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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.93 by root, Sun Nov 26 03:22:50 2006 UTC vs.
Revision 1.96 by root, Sun Nov 26 18:25:11 2006 UTC

 #define dSTACKLEVEL int stacklevel
 #define STACKLEVEL ((void *)&stacklevel)
 #define IN_DESTRUCT (PL_main_cv == Nullcv)
-#define labs(l) ((l) >= 0 ? (l) : -(l))
 #include "CoroAPI.h"
 #define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
 #ifdef USE_ITHREADS
   /* the stack */
   void *sptr;
   long ssize; /* positive == mmap, otherwise malloc */
   /* cpu state */
-  void *idle_sp; /* original stacklevel when coroutine was created */
+  void *idle_sp; /* sp of top-level transfer/schedule/cede call */
   JMPENV *top_env;
   coro_context cctx;
 } coro_stack;
-/* the (fake) coro_stack representing the main program */
-static coro_stack *main_stack;
 /* this is a structure representing a perl-level coroutine */
 struct coro {
   /* the c coroutine allocated to this perl coroutine, if any */
   coro_stack *stack;
   if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
     CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
   else
    {
 #if 0
-     /* this should work - but it doesn't :( */
+     /* this is probably cleaner, but also slower? */
      CV *cp = Perl_cv_clone (aTHX_ cv);
      CvPADLIST (cv) = CvPADLIST (cp);
      CvPADLIST (cp) = 0;
      SvREFCNT_dec (cp);
 #else
 {
   /*
    * this is a _very_ stripped down perl interpreter ;)
    */
   dTHX;
+  int ret;
   UNLOCK;
   PL_top_env = &PL_start_env;
   sv_setiv (get_sv ("Coro::State::cctx_restartop", FALSE), PTR2IV (PL_op));
   /* 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_restart_op */
+  /* somebody will hit me for both perl_run and PL_restartop */
-  perl_run (aTHX_ PERL_GET_CONTEXT);
+  ret = perl_run (aTHX_ PERL_GET_CONTEXT);
+  printf ("ret %d\n", ret);//D
+  fputs ("FATAL: C coroutine fell over the edge of the world, aborting.\n", stderr);
   abort ();
 }
 static coro_stack *
 stack_new ()
   New (0, stack, 1, coro_stack);
 #if HAVE_MMAP
-  stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */
+  stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
+  /* mmap suppsedly does allocate-on-write for us */
   stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
   if (stack->sptr == (void *)-1)
     {
       perror ("FATAL: unable to mmap stack for coroutine");
       _exit (EXIT_FAILURE);
     }
+# if STACKGUARD
   mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
+# endif
 #else
   stack->ssize = STACKSIZE * (long)sizeof (long);
   New (0, stack->sptr, STACKSIZE, long);
 }
 static void
 stack_free (coro_stack *stack)
 {
-  if (!stack || stack == main_stack)
+  if (!stack)
     return;
 #if HAVE_MMAP
   munmap (stack->sptr, stack->ssize);
 #else
           setup_coro (next);
           /* need a stack */
           next->stack = 0;
         }
+      if (!prev->stack)
+        /* create a new empty context */
+        Newz (0, prev->stack, 1, coro_stack);
       prev__stack = prev->stack;
       /* possibly "free" the stack */
       if (prev__stack->idle_sp == STACKLEVEL)
         {
         main_mainstack = PL_mainstack;
         coroapi.ver      = CORO_API_VERSION;
         coroapi.transfer = api_transfer;
-        Newz (0, main_stack, 1, coro_stack);
-        main_stack->idle_sp = (void *)-1;
         assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
 }
 SV *
 new (char *klass, ...)
         RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
         for (i = 1; i < items; i++)
           av_push (coro->args, newSVsv (ST (i)));
-        coro->stack = main_stack;
         /*coro->mainstack = 0; *//*actual work is done inside transfer */
         /*coro->stack = 0;*/
 }
         OUTPUT:
         RETVAL
 void
-transfer (...)
+_set_stacklevel (...)
 	ALIAS:
-        Coro::schedule  = 1
+        Coro::State::transfer = 1
-        Coro::cede      = 2
+        Coro::schedule        = 2
-        _set_stacklevel = 3
+        Coro::cede            = 3
+        Coro::Cont::yield     = 4
         CODE:
 {
 	struct transfer_args ta;
         switch (ix)
           {
             case 0:
-              if (items != 3)
-                croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items);
-              prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2)));
-              break;
-            case 1:
-              prepare_schedule (&ta);
-              break;
-            case 2:
-              prepare_cede (&ta);
-              break;
-            case 3:
               ta.prev  = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0)));
               ta.next  = 0;
               ta.flags = TRANSFER_SET_STACKLEVEL;
               break;
+            case 1:
+              if (items != 3)
+                croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items);
+              prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2)));
+              break;
+            case 2:
+              prepare_schedule (&ta);
+              break;
+            case 3:
+              prepare_cede (&ta);
+              break;
+            case 4:
+              {
+                SV *yieldstack;
+                SV *sv;
+                AV *defav = GvAV (PL_defgv);
+                yieldstack = *hv_fetch (
+                   (HV *)SvRV (GvSV (coro_current)),
+                   "yieldstack", sizeof ("yieldstack") - 1,
+                   0
+                );
+                /* set up @_ -- ugly */
+                av_clear (defav);
+                av_fill (defav, items - 1);
+                while (items--)
+                  av_store (defav, items, SvREFCNT_inc (ST(items)));
+                sv = av_pop ((AV *)SvRV (yieldstack));
+                ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
+                ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
+                ta.flags = 0;
+                SvREFCNT_dec (sv);
+              }
+            break;
           }
         TRANSFER (ta);
 }
 _exit (code)
 	int	code
         PROTOTYPE: $
 	CODE:
 	_exit (code);
-MODULE = Coro::State                PACKAGE = Coro::Cont
-void
-yield (...)
-	PROTOTYPE: @
-        CODE:
-{
-        SV *yieldstack;
-        SV *sv;
-        AV *defav = GvAV (PL_defgv);
-        struct coro *prev, *next;
-        yieldstack = *hv_fetch (
-           (HV *)SvRV (GvSV (coro_current)),
-           "yieldstack", sizeof ("yieldstack") - 1,
-           0
-        );
-        /* set up @_ -- ugly */
-        av_clear (defav);
-        av_fill (defav, items - 1);
-        while (items--)
-          av_store (defav, items, SvREFCNT_inc (ST(items)));
-        sv = av_pop ((AV *)SvRV (yieldstack));
-        prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
-        next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
-        SvREFCNT_dec (sv);
-        coro_state_transfer (aTHX_ prev, next, 0);
-}
 MODULE = Coro::State                PACKAGE = Coro
 BOOT:
 {

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.93 by root, Sun Nov 26 03:22:50 2006 UTC vs. Revision 1.96 by root, Sun Nov 26 18:25:11 2006 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.93 by root, Sun Nov 26 03:22:50 2006 UTC vs.
Revision 1.96 by root, Sun Nov 26 18:25:11 2006 UTC