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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.307 by root, Wed Nov 19 14:34:46 2008 UTC

   /* state data */
   struct CoroSLF slf_frame; /* saved slf frame */
   AV *mainstack;
   perl_slots *slot; /* basically the saved sp */
+  CV *startcv; /* the CV to execute */
-  AV *args;   /* data associated with this coroutine (initial args) */
+  AV *args;    /* data associated with this coroutine (initial args) */
-  int refcnt; /* coroutines are refcounted, yes */
+  int refcnt;  /* coroutines are refcounted, yes */
-  int flags;  /* CF_ flags */
+  int flags;   /* CF_ flags */
-  HV *hv;     /* the perl hash associated with this coro, if any */
+  HV *hv;      /* the perl hash associated with this coro, if any */
   void (*on_destroy)(pTHX_ struct coro *coro);
   /* statistics */
   int usecount; /* number of transfers to this coro */
 #if PERL_VERSION_ATLEAST (5,10,0)
          /* silence stupid and wrong 5.10 warning that I am unable to switch off */
          get_hv (name, create);
 #endif
   return get_hv (name, create);
+}
+/* may croak */
+INLINE CV *
+coro_sv_2cv (SV *sv)
+{
+  HV *st;
+  GV *gvp;
+  return sv_2cv (sv, &st, &gvp, 0);
 }
 static AV *
 coro_clone_padlist (pTHX_ CV *cv)
 {
   else
    {
 #if CORO_PREFER_PERL_FUNCTIONS
      /* this is probably cleaner? but also slower! */
      /* in practise, it seems to be less stable */
-     CV *cp = Perl_cv_clone (cv);
+     CV *cp = Perl_cv_clone (aTHX_ cv);
      CvPADLIST (cv) = CvPADLIST (cp);
      CvPADLIST (cp) = 0;
      SvREFCNT_dec (cp);
 #else
      CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
  * of perl.c:init_stacks, except that it uses less memory
  * on the (sometimes correct) assumption that coroutines do
  * not usually need a lot of stackspace.
  */
 #if CORO_PREFER_PERL_FUNCTIONS
-# define coro_init_stacks init_stacks
+# define coro_init_stacks(thx) init_stacks ()
 #else
 static void
 coro_init_stacks (pTHX)
 {
     PL_curstackinfo = new_stackinfo(32, 8);
                           SAVETMPS;
                           EXTEND (SP, 3);
                           PUSHMARK (SP);
                           PUSHs (&PL_sv_yes);
                           PUSHs (fullname);
-                          PUSHs (CxHASARGS (cx)  ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
+                          PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
                           PUTBACK;
                           cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
                           if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
                           SPAGAIN;
                           FREETMPS;
       coro->slot = 0;
     }
   cctx_destroy (coro->cctx);
+  SvREFCNT_dec (coro->startcv);
   SvREFCNT_dec (coro->args);
   if (coro->next) coro->next->prev = coro->prev;
   if (coro->prev) coro->prev->next = coro->next;
   if (coro == coro_first) coro_first = coro->next;
   SV **ary;
   /* unfortunately, building manually saves memory */
   Newx (ary, 2, SV *);
   AvALLOC (av) = ary;
-  AvARRAY (av) = ary;
+  /*AvARRAY (av) = ary;*/
+  SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */
   AvMAX   (av) = 1;
   AvFILLp (av) = 0;
   ary [0] = newSViv (count);
   return newRV_noinc ((SV *)av);
       AvARRAY (av)[0] = AvARRAY (av)[1];
       AvARRAY (av)[1] = count_sv;
       cb = av_shift (av);
       if (SvOBJECT (cb))
+        {
-        api_ready (aTHX_ cb);
+          api_ready (aTHX_ cb);
-      else
+          --count;
-        croak ("callbacks not yet supported");
+        }
+      else if (SvTYPE (cb) == SVt_PVCV)
+        {
+          dSP;
+          PUSHMARK (SP);
+          XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
+          PUTBACK;
+          call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
+        }
       SvREFCNT_dec (cb);
-      --count;
     }
 }
 static void
 coro_semaphore_on_destroy (pTHX_ struct coro *coro)
 }
 static void
 slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
 {
+  if (items >= 2)
+    {
+      /* callback form */
+      AV *av = (AV *)SvRV (arg [0]);
+      CV *cb_cv = coro_sv_2cv (arg [1]);
+      av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
+      if (SvIVX (AvARRAY (av)[0]) > 0)
+        coro_semaphore_adjust (aTHX_ av, 0);
+      frame->prepare = prepare_nop;
+      frame->check   = slf_check_nop;
+    }
+  else
+    {
-  slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
+      slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
-  frame->check = slf_check_semaphore_wait;
+      frame->check = slf_check_semaphore_wait;
+    }
 }
 /* signal */
 static void
         CODE:
 {
         struct coro *coro;
         MAGIC *mg;
         HV *hv;
+        CV *cb;
         int i;
+        if (items > 1)
+          {
+            cb = coro_sv_2cv (ST (1));
+            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;
         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)
+          {
+            coro->startcv = SvREFCNT_inc_NN (cb);
-        av_extend (coro->args, items - 1);
+            av_extend (coro->args, items - 1);
+            av_push (coro->args, SvREFCNT_inc (cb));
-        for (i = 1; i < items; i++)
+            for (i = 2; i < items; i++)
-          av_push (coro->args, newSVsv (ST (i)));
+              av_push (coro->args, newSVsv (ST (i)));
+          }
 }
         OUTPUT:
         RETVAL
 void
         RETVAL = coro_new_rouse_cb (aTHX);
 	OUTPUT:
         RETVAL
 void
-rouse_wait (SV *cb = 0)
+rouse_wait (...)
         PROTOTYPE: ;$
 	PPCODE:
         CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
         adjust = 1
         CODE:
         coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
 void
-down (SV *self)
+down (...)
         CODE:
         CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
 void
-wait (SV *self)
+wait (...)
         CODE:
         CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
 void
 try (SV *self)
                  );
         OUTPUT:
         RETVAL
 void
-wait (SV *self)
+wait (...)
         CODE:
         CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
 void
 broadcast (SV *self)
 void
 _register (char *target, char *proto, SV *req)
 	CODE:
 {
-  	HV *st;
-        GV *gvp;
-        CV *req_cv = sv_2cv (req, &st, &gvp, 0);
+        CV *req_cv = coro_sv_2cv (req);
         /* newXSproto doesn't return the CV on 5.8 */
         CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
         sv_setpv ((SV *)slf_cv, proto);
         sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
 }

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.303 by root, Wed Nov 19 05:52:42 2008 UTC vs. Revision 1.307 by root, Wed Nov 19 14:34:46 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.307 by root, Wed Nov 19 14:34:46 2008 UTC