From c1655a501fc26f7100dd788b42a1914be833fea4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 26 Dec 2010 21:33:21 +0000 Subject: rev_thread_spawn: disable under Ruby 1.8 It still burns CPU at the first sign of doing anything interesting, so stop it. Ruby 1.9 is the future :P --- Documentation/comparison.haml | 2 +- lib/rainbows/rev/thread.rb | 4 ++-- t/GNUmakefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/comparison.haml b/Documentation/comparison.haml index d1f689f..2461234 100644 --- a/Documentation/comparison.haml +++ b/Documentation/comparison.haml @@ -58,7 +58,7 @@ %tr.comp_row %td.mod RevThreadSpawn %td.tee No - %td.r18 Yes + %td.r18 No %td.r19 Yes %td.rbx No %td.slow Yes diff --git a/lib/rainbows/rev/thread.rb b/lib/rainbows/rev/thread.rb index 0f36ce5..276b315 100644 --- a/lib/rainbows/rev/thread.rb +++ b/lib/rainbows/rev/thread.rb @@ -3,8 +3,8 @@ require 'thread' require 'rainbows/rev/master' -RUBY_VERSION =~ %r{\A1\.8} && Rev::VERSION < "0.3.2" and - warn "Rev (< 0.3.2) and Threads do not mix well under Ruby 1.8" +RUBY_VERSION =~ %r{\A1\.8} and + warn "Rev and Threads do not mix well under Ruby 1.8" module Rainbows module Rev diff --git a/t/GNUmakefile b/t/GNUmakefile index 8198388..00c887d 100644 --- a/t/GNUmakefile +++ b/t/GNUmakefile @@ -26,7 +26,6 @@ models += ThreadSpawn models += Rev models += EventMachine models += NeverBlock -models += RevThreadSpawn ifeq ($(RUBY_ENGINE),ruby) rp := ) @@ -37,6 +36,7 @@ ifeq ($(RUBY_ENGINE),ruby) models += RevFiberSpawn models += FiberPool models += RevThreadPool + models += RevThreadSpawn endif endif -- cgit v1.2.3-24-ge0c7