memprof 0.3.5 → 0.3.6

data/ext/elf.c

@@ -60,8 +60,6 @@ struct elf_info {
   size_t plt_size;
   size_t plt_count;
 
-  GElf_Addr debuglink_addr;
-  size_t debuglink_sz;
   Elf_Data *debuglink_data;
 
   GElf_Ehdr ehdr;
@@ -1135,17 +1133,14 @@ dissect_elf(struct elf_info *info, int find_debug)
       if (strcmp(elf_strptr(elf, shstrndx, shdr.sh_name), ".plt") == 0) {
         info->plt_addr = shdr.sh_addr;
       } else if (strcmp(elf_strptr(elf, shstrndx, shdr.sh_name), ".gnu_debuglink") == 0) {
-        info->debuglink_addr = shdr.sh_addr;
-        info->debuglink_sz = shdr.sh_size;
-        dbg_printf("address: %lx, size: %zd\n", shdr.sh_addr, shdr.sh_size);
-
-       if ((info->debuglink_data = elf_getdata(scn, NULL)) == NULL ||
-           info->debuglink_data->d_size == 0) {
+        dbg_printf("gnu_debuglink section found\n", shdr.sh_size);
+        if ((info->debuglink_data = elf_getdata(scn, NULL)) == NULL ||
+             info->debuglink_data->d_size == 0) {
           dbg_printf(".gnu_debuglink section existed, but wasn't readable.\n");
           ret = 2;
           goto out;
-       }
-       dbg_printf("size: %zd\n", shdr.sh_size);
+        }
+        dbg_printf("gnu_debuglink section read (size: %zd)\n", shdr.sh_size);
       }
     }
     /*
@@ -1165,7 +1160,11 @@ dissect_elf(struct elf_info *info, int find_debug)
 
   /* If this object has no symbol table there's nothing else to do but fail */
   if (!info->symtab_data) {
-    dbg_printf("binary is stripped. memprof only works on binaries that are not stripped!\n");
+    if (info->debuglink_data) {
+      dbg_printf("binary is stripped, but there is debug symbol information. memprof will try to read debug symbols in.\n");
+    } else {
+      dbg_printf("binary is stripped, and no debug symbol info was found. memprof only works on binaries that are not stripped!\n");
+    }
     ret = 1;
   }
 
@@ -1195,10 +1194,10 @@ dissect_elf(struct elf_info *info, int find_debug)
 
 out:
   if (find_debug && ret == 1) {
-    if (info->debuglink_addr) {
+    if (info->debuglink_data) {
       find_debug_syms(info);
     } else {
-      dbg_printf("=== WARNING: Object %s was STRIPPED and had no debuglink section. Nothing left to try.", info->filename);
+      dbg_printf("=== WARNING: Object %s was STRIPPED and had no debuglink section. Nothing left to try.\n", info->filename);
     }
   }
   return ret;

data/lib/memprof/middleware.rb

@@ -1,8 +1,9 @@
 require File.expand_path('../../memprof', __FILE__)
 module Memprof
   class Middleware
-    def initialize(app)
+    def initialize(app, opts = {})
       @app = app
+      @options = opts
     end
     def call(env)
       ret = nil

data/memprof.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'memprof'
-  s.version = '0.3.5'
+  s.version = '0.3.6'
   s.date = '2010-04-13'
   s.summary = 'Ruby Memory Profiler'
   s.description = "Ruby memory profiler similar to bleak_house, but without patches to the Ruby VM"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memprof
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Joe Damato
@@ -17,16 +18,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -04:00
+date: 2010-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -38,9 +41,11 @@ dependencies:
   name: term-ansicolor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -109,23 +114,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Memory Profiler