ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.55 by pcg, Thu Apr 1 02:29:05 2004 UTC vs.
Revision 1.74 by root, Mon Oct 23 22:49:09 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#include "patchlevel.h" 9#include "patchlevel.h"
6 10
7#if PATCHLEVEL < 6 11#if PERL_VERSION < 6
8# ifndef PL_ppaddr 12# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr 13# define PL_ppaddr ppaddr
10# endif 14# endif
11# ifndef call_sv 15# ifndef call_sv
12# define call_sv perl_call_sv 16# define call_sv perl_call_sv
… …
23# ifndef IS_PADCONST 27# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
25# endif 29# endif
26#endif 30#endif
27 31
28#include "libcoro/coro.c" 32#include <errno.h>
29
30#include <signal.h> 33#include <signal.h>
31 34
32#ifdef HAVE_MMAP 35#ifdef HAVE_MMAP
33# include <unistd.h> 36# include <unistd.h>
34# include <sys/mman.h> 37# include <sys/mman.h>
… …
55 58
56#include "CoroAPI.h" 59#include "CoroAPI.h"
57 60
58#ifdef USE_ITHREADS 61#ifdef USE_ITHREADS
59static perl_mutex coro_mutex; 62static perl_mutex coro_mutex;
60# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 63# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
61# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 64# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
62#else 65#else
63# define LOCK 0 66# define LOCK (void)0
64# define UNLOCK 0 67# define UNLOCK (void)0
65#endif 68#endif
66 69
67static struct CoroAPI coroapi; 70static struct CoroAPI coroapi;
71static AV *main_mainstack; /* used to differentiate between $main and others */
72static HV *coro_state_stash;
73static SV *ucoro_state_sv;
74static U32 ucoro_state_hash;
75static SV *coro_mortal; /* will be freed after next transfer */
68 76
69/* this is actually not only the c stack but also c registers etc... */ 77/* this is actually not only the c stack but also c registers etc... */
70typedef struct { 78typedef struct {
71 int refcnt; /* pointer reference counter */ 79 int refcnt; /* pointer reference counter */
72 int usecnt; /* shared by how many coroutines */ 80 int usecnt; /* shared by how many coroutines */
… …
102 AV *mainstack; 110 AV *mainstack;
103 SV **stack_sp; 111 SV **stack_sp;
104 OP *op; 112 OP *op;
105 SV **curpad; 113 SV **curpad;
106 AV *comppad; 114 AV *comppad;
115 CV *compcv;
107 SV **stack_base; 116 SV **stack_base;
108 SV **stack_max; 117 SV **stack_max;
109 SV **tmps_stack; 118 SV **tmps_stack;
110 I32 tmps_floor; 119 I32 tmps_floor;
111 I32 tmps_ix; 120 I32 tmps_ix;
… …
120 I32 savestack_ix; 129 I32 savestack_ix;
121 I32 savestack_max; 130 I32 savestack_max;
122 OP **retstack; 131 OP **retstack;
123 I32 retstack_ix; 132 I32 retstack_ix;
124 I32 retstack_max; 133 I32 retstack_max;
134 PMOP *curpm;
125 COP *curcop; 135 COP *curcop;
126 JMPENV *top_env; 136 JMPENV *top_env;
127 137
128 /* data associated with this coroutine (initial args) */ 138 /* data associated with this coroutine (initial args) */
129 AV *args; 139 AV *args;
130}; 140};
131 141
132typedef struct coro *Coro__State; 142typedef struct coro *Coro__State;
133typedef struct coro *Coro__State_or_hashref; 143typedef struct coro *Coro__State_or_hashref;
134 144
135static AV *main_mainstack; /* used to differentiate between $main and others */
136static HV *coro_state_stash;
137static SV *ucoro_state_sv;
138static U32 ucoro_state_hash;
139static SV *coro_mortal; /* will be freed after next transfer */
140
141/* mostly copied from op.c:cv_clone2 */ 145/* mostly copied from op.c:cv_clone2 */
142STATIC AV * 146STATIC AV *
143clone_padlist (AV *protopadlist) 147clone_padlist (pTHX_ AV *protopadlist)
144{ 148{
145 AV *av; 149 AV *av;
146 I32 ix; 150 I32 ix;
147 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 151 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
148 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 152 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
… …
167 av_store (newpadlist, 1, (SV *) newpad); 171 av_store (newpadlist, 1, (SV *) newpad);
168 172
169 av = newAV (); /* will be @_ */ 173 av = newAV (); /* will be @_ */
170 av_extend (av, 0); 174 av_extend (av, 0);
171 av_store (newpad, 0, (SV *) av); 175 av_store (newpad, 0, (SV *) av);
172 AvFLAGS (av) = AVf_REIFY; 176 AvREIFY_on (av);
173 177
174 for (ix = fpad; ix > 0; ix--) 178 for (ix = fpad; ix > 0; ix--)
175 { 179 {
176 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 180 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
177 181
… …
237 241
238 return newpadlist; 242 return newpadlist;
239} 243}
240 244
241STATIC void 245STATIC void
242free_padlist (AV *padlist) 246free_padlist (pTHX_ AV *padlist)
243{ 247{
244 /* may be during global destruction */ 248 /* may be during global destruction */
245 if (SvREFCNT (padlist)) 249 if (SvREFCNT (padlist))
246 { 250 {
247 I32 i = AvFILLp (padlist); 251 I32 i = AvFILLp (padlist);
… …
268 AV *padlist; 272 AV *padlist;
269 AV *av = (AV *)mg->mg_obj; 273 AV *av = (AV *)mg->mg_obj;
270 274
271 /* casting is fun. */ 275 /* casting is fun. */
272 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 276 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
273 free_padlist (padlist); 277 free_padlist (aTHX_ padlist);
278
279 SvREFCNT_dec (av);
274} 280}
275 281
276#define PERL_MAGIC_coro PERL_MAGIC_ext 282#define PERL_MAGIC_coro PERL_MAGIC_ext
277 283
278static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 284static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
279 285
280/* the next two functions merely cache the padlists */ 286/* the next two functions merely cache the padlists */
281STATIC void 287STATIC void
282get_padlist (CV *cv) 288get_padlist (pTHX_ CV *cv)
283{ 289{
284 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 290 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
285 291
286 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 292 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
287 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 293 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
288 else 294 else
289 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 295 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
290} 296}
291 297
292STATIC void 298STATIC void
293put_padlist (CV *cv) 299put_padlist (pTHX_ CV *cv)
294{ 300{
295 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 301 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
296 302
297 if (!mg) 303 if (!mg)
298 { 304 {
… …
324 PL_mainstack = c->mainstack; 330 PL_mainstack = c->mainstack;
325 PL_stack_sp = c->stack_sp; 331 PL_stack_sp = c->stack_sp;
326 PL_op = c->op; 332 PL_op = c->op;
327 PL_curpad = c->curpad; 333 PL_curpad = c->curpad;
328 PL_comppad = c->comppad; 334 PL_comppad = c->comppad;
335 PL_compcv = c->compcv;
329 PL_stack_base = c->stack_base; 336 PL_stack_base = c->stack_base;
330 PL_stack_max = c->stack_max; 337 PL_stack_max = c->stack_max;
331 PL_tmps_stack = c->tmps_stack; 338 PL_tmps_stack = c->tmps_stack;
332 PL_tmps_floor = c->tmps_floor; 339 PL_tmps_floor = c->tmps_floor;
333 PL_tmps_ix = c->tmps_ix; 340 PL_tmps_ix = c->tmps_ix;
… …
339 PL_scopestack_ix = c->scopestack_ix; 346 PL_scopestack_ix = c->scopestack_ix;
340 PL_scopestack_max = c->scopestack_max; 347 PL_scopestack_max = c->scopestack_max;
341 PL_savestack = c->savestack; 348 PL_savestack = c->savestack;
342 PL_savestack_ix = c->savestack_ix; 349 PL_savestack_ix = c->savestack_ix;
343 PL_savestack_max = c->savestack_max; 350 PL_savestack_max = c->savestack_max;
351#if PERL_VERSION < 9
344 PL_retstack = c->retstack; 352 PL_retstack = c->retstack;
345 PL_retstack_ix = c->retstack_ix; 353 PL_retstack_ix = c->retstack_ix;
346 PL_retstack_max = c->retstack_max; 354 PL_retstack_max = c->retstack_max;
355#endif
356 PL_curpm = c->curpm;
347 PL_curcop = c->curcop; 357 PL_curcop = c->curcop;
348 PL_top_env = c->top_env; 358 PL_top_env = c->top_env;
349 359
350 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 360 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
351 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 361 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
360 { 370 {
361 AV *padlist = (AV *)POPs; 371 AV *padlist = (AV *)POPs;
362 372
363 if (padlist) 373 if (padlist)
364 { 374 {
365 put_padlist (cv); /* mark this padlist as available */ 375 put_padlist (aTHX_ cv); /* mark this padlist as available */
366 CvPADLIST(cv) = padlist; 376 CvPADLIST(cv) = padlist;
367 } 377 }
368 378
369 ++CvDEPTH(cv); 379 ++CvDEPTH(cv);
370 } 380 }
… …
410 } 420 }
411 421
412 PUSHs ((SV *)CvPADLIST(cv)); 422 PUSHs ((SV *)CvPADLIST(cv));
413 PUSHs ((SV *)cv); 423 PUSHs ((SV *)cv);
414 424
415 get_padlist (cv); /* this is a monster */ 425 get_padlist (aTHX_ cv); /* this is a monster */
416 } 426 }
417 } 427 }
418#ifdef CXt_FORMAT 428#ifdef CXt_FORMAT
419 else if (CxTYPE(cx) == CXt_FORMAT) 429 else if (CxTYPE(cx) == CXt_FORMAT)
420 { 430 {
… …
448 c->mainstack = PL_mainstack; 458 c->mainstack = PL_mainstack;
449 c->stack_sp = PL_stack_sp; 459 c->stack_sp = PL_stack_sp;
450 c->op = PL_op; 460 c->op = PL_op;
451 c->curpad = PL_curpad; 461 c->curpad = PL_curpad;
452 c->comppad = PL_comppad; 462 c->comppad = PL_comppad;
463 c->compcv = PL_compcv;
453 c->stack_base = PL_stack_base; 464 c->stack_base = PL_stack_base;
454 c->stack_max = PL_stack_max; 465 c->stack_max = PL_stack_max;
455 c->tmps_stack = PL_tmps_stack; 466 c->tmps_stack = PL_tmps_stack;
456 c->tmps_floor = PL_tmps_floor; 467 c->tmps_floor = PL_tmps_floor;
457 c->tmps_ix = PL_tmps_ix; 468 c->tmps_ix = PL_tmps_ix;
… …
463 c->scopestack_ix = PL_scopestack_ix; 474 c->scopestack_ix = PL_scopestack_ix;
464 c->scopestack_max = PL_scopestack_max; 475 c->scopestack_max = PL_scopestack_max;
465 c->savestack = PL_savestack; 476 c->savestack = PL_savestack;
466 c->savestack_ix = PL_savestack_ix; 477 c->savestack_ix = PL_savestack_ix;
467 c->savestack_max = PL_savestack_max; 478 c->savestack_max = PL_savestack_max;
479#if PERL_VERSION < 9
468 c->retstack = PL_retstack; 480 c->retstack = PL_retstack;
469 c->retstack_ix = PL_retstack_ix; 481 c->retstack_ix = PL_retstack_ix;
470 c->retstack_max = PL_retstack_max; 482 c->retstack_max = PL_retstack_max;
483#endif
484 c->curpm = PL_curpm;
471 c->curcop = PL_curcop; 485 c->curcop = PL_curcop;
472 c->top_env = PL_top_env; 486 c->top_env = PL_top_env;
473} 487}
474 488
475/* 489/*
… …
511 525
512 New(54,PL_savestack,96,ANY); 526 New(54,PL_savestack,96,ANY);
513 PL_savestack_ix = 0; 527 PL_savestack_ix = 0;
514 PL_savestack_max = 96; 528 PL_savestack_max = 96;
515 529
530#if PERL_VERSION < 9
516 New(54,PL_retstack,8,OP*); 531 New(54,PL_retstack,8,OP*);
517 PL_retstack_ix = 0; 532 PL_retstack_ix = 0;
518 PL_retstack_max = 8; 533 PL_retstack_max = 8;
534#endif
519 535
520 UNLOCK; 536 UNLOCK;
521} 537}
522 538
523/* 539/*
… …
531 /* is this ugly, I ask? */ 547 /* is this ugly, I ask? */
532 LEAVE_SCOPE (0); 548 LEAVE_SCOPE (0);
533 549
534 /* sure it is, but more important: is it correct?? :/ */ 550 /* sure it is, but more important: is it correct?? :/ */
535 FREETMPS; 551 FREETMPS;
552
553 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
536 } 554 }
537 555
538 while (PL_curstackinfo->si_next) 556 while (PL_curstackinfo->si_next)
539 PL_curstackinfo = PL_curstackinfo->si_next; 557 PL_curstackinfo = PL_curstackinfo->si_next;
540 558
541 while (PL_curstackinfo) 559 while (PL_curstackinfo)
542 { 560 {
543 PERL_SI *p = PL_curstackinfo->si_prev; 561 PERL_SI *p = PL_curstackinfo->si_prev;
544 562
545 { 563 { /*D*//*remove*/
546 dSP; 564 dSP;
547 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 565 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
548 PUTBACK; /* possibly superfluous */ 566 PUTBACK; /* possibly superfluous */
549 } 567 }
550 568
551 if (!IN_DESTRUCT) 569 if (!IN_DESTRUCT)
552 { 570 {
553 dounwind(-1); 571 dounwind (-1);/*D*//*remove*/
554 SvREFCNT_dec(PL_curstackinfo->si_stack); 572 SvREFCNT_dec (PL_curstackinfo->si_stack);
555 } 573 }
556 574
557 Safefree(PL_curstackinfo->si_cxstack); 575 Safefree (PL_curstackinfo->si_cxstack);
558 Safefree(PL_curstackinfo); 576 Safefree (PL_curstackinfo);
559 PL_curstackinfo = p; 577 PL_curstackinfo = p;
560 } 578 }
561 579
562 Safefree(PL_tmps_stack); 580 Safefree (PL_tmps_stack);
563 Safefree(PL_markstack); 581 Safefree (PL_markstack);
564 Safefree(PL_scopestack); 582 Safefree (PL_scopestack);
565 Safefree(PL_savestack); 583 Safefree (PL_savestack);
584#if PERL_VERSION < 9
566 Safefree(PL_retstack); 585 Safefree (PL_retstack);
586#endif
567} 587}
568 588
569static void 589static void
570allocate_stack (Coro__State ctx, int alloc) 590allocate_stack (Coro__State ctx, int alloc)
571{ 591{
… …
578 stack->gencnt = ctx->gencnt = 0; 598 stack->gencnt = ctx->gencnt = 0;
579 599
580 if (alloc) 600 if (alloc)
581 { 601 {
582#if HAVE_MMAP 602#if HAVE_MMAP
583 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */ 603 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */
584 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 604 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
585 if (stack->sptr == (void *)-1) 605 if (stack->sptr == (void *)-1)
586#endif 606#endif
587 { 607 {
588 /*FIXME*//*D*//* reasonable stack size! */ 608 /*FIXME*//*D*//* reasonable stack size! */
589 stack->ssize = - (8192 * sizeof (long)); 609 stack->ssize = - (STACKSIZE * sizeof (long));
590 New (0, stack->sptr, 8192, long); 610 New (0, stack->sptr, STACKSIZE, long);
591 } 611 }
592 } 612 }
593 else 613 else
594 stack->sptr = 0; 614 stack->sptr = 0;
595 615
… …
625setup_coro (void *arg) 645setup_coro (void *arg)
626{ 646{
627 /* 647 /*
628 * emulate part of the perl startup here. 648 * emulate part of the perl startup here.
629 */ 649 */
650 dTHX;
630 dSP; 651 dSP;
631 Coro__State ctx = (Coro__State)arg; 652 Coro__State ctx = (Coro__State)arg;
632 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE); 653 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
633 654
634 coro_init_stacks (aTHX); 655 coro_init_stacks (aTHX);
… …
683continue_coro (void *arg) 704continue_coro (void *arg)
684{ 705{
685 /* 706 /*
686 * this is a _very_ stripped down perl interpreter ;) 707 * this is a _very_ stripped down perl interpreter ;)
687 */ 708 */
709 dTHX;
688 Coro__State ctx = (Coro__State)arg; 710 Coro__State ctx = (Coro__State)arg;
689 JMPENV coro_start_env; 711 JMPENV coro_start_env;
690 712
691 PL_top_env = &ctx->start_env; 713 PL_top_env = &ctx->start_env;
692 714
… …
825api_transfer(pTHX_ SV *prev, SV *next, int flags) 847api_transfer(pTHX_ SV *prev, SV *next, int flags)
826{ 848{
827 SV_CORO (prev, "Coro::transfer"); 849 SV_CORO (prev, "Coro::transfer");
828 SV_CORO (next, "Coro::transfer"); 850 SV_CORO (next, "Coro::transfer");
829 851
830 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 852 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
831} 853}
832 854
833/** Coro ********************************************************************/ 855/** Coro ********************************************************************/
834 856
835#define PRIO_MAX 3 857#define PRIO_MAX 3
… …
843static GV *coro_current, *coro_idle; 865static GV *coro_current, *coro_idle;
844static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 866static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
845static int coro_nready; 867static int coro_nready;
846 868
847static void 869static void
848coro_enq (SV *sv) 870coro_enq (pTHX_ SV *sv)
849{ 871{
872 SV **xprio;
873 int prio;
874
850 if (SvTYPE (sv) == SVt_PVHV) 875 if (SvTYPE (sv) != SVt_PVHV)
851 {
852 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
853 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
854
855 prio = prio > PRIO_MAX ? PRIO_MAX
856 : prio < PRIO_MIN ? PRIO_MIN
857 : prio;
858
859 av_push (coro_ready [prio - PRIO_MIN], sv);
860 coro_nready++;
861
862 return;
863 }
864
865 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 876 croak ("Coro::ready tried to enqueue something that is not a coroutine");
877
878 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
879 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
880
881 prio = prio > PRIO_MAX ? PRIO_MAX
882 : prio < PRIO_MIN ? PRIO_MIN
883 : prio;
884
885 av_push (coro_ready [prio - PRIO_MIN], sv);
886 coro_nready++;
866} 887}
867 888
868static SV * 889static SV *
869coro_deq (int min_prio) 890coro_deq (pTHX_ int min_prio)
870{ 891{
871 int prio = PRIO_MAX - PRIO_MIN; 892 int prio = PRIO_MAX - PRIO_MIN;
872 893
873 min_prio -= PRIO_MIN; 894 min_prio -= PRIO_MIN;
874 if (min_prio < 0) 895 if (min_prio < 0)
… …
885} 906}
886 907
887static void 908static void
888api_ready (SV *coro) 909api_ready (SV *coro)
889{ 910{
911 dTHX;
912
890 if (SvROK (coro)) 913 if (SvROK (coro))
891 coro = SvRV (coro); 914 coro = SvRV (coro);
892 915
893 LOCK; 916 LOCK;
894 coro_enq (SvREFCNT_inc (coro)); 917 coro_enq (aTHX_ SvREFCNT_inc (coro));
895 UNLOCK; 918 UNLOCK;
896} 919}
897 920
898static void 921static void
899api_schedule (void) 922api_schedule (void)
900{ 923{
924 dTHX;
925
901 SV *prev, *next; 926 SV *prev, *next;
902 927
903 LOCK; 928 LOCK;
904 929
905 prev = SvRV (GvSV (coro_current)); 930 prev = SvRV (GvSV (coro_current));
906 next = coro_deq (PRIO_MIN); 931 next = coro_deq (aTHX_ PRIO_MIN);
907 932
908 if (!next) 933 if (!next)
909 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 934 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
910 935
911 /* free this only after the transfer */ 936 /* free this only after the transfer */
… …
923} 948}
924 949
925static void 950static void
926api_cede (void) 951api_cede (void)
927{ 952{
953 dTHX;
954
928 LOCK; 955 LOCK;
929 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 956 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
930 UNLOCK; 957 UNLOCK;
931 958
932 api_schedule (); 959 api_schedule ();
933} 960}
934 961
… …
968 croak ("Coro::State::_newprocess expects an arrayref"); 995 croak ("Coro::State::_newprocess expects an arrayref");
969 996
970 Newz (0, coro, 1, struct coro); 997 Newz (0, coro, 1, struct coro);
971 998
972 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 999 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
973 coro->mainstack = 0; /* actual work is done inside transfer */ 1000 /*coro->mainstack = 0; *//*actual work is done inside transfer */
974 coro->stack = 0; 1001 /*coro->stack = 0;*/
975 1002
976 /* same as JMPENV_BOOTSTRAP */ 1003 /* same as JMPENV_BOOTSTRAP */
977 /* we might be able to recycle start_env, but safe is safe */ 1004 /* we might be able to recycle start_env, but safe is safe */
978 //Zero(&coro->start_env, 1, JMPENV); 1005 /*Zero(&coro->start_env, 1, JMPENV);*/
979 coro->start_env.je_ret = -1; 1006 coro->start_env.je_ret = -1;
980 coro->start_env.je_mustcatch = TRUE; 1007 coro->start_env.je_mustcatch = TRUE;
981 1008
982 RETVAL = coro; 1009 RETVAL = coro;
983 OUTPUT: 1010 OUTPUT:
… …
1004 if (coro->mainstack && coro->mainstack != main_mainstack) 1031 if (coro->mainstack && coro->mainstack != main_mainstack)
1005 { 1032 {
1006 struct coro temp; 1033 struct coro temp;
1007 1034
1008 PUTBACK; 1035 PUTBACK;
1009 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1036 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
1010 LOAD(aTHX_ coro); 1037 LOAD (aTHX_ coro);
1011 SPAGAIN; 1038 SPAGAIN;
1012 1039
1013 destroy_stacks (aTHX); 1040 destroy_stacks (aTHX);
1014 1041
1015 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1042 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1016 SPAGAIN; 1043 SPAGAIN;
1017 1044
1018 coro->mainstack = 0; 1045 coro->mainstack = 0;
1019 } 1046 }
1020 1047
… …
1035 1062
1036void 1063void
1037yield(...) 1064yield(...)
1038 PROTOTYPE: @ 1065 PROTOTYPE: @
1039 CODE: 1066 CODE:
1040 static SV *returnstk; 1067 SV *yieldstack;
1041 SV *sv; 1068 SV *sv;
1042 AV *defav = GvAV (PL_defgv); 1069 AV *defav = GvAV (PL_defgv);
1043 struct coro *prev, *next; 1070 struct coro *prev, *next;
1044 1071
1045 if (!returnstk) 1072 yieldstack = *hv_fetch (
1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1073 (HV *)SvRV (GvSV (coro_current)),
1074 "yieldstack", sizeof ("yieldstack") - 1,
1075 0
1076 );
1047 1077
1048 /* set up @_ -- ugly */ 1078 /* set up @_ -- ugly */
1049 av_clear (defav); 1079 av_clear (defav);
1050 av_fill (defav, items - 1); 1080 av_fill (defav, items - 1);
1051 while (items--) 1081 while (items--)
1052 av_store (defav, items, SvREFCNT_inc (ST(items))); 1082 av_store (defav, items, SvREFCNT_inc (ST(items)));
1053 1083
1054 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1055 sv = av_pop ((AV *)SvRV (returnstk)); 1084 sv = av_pop ((AV *)SvRV (yieldstack));
1056 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1085 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1057 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1086 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1058 SvREFCNT_dec (sv); 1087 SvREFCNT_dec (sv);
1059 1088
1060 transfer(aTHX_ prev, next, 0); 1089 transfer (aTHX_ prev, next, 0);
1061 1090
1062MODULE = Coro::State PACKAGE = Coro 1091MODULE = Coro::State PACKAGE = Coro
1063 1092
1064# this is slightly dirty (should expose a c-level api) 1093# this is slightly dirty (should expose a c-level api)
1065 1094
… …
1125cede(...) 1154cede(...)
1126 PROTOTYPE: 1155 PROTOTYPE:
1127 CODE: 1156 CODE:
1128 api_cede (); 1157 api_cede ();
1129 1158
1159# and these are hacks
1160SV *
1161_aio_get_state ()
1162 CODE:
1163{
1164 struct {
1165 int errorno;
1166 int laststype;
1167 int laststatval;
1168 Stat_t statcache;
1169 } data;
1170
1171 data.errorno = errno;
1172 data.laststype = PL_laststype;
1173 data.laststatval = PL_laststatval;
1174 data.statcache = PL_statcache;
1175
1176 RETVAL = newSVpvn ((char *)&data, sizeof data);
1177}
1178 OUTPUT:
1179 RETVAL
1180
1181void
1182_aio_set_state (char *data_)
1183 PROTOTYPE: $
1184 CODE:
1185{
1186 struct {
1187 int errorno;
1188 int laststype;
1189 int laststatval;
1190 Stat_t statcache;
1191 } *data = (void *)data_;
1192
1193 errno = data->errorno;
1194 PL_laststype = data->laststype;
1195 PL_laststatval = data->laststatval;
1196 PL_statcache = data->statcache;
1197}

Diff Legend

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