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.22 by root, Sat Aug 11 23:10:56 2001 UTC vs.
Revision 1.53 by pcg, Sat Feb 14 12:39:41 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/* perl-related */
24#define TRANSFER_SAVE_DEFAV 0x00000001
25#define TRANSFER_SAVE_DEFSV 0x00000002
26#define TRANSFER_SAVE_ERRSV 0x00000004
27/* c-related */
28#define TRANSFER_SAVE_CCTXT 0x00000008
29#ifdef CORO_LAZY_STACK
30# define TRANSFER_LAZY_STACK 0x00000010
31#else
32# define TRANSFER_LAZY_STACK 0x00000000
33#endif
34
35#define TRANSFER_SAVE_ALL (TRANSFER_SAVE_DEFAV|TRANSFER_SAVE_DEFSV \
36 |TRANSFER_SAVE_ERRSV|TRANSFER_SAVE_CCTXT)
37
38#define SUB_INIT "Coro::State::initialize" 44#define SUB_INIT "Coro::State::initialize"
39#define UCORO_STATE "_coro_state" 45#define UCORO_STATE "_coro_state"
40 46
41/* 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
42 * to the current C stack pointer. It's property is that it changes with each call 48 * to the current C stack pointer. Its property is that it changes with each call
43 * and should be unique. */ 49 * and should be unique. */
44#define dSTACKLEVEL void *stacklevel = &stacklevel 50#define dSTACKLEVEL void *stacklevel = &stacklevel
45 51
52#define IN_DESTRUCT (PL_main_cv == Nullcv)
53
46#define labs(l) ((l) >= 0 ? (l) : -(l)) 54#define labs(l) ((l) >= 0 ? (l) : -(l))
55
56#include "CoroAPI.h"
57
58static struct CoroAPI coroapi;
47 59
48/* this is actually not only the c stack but also c registers etc... */ 60/* this is actually not only the c stack but also c registers etc... */
49typedef struct { 61typedef struct {
50 int refcnt; /* pointer reference counter */ 62 int refcnt; /* pointer reference counter */
51 int usecnt; /* shared by how many coroutines */ 63 int usecnt; /* shared by how many coroutines */
… …
56 void *sptr; 68 void *sptr;
57 long ssize; /* positive == mmap, otherwise malloc */ 69 long ssize; /* positive == mmap, otherwise malloc */
58} coro_stack; 70} coro_stack;
59 71
60struct coro { 72struct coro {
73 /* the top-level JMPENV for each coroutine, needed to catch dies. */
74 JMPENV start_env;
75
61 /* the optional C context */ 76 /* the optional C context */
62 coro_stack *stack; 77 coro_stack *stack;
63 void *cursp; 78 void *cursp;
64 int gencnt; 79 int gencnt;
65 80
… …
77 AV *curstack; 92 AV *curstack;
78 AV *mainstack; 93 AV *mainstack;
79 SV **stack_sp; 94 SV **stack_sp;
80 OP *op; 95 OP *op;
81 SV **curpad; 96 SV **curpad;
97 AV *comppad;
82 SV **stack_base; 98 SV **stack_base;
83 SV **stack_max; 99 SV **stack_max;
84 SV **tmps_stack; 100 SV **tmps_stack;
85 I32 tmps_floor; 101 I32 tmps_floor;
86 I32 tmps_ix; 102 I32 tmps_ix;
… …
110static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
111static HV *coro_state_stash; 127static HV *coro_state_stash;
112static SV *ucoro_state_sv; 128static SV *ucoro_state_sv;
113static U32 ucoro_state_hash; 129static U32 ucoro_state_hash;
114static HV *padlist_cache; 130static HV *padlist_cache;
131static SV *coro_mortal; /* will be freed after next transfer */
115 132
116/* mostly copied from op.c:cv_clone2 */ 133/* mostly copied from op.c:cv_clone2 */
117STATIC AV * 134STATIC AV *
118clone_padlist (AV *protopadlist) 135clone_padlist (AV *protopadlist)
119{ 136{
… …
165 sv = (SV *) newAV (); 182 sv = (SV *) newAV ();
166 else if (*name == '%') 183 else if (*name == '%')
167 sv = (SV *) newHV (); 184 sv = (SV *) newHV ();
168 else 185 else
169 sv = NEWSV (0, 0); 186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
170 if (!SvPADBUSY (sv)) 188 if (!SvPADBUSY (sv))
189#endif
171 SvPADMY_on (sv); 190 SvPADMY_on (sv);
172 npad[ix] = sv; 191 npad[ix] = sv;
173 } 192 }
174 } 193 }
175 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
… …
205#endif 224#endif
206 225
207 return newpadlist; 226 return newpadlist;
208} 227}
209 228
210#ifdef MAY_FLUSH 229STATIC void
211STATIC AV *
212free_padlist (AV *padlist) 230free_padlist (AV *padlist)
213{ 231{
214 /* may be during global destruction */ 232 /* may be during global destruction */
215 if (SvREFCNT(padlist)) 233 if (SvREFCNT (padlist))
216 { 234 {
217 I32 i = AvFILLp(padlist); 235 I32 i = AvFILLp (padlist);
218 while (i >= 0) 236 while (i >= 0)
219 { 237 {
220 SV **svp = av_fetch(padlist, i--, FALSE); 238 SV **svp = av_fetch (padlist, i--, FALSE);
221 SV *sv = svp ? *svp : Nullsv;
222 if (sv) 239 if (svp)
240 {
241 SV *sv;
242 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
223 SvREFCNT_dec(sv); 243 SvREFCNT_dec (sv);
244
245 SvREFCNT_dec (*svp);
246 }
224 } 247 }
225 248
226 SvREFCNT_dec((SV*)padlist); 249 SvREFCNT_dec ((SV*)padlist);
227 } 250 }
228} 251}
229#endif 252
253STATIC int
254coro_cv_free (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};
230 267
231/* the next two functions merely cache the padlists */ 268/* the next two functions merely cache the padlists */
232STATIC void 269STATIC void
233get_padlist (CV *cv) 270get_padlist (CV *cv)
234{ 271{
235 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
236 273
237 if (he && AvFILLp ((AV *)*he) >= 0) 274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
238 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
239 else 276 else
240 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
241} 278}
242 279
243STATIC void 280STATIC void
244put_padlist (CV *cv) 281put_padlist (CV *cv)
245{ 282{
246 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
247 284
248 if (SvTYPE (*he) != SVt_PVAV) 285 if (!mg)
249 { 286 {
250 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;
251 *he = (SV *)newAV (); 290 mg->mg_obj = (SV *)newAV ();
252 } 291 }
253 292
254 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 293 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
255} 294}
256
257#ifdef MAY_FLUSH
258STATIC void
259flush_padlist_cache ()
260{
261 HV *hv = padlist_cache;
262 padlist_cache = newHV ();
263
264 if (hv_iterinit (hv))
265 {
266 HE *he;
267 AV *padlist;
268
269 while (!!(he = hv_iternext (hv)))
270 {
271 AV *av = (AV *)HeVAL(he);
272
273 /* casting is fun. */
274 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
275 free_padlist (padlist);
276 }
277 }
278
279 SvREFCNT_dec (hv);
280}
281#endif
282 295
283#define SB do { 296#define SB do {
284#define SE } while (0) 297#define SE } while (0)
285 298
286#define LOAD(state) SB load_state(aTHX_ (state)); SPAGAIN; SE 299#define LOAD(state) load_state(aTHX_ (state));
287#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ (state),(flags)); SE 300#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
288 301
289#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
290 303
291static void 304static void
292load_state(pTHX_ Coro__State c) 305load_state(pTHX_ Coro__State c)
293{ 306{
294 PL_dowarn = c->dowarn; 307 PL_dowarn = c->dowarn;
… …
298 PL_curstack = c->curstack; 311 PL_curstack = c->curstack;
299 PL_mainstack = c->mainstack; 312 PL_mainstack = c->mainstack;
300 PL_stack_sp = c->stack_sp; 313 PL_stack_sp = c->stack_sp;
301 PL_op = c->op; 314 PL_op = c->op;
302 PL_curpad = c->curpad; 315 PL_curpad = c->curpad;
316 PL_comppad = c->comppad;
303 PL_stack_base = c->stack_base; 317 PL_stack_base = c->stack_base;
304 PL_stack_max = c->stack_max; 318 PL_stack_max = c->stack_max;
305 PL_tmps_stack = c->tmps_stack; 319 PL_tmps_stack = c->tmps_stack;
306 PL_tmps_floor = c->tmps_floor; 320 PL_tmps_floor = c->tmps_floor;
307 PL_tmps_ix = c->tmps_ix; 321 PL_tmps_ix = c->tmps_ix;
… …
366 380
367 PUSHs (Nullsv); 381 PUSHs (Nullsv);
368 /* this loop was inspired by pp_caller */ 382 /* this loop was inspired by pp_caller */
369 for (;;) 383 for (;;)
370 { 384 {
371 do 385 while (cxix >= 0)
372 { 386 {
373 PERL_CONTEXT *cx = &ccstk[cxix--]; 387 PERL_CONTEXT *cx = &ccstk[cxix--];
374 388
375 if (CxTYPE(cx) == CXt_SUB) 389 if (CxTYPE(cx) == CXt_SUB)
376 { 390 {
… …
395 PUSHs ((SV *)cv); 409 PUSHs ((SV *)cv);
396 410
397 get_padlist (cv); /* this is a monster */ 411 get_padlist (cv); /* this is a monster */
398 } 412 }
399 } 413 }
414#ifdef CXt_FORMAT
400 else if (CxTYPE(cx) == CXt_FORMAT) 415 else if (CxTYPE(cx) == CXt_FORMAT)
401 { 416 {
402 /* 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? */
403 /* my bold guess is as a simple, plain sub... */ 418 /* my bold guess is as a simple, plain sub... */
404 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");
405 } 420 }
421#endif
406 } 422 }
407 while (cxix >= 0);
408 423
409 if (top_si->si_type == PERLSI_MAIN) 424 if (top_si->si_type == PERLSI_MAIN)
410 break; 425 break;
411 426
412 top_si = top_si->si_prev; 427 top_si = top_si->si_prev;
… …
418 } 433 }
419 434
420 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;
421 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 436 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
422 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 437 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
423
424 /* I have not the slightest idea of why av_reify is necessary */
425 /* but if it's missing the defav contents magically get replaced sometimes */
426 if (c->defav)
427 av_reify (c->defav);
428 438
429 c->dowarn = PL_dowarn; 439 c->dowarn = PL_dowarn;
430 c->in_eval = PL_in_eval; 440 c->in_eval = PL_in_eval;
431 441
432 c->curstackinfo = PL_curstackinfo; 442 c->curstackinfo = PL_curstackinfo;
433 c->curstack = PL_curstack; 443 c->curstack = PL_curstack;
434 c->mainstack = PL_mainstack; 444 c->mainstack = PL_mainstack;
435 c->stack_sp = PL_stack_sp; 445 c->stack_sp = PL_stack_sp;
436 c->op = PL_op; 446 c->op = PL_op;
437 c->curpad = PL_curpad; 447 c->curpad = PL_curpad;
448 c->comppad = PL_comppad;
438 c->stack_base = PL_stack_base; 449 c->stack_base = PL_stack_base;
439 c->stack_max = PL_stack_max; 450 c->stack_max = PL_stack_max;
440 c->tmps_stack = PL_tmps_stack; 451 c->tmps_stack = PL_tmps_stack;
441 c->tmps_floor = PL_tmps_floor; 452 c->tmps_floor = PL_tmps_floor;
442 c->tmps_ix = PL_tmps_ix; 453 c->tmps_ix = PL_tmps_ix;
… …
458} 469}
459 470
460/* 471/*
461 * allocate various perl stacks. This is an exact copy 472 * allocate various perl stacks. This is an exact copy
462 * of perl.c:init_stacks, except that it uses less memory 473 * of perl.c:init_stacks, except that it uses less memory
463 * on the assumption that coroutines do not usually need 474 * on the (sometimes correct) assumption that coroutines do
464 * a lot of stackspace. 475 * not usually need a lot of stackspace.
465 */ 476 */
466STATIC void 477STATIC void
467coro_init_stacks (pTHX) 478coro_init_stacks (pTHX)
468{ 479{
469 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
482 493
483 New(54,PL_markstack,16,I32); 494 New(54,PL_markstack,16,I32);
484 PL_markstack_ptr = PL_markstack; 495 PL_markstack_ptr = PL_markstack;
485 PL_markstack_max = PL_markstack + 16; 496 PL_markstack_max = PL_markstack + 16;
486 497
498#ifdef SET_MARK_OFFSET
487 SET_MARK_OFFSET; 499 SET_MARK_OFFSET;
500#endif
488 501
489 New(54,PL_scopestack,16,I32); 502 New(54,PL_scopestack,16,I32);
490 PL_scopestack_ix = 0; 503 PL_scopestack_ix = 0;
491 PL_scopestack_max = 16; 504 PL_scopestack_max = 16;
492 505
… …
499 PL_retstack_max = 8; 512 PL_retstack_max = 8;
500} 513}
501 514
502/* 515/*
503 * destroy the stacks, the callchain etc... 516 * destroy the stacks, the callchain etc...
504 * still there is a memleak of 128 bytes...
505 */ 517 */
506STATIC void 518STATIC void
507destroy_stacks(pTHX) 519destroy_stacks(pTHX)
508{ 520{
521 if (!IN_DESTRUCT)
522 {
509 /* is this ugly, I ask? */ 523 /* is this ugly, I ask? */
510 while (PL_scopestack_ix) 524 LEAVE_SCOPE (0);
511 LEAVE;
512 525
513 /* sure it is, but more important: is it correct?? :/ */ 526 /* sure it is, but more important: is it correct?? :/ */
514 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
515 FREETMPS; 527 FREETMPS;
528 }
516 529
517 while (PL_curstackinfo->si_next) 530 while (PL_curstackinfo->si_next)
518 PL_curstackinfo = PL_curstackinfo->si_next; 531 PL_curstackinfo = PL_curstackinfo->si_next;
519 532
520 while (PL_curstackinfo) 533 while (PL_curstackinfo)
… …
525 dSP; 538 dSP;
526 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 539 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
527 PUTBACK; /* possibly superfluous */ 540 PUTBACK; /* possibly superfluous */
528 } 541 }
529 542
543 if (!IN_DESTRUCT)
544 {
530 dounwind(-1); 545 dounwind(-1);
531
532 SvREFCNT_dec(PL_curstackinfo->si_stack); 546 SvREFCNT_dec(PL_curstackinfo->si_stack);
547 }
548
533 Safefree(PL_curstackinfo->si_cxstack); 549 Safefree(PL_curstackinfo->si_cxstack);
534 Safefree(PL_curstackinfo); 550 Safefree(PL_curstackinfo);
535 PL_curstackinfo = p; 551 PL_curstackinfo = p;
536 } 552 }
537 553
… …
552 stack->refcnt = 1; 568 stack->refcnt = 1;
553 stack->usecnt = 1; 569 stack->usecnt = 1;
554 stack->gencnt = ctx->gencnt = 0; 570 stack->gencnt = ctx->gencnt = 0;
555 if (alloc) 571 if (alloc)
556 { 572 {
557#ifdef HAVE_MMAP 573#if HAVE_MMAP
558 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 */
559 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);
560 if (stack->sptr == (void *)-1) 576 if (stack->sptr == (void *)-1)
561#endif 577#endif
562 { 578 {
563 /*FIXME*//*D*//* reasonable stack size! */ 579 /*FIXME*//*D*//* reasonable stack size! */
564 stack->ssize = -4096 * sizeof (long); 580 stack->ssize = - (8192 * sizeof (long));
565 New (0, stack->sptr, 4096, long); 581 New (0, stack->sptr, 8192, long);
566 } 582 }
567 } 583 }
568 else 584 else
569 stack->sptr = 0; 585 stack->sptr = 0;
570 586
… …
584 { 600 {
585#ifdef HAVE_MMAP 601#ifdef HAVE_MMAP
586 if (stack->ssize > 0 && stack->sptr) 602 if (stack->ssize > 0 && stack->sptr)
587 munmap (stack->sptr, stack->ssize); 603 munmap (stack->sptr, stack->ssize);
588 else 604 else
589#else 605#endif
590 Safefree (stack->sptr); 606 Safefree (stack->sptr);
591#endif 607
592 Safefree (stack); 608 Safefree (stack);
593 } 609 }
594 else if (ctx->gencnt == stack->gencnt) 610 else if (ctx->gencnt == stack->gencnt)
595 --stack->usecnt; 611 --stack->usecnt;
596 } 612 }
… …
602 /* 618 /*
603 * emulate part of the perl startup here. 619 * emulate part of the perl startup here.
604 */ 620 */
605 dSP; 621 dSP;
606 Coro__State ctx = (Coro__State)arg; 622 Coro__State ctx = (Coro__State)arg;
607 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 623 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
608 624
609 coro_init_stacks (aTHX); 625 coro_init_stacks (aTHX);
610 /*PL_curcop = 0;*/ 626 /*PL_curcop = 0;*/
611 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 627 /*PL_in_eval = PL_in_eval;*/ /* inherit */
612 SvREFCNT_dec (GvAV (PL_defgv)); 628 SvREFCNT_dec (GvAV (PL_defgv));
613 GvAV (PL_defgv) = ctx->args; 629 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
614 630
615 SPAGAIN; 631 SPAGAIN;
616 632
617 if (ctx->stack) 633 if (ctx->stack)
618 { 634 {
… …
645 * that doesn't matter, though, since it is only 661 * that doesn't matter, though, since it is only
646 * pp_nextstate and we never return... 662 * pp_nextstate and we never return...
647 * ah yes, and I don't care anyways ;) 663 * ah yes, and I don't care anyways ;)
648 */ 664 */
649 PUTBACK; 665 PUTBACK;
650 PL_op = pp_entersub(); 666 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
651 SPAGAIN; 667 SPAGAIN;
652 668
653 ENTER; /* necessary e.g. for dounwind */ 669 ENTER; /* necessary e.g. for dounwind */
654 } 670 }
655} 671}
… …
659{ 675{
660 /* 676 /*
661 * this is a _very_ stripped down perl interpreter ;) 677 * this is a _very_ stripped down perl interpreter ;)
662 */ 678 */
663 Coro__State ctx = (Coro__State)arg; 679 Coro__State ctx = (Coro__State)arg;
680 JMPENV coro_start_env;
664 681
665 /*FIXME*//* must set up top_env here */ 682 PL_top_env = &ctx->start_env;
683
666 ctx->cursp = 0; 684 ctx->cursp = 0;
667 PL_op = PL_op->op_next; 685 PL_op = PL_op->op_next;
668 CALLRUNOPS(aTHX); 686 CALLRUNOPS(aTHX);
669 687
670 abort (); 688 abort ();
671} 689}
672 690
673STATIC void 691STATIC void
674transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 692transfer(pTHX_ struct coro *prev, struct coro *next, int flags)
675{ 693{
676 dSP;
677 dSTACKLEVEL; 694 dSTACKLEVEL;
695 static struct coro *xnext;
678 696
679 if (prev != next) 697 if (prev != next)
680 { 698 {
699 xnext = next;
700
681 if (next->mainstack) 701 if (next->mainstack)
682 { 702 {
683 SAVE (prev, flags); 703 SAVE (prev, flags);
684 LOAD (next); 704 LOAD (next);
685 705
… …
708 continue_coro, (void *)next, 728 continue_coro, (void *)next,
709 next->stack->sptr, labs (next->stack->ssize)); 729 next->stack->sptr, labs (next->stack->ssize));
710 } 730 }
711 731
712 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
733 /* don't add any code here */
713 } 734 }
714 735
715 } 736 }
716 else if (next->tmps_ix == -2) 737 else if (next->tmps_ix == -2)
717 croak ("tried to transfer to running coroutine"); 738 croak ("tried to transfer to running coroutine");
… …
724 if (!prev->stack) 745 if (!prev->stack)
725 allocate_stack (prev, 0); 746 allocate_stack (prev, 0);
726 747
727 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 748 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
728 { 749 {
750 PL_top_env = &next->start_env;
751
729 setup_coro (next); 752 setup_coro (next);
730 753
731 prev->stack->refcnt++; 754 prev->stack->refcnt++;
732 prev->stack->usecnt++; 755 prev->stack->usecnt++;
733 next->stack = prev->stack; 756 next->stack = prev->stack;
734 next->gencnt = prev->gencnt; 757 next->gencnt = prev->gencnt;
735 } 758 }
736 else 759 else
737 { 760 {
761 assert (!next->stack);
738 allocate_stack (next, 1); 762 allocate_stack (next, 1);
739 coro_create (&(next->stack->cctx), 763 coro_create (&(next->stack->cctx),
740 setup_coro, (void *)next, 764 setup_coro, (void *)next,
741 next->stack->sptr, labs (next->stack->ssize)); 765 next->stack->sptr, labs (next->stack->ssize));
742 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 766 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
767 /* don't add any code here */
743 } 768 }
744 } 769 }
745 else 770 else
746 setup_coro (next); 771 setup_coro (next);
747 } 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;
748 } 780 }
749 781
750 next->cursp = stacklevel; 782 if (coro_mortal)
751}
752
753static struct coro *
754sv_to_coro (SV *arg, const char *funcname, const char *varname)
755{
756 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
757 { 783 {
784 SvREFCNT_dec (coro_mortal);
785 coro_mortal = 0;
786 }
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 { \
758 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 796 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
759 797 \
760 if (!he) 798 if (!he) \
761 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname); 799 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
762 800 \
763 arg = HeVAL(he); 801 (sv) = SvRV (HeVAL(he)); \
764 } 802 } \
765 803 \
766 /* must also be changed inside Coro::Cont::yield */ 804 /* must also be changed inside Coro::Cont::yield */ \
767 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 805 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
768 return (struct coro *) SvIV((SV*)SvRV(arg));
769 else
770 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); \
807 \
808 } while(0)
809
810#define SvSTATE(sv) (struct coro *)SvIV (sv)
811
812static void
813api_transfer(pTHX_ SV *prev, SV *next, int flags)
814{
815 SV_CORO (prev, "Coro::transfer");
816 SV_CORO (next, "Coro::transfer");
817
818 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
771} 819}
772 820
773/** Coro ********************************************************************/ 821/** Coro ********************************************************************/
774 822
775#define PRIO_MAX 3 823#define PRIO_MAX 3
… …
780#define PRIO_MIN -4 828#define PRIO_MIN -4
781 829
782/* for Coro.pm */ 830/* for Coro.pm */
783static GV *coro_current, *coro_idle; 831static GV *coro_current, *coro_idle;
784static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 832static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
833static int coro_nready;
785 834
786static void 835static void
787coro_enq (SV *sv) 836coro_enq (SV *sv)
788{ 837{
789 if (SvROK (sv)) 838 if (SvTYPE (sv) == SVt_PVHV)
790 { 839 {
791 SV *hv = SvRV (sv);
792 if (SvTYPE (hv) == SVt_PVHV)
793 {
794 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 840 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
795 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 841 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
796 842
797 prio = prio > PRIO_MAX ? PRIO_MAX 843 prio = prio > PRIO_MAX ? PRIO_MAX
798 : prio < PRIO_MIN ? PRIO_MIN 844 : prio < PRIO_MIN ? PRIO_MIN
799 : prio; 845 : prio;
800 846
801 av_push (coro_ready [prio - PRIO_MIN], sv); 847 av_push (coro_ready [prio - PRIO_MIN], sv);
848 coro_nready++;
802 849
803 return; 850 return;
804 }
805 } 851 }
806 852
807 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");
808} 854}
809 855
… …
816 if (min_prio < 0) 862 if (min_prio < 0)
817 min_prio = 0; 863 min_prio = 0;
818 864
819 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 865 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
820 if (av_len (coro_ready[prio]) >= 0) 866 if (av_len (coro_ready[prio]) >= 0)
867 {
868 coro_nready--;
821 return av_shift (coro_ready[prio]); 869 return av_shift (coro_ready[prio]);
870 }
822 871
823 return 0; 872 return 0;
873}
874
875static void
876api_ready (SV *coro)
877{
878 if (SvROK (coro))
879 coro = SvRV (coro);
880
881 coro_enq (SvREFCNT_inc (coro));
882}
883
884static void
885api_schedule (void)
886{
887 SV *prev, *next;
888
889 prev = SvRV (GvSV (coro_current));
890 next = coro_deq (PRIO_MIN);
891
892 if (!next)
893 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
894
895 /* free this only after the transfer */
896 coro_mortal = prev;
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),
904 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
905}
906
907static void
908api_cede (void)
909{
910 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
911
912 api_schedule ();
824} 913}
825 914
826MODULE = Coro::State PACKAGE = Coro::State 915MODULE = Coro::State PACKAGE = Coro::State
827 916
828PROTOTYPES: ENABLE 917PROTOTYPES: ENABLE
… …
840 929
841 if (!padlist_cache) 930 if (!padlist_cache)
842 padlist_cache = newHV (); 931 padlist_cache = newHV ();
843 932
844 main_mainstack = PL_mainstack; 933 main_mainstack = PL_mainstack;
934
935 coroapi.ver = CORO_API_VERSION;
936 coroapi.transfer = api_transfer;
845} 937}
846 938
847Coro::State 939Coro::State
848_newprocess(args) 940_newprocess(args)
849 SV * args 941 SV * args
… …
852 Coro__State coro; 944 Coro__State coro;
853 945
854 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 946 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
855 croak ("Coro::State::_newprocess expects an arrayref"); 947 croak ("Coro::State::_newprocess expects an arrayref");
856 948
857 New (0, coro, 1, struct coro); 949 Newz (0, coro, 1, struct coro);
858 950
859 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 951 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
860 coro->mainstack = 0; /* actual work is done inside transfer */ 952 coro->mainstack = 0; /* actual work is done inside transfer */
861 coro->stack = 0; 953 coro->stack = 0;
862 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
863 RETVAL = coro; 961 RETVAL = coro;
864 OUTPUT: 962 OUTPUT:
865 RETVAL 963 RETVAL
866 964
867void 965void
868transfer(prev, next, flags) 966transfer(prev, next, flags)
869 Coro::State_or_hashref prev 967 SV *prev
870 Coro::State_or_hashref next 968 SV *next
871 int flags 969 int flags
872 PROTOTYPE: @ 970 PROTOTYPE: @
873 CODE: 971 CODE:
874 PUTBACK; 972 PUTBACK;
973 SV_CORO (next, "Coro::transfer");
974 SV_CORO (prev, "Coro::transfer");
875 transfer (aTHX_ prev, next, flags); 975 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
876 SPAGAIN; 976 SPAGAIN;
877 977
878void 978void
879DESTROY(coro) 979DESTROY(coro)
880 Coro::State coro 980 Coro::State coro
… …
882 982
883 if (coro->mainstack && coro->mainstack != main_mainstack) 983 if (coro->mainstack && coro->mainstack != main_mainstack)
884 { 984 {
885 struct coro temp; 985 struct coro temp;
886 986
987 PUTBACK;
887 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 988 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL);
888 LOAD(aTHX_ coro); 989 LOAD(aTHX_ coro);
990 SPAGAIN;
889 991
890 destroy_stacks (aTHX); 992 destroy_stacks (aTHX);
891 993
892 LOAD((&temp)); /* this will get rid of defsv etc.. */ 994 LOAD((&temp)); /* this will get rid of defsv etc.. */
995 SPAGAIN;
893 996
894 coro->mainstack = 0; 997 coro->mainstack = 0;
895 } 998 }
896 999
897 deallocate_stack (coro); 1000 deallocate_stack (coro);
898 1001 SvREFCNT_dec (coro->args);
899 Safefree (coro); 1002 Safefree (coro);
900
901void
902flush()
903 CODE:
904#ifdef MAY_FLUSH
905 flush_padlist_cache ();
906#endif
907 1003
908void 1004void
909_exit(code) 1005_exit(code)
910 int code 1006 int code
911 PROTOTYPE: $ 1007 PROTOTYPE: $
912 CODE: 1008 CODE:
913#if defined(__GLIBC__) || _POSIX_C_SOURCE
914 _exit (code); 1009 _exit (code);
915#else
916 signal (SIGTERM, SIG_DFL);
917 raise (SIGTERM);
918 exit (code);
919#endif
920 1010
921MODULE = Coro::State PACKAGE = Coro::Cont 1011MODULE = Coro::State PACKAGE = Coro::Cont
922 1012
923# this is slightly dirty (should expose a c-level api) 1013# this is slightly dirty (should expose a c-level api)
924 1014
… …
930 SV *sv; 1020 SV *sv;
931 AV *defav = GvAV (PL_defgv); 1021 AV *defav = GvAV (PL_defgv);
932 struct coro *prev, *next; 1022 struct coro *prev, *next;
933 1023
934 if (!returnstk) 1024 if (!returnstk)
935 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1025 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
936 1026
937 /* set up @_ -- ugly */ 1027 /* set up @_ -- ugly */
938 av_clear (defav); 1028 av_clear (defav);
939 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
940 while (items--) 1030 while (items--)
… …
967 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1057 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV);
968 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1058 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV);
969 1059
970 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1060 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
971 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 }
972} 1076}
1077
1078#if !PERL_MICRO
973 1079
974void 1080void
975ready(self) 1081ready(self)
976 SV * self 1082 SV * self
1083 PROTOTYPE: $
977 CODE: 1084 CODE:
978 coro_enq (SvREFCNT_inc (self)); 1085 api_ready (self);
1086
1087#endif
1088
1089int
1090nready(...)
1091 PROTOTYPE:
1092 CODE:
1093 RETVAL = coro_nready;
1094 OUTPUT:
1095 RETVAL
979 1096
980void 1097void
981schedule(...) 1098schedule(...)
982 ALIAS: 1099 PROTOTYPE:
983 cede = 1
984 CODE: 1100 CODE:
985 SV *prev, *next; 1101 api_schedule ();
986 1102
987 prev = GvSV (coro_current); 1103void
1104cede(...)
1105 PROTOTYPE:
1106 CODE:
1107 api_cede ();
988 1108
989 if (ix)
990 coro_enq (SvREFCNT_inc (prev));
991
992 next = coro_deq (PRIO_MIN);
993
994 if (!next)
995 next = SvREFCNT_inc (GvSV (coro_idle));
996
997 GvSV (coro_current) = SvREFCNT_inc (next);
998 transfer (sv_to_coro (prev, "Coro::schedule", "current coroutine"),
999 sv_to_coro (next, "Coro::schedule", "next coroutine"),
1000 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
1001 SvREFCNT_dec (next);
1002 SvREFCNT_dec (prev);
1003

Diff Legend

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