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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.97 by root, Sun Nov 26 21:21:14 2006 UTC vs.
Revision 1.98 by root, Sun Nov 26 21:25:53 2006 UTC

-#define PERL_NO_GET_CONTEXT
 #include "libcoro/coro.c"
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 typedef struct coro *Coro__State;
 typedef struct coro *Coro__State_or_hashref;
 static AV *
-coro_clone_padlist (pTHX_ CV *cv)
+coro_clone_padlist (CV *cv)
 {
   AV *padlist = CvPADLIST (cv);
   AV *newpadlist, *newpad;
   newpadlist = newAV ();
   return newpadlist;
 }
 static void
-free_padlist (pTHX_ AV *padlist)
+free_padlist (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 (aTHX_ padlist);
+    free_padlist (padlist);
   SvREFCNT_dec (av);
   return 0;
 }
 static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
 /* the next two functions merely cache the padlists */
 static void
-get_padlist (pTHX_ CV *cv)
+get_padlist (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
    {
 #if 0
      /* this is probably cleaner, but also slower? */
-     CV *cp = Perl_cv_clone (aTHX_ cv);
+     CV *cp = Perl_cv_clone (cv);
      CvPADLIST (cv) = CvPADLIST (cp);
      CvPADLIST (cp) = 0;
      SvREFCNT_dec (cp);
 #else
-     CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
+     CvPADLIST (cv) = coro_clone_padlist (cv);
 #endif
    }
 }
 static void
-put_padlist (pTHX_ CV *cv)
+put_padlist (CV *cv)
 {
   MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
   if (!mg)
     {
 }
 #define SB do {
 #define SE } while (0)
-#define LOAD(state)       load_state(aTHX_ (state));
+#define LOAD(state)       load_state((state));
-#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
+#define SAVE(state,flags) save_state((state),(flags));
 #define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
 static void
-load_state(pTHX_ Coro__State c)
+load_state(Coro__State c)
 {
   PL_dowarn = c->dowarn;
   PL_in_eval = c->in_eval;
   PL_curstackinfo = c->curstackinfo;
       {
         AV *padlist = (AV *)POPs;
         if (padlist)
           {
-            put_padlist (aTHX_ cv); /* mark this padlist as available */
+            put_padlist (cv); /* mark this padlist as available */
             CvPADLIST(cv) = padlist;
           }
         ++CvDEPTH(cv);
       }
     PUTBACK;
   }
 }
 static void
-save_state(pTHX_ Coro__State c, int flags)
+save_state(Coro__State c, int flags)
 {
   {
     dSP;
     I32 cxix = cxstack_ix;
     PERL_CONTEXT *ccstk = cxstack;
                       }
                     PUSHs ((SV *)CvPADLIST(cv));
                     PUSHs ((SV *)cv);
-                    get_padlist (aTHX_ cv);
+                    get_padlist (cv);
                   }
               }
 #ifdef CXt_FORMAT
             else if (CxTYPE(cx) == CXt_FORMAT)
               {
  * 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.
  */
 static void
-coro_init_stacks (pTHX)
+coro_init_stacks ()
 {
     LOCK;
     PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
     PL_curstackinfo->si_type = PERLSI_MAIN;
 /*
  * destroy the stacks, the callchain etc...
  */
 static void
-destroy_stacks(pTHX)
+destroy_stacks()
 {
   if (!IN_DESTRUCT)
     {
       /* is this ugly, I ask? */
       LEAVE_SCOPE (0);
   dTHX;
   dSP;
   UNOP myop;
   SV *sub_init = (SV *)get_cv ("Coro::State::coro_init", FALSE);
-  coro_init_stacks (aTHX);
+  coro_init_stacks ();
   /*PL_curcop = 0;*/
   /*PL_in_eval = PL_in_eval;*/ /* inherit */
   SvREFCNT_dec (GvAV (PL_defgv));
   GvAV (PL_defgv) = coro->args; coro->args = 0;
 static void
 free_coro_mortal ()
 {
   if (coro_mortal)
     {
-      dTHX;
       SvREFCNT_dec (coro_mortal);
       coro_mortal = 0;
     }
 }
   /* continue at cctx_init, without entersub */
   PL_restartop = CvSTART (get_cv ("Coro::State::cctx_init", FALSE));
   /* somebody will hit me for both perl_run and PL_restartop */
-  ret = perl_run (aTHX_ PERL_GET_CONTEXT);
+  ret = perl_run (PERL_GET_CONTEXT);
   printf ("ret %d\n", ret);//D
   fputs ("FATAL: C coroutine fell over the edge of the world, aborting.\n", stderr);
   abort ();
 }
   stack_first = stack;
 }
 /* never call directly, always through the coro_state_transfer global variable */
 static void
-transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags)
+transfer_impl (struct coro *prev, struct coro *next, int flags)
 {
   dSTACKLEVEL;
   /* sometimes transfer is only called to set idle_sp */
   if (flags == TRANSFER_SET_STACKLEVEL)
 }
 /* use this function pointer to call the above function */
 /* this is done to increase chances of the compiler not inlining the call */
 /* not static to make it even harder for the compiler (and theoretically impossible in most cases */
-void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
+void (*coro_state_transfer)(struct coro *prev, struct coro *next, int flags) = transfer_impl;
 struct transfer_args
 {
   struct coro *prev, *next;
   int flags;
   if (coro->mainstack && coro->mainstack != main_mainstack)
     {
       struct coro temp;
-      SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
+      SAVE ((&temp), TRANSFER_SAVE_ALL);
-      LOAD (aTHX_ coro);
+      LOAD (coro);
-      destroy_stacks (aTHX);
+      destroy_stacks ();
       LOAD ((&temp)); /* this will get rid of defsv etc.. */
       coro->mainstack = 0;
     }
   SvREFCNT_dec (coro->args);
   Safefree (coro);
 }
 static int
-coro_state_clear (SV *sv, MAGIC *mg)
+coro_state_clear (pTHX_ SV *sv, MAGIC *mg)
 {
   struct coro *coro = (struct coro *)mg->mg_ptr;
   mg->mg_ptr = 0;
   coro_state_destroy (coro);
   return 0;
 }
 static int
-coro_state_dup (MAGIC *mg, CLONE_PARAMS *params)
+coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
 {
   struct coro *coro = (struct coro *)mg->mg_ptr;
   ++coro->refcnt;
   assert (mg->mg_type == PERL_MAGIC_ext);
   return (struct coro *)mg->mg_ptr;
 }
 static void
-prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev, SV *next, int flags)
+prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags)
 {
   ta->prev  = SvSTATE (prev);
   ta->next  = SvSTATE (next);
   ta->flags = flags;
 }
 api_transfer (SV *prev, SV *next, int flags)
 {
   dTHX;
   struct transfer_args ta;
-  prepare_transfer (aTHX_ &ta, prev, next, flags);
+  prepare_transfer (&ta, prev, next, flags);
   TRANSFER (ta);
 }
 /** Coro ********************************************************************/
 static GV *coro_current, *coro_idle;
 static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
 static int coro_nready;
 static void
-coro_enq (pTHX_ SV *sv)
+coro_enq (SV *sv)
 {
   int prio;
   if (SvTYPE (sv) != SVt_PVHV)
     croak ("Coro::ready tried to enqueue something that is not a coroutine");
   av_push (coro_ready [prio - PRIO_MIN], sv);
   coro_nready++;
 }
 static SV *
-coro_deq (pTHX_ int min_prio)
+coro_deq (int min_prio)
 {
   int prio = PRIO_MAX - PRIO_MIN;
   min_prio -= PRIO_MIN;
   if (min_prio < 0)
   if (SvROK (coro))
     coro = SvRV (coro);
   LOCK;
-  coro_enq (aTHX_ SvREFCNT_inc (coro));
+  coro_enq (SvREFCNT_inc (coro));
   UNLOCK;
 }
 static void
-prepare_schedule (aTHX_ struct transfer_args *ta)
+prepare_schedule (struct transfer_args *ta)
 {
   SV *current, *prev, *next;
   LOCK;
   for (;;)
     {
       LOCK;
-      next = coro_deq (aTHX_ PRIO_MIN);
+      next = coro_deq (PRIO_MIN);
       if (next)
         break;
       UNLOCK;
   UNLOCK;
 }
 static void
-prepare_cede (aTHX_ struct transfer_args *ta)
+prepare_cede (struct transfer_args *ta)
 {
   LOCK;
-  coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
+  coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
   UNLOCK;
   prepare_schedule (ta);
 }

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.97 by root, Sun Nov 26 21:21:14 2006 UTC vs. Revision 1.98 by root, Sun Nov 26 21:25:53 2006 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.97 by root, Sun Nov 26 21:21:14 2006 UTC vs.
Revision 1.98 by root, Sun Nov 26 21:25:53 2006 UTC