HDRHistogram 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 552613925806b789118b4fe48e14ab97d586c05c
-  data.tar.gz: ede44074c166d7508daed156d8f7591c58a111b1
+SHA256:
+  metadata.gz: fc890bb97e2d8e3df9318ebeadbdfe33f3593b5ce2ca8afaef123c7876c0cb12
+  data.tar.gz: 4e26dd8585aafc0edc028b31ab0185c8397a95897062aa203fc0a2b8f1cc3839
 SHA512:
-  metadata.gz: e353550b31b579eba4e36314b5494e1523e925f5260a3470b7c35a74ecd373398dc9f8cefc8e1a32581e80b9bf4f3039fa2fa284477f6dbf845b42d08c233a6f
-  data.tar.gz: 02f1921c20e1bd017b583b54aa32c1081fb114c4f3188a280bdc52165f45ea57f38b7974a1f9f5bb2fa03726941dbb02b0ad6d8f2e86bf734c511987e624705d
+  metadata.gz: 46b8dc766bb51cc69508309b60c9821907f95d14a1564fcca4cbd1447347a02afea2d8cabd6dce41cd40f85ac8e23f8d73020096a821bcc78c8430d3bdc265e9
+  data.tar.gz: dd38b0453460d01acebaf66c4f6898e9a1f12514cc3ca24dab51c6c76c83f38629f738d3352959cc394c280745106173ae513ef7a58cabc6913d0d0374bdfef4

data/ext/ruby_hdr_histogram/ruby_hdr_histogram.c

@@ -109,6 +109,29 @@ static VALUE histogram_##int_name(VALUE self) {           \
   return INT2NUM(hdr->int_name);                          \
 }
 
+#define HISTOGRAM_SETNUM_METHOD(num_name, num_type)       \
+static VALUE histogram_set_##num_name(VALUE self, VALUE num) { \
+  GET_HDRHIST(hdr, self);                                 \
+  hdr->num_name = NUM2##num_type(num);                    \
+  return Qtrue;                                           \
+}
+
+HISTOGRAM_SETNUM_METHOD(lowest_trackable_value, LL)
+HISTOGRAM_SETNUM_METHOD(highest_trackable_value, LL)
+HISTOGRAM_SETNUM_METHOD(unit_magnitude, LONG)
+HISTOGRAM_SETNUM_METHOD(significant_figures, LONG)
+HISTOGRAM_SETNUM_METHOD(sub_bucket_half_count_magnitude, LONG)
+HISTOGRAM_SETNUM_METHOD(sub_bucket_half_count, LONG)
+HISTOGRAM_SETNUM_METHOD(sub_bucket_mask, LL)
+HISTOGRAM_SETNUM_METHOD(sub_bucket_count, LONG)
+HISTOGRAM_SETNUM_METHOD(bucket_count, LONG)
+HISTOGRAM_SETNUM_METHOD(min_value, LL)
+HISTOGRAM_SETNUM_METHOD(max_value, LL)
+HISTOGRAM_SETNUM_METHOD(normalizing_index_offset, LONG)
+HISTOGRAM_SETNUM_METHOD(conversion_ratio, DBL)
+HISTOGRAM_SETNUM_METHOD(counts_len, LONG)
+HISTOGRAM_SETNUM_METHOD(total_count, LL)
+
 HISTOGRAM_GETINT_METHOD(lowest_trackable_value)
 HISTOGRAM_GETINT_METHOD(highest_trackable_value)
 HISTOGRAM_GETINT_METHOD(unit_magnitude)
@@ -117,6 +140,14 @@ HISTOGRAM_GETINT_METHOD(bucket_count)
 HISTOGRAM_GETINT_METHOD(sub_bucket_count)
 HISTOGRAM_GETINT_METHOD(counts_len)
 
+static VALUE histogram_set_raw_count(VALUE self, VALUE index, VALUE count) {
+  GET_HDRHIST(hdr, self);
+  int     i = NUM2INT(index);
+  int64_t c = NUM2LL(count);
+  hdr->counts[i]=c;
+  return Qtrue;
+}
+
 void Init_ruby_hdr_histogram() {
   HDRHistogram = rb_define_class("HDRHistogram", rb_cObject);
   HDRHistogramError = rb_define_class_under(HDRHistogram, "HDRHistogramError", rb_eRuntimeError);
@@ -138,15 +169,34 @@ void Init_ruby_hdr_histogram() {
   rb_define_private_method(HDRHistogram, "raw_percentile", histogram_percentile, 1);
   rb_define_private_method(HDRHistogram, "raw_merge", histogram_merge, 1);
   
+  rb_define_private_method(HDRHistogram, "lowest_trackable_value=", histogram_set_lowest_trackable_value, 1);
+  rb_define_private_method(HDRHistogram, "highest_trackable_value=", histogram_set_highest_trackable_value, 1);
+  rb_define_private_method(HDRHistogram, "unit_magnitude=", histogram_set_unit_magnitude, 1);
+  rb_define_private_method(HDRHistogram, "significant_figures=", histogram_set_significant_figures, 1);
+  rb_define_private_method(HDRHistogram, "sub_bucket_half_count_magnitude=", histogram_set_sub_bucket_half_count_magnitude, 1);
+  rb_define_private_method(HDRHistogram, "sub_bucket_half_count=", histogram_set_sub_bucket_half_count, 1);
+  rb_define_private_method(HDRHistogram, "sub_bucket_mask=", histogram_set_sub_bucket_mask, 1);
+  rb_define_private_method(HDRHistogram, "sub_bucket_count=", histogram_set_sub_bucket_count, 1);
+  rb_define_private_method(HDRHistogram, "bucket_count=", histogram_set_bucket_count, 1);
+  rb_define_private_method(HDRHistogram, "min_value=", histogram_set_min_value, 1);
+  rb_define_private_method(HDRHistogram, "max_value=", histogram_set_max_value, 1);
+  rb_define_private_method(HDRHistogram, "normalizing_index_offset=", histogram_set_normalizing_index_offset, 1);
+  rb_define_private_method(HDRHistogram, "conversion_ratio=", histogram_set_conversion_ratio, 1);
+  rb_define_private_method(HDRHistogram, "counts_len=", histogram_set_counts_len, 1);
+  rb_define_private_method(HDRHistogram, "total_count=", histogram_set_total_count, 1);
+  rb_define_private_method(HDRHistogram, "set_raw_count", histogram_set_raw_count, 2);
   
   rb_define_method(HDRHistogram, "lowest_trackable_value", histogram_lowest_trackable_value, 0);
   rb_define_method(HDRHistogram, "highest_trackable_value", histogram_highest_trackable_value, 0);
   rb_define_private_method(HDRHistogram, "unit_magnitude", histogram_unit_magnitude, 0);
   rb_define_method(HDRHistogram, "significant_figures", histogram_significant_figures, 0);
   rb_define_private_method(HDRHistogram, "bucket_count", histogram_bucket_count, 0);
-  rb_define_private_method(HDRHistogram, "sub_bucket_count", histogram_bucket_count, 0);
+  rb_define_private_method(HDRHistogram, "sub_bucket_count", histogram_sub_bucket_count, 0);
   rb_define_private_method(HDRHistogram, "counts_len", histogram_counts_len, 0);
   
+  
+  rb_define_private_method(HDRHistogram, "unit_magnitude", histogram_unit_magnitude, 0);
+  
   //rb_define_private_method(HDRHistogram, "histogram_spectrum", histogram_spectrum, 2);
 }
 

data/lib/HDRHistogram.rb

@@ -5,6 +5,37 @@ class HDRHistogram
   def initialize(lowest, highest, sig, opt={})
     @multiplier = opt[:multiplier] || 1
     @unit = opt[:unit] || opt[:units]
+    
+    if opt[:unserialized]
+      m=opt[:unserialized]
+      self.unit_magnitude= m[:unit_magnitude].to_i
+      self.sub_bucket_half_count_magnitude= m[:sub_bucket_half_count_magnitude].to_i
+      self.sub_bucket_half_count= m[:sub_bucket_half_count].to_i
+      self.sub_bucket_mask= m[:sub_bucket_mask].to_i
+      self.sub_bucket_count= m[:sub_bucket_count].to_i
+      self.bucket_count= m[:bucket_count].to_i
+      self.min_value= m[:min_value].to_i
+      self.max_value= m[:max_value].to_i
+      self.normalizing_index_offset= m[:normalizing_index_offset].to_i
+      self.conversion_ratio= m[:conversion_ratio].to_f
+      self.counts_len= m[:counts_len].to_i
+      self.total_count= m[:total_count].to_i
+      
+      counts = m[:counts].split " "
+      i=0
+      counts.each do |count|
+        m = count.match /^~(\d+)$/
+        if m then #zerofill
+          m[1].to_i.times do
+            set_raw_count(i, 0)
+            i=i+1
+          end
+        else
+          set_raw_count(i, count.to_i)
+          i=i+1
+        end
+      end
+    end
   end
 
   def record(val)
@@ -62,4 +93,13 @@ class HDRHistogram
   end
   private_class_method :adjusted_boundary_val
   
+  def self.unserialize(str)
+    regex = /^(?<lowest_trackable_value>\d+) (?<highest_trackable_value>\d+) (?<unit_magnitude>\d+) (?<significant_figures>\d+) (?<sub_bucket_half_count_magnitude>\d+) (?<sub_bucket_half_count>\d+) (?<sub_bucket_mask>\d+) (?<sub_bucket_count>\d+) (?<bucket_count>\d+) (?<min_value>\d+) (?<max_value>\d+) (?<normalizing_index_offset>\d+) (?<conversion_ratio>\S+) (?<counts_len>\d+) (?<total_count>\d+) \[(?<counts>[\d~ ]+)\s\]/
+    
+    m = str.match regex
+    
+    hdrh = self.new(m[:lowest_trackable_value].to_i, m[:highest_trackable_value].to_i, m[:significant_figures].to_i, {unserialized: m})
+    
+    return hdrh
+  end
 end

data/lib/HDRHistogram/version.rb

@@ -1,3 +1,3 @@
 class HDRHistogram
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDRHistogram
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Leo P.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the C hdr_histogram library