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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.122 by root, Mon Dec 4 13:47:56 2006 UTC vs.
Revision 1.126 by root, Tue Dec 12 04:19:56 2006 UTC

 # ifndef IS_PADCONST
 #  define IS_PADCONST(v) 0
 # endif
 #endif
+/* 5.8.7 */
+#ifndef SvRV_set
+# define SvRV_set(s,v) SvRV(s) = (v)
+#endif
 #include <stdio.h>
 #include <errno.h>
+#include <assert.h>
 #if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
 # undef STACKGUARD
 #endif
   /* optionally saved, might be zero */
   AV *defav; /* @_ */
   SV *defsv; /* $_ */
   SV *errsv; /* $@ */
   SV *irssv; /* $/ */
+  SV *irssv_sv; /* real $/ cache */
 #define VAR(name,type) type name;
 # include "state.h"
 #undef VAR
 #undef VAR
   if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
   if (c->defsv) REPLACE_SV (DEFSV          , c->defsv);
   if (c->errsv) REPLACE_SV (ERRSV          , c->errsv);
-  if (c->irssv) REPLACE_SV (PL_rs          , c->irssv);
+  if (c->irssv)
+    {
+      if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
+        SvREFCNT_dec (c->irssv);
+      else
+        {
+          REPLACE_SV (PL_rs, c->irssv);
+          if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
+          sv_setsv (c->irssv_sv, PL_rs);
+        }
+    }
   {
     dSP;
     CV *cv;
     /*
      * the worst thing you can imagine happens first - we have to save
      * (and reinitialize) all cv's in the whole callchain :(
      */
+    EXTEND (SP, 3 + 1);
     PUSHs (Nullsv);
     /* this loop was inspired by pp_caller */
     for (;;)
       {
         while (cxix >= 0)
                 CV *cv = cx->blk_sub.cv;
                 if (CvDEPTH (cv))
                   {
                     EXTEND (SP, 3);
                     PUSHs ((SV *)CvPADLIST (cv));
                     PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
                     PUSHs ((SV *)cv);
                     CvDEPTH (cv) = 0;
                     get_padlist (cv);
                   }
               }
-#ifdef CXt_FORMAT
-            else if (CxTYPE (cx) == CXt_FORMAT)
-              {
-                /* I never used formats, so how should I know how these are implemented? */
-                /* my bold guess is as a simple, plain sub... */
-                croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
-              }
-#endif
           }
         if (top_si->si_type == PERLSI_MAIN)
           break;
  * allocate various perl stacks. This is an exact copy
  * 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 USE_PERL_INIT_STACKS
+# define coro_init_stacks init_stacks
+#else
 static void
 coro_init_stacks ()
 {
     PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
     PL_curstackinfo->si_type = PERLSI_MAIN;
 static void
 coro_destroy_stacks ()
 {
   if (!IN_DESTRUCT)
     {
-      /* is this ugly, I ask? */
+      /* restore all saved variables and stuff */
       LEAVE_SCOPE (0);
+      assert (PL_tmps_floor == -1);
-      /* sure it is, but more important: is it correct?? :/ */
+      /* free all temporaries */
       FREETMPS;
+      assert (PL_tmps_ix == -1);
-      /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
+      POPSTACK_TO (PL_mainstack);
     }
   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);/*D*//*remove*/
-          SvREFCNT_dec (PL_curstackinfo->si_stack);
+        SvREFCNT_dec (PL_curstackinfo->si_stack);
-        }
       Safefree (PL_curstackinfo->si_cxstack);
       Safefree (PL_curstackinfo);
       PL_curstackinfo = p;
   }
   Safefree (PL_savestack);
 #if !PERL_VERSION_ATLEAST (5,9,0)
   Safefree (PL_retstack);
 #endif
 }
+#endif
 static void
 setup_coro (struct coro *coro)
 {
   /*
 {
   coro_cctx *cctx;
   ++cctx_count;
-  New (0, cctx, 1, coro_cctx);
+  Newz (0, cctx, 1, coro_cctx);
 #if HAVE_MMAP
   cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
   /* mmap supposedly does allocate-on-write for us */
 {
   dSTACKLEVEL;
   /* sometimes transfer is only called to set idle_sp */
   if (!next)
+    {
-    ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
+      ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
+      assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */
+    }
   else if (prev != next)
     {
       coro_cctx *prev__cctx;
       if (prev->flags & CF_NEW)
           /* first get rid of the old state */
           save_perl (prev);
           /* setup coroutine call */
           setup_coro (next);
           /* need a new stack */
-          assert (!next->stack);
+          assert (!next->cctx);
         }
       else
         {
           /* coroutine already started */
           save_perl (prev);

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.122 by root, Mon Dec 4 13:47:56 2006 UTC vs. Revision 1.126 by root, Tue Dec 12 04:19:56 2006 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.122 by root, Mon Dec 4 13:47:56 2006 UTC vs.
Revision 1.126 by root, Tue Dec 12 04:19:56 2006 UTC