fast-stats 1.7 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2333c25bd11e2269552ec7a993f4669e7678a46e
-  data.tar.gz: 24b6f8bfcb9394f491696f0db9a8c821b5fce972
+  metadata.gz: d927911272d5a002dc8c65081daf6ef427a45eeb
+  data.tar.gz: ea6b385bb0459ea4c0e298d873b06f6dc106e241
 SHA512:
-  metadata.gz: bb6441cdf70869f5520ae8c27ff87df3d7b9c3c662186ee48e870ee8532f2dac9fbb32b9ede05c5d7c8d385893775c66af0b552211acfc3d9e845f235d601132
-  data.tar.gz: d1d9c73c37d20620009fa0db0ece7039757c41c5096916c5eb1bf106ba2f2c7cef16f6912735d6f4d6e838b154bf26368b38f3fb8dccb299036b42ff987b60fa
+  metadata.gz: 2072ef0aede7cb79bc0bb90b82954782bf7cd44ec572aa29cc4526e11c4767924b09082a8571052a0b81f632d608c2f47c80c0bca853cbf2e2e6464501fa66af
+  data.tar.gz: 24bde670ea0a91aae2df662800bdf154a60856fc15eb0adaef234582683feded041669a8ac9427ef06b397781e0c4a4c6adb81bde3056e21de53f75541949e74

data/Makefile

@@ -6,6 +6,7 @@ $(info gem version is $(GEMVERSION))
 all: build test
 
 build: copy-lib-files
+	-gem uninstall fast-stats -v $(GEMVERSION)
 	gem build fast-stats.gemspec
 	gem install fast-stats-$(GEMVERSION).gem
 

data/ext/stats/stats-ruby.c

@@ -10,6 +10,7 @@
 static VALUE stats_class = Qnil;
 static VALUE ctr_class = Qnil;
 static VALUE tmr_class = Qnil;
+static VALUE sample_class = Qnil;
 
 #define STATS_MAGIC  'stat'
 #define CTR_MAGIC    'ctr '
@@ -37,6 +38,9 @@ static void rbctr_free(void *p);
 static VALUE rbtmr_alloc(struct stats_counter *counter);
 static void rbtmr_free(void *p);
 
+static VALUE rbsample_alloc(struct stats_counter_list *cl, struct stats_sample *sample);
+static void rbsample_free(void *p);
+
 
 static int hash_probe(struct rbstats *stats, const char *key, long len)
 {
@@ -395,6 +399,52 @@ static VALUE rbstats_clr(VALUE self, VALUE rbkey)
 }
 
 
+static VALUE rbstats_sample(VALUE self)
+{
+    struct rbstats *stats;
+    struct stats_counter_list *cl = NULL;
+    struct stats_sample *sample = NULL;
+    VALUE ret = Qnil;
+
+    stats = rbstats_get_wrapped_stats(self);
+    if (!stats)
+        goto exit;
+
+    if (stats_cl_create(&cl) != S_OK)
+        goto exit;
+
+    if (stats_get_counter_list(stats->stats, cl) != S_OK)
+        goto exit;
+
+    if (stats_sample_create(&sample) != S_OK)
+        goto exit;
+
+    if (stats_get_sample(stats->stats, cl, sample) != S_OK)
+        goto exit;
+
+    ret = rbsample_alloc(cl, sample);
+    if (ret != Qnil)
+    {
+        cl = NULL;
+        sample = NULL;
+    }
+
+exit:
+    if (cl != NULL)
+    {
+        stats_cl_free(cl);
+    }
+
+    if (sample != NULL)
+    {
+        stats_sample_free(sample);
+    }
+
+    return ret;
+}
+
+
+
 /******************************************************************
  *
  *  Ruby Counter
@@ -439,6 +489,16 @@ VALUE rbctr_clr(VALUE self)
     return self;
 }
 
+VALUE rbctr_get(VALUE self)
+{
+    struct stats_counter *counter = NULL;
+    long long val;
+
+    Data_Get_Struct(self, struct stats_counter, counter);
+    val = counter_get_value(counter);
+    return LONG2FIX(val);
+}
+
 VALUE rbctr_set(VALUE self, VALUE amt)
 {
     struct stats_counter *counter = NULL;
@@ -472,15 +532,18 @@ struct timer_data
 
 static VALUE rbtmr_alloc(struct stats_counter *counter)
 {
-    VALUE tdata;
+    VALUE tdata = Qnil;
     struct timer_data *td;
 
     td = (struct timer_data *)malloc(sizeof(struct timer_data));
-    td->counter = counter;
-    td->start_time = 0;
-    td->depth = 0;
+    if (td)
+    {
+        td->counter = counter;
+        td->start_time = 0;
+        td->depth = 0;
 
-    tdata = Data_Wrap_Struct(tmr_class, 0, rbtmr_free, td);
+        tdata = Data_Wrap_Struct(tmr_class, 0, rbtmr_free, td);
+    }
 
     return tdata;
 }
@@ -531,11 +594,144 @@ static void rbtmr_free(void *p)
     free(p);
 }
 
+
+/******************************************************************
+ *
+ *  Ruby Sample
+ *
+ */
+
+struct rb_sample_data
+{
+    struct stats_counter_list *cl;
+    struct stats_sample *sample;
+};
+
+
+static VALUE rbsample_alloc(struct stats_counter_list *cl, struct stats_sample *sample)
+{
+    VALUE tdata = Qnil;
+    struct rb_sample_data *sd;
+
+    sd = (struct rb_sample_data *) malloc(sizeof(struct rb_sample_data));
+    if (sd)
+    {
+        sd->cl = cl;
+        sd->sample = sample;
+        tdata = Data_Wrap_Struct(sample_class, 0, rbsample_free, sd);
+    }
+
+    return tdata;
+}
+
+static void rbsample_free(void *p)
+{
+    struct rb_sample_data *d = (struct rb_sample_data *)p;
+    stats_cl_free(d->cl);
+    stats_sample_free(d->sample);
+    free(d);
+}
+
+static VALUE rbsample_keys(VALUE self)
+{
+    struct rb_sample_data *sd = NULL;
+    VALUE keys;
+    int i;
+    char counter_name[MAX_COUNTER_KEY_LENGTH+1];
+
+    Data_Get_Struct(self, struct rb_sample_data, sd);
+
+    keys = rb_ary_new();
+    if (keys != Qnil)
+    {
+        for (i = 0; i < sd->cl->cl_count; i++)
+        {
+            counter_get_key(sd->cl->cl_ctr[i],counter_name,MAX_COUNTER_KEY_LENGTH+1);
+            rb_ary_push(keys, rb_str_new_cstr(counter_name));
+        }
+    }
+
+    return keys;
+}
+
+static VALUE rbsample_time(VALUE self)
+{
+    struct rb_sample_data *sd = NULL;
+
+    Data_Get_Struct(self, struct rb_sample_data, sd);
+
+    return LONG2FIX(sd->sample->sample_time);
+}
+
+static VALUE rbsample_count(VALUE self)
+{
+    struct rb_sample_data *sd = NULL;
+
+    Data_Get_Struct(self, struct rb_sample_data, sd);
+
+    return LONG2FIX(sd->cl->cl_count);
+}
+
+static VALUE rbsample_get(VALUE self, VALUE key_arg)
+{
+    struct rb_sample_data *sd = NULL;
+    int i;
+    char counter_name[MAX_COUNTER_KEY_LENGTH+1], *key;
+    long long val;
+
+    Check_Type(key_arg,T_STRING);
+
+    Data_Get_Struct(self, struct rb_sample_data, sd);
+    key = StringValueCStr(key_arg);
+
+    for (i = 0; i < sd->cl->cl_count; i++)
+    {
+        counter_get_key(sd->cl->cl_ctr[i],counter_name,MAX_COUNTER_KEY_LENGTH+1);
+        if (strcmp(key, counter_name) == 0)
+        {
+            val = stats_sample_get_value(sd->sample, i);
+            return LONG2FIX(val);
+        }
+    }
+
+    return Qnil;
+}
+
+static VALUE rbsample_each(VALUE self)
+{
+    struct rb_sample_data *sd = NULL;
+    int i;
+    char counter_name[MAX_COUNTER_KEY_LENGTH+1];
+    long long val;
+    VALUE key;
+
+    Data_Get_Struct(self, struct rb_sample_data, sd);
+
+    for (i = 0; i < sd->cl->cl_count; i++)
+    {
+        counter_get_key(sd->cl->cl_ctr[i],counter_name,MAX_COUNTER_KEY_LENGTH+1);
+        key = rb_str_new_cstr(counter_name);
+        val = stats_sample_get_value(sd->sample, i);
+        rb_yield_values(2, key, LONG2FIX(val));
+    }
+
+    return self;
+}
+
+
+
+/******************************************************************
+ *
+ *  Module initialization
+ *
+ */
+
 void Init_stats()
 {
     stats_class = rb_define_class("Stats", rb_cObject);
     rb_define_singleton_method(stats_class, "new", rbstats_new, 1);
     rb_define_method(stats_class, "initialize", rbstats_init, 1);
+    rb_define_method(stats_class, "sample", rbstats_sample, 0);
     rb_define_method(stats_class, "get", rbstats_get, 1);
     rb_define_method(stats_class, "timer", rbstats_get_tmr, 1);
     rb_define_method(stats_class, "inc", rbstats_inc, 1);
@@ -548,10 +744,18 @@ void Init_stats()
     rb_define_method(ctr_class, "add", rbctr_add, 1);
     rb_define_method(ctr_class, "set", rbctr_set, 1);
     rb_define_method(ctr_class, "clr", rbctr_clr, 0);
+    rb_define_method(ctr_class, "get", rbctr_get, 0);
 
     tmr_class = rb_define_class("Timer", rb_cObject);
     rb_define_method(tmr_class, "enter", rbtmr_enter, 0);
     rb_define_method(tmr_class, "exit", rbtmr_exit, 0);
     rb_define_method(tmr_class, "time", rbtmr_time, 0);
+
+    sample_class = rb_define_class("Sample", rb_cObject);
+    rb_define_method(sample_class, "keys", rbsample_keys, 0);
+    rb_define_method(sample_class, "time", rbsample_time, 0);
+    rb_define_method(sample_class, "count", rbsample_count, 0);
+    rb_define_method(sample_class, "each", rbsample_each, 0);
+    rb_define_method(sample_class, "[]", rbsample_get, 1);
 }
 

data/fast-stats.gemspec

@@ -2,8 +2,10 @@ require './lib/stats/version'
 
 Gem::Specification.new do |s|
   s.name = "fast-stats"
+  s.licenses = ["BSD-3"]
   s.version = StatsGem::VERSION
   s.authors = ["Alan Pearson"]
+  s.homepage = "https://github.com/pearsonalan/stats"
   s.date = Time.now.utc.strftime("%Y-%m-%d")
   s.extensions = ["ext/stats/extconf.rb"]
   s.files = `git ls-files .`.split("\n")
@@ -13,5 +15,6 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files spec examples`.split("\n")
   s.required_ruby_version = ">= 1.9.3"
   s.summary = "stats monitoring"
+  s.description = "fast-stats is a SysV IPC based stats tracking tool. Counters are stored in shared memory, so updating or reading the counter is quite fast"
 end
 

data/lib/stats/version.rb

@@ -1,3 +1,3 @@
 module StatsGem
-  VERSION = '1.7'
+  VERSION = '1.9'
 end

data/test/test_stats.rb

@@ -6,6 +6,24 @@ puts "TEST STATS: version is #{Stats.version}"
 
 s = Stats.new("rubytest")
 ctr = s.get("ctr")
+ctr.clr
 ctr.inc
 
+raise "unexpected value" unless ctr.get == 1
+
+d = s.sample
+
+# puts "Sample is #{d.inspect}"
+
+raise "unexpected sample count" unless d.count == 1
+raise "unexpected sample keys" unless d.keys == ['ctr']
+raise "unexpected sample value" unless d['ctr'] == 1
+
+h = Hash.new
+d.each do |k,v|
+  h[k] = v
+end
+
+raise "unexpected sample data" unless h == {"ctr" => 1}
+
 puts "TEST STATS: OK"

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fast-stats
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.9'
 platform: ruby
 authors:
 - Alan Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies: []
-description: 
+description: fast-stats is a SysV IPC based stats tracking tool. Counters are stored
+  in shared memory, so updating or reading the counter is quite fast
 email: 
 executables: []
 extensions:
@@ -19,23 +20,16 @@ extra_rdoc_files: []
 files:
 - Makefile
 - ext/stats/.gitignore
-- ext/stats/extconf.rb
-- ext/stats/stats-ruby.c
-- fast-stats.gemspec
-- lib/stats.rb
-- lib/stats/version.rb
-- test/benchmark_stats.rb
-- test/test_stats.rb
 - ext/stats/error.c
+- ext/stats/extconf.rb
 - ext/stats/hash.c
 - ext/stats/lock.c
 - ext/stats/mt19937.c
+- ext/stats/mt19937.h
 - ext/stats/semaphore.c
 - ext/stats/shared_mem.c
+- ext/stats/stats-ruby.c
 - ext/stats/stats.c
-- ext/stats/strlcat.c
-- ext/stats/strlcpy.c
-- ext/stats/mt19937.h
 - ext/stats/stats/debug.h
 - ext/stats/stats/error.h
 - ext/stats/stats/hash.h
@@ -44,8 +38,16 @@ files:
 - ext/stats/stats/semaphore.h
 - ext/stats/stats/shared_mem.h
 - ext/stats/stats/stats.h
-homepage: 
-licenses: []
+- ext/stats/strlcat.c
+- ext/stats/strlcpy.c
+- fast-stats.gemspec
+- lib/stats.rb
+- lib/stats/version.rb
+- test/benchmark_stats.rb
+- test/test_stats.rb
+homepage: https://github.com/pearsonalan/stats
+licenses:
+- BSD-3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -53,17 +55,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: stats monitoring