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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.375 by root, Fri Oct 2 19:58:02 2009 UTC vs.
Revision 1.389 by root, Fri Mar 4 16:41:21 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
 #ifndef SVs_PADSTALE
 # define SVs_PADSTALE 0
 #endif
-#ifdef WIN32
+#if defined(_WIN32)
+# undef HAS_GETTIMEOFDAY
 # undef setjmp
 # undef longjmp
 # undef _exit
 # define setjmp _setjmp /* deep magic */
 #else
   CV *startcv; /* the CV to execute */
   AV *args;    /* data associated with this coroutine (initial args) */
   int refcnt;  /* coroutines are refcounted, yes */
   int flags;   /* CF_ flags */
   HV *hv;      /* the perl hash associated with this coro, if any */
-  void (*on_destroy)(pTHX_ struct coro *coro);
+  void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
   /* statistics */
   int usecount; /* number of transfers to this coro */
   /* coro process data */
   /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
   PL_op->op_flags |= OPf_STACKED;
   PL_op->op_private = 0;
   return PL_ppaddr [OP_ENTERSUB](aTHX);
 }
+/** time stuff **************************************************************/
+#ifdef HAS_GETTIMEOFDAY
+static void
+coro_u2time (pTHX_ UV ret[2])
+{
+  struct timeval tv;
+  gettimeofday (&tv, 0);
+  ret [0] = tv.tv_sec;
+  ret [1] = tv.tv_usec;
+}
+static double
+coro_nvtime ()
+{
+  struct timeval tv;
+  gettimeofday (&tv, 0);
+  return tv.tv_sec + tv.tv_usec * 1e-6;
+}
+static void
+time_init (pTHX)
+{
+  nvtime = coro_nvtime;
+  u2time = coro_u2time;
+}
+#else
+static void
+time_init (pTHX)
+{
+  SV **svp;
+  require_pv ("Time/HiRes.pm");
+  svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
+  if (!svp)          croak ("Time::HiRes is required, but missing.");
+  if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
+  nvtime = INT2PTR (double (*)(), SvIV (*svp));
+  svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
+  u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
+}
+#endif
 /** lowlevel stuff **********************************************************/
 static SV *
 coro_get_sv (pTHX_ const char *name, int create)
       SvFLAGS (a)    = (SvFLAGS (a) & keep) | (SvFLAGS (b   ) & ~keep);
       SvFLAGS (b)    = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
 #if PERL_VERSION_ATLEAST (5,10,0)
       /* perl 5.10 complicates this _quite_ a bit, but it also is
-       * is much faster, so no quarrels here. alternatively, we could
+       * much faster, so no quarrels here. alternatively, we could
        * sv_upgrade to avoid this.
        */
       {
         /* swap sv_u */
         tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
               {
                 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;
   PL_comppad_name_fill  = 0;
   PL_comppad_name_floor = 0;
   PL_curpm      = 0;
   PL_curpad     = 0;
   PL_localizing = 0;
-  PL_dirty      = 0;
   PL_restartop  = 0;
 #if PERL_VERSION_ATLEAST (5,10,0)
   PL_parser     = 0;
 #endif
   PL_hints      = 0;
     SvREFCNT_dec (coro->saved_deffh);
     SvREFCNT_dec (coro->rouse_cb);
     SvREFCNT_dec (coro->invoke_cb);
     SvREFCNT_dec (coro->invoke_av);
-    SvREFCNT_dec (coro->swap_sv);
   }
 }
 INLINE void
 free_coro_mortal (pTHX)
       && coro->mainstack != main_mainstack
       && coro->slot
       && !PL_dirty)
     destroy_perl (aTHX_ coro);
+  if (coro->next) coro->next->prev = coro->prev;
+  if (coro->prev) coro->prev->next = coro->next;
+  if (coro == coro_first) coro_first = coro->next;
   cctx_destroy (coro->cctx);
   SvREFCNT_dec (coro->startcv);
   SvREFCNT_dec (coro->args);
+  SvREFCNT_dec (coro->swap_sv);
   SvREFCNT_dec (CORO_THROW);
-  if (coro->next) coro->next->prev = coro->prev;
-  if (coro->prev) coro->prev->next = coro->next;
-  if (coro == coro_first) coro_first = coro->next;
   return 1;
 }
 static int
         {
           /* 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;
 }
         coroapi.prepare_nop          = prepare_nop;
         coroapi.prepare_schedule     = prepare_schedule;
         coroapi.prepare_cede         = prepare_cede;
         coroapi.prepare_cede_notself = prepare_cede_notself;
-        {
+        time_init (aTHX);
-          SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
-          if (!svp)          croak ("Time::HiRes is required");
-          if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
-          nvtime = INT2PTR (double (*)(), SvIV (*svp));
-          svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
-          u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
-        }
         assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
 }
 SV *
         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.375 by root, Fri Oct 2 19:58:02 2009 UTC vs. Revision 1.389 by root, Fri Mar 4 16:41:21 2011 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.375 by root, Fri Oct 2 19:58:02 2009 UTC vs.
Revision 1.389 by root, Fri Mar 4 16:41:21 2011 UTC