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.51 by pcg, Sun Nov 30 17:03:48 2003 UTC vs.
Revision 1.64 by root, Mon Mar 21 15:06:51 2005 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#include "patchlevel.h" 9#include "patchlevel.h"
… …
23# ifndef IS_PADCONST 27# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
25# endif 29# endif
26#endif 30#endif
27 31
28#include "libcoro/coro.c"
29
30#include <signal.h> 32#include <signal.h>
31 33
32#ifdef HAVE_MMAP 34#ifdef HAVE_MMAP
33# include <unistd.h> 35# include <unistd.h>
34# include <sys/mman.h> 36# include <sys/mman.h>
… …
53 55
54#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
55 57
56#include "CoroAPI.h" 58#include "CoroAPI.h"
57 59
60#ifdef USE_ITHREADS
61static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else
65# define LOCK 0
66# define UNLOCK 0
67#endif
68
58static struct CoroAPI coroapi; 69static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash;
72static SV *ucoro_state_sv;
73static U32 ucoro_state_hash;
74static SV *coro_mortal; /* will be freed after next transfer */
59 75
60/* this is actually not only the c stack but also c registers etc... */ 76/* this is actually not only the c stack but also c registers etc... */
61typedef struct { 77typedef struct {
62 int refcnt; /* pointer reference counter */ 78 int refcnt; /* pointer reference counter */
63 int usecnt; /* shared by how many coroutines */ 79 int usecnt; /* shared by how many coroutines */
… …
93 AV *mainstack; 109 AV *mainstack;
94 SV **stack_sp; 110 SV **stack_sp;
95 OP *op; 111 OP *op;
96 SV **curpad; 112 SV **curpad;
97 AV *comppad; 113 AV *comppad;
114 CV *compcv;
98 SV **stack_base; 115 SV **stack_base;
99 SV **stack_max; 116 SV **stack_max;
100 SV **tmps_stack; 117 SV **tmps_stack;
101 I32 tmps_floor; 118 I32 tmps_floor;
102 I32 tmps_ix; 119 I32 tmps_ix;
… …
121}; 138};
122 139
123typedef struct coro *Coro__State; 140typedef struct coro *Coro__State;
124typedef struct coro *Coro__State_or_hashref; 141typedef struct coro *Coro__State_or_hashref;
125 142
126static AV *main_mainstack; /* used to differentiate between $main and others */
127static HV *coro_state_stash;
128static SV *ucoro_state_sv;
129static U32 ucoro_state_hash;
130static HV *padlist_cache;
131static SV *coro_mortal; /* will be freed after next transfer */
132
133/* mostly copied from op.c:cv_clone2 */ 143/* mostly copied from op.c:cv_clone2 */
134STATIC AV * 144STATIC AV *
135clone_padlist (AV *protopadlist) 145clone_padlist (pTHX_ AV *protopadlist)
136{ 146{
137 AV *av; 147 AV *av;
138 I32 ix; 148 I32 ix;
139 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 149 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
140 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 150 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
… …
164 AvFLAGS (av) = AVf_REIFY; 174 AvFLAGS (av) = AVf_REIFY;
165 175
166 for (ix = fpad; ix > 0; ix--) 176 for (ix = fpad; ix > 0; ix--)
167 { 177 {
168 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 178 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
179
169 if (namesv && namesv != &PL_sv_undef) 180 if (namesv && namesv != &PL_sv_undef)
170 { 181 {
171 char *name = SvPVX (namesv); /* XXX */ 182 char *name = SvPVX (namesv); /* XXX */
183
172 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 184 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
173 { /* lexical from outside? */ 185 { /* lexical from outside? */
174 npad[ix] = SvREFCNT_inc (ppad[ix]); 186 npad[ix] = SvREFCNT_inc (ppad[ix]);
175 } 187 }
176 else 188 else
… …
182 sv = (SV *) newAV (); 194 sv = (SV *) newAV ();
183 else if (*name == '%') 195 else if (*name == '%')
184 sv = (SV *) newHV (); 196 sv = (SV *) newHV ();
185 else 197 else
186 sv = NEWSV (0, 0); 198 sv = NEWSV (0, 0);
199
187#ifdef SvPADBUSY 200#ifdef SvPADBUSY
188 if (!SvPADBUSY (sv)) 201 if (!SvPADBUSY (sv))
189#endif 202#endif
190 SvPADMY_on (sv); 203 SvPADMY_on (sv);
204
191 npad[ix] = sv; 205 npad[ix] = sv;
192 } 206 }
193 } 207 }
194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 208 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
195 { 209 {
… …
225 239
226 return newpadlist; 240 return newpadlist;
227} 241}
228 242
229STATIC void 243STATIC void
230free_padlist (AV *padlist) 244free_padlist (pTHX_ AV *padlist)
231{ 245{
232 /* may be during global destruction */ 246 /* may be during global destruction */
233 if (SvREFCNT (padlist)) 247 if (SvREFCNT (padlist))
234 { 248 {
235 I32 i = AvFILLp (padlist); 249 I32 i = AvFILLp (padlist);
… …
249 SvREFCNT_dec ((SV*)padlist); 263 SvREFCNT_dec ((SV*)padlist);
250 } 264 }
251} 265}
252 266
253STATIC int 267STATIC int
254coro_cv_free (SV *sv, MAGIC *mg) 268coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
255{ 269{
256 AV *padlist; 270 AV *padlist;
257 AV *av = (AV *)mg->mg_obj; 271 AV *av = (AV *)mg->mg_obj;
258 272
259 /* casting is fun. */ 273 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 274 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist); 275 free_padlist (aTHX_ padlist);
276
277 SvREFCNT_dec (av);
262} 278}
263 279
264#define PERL_MAGIC_coro PERL_MAGIC_ext 280#define PERL_MAGIC_coro PERL_MAGIC_ext
265 281
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 282static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
267 283
268/* the next two functions merely cache the padlists */ 284/* the next two functions merely cache the padlists */
269STATIC void 285STATIC void
270get_padlist (CV *cv) 286get_padlist (pTHX_ CV *cv)
271{ 287{
272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 288 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
273 289
274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 290 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 291 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
276 else 292 else
277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 293 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
278} 294}
279 295
280STATIC void 296STATIC void
281put_padlist (CV *cv) 297put_padlist (pTHX_ CV *cv)
282{ 298{
283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 299 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
284 300
285 if (!mg) 301 if (!mg)
286 { 302 {
… …
312 PL_mainstack = c->mainstack; 328 PL_mainstack = c->mainstack;
313 PL_stack_sp = c->stack_sp; 329 PL_stack_sp = c->stack_sp;
314 PL_op = c->op; 330 PL_op = c->op;
315 PL_curpad = c->curpad; 331 PL_curpad = c->curpad;
316 PL_comppad = c->comppad; 332 PL_comppad = c->comppad;
333 PL_compcv = c->compcv;
317 PL_stack_base = c->stack_base; 334 PL_stack_base = c->stack_base;
318 PL_stack_max = c->stack_max; 335 PL_stack_max = c->stack_max;
319 PL_tmps_stack = c->tmps_stack; 336 PL_tmps_stack = c->tmps_stack;
320 PL_tmps_floor = c->tmps_floor; 337 PL_tmps_floor = c->tmps_floor;
321 PL_tmps_ix = c->tmps_ix; 338 PL_tmps_ix = c->tmps_ix;
… …
348 { 365 {
349 AV *padlist = (AV *)POPs; 366 AV *padlist = (AV *)POPs;
350 367
351 if (padlist) 368 if (padlist)
352 { 369 {
353 put_padlist (cv); /* mark this padlist as available */ 370 put_padlist (aTHX_ cv); /* mark this padlist as available */
354 CvPADLIST(cv) = padlist; 371 CvPADLIST(cv) = padlist;
355#ifdef USE_THREADS
356 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
357#endif
358 } 372 }
359 373
360 ++CvDEPTH(cv); 374 ++CvDEPTH(cv);
361 } 375 }
362 376
… …
389 if (CxTYPE(cx) == CXt_SUB) 403 if (CxTYPE(cx) == CXt_SUB)
390 { 404 {
391 CV *cv = cx->blk_sub.cv; 405 CV *cv = cx->blk_sub.cv;
392 if (CvDEPTH(cv)) 406 if (CvDEPTH(cv))
393 { 407 {
394#ifdef USE_THREADS
395 /*XPUSHs ((SV *)CvOWNER(cv));*/
396 /*CvOWNER(cv) = 0;*/
397 /*error must unlock this cv etc.. etc...*/
398#endif
399 EXTEND (SP, CvDEPTH(cv)*2); 408 EXTEND (SP, CvDEPTH(cv)*2);
400 409
401 while (--CvDEPTH(cv)) 410 while (--CvDEPTH(cv))
402 { 411 {
403 /* this tells the restore code to increment CvDEPTH */ 412 /* this tells the restore code to increment CvDEPTH */
… …
406 } 415 }
407 416
408 PUSHs ((SV *)CvPADLIST(cv)); 417 PUSHs ((SV *)CvPADLIST(cv));
409 PUSHs ((SV *)cv); 418 PUSHs ((SV *)cv);
410 419
411 get_padlist (cv); /* this is a monster */ 420 get_padlist (aTHX_ cv); /* this is a monster */
412 } 421 }
413 } 422 }
414#ifdef CXt_FORMAT 423#ifdef CXt_FORMAT
415 else if (CxTYPE(cx) == CXt_FORMAT) 424 else if (CxTYPE(cx) == CXt_FORMAT)
416 { 425 {
… …
444 c->mainstack = PL_mainstack; 453 c->mainstack = PL_mainstack;
445 c->stack_sp = PL_stack_sp; 454 c->stack_sp = PL_stack_sp;
446 c->op = PL_op; 455 c->op = PL_op;
447 c->curpad = PL_curpad; 456 c->curpad = PL_curpad;
448 c->comppad = PL_comppad; 457 c->comppad = PL_comppad;
458 c->compcv = PL_compcv;
449 c->stack_base = PL_stack_base; 459 c->stack_base = PL_stack_base;
450 c->stack_max = PL_stack_max; 460 c->stack_max = PL_stack_max;
451 c->tmps_stack = PL_tmps_stack; 461 c->tmps_stack = PL_tmps_stack;
452 c->tmps_floor = PL_tmps_floor; 462 c->tmps_floor = PL_tmps_floor;
453 c->tmps_ix = PL_tmps_ix; 463 c->tmps_ix = PL_tmps_ix;
… …
469} 479}
470 480
471/* 481/*
472 * allocate various perl stacks. This is an exact copy 482 * allocate various perl stacks. This is an exact copy
473 * of perl.c:init_stacks, except that it uses less memory 483 * of perl.c:init_stacks, except that it uses less memory
474 * on the assumption that coroutines do not usually need 484 * on the (sometimes correct) assumption that coroutines do
475 * a lot of stackspace. 485 * not usually need a lot of stackspace.
476 */ 486 */
477STATIC void 487STATIC void
478coro_init_stacks (pTHX) 488coro_init_stacks (pTHX)
479{ 489{
490 LOCK;
491
480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 492 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
481 PL_curstackinfo->si_type = PERLSI_MAIN; 493 PL_curstackinfo->si_type = PERLSI_MAIN;
482 PL_curstack = PL_curstackinfo->si_stack; 494 PL_curstack = PL_curstackinfo->si_stack;
483 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 495 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
484 496
… …
508 PL_savestack_max = 96; 520 PL_savestack_max = 96;
509 521
510 New(54,PL_retstack,8,OP*); 522 New(54,PL_retstack,8,OP*);
511 PL_retstack_ix = 0; 523 PL_retstack_ix = 0;
512 PL_retstack_max = 8; 524 PL_retstack_max = 8;
525
526 UNLOCK;
513} 527}
514 528
515/* 529/*
516 * destroy the stacks, the callchain etc... 530 * destroy the stacks, the callchain etc...
517 */ 531 */
… …
519destroy_stacks(pTHX) 533destroy_stacks(pTHX)
520{ 534{
521 if (!IN_DESTRUCT) 535 if (!IN_DESTRUCT)
522 { 536 {
523 /* is this ugly, I ask? */ 537 /* is this ugly, I ask? */
524 while (PL_scopestack_ix) 538 LEAVE_SCOPE (0);
525 LEAVE;
526 539
527 /* sure it is, but more important: is it correct?? :/ */ 540 /* sure it is, but more important: is it correct?? :/ */
528 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
529 FREETMPS; 541 FREETMPS;
542
543 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
530 } 544 }
531 545
532 while (PL_curstackinfo->si_next) 546 while (PL_curstackinfo->si_next)
533 PL_curstackinfo = PL_curstackinfo->si_next; 547 PL_curstackinfo = PL_curstackinfo->si_next;
534 548
535 while (PL_curstackinfo) 549 while (PL_curstackinfo)
536 { 550 {
537 PERL_SI *p = PL_curstackinfo->si_prev; 551 PERL_SI *p = PL_curstackinfo->si_prev;
538 552
539 { 553 { /*D*//*remove*/
540 dSP; 554 dSP;
541 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 555 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
542 PUTBACK; /* possibly superfluous */ 556 PUTBACK; /* possibly superfluous */
543 } 557 }
544 558
545 if (!IN_DESTRUCT) 559 if (!IN_DESTRUCT)
546 { 560 {
547 dounwind(-1); 561 dounwind (-1);/*D*//*remove*/
548 SvREFCNT_dec(PL_curstackinfo->si_stack); 562 SvREFCNT_dec (PL_curstackinfo->si_stack);
549 } 563 }
550 564
551 Safefree(PL_curstackinfo->si_cxstack); 565 Safefree (PL_curstackinfo->si_cxstack);
552 Safefree(PL_curstackinfo); 566 Safefree (PL_curstackinfo);
553 PL_curstackinfo = p; 567 PL_curstackinfo = p;
554 } 568 }
555 569
556 Safefree(PL_tmps_stack); 570 Safefree (PL_tmps_stack);
557 Safefree(PL_markstack); 571 Safefree (PL_markstack);
558 Safefree(PL_scopestack); 572 Safefree (PL_scopestack);
559 Safefree(PL_savestack); 573 Safefree (PL_savestack);
560 Safefree(PL_retstack); 574 Safefree (PL_retstack);
561} 575}
562 576
563static void 577static void
564allocate_stack (Coro__State ctx, int alloc) 578allocate_stack (Coro__State ctx, int alloc)
565{ 579{
… …
568 New (0, stack, 1, coro_stack); 582 New (0, stack, 1, coro_stack);
569 583
570 stack->refcnt = 1; 584 stack->refcnt = 1;
571 stack->usecnt = 1; 585 stack->usecnt = 1;
572 stack->gencnt = ctx->gencnt = 0; 586 stack->gencnt = ctx->gencnt = 0;
587
573 if (alloc) 588 if (alloc)
574 { 589 {
575#if HAVE_MMAP 590#if HAVE_MMAP
576 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 591 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
577 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 592 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
578 if (stack->sptr == (void *)-1) 593 if (stack->sptr == (void *)-1)
579#endif 594#endif
580 { 595 {
581 /*FIXME*//*D*//* reasonable stack size! */ 596 /*FIXME*//*D*//* reasonable stack size! */
582 stack->ssize = - (16384 * sizeof (long)); 597 stack->ssize = - (8192 * sizeof (long));
583 New (0, stack->sptr, 16384, long); 598 New (0, stack->sptr, 8192, long);
584 } 599 }
585 } 600 }
586 else 601 else
587 stack->sptr = 0; 602 stack->sptr = 0;
588 603
… …
618setup_coro (void *arg) 633setup_coro (void *arg)
619{ 634{
620 /* 635 /*
621 * emulate part of the perl startup here. 636 * emulate part of the perl startup here.
622 */ 637 */
638 dTHX;
623 dSP; 639 dSP;
624 Coro__State ctx = (Coro__State)arg; 640 Coro__State ctx = (Coro__State)arg;
625 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 641 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
626 642
627 coro_init_stacks (aTHX); 643 coro_init_stacks (aTHX);
628 /*PL_curcop = 0;*/ 644 /*PL_curcop = 0;*/
629 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 645 /*PL_in_eval = PL_in_eval;*/ /* inherit */
630 SvREFCNT_dec (GvAV (PL_defgv)); 646 SvREFCNT_dec (GvAV (PL_defgv));
… …
676continue_coro (void *arg) 692continue_coro (void *arg)
677{ 693{
678 /* 694 /*
679 * this is a _very_ stripped down perl interpreter ;) 695 * this is a _very_ stripped down perl interpreter ;)
680 */ 696 */
697 dTHX;
681 Coro__State ctx = (Coro__State)arg; 698 Coro__State ctx = (Coro__State)arg;
682 JMPENV coro_start_env; 699 JMPENV coro_start_env;
683 700
684 PL_top_env = &ctx->start_env; 701 PL_top_env = &ctx->start_env;
685 702
… …
689 706
690 abort (); 707 abort ();
691} 708}
692 709
693STATIC void 710STATIC void
694transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 711transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
695{ 712{
696 dSTACKLEVEL; 713 dSTACKLEVEL;
697 static struct coro *xnext;
698 714
699 if (prev != next) 715 if (prev != next)
700 { 716 {
701 xnext = next;
702
703 if (next->mainstack) 717 if (next->mainstack)
704 { 718 {
719 LOCK;
705 SAVE (prev, flags); 720 SAVE (prev, flags);
706 LOAD (next); 721 LOAD (next);
722 UNLOCK;
707 723
708 /* mark this state as in-use */ 724 /* mark this state as in-use */
709 next->mainstack = 0; 725 next->mainstack = 0;
710 next->tmps_ix = -2; 726 next->tmps_ix = -2;
711 727
… …
730 continue_coro, (void *)next, 746 continue_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 747 next->stack->sptr, labs (next->stack->ssize));
732 } 748 }
733 749
734 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 750 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
751 prev->cursp = stacklevel;
735 /* don't add any code here */ 752 /* don't add any code here */
736 } 753 }
737 754 else
755 next->cursp = stacklevel;
738 } 756 }
739 else if (next->tmps_ix == -2) 757 else if (next->tmps_ix == -2)
740 croak ("tried to transfer to running coroutine"); 758 croak ("tried to transfer to running coroutine");
741 else 759 else
742 { 760 {
761 LOCK;
743 SAVE (prev, -1); /* first get rid of the old state */ 762 SAVE (prev, -1); /* first get rid of the old state */
763 UNLOCK;
744 764
745 if (flags & TRANSFER_SAVE_CCTXT) 765 if (flags & TRANSFER_SAVE_CCTXT)
746 { 766 {
747 if (!prev->stack) 767 if (!prev->stack)
748 allocate_stack (prev, 0); 768 allocate_stack (prev, 0);
… …
750 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 770 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
751 { 771 {
752 PL_top_env = &next->start_env; 772 PL_top_env = &next->start_env;
753 773
754 setup_coro (next); 774 setup_coro (next);
775 next->cursp = stacklevel;
755 776
756 prev->stack->refcnt++; 777 prev->stack->refcnt++;
757 prev->stack->usecnt++; 778 prev->stack->usecnt++;
758 next->stack = prev->stack; 779 next->stack = prev->stack;
759 next->gencnt = prev->gencnt; 780 next->gencnt = prev->gencnt;
… …
764 allocate_stack (next, 1); 785 allocate_stack (next, 1);
765 coro_create (&(next->stack->cctx), 786 coro_create (&(next->stack->cctx),
766 setup_coro, (void *)next, 787 setup_coro, (void *)next,
767 next->stack->sptr, labs (next->stack->ssize)); 788 next->stack->sptr, labs (next->stack->ssize));
768 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 789 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
790 prev->cursp = stacklevel;
769 /* don't add any code here */ 791 /* don't add any code here */
770 } 792 }
771 } 793 }
772 else 794 else
795 {
773 setup_coro (next); 796 setup_coro (next);
797 next->cursp = stacklevel;
798 }
774 } 799 }
775
776 /*
777 * xnext is now either prev or next, depending on wether
778 * we switched the c stack or not. that's why I use a global
779 * variable, that should become thread-specific at one point.
780 */
781 xnext->cursp = stacklevel;
782 } 800 }
783 801
802 LOCK;
784 if (coro_mortal) 803 if (coro_mortal)
785 { 804 {
786 SvREFCNT_dec (coro_mortal); 805 SvREFCNT_dec (coro_mortal);
787 coro_mortal = 0; 806 coro_mortal = 0;
788 } 807 }
808 UNLOCK;
789} 809}
790 810
791#define SV_CORO(sv,func) \ 811#define SV_CORO(sv,func) \
792 do { \ 812 do { \
793 if (SvROK (sv)) \ 813 if (SvROK (sv)) \
794 sv = SvRV (sv); \ 814 sv = SvRV (sv); \
795 \ 815 \
796 if (SvTYPE(sv) == SVt_PVHV) \ 816 if (SvTYPE (sv) == SVt_PVHV) \
797 { \ 817 { \
798 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 818 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
799 \ 819 \
800 if (!he) \ 820 if (!he) \
801 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 821 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
802 \ 822 \
803 (sv) = SvRV (HeVAL(he)); \ 823 (sv) = SvRV (HeVAL(he)); \
804 } \ 824 } \
805 \ 825 \
806 /* must also be changed inside Coro::Cont::yield */ \ 826 /* must also be changed inside Coro::Cont::yield */ \
807 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 827 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
808 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 828 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
809 \ 829 \
810 } while(0) 830 } while(0)
811 831
812#define SvSTATE(sv) (struct coro *)SvIV (sv) 832#define SvSTATE(sv) (struct coro *)SvIV (sv)
… …
815api_transfer(pTHX_ SV *prev, SV *next, int flags) 835api_transfer(pTHX_ SV *prev, SV *next, int flags)
816{ 836{
817 SV_CORO (prev, "Coro::transfer"); 837 SV_CORO (prev, "Coro::transfer");
818 SV_CORO (next, "Coro::transfer"); 838 SV_CORO (next, "Coro::transfer");
819 839
820 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 840 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
821} 841}
822 842
823/** Coro ********************************************************************/ 843/** Coro ********************************************************************/
824 844
825#define PRIO_MAX 3 845#define PRIO_MAX 3
… …
833static GV *coro_current, *coro_idle; 853static GV *coro_current, *coro_idle;
834static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 854static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
835static int coro_nready; 855static int coro_nready;
836 856
837static void 857static void
838coro_enq (SV *sv) 858coro_enq (pTHX_ SV *sv)
839{ 859{
840 if (SvTYPE (sv) == SVt_PVHV) 860 if (SvTYPE (sv) == SVt_PVHV)
841 { 861 {
842 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 862 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
843 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 863 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
… …
854 874
855 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 875 croak ("Coro::ready tried to enqueue something that is not a coroutine");
856} 876}
857 877
858static SV * 878static SV *
859coro_deq (int min_prio) 879coro_deq (pTHX_ int min_prio)
860{ 880{
861 int prio = PRIO_MAX - PRIO_MIN; 881 int prio = PRIO_MAX - PRIO_MIN;
862 882
863 min_prio -= PRIO_MIN; 883 min_prio -= PRIO_MIN;
864 if (min_prio < 0) 884 if (min_prio < 0)
… …
875} 895}
876 896
877static void 897static void
878api_ready (SV *coro) 898api_ready (SV *coro)
879{ 899{
900 dTHX;
901
880 if (SvROK (coro)) 902 if (SvROK (coro))
881 coro = SvRV (coro); 903 coro = SvRV (coro);
882 904
905 LOCK;
883 coro_enq (SvREFCNT_inc (coro)); 906 coro_enq (aTHX_ SvREFCNT_inc (coro));
907 UNLOCK;
884} 908}
885 909
886static void 910static void
887api_schedule (void) 911api_schedule (void)
888{ 912{
913 dTHX;
914
889 SV *prev, *next; 915 SV *prev, *next;
890 916
917 LOCK;
918
891 prev = SvRV (GvSV (coro_current)); 919 prev = SvRV (GvSV (coro_current));
892 next = coro_deq (PRIO_MIN); 920 next = coro_deq (aTHX_ PRIO_MIN);
893 921
894 if (!next) 922 if (!next)
895 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 923 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
896 924
897 /* free this only after the transfer */ 925 /* free this only after the transfer */
… …
900 928
901 SvRV (GvSV (coro_current)) = next; 929 SvRV (GvSV (coro_current)) = next;
902 930
903 SV_CORO (next, "Coro::schedule"); 931 SV_CORO (next, "Coro::schedule");
904 932
933 UNLOCK;
934
905 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 935 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
906 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 936 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
907} 937}
908 938
909static void 939static void
910api_cede (void) 940api_cede (void)
911{ 941{
942 dTHX;
943
944 LOCK;
912 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 945 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
946 UNLOCK;
913 947
914 api_schedule (); 948 api_schedule ();
915} 949}
916 950
917MODULE = Coro::State PACKAGE = Coro::State 951MODULE = Coro::State PACKAGE = Coro::State
918 952
919PROTOTYPES: ENABLE 953PROTOTYPES: ENABLE
920 954
921BOOT: 955BOOT:
922{ /* {} necessary for stoopid perl-5.6.x */ 956{ /* {} necessary for stoopid perl-5.6.x */
957#ifdef USE_ITHREADS
958 MUTEX_INIT (&coro_mutex);
959#endif
960
923 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 961 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
924 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 962 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
925 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 963 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
926 964
927 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 965 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
928 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 966 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
929 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 967 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
930 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 968 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
931
932 if (!padlist_cache)
933 padlist_cache = newHV ();
934 969
935 main_mainstack = PL_mainstack; 970 main_mainstack = PL_mainstack;
936 971
937 coroapi.ver = CORO_API_VERSION; 972 coroapi.ver = CORO_API_VERSION;
938 coroapi.transfer = api_transfer; 973 coroapi.transfer = api_transfer;
… …
949 croak ("Coro::State::_newprocess expects an arrayref"); 984 croak ("Coro::State::_newprocess expects an arrayref");
950 985
951 Newz (0, coro, 1, struct coro); 986 Newz (0, coro, 1, struct coro);
952 987
953 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 988 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
954 coro->mainstack = 0; /* actual work is done inside transfer */ 989 /*coro->mainstack = 0; *//*actual work is done inside transfer */
955 coro->stack = 0; 990 /*coro->stack = 0;*/
956 991
957 /* same as JMPENV_BOOTSTRAP */ 992 /* same as JMPENV_BOOTSTRAP */
958 /* we might be able to recycle start_env, but safe is safe */ 993 /* we might be able to recycle start_env, but safe is safe */
959 //Zero(&coro->start_env, 1, JMPENV); 994 /*Zero(&coro->start_env, 1, JMPENV);*/
960 coro->start_env.je_ret = -1; 995 coro->start_env.je_ret = -1;
961 coro->start_env.je_mustcatch = TRUE; 996 coro->start_env.je_mustcatch = TRUE;
962 997
963 RETVAL = coro; 998 RETVAL = coro;
964 OUTPUT: 999 OUTPUT:
… …
985 if (coro->mainstack && coro->mainstack != main_mainstack) 1020 if (coro->mainstack && coro->mainstack != main_mainstack)
986 { 1021 {
987 struct coro temp; 1022 struct coro temp;
988 1023
989 PUTBACK; 1024 PUTBACK;
990 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1025 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
991 LOAD(aTHX_ coro); 1026 LOAD (aTHX_ coro);
992 SPAGAIN; 1027 SPAGAIN;
993 1028
994 destroy_stacks (aTHX); 1029 destroy_stacks (aTHX);
995 1030
996 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1031 LOAD ((&temp)); /* this will get rid of defsv etc.. */
997 SPAGAIN; 1032 SPAGAIN;
998 1033
999 coro->mainstack = 0; 1034 coro->mainstack = 0;
1000 } 1035 }
1001 1036
… …
1006void 1041void
1007_exit(code) 1042_exit(code)
1008 int code 1043 int code
1009 PROTOTYPE: $ 1044 PROTOTYPE: $
1010 CODE: 1045 CODE:
1011#if defined(__GLIBC__) || _POSIX_C_SOURCE
1012 _exit (code); 1046 _exit (code);
1013#else
1014 signal (SIGTERM, SIG_DFL);
1015 raise (SIGTERM);
1016 exit (code);
1017#endif
1018 1047
1019MODULE = Coro::State PACKAGE = Coro::Cont 1048MODULE = Coro::State PACKAGE = Coro::Cont
1020 1049
1021# this is slightly dirty (should expose a c-level api) 1050# this is slightly dirty (should expose a c-level api)
1022 1051
1023void 1052void
1024yield(...) 1053yield(...)
1025 PROTOTYPE: @ 1054 PROTOTYPE: @
1026 CODE: 1055 CODE:
1027 static SV *returnstk; 1056 SV *yieldstack;
1028 SV *sv; 1057 SV *sv;
1029 AV *defav = GvAV (PL_defgv); 1058 AV *defav = GvAV (PL_defgv);
1030 struct coro *prev, *next; 1059 struct coro *prev, *next;
1031 1060
1032 if (!returnstk) 1061 yieldstack = *hv_fetch (
1033 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1062 (HV *)SvRV (GvSV (coro_current)),
1063 "yieldstack", sizeof ("yieldstack") - 1,
1064 0
1065 );
1034 1066
1035 /* set up @_ -- ugly */ 1067 /* set up @_ -- ugly */
1036 av_clear (defav); 1068 av_clear (defav);
1037 av_fill (defav, items - 1); 1069 av_fill (defav, items - 1);
1038 while (items--) 1070 while (items--)
1039 av_store (defav, items, SvREFCNT_inc (ST(items))); 1071 av_store (defav, items, SvREFCNT_inc (ST(items)));
1040 1072
1041 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1042 sv = av_pop ((AV *)SvRV (returnstk)); 1073 sv = av_pop ((AV *)SvRV (yieldstack));
1043 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1074 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1044 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1075 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1045 SvREFCNT_dec (sv); 1076 SvREFCNT_dec (sv);
1046 1077
1047 transfer(aTHX_ prev, next, 0); 1078 transfer (aTHX_ prev, next, 0);
1048 1079
1049MODULE = Coro::State PACKAGE = Coro 1080MODULE = Coro::State PACKAGE = Coro
1050 1081
1051# this is slightly dirty (should expose a c-level api) 1082# this is slightly dirty (should expose a c-level api)
1052 1083

Diff Legend

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