[ViewVC] Diff of: cvs/Coro/Coro/State.xs

Comparing Coro/Coro/State.xs (file contents):
Revision 1.5 by root, Tue Jul 17 02:55:29 2001 UTC vs.
Revision 1.6 by root, Tue Jul 17 15:42:28 2001 UTC

   av_push ((AV *)*he, (SV *)CvPADLIST (cv));
 }
 static void
-SAVE(pTHX_ Coro__State c)
+save_state(pTHX_ Coro__State c)
 {
   {
     dSP;
     I32 cxix = cxstack_ix;
     PERL_SI *top_si = PL_curstackinfo;
   c->retstack_ix = PL_retstack_ix;
   c->retstack_max = PL_retstack_max;
   c->curcop = PL_curcop;
 }
+#define LOAD(state) do { load_state(aTHX_ state); SPAGAIN; } while (0)
+#define SAVE(state) do { PUTBACK; save_state(aTHX_ state); } while (0)
 static void
-LOAD(pTHX_ Coro__State c)
+load_state(pTHX_ Coro__State c)
 {
   PL_dowarn = c->dowarn;
   GvAV (PL_defgv) = c->defav;
   PL_curstackinfo = c->curstackinfo;
   PL_curstack = c->curstack;
 /* this is an EXACT copy of S_nuke_stacks in perl.c, which is unfortunately static */
 STATIC void
 destroy_stacks(pTHX)
 {
   /* die does this while calling POPSTACK, but I just don't see why. */
+  /* OTOH, die does not have a memleak, but we do... */
   dounwind(-1);
   /* is this ugly, I ask? */
   while (PL_scopestack_ix)
     LEAVE;
         Coro::State_or_hashref	next
         CODE:
         if (prev != next)
           {
-            PUTBACK;
-            SAVE (aTHX_ prev);
             /*
              * this could be done in newprocess which would lead to
-             * extremely elegant and fast (just PUTBACK/SAVE/LOAD/SPAGAIN)
+             * extremely elegant and fast (just SAVE/LOAD)
              * code here, but lazy allocation of stacks has also
              * some virtues and the overhead of the if() is nil.
              */
             if (next->mainstack)
               {
+                SAVE (prev);
-                LOAD (aTHX_ next);
+                LOAD (next);
-                next->mainstack = 0; /* unnecessary but much cleaner */
+                /* mark this state as in-use */
-                SPAGAIN;
+                next->mainstack = 0;
+                next->tmps_ix = -2;
+              }
+            else if (next->tmps_ix == -2)
+              {
+                croak ("tried to transfer to running coroutine");
               }
             else
               {
+                SAVE (prev);
                 /*
                  * emulate part of the perl startup here.
                  */
                 UNOP myop;
         if (coro->mainstack)
           {
             struct coro temp;
-            PUTBACK;
             SAVE(aTHX_ (&temp));
             LOAD(aTHX_ coro);
             destroy_stacks ();
             SvREFCNT_dec ((SV *)GvAV (PL_defgv));
             LOAD((&temp));
-            SPAGAIN;
           }
         SvREFCNT_dec (coro->args);
         Safefree (coro);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing Coro/Coro/State.xs (file contents): Revision 1.5 by root, Tue Jul 17 02:55:29 2001 UTC vs. Revision 1.6 by root, Tue Jul 17 15:42:28 2001 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.5 by root, Tue Jul 17 02:55:29 2001 UTC vs.
Revision 1.6 by root, Tue Jul 17 15:42:28 2001 UTC