skylight 0.4.3 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f853699be749f8141c245b8b45bea6f3b4e2b3f8
-  data.tar.gz: 646bf5fb1f3366cc3f72f63207905738bc7b178c
+  metadata.gz: c7eb484b9fcd3852564008f81d9cdbc1da4ddf11
+  data.tar.gz: 37c8da551cbe8d0b460bfcf8346defe265e5a665
 SHA512:
-  metadata.gz: 485eae8e30668d6da29b19ad4e44b046684bb4fc0a2ad89490d4f3637b99ef5ab803f07c7bc193b580ee948170ce2069ebb8b17cd88b6eb52861f688677bcb53
-  data.tar.gz: d43325433073a686d209791c640c3ea1a8ed87dd5848f28b2233582fd1adb66ab8084566a64929a6dbebba82ac9af63cb15c0fd96172c8d5b4dc7f4d47db00c4
+  metadata.gz: 8aa90d031fe9903413d71cd4dbb1097fa9566595eadfa288326dd629d98313bd8096547fed9681e49aed8fdbe03b38b1d59621aa8b1f61411e819affebbecafb
+  data.tar.gz: 89722c481983864f6e1fbfec52885fa3d10a63587ed324f77356f7276c0b6c63f5da63f5862e79c7a496cf42899588bfefbddfb8cc4fe0b87da94a84fd337c3b

data/CHANGELOG.md

@@ -1,6 +1,7 @@
-## 0.4.3 (November 12, 2014)
-
-* [BUGFIX] Fix Moped integration when queries include times
+## 0.5.0 (unreleased)
+* [FEATURE] Track object allocations per span
+* [BUGFIX] Fix exit status in 1.9.2
+* [IMPROVEMENT] Fix C warnings
 
 ## 0.4.2 (November 12, 2014)
 

data/ext/extconf.rb

@@ -135,8 +135,6 @@ def find_file(file, root = nil)
   end
 end
 
-# Flag -std=c99 required for older build systems
-$CFLAGS << " -std=c99 -pedantic" # -Wall
 $VPATH  << libpath
 
 # Where the ruby binding src is
@@ -161,5 +159,28 @@ unless have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
   have_func('rb_thread_blocking_region') or abort "Ruby is unexpectedly missing rb_thread_blocking_region. This should not happen."
 end
 
+# Some extra checks
+# -Werror is needed for the fast thread local storage
+$CFLAGS << " -Werror"
+
+checking_for 'fast thread local storage' do
+  if try_compile("__thread int foo;")
+    $defs << "-DHAVE_FAST_TLS"
+    true
+  end
+end
+
+#     spec = nil
+#     checking_for('thread_specific', '%s') do
+#       spec = %w[__declspec(thread) __thread].find {|th|
+#         try_compile("#{th} int foo;", "", :werror => true)
+#       }
+#       spec or 'no'
+#     end
+#     $defs << "-DRB_THREAD_SPECIFIC=#{spec}" if spec
+
+# Flag -std=c99 required for older build systems
+$CFLAGS << " -std=c99 -pedantic -Wall -fno-strict-aliasing"
+
 # TODO: Compute the relative path to the location
 create_makefile 'skylight_native', File.expand_path('..', __FILE__) # or fail "could not create makefile"

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "0.4.0-17128bb"
+version: "0.5.0-72edddd"
 checksums:
-  x86-linux:     "82f4cbee3ea37896c3f6197799a42750513bcc05e11ab60d897913db56d70be9"
-  x86_64-linux:  "812557897d1713e2e4580644230488edc9f9217fe9e73c312c4353357b3be909"
-  x86_64-darwin: "9adc46857840d85d5158db6b395b5e1430535a8e15b3b4c880bbd1bdff4a377d"
+  x86-linux:     "d5935c1b135e1ff63050e4997d5b09324a1fc9249dd2331480c60cca188a64da"
+  x86_64-linux:  "10229cc6a3fe6e793089ab78c8c01f70b0c4f8d7c6298184cf86ae252b91ffe5"
+  x86_64-darwin: "131de21acd4ebe5ae1502a2ae73880af1bc98b78506ee604c522bb0005ef7ff2"

data/ext/skylight_memprof.c

@@ -0,0 +1,109 @@
+#include <ruby.h>
+#include <skylight_native.h>
+
+#ifdef RUBY_INTERNAL_EVENT_NEWOBJ
+
+typedef struct {
+  uint64_t allocations;
+} sky_allocations_t;
+
+#ifdef HAVE_FAST_TLS
+
+// Use the __thread directive
+static __thread sky_allocations_t sky_allocations;
+
+static inline sky_allocations_t* get_allocations() {
+  return &sky_allocations;
+}
+
+#else
+
+#include <pthread.h>
+
+// Use pthread thread locals
+static pthread_key_t ALLOCATIONS_KEY;
+
+static pthread_once_t KEY_INIT_ONCE = PTHREAD_ONCE_INIT;
+
+static void init_allocations_key() {
+  pthread_key_create(&ALLOCATIONS_KEY, free);
+}
+
+static sky_allocations_t* get_allocations() {
+  sky_allocations_t* ret;
+
+  // Initialize the TLS key
+  pthread_once(&KEY_INIT_ONCE, init_allocations_key);
+
+  ret = (sky_allocations_t*) pthread_getspecific(ALLOCATIONS_KEY);
+
+  if (ret == 0) {
+    ret = (sky_allocations_t*) malloc(sizeof(sky_allocations_t));
+    pthread_setspecific(ALLOCATIONS_KEY, (void*) ret);
+  }
+
+  return ret;
+}
+
+#endif
+
+static void sky_increment_allocation(rb_event_flag_t flag, VALUE data, VALUE self, ID mid, VALUE klass) {
+  get_allocations()->allocations++;
+}
+
+void sky_activate_memprof(void) {
+  rb_add_event_hook(sky_increment_allocation, RUBY_INTERNAL_EVENT_NEWOBJ, Qnil);
+}
+
+void sky_deactivate_memprof(void) {
+  rb_remove_event_hook(sky_increment_allocation);
+}
+
+uint64_t sky_allocation_count(void) {
+  return get_allocations()->allocations;
+}
+
+uint64_t sky_consume_allocations() {
+  uint64_t ret = get_allocations()->allocations;
+  sky_clear_allocation_count();
+  return ret;
+}
+
+void sky_clear_allocation_count(void) {
+  get_allocations()->allocations = 0;
+}
+
+int sky_have_memprof(void) {
+  return 1;
+}
+
+#else
+/*
+ *
+ * ===== No memory profiling ======
+ *
+ */
+
+void sky_activate_memprof(void) {
+}
+
+void sky_deactivate_memprof(void) {
+}
+
+uint64_t sky_allocation_count(void) {
+  return 0;
+}
+
+uint64_t sky_consume_allocations() {
+  return 0;
+}
+
+void sky_clear_allocation_count(void) {
+}
+
+int sky_have_memprof(void) {
+  return 0;
+}
+
+
+#endif

data/ext/skylight_native.c

@@ -1,11 +1,14 @@
 #include <dlfcn.h>
 #include <ruby.h>
 #include <skylight_dlopen.h>
+#include <skylight_native.h>
 
 #ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
 #endif
 
+#define UNUSED(x) (void)(x)
+
 #define TO_S(VAL) \
   RSTRING_PTR(rb_funcall(VAL, rb_intern("to_s"), 0))
 
@@ -28,22 +31,20 @@
     }                                             \
   } while(0)                                      \
 
-#define BUF2STR(buf)                            \
-  ({                                            \
-    sky_buf_t b = (buf);                        \
-    VALUE str = rb_str_new(b.data, b.len);      \
-    rb_enc_associate(str, rb_utf8_encoding());  \
-    str;                                        \
-  })
-
-#define STR2BUF(str)           \
-  ({                           \
-    sky_buf_t buf;             \
-    VALUE s = (str);           \
-    buf.data = RSTRING_PTR(s); \
-    buf.len = RSTRING_LEN(s);  \
-    buf;                       \
-  })
+static inline VALUE
+BUF2STR(sky_buf_t buf) {
+  VALUE str = rb_str_new(buf.data, buf.len);
+  rb_enc_associate(str, rb_utf8_encoding());
+  return str;
+}
+
+static inline sky_buf_t
+STR2BUF(VALUE str) {
+  return (sky_buf_t) {
+    .data = RSTRING_PTR(str),
+    .len = RSTRING_LEN(str),
+  };
+}
 
 #define CHECK_FFI(success, message)               \
   do {                                            \
@@ -65,7 +66,6 @@
   DATA_PTR(obj) = NULL;                           \
 
 #define Get_Struct(name, obj, Type, msg)          \
-  Type name;                                      \
   Data_Get_Struct(obj, Type, name);               \
   if (name == NULL) {                             \
     rb_raise(rb_eRuntimeError, "%s", msg);        \
@@ -115,6 +115,7 @@ static VALUE
 load_libskylight(VALUE klass, VALUE path) {
   int res;
 
+  UNUSED(klass);
   CHECK_TYPE(path, T_STRING);
 
   // Already loaded
@@ -140,6 +141,7 @@ load_libskylight(VALUE klass, VALUE path) {
 
 static VALUE
 clock_high_res_time(VALUE self) {
+  UNUSED(self);
   return ULL2NUM(sky_hrtime());
 }
 
@@ -153,7 +155,9 @@ static VALUE
 instrumenter_new(VALUE klass, VALUE rb_env) {
   sky_instrumenter_t* instrumenter;
   sky_buf_t env[256];
+  int i, envc;
 
+  UNUSED(klass);
   CHECK_TYPE(rb_env, T_ARRAY);
 
   if (RARRAY_LEN(rb_env) >= 256) {
@@ -161,8 +165,7 @@ instrumenter_new(VALUE klass, VALUE rb_env) {
     return Qnil;
   }
 
-  int i;
-  int envc = (int) RARRAY_LEN(rb_env);
+  envc = (int) RARRAY_LEN(rb_env);
 
   for (i = 0; i < envc; ++i) {
     VALUE val = rb_ary_entry(rb_env, i);
@@ -187,6 +190,8 @@ instrumenter_start_nogvl(sky_instrumenter_t* instrumenter) {
    */
 
   if (sky_instrumenter_start(instrumenter) == 0) {
+    sky_activate_memprof();
+
     return (void*) Qtrue;
   }
   else {
@@ -196,26 +201,35 @@ instrumenter_start_nogvl(sky_instrumenter_t* instrumenter) {
 
 static VALUE
 instrumenter_start(VALUE self) {
-  My_Struct(instrumenter, sky_instrumenter_t*, no_instrumenter_msg);
+  sky_instrumenter_t* instrumenter;
+
+  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
 
   return (VALUE) WITHOUT_GVL(instrumenter_start_nogvl, instrumenter);
 }
 
 static VALUE
 instrumenter_stop(VALUE self) {
-  My_Struct(instrumenter, sky_instrumenter_t*, no_instrumenter_msg);
+  sky_instrumenter_t* instrumenter;
+
+  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
 
   CHECK_FFI(
       sky_instrumenter_stop(instrumenter),
       "native Instrumenter#stop failed");
 
+  sky_deactivate_memprof();
+
   return Qnil;
 }
 
 static VALUE
 instrumenter_submit_trace(VALUE self, VALUE rb_trace) {
-  My_Struct(instrumenter, sky_instrumenter_t*, no_instrumenter_msg);
-  Transfer_Struct(trace, rb_trace, sky_trace_t*, consumed_trace_msg);
+  sky_instrumenter_t* instrumenter;
+  sky_trace_t* trace;
+
+  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
+  Transfer_Struct(trace, rb_trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_instrumenter_submit_trace(instrumenter, trace),
@@ -232,23 +246,28 @@ instrumenter_submit_trace(VALUE self, VALUE rb_trace) {
 
 static VALUE
 trace_new(VALUE klass, VALUE start, VALUE uuid, VALUE endpoint) {
+  sky_trace_t* trace;
+
+  UNUSED(klass);
   CHECK_NUMERIC(start);
   CHECK_TYPE(uuid, T_STRING);
   CHECK_TYPE(endpoint, T_STRING);
 
-  sky_trace_t* trace;
-
   CHECK_FFI(
       sky_trace_new(NUM2ULL(start), STR2BUF(uuid), STR2BUF(endpoint), &trace),
       "native Trace#new failed");
 
+  sky_clear_allocation_count();
+
   return Data_Wrap_Struct(rb_cTrace, NULL, sky_trace_free, trace);
 }
 
 static VALUE
 trace_get_started_at(VALUE self) {
   uint64_t start;
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+  sky_trace_t* trace;
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_start(trace, &start),
@@ -259,8 +278,10 @@ trace_get_started_at(VALUE self) {
 
 static VALUE
 trace_get_endpoint(VALUE self) {
+  sky_trace_t* trace;
   sky_buf_t endpoint;
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_endpoint(trace, &endpoint),
@@ -271,8 +292,10 @@ trace_get_endpoint(VALUE self) {
 
 static VALUE
 trace_set_endpoint(VALUE self, VALUE endpoint) {
+  sky_trace_t* trace;
+
   CHECK_TYPE(endpoint, T_STRING);
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_set_endpoint(trace, STR2BUF(endpoint)),
@@ -283,8 +306,10 @@ trace_set_endpoint(VALUE self, VALUE endpoint) {
 
 static VALUE
 trace_get_uuid(VALUE self) {
+  sky_trace_t* trace;
   sky_buf_t uuid;
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_uuid(trace, &uuid),
@@ -295,8 +320,10 @@ trace_get_uuid(VALUE self) {
 
 static VALUE
 trace_start_span(VALUE self, VALUE time, VALUE category) {
+  sky_trace_t* trace;
   uint32_t span;
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_NUMERIC(time);
   CHECK_TYPE(category, T_STRING);
@@ -305,16 +332,26 @@ trace_start_span(VALUE self, VALUE time, VALUE category) {
       sky_trace_instrument(trace, NUM2ULL(time), STR2BUF(category), &span),
       "native Trace#start_span failed");
 
+  if (sky_have_memprof()) {
+    sky_trace_span_add_uint_annotation(trace, span, 2, sky_consume_allocations());
+  }
+
   return UINT2NUM(span);
 }
 
 static VALUE
 trace_stop_span(VALUE self, VALUE span, VALUE time) {
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+  sky_trace_t* trace;
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_NUMERIC(time);
   CHECK_TYPE(span, T_FIXNUM);
 
+  if (sky_have_memprof()) {
+    sky_trace_span_add_uint_annotation(trace, FIX2UINT(span), 1, sky_consume_allocations());
+  }
+
   CHECK_FFI(
       sky_trace_span_done(trace, FIX2UINT(span), NUM2ULL(time)),
       "native Trace#stop_span failed");
@@ -324,7 +361,9 @@ trace_stop_span(VALUE self, VALUE span, VALUE time) {
 
 static VALUE
 trace_span_set_title(VALUE self, VALUE span, VALUE title) {
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+  sky_trace_t* trace;
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_TYPE(span, T_FIXNUM);
   CHECK_TYPE(title, T_STRING);
@@ -338,7 +377,9 @@ trace_span_set_title(VALUE self, VALUE span, VALUE title) {
 
 static VALUE
 trace_span_set_description(VALUE self, VALUE span, VALUE desc) {
-  My_Struct(trace, sky_trace_t*, consumed_trace_msg);
+  sky_trace_t* trace;
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
 
   CHECK_TYPE(span, T_FIXNUM);
   CHECK_TYPE(desc, T_STRING);

data/ext/skylight_native.h

@@ -0,0 +1,18 @@
+#ifndef __SKYLIGHT_NATIVE__
+#define __SKYLIGHT_NATIVE__
+
+#include <stdint.h>
+
+void sky_activate_memprof(void);
+
+void sky_deactivate_memprof(void);
+
+uint64_t sky_allocation_count(void);
+
+uint64_t sky_consume_allocations();
+
+void sky_clear_allocation_count(void);
+
+int sky_have_memprof(void);
+
+#endif

data/lib/skylight/normalizers/moped/query.rb

@@ -117,18 +117,18 @@ module Skylight
         end
 
         def extract_binds(hash, binds=[])
-          ret = {}
+          hash = hash.dup
 
           hash.each do |k,v|
             if v.is_a?(Hash)
-              ret[k] = extract_binds(v, binds)[0]
+              hash[k] = extract_binds(v, binds)[0]
             else
               binds << stringify(hash[k])
-              ret[k] = '?'
+              hash[k] = '?'
             end
           end
 
-          [ret, binds]
+          [hash, binds]
         end
 
         def stringify(value)

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.4.3'
+  VERSION = '0.5.0-beta1'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - Tilde, Inc.
@@ -41,7 +41,9 @@ files:
 - bin/skylight
 - ext/extconf.rb
 - ext/libskylight.yml
+- ext/skylight_memprof.c
 - ext/skylight_native.c
+- ext/skylight_native.h
 - lib/skylight.rb
 - lib/skylight/api.rb
 - lib/skylight/cli.rb
@@ -160,9 +162,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2