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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.55 by pcg, Thu Apr 1 02:29:05 2004 UTC vs.
Revision 1.59 by root, Mon Jul 19 01:32:27 2004 UTC

+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 #include "patchlevel.h"
 # define LOCK   0
 # define UNLOCK 0
 #endif
 static struct CoroAPI coroapi;
+static AV *main_mainstack; /* used to differentiate between $main and others */
+static HV *coro_state_stash;
+static SV *ucoro_state_sv;
+static U32 ucoro_state_hash;
+static SV *coro_mortal; /* will be freed after next transfer */
 /* this is actually not only the c stack but also c registers etc... */
 typedef struct {
   int refcnt; /* pointer reference counter */
   int usecnt; /* shared by how many coroutines */
 };
 typedef struct coro *Coro__State;
 typedef struct coro *Coro__State_or_hashref;
-static AV *main_mainstack; /* used to differentiate between $main and others */
-static HV *coro_state_stash;
-static SV *ucoro_state_sv;
-static U32 ucoro_state_hash;
-static SV *coro_mortal; /* will be freed after next transfer */
 /* mostly copied from op.c:cv_clone2 */
 STATIC AV *
-clone_padlist (AV *protopadlist)
+clone_padlist (pTHX_ AV *protopadlist)
 {
   AV *av;
   I32 ix;
   AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
   AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
   return newpadlist;
 }
 STATIC void
-free_padlist (AV *padlist)
+free_padlist (pTHX_ AV *padlist)
 {
   /* may be during global destruction */
   if (SvREFCNT (padlist))
     {
       I32 i = AvFILLp (padlist);
   AV *padlist;
   AV *av = (AV *)mg->mg_obj;
   /* casting is fun. */
   while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
-    free_padlist (padlist);
+    free_padlist (aTHX_ padlist);
 }
 #define PERL_MAGIC_coro PERL_MAGIC_ext
 static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
 /* the next two functions merely cache the padlists */
 STATIC void
-get_padlist (CV *cv)
+get_padlist (pTHX_ CV *cv)
 {
   MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
   if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
     CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
   else
-    CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
+    CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
 }
 STATIC void
-put_padlist (CV *cv)
+put_padlist (pTHX_ CV *cv)
 {
   MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
   if (!mg)
     {
       {
         AV *padlist = (AV *)POPs;
         if (padlist)
           {
-            put_padlist (cv); /* mark this padlist as available */
+            put_padlist (aTHX_ cv); /* mark this padlist as available */
             CvPADLIST(cv) = padlist;
           }
         ++CvDEPTH(cv);
       }
                       }
                     PUSHs ((SV *)CvPADLIST(cv));
                     PUSHs ((SV *)cv);
-                    get_padlist (cv); /* this is a monster */
+                    get_padlist (aTHX_ cv); /* this is a monster */
                   }
               }
 #ifdef CXt_FORMAT
             else if (CxTYPE(cx) == CXt_FORMAT)
               {
       /* is this ugly, I ask? */
       LEAVE_SCOPE (0);
       /* sure it is, but more important: is it correct?? :/ */
       FREETMPS;
+      /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
     }
   while (PL_curstackinfo->si_next)
     PL_curstackinfo = PL_curstackinfo->si_next;
   while (PL_curstackinfo)
     {
       PERL_SI *p = PL_curstackinfo->si_prev;
-      {
+      { /*D*//*remove*/
         dSP;
         SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
         PUTBACK; /* possibly superfluous */
       }
       if (!IN_DESTRUCT)
         {
-          dounwind(-1);
+          dounwind (-1);/*D*//*remove*/
-          SvREFCNT_dec(PL_curstackinfo->si_stack);
+          SvREFCNT_dec (PL_curstackinfo->si_stack);
         }
-      Safefree(PL_curstackinfo->si_cxstack);
+      Safefree (PL_curstackinfo->si_cxstack);
-      Safefree(PL_curstackinfo);
+      Safefree (PL_curstackinfo);
       PL_curstackinfo = p;
   }
-  Safefree(PL_tmps_stack);
+  Safefree (PL_tmps_stack);
-  Safefree(PL_markstack);
+  Safefree (PL_markstack);
-  Safefree(PL_scopestack);
+  Safefree (PL_scopestack);
-  Safefree(PL_savestack);
+  Safefree (PL_savestack);
-  Safefree(PL_retstack);
+  Safefree (PL_retstack);
 }
 static void
 allocate_stack (Coro__State ctx, int alloc)
 {
 setup_coro (void *arg)
 {
   /*
    * emulate part of the perl startup here.
    */
+  dTHX;
   dSP;
   Coro__State ctx = (Coro__State)arg;
   SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
   coro_init_stacks (aTHX);
 continue_coro (void *arg)
 {
   /*
    * this is a _very_ stripped down perl interpreter ;)
    */
+  dTHX;
   Coro__State ctx = (Coro__State)arg;
   JMPENV coro_start_env;
   PL_top_env = &ctx->start_env;
 api_transfer(pTHX_ SV *prev, SV *next, int flags)
 {
   SV_CORO (prev, "Coro::transfer");
   SV_CORO (next, "Coro::transfer");
-  transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
+  transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
 }
 /** Coro ********************************************************************/
 #define PRIO_MAX     3
 static GV *coro_current, *coro_idle;
 static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
 static int coro_nready;
 static void
-coro_enq (SV *sv)
+coro_enq (pTHX_ SV *sv)
 {
   if (SvTYPE (sv) == SVt_PVHV)
     {
       SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
       int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
   croak ("Coro::ready tried to enqueue something that is not a coroutine");
 }
 static SV *
-coro_deq (int min_prio)
+coro_deq (pTHX_ int min_prio)
 {
   int prio = PRIO_MAX - PRIO_MIN;
   min_prio -= PRIO_MIN;
   if (min_prio < 0)
 }
 static void
 api_ready (SV *coro)
 {
+  dTHX;
   if (SvROK (coro))
     coro = SvRV (coro);
   LOCK;
-  coro_enq (SvREFCNT_inc (coro));
+  coro_enq (aTHX_ SvREFCNT_inc (coro));
   UNLOCK;
 }
 static void
 api_schedule (void)
 {
+  dTHX;
   SV *prev, *next;
   LOCK;
   prev = SvRV (GvSV (coro_current));
-  next = coro_deq (PRIO_MIN);
+  next = coro_deq (aTHX_ PRIO_MIN);
   if (!next)
     next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
   /* free this only after the transfer */
 }
 static void
 api_cede (void)
 {
+  dTHX;
   LOCK;
-  coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
+  coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
   UNLOCK;
   api_schedule ();
 }
           croak ("Coro::State::_newprocess expects an arrayref");
         Newz (0, coro, 1, struct coro);
         coro->args = (AV *)SvREFCNT_inc (SvRV (args));
-        coro->mainstack = 0; /* actual work is done inside transfer */
+        /*coro->mainstack = 0; *//*actual work is done inside transfer */
-        coro->stack = 0;
+        /*coro->stack = 0;*/
         /* same as JMPENV_BOOTSTRAP */
         /* we might be able to recycle start_env, but safe is safe */
-        //Zero(&coro->start_env, 1, JMPENV);
+        /*Zero(&coro->start_env, 1, JMPENV);*/
         coro->start_env.je_ret = -1;
         coro->start_env.je_mustcatch = TRUE;
         RETVAL = coro;
         OUTPUT:

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.55 by pcg, Thu Apr 1 02:29:05 2004 UTC vs. Revision 1.59 by root, Mon Jul 19 01:32:27 2004 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.55 by pcg, Thu Apr 1 02:29:05 2004 UTC vs.
Revision 1.59 by root, Mon Jul 19 01:32:27 2004 UTC