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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.321 by root, Sat Nov 22 02:09:54 2008 UTC vs.
Revision 1.322 by root, Sat Nov 22 05:13:34 2008 UTC

-#define CORO_CLONE 1 //D
 #include "libcoro/coro.c"
 #define PERL_NO_GET_CONTEXT
 #define PERL_EXT
   int valgrind_id;
 #endif
   unsigned char flags;
 } coro_cctx;
+coro_cctx *cctx_current; /* the currently running cctx */
+/*****************************************************************************/
 enum {
   CF_RUNNING   = 0x0001, /* coroutine is running */
   CF_READY     = 0x0002, /* coroutine is ready */
   CF_NEW       = 0x0004, /* has never been switched to */
   CF_DESTROYED = 0x0008, /* coroutine data has been freed */
   TAINT_NOT;
   return 0;
 }
-static struct coro_cctx *cctx_ssl_cctx;
 static struct CoroSLF cctx_ssl_frame;
 static void
 slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
 {
-  ta->prev  = (struct coro *)cctx_ssl_cctx;
-  ta->next  = 0;
+  ta->prev = 0;
 }
 static int
 slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
 {
   return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
 }
 /* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
 static void NOINLINE
-cctx_prepare (pTHX_ coro_cctx *cctx)
+cctx_prepare (pTHX)
 {
   PL_top_env = &PL_start_env;
-  if (cctx->flags & CC_TRACE)
+  if (cctx_current->flags & CC_TRACE)
     PL_runops = runops_trace;
   /* we already must be executing an SLF op, there is no other valid way
    * that can lead to creation of a new cctx */
   assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
            slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
   /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
-  cctx_ssl_cctx  = cctx;
   cctx_ssl_frame = slf_frame;
   slf_frame.prepare = slf_prepare_set_stacklevel;
   slf_frame.check   = slf_check_set_stacklevel;
 }
     /* normally we would need to skip the entersub here */
     /* not doing so will re-execute it, which is exactly what we want */
     /* PL_nop = PL_nop->op_next */
     /* inject a fake subroutine call to cctx_init */
-    cctx_prepare (aTHX_ (coro_cctx *)arg);
+    cctx_prepare (aTHX);
     /* cctx_run is the alternative tail of transfer() */
     transfer_tail (aTHX);
     /* somebody or something will hit me for both perl_run and PL_restartop */
 cctx_destroy (coro_cctx *cctx)
 {
   if (!cctx)
     return;
+  assert (cctx != cctx_current);//D temporary
   --cctx_count;
   coro_destroy (&cctx->cctx);
   /* coro_transfer creates new, empty cctx's */
   if (cctx->sptr)
 transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
 {
   dSTACKLEVEL;
   /* sometimes transfer is only called to set idle_sp */
-  if (expect_false (!next))
+  if (expect_false (!prev))
     {
-      ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
+      cctx_current->idle_sp = STACKLEVEL;
-      assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
+      assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
     }
   else if (expect_true (prev != next))
     {
-      coro_cctx *prev__cctx;
+      coro_cctx *cctx_prev;
       if (expect_false (prev->flags & CF_NEW))
         {
           /* create a new empty/source context */
-          prev->cctx = cctx_new_empty ();
           prev->flags &= ~CF_NEW;
           prev->flags |=  CF_RUNNING;
         }
       prev->flags &= ~CF_RUNNING;
           coro_setup (aTHX_ next);
         }
       else
         load_perl (aTHX_ next);
-      prev__cctx = prev->cctx;
       /* possibly untie and reuse the cctx */
       if (expect_true (
-            prev__cctx->idle_sp == STACKLEVEL
+            cctx_current->idle_sp == STACKLEVEL
-            && !(prev__cctx->flags & CC_TRACE)
+            && !(cctx_current->flags & CC_TRACE)
             && !force_cctx
          ))
         {
           /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
-          assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
+          assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
-          prev->cctx = 0;
           /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
           /* without this the next cctx_get might destroy the prev__cctx while still in use */
-          if (expect_false (CCTX_EXPIRED (prev__cctx)))
+          if (expect_false (CCTX_EXPIRED (cctx_current)))
             if (!next->cctx)
               next->cctx = cctx_get (aTHX);
-          cctx_put (prev__cctx);
+          cctx_put (cctx_current);
+          assert (!prev->cctx);//D temporary
         }
+      else
+        prev->cctx = cctx_current;
       ++next->usecount;
-      if (expect_true (!next->cctx))
+      cctx_prev    = cctx_current;
-        next->cctx = cctx_get (aTHX);
+      cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
-      if (expect_false (prev__cctx != next->cctx))
+      next->cctx = 0;
+      if (expect_false (cctx_prev != cctx_current))
         {
-          prev__cctx->top_env = PL_top_env;
+          cctx_prev->top_env = PL_top_env;
-          PL_top_env = next->cctx->top_env;
+          PL_top_env = cctx_current->top_env;
-          coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
+          coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
         }
       transfer_tail (aTHX);
     }
 }
         coro_thx = PERL_GET_CONTEXT;
 # endif
 #endif
         BOOT_PAGESIZE;
+        cctx_current = cctx_new_empty ();
         irsgv    = gv_fetchpv ("/"     , GV_ADD|GV_NOTQUAL, SVt_PV);
         stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
         orig_sigelem_get = PL_vtbl_sigelem.svt_get;   PL_vtbl_sigelem.svt_get   = coro_sigelem_get;
         orig_sigelem_set = PL_vtbl_sigelem.svt_set;   PL_vtbl_sigelem.svt_set   = coro_sigelem_set;
 _exit (int code)
         PROTOTYPE: $
 	CODE:
 	_exit (code);
-#if CORO_CLONE
 SV *
 clone (Coro::State coro)
 	CODE:
 {
+#if CORO_CLONE
         struct coro *ncoro = coro_clone (coro);
         MAGIC *mg;
         /* TODO: too much duplication */
         ncoro->hv = newHV ();
         mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
         mg->mg_flags |= MGf_DUP;
         RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
+#else
+        croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
+#endif
 }
 	OUTPUT:
         RETVAL
-#endif
 int
 cctx_stacksize (int new_stacksize = 0)
 	PROTOTYPE: ;$
 	CODE:

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.321 by root, Sat Nov 22 02:09:54 2008 UTC vs. Revision 1.322 by root, Sat Nov 22 05:13:34 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.321 by root, Sat Nov 22 02:09:54 2008 UTC vs.
Revision 1.322 by root, Sat Nov 22 05:13:34 2008 UTC