Permalink
Browse files

Merge pull request #1228 from skaes/ruby193pl286patches

updated rails express patches
  • Loading branch information...
1 parent bf66eaa commit 652e27617d425bb0aaac3234a904e08196334e24 @richo richo committed with mpapis Oct 14, 2012
Showing with 1,818 additions and 402 deletions.
  1. +16 −16 patches/ruby/1.8.7/p370/railsexpress/02-fix-tests-for-osx.patch
  2. +6 −4 patches/ruby/1.8.7/p370/railsexpress/03-sigvtalrm-fix.patch
  3. +133 −132 patches/ruby/1.8.7/p370/railsexpress/04-railsbench-gc-patch.patch
  4. +4 −4 patches/ruby/1.8.7/p370/railsexpress/05-display-full-stack-trace.patch
  5. +2 −2 patches/ruby/1.8.7/p370/railsexpress/06-better-source-file-tracing.patch
  6. +10 −10 patches/ruby/1.8.7/p370/railsexpress/07-heap-dump-support.patch
  7. +18 −18 patches/ruby/1.8.7/p370/railsexpress/08-fork-support-for-gc-logging.patch
  8. +5 −5 patches/ruby/1.8.7/p370/railsexpress/09-track-malloc-size.patch
  9. +8 −8 patches/ruby/1.8.7/p370/railsexpress/10-track-object-allocation.patch
  10. +9 −9 patches/ruby/1.8.7/p370/railsexpress/11-expose-heap-slots.patch
  11. +5 −4 patches/ruby/1.8.7/p370/railsexpress/12-fix-heap-size-growth-logic.patch
  12. +5 −5 patches/ruby/1.8.7/p370/railsexpress/14-add-trace-stats-enabled-methods.patch
  13. +5 −5 patches/ruby/1.8.7/p370/railsexpress/15-track-live-dataset-size.patch
  14. +2 −2 patches/ruby/1.8.7/p370/railsexpress/16-add-object-size-information-to-heap-dump.patch
  15. +8 −8 patches/ruby/1.8.7/p370/railsexpress/17-caller-for-all-threads.patch
  16. +6 −6 patches/ruby/1.8.7/p370/railsexpress/18-fix-zlib-deflate.patch
  17. +1 −0 patches/ruby/1.8.7/p370/railsexpress/19-fix-broken-seek-on-osx.patch
  18. +0 −24 patches/ruby/1.9.3/head/railsexpress/01-avoid-using-broken-ffi-headers.patch
  19. +43 −49 patches/ruby/1.9.3/head/railsexpress/{02-railsbench-gc.patch → 01-railsbench-gc.patch}
  20. 0 ...express/{03-display-more-detailed-stack-trace.patch → 02-display-more-detailed-stack-trace.patch}
  21. +2 −2 ...3/head/railsexpress/{04-fork-support-for-gc-logging.patch → 03-fork-support-for-gc-logging.patch}
  22. +45 −0 patches/ruby/1.9.3/head/railsexpress/04-track-live-dataset-size.patch
  23. +0 −69 patches/ruby/1.9.3/head/railsexpress/05-track-live-dataset-size.patch
  24. 0 .../railsexpress/{06-webrick_204_304_keep_alive_fix.patch → 05-webrick_204_304_keep_alive_fix.patch}
  25. +11 −11 ...export-a-few-more-symbols-for-ruby-prof.patch → 06-export-a-few-more-symbols-for-ruby-prof.patch}
  26. +2 −2 patches/ruby/1.9.3/p194/railsexpress/09-avoid-using-broken-ffi-headers.patch
  27. +1,235 −0 patches/ruby/1.9.3/p286/railsexpress/01-railsbench-gc.patch
  28. +15 −0 patches/ruby/1.9.3/p286/railsexpress/02-display-more-detailed-stack-trace.patch
  29. +68 −0 patches/ruby/1.9.3/p286/railsexpress/03-fork-support-for-gc-logging.patch
  30. +45 −0 patches/ruby/1.9.3/p286/railsexpress/04-track-live-dataset-size.patch
  31. +13 −0 patches/ruby/1.9.3/p286/railsexpress/05-webrick_204_304_keep_alive_fix.patch
  32. +84 −0 patches/ruby/1.9.3/p286/railsexpress/06-export-a-few-more-symbols-for-ruby-prof.patch
  33. +6 −7 patchsets/ruby/1.9.3/head/railsexpress
  34. +6 −0 patchsets/ruby/1.9.3/p286/railsexpress
@@ -13,33 +13,33 @@ index bc16ab1..c12b168 100644
@@manager
@@ -79,16 +79,16 @@ module DRbCore
end
-
+
def test_00_DRbObject
- ro = DRbObject.new(nil, 'druby://localhost:12345')
- assert_equal('druby://localhost:12345', ro.__drburi)
+ ro = DRbObject.new(nil, 'druby://127.0.0.1:12345')
+ assert_equal('druby://127.0.0.1:12345', ro.__drburi)
assert_equal(nil, ro.__drbref)
-
+
- ro = DRbObject.new_with_uri('druby://localhost:12345')
- assert_equal('druby://localhost:12345', ro.__drburi)
+ ro = DRbObject.new_with_uri('druby://127.0.0.1:12345')
+ assert_equal('druby://127.0.0.1:12345', ro.__drburi)
assert_equal(nil, ro.__drbref)
-
+
- ro = DRbObject.new_with_uri('druby://localhost:12345?foobar')
- assert_equal('druby://localhost:12345', ro.__drburi)
+ ro = DRbObject.new_with_uri('druby://127.0.0.1:12345?foobar')
+ assert_equal('druby://127.0.0.1:12345', ro.__drburi)
assert_equal(DRb::DRbURIOption.new('foobar'), ro.__drbref)
end
-
+
diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb
index f5720cf..265713d 100644
--- a/test/drb/ut_drb.rb
+++ b/test/drb/ut_drb.rb
@@ -154,7 +154,7 @@ if __FILE__ == $0
-
+
DRb::DRbServer.default_argc_limit(8)
DRb::DRbServer.default_load_limit(4096)
- DRb.start_service('druby://localhost:0', DRbEx.new)
@@ -52,7 +52,7 @@ index 0a2191e..bca3012 100644
--- a/test/drb/ut_drb_drbssl.rb
+++ b/test/drb/ut_drb_drbssl.rb
@@ -18,7 +18,7 @@ if __FILE__ == $0
-
+
DRb::DRbServer.default_argc_limit(8)
DRb::DRbServer.default_load_limit(4096)
- DRb.start_service('drbssl://localhost:0', DRbEx.new, config)
@@ -65,18 +65,18 @@ index 4df963e..9127939 100644
--- a/test/drb/ut_eval.rb
+++ b/test/drb/ut_eval.rb
@@ -3,7 +3,7 @@ require 'drb/extserv'
-
+
class EvalAttack
def initialize
- @four = DRb::DRbServer.new('druby://localhost:0', self, {:safe_level => 4})
+ @four = DRb::DRbServer.new('druby://127.0.0.1:0', self, {:safe_level => 4})
end
-
+
def four
@@ -25,7 +25,7 @@ if __FILE__ == $0
-
+
$SAFE = 1
-
+
- DRb.start_service('druby://localhost:0', EvalAttack.new, {:safe_level => 2})
+ DRb.start_service('druby://127.0.0.1:0', EvalAttack.new, {:safe_level => 2})
es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
@@ -87,7 +87,7 @@ index d6717c5..0aefd1b 100644
--- a/test/drb/ut_large.rb
+++ b/test/drb/ut_large.rb
@@ -31,7 +31,7 @@ if __FILE__ == $0
-
+
DRb::DRbServer.default_argc_limit(3)
DRb::DRbServer.default_load_limit(100000)
- DRb.start_service('druby://localhost:0', DRbLarge.new)
@@ -102,8 +102,8 @@ index 4df8e1e..5e7fe82 100644
@@ -8,7 +8,7 @@ if __FILE__ == $0
it
end
-
-- DRb.start_service('druby://localhost:0', [1, 2, 'III', 4, "five", 6],
+
+- DRb.start_service('druby://localhost:0', [1, 2, 'III', 4, "five", 6],
+ DRb.start_service('druby://127.0.0.1:0', [1, 2, 'III', 4, "five", 6],
{:safe_level => 1})
es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
@@ -114,7 +114,7 @@ index c8aa9a8..129ca08 100644
+++ b/test/net/pop/test_pop.rb
@@ -3,10 +3,14 @@ require 'test/unit'
require 'digest/md5'
-
+
class TestPOP < Test::Unit::TestCase
+ def localhost
+ '127.0.0.1'
@@ -126,11 +126,11 @@ index c8aa9a8..129ca08 100644
- @stamp_base = "#{$$}.#{Time.now.to_i}@localhost"
+ @stamp_base = "#{$$}.#{Time.now.to_i}@#{localhost}"
end
-
+
def test_pop_auth_ok
@@ -64,7 +68,7 @@ class TestPOP < Test::Unit::TestCase
end
-
+
def pop_test(apop=false)
- host = 'localhost'
+ host = localhost
@@ -3,17 +3,17 @@ index c2049c7..f49044a 100644
--- a/eval.c
+++ b/eval.c
@@ -12483,6 +12483,11 @@ rb_thread_start_0(fn, arg, th)
- curr_thread->next = th;
- th->priority = curr_thread->priority;
- th->thgroup = curr_thread->thgroup;
+ curr_thread->next = th;
+ th->priority = curr_thread->priority;
+ th->thgroup = curr_thread->thgroup;
+#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
+ if (!thread_init) {
+ rb_thread_start_timer();
+ }
+#endif
}
START_TIMER();
-
+
@@ -13211,7 +13216,9 @@ rb_thread_atfork()
main_thread = curr_thread;
curr_thread->next = curr_thread;
@@ -23,3 +23,5 @@ index c2049c7..f49044a 100644
+ rb_thread_stop_timer();
+#endif
}
+
+
Oops, something went wrong.

0 comments on commit 652e276

Please sign in to comment.