memprof 0.2.9 → 0.3.0

data/ext/tramp.c

@@ -123,7 +123,7 @@ hook_freelist(int entry, void *tramp)
 void
 insert_tramp(const char *trampee, void *tramp)
 {
-  void *trampee_addr = bin_find_symbol(trampee, NULL);
+  void *trampee_addr = bin_find_symbol(trampee, NULL, 0);
   int inline_ent = inline_tramp_size;
 
   if (trampee_addr == NULL) {
@@ -136,7 +136,7 @@ insert_tramp(const char *trampee, void *tramp)
     }
   } else {
     tramp_table[tramp_size].addr = tramp;
-    if (bin_update_image(trampee, &tramp_table[tramp_size]) != 0)
+    if (bin_update_image(trampee, &tramp_table[tramp_size], NULL) != 0)
       errx(EX_SOFTWARE, "Failed to insert tramp for %s", trampee);
     tramp_size++;
   }

data/ext/util.c

@@ -3,6 +3,7 @@
  * information and a checksum.
  */
 #include <stdlib.h>
+#include <util.h>
 /*   !!!! DO NOT MODIFY THIS FUNCTION !!!!
  *   TODO create specs for this!
  */

data/ext/util.h

@@ -13,20 +13,52 @@
 struct memprof_config {
   void *gc_sweep;
   size_t gc_sweep_size;
+
   void *finalize_list;
   size_t finalize_list_size;
+
   void *rb_gc_force_recycle;
   size_t rb_gc_force_recycle_size;
+
   void *freelist;
   void *classname;
   void *add_freelist;
+  void *timeofday;
+
   void *rb_mark_table_add_filename;
+
+  void *bm_mark;
+  void *blk_free;
+  void *thread_mark;
+
   void *heaps;
   void *heaps_used;
+
   size_t sizeof_RVALUE;
   size_t sizeof_heaps_slot;
-  int offset_heaps_slot_limit;
-  int offset_heaps_slot_slot;
+
+  size_t offset_heaps_slot_limit;
+  size_t offset_heaps_slot_slot;
+
+  size_t offset_BLOCK_body;
+  size_t offset_BLOCK_var;
+  size_t offset_BLOCK_cref;
+  size_t offset_BLOCK_prev;
+  size_t offset_BLOCK_self;
+  size_t offset_BLOCK_klass;
+  size_t offset_BLOCK_wrapper;
+  size_t offset_BLOCK_orig_thread;
+  size_t offset_BLOCK_block_obj;
+  size_t offset_BLOCK_scope;
+  size_t offset_BLOCK_dyna_vars;
+
+  size_t offset_METHOD_klass;
+  size_t offset_METHOD_rklass;
+  size_t offset_METHOD_recv;
+  size_t offset_METHOD_id;
+  size_t offset_METHOD_oid;
+  size_t offset_METHOD_body;
+
   size_t pagesize;
 };
 

data/lib/memprof/signal.rb

@@ -0,0 +1,16 @@
+begin
+  require File.expand_path('../../memprof', __FILE__)
+rescue LoadError
+  require File.expand_path('../../../ext/memprof', __FILE__)
+end
+
+Memprof.start
+old_handler = trap('URG'){
+  pid = Process.pid
+  fork{
+    GC.start
+    Memprof.dump_all("/tmp/memprof-#{pid}-#{Time.now.to_i}.json")
+    exit!
+  }
+  old_handler.call if old_handler
+}

data/memprof.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'memprof'
-  s.version = '0.2.9'
+  s.version = '0.3.0'
   s.date = '2010-03-15'
   s.summary = 'Ruby Memory Profiler'
   s.description = "Ruby memory profiler similar to bleak_house, but without patches to the Ruby VM"
@@ -9,5 +9,9 @@ spec = Gem::Specification.new do |s|
   s.authors = ["Joe Damato", "Aman Gupta", "Jake Douglas", "Rob Benson"]
   s.email = ["joe@memprof.com", "aman@memprof.com", "jake@memprof.com"]
   s.extensions = "ext/extconf.rb"
+  s.bindir = 'bin'
+  s.executables << 'memprof'
   s.files = `git ls-files`.split
+  s.add_dependency('rest-client', '>= 1.4.2')
+  s.add_dependency('term-ansicolor')
 end

data/spec/memprof_spec.rb

@@ -76,7 +76,7 @@ describe Memprof do
     Memprof.stop
     Memprof.dump_all(filename)
 
-    obj = File.open(filename, 'r').each_line.find do |line|
+    obj = File.open(filename, 'r').readlines.find do |line|
       line =~ /"dump out the entire heap"/
     end
 
@@ -90,7 +90,7 @@ describe Memprof do
     @str = "some random" + " string"
     Memprof.dump_all(filename)
 
-    obj = File.open(filename, 'r').each_line.find do |line|
+    obj = File.open(filename, 'r').readlines.find do |line|
       line =~ /"some random string"/
     end
 

data/spec/memprof_uploader_spec.rb

@@ -0,0 +1,117 @@
+require 'rubygems'
+require 'bacon'
+Bacon.summary_on_exit
+
+describe "MemprofUploader" do
+
+  it "should display help output with -h" do
+    output = `ruby bin/memprof -h`
+    output.should =~ /Memprof Uploader/
+    output.should =~ /Usage:/
+    $?.exitstatus.should == 0
+  end
+
+  it "should fail without a pid being passed" do
+    output = `ruby bin/memprof -n SomeLabel -k abcdef`
+    output.should =~ /Missing PID!/
+    $?.exitstatus.should == 1
+  end
+
+  it "should fail without a name being passed" do
+    output = `ruby bin/memprof -p 123 -k abcdef`
+    output.should =~ /Missing name!/
+    $?.exitstatus.should == 1
+  end
+
+  it "should fail without an API key" do
+    output = `ruby bin/memprof -p 123 -n SomeLabel`
+    output.should =~ /Missing API key!/
+    $?.exitstatus.should == 1
+  end
+
+  it "should fail with an invalid pid" do
+    output = `ruby bin/memprof -p 99999999 -n Label -k abcdef`
+    output.should =~ Regexp.new("No such process 99999999!")
+    $?.exitstatus.should == 1
+  end
+
+  it "should fail when the target process does not create a new file within 5 sec" do
+    pid = fork { sleep 5; exit! }
+    Process.detach(pid)
+    output = `ruby bin/memprof -p #{pid} -n Label -k abcdef`
+    output.should =~ Regexp.new("Waiting 5 seconds for process #{pid} to create a new dump...")
+    output.should =~ Regexp.new("Timed out after waiting 5 seconds")
+    $?.exitstatus.should == 1
+  end
+
+  it "should WORK and wait for a dump to complete if it's IN_PROGRESS" do
+    pid = fork {
+      # create a fake file
+      filename = "/tmp/memprof-#{Process.pid}-#{Time.now.to_i}.json.IN_PROGRESS"
+      # simulate dump in progress
+      trap("URG") { File.open(filename, "w") {|f| f.write("foo") }; sleep 1 }
+      # should get signaled somewhere in here and execute the handler before exiting.
+      sleep 5
+      # rename the file to simulate completion of the dump writeout.
+      File.rename(filename, filename.sub(/\.IN_PROGRESS/, ""))
+      exit!
+      }
+    Process.detach(pid)
+    output = `ruby bin/memprof -p #{pid} -n Label -k abcdef -t`
+    output.should =~ Regexp.new("Waiting 5 seconds for process #{pid} to create a new dump...")
+    output.should =~ Regexp.new("Found file /tmp/memprof-#{pid}-\\d*.json\\.?\\w*")
+    output.should =~ Regexp.new("Dump in progress. Waiting 60 seconds for it to complete...")
+    output.should =~ Regexp.new("Finished!")
+    file = output.slice(Regexp.new("/tmp/memprof-#{pid}-\\d*.json\\.?\\w*"))
+    # make sure both files are gone
+    File.exist?(file).should == false
+    File.exist?(file.sub(/\.IN_PROGRESS/, "") + ".gz").should == false
+    $?.exitstatus.should == 0
+  end
+
+  it "should WORK and delete the dump file after it's done, by default" do
+    pid = fork {
+      require File.dirname(__FILE__) + "/../lib/memprof/signal"
+      # should get signaled somewhere in here and execute the handler before exiting.
+      sleep 5
+      exit!
+    }
+    Process.detach(pid)
+    sleep 2
+    output = `ruby bin/memprof -p #{pid} -n TestDump -k abcdef -t`
+    output.should =~ Regexp.new("Waiting 5 seconds for process #{pid} to create a new dump...")
+    output.should =~ Regexp.new("Found file /tmp/memprof-#{pid}-\\d*.json\\.?\\w*")
+    output.should =~ Regexp.new("Finished!")
+    file = output.slice(Regexp.new("/tmp/memprof-#{pid}-\\d*.json\\.?\\w*"))
+    # make sure both files are gone
+    File.exist?(file).should == false
+    File.exist?(file.sub(/\.IN_PROGRESS/, "") + ".gz").should == false
+    $?.exitstatus.should == 0
+  end
+
+  it "should WORK and leave the dump file after it's done, with --no-delete" do
+    pid = fork {
+      require File.dirname(__FILE__) + "/../lib/memprof/signal"
+      # should get signaled somewhere in here and execute the handler before exiting.
+      sleep 5
+      exit!
+    }
+    Process.detach(pid)
+    sleep 2
+    output = `ruby bin/memprof -p #{pid} -n TestDump -k abcdef -t --no-delete`
+    output.should =~ Regexp.new("Waiting 5 seconds for process #{pid} to create a new dump...")
+    output.should =~ Regexp.new("Found file /tmp/memprof-#{pid}-\\d*.json\\w*")
+    output.should =~ Regexp.new("Finished!")
+    file = output.slice(Regexp.new("/tmp/memprof-#{pid}-\\d*.json\\.?\\w*"))
+    # Make sure it deleted the temporary one
+    if file =~ /\.IN_PROGRESS/
+      File.exist?(file).should == false
+    end
+    # make sure it left the completed one
+    file = file.sub(/\.IN_PROGRESS/, "") + ".gz"
+    File.exist?(file).should == true
+    File.delete(file)
+    $?.exitstatus.should == 0
+  end
+
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Joe Damato
@@ -19,15 +19,40 @@ cert_chain: []
 
 date: 2010-03-15 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Ruby memory profiler similar to bleak_house, but without patches to the Ruby VM
 email: 
 - joe@memprof.com
 - aman@memprof.com
 - jake@memprof.com
-executables: []
-
+executables: 
+- memprof
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: []
@@ -36,6 +61,7 @@ files:
 - .gitignore
 - README
 - Rakefile
+- bin/memprof
 - ext/arch.h
 - ext/bin_api.h
 - ext/elf.c
@@ -55,9 +81,10 @@ files:
 - ext/x86_64.h
 - ext/x86_gen.h
 - lib/memprof/middleware.rb
-- lib/memprof/usr2.rb
+- lib/memprof/signal.rb
 - memprof.gemspec
 - spec/memprof_spec.rb
+- spec/memprof_uploader_spec.rb
 has_rdoc: true
 homepage: http://github.com/ice799/memprof
 licenses: []

data/lib/memprof/usr2.rb

@@ -1,10 +0,0 @@
-require File.expand_path('../../memprof', __FILE__)
-Memprof.start
-trap('USR2'){
-  pid = Process.pid
-  fork{
-    GC.start
-    Memprof.dump_all("/tmp/memprof-#{pid}-#{Time.now.to_i}.json")
-    exit!
-  }
-}