Changeset 110

Timestamp:

12/31/2006 18:00:41 (23 months ago)

Author:

mental

Message:

• ext/sand_table/sand_table.h: added sandwick::self
  
• ext/sand_table/sand_table.c: semi-reified sandwicks for proper gc behavior
  

Location:

trunk/ext/sand_table

Files:

• sand_table.c (modified) (6 diffs)
• sand_table.h (modified) (1 diff)

trunk/ext/sand_table/sand_table.c

@@ -17 +17 @@
 
 static VALUE Qimport, Qinit, Qload, Qenv, Qio, Qreal, Qref, Qall;
-VALUE rb_cSandbox, rb_cSandboxFull, rb_cSandboxSafe, rb_eSandboxException, rb_cSandboxRef;
+VALUE rb_cSandbox, rb_cSandboxFull, rb_cSandboxSafe, rb_eSandboxException, rb_cSandboxRef, rb_cSandwick;
 static ID s_options;
 
@@ -317 +317 @@
 } sandtransfer;
 
+void
+mark_sandwick(wick)
+  sandwick *wick;
+{
+  int i;
+  for ( i = 0 ; i < wick->argc ; i++ ) {
+    rb_gc_mark_maybe(wick->argv[i]);
+  }
+  rb_gc_mark(wick->link);
+  rb_gc_mark(wick->exception);
+  if (wick->kit) {
+    rb_gc_mark(wick->kit->self);
+  }
+  rb_gc_mark(wick->banished);
+  /* TODO: mark wick->scope and wick->dyna_vars */
+}
+
+void
+free_sandwick(wick)
+  sandwick *wick;
+{
+  rb_gc_unregister_address(&wick->self);
+  free(wick);
+}
+
+sandwick *
+alloc_sandwick()
+{
+  sandwick *wick;
+  wick = (sandwick *)malloc(sizeof(sandwick));
+  wick->self = Qnil;
+  wick->argc = 0;
+  wick->argv = NULL;
+  wick->link = Qnil;
+  wick->action = NULL;
+  wick->exception = Qnil;
+  wick->kit = NULL;
+  wick->banished = Qnil;
+  wick->scope = NULL;
+  wick->dyna_vars = NULL;
+
+  rb_gc_register_address(&wick->self);
+  wick->self = Data_Wrap_Struct(rb_cSandwick, mark_sandwick, free_sandwick, wick);
+
+  return wick;
+}
+
 /*
  * A "wick" for starting a sandbox that calls
@@ -328 +375 @@
   VALUE *argv;
 {
-  sandwick *wick = ALLOC(sandwick);
+  sandwick *wick = alloc_sandwick();
   wick->calltype = SANDBOX_METHOD_CALL;
-  wick->action = NULL;
   wick->link = link;
   wick->argc = argc;
@@ -355 +401 @@
   VALUE str;
 {
-  sandwick *wick = ALLOC(sandwick);
+  sandwick *wick = alloc_sandwick();
   wick->calltype = SANDBOX_EVAL;
-  wick->action = NULL;
   wick->link = str;
-  wick->argc = 0;
-  wick->argv = NULL;
   return wick;
 }
@@ -686 +729 @@
   }
   sandbox_off( wick );
-  free( wick );
+  free_sandwick( wick );
   if (!NIL_P(exc))
   {
@@ -2960 +3003 @@
   Init_kit_real(&base, 0);
 
+  rb_cSandwick = rb_class_new(rb_cObject);
+
   rb_cSandbox = rb_define_module("Sandbox");
   rb_cSandboxFull = rb_define_class_under(rb_cSandbox, "Full", rb_cObject);

trunk/ext/sand_table/sand_table.h

@@ -173 +173 @@
  */
 typedef struct {
+  VALUE self;
+
   /* how is the sandbox to be called? */
   char calltype;