tacho 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 649ae475b526cb6a76fec040c7ba1f1519a1035a980eecc51b3b57fb593ca950
-  data.tar.gz: d16cce60864b220c7b376dd4248f35cce5584f56332cd716d3db9ad0943b76e4
+  metadata.gz: abd0c2672497503b4b9f2777d4e4ba0bb93d8b720ba301d5412e32072b8dc029
+  data.tar.gz: 6f1be7d8c34c8b749910791a6ae4d2cab3db2380e7880116502cb65401cbe411
 SHA512:
-  metadata.gz: 6eaea8985e1dcbdb92156fe6ef0655978a94a960a3ebb119c91ddd769e9ecb0f042d39b48956c17dd64ca1d38c94dbbb569174a1758160b9ab93d377a24d0316
-  data.tar.gz: 7587dd2b0b9a843981cf083ba38abb54529e2c890906cb2d5b3114a4155a98046b24d875c9c5573919bb7c6febc01904cf788161519db8764466d6d19f596cfa
+  metadata.gz: 2366e1ddd9aee11f190bc0d5e2aeb3ef2e625ab990a3cbf223f827fcf5a6970f07bf1076119ecee336256362e680a3de81df8c84005082e7e62f3e43446e6fbb
+  data.tar.gz: 640a07df5a1be26d25edf9e8cb81a4a7c76de84bd7ee37ce55bcaebae12ba0d4837692faea8bcfa4660f7dc56ebe8e399e45dd1d76bad080360904213d0b6ab6

data/.gitignore

@@ -12,4 +12,8 @@
 *.a
 mkmf.log
 
+*.gem
+
+tacho/*.tch
+
 .idea/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tacho (0.1.0)
+    tacho (0.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -18,7 +18,7 @@ DEPENDENCIES
   bundler (~> 1.17)
   minitest (~> 5.0)
   rake (~> 10.0)
-  rake-compiler
+  rake-compiler (~> 1.0)
   tacho!
 
 BUNDLED WITH

data/ext/tacho/tacho.c

@@ -3,11 +3,35 @@
 #include <ruby/ruby.h>
 #include <ruby/debug.h>
 
+VALUE rb_mTacho;
+VALUE rb_cTachoProfile;
+ID    id_wall;
+ID    id_process;
+ID    id_thread;
+
 static inline void write_header(tch_profile* profile, char type, uint64_t time) {
     uint64_t c = ((time - profile->start_time) << 8) | type;
     fwrite(&c, sizeof(uint64_t), 1, profile->output);
 }
 
+static inline void write_thread_switch_maybe(tch_profile* profile) {
+    char c = 'T';
+    tch_thread_switch thread_switch;
+    VALUE thread = rb_thread_current();
+    VALUE fiber = rb_fiber_current();
+
+    thread_switch.thread_id = rb_obj_id(thread);
+    thread_switch.fiber_id = rb_obj_id(fiber);
+
+    if (thread_switch.thread_id != profile->last_thread_id || thread_switch.fiber_id != profile->last_fiber_id) {
+        profile->last_thread_id = thread_switch.thread_id;
+        profile->last_fiber_id = thread_switch.fiber_id;
+
+        fwrite(&c, 1, 1, profile->output);
+        fwrite(&thread_switch, sizeof(tch_thread_switch), 1, profile->output);
+    }
+}
+
 static void tacho_event(VALUE tpval, void *data) {
     tch_profile* profile = (tch_profile*)data;
 
@@ -25,17 +49,17 @@ static void tacho_event(VALUE tpval, void *data) {
     char* cur_str;
     int i;
 
+    uint32_t return_body;
     tch_call_body call_body;
 
-    rb_trace_arg_t* trace_arg;
-    rb_event_flag_t event_flag;
-
-    trace_arg = rb_tracearg_from_tracepoint(tpval);
-    event_flag = rb_tracearg_event_flag(trace_arg);
+    rb_trace_arg_t* trace_arg = rb_tracearg_from_tracepoint(tpval);
+    rb_event_flag_t event_flag = rb_tracearg_event_flag(trace_arg);
 
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time);
+    clock_gettime(profile->clock_type, &time);
     itime = (long)time.tv_sec * 1000000000 + (long)time.tv_nsec;
 
+    write_thread_switch_maybe(profile);
+
     if (event_flag == RUBY_EVENT_CALL) {
         write_header(profile, 'C', itime);
         call_body.line_no = FIX2INT(rb_tracearg_lineno(trace_arg));
@@ -43,6 +67,7 @@ static void tacho_event(VALUE tpval, void *data) {
         path = rb_tracearg_path(trace_arg);
 
         method_id = SYM2ID(rb_tracearg_method_id(trace_arg));
+        call_body.method_id = method_id;
 
         method_name = rb_id2name(method_id);
         method_length = strlen(method_name);
@@ -67,12 +92,12 @@ static void tacho_event(VALUE tpval, void *data) {
         fwrite(cur_str, call_body.filename_length, 1, profile->output);
     } else if (event_flag == RUBY_EVENT_RETURN) {
         write_header(profile, 'R', itime);
+
+        return_body = SYM2ID(rb_tracearg_method_id(trace_arg));
+        fwrite(&return_body, sizeof(uint32_t), 1, profile->output);
     }
 }
 
-VALUE rb_mTacho;
-VALUE rb_cTachoProfile;
-
 static tch_profile* tch_profile_get_profile(VALUE self) {
     return (tch_profile*)RDATA(self)->data;
 }
@@ -107,11 +132,12 @@ static VALUE tch_profile_initialize(VALUE self) {
     return self;
 }
 
-static VALUE tch_profile_start(VALUE self, VALUE filename, VALUE name) {
+static VALUE tch_profile_start(VALUE self, VALUE filename, VALUE name, VALUE clock_type) {
     tch_profile* profile = tch_profile_get_profile(self);
 
     struct timespec time;
     uint32_t name_length;
+    ID clock_type_id;
 
     profile->output = fopen(StringValueCStr(filename), "wb");
     profile->buffer_count = 0;
@@ -125,7 +151,24 @@ static VALUE tch_profile_start(VALUE self, VALUE filename, VALUE name) {
 
     profile->recording = 1;
 
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time);
+    if (NIL_P(clock_type)) {
+        profile->clock_type = CLOCK_MONOTONIC;
+    } else if (TYPE(clock_type) == T_SYMBOL) {
+        clock_type_id = SYM2ID(clock_type);
+        if (id_wall == clock_type_id) {
+            profile->clock_type = CLOCK_MONOTONIC;
+        } else if (id_process == clock_type_id) {
+            profile->clock_type = CLOCK_PROCESS_CPUTIME_ID;
+        } else if (id_thread == clock_type_id) {
+            profile->clock_type = CLOCK_THREAD_CPUTIME_ID;
+        } else {
+            rb_raise(rb_eTypeError, "not valid value. Must be one of :wall, :process or :thread got :%s", rb_id2name(clock_type_id));
+        }
+    } else {
+        rb_raise(rb_eTypeError, "not valid value. Must be a symbol of one of :wall, :process or :thread");
+    }
+
+    clock_gettime(profile->clock_type, &time);
     profile->start_time = (long)time.tv_sec * 1000000000 + (long)time.tv_nsec;
     write_header(profile, 'S', profile->start_time);
 
@@ -147,7 +190,7 @@ static VALUE tch_profile_stop(VALUE self) {
     uint64_t itime;
 
     if (profile->recording) {
-        clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time);
+        clock_gettime(profile->clock_type, &time);
         itime = (long)time.tv_sec * 1000000000 + (long)time.tv_nsec;
         write_header(profile, 'F', itime);
 
@@ -171,6 +214,10 @@ Init_tacho(void) {
     rb_cTachoProfile = rb_define_class_under(rb_mTacho, "Profile", rb_cObject);
 	rb_define_alloc_func(rb_cTachoProfile, tch_profile_allocate);
 	rb_define_method(rb_cTachoProfile, "initialize", tch_profile_initialize, 0);
-    rb_define_method(rb_cTachoProfile, "start", tch_profile_start, 2);
+    rb_define_method(rb_cTachoProfile, "start", tch_profile_start, 3);
     rb_define_method(rb_cTachoProfile, "stop", tch_profile_stop, 0);
+
+    id_wall = rb_intern("wall");
+    id_process = rb_intern("process");
+    id_thread = rb_intern("thread");
 }

data/ext/tacho/tacho.h

@@ -7,20 +7,30 @@
 
 typedef struct {
     uint32_t line_no;
+    uint32_t method_id;
     uint16_t method_name_length;
     uint16_t filename_offset;
     uint16_t filename_length;
 } tch_call_body;
-#define CALL_BODY_BYTES 10
+#define CALL_BODY_BYTES 14
 
 typedef struct {
-    VALUE    tracepoint;
+    uint32_t thread_id;
+    uint32_t fiber_id;
+} tch_thread_switch;
+#define THREAD_SWITCH_BYTES 8
 
-    int      recording;
-    FILE*    output;
-    uint64_t start_time;
-    int64_t  buffer_count;
-    char     buffer[4096];
+typedef struct {
+    VALUE     tracepoint;
+    clockid_t clock_type;
+    int       recording;
+    FILE*     output;
+    uint64_t  start_time;
+    int64_t   buffer_count;
+    char      buffer[4096];
+
+    uint32_t  last_thread_id;
+    uint32_t  last_fiber_id;
 } tch_profile;
 
 #endif /* TACHOMETER_H */

data/lib/tacho.rb

@@ -6,9 +6,9 @@ module Tacho
   class Error < StandardError;
   end
 
-  def self.start(name = '')
+  def self.start(name = '', clock_type: :wall)
     profile = Profile.new()
-    profile.start("tacho/#{Time.now.strftime("%Y%m%d_%H%M%S_%N")}.tch", name)
+    profile.start("tacho/#{Time.now.strftime("%Y%m%d_%H%M%S_%N")}.tch", name, clock_type)
     return profile
   end
 end

data/lib/tacho/version.rb

@@ -1,3 +1,3 @@
 module Tacho
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/tacho.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler", "~> 0"
+  spec.add_development_dependency "rake-compiler", "~> 1.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tacho
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Divan Burger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - lib/tacho/middleware.rb
 - lib/tacho/version.rb
 - tacho.gemspec
+- tacho/.gitkeep
 homepage: https://github.com/divanburger/tacho
 licenses:
 - MIT