journalist 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20db52670ef27ceb9997cad3ec0549694690276d
-  data.tar.gz: d0174b59664d9edede7a79aa7e4704acc2ef975f
+  metadata.gz: 95517034abf866395da885dd6c76b4dc4f247dc9
+  data.tar.gz: 05e3d8fc5475524bd32a85d2d44c30bdfd565b8e
 SHA512:
-  metadata.gz: 6cdc6dfc98d9ebfa1df021b5b72a53b723ac7dee90bcdaf77ae7583d1099e29746ad834423157201eed852dcfa1d9930ac878cd3081f296e1a0ccb60843aa226
-  data.tar.gz: 8768347c02d4d2e3d7604409388a2d06194ad849f1107f4fe88ddafb0b6acff5f365460212e5799de9518fd3411e89778ee086032ef1962fb51bba6ba8493f3b
+  metadata.gz: f3675511414ae3db9d0b011e9c89c4c36279137bd76d636b186a8db5fbc63e66477c62fd3922f255fa8d8c9b24cb5f401a45eb708b6f3e71881d1394504aae80
+  data.tar.gz: 67ceccb11555c8e7bacdb5a398fafeb05fbf57a0c7208c5e2e53aba77452648f7ddb363e76cb77983b1a7cd02655f1731fd70c8ea21b83db7e98befca5b3696b

data/.consolerc

@@ -1,10 +1,21 @@
 def start
   Journalist.start
-  stress_gc
 end
 
 def stress_gc
   100_000.times { "foo" }
 end
 
+def fibo(num)
+  if num < 2
+    num
+  else
+    fibo(num-1) + fibo(num-2)
+  end
+end
+
+def slow
+  fibo(34) # Slow enough on my computer
+end
+
 puts "Fixtures loaded"

data/ext/journalist/allocations.c

@@ -76,7 +76,7 @@ journalist_on_newobj(VALUE tpval, void *data) {
 
 static void
 journalist_on_freeobj(VALUE tpval, void *data) {
-  // rb_journalist_socket_send("freeobj\n");
+  // TODO: Keep track of how many objects were freed and aggregate that info.
 }
 
 static int
@@ -85,11 +85,12 @@ journalist_allocations_send_locations(st_data_t key, st_data_t value, st_data_t
   char *location = (char *)key;
   int total      = (int)value;
 
-  char message[4096];
-  sprintf(message, "newobj_loc: type %s loc %s count %d\n",
-    type, location, total);
-
-  rb_journalist_socket_send(message);
+  rb_journalist_socket_send(3,
+    "newobj_loc",
+    "type",     's', type,
+    "location", 's', location,
+    "count",    'i', total
+  );
 
   return ST_CONTINUE;
 }
@@ -99,11 +100,11 @@ journalist_allocations_send_types(st_data_t key, st_data_t value, st_data_t _) {
   char *type = (char *)key;
   aggregation_entry_t *entry = (aggregation_entry_t *)value;
 
-  char message[4096];
-  sprintf(message, "newobj: type %s count %d\n",
-    type, entry->total);
-
-  rb_journalist_socket_send(message);
+  rb_journalist_socket_send(2,
+    "newobj",
+    "type",  's', type,
+    "total", 'i', entry->total
+  );
 
   st_foreach(entry->locations, journalist_allocations_send_locations, key);
   st_free_table(entry->locations);

data/ext/journalist/calls.c

@@ -5,17 +5,23 @@ static struct {
   VALUE c_return;
 } calls_tp_hook;
 
-// TODO: For now, a very basic counter. What we really want to do is keep around
-// the trace argument, and keep track of what's going on at all times (maybe
-// even benchmark how long calls take and only output the info on return.)
-static int stack_size = 0;
-
-const char c_call_fmt[] = "c_call: "
-  "class %s method %s class_method %d stack_depth %d "
-  "path %s line %d\n";
+static uint64_t call_times[MAX_CALLS] = {0};
+static int call_count = 0;
 
 static void
 journalist_on_call_c_call(VALUE tpval, void *data) {
+  call_times[call_count] = ru_utime_usec();
+  call_count++;
+}
+
+static void
+journalist_on_call_c_return(VALUE tpval, void *data) {
+  if(call_count == 0) return;
+  call_count--;
+
+  uint64_t diff = ru_utime_usec() - call_times[call_count];
+  if(diff < 250000) return;
+
   rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
 
   VALUE self      = rb_tracearg_self(tparg);
@@ -24,27 +30,16 @@ journalist_on_call_c_call(VALUE tpval, void *data) {
   VALUE lineno    = rb_tracearg_lineno(tparg);
   bool singleton  = TYPE(self) == T_CLASS || TYPE(self) == T_MODULE;
 
-  char buffer[4096];
-  sprintf(buffer,
-    c_call_fmt,
-    rb_obj_classname(self),
-    rb_id2name(SYM2ID(method_id)),
-    singleton,
-    stack_size,
-    RSTRING_PTR(path),
-    NUM2INT(lineno)
+  rb_journalist_socket_send(7,
+    "slow_cpu",
+    "class",        's', rb_obj_classname(self),
+    "method",       's', rb_id2name(SYM2ID(method_id)),
+    "class_method", 'b', singleton,
+    "stack_depth",  'i', call_count,
+    "path",         's', RSTRING_PTR(path),
+    "line",         'i', NUM2INT(lineno),
+    "diff",         't', diff
   );
-
-  rb_journalist_socket_send(buffer);
-  stack_size++;
-}
-
-static void
-journalist_on_call_c_return(VALUE tpval, void *data) {
-  if(stack_size == 0) return;
-
-  rb_journalist_socket_send("c_return\n");
-  stack_size--;
 }
 
 void

data/ext/journalist/calls.h

@@ -3,6 +3,8 @@
 
 #include "journalist.h"
 
+#define MAX_CALLS 32768
+
 void rb_journalist_calls_init();
 void rb_journalist_calls_start();
 void rb_journalist_calls_stop();

data/ext/journalist/extconf.rb

@@ -1,5 +1,7 @@
 require "mkmf"
 
+pkg_config('yajl')
+
 $CFLAGS << " -Wall -Werror -Wno-unused-parameter "
 
 create_makefile("journalist/journalist")

data/ext/journalist/garbage_collection.c

@@ -31,32 +31,23 @@ static VALUE sym_count,
   sym_oldmalloc_increase,
   sym_oldmalloc_limit;
 
-const char gc_end_sweep_fmt[] = "gc_end_sweep: "
-  "count %d heap_used %d heap_length %d heap_live_slot %d heap_free_slot %d "
-  "heap_final_slot %d heap_swept_slot %d total_allocated_object %d "
-  "total_freed_object %d malloc_increase %d malloc_limit %d "
-  "minor_gc_count %d major_gc_count %d remembered_shady_object %d "
-  "remembered_shady_object_limit %d old_object %d old_object_limit %d "
-  "oldmalloc_increase %d oldmalloc_limit %d\n";
-
 static void
 journalist_on_gc_start(VALUE tpval, void *data) {
-  rb_journalist_socket_send("gc_start\n");
+  rb_journalist_socket_send(0, "gc_start");
 }
 
 static void
 journalist_on_gc_end_mark(VALUE tpval, void *data) {
-  rb_journalist_socket_send("gc_mark\n");
+  rb_journalist_socket_send(0, "gc_mark");
 }
 
 static void
 journalist_on_gc_end_sweep(VALUE tpval, void *data) {
-  char buffer[4096];
   rb_gc_stat(cookie.gc);
 
-#define STAT(name) NUM2INT(rb_hash_aref(cookie.gc, sym_##name))
-  sprintf(buffer,
-    gc_end_sweep_fmt,
+#define STAT(name) #name, 'i', NUM2INT(rb_hash_aref(cookie.gc, sym_##name))
+  rb_journalist_socket_send(19,
+    "gc_end_sweep",
     STAT(count),
     STAT(heap_used),
     STAT(heap_length),
@@ -78,8 +69,6 @@ journalist_on_gc_end_sweep(VALUE tpval, void *data) {
     STAT(oldmalloc_limit)
   );
 #undef STAT
-
-  rb_journalist_socket_send(buffer);
 }
 
 void

data/ext/journalist/journalist.c

@@ -47,3 +47,11 @@ timeofday_usec() {
   return (uint64_t)tv.tv_sec*1e6 +
          (uint64_t)tv.tv_usec;
 }
+
+uint64_t
+ru_utime_usec() {
+  struct rusage r_usage;
+  getrusage(RUSAGE_SELF, &r_usage);
+  return (uint64_t)r_usage.ru_utime.tv_sec*1e6 +
+         (uint64_t)r_usage.ru_utime.tv_usec;
+}

data/ext/journalist/journalist.h

@@ -1,6 +1,7 @@
 #ifndef JOURNALIST_H
 #define JOURNALIST_H 1
 
+#include <inttypes.h>
 #include <pthread.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -16,5 +17,5 @@
 #include "socket.h"
 
 uint64_t timeofday_usec();
-
+uint64_t ru_utime_usec();
 #endif /* JOURNALIST_H */

data/ext/journalist/socket.c

@@ -5,8 +5,14 @@ static pthread_mutex_t sock_mutex = PTHREAD_MUTEX_INITIALIZER;
 FILE *journalist_file;
 static char journalist_file_path_fmt[] = "/tmp/journalist-%d";
 
+yajl_gen gen;
+
 void
 rb_journalist_socket_init() {
+
+  gen = yajl_gen_alloc(NULL);
+  yajl_gen_config(gen, yajl_gen_beautify, 0);
+
   pid_t pid = getpid();
 
   char path[1024];
@@ -21,11 +27,78 @@ rb_journalist_socket_init() {
 }
 
 void
-rb_journalist_socket_send(char *message) {
+rb_journalist_socket_send(int count, char *event, ...)
+{
   pthread_mutex_lock(&sock_mutex);
 
-  fwrite(message, sizeof(char), strlen(message), journalist_file);
+  yajl_gen_map_open(gen);
+
+  yajl_gen_string(gen, (const unsigned char *)"event", 5);
+  yajl_gen_string(gen, (const unsigned char *)event, strlen(event));
+
+  if(count > 0) {
+    va_list arguments;
+    va_start(arguments, event);
+
+    char   buf[32];
+    char  *key;
+    int    type;
+    size_t length;
+
+    char *string;
+    int  integer;
+    uint64_t uint64;
+
+    int i;
+
+    for(i = 0; i < count; i++) {
+      key  = va_arg(arguments, char *);
+      type = va_arg(arguments, int);
+
+      yajl_gen_string(gen, (const unsigned char *)key, strlen(key));
+
+      switch(type) {
+        case 's':
+          string = va_arg(arguments, char *);
+          length = strlen(string);
+
+          yajl_gen_string(gen, (const unsigned char *)string, length);
+          break;
+
+        case 'i':
+          integer = va_arg(arguments, int);
+          sprintf(buf, "%d", integer);
+          length = strlen(buf);
+
+          yajl_gen_number(gen, buf, length);
+          break;
+
+        case 'b':
+          yajl_gen_bool(gen, va_arg(arguments, int));
+          break;
+
+        case 't':
+          uint64 = va_arg(arguments, uint64_t);
+          sprintf(buf, "%" PRIu64, uint64);
+          length = strlen(buf);
+
+          yajl_gen_number(gen, buf, length);
+          break;
+      }
+    }
+  }
+
+  yajl_gen_map_close(gen);
+
+  const unsigned char *buffer;
+  size_t length;
+
+  yajl_gen_get_buf(gen, &buffer, &length);
+
+  fprintf(journalist_file, "%s\n", buffer);
   fflush(journalist_file);
 
+  yajl_gen_clear(gen);
+  yajl_gen_reset(gen, "");
   pthread_mutex_unlock(&sock_mutex);
 }

data/ext/journalist/socket.h

@@ -5,9 +5,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "yajl_gen.h"
+
 #include "journalist.h"
 
 void rb_journalist_socket_init();
-void rb_journalist_socket_send(char *message);
+void rb_journalist_socket_send(int count, char *event, ...);
 
 #endif /* SOCKET_H */

data/lib/journalist/version.rb

@@ -1,3 +1,3 @@
 module Journalist
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journalist
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andre Medeiros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler