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.24 by root, Tue Aug 14 14:56:22 2001 UTC vs.
Revision 1.54 by pcg, Sat Mar 13 06:45:04 2004 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "patchlevel.h"
6
7#if PATCHLEVEL < 6
8# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr
10# endif
11# ifndef call_sv
12# define call_sv perl_call_sv
13# endif
14# ifndef get_sv
15# define get_sv perl_get_sv
16# endif
17# ifndef get_cv
18# define get_cv perl_get_cv
19# endif
20# ifndef IS_PADGV
21# define IS_PADGV(v) 0
22# endif
23# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0
25# endif
26#endif
27
5#include "libcoro/coro.c" 28#include "libcoro/coro.c"
6 29
7#include <signal.h> 30#include <signal.h>
8 31
9#ifdef HAVE_MMAP 32#ifdef HAVE_MMAP
10# include <unistd.h> 33# include <unistd.h>
11# include <sys/mman.h> 34# include <sys/mman.h>
12# ifndef MAP_ANON
13# ifdef MAP_ANONYMOUS 35# ifndef MAP_ANONYMOUS
14# define MAP_ANON MAP_ANONYMOUS 36# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON
15# else 38# else
16# undef HAVE_MMAP 39# undef HAVE_MMAP
17# endif 40# endif
18# endif 41# endif
19#endif 42#endif
20 43
21#define MAY_FLUSH /* increases codesize */
22
23#define SUB_INIT "Coro::State::initialize" 44#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 45#define UCORO_STATE "_coro_state"
25 46
26/* The next macro should delcare a variable stacklevel that contains and approximation 47/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 48 * to the current C stack pointer. Its property is that it changes with each call
28 * and should be unique. */ 49 * and should be unique. */
29#define dSTACKLEVEL void *stacklevel = &stacklevel 50#define dSTACKLEVEL void *stacklevel = &stacklevel
51
52#define IN_DESTRUCT (PL_main_cv == Nullcv)
30 53
31#define labs(l) ((l) >= 0 ? (l) : -(l)) 54#define labs(l) ((l) >= 0 ? (l) : -(l))
32 55
33#include "CoroAPI.h" 56#include "CoroAPI.h"
34 57
… …
45 void *sptr; 68 void *sptr;
46 long ssize; /* positive == mmap, otherwise malloc */ 69 long ssize; /* positive == mmap, otherwise malloc */
47} coro_stack; 70} coro_stack;
48 71
49struct coro { 72struct coro {
73 /* the top-level JMPENV for each coroutine, needed to catch dies. */
74 JMPENV start_env;
75
50 /* the optional C context */ 76 /* the optional C context */
51 coro_stack *stack; 77 coro_stack *stack;
52 void *cursp; 78 void *cursp;
53 int gencnt; 79 int gencnt;
54 80
… …
66 AV *curstack; 92 AV *curstack;
67 AV *mainstack; 93 AV *mainstack;
68 SV **stack_sp; 94 SV **stack_sp;
69 OP *op; 95 OP *op;
70 SV **curpad; 96 SV **curpad;
97 AV *comppad;
71 SV **stack_base; 98 SV **stack_base;
72 SV **stack_max; 99 SV **stack_max;
73 SV **tmps_stack; 100 SV **tmps_stack;
74 I32 tmps_floor; 101 I32 tmps_floor;
75 I32 tmps_ix; 102 I32 tmps_ix;
… …
99static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
100static HV *coro_state_stash; 127static HV *coro_state_stash;
101static SV *ucoro_state_sv; 128static SV *ucoro_state_sv;
102static U32 ucoro_state_hash; 129static U32 ucoro_state_hash;
103static HV *padlist_cache; 130static HV *padlist_cache;
131static SV *coro_mortal; /* will be freed after next transfer */
104 132
105/* mostly copied from op.c:cv_clone2 */ 133/* mostly copied from op.c:cv_clone2 */
106STATIC AV * 134STATIC AV *
107clone_padlist (AV *protopadlist) 135clone_padlist (AV *protopadlist)
108{ 136{
… …
154 sv = (SV *) newAV (); 182 sv = (SV *) newAV ();
155 else if (*name == '%') 183 else if (*name == '%')
156 sv = (SV *) newHV (); 184 sv = (SV *) newHV ();
157 else 185 else
158 sv = NEWSV (0, 0); 186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
159 if (!SvPADBUSY (sv)) 188 if (!SvPADBUSY (sv))
189#endif
160 SvPADMY_on (sv); 190 SvPADMY_on (sv);
161 npad[ix] = sv; 191 npad[ix] = sv;
162 } 192 }
163 } 193 }
164 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
… …
194#endif 224#endif
195 225
196 return newpadlist; 226 return newpadlist;
197} 227}
198 228
199#ifdef MAY_FLUSH 229STATIC void
200STATIC AV *
201free_padlist (AV *padlist) 230free_padlist (AV *padlist)
202{ 231{
203 /* may be during global destruction */ 232 /* may be during global destruction */
204 if (SvREFCNT(padlist)) 233 if (SvREFCNT (padlist))
205 { 234 {
206 I32 i = AvFILLp(padlist); 235 I32 i = AvFILLp (padlist);
207 while (i >= 0) 236 while (i >= 0)
208 { 237 {
209 SV **svp = av_fetch(padlist, i--, FALSE); 238 SV **svp = av_fetch (padlist, i--, FALSE);
210 SV *sv = svp ? *svp : Nullsv;
211 if (sv) 239 if (svp)
240 {
241 SV *sv;
242 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
212 SvREFCNT_dec(sv); 243 SvREFCNT_dec (sv);
244
245 SvREFCNT_dec (*svp);
246 }
213 } 247 }
214 248
215 SvREFCNT_dec((SV*)padlist); 249 SvREFCNT_dec ((SV*)padlist);
216 } 250 }
217} 251}
218#endif 252
253STATIC int
254coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
255{
256 AV *padlist;
257 AV *av = (AV *)mg->mg_obj;
258
259 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist);
262}
263
264#define PERL_MAGIC_coro PERL_MAGIC_ext
265
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
219 267
220/* the next two functions merely cache the padlists */ 268/* the next two functions merely cache the padlists */
221STATIC void 269STATIC void
222get_padlist (CV *cv) 270get_padlist (CV *cv)
223{ 271{
224 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
225 273
226 if (he && AvFILLp ((AV *)*he) >= 0) 274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
227 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
228 else 276 else
229 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
230} 278}
231 279
232STATIC void 280STATIC void
233put_padlist (CV *cv) 281put_padlist (CV *cv)
234{ 282{
235 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
236 284
237 if (SvTYPE (*he) != SVt_PVAV) 285 if (!mg)
238 { 286 {
239 SvREFCNT_dec (*he); 287 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
288 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
289 mg->mg_virtual = &vtbl_coro;
240 *he = (SV *)newAV (); 290 mg->mg_obj = (SV *)newAV ();
241 } 291 }
242 292
243 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 293 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
244} 294}
245
246#ifdef MAY_FLUSH
247STATIC void
248flush_padlist_cache ()
249{
250 HV *hv = padlist_cache;
251 padlist_cache = newHV ();
252
253 if (hv_iterinit (hv))
254 {
255 HE *he;
256 AV *padlist;
257
258 while (!!(he = hv_iternext (hv)))
259 {
260 AV *av = (AV *)HeVAL(he);
261
262 /* casting is fun. */
263 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
264 free_padlist (padlist);
265 }
266 }
267
268 SvREFCNT_dec (hv);
269}
270#endif
271 295
272#define SB do { 296#define SB do {
273#define SE } while (0) 297#define SE } while (0)
274 298
275#define LOAD(state) SB load_state(aTHX_ (state)); SPAGAIN; SE 299#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ (state),(flags)); SE 300#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
277 301
278#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 302#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
279 303
280static void 304static void
281load_state(pTHX_ Coro__State c) 305load_state(pTHX_ Coro__State c)
282{ 306{
283 PL_dowarn = c->dowarn; 307 PL_dowarn = c->dowarn;
… …
287 PL_curstack = c->curstack; 311 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 312 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 313 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 314 PL_op = c->op;
291 PL_curpad = c->curpad; 315 PL_curpad = c->curpad;
316 PL_comppad = c->comppad;
292 PL_stack_base = c->stack_base; 317 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 318 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 319 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 320 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 321 PL_tmps_ix = c->tmps_ix;
… …
355 380
356 PUSHs (Nullsv); 381 PUSHs (Nullsv);
357 /* this loop was inspired by pp_caller */ 382 /* this loop was inspired by pp_caller */
358 for (;;) 383 for (;;)
359 { 384 {
360 do 385 while (cxix >= 0)
361 { 386 {
362 PERL_CONTEXT *cx = &ccstk[cxix--]; 387 PERL_CONTEXT *cx = &ccstk[cxix--];
363 388
364 if (CxTYPE(cx) == CXt_SUB) 389 if (CxTYPE(cx) == CXt_SUB)
365 { 390 {
… …
384 PUSHs ((SV *)cv); 409 PUSHs ((SV *)cv);
385 410
386 get_padlist (cv); /* this is a monster */ 411 get_padlist (cv); /* this is a monster */
387 } 412 }
388 } 413 }
414#ifdef CXt_FORMAT
389 else if (CxTYPE(cx) == CXt_FORMAT) 415 else if (CxTYPE(cx) == CXt_FORMAT)
390 { 416 {
391 /* I never used formats, so how should I know how these are implemented? */ 417 /* I never used formats, so how should I know how these are implemented? */
392 /* my bold guess is as a simple, plain sub... */ 418 /* my bold guess is as a simple, plain sub... */
393 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 419 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
394 } 420 }
421#endif
395 } 422 }
396 while (cxix >= 0);
397 423
398 if (top_si->si_type == PERLSI_MAIN) 424 if (top_si->si_type == PERLSI_MAIN)
399 break; 425 break;
400 426
401 top_si = top_si->si_prev; 427 top_si = top_si->si_prev;
… …
407 } 433 }
408 434
409 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 435 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
410 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 436 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
411 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 437 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
412
413 /* I have not the slightest idea of why av_reify is necessary */
414 /* but if it's missing the defav contents magically get replaced sometimes */
415 if (c->defav)
416 av_reify (c->defav);
417 438
418 c->dowarn = PL_dowarn; 439 c->dowarn = PL_dowarn;
419 c->in_eval = PL_in_eval; 440 c->in_eval = PL_in_eval;
420 441
421 c->curstackinfo = PL_curstackinfo; 442 c->curstackinfo = PL_curstackinfo;
422 c->curstack = PL_curstack; 443 c->curstack = PL_curstack;
423 c->mainstack = PL_mainstack; 444 c->mainstack = PL_mainstack;
424 c->stack_sp = PL_stack_sp; 445 c->stack_sp = PL_stack_sp;
425 c->op = PL_op; 446 c->op = PL_op;
426 c->curpad = PL_curpad; 447 c->curpad = PL_curpad;
448 c->comppad = PL_comppad;
427 c->stack_base = PL_stack_base; 449 c->stack_base = PL_stack_base;
428 c->stack_max = PL_stack_max; 450 c->stack_max = PL_stack_max;
429 c->tmps_stack = PL_tmps_stack; 451 c->tmps_stack = PL_tmps_stack;
430 c->tmps_floor = PL_tmps_floor; 452 c->tmps_floor = PL_tmps_floor;
431 c->tmps_ix = PL_tmps_ix; 453 c->tmps_ix = PL_tmps_ix;
… …
447} 469}
448 470
449/* 471/*
450 * allocate various perl stacks. This is an exact copy 472 * allocate various perl stacks. This is an exact copy
451 * of perl.c:init_stacks, except that it uses less memory 473 * of perl.c:init_stacks, except that it uses less memory
452 * on the assumption that coroutines do not usually need 474 * on the (sometimes correct) assumption that coroutines do
453 * a lot of stackspace. 475 * not usually need a lot of stackspace.
454 */ 476 */
455STATIC void 477STATIC void
456coro_init_stacks (pTHX) 478coro_init_stacks (pTHX)
457{ 479{
458 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
471 493
472 New(54,PL_markstack,16,I32); 494 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 495 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 496 PL_markstack_max = PL_markstack + 16;
475 497
498#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 499 SET_MARK_OFFSET;
500#endif
477 501
478 New(54,PL_scopestack,16,I32); 502 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 503 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 504 PL_scopestack_max = 16;
481 505
… …
488 PL_retstack_max = 8; 512 PL_retstack_max = 8;
489} 513}
490 514
491/* 515/*
492 * destroy the stacks, the callchain etc... 516 * destroy the stacks, the callchain etc...
493 * still there is a memleak of 128 bytes...
494 */ 517 */
495STATIC void 518STATIC void
496destroy_stacks(pTHX) 519destroy_stacks(pTHX)
497{ 520{
521 if (!IN_DESTRUCT)
522 {
498 /* is this ugly, I ask? */ 523 /* is this ugly, I ask? */
499 while (PL_scopestack_ix) 524 LEAVE_SCOPE (0);
500 LEAVE;
501 525
502 /* sure it is, but more important: is it correct?? :/ */ 526 /* sure it is, but more important: is it correct?? :/ */
503 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
504 FREETMPS; 527 FREETMPS;
528 }
505 529
506 while (PL_curstackinfo->si_next) 530 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 531 PL_curstackinfo = PL_curstackinfo->si_next;
508 532
509 while (PL_curstackinfo) 533 while (PL_curstackinfo)
… …
514 dSP; 538 dSP;
515 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 539 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
516 PUTBACK; /* possibly superfluous */ 540 PUTBACK; /* possibly superfluous */
517 } 541 }
518 542
519 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 543 if (!IN_DESTRUCT)
544 {
520 dounwind(-1); 545 dounwind(-1);
521
522 SvREFCNT_dec(PL_curstackinfo->si_stack); 546 SvREFCNT_dec(PL_curstackinfo->si_stack);
547 }
548
523 Safefree(PL_curstackinfo->si_cxstack); 549 Safefree(PL_curstackinfo->si_cxstack);
524 Safefree(PL_curstackinfo); 550 Safefree(PL_curstackinfo);
525 PL_curstackinfo = p; 551 PL_curstackinfo = p;
526 } 552 }
527 553
… …
542 stack->refcnt = 1; 568 stack->refcnt = 1;
543 stack->usecnt = 1; 569 stack->usecnt = 1;
544 stack->gencnt = ctx->gencnt = 0; 570 stack->gencnt = ctx->gencnt = 0;
545 if (alloc) 571 if (alloc)
546 { 572 {
547#ifdef HAVE_MMAP 573#if HAVE_MMAP
548 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 574 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
549 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 575 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
550 if (stack->sptr == (void *)-1) 576 if (stack->sptr == (void *)-1)
551#endif 577#endif
552 { 578 {
553 /*FIXME*//*D*//* reasonable stack size! */ 579 /*FIXME*//*D*//* reasonable stack size! */
554 stack->ssize = -4096 * sizeof (long); 580 stack->ssize = - (8192 * sizeof (long));
555 New (0, stack->sptr, 4096, long); 581 New (0, stack->sptr, 8192, long);
556 } 582 }
557 } 583 }
558 else 584 else
559 stack->sptr = 0; 585 stack->sptr = 0;
560 586
… …
574 { 600 {
575#ifdef HAVE_MMAP 601#ifdef HAVE_MMAP
576 if (stack->ssize > 0 && stack->sptr) 602 if (stack->ssize > 0 && stack->sptr)
577 munmap (stack->sptr, stack->ssize); 603 munmap (stack->sptr, stack->ssize);
578 else 604 else
579#else 605#endif
580 Safefree (stack->sptr); 606 Safefree (stack->sptr);
581#endif 607
582 Safefree (stack); 608 Safefree (stack);
583 } 609 }
584 else if (ctx->gencnt == stack->gencnt) 610 else if (ctx->gencnt == stack->gencnt)
585 --stack->usecnt; 611 --stack->usecnt;
586 } 612 }
… …
592 /* 618 /*
593 * emulate part of the perl startup here. 619 * emulate part of the perl startup here.
594 */ 620 */
595 dSP; 621 dSP;
596 Coro__State ctx = (Coro__State)arg; 622 Coro__State ctx = (Coro__State)arg;
597 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 623 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
598 624
599 coro_init_stacks (aTHX); 625 coro_init_stacks (aTHX);
600 /*PL_curcop = 0;*/ 626 /*PL_curcop = 0;*/
601 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 627 /*PL_in_eval = PL_in_eval;*/ /* inherit */
602 SvREFCNT_dec (GvAV (PL_defgv)); 628 SvREFCNT_dec (GvAV (PL_defgv));
603 GvAV (PL_defgv) = ctx->args; 629 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
604 630
605 SPAGAIN; 631 SPAGAIN;
606 632
607 if (ctx->stack) 633 if (ctx->stack)
608 { 634 {
… …
635 * that doesn't matter, though, since it is only 661 * that doesn't matter, though, since it is only
636 * pp_nextstate and we never return... 662 * pp_nextstate and we never return...
637 * ah yes, and I don't care anyways ;) 663 * ah yes, and I don't care anyways ;)
638 */ 664 */
639 PUTBACK; 665 PUTBACK;
640 PL_op = pp_entersub(); 666 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
641 SPAGAIN; 667 SPAGAIN;
642 668
643 ENTER; /* necessary e.g. for dounwind */ 669 ENTER; /* necessary e.g. for dounwind */
644 } 670 }
645} 671}
… …
649{ 675{
650 /* 676 /*
651 * this is a _very_ stripped down perl interpreter ;) 677 * this is a _very_ stripped down perl interpreter ;)
652 */ 678 */
653 Coro__State ctx = (Coro__State)arg; 679 Coro__State ctx = (Coro__State)arg;
680 JMPENV coro_start_env;
654 681
655 /*FIXME*//* must set up top_env here */ 682 PL_top_env = &ctx->start_env;
683
656 ctx->cursp = 0; 684 ctx->cursp = 0;
657 PL_op = PL_op->op_next; 685 PL_op = PL_op->op_next;
658 CALLRUNOPS(aTHX); 686 CALLRUNOPS(aTHX);
659 687
660 abort (); 688 abort ();
661} 689}
662 690
663STATIC void 691STATIC void
664transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 692transfer(pTHX_ struct coro *prev, struct coro *next, int flags)
665{ 693{
666 dSP;
667 dSTACKLEVEL; 694 dSTACKLEVEL;
695 static struct coro *xnext;
668 696
669 if (prev != next) 697 if (prev != next)
670 { 698 {
699 xnext = next;
700
671 if (next->mainstack) 701 if (next->mainstack)
672 { 702 {
673 SAVE (prev, flags); 703 SAVE (prev, flags);
674 LOAD (next); 704 LOAD (next);
675 705
… …
698 continue_coro, (void *)next, 728 continue_coro, (void *)next,
699 next->stack->sptr, labs (next->stack->ssize)); 729 next->stack->sptr, labs (next->stack->ssize));
700 } 730 }
701 731
702 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
733 /* don't add any code here */
703 } 734 }
704 735
705 } 736 }
706 else if (next->tmps_ix == -2) 737 else if (next->tmps_ix == -2)
707 croak ("tried to transfer to running coroutine"); 738 croak ("tried to transfer to running coroutine");
… …
714 if (!prev->stack) 745 if (!prev->stack)
715 allocate_stack (prev, 0); 746 allocate_stack (prev, 0);
716 747
717 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 748 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
718 { 749 {
750 PL_top_env = &next->start_env;
751
719 setup_coro (next); 752 setup_coro (next);
720 753
721 prev->stack->refcnt++; 754 prev->stack->refcnt++;
722 prev->stack->usecnt++; 755 prev->stack->usecnt++;
723 next->stack = prev->stack; 756 next->stack = prev->stack;
724 next->gencnt = prev->gencnt; 757 next->gencnt = prev->gencnt;
725 } 758 }
726 else 759 else
727 { 760 {
761 assert (!next->stack);
728 allocate_stack (next, 1); 762 allocate_stack (next, 1);
729 coro_create (&(next->stack->cctx), 763 coro_create (&(next->stack->cctx),
730 setup_coro, (void *)next, 764 setup_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 765 next->stack->sptr, labs (next->stack->ssize));
732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 766 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
767 /* don't add any code here */
733 } 768 }
734 } 769 }
735 else 770 else
736 setup_coro (next); 771 setup_coro (next);
737 } 772 }
773
774 /*
775 * xnext is now either prev or next, depending on wether
776 * we switched the c stack or not. that's why I use a global
777 * variable, that should become thread-specific at one point.
778 */
779 xnext->cursp = stacklevel;
738 } 780 }
739 781
740 next->cursp = stacklevel; 782 if (coro_mortal)
741}
742
743static struct coro *
744sv_to_coro (SV *arg, const char *funcname, const char *varname)
745{
746 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
747 { 783 {
748 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 784 SvREFCNT_dec (coro_mortal);
749 785 coro_mortal = 0;
750 if (!he)
751 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
752
753 arg = HeVAL(he);
754 } 786 }
755 787}
788
789#define SV_CORO(sv,func) \
790 do { \
791 if (SvROK (sv)) \
792 sv = SvRV (sv); \
793 \
794 if (SvTYPE(sv) == SVt_PVHV) \
795 { \
796 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
797 \
798 if (!he) \
799 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
800 \
801 (sv) = SvRV (HeVAL(he)); \
802 } \
803 \
756 /* must also be changed inside Coro::Cont::yield */ 804 /* must also be changed inside Coro::Cont::yield */ \
757 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 805 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
758 return (struct coro *) SvIV((SV*)SvRV(arg));
759 else
760 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 806 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
761} 807 \
808 } while(0)
809
810#define SvSTATE(sv) (struct coro *)SvIV (sv)
762 811
763static void 812static void
764api_transfer(pTHX_ SV *prev, SV *next, int flags) 813api_transfer(pTHX_ SV *prev, SV *next, int flags)
765{ 814{
766 transfer(aTHX_ sv_to_coro (prev, "Coro::transfer", "prev"), 815 SV_CORO (prev, "Coro::transfer");
767 sv_to_coro (next, "Coro::transfer", "next"), 816 SV_CORO (next, "Coro::transfer");
768 flags); 817
818 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
769} 819}
770 820
771/** Coro ********************************************************************/ 821/** Coro ********************************************************************/
772 822
773#define PRIO_MAX 3 823#define PRIO_MAX 3
… …
778#define PRIO_MIN -4 828#define PRIO_MIN -4
779 829
780/* for Coro.pm */ 830/* for Coro.pm */
781static GV *coro_current, *coro_idle; 831static GV *coro_current, *coro_idle;
782static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 832static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
833static int coro_nready;
783 834
784static void 835static void
785coro_enq (SV *sv) 836coro_enq (SV *sv)
786{ 837{
787 if (SvROK (sv)) 838 if (SvTYPE (sv) == SVt_PVHV)
788 { 839 {
789 SV *hv = SvRV (sv);
790 if (SvTYPE (hv) == SVt_PVHV)
791 {
792 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 840 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
793 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 841 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
794 842
795 prio = prio > PRIO_MAX ? PRIO_MAX 843 prio = prio > PRIO_MAX ? PRIO_MAX
796 : prio < PRIO_MIN ? PRIO_MIN 844 : prio < PRIO_MIN ? PRIO_MIN
797 : prio; 845 : prio;
798 846
799 av_push (coro_ready [prio - PRIO_MIN], sv); 847 av_push (coro_ready [prio - PRIO_MIN], sv);
848 coro_nready++;
800 849
801 return; 850 return;
802 }
803 } 851 }
804 852
805 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 853 croak ("Coro::ready tried to enqueue something that is not a coroutine");
806} 854}
807 855
… …
814 if (min_prio < 0) 862 if (min_prio < 0)
815 min_prio = 0; 863 min_prio = 0;
816 864
817 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 865 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
818 if (av_len (coro_ready[prio]) >= 0) 866 if (av_len (coro_ready[prio]) >= 0)
867 {
868 coro_nready--;
819 return av_shift (coro_ready[prio]); 869 return av_shift (coro_ready[prio]);
870 }
820 871
821 return 0; 872 return 0;
822} 873}
823 874
824static void 875static void
825api_ready (SV *coro) 876api_ready (SV *coro)
826{ 877{
878 if (SvROK (coro))
879 coro = SvRV (coro);
880
827 coro_enq (SvREFCNT_inc (coro)); 881 coro_enq (SvREFCNT_inc (coro));
828} 882}
829 883
830static void 884static void
831api_schedule (int cede) 885api_schedule (void)
832{ 886{
833 SV *prev, *next; 887 SV *prev, *next;
834 888
835 prev = GvSV (coro_current); 889 prev = SvRV (GvSV (coro_current));
836
837 if (cede)
838 coro_enq (SvREFCNT_inc (prev));
839
840 next = coro_deq (PRIO_MIN); 890 next = coro_deq (PRIO_MIN);
841 891
842 if (!next) 892 if (!next)
843 next = SvREFCNT_inc (GvSV (coro_idle)); 893 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
844 894
845 GvSV (coro_current) = SvREFCNT_inc (next); 895 /* free this only after the transfer */
846 transfer (sv_to_coro (prev, "Coro::schedule", "current coroutine"), 896 coro_mortal = prev;
847 sv_to_coro (next, "Coro::schedule", "next coroutine"), 897 SV_CORO (prev, "Coro::schedule");
898
899 SvRV (GvSV (coro_current)) = next;
900
901 SV_CORO (next, "Coro::schedule");
902
903 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
848 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 904 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
849 SvREFCNT_dec (next); 905}
850 SvREFCNT_dec (prev); 906
907static void
908api_cede (void)
909{
910 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
911
912 api_schedule ();
851} 913}
852 914
853MODULE = Coro::State PACKAGE = Coro::State 915MODULE = Coro::State PACKAGE = Coro::State
854 916
855PROTOTYPES: ENABLE 917PROTOTYPES: ENABLE
… …
868 if (!padlist_cache) 930 if (!padlist_cache)
869 padlist_cache = newHV (); 931 padlist_cache = newHV ();
870 932
871 main_mainstack = PL_mainstack; 933 main_mainstack = PL_mainstack;
872 934
873 {
874 SV *sv = perl_get_sv("Coro::API", 1);
875
876 coroapi.ver = CORO_API_VERSION - 1; 935 coroapi.ver = CORO_API_VERSION;
877 coroapi.transfer = api_transfer; 936 coroapi.transfer = api_transfer;
878 coroapi.schedule = api_schedule;
879 coroapi.ready = api_ready;
880
881 GCoroAPI = &coroapi;
882 sv_setiv(sv, (IV)&coroapi);
883 SvREADONLY_on(sv);
884 }
885} 937}
886 938
887Coro::State 939Coro::State
888_newprocess(args) 940_newprocess(args)
889 SV * args 941 SV * args
… …
892 Coro__State coro; 944 Coro__State coro;
893 945
894 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 946 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
895 croak ("Coro::State::_newprocess expects an arrayref"); 947 croak ("Coro::State::_newprocess expects an arrayref");
896 948
897 New (0, coro, 1, struct coro); 949 Newz (0, coro, 1, struct coro);
898 950
899 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 951 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
900 coro->mainstack = 0; /* actual work is done inside transfer */ 952 coro->mainstack = 0; /* actual work is done inside transfer */
901 coro->stack = 0; 953 coro->stack = 0;
902 954
955 /* same as JMPENV_BOOTSTRAP */
956 /* we might be able to recycle start_env, but safe is safe */
957 //Zero(&coro->start_env, 1, JMPENV);
958 coro->start_env.je_ret = -1;
959 coro->start_env.je_mustcatch = TRUE;
960
903 RETVAL = coro; 961 RETVAL = coro;
904 OUTPUT: 962 OUTPUT:
905 RETVAL 963 RETVAL
906 964
907void 965void
908transfer(prev, next, flags) 966transfer(prev, next, flags)
909 Coro::State_or_hashref prev 967 SV *prev
910 Coro::State_or_hashref next 968 SV *next
911 int flags 969 int flags
912 PROTOTYPE: @ 970 PROTOTYPE: @
913 CODE: 971 CODE:
914 PUTBACK; 972 PUTBACK;
973 SV_CORO (next, "Coro::transfer");
974 SV_CORO (prev, "Coro::transfer");
915 transfer (aTHX_ prev, next, flags); 975 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
916 SPAGAIN; 976 SPAGAIN;
917 977
918void 978void
919DESTROY(coro) 979DESTROY(coro)
920 Coro::State coro 980 Coro::State coro
… …
922 982
923 if (coro->mainstack && coro->mainstack != main_mainstack) 983 if (coro->mainstack && coro->mainstack != main_mainstack)
924 { 984 {
925 struct coro temp; 985 struct coro temp;
926 986
987 PUTBACK;
927 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 988 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL);
928 LOAD(aTHX_ coro); 989 LOAD(aTHX_ coro);
990 SPAGAIN;
929 991
930 destroy_stacks (aTHX); 992 destroy_stacks (aTHX);
931 993
932 LOAD((&temp)); /* this will get rid of defsv etc.. */ 994 LOAD((&temp)); /* this will get rid of defsv etc.. */
995 SPAGAIN;
933 996
934 coro->mainstack = 0; 997 coro->mainstack = 0;
935 } 998 }
936 999
937 deallocate_stack (coro); 1000 deallocate_stack (coro);
938 1001 SvREFCNT_dec (coro->args);
939 Safefree (coro); 1002 Safefree (coro);
940
941void
942flush()
943 CODE:
944#ifdef MAY_FLUSH
945 flush_padlist_cache ();
946#endif
947 1003
948void 1004void
949_exit(code) 1005_exit(code)
950 int code 1006 int code
951 PROTOTYPE: $ 1007 PROTOTYPE: $
952 CODE: 1008 CODE:
953#if defined(__GLIBC__) || _POSIX_C_SOURCE
954 _exit (code); 1009 _exit (code);
955#else
956 signal (SIGTERM, SIG_DFL);
957 raise (SIGTERM);
958 exit (code);
959#endif
960 1010
961MODULE = Coro::State PACKAGE = Coro::Cont 1011MODULE = Coro::State PACKAGE = Coro::Cont
962 1012
963# this is slightly dirty (should expose a c-level api) 1013# this is slightly dirty (should expose a c-level api)
964 1014
… …
970 SV *sv; 1020 SV *sv;
971 AV *defav = GvAV (PL_defgv); 1021 AV *defav = GvAV (PL_defgv);
972 struct coro *prev, *next; 1022 struct coro *prev, *next;
973 1023
974 if (!returnstk) 1024 if (!returnstk)
975 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1025 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
976 1026
977 /* set up @_ -- ugly */ 1027 /* set up @_ -- ugly */
978 av_clear (defav); 1028 av_clear (defav);
979 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
980 while (items--) 1030 while (items--)
… …
1007 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1057 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV);
1008 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1058 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV);
1009 1059
1010 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1060 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1011 coro_ready[i] = newAV (); 1061 coro_ready[i] = newAV ();
1062
1063 {
1064 SV *sv = perl_get_sv("Coro::API", 1);
1065
1066 coroapi.schedule = api_schedule;
1067 coroapi.cede = api_cede;
1068 coroapi.ready = api_ready;
1069 coroapi.nready = &coro_nready;
1070 coroapi.current = coro_current;
1071
1072 GCoroAPI = &coroapi;
1073 sv_setiv(sv, (IV)&coroapi);
1074 SvREADONLY_on(sv);
1075 }
1012} 1076}
1077
1078#if !PERL_MICRO
1013 1079
1014void 1080void
1015ready(self) 1081ready(self)
1016 SV * self 1082 SV * self
1083 PROTOTYPE: $
1017 CODE: 1084 CODE:
1018 api_ready (self); 1085 api_ready (self);
1019 1086
1087#endif
1088
1089int
1090nready(...)
1091 PROTOTYPE:
1092 CODE:
1093 RETVAL = coro_nready;
1094 OUTPUT:
1095 RETVAL
1096
1020void 1097void
1021schedule(...) 1098schedule(...)
1022 ALIAS: 1099 PROTOTYPE:
1023 cede = 1
1024 CODE: 1100 CODE:
1025 api_schedule (ix); 1101 api_schedule ();
1026 1102
1103void
1104cede(...)
1105 PROTOTYPE:
1106 CODE:
1107 api_cede ();
1108

Diff Legend

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