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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.294 by root, Tue Nov 18 08:31:03 2008 UTC vs.
Revision 1.297 by root, Tue Nov 18 11:04:42 2008 UTC

 #define expect_true(expr)  expect ((expr) != 0, 1)
 #define NOINLINE attribute ((noinline))
 #include "CoroAPI.h"
+#define GCoroAPI (&coroapi) /* very sneaky */
 #ifdef USE_ITHREADS
 # if CORO_PTHREAD
 static void *coro_thx;
 # endif
   /* statistics */
   int usecount; /* number of transfers to this coro */
   /* coro process data */
   int prio;
-  SV *throw; /* exception to be thrown */
+  SV *except; /* exception to be thrown */
   /* async_pool */
   SV *saved_deffh;
   /* linked list */
 /* the following variables are effectively part of the perl context */
 /* and get copied between struct coro and these variables */
 /* the mainr easonw e don't support windows process emulation */
 static struct CoroSLF slf_frame; /* the current slf frame */
-static SV *coro_throw;
 /** Coro ********************************************************************/
 #define PRIO_MAX     3
 #define PRIO_HIGH    1
     PUTBACK;
   }
   slf_frame  = c->slf_frame;
-  coro_throw = c->throw;
+  CORO_THROW = c->except;
 }
 static void
 save_perl (pTHX_ Coro__State c)
 {
-  c->throw     = coro_throw;
+  c->except    = CORO_THROW;
   c->slf_frame = slf_frame;
   {
     dSP;
     I32 cxix = cxstack_ix;
   /* no flags required, as an init function won't be called */
   PL_op = (OP *)&coro_setup_op;
   /* copy throw, in case it was set before coro_setup */
-  coro_throw = coro->throw;
+  CORO_THROW = coro->except;
 }
 static void
 coro_destruct (pTHX_ struct coro *coro)
 {
   SvREFCNT_dec (PL_diehook);
   SvREFCNT_dec (PL_warnhook);
   SvREFCNT_dec (coro->saved_deffh);
-  SvREFCNT_dec (coro_throw);
+  SvREFCNT_dec (CORO_THROW);
   coro_destruct_stacks (aTHX);
 }
 INLINE void
     }
   while (slf_frame.check (aTHX_ &slf_frame));
   slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
+  /* exception handling */
+  if (expect_false (CORO_THROW))
+    {
+      SV *exception = sv_2mortal (CORO_THROW);
+      CORO_THROW = 0;
+      sv_setsv (ERRSV, exception);
+      croak (0);
+    }
   /* return value handling - mostly like entersub */
   /* make sure we put something on the stack in scalar context */
   if (GIMME_V == G_SCALAR)
     {
       dSP;
         bot [1] = *sp;
       SP = bot + 1;
       PUTBACK;
-    }
-  /* exception handling */
-  if (expect_false (coro_throw))
-    {
-      SV *exception = sv_2mortal (coro_throw);
-      coro_throw = 0;
-      sv_setsv (ERRSV, exception);
-      croak (0);
     }
   return NORMAL;
 }
 slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
 {
   AV *av = (AV *)frame->data;
   SV *count_sv = AvARRAY (av)[0];
+  /* if we are about to throw, don't actually acquire the lock, just throw */
+  if (CORO_THROW)
+    return 0;
-  if (SvIVX (count_sv) > 0)
+  else if (SvIVX (count_sv) > 0)
     {
       SvSTATE_current->on_destroy = 0;
       SvIVX (count_sv) = SvIVX (count_sv) - 1;
       return 0;
     }
   if (SvIVX (AvARRAY (av)[0]) > 0)
     {
       frame->data    = (void *)av;
       frame->prepare = prepare_nop;
-      SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
     }
   else
     {
       av_push (av, SvREFCNT_inc (SvRV (coro_current)));
       frame->data    = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
       frame->prepare = prepare_schedule;
       /* to avoid race conditions when a woken-up coro gets terminated */
       /* we arrange for a temporary on_destroy that calls adjust (0) */
-      assert (!SvSTATE_current->on_destroy);//D
       SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
     }
   frame->check = slf_check_semaphore_down;
 static int
 slf_check_aio_req (pTHX_ struct CoroSLF *frame)
 {
   AV *state = (AV *)frame->data;
+  /* if we are about to throw, return early */
+  /* this does not cancel the aio request, but at least */
+  /* it quickly returns */
+  if (CORO_THROW)
+    return 0;
   /* one element that is an RV? repeat! */
   if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
     return 1;
 throw (Coro::State self, SV *throw = &PL_sv_undef)
 	PROTOTYPE: $;$
         CODE:
 {
 	struct coro *current = SvSTATE_current;
-	SV **throwp = self == current ? &coro_throw : &self->throw;
+	SV **throwp = self == current ? &CORO_THROW : &self->except;
         SvREFCNT_dec (*throwp);
         *throwp = SvOK (throw) ? newSVsv (throw) : 0;
 }
 void
           coroapi.ready        = api_ready;
           coroapi.is_ready     = api_is_ready;
           coroapi.nready       = coro_nready;
           coroapi.current      = coro_current;
-          GCoroAPI = &coroapi;
+          /*GCoroAPI = &coroapi;*/
           sv_setiv (sv, (IV)&coroapi);
           SvREADONLY_on (sv);
         }
 }

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.294 by root, Tue Nov 18 08:31:03 2008 UTC vs. Revision 1.297 by root, Tue Nov 18 11:04:42 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.294 by root, Tue Nov 18 08:31:03 2008 UTC vs.
Revision 1.297 by root, Tue Nov 18 11:04:42 2008 UTC