fastthread 0.6.3 → 0.6.4.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require 'rake/gempackagetask'
 require 'tools/rakehelp'
 
-GEM_VERSION="0.6.3"
+GEM_VERSION="0.6.4.1"
 
 setup_extension('fastthread', 'fastthread')
 
@@ -49,7 +49,7 @@ end
 
 setup_clean ["ext/fastthread/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/fastthread/Makefile", "pkg", "lib/*.bundle", "*.gem", ".config"]
 
-task :install => [:default] do
+task :install => [:default, :package] do
   sh %{ sudo gem install pkg/fastthread-#{GEM_VERSION}.gem }
 end
 

data/ext/fastthread/fastthread.c

@@ -134,6 +134,23 @@ push_multiple_list(list, values, count)
   }
 }
 
+static void recycle_entries _((List *, Entry *, Entry *));
+
+static void
+recycle_entries(list, first_entry, last_entry)
+  List *list;
+  Entry *first_entry;
+  Entry *last_entry;
+{
+  if (USE_MEM_POOLS) {
+    last_entry->next = list->entry_pool;
+    list->entry_pool = first_entry;
+  } else {
+    last_entry->next = NULL;
+    free_entries(first_entry);
+  }
+}
+
 static VALUE shift_list _((List *));
 
 static VALUE
@@ -154,16 +171,32 @@ shift_list(list)
   --list->size;
 
   value = entry->value;
-  if (USE_MEM_POOLS) {
-    entry->next = list->entry_pool;
-    list->entry_pool = entry;
-  } else {
-    free(entry);
-  }
+  recycle_entries(list, entry, entry);
 
   return value;
 }
 
+static void remove_one _((List *, VALUE));
+
+static void
+remove_one(list, value)
+  List *list;
+  VALUE value;
+{
+  Entry **ref;
+  Entry *entry;
+  for (ref = &list->entries, entry = list->entries;
+       entry != NULL;
+       ref = &entry->next, entry = entry->next)
+  {
+    if (entry->value == value) {
+      *ref = entry->next;
+      recycle_entries(list, entry, entry);
+      break;
+    }
+  }
+}
+
 static void clear_list _((List *));
 
 static void
@@ -171,12 +204,7 @@ clear_list(list)
   List *list;
 {
   if (list->last_entry) {
-    if (USE_MEM_POOLS) {
-      list->last_entry->next = list->entry_pool;
-      list->entry_pool = list->entries;
-    } else {
-      free_entries(list->entries);
-    }
+    recycle_entries(list, list->entries, list->last_entry);
     list->entries = NULL;
     list->last_entry = NULL;
     list->size = 0;
@@ -246,6 +274,39 @@ wake_all(list)
   return Qnil;
 }
 
+static VALUE wait_list_inner _((List *));
+
+static VALUE
+wait_list_inner(list)
+  List *list;
+{
+  push_list(list, rb_thread_current());
+  rb_thread_stop();
+  return Qnil;
+}
+
+static VALUE wait_list_cleanup _((List *));
+
+static VALUE
+wait_list_cleanup(list)
+  List *list;
+{
+  /* cleanup in case of spurious wakeups */
+  rb_thread_critical = 1;
+  remove_one(list, rb_thread_current());
+  rb_thread_critical = 0;
+  return Qnil;
+}
+
+static void wait_list _((List *));
+
+static void
+wait_list(list)
+  List *list;
+{
+  rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
+}
+
 static void assert_no_survivors _((List *, const char *, void *));
 
 static void
@@ -365,9 +426,7 @@ lock_mutex(mutex)
   rb_thread_critical = 1;
 
   while (RTEST(mutex->owner)) {
-    push_list(&mutex->waiting, current);
-    rb_thread_stop();
-
+    wait_list(&mutex->waiting);
     rb_thread_critical = 1;
   }
   mutex->owner = current; 
@@ -571,8 +630,7 @@ wait_condvar(condvar, mutex)
     rb_raise(private_eThreadError, "Not owner");
   }
   mutex->owner = Qnil;
-  push_list(&condvar->waiting, rb_thread_current());
-  rb_thread_stop();
+  wait_list(&condvar->waiting);
 
   lock_mutex(mutex);
 }
@@ -598,8 +656,7 @@ legacy_wait(unused, args)
   VALUE unused;
   legacy_wait_args *args;
 {
-  push_list(&args->condvar->waiting, rb_thread_current());
-  rb_thread_stop();
+  wait_list(&args->condvar->waiting);
   rb_funcall(args->mutex, rb_intern("lock"), 0);
   return Qnil;
 }
@@ -1048,9 +1105,21 @@ static VALUE setup_classes(unused)
 void
 Init_fastthread()
 {
+  VALUE global_variables;
+  VALUE fastthread_avoid_mem_pools;
   int saved_critical;
-
-  avoid_mem_pools = rb_gv_get("$fastthread_avoid_mem_pools");
+  int i;
+
+  avoid_mem_pools = Qnil;
+  fastthread_avoid_mem_pools = rb_str_new2("$fastthread_avoid_mem_pools");
+  global_variables = rb_f_global_variables();
+  for ( i = 0 ; i < RARRAY(global_variables)->len ; i++ ) {
+    if (RTEST(rb_equal(RARRAY(global_variables)->ptr[i], fastthread_avoid_mem_pools))) {
+      avoid_mem_pools = rb_gv_get("$fastthread_avoid_mem_pools");
+      break;
+    }
+  }
+  
   rb_global_variable(&avoid_mem_pools);
   rb_define_variable("$fastthread_avoid_mem_pools", &avoid_mem_pools);
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: fastthread
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
-date: 2007-01-25 00:00:00 -05:00
+  version: 0.6.4.1
+date: 2007-02-14 00:00:00 -05:00
 summary: Optimized replacement for thread.rb primitives
 require_paths: 
 - lib
@@ -30,9 +30,9 @@ authors:
 files: 
 - Rakefile
 - setup.rb
-- test/test_all.rb
 - test/test_condvar.rb
 - test/test_mutex.rb
+- test/test_all.rb
 - test/test_queue.rb
 - ext/fastthread/fastthread.c
 - ext/fastthread/extconf.rb