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

Diff Legend

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