Changeset 21202 for v6/smop/src/p6opaque.sm0p

Timestamp:

07/04/08 02:15:06 (5 months ago)

Author:

ruoso

Message:

[smop] yet more work on the p6opaque implementation... Some nasty bug is causing a deadlock (yes... I know the reasons for locks to exist is to cause dead-locks, but that is what I got so far)

Files:

• v6/smop/src/p6opaque.sm0p (modified) (6 diffs)

v6/smop/src/p6opaque.sm0p

@@ -113 +113 @@
 
       if (invocant == SMOP__p6opaque__RI) {
-        fprintf(stderr, "[SMOP p6opaque] TODO: p6opaque RI's meta undefined yet\n");
         ret = SMOP__NATIVE__bool_false;
       } else if (SMOP_RI(invocant) != (SMOP__ResponderInterface*)SMOP__p6opaque__RI) {
@@ -119 +118 @@
         ret = SMOP__NATIVE__bool_false;
       } else {
-        if (set)
+
+        if (set) {
           smop_lowlevel_wrlock(invocant);
-        else
+        } else {
           smop_lowlevel_rdlock(invocant);
+        }
 
         if (((SMOP__p6opaque_struct*)invocant)->metadata) {
           // we have our own metadata.
-          SMOP__Object* old = ((SMOP__p6opaque_struct*)invocant)->metadata->how;
-          ret = old;
+          SMOP__Object* old = NULL;
           if (set) {
+            old = ((SMOP__p6opaque_struct*)invocant)->metadata->how;
             ((SMOP__p6opaque_struct*)invocant)->metadata->how = set;
-            ret = set;
           }
+          ret = ((SMOP__p6opaque_struct*)invocant)->metadata->how;
           smop_lowlevel_unlock(invocant);
+
           if (old) SMOP_RELEASE(interpreter, old);
+          SMOP_REFERENCE(interpreter, ret);
 
         } else if (((SMOP__p6opaque_struct*)invocant)->instanceof) {
@@ -143 +146 @@
           if (set) {
             fprintf(stderr, "[SMOP p6opaque] Can't set how on a instance\n");
-            SMOP_RELEASE(interpreter,set);
           } else {
 
@@ -173 +175 @@
           ret = SMOP_REFERENCE(interpreter, set);
         } else {
+          smop_lowlevel_unlock(invocant);
           fprintf(stderr,"[SMOP p6opaque] TODO: invalid .^!how call\n");
+          ret = SMOP__NATIVE__bool_false;
         }
       }
@@ -183 +187 @@
       ret = SMOP__NATIVE__bool_false;
     }
+
+  } else if (identifier == SMOP__ID__REPR_DESTROY) {
+
+    if (SMOP_RI(capture) == (SMOP__ResponderInterface*)SMOP__NATIVE__capture) {
+      SMOP__Object* invocant = SMOP__NATIVE__capture_invocant(interpreter,capture);
+
+      if (invocant == SMOP__p6opaque__RI) {
+        ret = SMOP__NATIVE__bool_false;
+      } else if (SMOP_RI(invocant) != (SMOP__ResponderInterface*)SMOP__p6opaque__RI) {
+        fprintf(stderr, "[SMOP p6opaque] call to repr method with non p6opaque invocant\n");
+        ret = SMOP__NATIVE__bool_false;
+      } else {
+        smop_lowlevel_wrlock(invocant);
+        SMOP__p6opaque_LOWL_metadata* m = ((SMOP__p6opaque_struct*)invocant)->metadata;
+        ((SMOP__p6opaque_struct*)invocant)->metadata = NULL;
+        smop_lowlevel_unlock(invocant);
+        SMOP_RELEASE(interpreter,m->how);
+        free(m);
+      }
+
+      SMOP_RELEASE(interpreter,invocant);
+    } else {
+      fprintf(stderr, "[SMOP p6opaque] TODO: non-native captures\n");
+    }
+  } else if (identifier == SMOP__ID__DESTROYALL) {
+
+    ret = SMOP__NATIVE__bool_true;
+    SMOP__Object* frame;
+    SMOP__Object* continuation = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
+                                               SMOP__ID__continuation, 
+                                               SMOP_REFERENCE(interpreter,interpreter));
+
+    if (SMOP_RI(capture) == (SMOP__ResponderInterface*)SMOP__p6opaque__RI) {
+      SMOP__Object* invocant = capture;
+      $frame = q:sm0p {
+        $capture;
+        $identifier;
+        $invocant;
+        $invocant.SMOP__ID__REPR_how();
+        SMOP__SLIME__CurrentFrame.copy(1);
+        SMOP__SLIME__CurrentFrame.move_responder(2,2);
+        SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(2,(4,5,6),(),1));
+        SMOP__NATIVE__bool_true.SMOP__ID__dispatch();
+        $invocant.SMOP__ID__REPR_DESTROY();
+        $interpreter.goto(|$continuation);
+      };
+    } else {
+      $frame = q:sm0p {
+        $capture;
+        $identifier;
+        $capture.SMOP__ID__invocant();
+        $capture.SMOP__ID__invocant();
+        SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(1,(),(),1));
+        SMOP__p6opaque__RI.SMOP__ID__REPR_how();
+        SMOP__SLIME__CurrentFrame.copy(1);
+        SMOP__SLIME__CurrentFrame.move_responder(2,2);
+        SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(2,(6,7,8),(),1));
+        SMOP__NATIVE__bool_true.SMOP__ID__dispatch();
+        $capture.SMOP__ID__invocant();
+        SMOP__SLIME__CurrentFrame.move_responder(1,3);
+        $capture.SMOP__ID__invocant();
+        SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(1,(),(),1));
+        SMOP__p6opaque__RI.SMOP__ID__REPR_DESTROY();
+        $interpreter.goto(|$continuation);
+      };
+    }
+
+    SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
+                  SMOP__ID__goto,
+                  frame);
+
   } else {
     // as we want to support different captures, we'll start to use a
@@ -196 +271 @@
       $identifier;
       $capture.SMOP__ID__invocant();
-      SMOP__SLIME__CurrentFrame.copy(1);
+      $capture.SMOP__ID__invocant();
       SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(1,(),(),1));
       SMOP__p6opaque__RI.SMOP__ID__REPR_how();