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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.339 by root, Mon Dec 15 00:28:30 2008 UTC vs.
Revision 1.343 by root, Mon Dec 15 16:41:43 2008 UTC

 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 */
+  CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
 };
 /* the structure where most of the perl state is stored, overlaid on the cxstack */
 typedef struct
 {
   if (expect_false (c->on_enter))
     {
       int i;
       for (i = 0; i <= AvFILLp (c->on_enter); ++i)
-        on_enterleave_call (AvARRAY (c->on_enter)[i]);
+        on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
     }
 }
 static void
 save_perl (pTHX_ Coro__State c)
   if (expect_false (c->on_leave))
     {
       int i;
       for (i = AvFILLp (c->on_leave); i >= 0; --i)
-        on_enterleave_call (AvARRAY (c->on_leave)[i]);
+        on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
     }
   c->except    = CORO_THROW;
   c->slf_frame = slf_frame;
   /* TODO: throwing up here is considered harmful */
   if (expect_true (prev != next))
     {
       if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
-        croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
+        croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
-      if (expect_false (next->flags & CF_RUNNING))
-        croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
-      if (expect_false (next->flags & CF_DESTROYED))
+      if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
-        croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
+        croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
 #if !PERL_VERSION_ATLEAST (5,10,0)
       if (expect_false (PL_lex_state != LEX_NOTPARSING))
         croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
 #endif
       if (expect_true (next_sv))
         {
           struct coro *next = SvSTATE_hv (next_sv);
           /* cannot transfer to destroyed coros, skip and look for next */
-          if (expect_false (next->flags & CF_DESTROYED))
+          if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
             SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
           else
             {
               next->flags &= ~CF_READY;
               --coro_nready;
   POPSTACK;
 }
 static SV *
-coro_avp_pop_and_free (AV **avp)
+coro_avp_pop_and_free (pTHX_ AV **avp)
 {
   AV *av = *avp;
   SV *res = av_pop (av);
   if (AvFILLp (av) < 0)
 }
 static void
 coro_pop_on_enter (pTHX_ void *coro)
 {
-  SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_enter);
+  SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
   SvREFCNT_dec (cb);
 }
 static void
 coro_pop_on_leave (pTHX_ void *coro)
 {
-  SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_leave);
+  SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
-  on_enterleave_call (sv_2mortal (cb));
+  on_enterleave_call (aTHX_ sv_2mortal (cb));
 }
 /*****************************************************************************/
 /* PerlIO::cede */
             if (ix)
               eval_sv (coderef, 0);
             else
               call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
+            POPSTACK;
             SPAGAIN;
-            POPSTACK;
             if (current != coro)
               {
                 PUTBACK;
                 save_perl (aTHX_ coro);
         ALIAS:
         is_ready     = CF_READY
         is_running   = CF_RUNNING
         is_new       = CF_NEW
         is_destroyed = CF_DESTROYED
+        is_suspended = CF_SUSPENDED
 	CODE:
         RETVAL = boolSV (coro->flags & ix);
 	OUTPUT:
         RETVAL
             SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
             SV *tmp = *src; *src = *dst; *dst = tmp;
           }
+void
+cancel (Coro::State self)
+	CODE:
+	coro_state_destroy (aTHX_ self);
+        coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
 MODULE = Coro::State                PACKAGE = Coro
 BOOT:
 {
 cede_notself (...)
 	CODE:
         CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
 void
-_cancel (Coro::State self)
-	CODE:
-	coro_state_destroy (aTHX_ self);
-        coro_call_on_destroy (aTHX_ self);
-void
 _set_current (SV *current)
         PROTOTYPE: $
 	CODE:
         SvREFCNT_dec (SvRV (coro_current));
         SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
 	CODE:
 {
 	struct coro *coro = SvSTATE_current;
   	AV **avp = ix ? &coro->on_leave : &coro->on_enter;
-        block = (SV *)coro_sv_2cv (block);
+        block = (SV *)coro_sv_2cv (aTHX_ block);
         if (!*avp)
           *avp = newAV ();
         av_push (*avp, SvREFCNT_inc (block));
                    GvSTASH (CvGV (cv))
                  );
 	OUTPUT:
         RETVAL
-# helper for Coro::Channel
+# helper for Coro::Channel and others
 SV *
 _alloc (int count)
 	CODE:
         RETVAL = coro_waitarray_new (aTHX_ count);
 	OUTPUT:

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.339 by root, Mon Dec 15 00:28:30 2008 UTC vs. Revision 1.343 by root, Mon Dec 15 16:41:43 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.339 by root, Mon Dec 15 00:28:30 2008 UTC vs.
Revision 1.343 by root, Mon Dec 15 16:41:43 2008 UTC