Add Memprof.

Author: metaskills

Diff for: Gemfile

@@ -12,6 +12,7 @@ group :development do
   platforms :mri_18 do
     gem 'ruby-prof', '0.9.1'
     gem 'ruby-debug', '0.10.3'
+    gem 'memprof', '0.3.6'
   end
 end
 

Diff for: Rakefile

@@ -1,7 +1,6 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-begin ; require 'ruby-prof' ; rescue LoadError ; end
 
 
 def test_libs(mode='odbc')
@@ -57,7 +56,7 @@ namespace :profile do
     end
   end
 
-end if defined?(RubyProf)
+end
 
 
 namespace :rvm do

Diff for: test/cases/sqlserver_helper.rb

@@ -20,6 +20,8 @@
 require 'models/topic'
 require 'active_record/version'
 
+GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly?)
+
 ActiveRecord::Migration.verbose = false
 
 # Defining our classes in one place as well as soem core tests that need coercing date/time types.

Diff for: test/profile/connection.rb

@@ -11,8 +11,9 @@ def setup
   end
 
   def test_select
+    select_statement = "SELECT [topics].* FROM [topics]"
     ruby_profile :connection_select do
-      1000.times { @connection.send :select, "SELECT [topics].* FROM [topics]" }
+      1000.times { @connection.send :select, select_statement }
     end
   end
 

Diff for: test/profile/helper.rb

@@ -1,11 +1,18 @@
 require 'cases/sqlserver_helper'
 require 'ruby-prof'
+require 'memprof'
 
 class ActiveRecord::TestCase
 
 
   protected
 
+  def mem_profile(*args)
+    Memprof.track do
+      yield
+    end
+  end
+  
   def ruby_profile(name)
     result = RubyProf.profile { yield }
     [:flat,:graph,:html].each do |printer|