memprof 0.1.2 → 0.1.3

data/ext/elf.c

@@ -2,10 +2,11 @@
 
 #include "bin_api.h"
 
-#include <stdio.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <link.h>
+#include <stdio.h>
+#include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
 
@@ -18,7 +19,14 @@ static Elf_Data *symtab_data = NULL;
 void *
 bin_allocate_page()
 {
-  return mmap(NULL, pagesize, PROT_WRITE|PROT_READ|PROT_EXEC, MAP_ANON|MAP_PRIVATE|MAP_32BIT, -1, 0);
+  void * ret = NULL;
+  ret = mmap(NULL, pagesize, PROT_WRITE|PROT_READ|PROT_EXEC, MAP_ANON|MAP_PRIVATE|MAP_32BIT, -1, 0);
+
+  if (ret != MAP_FAILED) {
+    memset(ret, 0x90, pagesize);
+  }
+
+  return ret;
 }
 
 void
@@ -32,15 +40,17 @@ bin_find_symbol(char *sym, size_t *size)
 {
   char *name = NULL;
 
-  /*now print the symbols*/
   ElfW(Sym) *esym = (ElfW(Sym)*) symtab_data->d_buf;
   ElfW(Sym) *lastsym = (ElfW(Sym)*) ((char*) symtab_data->d_buf + symtab_data->d_size);
-  /* now loop through the symbol table and print it*/
+
   for (; esym < lastsym; esym++){
+    /* ignore weak/numeric/empty symbols */
     if ((esym->st_value == 0) ||
         (ELF32_ST_BIND(esym->st_info)== STB_WEAK) ||
         (ELF32_ST_BIND(esym->st_info)== STB_NUM))
       continue;
+
+
     name = elf_strptr(elf, symtab_shdr.sh_link, (size_t)esym->st_name);
     if (strcmp(name, sym) == 0) {
       if (size) {
@@ -78,7 +88,7 @@ bin_init()
   if (elf_kind(elf) != ELF_K_ELF)
     errx(EX_DATAERR, "%s is not an ELF object.", filename);
 
-  if (elf_getshstrndx(elf, &shstrndx) == 0)
+  if (elf_getshdrstrndx(elf, &shstrndx) == -1)
     errx(EX_SOFTWARE, "getshstrndx() failed: %s.",
         elf_errmsg(-1));
 

data/ext/extconf.rb

@@ -7,12 +7,66 @@ if RUBY_VERSION >= "1.9"
 end
 
 require 'mkmf'
+require 'fileutils'
+
+CWD = File.expand_path(File.dirname(__FILE__))
+
+def sys(cmd)
+  puts "  -- #{cmd}"
+  unless ret = xsystem(cmd)
+    raise "#{cmd} failed, please report to http://github.com/ice799/memprof/issues with pastie.org link to #{CWD}/mkmf.log"
+  end
+  ret
+end
 
 def add_define(name)
   $defs.push("-D#{name}")
 end
 
-if (add_define("HAVE_ELF") if have_library('elf', 'gelf_getshdr')) ||
-  (add_define("HAVE_MACH") if have_header('mach-o/dyld.h'))
+###
+# libelf
+
+if RUBY_PLATFORM =~ /linux/
+  libelf = File.basename('libelf-0.8.13.tar.gz')
+  dir = File.basename(libelf, '.tar.gz')
+
+  unless File.exists?("#{CWD}/dst/lib/libelf_ext.so")
+    puts "(I'm about to compile libelf.. this will definitely take a while)"
+
+    Dir.chdir('src') do
+      FileUtils.rm_rf(dir) if File.exists?(dir)
+
+      sys("tar zxvf #{libelf}")
+      Dir.chdir(dir) do
+        sys("./configure --prefix=#{CWD}/dst")
+        sys("make")
+        sys("make install")
+      end
+    end
+
+    Dir.chdir('dst/lib') do
+      FileUtils.ln_s 'libelf.so', 'libelf_ext.so'
+    end
+  end
+
+  $LIBPATH.unshift "#{CWD}/dst/lib"
+  $INCFLAGS[0,0] = "-I#{CWD}/dst/include "
+
+  unless have_library('elf', 'gelf_getshdr')
+    raise 'libelf build failed'
+  end
+
+  is_elf = true
+  add_define 'HAVE_ELF'
+end
+
+if have_header('mach-o/dyld')
+  is_macho = true
+  add_define 'HAVE_MACH'
+end
+
+if is_elf or is_macho
   create_makefile('memprof')
+else
+  raise 'unsupported platform'
 end

data/ext/mach.c

@@ -3,6 +3,7 @@
 #include "bin_api.h"
 
 #include <limits.h>
+#include <string.h>
 #include <sysexits.h>
 #include <sys/mman.h>
 
@@ -43,11 +44,13 @@ bin_allocate_page()
   size_t i = 0;
 
   for (i = pagesize; i < INT_MAX - pagesize; i += pagesize) {
-    ret = mmap((void*)(NULL + i), 2*pagesize, PROT_WRITE|PROT_READ|PROT_EXEC,
+    ret = mmap((void*)(NULL + i), pagesize, PROT_WRITE|PROT_READ|PROT_EXEC,
                MAP_ANON|MAP_PRIVATE, -1, 0);
 
-    if (tramp_table != MAP_FAILED)
+    if (tramp_table != MAP_FAILED) {
+      memset(tramp_table, 0x90, pagesize);
       return ret;
+    }
   }
   return NULL;
 }

data/ext/memprof.c

@@ -102,6 +102,7 @@ objs_free(st_data_t key, st_data_t record, st_data_t arg)
 {
   struct obj_track *tracker = (struct obj_track *)record;
   free(tracker->source);
+  free(tracker);
   return ST_DELETE;
 }
 
@@ -150,7 +151,7 @@ struct results {
 };
 
 static int
-memprof_do_dump(st_data_t key, st_data_t record, st_data_t arg)
+objs_to_array(st_data_t key, st_data_t record, st_data_t arg)
 {
   struct results *res = (struct results *)arg;
   unsigned long count = (unsigned long)record;
@@ -200,6 +201,9 @@ memprof_stats(int argc, VALUE *argv, VALUE self)
   VALUE str;
   FILE *out = NULL;
 
+  if (!track_objs)
+    rb_raise(rb_eRuntimeError, "object tracking disabled, call Memprof.start first");
+
   rb_scan_args(argc, argv, "01", &str);
 
   if (RTEST(str)) {
@@ -216,10 +220,11 @@ memprof_stats(int argc, VALUE *argv, VALUE self)
   res.num_entries = 0;
   res.entries = malloc(sizeof(char*) * tmp_table->num_entries);
 
-  st_foreach(tmp_table, memprof_do_dump, (st_data_t)&res);
+  st_foreach(tmp_table, objs_to_array, (st_data_t)&res);
   st_free_table(tmp_table);
 
   qsort(res.entries, res.num_entries, sizeof(char*), &memprof_strcmp);
+
   for (i=0; i < res.num_entries; i++) {
     fprintf(out ? out : stderr, "%s\n", res.entries[i]);
     free(res.entries[i]);
@@ -254,7 +259,8 @@ memprof_track(int argc, VALUE *argv, VALUE self)
 static void
 create_tramp_table()
 {
-  int i, j = 0;
+  int i = 0;
+  void *region = NULL;
 
   struct tramp_tbl_entry ent = {
     .rbx_save      = {'\x53'},                // push rbx
@@ -291,22 +297,20 @@ create_tramp_table()
     .jmp_displacement = 0,
   };
 
-  if ((tramp_table = bin_allocate_page()) == MAP_FAILED) {
-    fprintf(stderr, "Failed to allocate memory for stage 1 trampoline.\n");
+  if ((region = bin_allocate_page()) == MAP_FAILED) {
+    fprintf(stderr, "Failed to allocate memory for stage 1 trampolines.\n");
     return;
   }
 
-  if ((inline_tramp_table = bin_allocate_page()) == MAP_FAILED) {
-    fprintf(stderr, "Faied to allocate memory for the stage 1 inline trampoline.\n");
-    return;
-  }
+  tramp_table = region;
+  inline_tramp_table = region + pagesize/2;
 
-  for (j = 0; j < pagesize/sizeof(struct tramp_tbl_entry); j ++ ) {
-    memcpy(tramp_table + j, &ent, sizeof(struct tramp_tbl_entry));
+  for (i = 0; i < (pagesize/2)/sizeof(struct tramp_tbl_entry); i++) {
+    memcpy(tramp_table + i, &ent, sizeof(struct tramp_tbl_entry));
   }
 
-  for (j = 0; j < pagesize/sizeof(struct inline_tramp_tbl_entry); j++) {
-    memcpy(inline_tramp_table + j, &inline_ent, sizeof(struct inline_tramp_tbl_entry));
+  for (i = 0; i < (pagesize/2)/sizeof(struct inline_tramp_tbl_entry); i++) {
+    memcpy(inline_tramp_table + i, &inline_ent, sizeof(struct inline_tramp_tbl_entry));
   }
 }
 

data/memprof.gemspec

@@ -1,13 +1,13 @@
 spec = Gem::Specification.new do |s|
   s.name = 'memprof'
-  s.version = '0.1.2'
-  s.date = '2009-12-10'
+  s.version = '0.1.3'
+  s.date = '2009-12-14'
   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"
   s.homepage = "http://github.com/ice799/memprof"
   s.has_rdoc = false
-  s.authors = ["Joe Damato"]
+  s.authors = ["Joe Damato", "Aman Gupta", "Jake Douglas"]
   s.extensions = "ext/extconf.rb"
   s.files = %w[
     .gitignore
@@ -17,6 +17,7 @@ spec = Gem::Specification.new do |s|
     ext/extconf.rb
     ext/mach.c
     ext/memprof.c
+    ext/src/libelf-0.8.13.tar.gz
     memprof.gemspec
   ]
 end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: memprof
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joe Damato
+- Aman Gupta
+- Jake Douglas
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -08:00
+date: 2009-12-14 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +31,7 @@ files:
 - ext/extconf.rb
 - ext/mach.c
 - ext/memprof.c
+- ext/src/libelf-0.8.13.tar.gz
 - memprof.gemspec
 has_rdoc: true
 homepage: http://github.com/ice799/memprof