From b3a9d93096324de1ef99d638f7bf8142f8956ef2 Mon Sep 17 00:00:00 2001
From: Tyler Brock <tyler.brock@gmail.com>
Date: Mon, 23 Apr 2012 16:58:11 -0400
Subject: [PATCH 1/4] RUBY-436 Handle IRB::Abort Exception

---
 lib/mongo/networking.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/mongo/networking.rb b/lib/mongo/networking.rb
index 62cee62..97cc7ea 100644
--- a/lib/mongo/networking.rb
+++ b/lib/mongo/networking.rb
@@ -140,6 +140,11 @@ module Mongo
       rescue SystemStackError, NoMemoryError, SystemCallError => ex
         close
         raise ex
+      rescue Exception => ex
+        if defined?(IRB)
+          close if ex.class == IRB::Abort
+        end
+        raise ex
       ensure
         if should_checkin
           if command || read == :primary

From d3955e0346fd7839fca873df60a242ab06d60674 Mon Sep 17 00:00:00 2001
From: Gary Murakami <gary.murakami@10gen.com>
Date: Tue, 24 Apr 2012 12:35:33 -0400
Subject: [PATCH 2/4] performance graphing and profiling improvements

---
 Gemfile                |  1 +
 Rakefile               | 10 ++++++++++
 bench/exp_series.html  |  8 +++-----
 bench/profile_array.rb | 26 ++++++++++++++++++++------
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2c12bbe..79f6d80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,7 @@ group :development, :test do
   gem "ci_reporter"
   gem "ruby-prof" unless RUBY_PLATFORM =~ /java/
   gem "perftools.rb" unless RUBY_PLATFORM =~ /java/
+  gem "rake-compiler"
 
   # Java
   platforms :jruby do
diff --git a/Rakefile b/Rakefile
index cf75565..547474d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,8 @@ end
 require 'fileutils'
 require 'rake/testtask'
 require 'rake'
+require 'rake/extensiontask'
+require 'rake/javaextensiontask'
 
 begin
   require 'git'
@@ -20,6 +22,14 @@ end
 
 ENV['TEST_MODE'] = 'TRUE'
 
+Rake::ExtensionTask.new('cbson') do |ext|
+  ext.lib_dir = "lib/bson_ext"
+end
+
+#Rake::JavaExtensionTask.new('jbson') do |ext| # not yet functional
+#  ext.ext_dir = 'ext/src/org/jbson'
+#end
+
 task :java do
   Rake::Task['build:java'].invoke
   Rake::Task['test:ruby'].invoke
diff --git a/bench/exp_series.html b/bench/exp_series.html
index 72675e1..a2b9fb0 100644
--- a/bench/exp_series.html
+++ b/bench/exp_series.html
@@ -25,7 +25,7 @@
     <h1>Exp Series Performance Tests</h1>
     x-axis is power of 2, log base 2 of size<br>
     y-axis is operations per user-time CPU-second<br>
-    Note that this is not operations per real-time second that includes DB real-time<br>
+    Note that this is not operations per real-time second that include DB real-time<br>
     <div id="placeholder"></div>
 
 <script type="text/javascript">
@@ -136,10 +136,8 @@ $(function () {
         ]
     ];
     $.each(graph, function(i, e){
-        var title = e[0];
-        var xMax = e[1];
-        var labelSpec = e[2];
-        var plotSpecs = e[3];
+        var title, xMax, labelSpec, plotSpecs;
+        title = e[0]; xMax = e[1]; labelSpec = e[2]; plotSpecs = e[3]; //[title, xMax, labelSpec, plotSpecs] = e;
         var series = flotSeries(expSeries, xMax, labelSpec, plotSpecs);
         doPlot(title, series);
     });
diff --git a/bench/profile_array.rb b/bench/profile_array.rb
index c3a5c5f..3f20565 100644
--- a/bench/profile_array.rb
+++ b/bench/profile_array.rb
@@ -16,7 +16,6 @@ def set_mongo_driver_mode(mode)
 end
 
 $mode = ARGV[0].to_sym if ARGV[0]
-#p (ARGV[0] && ARGV[0].to_sym || :c)
 set_mongo_driver_mode($mode || :c)
 
 require 'rubygems'
@@ -40,6 +39,16 @@ def insert(coll, h)
   coll.insert(h) # note that insert stores :_id in h and subsequent inserts are updates
 end
 
+def benchmark(iterations)
+  btms = Benchmark.measure do
+    (0...iterations).each do
+      yield
+    end
+  end
+  utime = btms.utime
+  p ({'ops' => (iterations.to_f / utime.to_f).round(1)})
+end
+
 def ruby_prof(iterations)
   RubyProf.start
   puts Benchmark.measure {
@@ -57,7 +66,7 @@ def ruby_prof(iterations)
 end
 
 def perftools(iterations)
-  profile_file_name = "/tmp/profile_array.perftools"
+  profile_file_name = '/tmp/profile_array.perftools'
   PerfTools::CpuProfiler.start(profile_file_name) do
     iterations.times { yield }
   end
@@ -71,12 +80,17 @@ db  = conn['benchmark']
 coll = db['profile']
 
 coll.remove
-puts "coll.count: #{coll.count}"
+#puts "coll.count: #{coll.count}"
 
-n, doc = array_size_fixnum(2, 6)
-ruby_prof(1000) { insert(coll, doc) }
+base = 2
+power = 6
+n, doc = array_size_fixnum(base, power)
+p ({'generator' => 'array_size_fixnum', 'operation' => 'insert',  'base' => base, 'power' => power})
+
+benchmark(10000) { insert(coll, doc)} # valgrind --tool=callgrind ruby bench/profile_array.rb; callgrind_annotate ...
+#ruby_prof(1000) { insert(coll, doc) }
 #perftools(10000) { insert(coll, doc) }
 
-puts "coll.count: #{coll.count}"
+#puts "coll.count: #{coll.count}"
 coll.remove
 

From c11799abb120ff5104a9f088858f54e8bfd219f5 Mon Sep 17 00:00:00 2001
From: Tyler Brock <tyler.brock@gmail.com>
Date: Tue, 24 Apr 2012 14:57:55 -0400
Subject: [PATCH 3/4] possible date fix

---
 ext/cbson/cbson.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/cbson/cbson.c b/ext/cbson/cbson.c
index a60423b..60599b2 100644
--- a/ext/cbson/cbson.c
+++ b/ext/cbson/cbson.c
@@ -742,7 +742,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
         }
     case 9:
         {
-            long long millis;
+            int64_t millis;
             memcpy(&millis, buffer + *position, 8);
 
             value = rb_time_new(millis / 1000, (millis % 1000) * 1000);

From f5efe08d9147b34a016b4f3b4bb3ec75da09f965 Mon Sep 17 00:00:00 2001
From: Tyler Brock <tyler.brock@gmail.com>
Date: Tue, 24 Apr 2012 15:22:07 -0400
Subject: [PATCH 4/4] minor: Gemfile fix

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 79f6d80..b884e68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,6 @@ group :development, :test do
   gem "test-unit"
   gem "ci_reporter"
   gem "ruby-prof" unless RUBY_PLATFORM =~ /java/
-  gem "perftools.rb" unless RUBY_PLATFORM =~ /java/
   gem "rake-compiler"
 
   # Java
@@ -26,3 +25,5 @@ group :development, :test do
     gem "jruby-openssl"
   end
 end
+
+gem "perftools.rb", :group => :development unless RUBY_PLATFORM =~ /java/