aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-05-21 10:49:15 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-05-21 10:49:15 +0000
commit2bccdba9d1403ce0010b0efa317376c01236440a (patch)
tree50431ff71a7ad24be3dd4cb12ad115be76eb28bf /railties/lib
parent997eb90c90ed43c5fa291a151f8848cb5758f467 (diff)
downloadrails-2bccdba9d1403ce0010b0efa317376c01236440a.tar.gz
rails-2bccdba9d1403ce0010b0efa317376c01236440a.tar.bz2
rails-2bccdba9d1403ce0010b0efa317376c01236440a.zip
Made the console and profiler work with the default 1.8.2 profiler #1325 [bitsweat]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1339 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/console_profile.rb14
1 files changed, 0 insertions, 14 deletions
diff --git a/railties/lib/console_profile.rb b/railties/lib/console_profile.rb
index afec28795d..e69de29bb2 100644
--- a/railties/lib/console_profile.rb
+++ b/railties/lib/console_profile.rb
@@ -1,14 +0,0 @@
-# No GC nonsense.
-GC.disable
-
-# Try to load the ruby-prof extension; fail back to the pure-Ruby
-# profiler included in the standard library.
-begin
- require 'prof'
- Prof.clock_mode = Prof::CPU
- puts 'Using the fast ruby-prof extension'
- require 'unprof'
-rescue LoadError
- puts 'Using the slow pure-Ruby profiler'
- require 'profile'
-end