Changeset 72

Timestamp:

09/06/2006 12:06:55 (2 years ago)

Author:

why

Message:

• ext/sand_table/sand_table.c: sandbox swapping across threads happens a bit more efficiently -- only when threads are in separate sandboxes. also, i'm now handling swapping back to the main thread better. sandbox_save and sandbox_restore are now run by all threads branching off of the main thread where the libary is loaded. the prelude is rb_load'd now, to keep $LOADED_FEATURES untouched.
  

Files:

• trunk/ext/sand_table/sand_table.c (modified) (6 diffs)

trunk/ext/sand_table/sand_table.c

@@ -119 +119 @@
   rb_thread_t thread;
 {
+  /* printf("SAVE: %lu, %lu -> %lu\n", thread, thread->sandbox, ruby_sandbox); */
   return Qnil;
 }
@@ -126 +127 @@
   rb_thread_t thread;
 {
-  if (!NIL_P(thread->sandbox))
+  /* printf("RESTORE: %lu, %lu -> %lu\n", thread, thread->sandbox, ruby_sandbox); */
+  if (ruby_sandbox != thread->sandbox)
   {
     sandkit *kit;
-    Data_Get_Struct( thread->sandbox, sandkit, kit );
-    sandbox_swap_in(kit);
+    if (NIL_P(thread->sandbox) && !NIL_P(ruby_sandbox))
+    {
+      sandbox_swap_in(&real);
+    }
+    else if (!NIL_P(thread->sandbox))
+    {
+      Data_Get_Struct( thread->sandbox, sandkit, kit );
+      sandbox_swap_in(kit);
+    }
   }
   return Qnil;
@@ -437 +446 @@
   sandbox_swap_out(go->kit);
   curr_thread->sandbox = Qnil;
-  curr_thread->sandbox_restore = NULL;
-  curr_thread->sandbox_save = NULL;
 
   go->kit->active = 0;
@@ -461 +468 @@
   kit->active = 1;
 
-  curr_thread->sandbox_save = sandbox_save;
-  curr_thread->sandbox_restore = sandbox_restore;
   curr_thread->sandbox = kit->self;
 
@@ -2670 +2675 @@
   StringValue(prelude);
   go_cart *go = sandbox_begin(kit);
-  rb_require(RSTRING(prelude)->ptr);
+  rb_load(prelude, 0);
   sandbox_whoa_whoa_whoa(go);
 }
@@ -2765 +2770 @@
   real.active = 1;
 
+  /* FIXME: all threads should run through sandbox_save. */
+  curr_thread->sandbox_save = sandbox_save;
+  curr_thread->sandbox_restore = sandbox_restore;
+
   rb_cSandbox = rb_define_class("Sandbox", rb_cObject);
   rb_define_const( rb_cSandbox, "VERSION", rb_str_new2( SAND_VERSION ) );