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.92 by root, Sun Nov 26 02:16:19 2006 UTC vs.
Revision 1.100 by root, Mon Nov 27 00:07:49 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c" 1#include "libcoro/coro.c"
4 2
5#include "EXTERN.h" 3#include "EXTERN.h"
6#include "perl.h" 4#include "perl.h"
7#include "XSUB.h" 5#include "XSUB.h"
8 6
9#include "patchlevel.h" 7#include "patchlevel.h"
10 8
11#if PERL_VERSION < 6 9#define PERL_VERSION_ATLEAST(a,b,c) \
10 (PERL_REVISION > (a) \
11 || (PERL_REVISION == (a) \
12 && (PERL_VERSION > (b) \
13 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
14
15#if !PERL_VERSION_ATLEAST (5,6,0)
12# ifndef PL_ppaddr 16# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr 17# define PL_ppaddr ppaddr
14# endif 18# endif
15# ifndef call_sv 19# ifndef call_sv
16# define call_sv perl_call_sv 20# define call_sv perl_call_sv
… …
66#define dSTACKLEVEL int stacklevel 70#define dSTACKLEVEL int stacklevel
67#define STACKLEVEL ((void *)&stacklevel) 71#define STACKLEVEL ((void *)&stacklevel)
68 72
69#define IN_DESTRUCT (PL_main_cv == Nullcv) 73#define IN_DESTRUCT (PL_main_cv == Nullcv)
70 74
71#define labs(l) ((l) >= 0 ? (l) : -(l)) 75#if __GNUC__ >= 3
76# define attribute(x) __attribute__(x)
77#else
78# define attribute(x)
79#endif
80
81#define NOINLINE attribute ((noinline))
72 82
73#include "CoroAPI.h" 83#include "CoroAPI.h"
74 84
75#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */ 85#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
76 86
… …
90 100
91/* this is a structure representing a c-level coroutine */ 101/* this is a structure representing a c-level coroutine */
92typedef struct coro_stack { 102typedef struct coro_stack {
93 struct coro_stack *next; 103 struct coro_stack *next;
94 104
95 void *idle_sp; /* original stacklevel when coroutine was created */ 105 /* the stack */
96 void *sptr; 106 void *sptr;
97 long ssize; /* positive == mmap, otherwise malloc */ 107 long ssize; /* positive == mmap, otherwise malloc */
98 108
99 /* cpu state */ 109 /* cpu state */
110 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
111 JMPENV *top_env;
100 coro_context cctx; 112 coro_context cctx;
101 JMPENV *top_env;
102} coro_stack; 113} coro_stack;
103
104/* the (fake) coro_stack representing the main program */
105static coro_stack *main_stack;
106 114
107/* this is a structure representing a perl-level coroutine */ 115/* this is a structure representing a perl-level coroutine */
108struct coro { 116struct coro {
109 /* the c coroutine allocated to this perl coroutine, if any */ 117 /* the c coroutine allocated to this perl coroutine, if any */
110 coro_stack *stack; 118 coro_stack *stack;
… …
158 166
159typedef struct coro *Coro__State; 167typedef struct coro *Coro__State;
160typedef struct coro *Coro__State_or_hashref; 168typedef struct coro *Coro__State_or_hashref;
161 169
162static AV * 170static AV *
163coro_clone_padlist (pTHX_ CV *cv) 171coro_clone_padlist (CV *cv)
164{ 172{
165 AV *padlist = CvPADLIST (cv); 173 AV *padlist = CvPADLIST (cv);
166 AV *newpadlist, *newpad; 174 AV *newpadlist, *newpad;
167 175
168 newpadlist = newAV (); 176 newpadlist = newAV ();
169 AvREAL_off (newpadlist); 177 AvREAL_off (newpadlist);
170#if PERL_VERSION < 9 178#if PERL_VERSION_ATLEAST (5,9,0)
179 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
180#else
171 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 181 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
172#else
173 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
174#endif 182#endif
175 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 183 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
176 --AvFILLp (padlist); 184 --AvFILLp (padlist);
177 185
178 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 186 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
… …
180 188
181 return newpadlist; 189 return newpadlist;
182} 190}
183 191
184static void 192static void
185free_padlist (pTHX_ AV *padlist) 193free_padlist (AV *padlist)
186{ 194{
187 /* may be during global destruction */ 195 /* may be during global destruction */
188 if (SvREFCNT (padlist)) 196 if (SvREFCNT (padlist))
189 { 197 {
190 I32 i = AvFILLp (padlist); 198 I32 i = AvFILLp (padlist);
… …
211 AV *padlist; 219 AV *padlist;
212 AV *av = (AV *)mg->mg_obj; 220 AV *av = (AV *)mg->mg_obj;
213 221
214 /* casting is fun. */ 222 /* casting is fun. */
215 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 223 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
216 free_padlist (aTHX_ padlist); 224 free_padlist (padlist);
217 225
218 SvREFCNT_dec (av); 226 SvREFCNT_dec (av);
219 227
220 return 0; 228 return 0;
221} 229}
… …
224 232
225static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 233static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
226 234
227/* the next two functions merely cache the padlists */ 235/* the next two functions merely cache the padlists */
228static void 236static void
229get_padlist (pTHX_ CV *cv) 237get_padlist (CV *cv)
230{ 238{
231 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 239 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
232 240
233 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 241 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
234 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 242 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
235 else 243 else
236 { 244 {
237#if 0 245#if 0
238 /* this should work - but it doesn't :( */ 246 /* this is probably cleaner, but also slower? */
239 CV *cp = Perl_cv_clone (aTHX_ cv); 247 CV *cp = Perl_cv_clone (cv);
240 CvPADLIST (cv) = CvPADLIST (cp); 248 CvPADLIST (cv) = CvPADLIST (cp);
241 CvPADLIST (cp) = 0; 249 CvPADLIST (cp) = 0;
242 SvREFCNT_dec (cp); 250 SvREFCNT_dec (cp);
243#else 251#else
244 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 252 CvPADLIST (cv) = coro_clone_padlist (cv);
245#endif 253#endif
246 } 254 }
247} 255}
248 256
249static void 257static void
250put_padlist (pTHX_ CV *cv) 258put_padlist (CV *cv)
251{ 259{
252 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 260 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
253 261
254 if (!mg) 262 if (!mg)
255 { 263 {
… …
263} 271}
264 272
265#define SB do { 273#define SB do {
266#define SE } while (0) 274#define SE } while (0)
267 275
268#define LOAD(state) load_state(aTHX_ (state)); 276#define LOAD(state) load_state((state));
269#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 277#define SAVE(state,flags) save_state((state),(flags));
270 278
271#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 279#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
272 280
273static void 281static void
274load_state(pTHX_ Coro__State c) 282load_state(Coro__State c)
275{ 283{
276 PL_dowarn = c->dowarn; 284 PL_dowarn = c->dowarn;
277 PL_in_eval = c->in_eval; 285 PL_in_eval = c->in_eval;
278 286
279 PL_curstackinfo = c->curstackinfo; 287 PL_curstackinfo = c->curstackinfo;
… …
297 PL_scopestack_ix = c->scopestack_ix; 305 PL_scopestack_ix = c->scopestack_ix;
298 PL_scopestack_max = c->scopestack_max; 306 PL_scopestack_max = c->scopestack_max;
299 PL_savestack = c->savestack; 307 PL_savestack = c->savestack;
300 PL_savestack_ix = c->savestack_ix; 308 PL_savestack_ix = c->savestack_ix;
301 PL_savestack_max = c->savestack_max; 309 PL_savestack_max = c->savestack_max;
302#if PERL_VERSION < 9 310#if !PERL_VERSION_ATLEAST (5,9,0)
303 PL_retstack = c->retstack; 311 PL_retstack = c->retstack;
304 PL_retstack_ix = c->retstack_ix; 312 PL_retstack_ix = c->retstack_ix;
305 PL_retstack_max = c->retstack_max; 313 PL_retstack_max = c->retstack_max;
306#endif 314#endif
307 PL_curpm = c->curpm; 315 PL_curpm = c->curpm;
… …
320 { 328 {
321 AV *padlist = (AV *)POPs; 329 AV *padlist = (AV *)POPs;
322 330
323 if (padlist) 331 if (padlist)
324 { 332 {
325 put_padlist (aTHX_ cv); /* mark this padlist as available */ 333 put_padlist (cv); /* mark this padlist as available */
326 CvPADLIST(cv) = padlist; 334 CvPADLIST(cv) = padlist;
327 } 335 }
328 336
329 ++CvDEPTH(cv); 337 ++CvDEPTH(cv);
330 } 338 }
… …
332 PUTBACK; 340 PUTBACK;
333 } 341 }
334} 342}
335 343
336static void 344static void
337save_state(pTHX_ Coro__State c, int flags) 345save_state(Coro__State c, int flags)
338{ 346{
339 { 347 {
340 dSP; 348 dSP;
341 I32 cxix = cxstack_ix; 349 I32 cxix = cxstack_ix;
342 PERL_CONTEXT *ccstk = cxstack; 350 PERL_CONTEXT *ccstk = cxstack;
… …
370 } 378 }
371 379
372 PUSHs ((SV *)CvPADLIST(cv)); 380 PUSHs ((SV *)CvPADLIST(cv));
373 PUSHs ((SV *)cv); 381 PUSHs ((SV *)cv);
374 382
375 get_padlist (aTHX_ cv); 383 get_padlist (cv);
376 } 384 }
377 } 385 }
378#ifdef CXt_FORMAT 386#ifdef CXt_FORMAT
379 else if (CxTYPE(cx) == CXt_FORMAT) 387 else if (CxTYPE(cx) == CXt_FORMAT)
380 { 388 {
… …
424 c->scopestack_ix = PL_scopestack_ix; 432 c->scopestack_ix = PL_scopestack_ix;
425 c->scopestack_max = PL_scopestack_max; 433 c->scopestack_max = PL_scopestack_max;
426 c->savestack = PL_savestack; 434 c->savestack = PL_savestack;
427 c->savestack_ix = PL_savestack_ix; 435 c->savestack_ix = PL_savestack_ix;
428 c->savestack_max = PL_savestack_max; 436 c->savestack_max = PL_savestack_max;
429#if PERL_VERSION < 9 437#if !PERL_VERSION_ATLEAST (5,9,0)
430 c->retstack = PL_retstack; 438 c->retstack = PL_retstack;
431 c->retstack_ix = PL_retstack_ix; 439 c->retstack_ix = PL_retstack_ix;
432 c->retstack_max = PL_retstack_max; 440 c->retstack_max = PL_retstack_max;
433#endif 441#endif
434 c->curpm = PL_curpm; 442 c->curpm = PL_curpm;
… …
440 * of perl.c:init_stacks, except that it uses less memory 448 * of perl.c:init_stacks, except that it uses less memory
441 * on the (sometimes correct) assumption that coroutines do 449 * on the (sometimes correct) assumption that coroutines do
442 * not usually need a lot of stackspace. 450 * not usually need a lot of stackspace.
443 */ 451 */
444static void 452static void
445coro_init_stacks (pTHX) 453coro_init_stacks ()
446{ 454{
447 LOCK;
448
449 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 455 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
450 PL_curstackinfo->si_type = PERLSI_MAIN; 456 PL_curstackinfo->si_type = PERLSI_MAIN;
451 PL_curstack = PL_curstackinfo->si_stack; 457 PL_curstack = PL_curstackinfo->si_stack;
452 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 458 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
453 459
… …
474 480
475 New(54,PL_savestack,96,ANY); 481 New(54,PL_savestack,96,ANY);
476 PL_savestack_ix = 0; 482 PL_savestack_ix = 0;
477 PL_savestack_max = 96; 483 PL_savestack_max = 96;
478 484
479#if PERL_VERSION < 9 485#if !PERL_VERSION_ATLEAST (5,9,0)
480 New(54,PL_retstack,8,OP*); 486 New(54,PL_retstack,8,OP*);
481 PL_retstack_ix = 0; 487 PL_retstack_ix = 0;
482 PL_retstack_max = 8; 488 PL_retstack_max = 8;
483#endif 489#endif
484
485 UNLOCK;
486} 490}
487 491
488/* 492/*
489 * destroy the stacks, the callchain etc... 493 * destroy the stacks, the callchain etc...
490 */ 494 */
491static void 495static void
492destroy_stacks(pTHX) 496destroy_stacks()
493{ 497{
494 if (!IN_DESTRUCT) 498 if (!IN_DESTRUCT)
495 { 499 {
496 /* is this ugly, I ask? */ 500 /* is this ugly, I ask? */
497 LEAVE_SCOPE (0); 501 LEAVE_SCOPE (0);
… …
528 532
529 Safefree (PL_tmps_stack); 533 Safefree (PL_tmps_stack);
530 Safefree (PL_markstack); 534 Safefree (PL_markstack);
531 Safefree (PL_scopestack); 535 Safefree (PL_scopestack);
532 Safefree (PL_savestack); 536 Safefree (PL_savestack);
533#if PERL_VERSION < 9 537#if !PERL_VERSION_ATLEAST (5,9,0)
534 Safefree (PL_retstack); 538 Safefree (PL_retstack);
535#endif 539#endif
536} 540}
537 541
538static void 542static void
… …
544 dTHX; 548 dTHX;
545 dSP; 549 dSP;
546 UNOP myop; 550 UNOP myop;
547 SV *sub_init = (SV *)get_cv ("Coro::State::coro_init", FALSE); 551 SV *sub_init = (SV *)get_cv ("Coro::State::coro_init", FALSE);
548 552
549 coro_init_stacks (aTHX); 553 coro_init_stacks ();
550 /*PL_curcop = 0;*/ 554 /*PL_curcop = 0;*/
551 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 555 /*PL_in_eval = PL_in_eval;*/ /* inherit */
552 SvREFCNT_dec (GvAV (PL_defgv)); 556 SvREFCNT_dec (GvAV (PL_defgv));
553 GvAV (PL_defgv) = coro->args; coro->args = 0; 557 GvAV (PL_defgv) = coro->args; coro->args = 0;
554 558
… …
577 SvREFCNT_dec (coro_mortal); 581 SvREFCNT_dec (coro_mortal);
578 coro_mortal = 0; 582 coro_mortal = 0;
579 } 583 }
580} 584}
581 585
586static void NOINLINE
587prepare_cctx (coro_stack *cctx)
588{
589 dSP;
590 UNOP myop;
591
592 Zero (&myop, 1, UNOP);
593 myop.op_next = PL_op;
594 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
595
596 PUSHMARK(SP);
597 EXTEND (SP, 2);
598 PUSHs (newSViv (PTR2IV (cctx)));
599 PUSHs ((SV *)get_cv ("Coro::State::cctx_init", FALSE));
600 PUTBACK;
601 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX);
602 SPAGAIN;
603}
604
582static void 605static void
583coro_run (void *arg) 606coro_run (void *arg)
584{ 607{
585 /* 608 /*
586 * this is a _very_ stripped down perl interpreter ;) 609 * this is a _very_ stripped down perl interpreter ;)
587 */ 610 */
588 dTHX; 611 UNLOCK;
612
589 PL_top_env = &PL_start_env; 613 PL_top_env = &PL_start_env;
614 prepare_cctx ((coro_stack *)arg);
590 615
591 UNLOCK;
592
593 sv_setiv (get_sv ("Coro::State::cctx_stack", FALSE), PTR2IV ((coro_stack *)arg));
594 sv_setiv (get_sv ("Coro::State::cctx_restartop", FALSE), PTR2IV (PL_op));
595 PL_restartop = CvSTART (get_cv ("Coro::State::cctx_init", FALSE));
596
597 /* somebody will hit me for both perl_run and PL_restart_op */ 616 /* somebody will hit me for both perl_run and PL_restartop */
598 perl_run (aTHX_ PERL_GET_CONTEXT); 617 perl_run (PERL_GET_CONTEXT);
599 618
619 fputs ("FATAL: C coroutine fell over the edge of the world, aborting.\n", stderr);
600 abort (); 620 abort ();
601} 621}
602 622
603static coro_stack * 623static coro_stack *
604stack_new () 624stack_new ()
… …
607 627
608 New (0, stack, 1, coro_stack); 628 New (0, stack, 1, coro_stack);
609 629
610#if HAVE_MMAP 630#if HAVE_MMAP
611 631
612 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */ 632 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
633 /* mmap suppsedly does allocate-on-write for us */
613 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 634 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
614 635
615 if (stack->sptr == (void *)-1) 636 if (stack->sptr == (void *)-1)
616 { 637 {
617 perror ("FATAL: unable to mmap stack for coroutine"); 638 perror ("FATAL: unable to mmap stack for coroutine");
618 _exit (EXIT_FAILURE); 639 _exit (EXIT_FAILURE);
619 } 640 }
620 641
642# if STACKGUARD
621 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 643 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
644# endif
622 645
623#else 646#else
624 647
625 stack->ssize = STACKSIZE * (long)sizeof (long); 648 stack->ssize = STACKSIZE * (long)sizeof (long);
626 New (0, stack->sptr, STACKSIZE, long); 649 New (0, stack->sptr, STACKSIZE, long);
… …
639} 662}
640 663
641static void 664static void
642stack_free (coro_stack *stack) 665stack_free (coro_stack *stack)
643{ 666{
644 if (!stack || stack == main_stack) 667 if (!stack)
645 return; 668 return;
646 669
647#if HAVE_MMAP 670#if HAVE_MMAP
648 munmap (stack->sptr, stack->ssize); 671 munmap (stack->sptr, stack->ssize);
649#else 672#else
… …
680 stack->next = stack_first; 703 stack->next = stack_first;
681 stack_first = stack; 704 stack_first = stack;
682} 705}
683 706
684/* never call directly, always through the coro_state_transfer global variable */ 707/* never call directly, always through the coro_state_transfer global variable */
685static void 708static void NOINLINE
686transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags) 709transfer (struct coro *prev, struct coro *next, int flags)
687{ 710{
688 dSTACKLEVEL; 711 dSTACKLEVEL;
689 712
690 /* sometimes transfer is only called to set idle_sp */ 713 /* sometimes transfer is only called to set idle_sp */
691 if (flags == TRANSFER_SET_STACKLEVEL) 714 if (flags == TRANSFER_SET_STACKLEVEL)
… …
711 setup_coro (next); 734 setup_coro (next);
712 /* need a stack */ 735 /* need a stack */
713 next->stack = 0; 736 next->stack = 0;
714 } 737 }
715 738
739 if (!prev->stack)
740 /* create a new empty context */
741 Newz (0, prev->stack, 1, coro_stack);
742
716 prev__stack = prev->stack; 743 prev__stack = prev->stack;
717 744
718 /* possibly "free" the stack */ 745 /* possibly "free" the stack */
719 if (prev__stack->idle_sp == STACKLEVEL) 746 if (prev__stack->idle_sp == STACKLEVEL)
720 { 747 {
… …
736 763
737 UNLOCK; 764 UNLOCK;
738 } 765 }
739} 766}
740 767
741/* use this function pointer to call the above function */
742/* this is done to increase chances of the compiler not inlining the call */
743/* not static to make it even harder for the compiler (and theoretically impossible in most cases */
744void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
745
746struct transfer_args 768struct transfer_args
747{ 769{
748 struct coro *prev, *next; 770 struct coro *prev, *next;
749 int flags; 771 int flags;
750}; 772};
751 773
752#define TRANSFER(ta) coro_state_transfer ((ta).prev, (ta).next, (ta).flags) 774#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags)
753 775
754static void 776static void
755coro_state_destroy (struct coro *coro) 777coro_state_destroy (struct coro *coro)
756{ 778{
757 if (coro->refcnt--) 779 if (coro->refcnt--)
… …
759 781
760 if (coro->mainstack && coro->mainstack != main_mainstack) 782 if (coro->mainstack && coro->mainstack != main_mainstack)
761 { 783 {
762 struct coro temp; 784 struct coro temp;
763 785
764 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL); 786 SAVE ((&temp), TRANSFER_SAVE_ALL);
765 LOAD (aTHX_ coro); 787 LOAD (coro);
766 788
767 destroy_stacks (aTHX); 789 destroy_stacks ();
768 790
769 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 791 LOAD ((&temp)); /* this will get rid of defsv etc.. */
770 792
771 coro->mainstack = 0; 793 coro->mainstack = 0;
772 } 794 }
… …
775 SvREFCNT_dec (coro->args); 797 SvREFCNT_dec (coro->args);
776 Safefree (coro); 798 Safefree (coro);
777} 799}
778 800
779static int 801static int
780coro_state_clear (SV *sv, MAGIC *mg) 802coro_state_clear (pTHX_ SV *sv, MAGIC *mg)
781{ 803{
782 struct coro *coro = (struct coro *)mg->mg_ptr; 804 struct coro *coro = (struct coro *)mg->mg_ptr;
783 mg->mg_ptr = 0; 805 mg->mg_ptr = 0;
784 806
785 coro_state_destroy (coro); 807 coro_state_destroy (coro);
786 808
787 return 0; 809 return 0;
788} 810}
789 811
790static int 812static int
791coro_state_dup (MAGIC *mg, CLONE_PARAMS *params) 813coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
792{ 814{
793 struct coro *coro = (struct coro *)mg->mg_ptr; 815 struct coro *coro = (struct coro *)mg->mg_ptr;
794 816
795 ++coro->refcnt; 817 ++coro->refcnt;
796 818
797 return 0; 819 return 0;
798} 820}
799 821
800static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, coro_state_clear, 0, coro_state_dup, 0 }; 822static MGVTBL coro_state_vtbl = {
823 0, 0, 0, 0,
824 coro_state_clear,
825 0,
826#ifdef MGf_DUP
827 coro_state_dup,
828#endif
829};
801 830
802static struct coro * 831static struct coro *
803SvSTATE (SV *coro) 832SvSTATE (SV *coro)
804{ 833{
805 HV *stash; 834 HV *stash;
… …
820 assert (mg->mg_type == PERL_MAGIC_ext); 849 assert (mg->mg_type == PERL_MAGIC_ext);
821 return (struct coro *)mg->mg_ptr; 850 return (struct coro *)mg->mg_ptr;
822} 851}
823 852
824static void 853static void
825prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev, SV *next, int flags) 854prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags)
826{ 855{
827 ta->prev = SvSTATE (prev); 856 ta->prev = SvSTATE (prev);
828 ta->next = SvSTATE (next); 857 ta->next = SvSTATE (next);
829 ta->flags = flags; 858 ta->flags = flags;
830} 859}
… …
833api_transfer (SV *prev, SV *next, int flags) 862api_transfer (SV *prev, SV *next, int flags)
834{ 863{
835 dTHX; 864 dTHX;
836 struct transfer_args ta; 865 struct transfer_args ta;
837 866
838 prepare_transfer (aTHX_ &ta, prev, next, flags); 867 prepare_transfer (&ta, prev, next, flags);
839 TRANSFER (ta); 868 TRANSFER (ta);
840} 869}
841 870
842/** Coro ********************************************************************/ 871/** Coro ********************************************************************/
843 872
… …
852static GV *coro_current, *coro_idle; 881static GV *coro_current, *coro_idle;
853static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 882static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
854static int coro_nready; 883static int coro_nready;
855 884
856static void 885static void
857coro_enq (pTHX_ SV *sv) 886coro_enq (SV *sv)
858{ 887{
859 int prio; 888 int prio;
860 889
861 if (SvTYPE (sv) != SVt_PVHV) 890 if (SvTYPE (sv) != SVt_PVHV)
862 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 891 croak ("Coro::ready tried to enqueue something that is not a coroutine");
… …
866 av_push (coro_ready [prio - PRIO_MIN], sv); 895 av_push (coro_ready [prio - PRIO_MIN], sv);
867 coro_nready++; 896 coro_nready++;
868} 897}
869 898
870static SV * 899static SV *
871coro_deq (pTHX_ int min_prio) 900coro_deq (int min_prio)
872{ 901{
873 int prio = PRIO_MAX - PRIO_MIN; 902 int prio = PRIO_MAX - PRIO_MIN;
874 903
875 min_prio -= PRIO_MIN; 904 min_prio -= PRIO_MIN;
876 if (min_prio < 0) 905 if (min_prio < 0)
… …
893 922
894 if (SvROK (coro)) 923 if (SvROK (coro))
895 coro = SvRV (coro); 924 coro = SvRV (coro);
896 925
897 LOCK; 926 LOCK;
898 coro_enq (aTHX_ SvREFCNT_inc (coro)); 927 coro_enq (SvREFCNT_inc (coro));
899 UNLOCK; 928 UNLOCK;
900} 929}
901 930
902static void 931static void
903prepare_schedule (aTHX_ struct transfer_args *ta) 932prepare_schedule (struct transfer_args *ta)
904{ 933{
905 SV *current, *prev, *next; 934 SV *current, *prev, *next;
906
907 LOCK;
908 935
909 current = GvSV (coro_current); 936 current = GvSV (coro_current);
910 937
911 for (;;) 938 for (;;)
912 { 939 {
913 LOCK; 940 LOCK;
914
915 next = coro_deq (aTHX_ PRIO_MIN); 941 next = coro_deq (PRIO_MIN);
942 UNLOCK;
916 943
917 if (next) 944 if (next)
918 break; 945 break;
919
920 UNLOCK;
921 946
922 { 947 {
923 dSP; 948 dSP;
924 949
925 ENTER; 950 ENTER;
… …
936 961
937 prev = SvRV (current); 962 prev = SvRV (current);
938 SvRV (current) = next; 963 SvRV (current) = next;
939 964
940 /* free this only after the transfer */ 965 /* free this only after the transfer */
966 LOCK;
941 free_coro_mortal (); 967 free_coro_mortal ();
968 UNLOCK;
942 coro_mortal = prev; 969 coro_mortal = prev;
943 970
944 ta->prev = SvSTATE (prev); 971 ta->prev = SvSTATE (prev);
945 ta->next = SvSTATE (next); 972 ta->next = SvSTATE (next);
946 ta->flags = TRANSFER_SAVE_ALL; 973 ta->flags = TRANSFER_SAVE_ALL;
947
948 UNLOCK;
949} 974}
950 975
951static void 976static void
952prepare_cede (aTHX_ struct transfer_args *ta) 977prepare_cede (struct transfer_args *ta)
953{ 978{
954 LOCK; 979 LOCK;
955 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current)))); 980 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
956 UNLOCK; 981 UNLOCK;
957 982
958 prepare_schedule (ta); 983 prepare_schedule (ta);
959} 984}
960 985
… …
998 main_mainstack = PL_mainstack; 1023 main_mainstack = PL_mainstack;
999 1024
1000 coroapi.ver = CORO_API_VERSION; 1025 coroapi.ver = CORO_API_VERSION;
1001 coroapi.transfer = api_transfer; 1026 coroapi.transfer = api_transfer;
1002 1027
1003 Newz (0, main_stack, 1, coro_stack);
1004 main_stack->idle_sp = (void *)-1;
1005
1006 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1028 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1007} 1029}
1008 1030
1009SV * 1031SV *
1010new (char *klass, ...) 1032new (char *klass, ...)
… …
1022 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1044 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1023 1045
1024 for (i = 1; i < items; i++) 1046 for (i = 1; i < items; i++)
1025 av_push (coro->args, newSVsv (ST (i))); 1047 av_push (coro->args, newSVsv (ST (i)));
1026 1048
1027 coro->stack = main_stack;
1028 /*coro->mainstack = 0; *//*actual work is done inside transfer */ 1049 /*coro->mainstack = 0; *//*actual work is done inside transfer */
1029 /*coro->stack = 0;*/ 1050 /*coro->stack = 0;*/
1030} 1051}
1031 OUTPUT: 1052 OUTPUT:
1032 RETVAL 1053 RETVAL
1033 1054
1034void 1055void
1035transfer (...) 1056_set_stacklevel (...)
1036 ALIAS: 1057 ALIAS:
1037 Coro::schedule = 1 1058 Coro::State::transfer = 1
1038 Coro::cede = 2 1059 Coro::schedule = 2
1039 _set_stacklevel = 3 1060 Coro::cede = 3
1061 Coro::Cont::yield = 4
1040 CODE: 1062 CODE:
1041{ 1063{
1042 struct transfer_args ta; 1064 struct transfer_args ta;
1043 1065
1044 switch (ix) 1066 switch (ix)
1045 { 1067 {
1046 case 0: 1068 case 0:
1047 if (items != 3)
1048 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items);
1049
1050 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2)));
1051 break;
1052
1053 case 1:
1054 prepare_schedule (&ta);
1055 break;
1056
1057 case 2:
1058 prepare_cede (&ta);
1059 break;
1060
1061 case 3:
1062 ta.prev = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0))); 1069 ta.prev = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0)));
1063 ta.next = 0; 1070 ta.next = 0;
1064 ta.flags = TRANSFER_SET_STACKLEVEL; 1071 ta.flags = TRANSFER_SET_STACKLEVEL;
1065 break; 1072 break;
1073
1074 case 1:
1075 if (items != 3)
1076 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items);
1077
1078 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2)));
1079 break;
1080
1081 case 2:
1082 prepare_schedule (&ta);
1083 break;
1084
1085 case 3:
1086 prepare_cede (&ta);
1087 break;
1088
1089 case 4:
1090 {
1091 SV *yieldstack;
1092 SV *sv;
1093 AV *defav = GvAV (PL_defgv);
1094
1095 yieldstack = *hv_fetch (
1096 (HV *)SvRV (GvSV (coro_current)),
1097 "yieldstack", sizeof ("yieldstack") - 1,
1098 0
1099 );
1100
1101 /* set up @_ -- ugly */
1102 av_clear (defav);
1103 av_fill (defav, items - 1);
1104 while (items--)
1105 av_store (defav, items, SvREFCNT_inc (ST(items)));
1106
1107 sv = av_pop ((AV *)SvRV (yieldstack));
1108 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1109 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1110 ta.flags = 0;
1111 SvREFCNT_dec (sv);
1112 }
1113 break;
1114
1066 } 1115 }
1067 1116
1068 TRANSFER (ta); 1117 TRANSFER (ta);
1069} 1118}
1070 1119
… …
1077 sv_unmagic (SvRV (dst), PERL_MAGIC_ext); 1126 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1078 1127
1079 ++coro_src->refcnt; 1128 ++coro_src->refcnt;
1080 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP; 1129 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1081} 1130}
1082
1083void
1084_nonlocal_goto (IV nextop)
1085 CODE:
1086 /* uuh, somebody will kill me again for this */
1087 PL_op->op_next = INT2PTR (OP *, nextop);
1088 1131
1089void 1132void
1090_exit (code) 1133_exit (code)
1091 int code 1134 int code
1092 PROTOTYPE: $ 1135 PROTOTYPE: $
1093 CODE: 1136 CODE:
1094 _exit (code); 1137 _exit (code);
1095
1096MODULE = Coro::State PACKAGE = Coro::Cont
1097
1098void
1099yield (...)
1100 PROTOTYPE: @
1101 CODE:
1102{
1103 SV *yieldstack;
1104 SV *sv;
1105 AV *defav = GvAV (PL_defgv);
1106 struct coro *prev, *next;
1107
1108 yieldstack = *hv_fetch (
1109 (HV *)SvRV (GvSV (coro_current)),
1110 "yieldstack", sizeof ("yieldstack") - 1,
1111 0
1112 );
1113
1114 /* set up @_ -- ugly */
1115 av_clear (defav);
1116 av_fill (defav, items - 1);
1117 while (items--)
1118 av_store (defav, items, SvREFCNT_inc (ST(items)));
1119
1120 sv = av_pop ((AV *)SvRV (yieldstack));
1121 prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1122 next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1123 SvREFCNT_dec (sv);
1124
1125 coro_state_transfer (aTHX_ prev, next, 0);
1126}
1127 1138
1128MODULE = Coro::State PACKAGE = Coro 1139MODULE = Coro::State PACKAGE = Coro
1129 1140
1130BOOT: 1141BOOT:
1131{ 1142{

Diff Legend

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