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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.365 by root, Mon Jul 20 16:18:30 2009 UTC vs.
Revision 1.368 by root, Thu Aug 13 02:35:41 2009 UTC

     /* somebody or something will hit me for both perl_run and PL_restartop */
     PL_restartop = PL_op;
     perl_run (PL_curinterp);
     /*
      * Unfortunately, there is no way to get at the return values of the
-     * coro body here, as perl_run destroys these
+     * coro body here, as perl_run destroys these. Likewise, we cannot catch
+     * runtime errors here, as this is just a random interpreter, not a thread.
      */
     /*
      * If perl-run returns we assume exit() was being called or the coro
      * fell off the end, which seems to be the only valid (non-bug)
 {
   int i;
   HV *hv = (HV *)SvRV (coro_current);
   AV *av = newAV ();
+  /* items are actually not so common, so optimise for this case */
+  if (items)
+    {
-  av_extend (av, items - 1);
+      av_extend (av, items - 1);
-  for (i = 0; i < items; ++i)
+      for (i = 0; i < items; ++i)
-    av_push (av, SvREFCNT_inc_NN (arg [i]));
+        av_push (av, SvREFCNT_inc_NN (arg [i]));
+    }
   hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
   av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
   api_ready (aTHX_ sv_manager);
 #if CORO_CLONE
 # include "clone.c"
 #endif
+/*****************************************************************************/
+static SV *
+coro_new (HV *stash, SV **argv, int argc, int is_coro)
+{
+  SV *coro_sv;
+  struct coro *coro;
+  MAGIC *mg;
+  HV *hv;
+  SV *cb;
+  int i;
+  if (argc > 0)
+    {
+      cb = s_get_cv_croak (argv [0]);
+      if (!is_coro)
+        {
+          if (CvISXSUB (cb))
+            croak ("Coro::State doesn't support XS functions as coroutine start, caught");
+          if (!CvROOT (cb))
+            croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
+        }
+    }
+  Newz (0, coro, 1, struct coro);
+  coro->args  = newAV ();
+  coro->flags = CF_NEW;
+  if (coro_first) coro_first->prev = coro;
+  coro->next = coro_first;
+  coro_first = coro;
+  coro->hv = hv = newHV ();
+  mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
+  mg->mg_flags |= MGf_DUP;
+  coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
+  if (argc > 0)
+    {
+      av_extend (coro->args, argc + is_coro - 1);
+      if (is_coro)
+        {
+          av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
+          cb = (SV *)cv_coro_run;
+        }
+      coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
+      for (i = 1; i < argc; i++)
+        av_push (coro->args, newSVsv (argv [i]));
+    }
+  return coro_sv;
+}
 MODULE = Coro::State                PACKAGE = Coro::State	PREFIX = api_
 PROTOTYPES: DISABLE
 BOOT:
         assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
 }
 SV *
-new (char *klass, ...)
+new (SV *klass, ...)
 	ALIAS:
         Coro::new = 1
         CODE:
-{
+        RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
-        struct coro *coro;
+	OUTPUT:
-        MAGIC *mg;
-        HV *hv;
-        SV *cb;
-        int i;
-        if (items > 1)
-          {
-            cb = s_get_cv_croak (ST (1));
-            if (!ix)
-              {
-                if (CvISXSUB (cb))
-                  croak ("Coro::State doesn't support XS functions as coroutine start, caught");
-                if (!CvROOT (cb))
-                  croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
-              }
-          }
-        Newz (0, coro, 1, struct coro);
-        coro->args  = newAV ();
-        coro->flags = CF_NEW;
-        if (coro_first) coro_first->prev = coro;
-        coro->next = coro_first;
-        coro_first = coro;
-        coro->hv = hv = newHV ();
-        mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
-        mg->mg_flags |= MGf_DUP;
-        RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
-        if (items > 1)
-          {
-            av_extend (coro->args, items - 1 + ix - 1);
-            if (ix)
-              {
-                av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
-                cb = (SV *)cv_coro_run;
-              }
-            coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
-            for (i = 2; i < items; i++)
-              av_push (coro->args, newSVsv (ST (i)));
-          }
-}
-        OUTPUT:
         RETVAL
 void
 transfer (...)
         PROTOTYPE: $$
           sv_setiv (sv, (IV)&coroapi);
           SvREADONLY_on (sv);
         }
 }
+SV *
+async (...)
+	PROTOTYPE: &@
+        CODE:
+        RETVAL = coro_new (coro_stash, &ST (0), items, 1);
+        api_ready (RETVAL);
+	OUTPUT:
+        RETVAL
 void
 terminate (...)
 	CODE:
         CORO_EXECUTE_SLF_XS (slf_init_terminate);
         SvGETMAGIC (hook);
         if (SvOK (hook))
 	  {
             coro_readyhook = newSVsv (hook);
             CORO_READYHOOK = invoke_sv_ready_hook_helper;
-            CORO_READYHOOK ();
           }
 	else
           {
             coro_readyhook = 0;
             CORO_READYHOOK = 0;

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.365 by root, Mon Jul 20 16:18:30 2009 UTC vs. Revision 1.368 by root, Thu Aug 13 02:35:41 2009 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.365 by root, Mon Jul 20 16:18:30 2009 UTC vs.
Revision 1.368 by root, Thu Aug 13 02:35:41 2009 UTC