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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.376 by root, Fri Oct 2 20:48:04 2009 UTC vs.
Revision 1.382 by root, Thu Feb 10 08:06:27 2011 UTC

+/* this works around a bug in mingw32 providing a non-working setjmp */
+#define USE_NO_MINGW_SETJMP_TWO_ARGS
 #define NDEBUG 1
 #include "libcoro/coro.c"
 #define PERL_NO_GET_CONTEXT
               {
                 CV *cv = cx->blk_sub.cv;
                 if (expect_true (CvDEPTH (cv)))
                   {
+                    EXTEND (SP, 3);
                     PUSHs ((SV *)CvPADLIST (cv));
                     PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
                     PUSHs ((SV *)cv);
                     CvDEPTH (cv) = 0;
         {
           /* nothing to schedule: call the idle handler */
           if (SvROK (sv_idle)
               && SvOBJECT (SvRV (sv_idle)))
             {
+              if (SvRV (sv_idle) == SvRV (coro_current))
+                croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
               ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
               api_ready (aTHX_ SvRV (sv_idle));
               --coro_nready;
             }
           else
   if (PL_op->op_flags & OPf_STACKED)
     {
       if (items > slf_arga)
         {
           slf_arga = items;
-          free (slf_argv);
+          Safefree (slf_argv);
-          slf_argv = malloc (slf_arga * sizeof (SV *));
+          New (0, slf_argv, slf_arga, SV *);
         }
       slf_argc = items;
       for (i = 0; i < items; ++i)
     {
       SV *cb_cv = s_get_cv_croak (arg [1]);
       av_push (av, SvREFCNT_inc_NN (cb_cv));
       if (SvIVX (AvARRAY (av)[0]))
-        coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
+        coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
       frame->prepare = prepare_nop;
       frame->check   = slf_check_nop;
     }
   else if (SvIVX (AvARRAY (av)[0]))
     /* now call the AIO function - we assume our request is uncancelable */
     PUTBACK;
     call_sv ((SV *)req, G_VOID | G_DISCARD);
   }
-  /* now that the requets is going, we loop toll we have a result */
+  /* now that the request is going, we loop till we have a result */
   frame->data    = (void *)state;
   frame->prepare = prepare_schedule;
   frame->check   = slf_check_aio_req;
 }
         RETVAL = boolSV (coro->flags & ix);
 	OUTPUT:
         RETVAL
 void
-throw (Coro::State self, SV *throw = &PL_sv_undef)
+throw (Coro::State self, SV *exception = &PL_sv_undef)
 	PROTOTYPE: $;$
         CODE:
 {
 	struct coro *current = SvSTATE_current;
-	SV **throwp = self == current ? &CORO_THROW : &self->except;
+	SV **exceptionp = self == current ? &CORO_THROW : &self->except;
-        SvREFCNT_dec (*throwp);
+        SvREFCNT_dec (*exceptionp);
-        SvGETMAGIC (throw);
+        SvGETMAGIC (exception);
-        *throwp = SvOK (throw) ? newSVsv (throw) : 0;
+        *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
 }
 void
 api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
 	PROTOTYPE: $;$
           {
             PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
             coro_old_pp_sselect = 0;
           }

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.376 by root, Fri Oct 2 20:48:04 2009 UTC vs. Revision 1.382 by root, Thu Feb 10 08:06:27 2011 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.376 by root, Fri Oct 2 20:48:04 2009 UTC vs.
Revision 1.382 by root, Thu Feb 10 08:06:27 2011 UTC