memprof 0.2.0 → 0.2.1

data/ext/arch.h

@@ -15,7 +15,7 @@
 void *
 arch_get_st2_tramp(size_t *size);
 
-void
+int
 arch_insert_st1_tramp(void *start, void *trampee, void *tramp);
 
 /*
@@ -27,4 +27,7 @@ arch_get_inline_st2_tramp(size_t *size);
 int
 arch_insert_inline_st2_tramp(void *addr, void *marker, void *trampoline, void *table_entry);
 
+void
+arch_overwrite_got(void *plt, void *tramp);
+
 #endif

data/ext/elf.c

@@ -5,6 +5,7 @@
 
 #include <dwarf.h>
 #include <err.h>
+#include <error.h>
 #include <fcntl.h>
 #include <libdwarf.h>
 #include <libelf/gelf.h>
@@ -102,7 +103,6 @@ find_got_addr(char *symname, void *cookie)
   }
 
   for (i = 0; i < info->relplt_count; ++i) {
-    GElf_Rel rel;
     GElf_Rela rela;
     GElf_Sym sym;
     GElf_Addr addr;
@@ -169,9 +169,13 @@ bin_update_image(int entry, char *trampee, struct tramp_st2_entry *tramp)
     unsigned char *byte = ruby_info->text_segment;
     trampee_addr = bin_find_symbol(trampee, NULL);
     size_t count = 0;
+    int num = 0;
 
     for(; count < ruby_info->text_segment_len; byte++, count++) {
-      arch_insert_st1_tramp(byte, trampee_addr, tramp);
+      if (arch_insert_st1_tramp(byte, trampee_addr, tramp)) {
+        // printf("tramped %x\n", byte);
+        num++;
+      }
     }
   } else {
     trampee_addr = find_got_addr(trampee, NULL);
@@ -427,7 +431,6 @@ dissect_elf(struct elf_info *info)
 {
   size_t shstrndx = 0;
   Elf *elf = info->elf;
-  ElfW(Dyn) *dyn;
   Elf_Scn *scn = NULL;
   GElf_Shdr shdr;
   size_t j = 0;
@@ -535,7 +538,7 @@ bin_init()
 {
   Dwarf_Error dwrf_err;
 
-  ruby_info = malloc(sizeof(*ruby_info));
+  ruby_info = calloc(1, sizeof(*ruby_info));
 
   if (!ruby_info)
     return;

data/ext/extconf.rb

@@ -30,7 +30,7 @@ end
 ###
 # yajl
 
-yajl = File.basename('yajl-1.0.8.tar.gz')
+yajl = File.basename('yajl-1.0.9.tar.gz')
 dir = File.basename(yajl, '.tar.gz')
 
 unless File.exists?("#{CWD}/dst/lib/libyajl_ext.a")
@@ -148,8 +148,11 @@ if have_header('mach-o/dyld')
 end
 
 arch = RUBY_PLATFORM[/(.*)-linux/,1]
-if arch == 'universal'
+case arch
+when "universal"
   arch = 'x86_64'
+when 'i486'
+  arch = 'i386'
 end
 add_define "_ARCH_#{arch}_"
 

data/ext/memprof.c

@@ -1,4 +1,9 @@
+#include <ruby.h>
+
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
+
 #include <err.h>
 #include <fcntl.h>
 #include <stddef.h>
@@ -11,13 +16,13 @@
 #include <err.h>
 
 #include <st.h>
-#include <ruby.h>
 #include <intern.h>
 #include <node.h>
 
 #include "arch.h"
 #include "bin_api.h"
 
+
 size_t pagesize;
 
 /*
@@ -51,7 +56,7 @@ newobj_tramp()
   VALUE ret = rb_newobj();
   struct obj_track *tracker = NULL;
 
-  if (track_objs) {
+  if (track_objs && objs) {
     tracker = malloc(sizeof(*tracker));
 
     if (tracker) {
@@ -67,7 +72,9 @@ newobj_tramp()
       }
 
       tracker->obj = ret;
+      rb_gc_disable();
       st_insert(objs, (st_data_t)ret, (st_data_t)tracker);
+      rb_gc_enable();
     } else {
       fprintf(stderr, "Warning, unable to allocate a tracker. You are running dangerously low on RAM!\n");
     }
@@ -80,7 +87,7 @@ static void
 freelist_tramp(unsigned long rval)
 {
   struct obj_track *tracker = NULL;
-  if (track_objs) {
+  if (track_objs && objs) {
     st_delete(objs, (st_data_t *) &rval, (st_data_t *) &tracker);
     if (tracker) {
       free(tracker->source);
@@ -285,7 +292,7 @@ yajl_gen_status
 yajl_gen_value(yajl_gen gen, VALUE obj)
 {
   if (FIXNUM_P(obj))
-    return yajl_gen_integer(gen, FIX2INT(obj));
+    return yajl_gen_integer(gen, NUM2LONG(obj));
   else if (NIL_P(obj) || obj == Qundef)
     return yajl_gen_null(gen);
   else if (obj == Qtrue)
@@ -305,8 +312,10 @@ each_hash_entry(st_data_t key, st_data_t record, st_data_t arg)
   VALUE k = (VALUE)key;
   VALUE v = (VALUE)record;
 
+  yajl_gen_array_open(gen);
   yajl_gen_value(gen, k);
   yajl_gen_value(gen, v);
+  yajl_gen_array_close(gen);
 
   return ST_CONTINUE;
 }
@@ -317,8 +326,9 @@ each_ivar(st_data_t key, st_data_t record, st_data_t arg)
   yajl_gen gen = (yajl_gen)arg;
   ID id = (ID)key;
   VALUE val = (VALUE)record;
+  const char *name = rb_id2name(id);
 
-  yajl_gen_cstr(gen, rb_id2name(id));
+  yajl_gen_cstr(gen, name ? name : "(none)");
   yajl_gen_value(gen, val);
 
   return ST_CONTINUE;
@@ -376,7 +386,7 @@ obj_dump(VALUE obj, yajl_gen gen)
   int type;
   yajl_gen_map_open(gen);
 
-  yajl_gen_cstr(gen, "address");
+  yajl_gen_cstr(gen, "_id");
   yajl_gen_value(gen, obj);
 
   struct obj_track *tracker = NULL;
@@ -632,9 +642,11 @@ obj_dump(VALUE obj, yajl_gen gen)
 
       if (hash->tbl && hash->tbl->num_entries) {
         yajl_gen_cstr(gen, "data");
-        yajl_gen_map_open(gen);
+        //yajl_gen_map_open(gen);
+        yajl_gen_array_open(gen);
         st_foreach(hash->tbl, each_hash_entry, (st_data_t)gen);
-        yajl_gen_map_close(gen);
+        yajl_gen_array_close(gen);
+        //yajl_gen_map_close(gen);
       }
       break;
 
@@ -659,7 +671,11 @@ void
 json_print(void *ctx, const char * str, unsigned int len)
 {
   FILE *out = (FILE *)ctx;
-  fwrite(str, sizeof(char), len, out ? out : stdout);
+  size_t written = 0;
+  while(1) {
+    written += fwrite(str + written, sizeof(char), len - written, out ? out : stdout);
+    if (written == len) break;
+  }
 }
 
 static VALUE
@@ -723,12 +739,12 @@ memprof_dump_all(int argc, VALUE *argv, VALUE self)
       rb_raise(rb_eArgError, "unable to open output file");
   }
 
-  yajl_gen_config conf = { .beautify = 1, .indentString = "  " };
+  yajl_gen_config conf = { .beautify = 0, .indentString = "  " };
   yajl_gen gen = yajl_gen_alloc2((yajl_print_t)&json_print, &conf, NULL, (void*)out);
 
   track_objs = 0;
 
-  yajl_gen_array_open(gen);
+  //yajl_gen_array_open(gen);
 
   for (i=0; i < heaps_used; i++) {
     p = *(char**)(heaps + (i * sizeof_heaps_slot) + offset_slot);
@@ -736,14 +752,21 @@ memprof_dump_all(int argc, VALUE *argv, VALUE self)
     pend = p + (sizeof_RVALUE * limit);
 
     while (p < pend) {
-      if (RBASIC(p)->flags)
+      if (RBASIC(p)->flags) {
         obj_dump((VALUE)p, gen);
+        // XXX ugh
+        yajl_gen_clear(gen);
+        yajl_gen_free(gen);
+        gen = yajl_gen_alloc2((yajl_print_t)&json_print, &conf, NULL, (void*)out);
+        while(fputc('\n', out ? out : stdout) == EOF);
+      }
 
       p += sizeof_RVALUE;
     }
   }
 
-  yajl_gen_array_close(gen);
+  //yajl_gen_array_close(gen);
+  yajl_gen_clear(gen);
   yajl_gen_free(gen);
 
   if (out)
@@ -846,10 +869,8 @@ static void
 insert_tramp(char *trampee, void *tramp)
 {
   void *trampee_addr = bin_find_symbol(trampee, NULL);
-  void *plt_addr = NULL;
   int entry = tramp_size;
   int inline_ent = inline_tramp_size;
-  void *info;
 
   if (trampee_addr == NULL) {
     if (strcmp("add_freelist", trampee) == 0) {

data/ext/x86_64.h

@@ -8,18 +8,26 @@
  * This is the "normal" stage 2 trampoline with a default entry pre-filled
  */
 static struct tramp_st2_entry {
-  unsigned char rbx_save;
+  unsigned char push_rbx;
+  unsigned char push_rbp;
+  unsigned char save_rsp[3];
+  unsigned char align_rsp[4];
   unsigned char mov[2];
   void *addr;
   unsigned char call[2];
+  unsigned char leave;
   unsigned char rbx_restore;
   unsigned char ret;
 } __attribute__((__packed__)) default_st2_tramp = {
-  .rbx_save      = 0x53,                // push rbx
+  .push_rbx      = 0x53,                // push rbx
+  .push_rbp      = 0x55,                // push rbp
+  .save_rsp      = {0x48, 0x89, 0xe5},  // mov rsp, rbp
+  .align_rsp     = {0x48, 0x83, 0xe4, 0xf0}, // andl ~0x1, rsp
   .mov           = {'\x48', '\xbb'},    // mov addr into rbx
   .addr          = 0,                   // ^^^
-  .call         = {'\xff', '\xd3'},     // call rbx
+  .call          = {'\xff', '\xd3'},    // call rbx
   .rbx_restore   = 0x5b,                // pop rbx
+  .leave         = 0xc9,                // leave
   .ret           = 0xc3,                // ret
 };
 

data/ext/x86_gen.h

@@ -45,7 +45,7 @@ copy_instructions(void *to, void *from, size_t count)
   mprotect(start, len, PROT_READ | PROT_EXEC); \
 } while (0)
 
-void
+int
 arch_insert_st1_tramp(void *start, void *trampee, void *tramp)
 {
   int32_t fn_addr = 0;
@@ -58,10 +58,11 @@ arch_insert_st1_tramp(void *start, void *trampee, void *tramp)
       WRITE_INSTRUCTIONS(aligned_addr,
                          ((void *)&(check->displacement) - aligned_addr) + 10,
                          (check->displacement = (tramp - (void *)(check + 1))));
+      return 1;
     }
   }
 
-  return;
+  return 0;
 }
 
 static void *

data/memprof.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'memprof'
-  s.version = '0.2.0'
-  s.date = '2009-12-14'
+  s.version = '0.2.1'
+  s.date = '2010-02-20'
   s.summary = 'Ruby Memory Profiler'
   s.description = "Ruby memory profiler similar to bleak_house, but without patches to the Ruby VM"
   s.email = "ice799@gmail.com"
@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
     ext/memprof.c
     ext/src/libdwarf-20091118.tar.gz
     ext/src/libelf-0.8.13.tar.gz
-    ext/src/yajl-1.0.8.tar.gz
+    ext/src/yajl-1.0.9.tar.gz
     ext/x86_64.c
     ext/x86_64.h
     ext/x86_gen.h

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memprof
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Joe Damato
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -08:00
+date: 2010-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -36,7 +36,7 @@ files:
 - ext/memprof.c
 - ext/src/libdwarf-20091118.tar.gz
 - ext/src/libelf-0.8.13.tar.gz
-- ext/src/yajl-1.0.8.tar.gz
+- ext/src/yajl-1.0.9.tar.gz
 - ext/x86_64.c
 - ext/x86_64.h
 - ext/x86_gen.h