fastthread 0.6.2 → 0.6.3

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require 'rake/gempackagetask'
 require 'tools/rakehelp'
 
-GEM_VERSION="0.6.2"
+GEM_VERSION="0.6.3"
 
 setup_extension('fastthread', 'fastthread')
 

data/ext/fastthread/fastthread.c

@@ -2,7 +2,7 @@
  * Optimized Ruby Mutex implementation, loosely based on thread.rb by
  * Yukihiro Matsumoto <matz@ruby-lang.org>
  *
- *  Copyright 2006  MenTaLguY <mental@rydia.net>
+ *  Copyright 2006-2007  MenTaLguY <mental@rydia.net>
  *
  * This file is made available under the same terms as Ruby.
  */
@@ -577,6 +577,33 @@ wait_condvar(condvar, mutex)
   lock_mutex(mutex);
 }
 
+static VALUE legacy_exclusive_unlock _((VALUE));
+
+static VALUE
+legacy_exclusive_unlock(mutex)
+  VALUE mutex;
+{
+  return rb_funcall(mutex, rb_intern("exclusive_unlock"), 0);
+}
+
+typedef struct {
+  ConditionVariable *condvar;
+  VALUE mutex;
+} legacy_wait_args;
+
+static VALUE legacy_wait _((VALUE, legacy_wait_args *));
+
+static VALUE
+legacy_wait(unused, args)
+  VALUE unused;
+  legacy_wait_args *args;
+{
+  push_list(&args->condvar->waiting, rb_thread_current());
+  rb_thread_stop();
+  rb_funcall(args->mutex, rb_intern("lock"), 0);
+  return Qnil;
+}
+
 static VALUE rb_condvar_wait _((VALUE, VALUE));
 
 static VALUE
@@ -585,15 +612,19 @@ rb_condvar_wait(self, mutex_v)
   VALUE mutex_v;
 {
   ConditionVariable *condvar;
-  Mutex *mutex;
+  Data_Get_Struct(self, ConditionVariable, condvar);
 
   if ( CLASS_OF(mutex_v) != rb_cMutex ) {
-    rb_raise(rb_eTypeError, "Not a Mutex");
+    /* interoperate with legacy mutex */
+    legacy_wait_args args;
+    args.condvar = condvar;
+    args.mutex = mutex_v;
+    rb_iterate(legacy_exclusive_unlock, mutex_v, legacy_wait, (VALUE)&args);
+  } else {
+    Mutex *mutex;
+    Data_Get_Struct(mutex_v, Mutex, mutex);
+    wait_condvar(condvar, mutex);
   }
-  Data_Get_Struct(self, ConditionVariable, condvar);
-  Data_Get_Struct(mutex_v, Mutex, mutex);
-
-  wait_condvar(condvar, mutex);
 
   return self;
 }

data/test/test_condvar.rb

@@ -1,7 +1,6 @@
 require 'test/unit'
-if RUBY_PLATFORM == "java"
-  require 'thread'
-else
+require 'thread'
+if RUBY_PLATFORM != "java"
   $:.unshift File.expand_path( File.join( File.dirname( __FILE__ ), "../ext/fastthread" ) )
   require 'fastthread'
 end

data/test/test_mutex.rb

@@ -1,7 +1,6 @@
 require 'test/unit'
-if RUBY_PLATFORM == "java"
-  require 'thread'
-else
+require 'thread'
+if RUBY_PLATFORM != "java"
   $:.unshift File.expand_path( File.join( File.dirname( __FILE__ ), "../ext/fastthread" ) )
   require 'fastthread'
 end

data/test/test_queue.rb

@@ -1,7 +1,6 @@
 require 'test/unit'
-if RUBY_PLATFORM == "java"
-  require 'thread'
-else
+require 'thread'
+if RUBY_PLATFORM != "java"
   $:.unshift File.expand_path( File.join( File.dirname( __FILE__ ), "../ext/fastthread" ) )
   require 'fastthread'
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: fastthread
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2007-01-18 00:00:00 -05:00
+  version: 0.6.3
+date: 2007-01-25 00:00:00 -05:00
 summary: Optimized replacement for thread.rb primitives
 require_paths: 
 - lib
@@ -36,7 +36,6 @@ files:
 - test/test_queue.rb
 - ext/fastthread/fastthread.c
 - ext/fastthread/extconf.rb
-- ext/fastthread/foo.rb
 - tools/rakehelp.rb
 test_files: 
 - test/test_all.rb

data/ext/fastthread/foo.rb

@@ -1,11 +0,0 @@
-require 'fastthread'
-require 'thread'
-
-mutex = Mutex.new
-condition = ConditionVariable.new
-t = Thread.new do
-  mutex.lock
-  condition.wait mutex
-end
-exit
-