journalist 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db826c70d439a2ee0ad1e9f9f67dfd8b6209471
-  data.tar.gz: ce108b771e21a517521b19efec110a6a1b81a935
+  metadata.gz: 20db52670ef27ceb9997cad3ec0549694690276d
+  data.tar.gz: d0174b59664d9edede7a79aa7e4704acc2ef975f
 SHA512:
-  metadata.gz: f49a58bff0124333d6a4fa06b5a3dcfa888aa5d94e493de4d8544dd750d3d8590090923e707932278fb701e704b7ded55c48e4cd8e3645abc0a689bc29b46c12
-  data.tar.gz: 3000484d221a0bbe164902f6290cfc3bf8900f55e938f14691e2be5a67773ee139a5988ec2ccb29d3337d29049c2c4218a14dfed6554d1710e2e48c856697ca2
+  metadata.gz: 6cdc6dfc98d9ebfa1df021b5b72a53b723ac7dee90bcdaf77ae7583d1099e29746ad834423157201eed852dcfa1d9930ac878cd3081f296e1a0ccb60843aa226
+  data.tar.gz: 8768347c02d4d2e3d7604409388a2d06194ad849f1107f4fe88ddafb0b6acff5f365460212e5799de9518fd3411e89778ee086032ef1962fb51bba6ba8493f3b

data/README.md

@@ -32,10 +32,11 @@ There are a lot of limitations right now, such as this only working for one proc
 
 ## TODO
 
-- [ ] Finish call/return tracepoints
-- [ ] Implement allocation tracepoints
-- [ ] Implement msgpack serialization
+- [X] Finish call/return tracepoints
+- [X] Implement allocation tracepoints
 - [ ] Implement command and stream sockets
+- [ ] Implement msgpack serialization
+- [ ] Implement event aggregation
 - [ ] Build GUI
 
 ## Contributing

data/Rakefile

@@ -5,3 +5,5 @@ require "rake/extensiontask"
 Rake::ExtensionTask.new("journalist") do |ext|
   ext.lib_dir = "lib/journalist"
 end
+
+task default: [:clobber, :compile]

data/ext/journalist/allocations.c

@@ -0,0 +1,168 @@
+#include "allocations.h"
+
+#include "calls.h"
+
+static struct {
+  VALUE newobj;
+  VALUE freeobj;
+} allocations_tp_hook;
+
+static struct {
+  int       total;
+  st_table *allocations;
+  uint64_t  last_sent_at;
+} aggregation;
+
+typedef struct aggregation_entry_s {
+  int        total;
+  st_table  *locations;
+} aggregation_entry_t;
+
+static pthread_mutex_t alloc_mutex;
+static pthread_t       alloc_observer;
+
+static void
+journalist_on_newobj(VALUE tpval, void *data) {
+  rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
+
+  VALUE path   = rb_tracearg_path(tparg);
+  VALUE lineno = rb_tracearg_lineno(tparg);
+  VALUE obj    = rb_tracearg_object(tparg);
+
+  // Initialize key strings for object type and file/line pair
+  char *type_key = strdup(rb_obj_classname(obj));
+  char *loc_key  = malloc(4096 * sizeof(char));
+  sprintf(loc_key, "%s:%d", RSTRING_PTR(path), NUM2INT(lineno));
+
+  // Start by looking up an entry.
+  int lookup;
+  aggregation_entry_t *entry = NULL;
+  st_data_t entry_lookup;
+
+  pthread_mutex_lock(&alloc_mutex);
+
+  lookup = st_lookup(aggregation.allocations, (st_data_t)type_key, &entry_lookup);
+
+  if(!lookup) {
+    // If it doesn't exist, allocate memory for one and initialize it.
+    entry = malloc(sizeof(aggregation_entry_t));
+    entry->locations = st_init_strtable_with_size(64);
+    entry->total = 0;
+
+    st_insert(aggregation.allocations, (st_data_t)strdup(type_key), (st_data_t)entry);
+  } else {
+    // If it does exist, get the address.
+    entry = (aggregation_entry_t *)entry_lookup;
+  }
+
+  entry->total++;
+
+  // Get or initialize the allocations for
+  int file_allocations = 0;
+  lookup = st_lookup(entry->locations, (st_data_t)loc_key, (st_data_t *)&file_allocations);
+
+  if(!lookup) file_allocations = 0;
+  file_allocations++;
+
+  st_insert(entry->locations, (st_data_t)strdup(loc_key), (st_data_t)file_allocations);
+
+  aggregation.total++;
+
+  pthread_mutex_unlock(&alloc_mutex);
+
+  free(type_key);
+  free(loc_key);
+}
+
+static void
+journalist_on_freeobj(VALUE tpval, void *data) {
+  // rb_journalist_socket_send("freeobj\n");
+}
+
+static int
+journalist_allocations_send_locations(st_data_t key, st_data_t value, st_data_t data) {
+  char *type     = (char *)data;
+  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);
+
+  return ST_CONTINUE;
+}
+
+static int
+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);
+
+  st_foreach(entry->locations, journalist_allocations_send_locations, key);
+  st_free_table(entry->locations);
+
+  free(entry);
+
+  return ST_CONTINUE;
+}
+
+void *
+journalist_allocations_observer(void *threadid) {
+  uint64_t current_time, last_sent_ago;
+  do {
+    current_time = timeofday_usec();
+    last_sent_ago = current_time - aggregation.last_sent_at;
+
+    pthread_mutex_lock(&alloc_mutex);
+    if((last_sent_ago > 500000 && aggregation.total > 0) || aggregation.total > 100000) {
+      // Iterate through the table.
+      st_foreach(aggregation.allocations, journalist_allocations_send_types, 0);
+
+      // Clear data.
+      st_clear(aggregation.allocations);
+      aggregation.total = 0;
+      aggregation.last_sent_at = current_time;
+    }
+
+    pthread_mutex_unlock(&alloc_mutex);
+    usleep(500000);
+  } while(1);
+
+  return 0;
+}
+
+void
+rb_journalist_allocations_init() {
+  allocations_tp_hook.newobj  = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ,  journalist_on_newobj,  0);
+  allocations_tp_hook.freeobj = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_FREEOBJ, journalist_on_freeobj, 0);
+
+  rb_gc_register_address(&allocations_tp_hook.newobj);
+  rb_gc_register_address(&allocations_tp_hook.freeobj);
+
+  aggregation.total = 0;
+  aggregation.allocations = st_init_strtable_with_size(1024);
+  aggregation.last_sent_at  = timeofday_usec();
+
+  pthread_mutex_init(&alloc_mutex, 0);
+}
+
+void
+rb_journalist_allocations_start() {
+  rb_tracepoint_enable(allocations_tp_hook.newobj);
+  rb_tracepoint_enable(allocations_tp_hook.freeobj);
+
+  pthread_create(&alloc_observer, 0, journalist_allocations_observer, 0);
+}
+
+void
+rb_journalist_allocations_stop() {
+  rb_tracepoint_disable(allocations_tp_hook.newobj);
+  rb_tracepoint_disable(allocations_tp_hook.freeobj);
+}

data/ext/journalist/allocations.h

@@ -0,0 +1,10 @@
+#ifndef ALLOCATIONS_H
+#define ALLOCATIONS_H 1
+
+#include "journalist.h"
+
+void rb_journalist_allocations_init();
+void rb_journalist_allocations_start();
+void rb_journalist_allocations_stop();
+
+#endif /* ALLOCATIONS_H */

data/ext/journalist/calls.c

@@ -11,7 +11,7 @@ static struct {
 static int stack_size = 0;
 
 const char c_call_fmt[] = "c_call: "
-  "class %s method: %s class_method %d stack_depth %d "
+  "class %s method %s class_method %d stack_depth %d "
   "path %s line %d\n";
 
 static void
@@ -22,15 +22,14 @@ journalist_on_call_c_call(VALUE tpval, void *data) {
   VALUE method_id = rb_tracearg_method_id(tparg);
   VALUE path      = rb_tracearg_path(tparg);
   VALUE lineno    = rb_tracearg_lineno(tparg);
-
-  bool instance   = TYPE(self) == T_CLASS || TYPE(self) == T_MODULE;
+  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)),
-    instance,
+    singleton,
     stack_size,
     RSTRING_PTR(path),
     NUM2INT(lineno)

data/ext/journalist/journalist.c

@@ -8,12 +8,14 @@ rb_journalist_init() {
 
   rb_journalist_gc_init();
   rb_journalist_calls_init();
+  rb_journalist_allocations_init();
 }
 
 static VALUE
 journalist_start(VALUE klass) {
   rb_journalist_gc_start();
   rb_journalist_calls_start();
+  rb_journalist_allocations_start();
 
   return Qtrue;
 }
@@ -22,6 +24,7 @@ static VALUE
 journalist_stop(VALUE klass) {
   rb_journalist_gc_stop();
   rb_journalist_calls_stop();
+  rb_journalist_allocations_stop();
 
   return Qtrue;
 }
@@ -36,3 +39,11 @@ Init_journalist(void)
 
   rb_journalist_init();
 }
+
+uint64_t
+timeofday_usec() {
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+  return (uint64_t)tv.tv_sec*1e6 +
+         (uint64_t)tv.tv_usec;
+}

data/ext/journalist/journalist.h

@@ -1,13 +1,20 @@
 #ifndef JOURNALIST_H
 #define JOURNALIST_H 1
 
+#include <pthread.h>
 #include <stdbool.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <time.h>
 
 #include "ruby.h"
 #include "ruby/debug.h"
 
+#include "allocations.h"
 #include "calls.h"
 #include "garbage_collection.h"
 #include "socket.h"
 
+uint64_t timeofday_usec();
+
 #endif /* JOURNALIST_H */

data/ext/journalist/socket.c

@@ -1,15 +1,31 @@
 #include "socket.h"
 
+static pthread_mutex_t sock_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 FILE *journalist_file;
-static char journalist_file_path[] = "/tmp/journalist";
+static char journalist_file_path_fmt[] = "/tmp/journalist-%d";
 
 void
 rb_journalist_socket_init() {
-  journalist_file = fopen(journalist_file_path, "w");
+  pid_t pid = getpid();
+
+  char path[1024];
+  snprintf(
+    path,
+    1024,
+    journalist_file_path_fmt,
+    pid
+  );
+
+  journalist_file = fopen(path, "w");
 }
 
 void
 rb_journalist_socket_send(char *message) {
+  pthread_mutex_lock(&sock_mutex);
+
   fwrite(message, sizeof(char), strlen(message), journalist_file);
   fflush(journalist_file);
+
+  pthread_mutex_unlock(&sock_mutex);
 }

data/ext/journalist/socket.h

@@ -1,14 +1,13 @@
-#ifndef ASDASDASD
-#define ASDASDASD 1
+#ifndef SOCKET_H
+#define SOCKET_H 1
 
-#include <stdio.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "journalist.h"
+
 void rb_journalist_socket_init();
 void rb_journalist_socket_send(char *message);
 
-#endif /* ASDASDASD */
+#endif /* SOCKET_H */

data/lib/journalist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journalist
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andre Medeiros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/journalist/allocations.c
+- ext/journalist/allocations.h
 - ext/journalist/calls.c
 - ext/journalist/calls.h
 - ext/journalist/extconf.rb