rev 0.3.1 → 0.3.2

data/CHANGES

@@ -1,3 +1,13 @@
+0.3.2:
+
+* Perform a blocking system call if we're the only thread running (1.8 only)
+
+* Run in non-blocking mode if we're the only thread in the process (1.8 only)
+
+* Make Rev::Loop#run_nonblock signal-safe
+
+* Fix spurious firing of Rev::AsyncWatchers
+
 0.3.1:
 
 * Configurable intervals for Rev::StatWatcher

data/ext/rev/extconf.rb

@@ -8,6 +8,10 @@ if have_func('rb_thread_blocking_region')
   $defs << '-DHAVE_RB_THREAD_BLOCKING_REGION'
 end
 
+if have_func('rb_thread_alone')
+  $defs << '-DHAVE_RB_THREAD_ALONE'
+end
+
 if have_func('rb_str_set_len')
   $defs << '-DHAVE_RB_STR_SET_LEN'
 end

data/ext/rev/rev_loop.c

@@ -12,6 +12,14 @@
 
 #include "rev.h"
 
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION)
+#  define Rev_Loop_may_block_safely() (1)
+#elif defined(HAVE_RB_THREAD_ALONE)
+#  define Rev_Loop_may_block_safely() (rb_thread_alone())
+#else /* just in case Ruby changes: */
+#  define Rev_Loop_may_block_safely() (0)
+#endif
+
 static VALUE mRev = Qnil;
 static VALUE cRev_Loop = Qnil;
 
@@ -175,19 +183,26 @@ void Rev_Loop_process_event(VALUE watcher, int revents)
  */
 static VALUE Rev_Loop_run_once(VALUE self)
 {
-  struct Rev_Loop *loop_data;
   VALUE nevents;
-  
-  Data_Get_Struct(self, struct Rev_Loop, loop_data);
 
-  assert(loop_data->ev_loop && !loop_data->events_received);
-  
-  Rev_Loop_ev_loop_oneshot(loop_data);  
-  Rev_Loop_dispatch_events(loop_data);
-  
-  nevents = INT2NUM(loop_data->events_received);
-  loop_data->events_received = 0;
-  
+  if (Rev_Loop_may_block_safely()) {
+    struct Rev_Loop *loop_data;
+
+    Data_Get_Struct(self, struct Rev_Loop, loop_data);
+
+    assert(loop_data->ev_loop && !loop_data->events_received);
+
+    Rev_Loop_ev_loop_oneshot(loop_data);
+    Rev_Loop_dispatch_events(loop_data);
+
+    nevents = INT2NUM(loop_data->events_received);
+    loop_data->events_received = 0;
+
+  } else {
+    nevents = Rev_Loop_run_nonblock(self);
+    rb_thread_schedule();
+  }
+
   return nevents;
 }
 
@@ -260,7 +275,9 @@ static VALUE Rev_Loop_run_nonblock(VALUE self)
 
   assert(loop_data->ev_loop && !loop_data->events_received);
 
+  TRAP_BEG;
   RUN_LOOP(loop_data, EVLOOP_NONBLOCK);  
+  TRAP_END;
   Rev_Loop_dispatch_events(loop_data);
   
   nevents = INT2NUM(loop_data->events_received);

data/lib/rev.rb

@@ -23,6 +23,6 @@ require 'iobuffer'
 end
 
 module Rev
-  Rev::VERSION = '0.3.1' unless defined? Rev::VERSION
+  Rev::VERSION = '0.3.2' unless defined? Rev::VERSION
   def self.version() VERSION end
 end

data/lib/rev/async_watcher.rb

@@ -31,7 +31,12 @@ module Rev
     def on_readable
       # Read a byte from the pipe.  This clears readability, unless
       # another signal is pending
-      @reader.read 1
+      begin
+        @reader.read_nonblock 1
+      rescue Errno::EAGAIN
+        # in case there are spurious wakeups from forked processs
+        return
+      end
       on_signal
     end
   end

data/lib/rev/timer_watcher.rb

@@ -5,13 +5,13 @@
 #++
 
 module Rev
-  class IOWatcher
+  class TimerWatcher
     # The actual implementation of this class resides in the C extension
     # Here we metaprogram proper event_callbacks for the callback methods
     # These can take a block and store it to be called when the event
     # is actually fired.
     
     extend Meta
-    event_callback :timer_watcher
+    event_callback :on_timer
   end
 end

data/rev.gemspec

@@ -2,10 +2,10 @@ require 'rubygems'
 
 GEMSPEC = Gem::Specification.new do |s|
   s.name = "rev"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
   s.authors = "Tony Arcieri"
   s.email = "tony@medioh.com"
-  s.date = "2009-10-13"
+  s.date = "2009-11-28"
   s.summary = "Rev is a Ruby binding to the libev high performance event library"
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version = '>= 1.8.6'
@@ -14,7 +14,7 @@ GEMSPEC = Gem::Specification.new do |s|
   s.files = Dir.glob("{lib,ext,examples}/**/*") + ['Rakefile', 'rev.gemspec']
   
   # Dependencies
-  s.add_dependency "iobuffer", ">= 0.1.0"
+  s.add_dependency "iobuffer", ">= 0.1.3"
 
   # RubyForge info
   s.homepage = "http://rev.rubyforge.org"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rev
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tony Arcieri
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 -06:00
+date: 2009-11-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.1.3
     version: 
 description: 
 email: tony@medioh.com