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.44 by root, Sat Mar 22 18:50:32 2003 UTC vs.
Revision 1.55 by pcg, Thu Apr 1 02:29:05 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
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
4 27
5#include "libcoro/coro.c" 28#include "libcoro/coro.c"
6 29
7#include <signal.h> 30#include <signal.h>
8 31
… …
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 and is rarely used */
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 declare 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
… …
31#define IN_DESTRUCT (PL_main_cv == Nullcv) 52#define IN_DESTRUCT (PL_main_cv == Nullcv)
32 53
33#define labs(l) ((l) >= 0 ? (l) : -(l)) 54#define labs(l) ((l) >= 0 ? (l) : -(l))
34 55
35#include "CoroAPI.h" 56#include "CoroAPI.h"
57
58#ifdef USE_ITHREADS
59static perl_mutex coro_mutex;
60# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
61# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
62#else
63# define LOCK 0
64# define UNLOCK 0
65#endif
36 66
37static struct CoroAPI coroapi; 67static struct CoroAPI coroapi;
38 68
39/* this is actually not only the c stack but also c registers etc... */ 69/* this is actually not only the c stack but also c registers etc... */
40typedef struct { 70typedef struct {
… …
47 void *sptr; 77 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 78 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 79} coro_stack;
50 80
51struct coro { 81struct coro {
82 /* the top-level JMPENV for each coroutine, needed to catch dies. */
83 JMPENV start_env;
84
52 /* the optional C context */ 85 /* the optional C context */
53 coro_stack *stack; 86 coro_stack *stack;
54 void *cursp; 87 void *cursp;
55 int gencnt; 88 int gencnt;
56 89
… …
101 134
102static AV *main_mainstack; /* used to differentiate between $main and others */ 135static AV *main_mainstack; /* used to differentiate between $main and others */
103static HV *coro_state_stash; 136static HV *coro_state_stash;
104static SV *ucoro_state_sv; 137static SV *ucoro_state_sv;
105static U32 ucoro_state_hash; 138static U32 ucoro_state_hash;
106static HV *padlist_cache;
107static SV *coro_mortal; /* will be freed after next transfer */ 139static SV *coro_mortal; /* will be freed after next transfer */
108 140
109/* mostly copied from op.c:cv_clone2 */ 141/* mostly copied from op.c:cv_clone2 */
110STATIC AV * 142STATIC AV *
111clone_padlist (AV *protopadlist) 143clone_padlist (AV *protopadlist)
… …
140 AvFLAGS (av) = AVf_REIFY; 172 AvFLAGS (av) = AVf_REIFY;
141 173
142 for (ix = fpad; ix > 0; ix--) 174 for (ix = fpad; ix > 0; ix--)
143 { 175 {
144 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 176 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
177
145 if (namesv && namesv != &PL_sv_undef) 178 if (namesv && namesv != &PL_sv_undef)
146 { 179 {
147 char *name = SvPVX (namesv); /* XXX */ 180 char *name = SvPVX (namesv); /* XXX */
181
148 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 182 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
149 { /* lexical from outside? */ 183 { /* lexical from outside? */
150 npad[ix] = SvREFCNT_inc (ppad[ix]); 184 npad[ix] = SvREFCNT_inc (ppad[ix]);
151 } 185 }
152 else 186 else
… …
158 sv = (SV *) newAV (); 192 sv = (SV *) newAV ();
159 else if (*name == '%') 193 else if (*name == '%')
160 sv = (SV *) newHV (); 194 sv = (SV *) newHV ();
161 else 195 else
162 sv = NEWSV (0, 0); 196 sv = NEWSV (0, 0);
197
198#ifdef SvPADBUSY
163 if (!SvPADBUSY (sv)) 199 if (!SvPADBUSY (sv))
200#endif
164 SvPADMY_on (sv); 201 SvPADMY_on (sv);
202
165 npad[ix] = sv; 203 npad[ix] = sv;
166 } 204 }
167 } 205 }
168 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 206 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
169 { 207 {
… …
198#endif 236#endif
199 237
200 return newpadlist; 238 return newpadlist;
201} 239}
202 240
203#ifdef MAY_FLUSH
204STATIC void 241STATIC void
205free_padlist (AV *padlist) 242free_padlist (AV *padlist)
206{ 243{
207 /* may be during global destruction */ 244 /* may be during global destruction */
208 if (SvREFCNT(padlist)) 245 if (SvREFCNT (padlist))
209 { 246 {
210 I32 i = AvFILLp(padlist); 247 I32 i = AvFILLp (padlist);
211 while (i >= 0) 248 while (i >= 0)
212 { 249 {
213 SV **svp = av_fetch(padlist, i--, FALSE); 250 SV **svp = av_fetch (padlist, i--, FALSE);
214 SV *sv = svp ? *svp : Nullsv;
215 if (sv) 251 if (svp)
252 {
253 SV *sv;
254 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
216 SvREFCNT_dec(sv); 255 SvREFCNT_dec (sv);
256
257 SvREFCNT_dec (*svp);
258 }
217 } 259 }
218 260
219 SvREFCNT_dec((SV*)padlist); 261 SvREFCNT_dec ((SV*)padlist);
220 } 262 }
221} 263}
222#endif 264
265STATIC int
266coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
267{
268 AV *padlist;
269 AV *av = (AV *)mg->mg_obj;
270
271 /* casting is fun. */
272 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
273 free_padlist (padlist);
274}
275
276#define PERL_MAGIC_coro PERL_MAGIC_ext
277
278static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
223 279
224/* the next two functions merely cache the padlists */ 280/* the next two functions merely cache the padlists */
225STATIC void 281STATIC void
226get_padlist (CV *cv) 282get_padlist (CV *cv)
227{ 283{
228 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 284 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
229 285
230 if (he && AvFILLp ((AV *)*he) >= 0) 286 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
231 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 287 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
232 else 288 else
233 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 289 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
234} 290}
235 291
236STATIC void 292STATIC void
237put_padlist (CV *cv) 293put_padlist (CV *cv)
238{ 294{
239 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 295 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
240 296
241 if (SvTYPE (*he) != SVt_PVAV) 297 if (!mg)
242 { 298 {
243 SvREFCNT_dec (*he); 299 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
300 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
301 mg->mg_virtual = &vtbl_coro;
244 *he = (SV *)newAV (); 302 mg->mg_obj = (SV *)newAV ();
245 } 303 }
246 304
247 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 305 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
248} 306}
249
250#ifdef MAY_FLUSH
251STATIC void
252flush_padlist_cache ()
253{
254 HV *hv = padlist_cache;
255 padlist_cache = newHV ();
256
257 if (hv_iterinit (hv))
258 {
259 HE *he;
260 AV *padlist;
261
262 while (!!(he = hv_iternext (hv)))
263 {
264 AV *av = (AV *)HeVAL(he);
265
266 /* casting is fun. */
267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
268 free_padlist (padlist);
269 }
270 }
271
272 SvREFCNT_dec (hv);
273}
274#endif
275 307
276#define SB do { 308#define SB do {
277#define SE } while (0) 309#define SE } while (0)
278 310
279#define LOAD(state) load_state(aTHX_ (state)); 311#define LOAD(state) load_state(aTHX_ (state));
280#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 312#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
281 313
282#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 314#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
283 315
284static void 316static void
285load_state(pTHX_ Coro__State c) 317load_state(pTHX_ Coro__State c)
286{ 318{
287 PL_dowarn = c->dowarn; 319 PL_dowarn = c->dowarn;
… …
330 362
331 if (padlist) 363 if (padlist)
332 { 364 {
333 put_padlist (cv); /* mark this padlist as available */ 365 put_padlist (cv); /* mark this padlist as available */
334 CvPADLIST(cv) = padlist; 366 CvPADLIST(cv) = padlist;
335#ifdef USE_THREADS
336 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
337#endif
338 } 367 }
339 368
340 ++CvDEPTH(cv); 369 ++CvDEPTH(cv);
341 } 370 }
342 371
… …
369 if (CxTYPE(cx) == CXt_SUB) 398 if (CxTYPE(cx) == CXt_SUB)
370 { 399 {
371 CV *cv = cx->blk_sub.cv; 400 CV *cv = cx->blk_sub.cv;
372 if (CvDEPTH(cv)) 401 if (CvDEPTH(cv))
373 { 402 {
374#ifdef USE_THREADS
375 /*XPUSHs ((SV *)CvOWNER(cv));*/
376 /*CvOWNER(cv) = 0;*/
377 /*error must unlock this cv etc.. etc...*/
378#endif
379 EXTEND (SP, CvDEPTH(cv)*2); 403 EXTEND (SP, CvDEPTH(cv)*2);
380 404
381 while (--CvDEPTH(cv)) 405 while (--CvDEPTH(cv))
382 { 406 {
383 /* this tells the restore code to increment CvDEPTH */ 407 /* this tells the restore code to increment CvDEPTH */
… …
389 PUSHs ((SV *)cv); 413 PUSHs ((SV *)cv);
390 414
391 get_padlist (cv); /* this is a monster */ 415 get_padlist (cv); /* this is a monster */
392 } 416 }
393 } 417 }
418#ifdef CXt_FORMAT
394 else if (CxTYPE(cx) == CXt_FORMAT) 419 else if (CxTYPE(cx) == CXt_FORMAT)
395 { 420 {
396 /* I never used formats, so how should I know how these are implemented? */ 421 /* I never used formats, so how should I know how these are implemented? */
397 /* my bold guess is as a simple, plain sub... */ 422 /* my bold guess is as a simple, plain sub... */
398 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 423 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
399 } 424 }
425#endif
400 } 426 }
401 427
402 if (top_si->si_type == PERLSI_MAIN) 428 if (top_si->si_type == PERLSI_MAIN)
403 break; 429 break;
404 430
… …
447} 473}
448 474
449/* 475/*
450 * allocate various perl stacks. This is an exact copy 476 * allocate various perl stacks. This is an exact copy
451 * of perl.c:init_stacks, except that it uses less memory 477 * of perl.c:init_stacks, except that it uses less memory
452 * on the assumption that coroutines do not usually need 478 * on the (sometimes correct) assumption that coroutines do
453 * a lot of stackspace. 479 * not usually need a lot of stackspace.
454 */ 480 */
455STATIC void 481STATIC void
456coro_init_stacks (pTHX) 482coro_init_stacks (pTHX)
457{ 483{
484 LOCK;
485
458 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 486 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
459 PL_curstackinfo->si_type = PERLSI_MAIN; 487 PL_curstackinfo->si_type = PERLSI_MAIN;
460 PL_curstack = PL_curstackinfo->si_stack; 488 PL_curstack = PL_curstackinfo->si_stack;
461 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 489 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
462 490
… …
471 499
472 New(54,PL_markstack,16,I32); 500 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 501 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 502 PL_markstack_max = PL_markstack + 16;
475 503
504#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 505 SET_MARK_OFFSET;
506#endif
477 507
478 New(54,PL_scopestack,16,I32); 508 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 509 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 510 PL_scopestack_max = 16;
481 511
… …
484 PL_savestack_max = 96; 514 PL_savestack_max = 96;
485 515
486 New(54,PL_retstack,8,OP*); 516 New(54,PL_retstack,8,OP*);
487 PL_retstack_ix = 0; 517 PL_retstack_ix = 0;
488 PL_retstack_max = 8; 518 PL_retstack_max = 8;
519
520 UNLOCK;
489} 521}
490 522
491/* 523/*
492 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
493 * still there is a memleak of 128 bytes...
494 */ 525 */
495STATIC void 526STATIC void
496destroy_stacks(pTHX) 527destroy_stacks(pTHX)
497{ 528{
498 if (!IN_DESTRUCT) 529 if (!IN_DESTRUCT)
499 { 530 {
500 /* is this ugly, I ask? */ 531 /* is this ugly, I ask? */
501 while (PL_scopestack_ix) 532 LEAVE_SCOPE (0);
502 LEAVE;
503 533
504 /* sure it is, but more important: is it correct?? :/ */ 534 /* sure it is, but more important: is it correct?? :/ */
505 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
506 FREETMPS; 535 FREETMPS;
507 } 536 }
508 537
509 while (PL_curstackinfo->si_next) 538 while (PL_curstackinfo->si_next)
510 PL_curstackinfo = PL_curstackinfo->si_next; 539 PL_curstackinfo = PL_curstackinfo->si_next;
511 540
… …
545 New (0, stack, 1, coro_stack); 574 New (0, stack, 1, coro_stack);
546 575
547 stack->refcnt = 1; 576 stack->refcnt = 1;
548 stack->usecnt = 1; 577 stack->usecnt = 1;
549 stack->gencnt = ctx->gencnt = 0; 578 stack->gencnt = ctx->gencnt = 0;
579
550 if (alloc) 580 if (alloc)
551 { 581 {
552#if HAVE_MMAP 582#if HAVE_MMAP
553 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 583 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
554 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 584 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
555 if (stack->sptr == (void *)-1) 585 if (stack->sptr == (void *)-1)
556#endif 586#endif
557 { 587 {
558 /*FIXME*//*D*//* reasonable stack size! */ 588 /*FIXME*//*D*//* reasonable stack size! */
559 stack->ssize = -4096 * sizeof (long); 589 stack->ssize = - (8192 * sizeof (long));
560 New (0, stack->sptr, 4096, long); 590 New (0, stack->sptr, 8192, long);
561 } 591 }
562 } 592 }
563 else 593 else
564 stack->sptr = 0; 594 stack->sptr = 0;
565 595
… …
579 { 609 {
580#ifdef HAVE_MMAP 610#ifdef HAVE_MMAP
581 if (stack->ssize > 0 && stack->sptr) 611 if (stack->ssize > 0 && stack->sptr)
582 munmap (stack->sptr, stack->ssize); 612 munmap (stack->sptr, stack->ssize);
583 else 613 else
584#else 614#endif
585 Safefree (stack->sptr); 615 Safefree (stack->sptr);
586#endif 616
587 Safefree (stack); 617 Safefree (stack);
588 } 618 }
589 else if (ctx->gencnt == stack->gencnt) 619 else if (ctx->gencnt == stack->gencnt)
590 --stack->usecnt; 620 --stack->usecnt;
591 } 621 }
… …
597 /* 627 /*
598 * emulate part of the perl startup here. 628 * emulate part of the perl startup here.
599 */ 629 */
600 dSP; 630 dSP;
601 Coro__State ctx = (Coro__State)arg; 631 Coro__State ctx = (Coro__State)arg;
602 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 632 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
603 633
604 coro_init_stacks (aTHX); 634 coro_init_stacks (aTHX);
605 /*PL_curcop = 0;*/ 635 /*PL_curcop = 0;*/
606 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 636 /*PL_in_eval = PL_in_eval;*/ /* inherit */
607 SvREFCNT_dec (GvAV (PL_defgv)); 637 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = ctx->args; 638 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
609 639
610 SPAGAIN; 640 SPAGAIN;
611 641
612 if (ctx->stack) 642 if (ctx->stack)
613 { 643 {
… …
656 * this is a _very_ stripped down perl interpreter ;) 686 * this is a _very_ stripped down perl interpreter ;)
657 */ 687 */
658 Coro__State ctx = (Coro__State)arg; 688 Coro__State ctx = (Coro__State)arg;
659 JMPENV coro_start_env; 689 JMPENV coro_start_env;
660 690
661 /* same as JMPENV_BOOTSTRAP */
662 Zero(&coro_start_env, 1, JMPENV);
663 coro_start_env.je_ret = -1;
664 coro_start_env.je_mustcatch = TRUE;
665 PL_top_env = &coro_start_env; 691 PL_top_env = &ctx->start_env;
666 692
667 ctx->cursp = 0; 693 ctx->cursp = 0;
668 PL_op = PL_op->op_next; 694 PL_op = PL_op->op_next;
669 CALLRUNOPS(aTHX); 695 CALLRUNOPS(aTHX);
670 696
671 abort (); 697 abort ();
672} 698}
673 699
674STATIC void 700STATIC void
675transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 701transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
676{ 702{
677 dSTACKLEVEL; 703 dSTACKLEVEL;
678 static struct coro *xnext;
679 704
680 if (prev != next) 705 if (prev != next)
681 { 706 {
682 xnext = next;
683
684 if (next->mainstack) 707 if (next->mainstack)
685 { 708 {
709 LOCK;
686 SAVE (prev, flags); 710 SAVE (prev, flags);
687 LOAD (next); 711 LOAD (next);
712 UNLOCK;
688 713
689 /* mark this state as in-use */ 714 /* mark this state as in-use */
690 next->mainstack = 0; 715 next->mainstack = 0;
691 next->tmps_ix = -2; 716 next->tmps_ix = -2;
692 717
… …
711 continue_coro, (void *)next, 736 continue_coro, (void *)next,
712 next->stack->sptr, labs (next->stack->ssize)); 737 next->stack->sptr, labs (next->stack->ssize));
713 } 738 }
714 739
715 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 740 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
741 prev->cursp = stacklevel;
716 /* don't add any code here */ 742 /* don't add any code here */
717 } 743 }
718 744 else
745 next->cursp = stacklevel;
719 } 746 }
720 else if (next->tmps_ix == -2) 747 else if (next->tmps_ix == -2)
721 croak ("tried to transfer to running coroutine"); 748 croak ("tried to transfer to running coroutine");
722 else 749 else
723 { 750 {
751 LOCK;
724 SAVE (prev, -1); /* first get rid of the old state */ 752 SAVE (prev, -1); /* first get rid of the old state */
753 UNLOCK;
725 754
726 if (flags & TRANSFER_SAVE_CCTXT) 755 if (flags & TRANSFER_SAVE_CCTXT)
727 { 756 {
728 if (!prev->stack) 757 if (!prev->stack)
729 allocate_stack (prev, 0); 758 allocate_stack (prev, 0);
730 759
731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 760 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
732 { 761 {
762 PL_top_env = &next->start_env;
763
733 setup_coro (next); 764 setup_coro (next);
765 next->cursp = stacklevel;
734 766
735 prev->stack->refcnt++; 767 prev->stack->refcnt++;
736 prev->stack->usecnt++; 768 prev->stack->usecnt++;
737 next->stack = prev->stack; 769 next->stack = prev->stack;
738 next->gencnt = prev->gencnt; 770 next->gencnt = prev->gencnt;
739 } 771 }
740 else 772 else
741 { 773 {
774 assert (!next->stack);
742 allocate_stack (next, 1); 775 allocate_stack (next, 1);
743 coro_create (&(next->stack->cctx), 776 coro_create (&(next->stack->cctx),
744 setup_coro, (void *)next, 777 setup_coro, (void *)next,
745 next->stack->sptr, labs (next->stack->ssize)); 778 next->stack->sptr, labs (next->stack->ssize));
746 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 779 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
780 prev->cursp = stacklevel;
747 /* don't add any code here */ 781 /* don't add any code here */
748 } 782 }
749 } 783 }
750 else 784 else
785 {
751 setup_coro (next); 786 setup_coro (next);
787 next->cursp = stacklevel;
788 }
752 } 789 }
753
754 /*
755 * xnext is now either prev or next, depending on wether
756 * we switched the c stack or not. that's why I use a global
757 * variable, that should become thread-specific at one point.
758 */
759 xnext->cursp = stacklevel;
760 } 790 }
761 791
792 LOCK;
762 if (coro_mortal) 793 if (coro_mortal)
763 { 794 {
764 SvREFCNT_dec (coro_mortal); 795 SvREFCNT_dec (coro_mortal);
765 coro_mortal = 0; 796 coro_mortal = 0;
766 } 797 }
798 UNLOCK;
767} 799}
768 800
769#define SV_CORO(sv,func) \ 801#define SV_CORO(sv,func) \
770 do { \ 802 do { \
771 if (SvROK (sv)) \ 803 if (SvROK (sv)) \
772 sv = SvRV (sv); \ 804 sv = SvRV (sv); \
773 \ 805 \
774 if (SvTYPE(sv) == SVt_PVHV) \ 806 if (SvTYPE (sv) == SVt_PVHV) \
775 { \ 807 { \
776 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 808 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
777 \ 809 \
778 if (!he) \ 810 if (!he) \
779 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 811 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
780 \ 812 \
781 (sv) = SvRV (HeVAL(he)); \ 813 (sv) = SvRV (HeVAL(he)); \
782 } \ 814 } \
783 \ 815 \
784 /* must also be changed inside Coro::Cont::yield */ \ 816 /* must also be changed inside Coro::Cont::yield */ \
785 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 817 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
786 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 818 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
787 \ 819 \
788 } while(0) 820 } while(0)
789 821
790#define SvSTATE(sv) (struct coro *)SvIV (sv) 822#define SvSTATE(sv) (struct coro *)SvIV (sv)
… …
856api_ready (SV *coro) 888api_ready (SV *coro)
857{ 889{
858 if (SvROK (coro)) 890 if (SvROK (coro))
859 coro = SvRV (coro); 891 coro = SvRV (coro);
860 892
893 LOCK;
861 coro_enq (SvREFCNT_inc (coro)); 894 coro_enq (SvREFCNT_inc (coro));
895 UNLOCK;
862} 896}
863 897
864static void 898static void
865api_schedule (void) 899api_schedule (void)
866{ 900{
867 SV *prev, *next; 901 SV *prev, *next;
902
903 LOCK;
868 904
869 prev = SvRV (GvSV (coro_current)); 905 prev = SvRV (GvSV (coro_current));
870 next = coro_deq (PRIO_MIN); 906 next = coro_deq (PRIO_MIN);
871 907
872 if (!next) 908 if (!next)
… …
878 914
879 SvRV (GvSV (coro_current)) = next; 915 SvRV (GvSV (coro_current)) = next;
880 916
881 SV_CORO (next, "Coro::schedule"); 917 SV_CORO (next, "Coro::schedule");
882 918
919 UNLOCK;
920
883 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 921 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
884 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 922 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
885} 923}
886 924
887static void 925static void
888api_cede (void) 926api_cede (void)
889{ 927{
928 LOCK;
890 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 929 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
930 UNLOCK;
891 931
892 api_schedule (); 932 api_schedule ();
893} 933}
894 934
895MODULE = Coro::State PACKAGE = Coro::State 935MODULE = Coro::State PACKAGE = Coro::State
896 936
897PROTOTYPES: ENABLE 937PROTOTYPES: ENABLE
898 938
899BOOT: 939BOOT:
900{ /* {} necessary for stoopid perl-5.6.x */ 940{ /* {} necessary for stoopid perl-5.6.x */
941#ifdef USE_ITHREADS
942 MUTEX_INIT (&coro_mutex);
943#endif
944
901 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 945 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
902 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 946 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
903 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 947 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
904 948
905 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 949 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
906 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 950 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
907 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 951 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
908 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 952 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
909
910 if (!padlist_cache)
911 padlist_cache = newHV ();
912 953
913 main_mainstack = PL_mainstack; 954 main_mainstack = PL_mainstack;
914 955
915 coroapi.ver = CORO_API_VERSION; 956 coroapi.ver = CORO_API_VERSION;
916 coroapi.transfer = api_transfer; 957 coroapi.transfer = api_transfer;
… …
924 Coro__State coro; 965 Coro__State coro;
925 966
926 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 967 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
927 croak ("Coro::State::_newprocess expects an arrayref"); 968 croak ("Coro::State::_newprocess expects an arrayref");
928 969
929 New (0, coro, 1, struct coro); 970 Newz (0, coro, 1, struct coro);
930 971
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 972 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 973 coro->mainstack = 0; /* actual work is done inside transfer */
933 coro->stack = 0; 974 coro->stack = 0;
975
976 /* same as JMPENV_BOOTSTRAP */
977 /* we might be able to recycle start_env, but safe is safe */
978 //Zero(&coro->start_env, 1, JMPENV);
979 coro->start_env.je_ret = -1;
980 coro->start_env.je_mustcatch = TRUE;
934 981
935 RETVAL = coro; 982 RETVAL = coro;
936 OUTPUT: 983 OUTPUT:
937 RETVAL 984 RETVAL
938 985
… …
970 1017
971 coro->mainstack = 0; 1018 coro->mainstack = 0;
972 } 1019 }
973 1020
974 deallocate_stack (coro); 1021 deallocate_stack (coro);
975 1022 SvREFCNT_dec (coro->args);
976 Safefree (coro); 1023 Safefree (coro);
977
978void
979flush()
980 CODE:
981#ifdef MAY_FLUSH
982 flush_padlist_cache ();
983#endif
984 1024
985void 1025void
986_exit(code) 1026_exit(code)
987 int code 1027 int code
988 PROTOTYPE: $ 1028 PROTOTYPE: $
989 CODE: 1029 CODE:
990#if defined(__GLIBC__) || _POSIX_C_SOURCE
991 _exit (code); 1030 _exit (code);
992#else
993 signal (SIGTERM, SIG_DFL);
994 raise (SIGTERM);
995 exit (code);
996#endif
997 1031
998MODULE = Coro::State PACKAGE = Coro::Cont 1032MODULE = Coro::State PACKAGE = Coro::Cont
999 1033
1000# this is slightly dirty (should expose a c-level api) 1034# this is slightly dirty (should expose a c-level api)
1001 1035
… …
1007 SV *sv; 1041 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1042 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1043 struct coro *prev, *next;
1010 1044
1011 if (!returnstk) 1045 if (!returnstk)
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1013 1047
1014 /* set up @_ -- ugly */ 1048 /* set up @_ -- ugly */
1015 av_clear (defav); 1049 av_clear (defav);
1016 av_fill (defav, items - 1); 1050 av_fill (defav, items - 1);
1017 while (items--) 1051 while (items--)
… …
1060 sv_setiv(sv, (IV)&coroapi); 1094 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv); 1095 SvREADONLY_on(sv);
1062 } 1096 }
1063} 1097}
1064 1098
1099#if !PERL_MICRO
1100
1065void 1101void
1066ready(self) 1102ready(self)
1067 SV * self 1103 SV * self
1068 PROTOTYPE: $ 1104 PROTOTYPE: $
1069 CODE: 1105 CODE:
1070 api_ready (self); 1106 api_ready (self);
1107
1108#endif
1071 1109
1072int 1110int
1073nready(...) 1111nready(...)
1074 PROTOTYPE: 1112 PROTOTYPE:
1075 CODE: 1113 CODE:

Diff Legend

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