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.139 by root, Sun Jan 14 21:13:41 2007 UTC vs.
Revision 1.148 by root, Fri Apr 13 12:56:55 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
… …
31#else 33#else
32# define PAGESIZE 0 34# define PAGESIZE 0
33# define BOOT_PAGESIZE (void)0 35# define BOOT_PAGESIZE (void)0
34#endif 36#endif
35 37
36#if USE_VALGRIND 38#if CORO_USE_VALGRIND
37# include <valgrind/valgrind.h> 39# include <valgrind/valgrind.h>
40# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
41#else
42# define REGISTER_STACK(cctx,start,end)
38#endif 43#endif
39 44
40/* the maximum number of idle cctx that will be pooled */ 45/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8 46#define MAX_IDLE_CCTX 8
42 47
… …
71#ifndef SvRV_set 76#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
73#endif 78#endif
74 79
75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
76# undef STACKGUARD 81# undef CORO_STACKGUARD
77#endif 82#endif
78 83
79#ifndef STACKGUARD 84#ifndef CORO_STACKGUARD
80# define STACKGUARD 0 85# define CORO_STACKGUARD 0
81#endif 86#endif
82 87
83/* prefer perl internal functions over our own? */ 88/* prefer perl internal functions over our own? */
84#ifndef PREFER_PERL_FUNCTIONS 89#ifndef CORO_PREFER_PERL_FUNCTIONS
85# define PREFER_PERL_FUNCTIONS 0 90# define CORO_PREFER_PERL_FUNCTIONS 0
86#endif 91#endif
87 92
88/* The next macro should declare a variable stacklevel that contains and approximation 93/* The next macro should declare a variable stacklevel that contains and approximation
89 * to the current C stack pointer. Its property is that it changes with each call 94 * to the current C stack pointer. Its property is that it changes with each call
90 * and should be unique. */ 95 * and should be unique. */
… …
121 I32 laststype; 126 I32 laststype;
122 int laststatval; 127 int laststatval;
123 Stat_t statcache; 128 Stat_t statcache;
124}; 129};
125 130
131static size_t coro_stacksize = CORO_STACKSIZE;
126static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
127static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
134static JMPENV *main_top_env;
128static HV *coro_state_stash, *coro_stash; 135static HV *coro_state_stash, *coro_stash;
129static SV *coro_mortal; /* will be freed after next transfer */ 136static SV *coro_mortal; /* will be freed after next transfer */
130 137
131static struct coro_cctx *cctx_first; 138static struct coro_cctx *cctx_first;
132static int cctx_count, cctx_idle; 139static int cctx_count, cctx_idle;
… …
135typedef struct coro_cctx { 142typedef struct coro_cctx {
136 struct coro_cctx *next; 143 struct coro_cctx *next;
137 144
138 /* the stack */ 145 /* the stack */
139 void *sptr; 146 void *sptr;
140 long ssize; /* positive == mmap, otherwise malloc */ 147 size_t ssize;
141 148
142 /* cpu state */ 149 /* cpu state */
143 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 150 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
144 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 151 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
145 JMPENV *top_env; 152 JMPENV *top_env;
146 coro_context cctx; 153 coro_context cctx;
147 154
148 int inuse;
149
150#if USE_VALGRIND 155#if CORO_USE_VALGRIND
151 int valgrind_id; 156 int valgrind_id;
152#endif 157#endif
158 char inuse, mapped;
153} coro_cctx; 159} coro_cctx;
154 160
155enum { 161enum {
156 CF_RUNNING = 0x0001, /* coroutine is running */ 162 CF_RUNNING = 0x0001, /* coroutine is running */
157 CF_READY = 0x0002, /* coroutine is ready */ 163 CF_READY = 0x0002, /* coroutine is ready */
… …
172 178
173 /* optionally saved, might be zero */ 179 /* optionally saved, might be zero */
174 AV *defav; /* @_ */ 180 AV *defav; /* @_ */
175 SV *defsv; /* $_ */ 181 SV *defsv; /* $_ */
176 SV *errsv; /* $@ */ 182 SV *errsv; /* $@ */
183 GV *deffh; /* default filehandle */
177 SV *irssv; /* $/ */ 184 SV *irssv; /* $/ */
178 SV *irssv_sv; /* real $/ cache */ 185 SV *irssv_sv; /* real $/ cache */
179 186
180#define VAR(name,type) type name; 187#define VAR(name,type) type name;
181# include "state.h" 188# include "state.h"
… …
203static int coro_nready; 210static int coro_nready;
204 211
205/** lowlevel stuff **********************************************************/ 212/** lowlevel stuff **********************************************************/
206 213
207static AV * 214static AV *
208coro_clone_padlist (CV *cv) 215coro_clone_padlist (pTHX_ CV *cv)
209{ 216{
210 AV *padlist = CvPADLIST (cv); 217 AV *padlist = CvPADLIST (cv);
211 AV *newpadlist, *newpad; 218 AV *newpadlist, *newpad;
212 219
213 newpadlist = newAV (); 220 newpadlist = newAV ();
… …
225 232
226 return newpadlist; 233 return newpadlist;
227} 234}
228 235
229static void 236static void
230free_padlist (AV *padlist) 237free_padlist (pTHX_ AV *padlist)
231{ 238{
232 /* may be during global destruction */ 239 /* may be during global destruction */
233 if (SvREFCNT (padlist)) 240 if (SvREFCNT (padlist))
234 { 241 {
235 I32 i = AvFILLp (padlist); 242 I32 i = AvFILLp (padlist);
… …
256 AV *padlist; 263 AV *padlist;
257 AV *av = (AV *)mg->mg_obj; 264 AV *av = (AV *)mg->mg_obj;
258 265
259 /* casting is fun. */ 266 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist); 268 free_padlist (aTHX_ padlist);
262 269
263 SvREFCNT_dec (av); 270 SvREFCNT_dec (av);
264 271
265 return 0; 272 return 0;
266} 273}
… …
276 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 283 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
277 : 0 284 : 0
278 285
279/* the next two functions merely cache the padlists */ 286/* the next two functions merely cache the padlists */
280static void 287static void
281get_padlist (CV *cv) 288get_padlist (pTHX_ CV *cv)
282{ 289{
283 MAGIC *mg = CORO_MAGIC (cv); 290 MAGIC *mg = CORO_MAGIC (cv);
284 AV *av; 291 AV *av;
285 292
286 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 293 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
287 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 294 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
288 else 295 else
289 { 296 {
290#if PREFER_PERL_FUNCTIONS 297#if CORO_PREFER_PERL_FUNCTIONS
291 /* this is probably cleaner, but also slower? */ 298 /* this is probably cleaner, but also slower? */
292 CV *cp = Perl_cv_clone (cv); 299 CV *cp = Perl_cv_clone (cv);
293 CvPADLIST (cv) = CvPADLIST (cp); 300 CvPADLIST (cv) = CvPADLIST (cp);
294 CvPADLIST (cp) = 0; 301 CvPADLIST (cp) = 0;
295 SvREFCNT_dec (cp); 302 SvREFCNT_dec (cp);
296#else 303#else
297 CvPADLIST (cv) = coro_clone_padlist (cv); 304 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
298#endif 305#endif
299 } 306 }
300} 307}
301 308
302static void 309static void
303put_padlist (CV *cv) 310put_padlist (pTHX_ CV *cv)
304{ 311{
305 MAGIC *mg = CORO_MAGIC (cv); 312 MAGIC *mg = CORO_MAGIC (cv);
306 AV *av; 313 AV *av;
307 314
308 if (!mg) 315 if (!mg)
… …
327#define SE } while (0) 334#define SE } while (0)
328 335
329#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 336#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
330 337
331static void 338static void
332load_perl (Coro__State c) 339load_perl (pTHX_ Coro__State c)
333{ 340{
334#define VAR(name,type) PL_ ## name = c->name; 341#define VAR(name,type) PL_ ## name = c->name;
335# include "state.h" 342# include "state.h"
336#undef VAR 343#undef VAR
337 344
338 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 345 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
339 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 346 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
340 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 347 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
348 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
349
341 if (c->irssv) 350 if (c->irssv)
342 { 351 {
343 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) 352 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
353 {
344 SvREFCNT_dec (c->irssv); 354 SvREFCNT_dec (c->irssv);
355 c->irssv = 0;
356 }
345 else 357 else
346 { 358 {
347 REPLACE_SV (PL_rs, c->irssv); 359 REPLACE_SV (PL_rs, c->irssv);
348 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); 360 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
349 sv_setsv (c->irssv_sv, PL_rs); 361 sv_setsv (c->irssv_sv, PL_rs);
… …
355 CV *cv; 367 CV *cv;
356 368
357 /* now do the ugly restore mess */ 369 /* now do the ugly restore mess */
358 while ((cv = (CV *)POPs)) 370 while ((cv = (CV *)POPs))
359 { 371 {
360 put_padlist (cv); /* mark this padlist as available */ 372 put_padlist (aTHX_ cv); /* mark this padlist as available */
361 CvDEPTH (cv) = PTR2IV (POPs); 373 CvDEPTH (cv) = PTR2IV (POPs);
362 CvPADLIST (cv) = (AV *)POPs; 374 CvPADLIST (cv) = (AV *)POPs;
363 } 375 }
364 376
365 PUTBACK; 377 PUTBACK;
366 } 378 }
379 assert (!PL_comppad || AvARRAY (PL_comppad));//D
367} 380}
368 381
369static void 382static void
370save_perl (Coro__State c) 383save_perl (pTHX_ Coro__State c)
371{ 384{
385 assert (!PL_comppad || AvARRAY (PL_comppad));//D
372 { 386 {
373 dSP; 387 dSP;
374 I32 cxix = cxstack_ix; 388 I32 cxix = cxstack_ix;
375 PERL_CONTEXT *ccstk = cxstack; 389 PERL_CONTEXT *ccstk = cxstack;
376 PERL_SI *top_si = PL_curstackinfo; 390 PERL_SI *top_si = PL_curstackinfo;
… …
399 PUSHs ((SV *)CvPADLIST (cv)); 413 PUSHs ((SV *)CvPADLIST (cv));
400 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 414 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
401 PUSHs ((SV *)cv); 415 PUSHs ((SV *)cv);
402 416
403 CvDEPTH (cv) = 0; 417 CvDEPTH (cv) = 0;
404 get_padlist (cv); 418 get_padlist (aTHX_ cv);
405 } 419 }
406 } 420 }
407 } 421 }
408 422
409 if (top_si->si_type == PERLSI_MAIN) 423 if (top_si->si_type == PERLSI_MAIN)
… …
418 } 432 }
419 433
420 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 434 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
421 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 435 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
422 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 436 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
437 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
423 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 438 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
424 439
425#define VAR(name,type)c->name = PL_ ## name; 440#define VAR(name,type)c->name = PL_ ## name;
426# include "state.h" 441# include "state.h"
427#undef VAR 442#undef VAR
… …
431 * allocate various perl stacks. This is an exact copy 446 * allocate various perl stacks. This is an exact copy
432 * of perl.c:init_stacks, except that it uses less memory 447 * of perl.c:init_stacks, except that it uses less memory
433 * on the (sometimes correct) assumption that coroutines do 448 * on the (sometimes correct) assumption that coroutines do
434 * not usually need a lot of stackspace. 449 * not usually need a lot of stackspace.
435 */ 450 */
436#if PREFER_PERL_FUNCTIONS 451#if CORO_PREFER_PERL_FUNCTIONS
437# define coro_init_stacks init_stacks 452# define coro_init_stacks init_stacks
438#else 453#else
439static void 454static void
440coro_init_stacks () 455coro_init_stacks (pTHX)
441{ 456{
442 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 457 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
443 PL_curstackinfo->si_type = PERLSI_MAIN; 458 PL_curstackinfo->si_type = PERLSI_MAIN;
444 PL_curstack = PL_curstackinfo->si_stack; 459 PL_curstack = PL_curstackinfo->si_stack;
445 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 460 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
… …
479 494
480/* 495/*
481 * destroy the stacks, the callchain etc... 496 * destroy the stacks, the callchain etc...
482 */ 497 */
483static void 498static void
484coro_destroy_stacks () 499coro_destroy_stacks (pTHX)
485{ 500{
486 if (!IN_DESTRUCT) 501 if (!IN_DESTRUCT)
487 { 502 {
488 /* restore all saved variables and stuff */ 503 /* restore all saved variables and stuff */
489 LEAVE_SCOPE (0); 504 LEAVE_SCOPE (0);
… …
525} 540}
526 541
527/** coroutine stack handling ************************************************/ 542/** coroutine stack handling ************************************************/
528 543
529static void 544static void
530setup_coro (struct coro *coro) 545setup_coro (pTHX_ struct coro *coro)
531{ 546{
532 /* 547 /*
533 * emulate part of the perl startup here. 548 * emulate part of the perl startup here.
534 */ 549 */
535
536 coro_init_stacks (); 550 coro_init_stacks (aTHX);
537 551
538 PL_curcop = &PL_compiling; 552 PL_curcop = &PL_compiling;
539 PL_in_eval = EVAL_NULL; 553 PL_in_eval = EVAL_NULL;
554 PL_comppad = 0;
540 PL_curpm = 0; 555 PL_curpm = 0;
541 PL_localizing = 0; 556 PL_localizing = 0;
542 PL_dirty = 0; 557 PL_dirty = 0;
543 PL_restartop = 0; 558 PL_restartop = 0;
544 559
… …
563 578
564 ENTER; /* necessary e.g. for dounwind */ 579 ENTER; /* necessary e.g. for dounwind */
565} 580}
566 581
567static void 582static void
568free_coro_mortal () 583free_coro_mortal (pTHX)
569{ 584{
570 if (coro_mortal) 585 if (coro_mortal)
571 { 586 {
572 SvREFCNT_dec (coro_mortal); 587 SvREFCNT_dec (coro_mortal);
573 coro_mortal = 0; 588 coro_mortal = 0;
574 } 589 }
575} 590}
576 591
577/* inject a fake call to Coro::State::_cctx_init into the execution */ 592/* inject a fake call to Coro::State::_cctx_init into the execution */
593/* _cctx_init shoukld be careful, as it could be called at almost any time */
594/* during execution of a pelr program */
578static void NOINLINE 595static void NOINLINE
579prepare_cctx (coro_cctx *cctx) 596prepare_cctx (pTHX_ coro_cctx *cctx)
580{ 597{
581 dSP; 598 dSP;
582 LOGOP myop; 599 LOGOP myop;
583 600
584 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
… …
593 PL_op = (OP *)&myop; 610 PL_op = (OP *)&myop;
594 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 611 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
595 SPAGAIN; 612 SPAGAIN;
596} 613}
597 614
615/*
616 * this is a _very_ stripped down perl interpreter ;)
617 */
598static void 618static void
599coro_run (void *arg) 619coro_run (void *arg)
600{ 620{
621 dTHX;
622
601 /* coro_run is the alternative tail of transfer(), so unlock here. */ 623 /* coro_run is the alternative tail of transfer(), so unlock here. */
602 UNLOCK; 624 UNLOCK;
603 625
604 /*
605 * this is a _very_ stripped down perl interpreter ;)
606 */
607 PL_top_env = &PL_start_env; 626 PL_top_env = &PL_start_env;
608 627
609 /* inject call to cctx_init */ 628 /* inject a fake subroutine call to cctx_init */
610 prepare_cctx ((coro_cctx *)arg); 629 prepare_cctx (aTHX_ (coro_cctx *)arg);
611 630
612 /* somebody will hit me for both perl_run and PL_restartop */ 631 /* somebody or something will hit me for both perl_run and PL_restartop */
613 PL_restartop = PL_op; 632 PL_restartop = PL_op;
614 perl_run (PL_curinterp); 633 perl_run (PL_curinterp);
615 634
616 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 635 /* If perl-run returns we assume exit() was being called, which */
617 abort (); 636 /* seems to be the only valid (non-bug) reason for perl_run to return. */
637 /* We try to exit by jumping to the bootstrap-time "top" top_env, as */
638 /* we cannot restore the "main" coroutine as Coro has no such concept */
639 PL_top_env = main_top_env;
640 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
618} 641}
619 642
620static coro_cctx * 643static coro_cctx *
621cctx_new () 644cctx_new ()
622{ 645{
623 coro_cctx *cctx; 646 coro_cctx *cctx;
647 void *stack_start;
648 size_t stack_size;
624 649
625 ++cctx_count; 650 ++cctx_count;
626 651
627 Newz (0, cctx, 1, coro_cctx); 652 Newz (0, cctx, 1, coro_cctx);
628 653
629#if HAVE_MMAP 654#if HAVE_MMAP
630 655
631 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 656 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
632 /* mmap supposedly does allocate-on-write for us */ 657 /* mmap supposedly does allocate-on-write for us */
633 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 658 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
634 659
635 if (cctx->sptr == (void *)-1) 660 if (cctx->sptr != (void *)-1)
636 {
637 perror ("FATAL: unable to mmap stack for coroutine");
638 _exit (EXIT_FAILURE);
639 } 661 {
640
641# if STACKGUARD 662# if CORO_STACKGUARD
642 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 663 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
643# endif 664# endif
665 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
666 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
667 cctx->mapped = 1;
668 }
669 else
670#endif
671 {
672 cctx->ssize = coro_stacksize * (long)sizeof (long);
673 New (0, cctx->sptr, coro_stacksize, long);
644 674
645#else
646
647 cctx->ssize = STACKSIZE * (long)sizeof (long);
648 New (0, cctx->sptr, STACKSIZE, long);
649
650 if (!cctx->sptr) 675 if (!cctx->sptr)
651 { 676 {
652 perror ("FATAL: unable to malloc stack for coroutine"); 677 perror ("FATAL: unable to allocate stack for coroutine");
653 _exit (EXIT_FAILURE); 678 _exit (EXIT_FAILURE);
654 } 679 }
655 680
656#endif 681 stack_start = cctx->sptr;
682 stack_size = cctx->ssize;
683 }
657 684
658#if USE_VALGRIND 685 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
659 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
660 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
661 cctx->ssize + (char *)cctx->sptr
662 );
663#endif
664
665 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); 686 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
666 687
667 return cctx; 688 return cctx;
668} 689}
669 690
670static void 691static void
… …
673 if (!cctx) 694 if (!cctx)
674 return; 695 return;
675 696
676 --cctx_count; 697 --cctx_count;
677 698
678#if USE_VALGRIND 699#if CORO_USE_VALGRIND
679 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 700 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
680#endif 701#endif
681 702
682#if HAVE_MMAP 703#if HAVE_MMAP
704 if (cctx->mapped)
683 munmap (cctx->sptr, cctx->ssize); 705 munmap (cctx->sptr, cctx->ssize);
684#else 706 else
707#endif
685 Safefree (cctx->sptr); 708 Safefree (cctx->sptr);
686#endif
687 709
688 Safefree (cctx); 710 Safefree (cctx);
689} 711}
690 712
691static coro_cctx * 713static coro_cctx *
692cctx_get () 714cctx_get (pTHX)
693{ 715{
694 coro_cctx *cctx;
695
696 if (cctx_first) 716 while (cctx_first)
697 { 717 {
698 cctx = cctx_first; 718 coro_cctx *cctx = cctx_first;
699 cctx_first = cctx->next; 719 cctx_first = cctx->next;
700 --cctx_idle; 720 --cctx_idle;
721
722 if (cctx->ssize >= coro_stacksize)
723 return cctx;
724
725 cctx_destroy (cctx);
701 } 726 }
702 else 727
703 {
704 cctx = cctx_new ();
705 PL_op = PL_op->op_next; 728 PL_op = PL_op->op_next;
706 }
707
708 return cctx; 729 return cctx_new ();
709} 730}
710 731
711static void 732static void
712cctx_put (coro_cctx *cctx) 733cctx_put (coro_cctx *cctx)
713{ 734{
… …
729 750
730/** coroutine switching *****************************************************/ 751/** coroutine switching *****************************************************/
731 752
732/* never call directly, always through the coro_state_transfer global variable */ 753/* never call directly, always through the coro_state_transfer global variable */
733static void NOINLINE 754static void NOINLINE
734transfer (struct coro *prev, struct coro *next) 755transfer (pTHX_ struct coro *prev, struct coro *next)
735{ 756{
736 dSTACKLEVEL; 757 dSTACKLEVEL;
737 758
738 /* sometimes transfer is only called to set idle_sp */ 759 /* sometimes transfer is only called to set idle_sp */
739 if (!next) 760 if (!next)
… …
772 if (next->flags & CF_NEW) 793 if (next->flags & CF_NEW)
773 { 794 {
774 /* need to start coroutine */ 795 /* need to start coroutine */
775 next->flags &= ~CF_NEW; 796 next->flags &= ~CF_NEW;
776 /* first get rid of the old state */ 797 /* first get rid of the old state */
777 save_perl (prev); 798 save_perl (aTHX_ prev);
778 /* setup coroutine call */ 799 /* setup coroutine call */
779 setup_coro (next); 800 setup_coro (aTHX_ next);
780 /* need a new stack */ 801 /* need a new stack */
781 assert (!next->cctx); 802 assert (!next->cctx);
782 } 803 }
783 else 804 else
784 { 805 {
785 /* coroutine already started */ 806 /* coroutine already started */
786 save_perl (prev); 807 save_perl (aTHX_ prev);
787 load_perl (next); 808 load_perl (aTHX_ next);
788 } 809 }
789 810
790 prev__cctx = prev->cctx; 811 prev__cctx = prev->cctx;
791 812
792 /* possibly "free" the cctx */ 813 /* possibly "free" the cctx */
… …
801 prev__cctx->inuse = 0; 822 prev__cctx->inuse = 0;
802 } 823 }
803 824
804 if (!next->cctx) 825 if (!next->cctx)
805 { 826 {
806 next->cctx = cctx_get (); 827 next->cctx = cctx_get (aTHX);
807 assert (!next->cctx->inuse); 828 assert (!next->cctx->inuse);
808 next->cctx->inuse = 1; 829 next->cctx->inuse = 1;
809 } 830 }
810 831
811 if (prev__cctx != next->cctx) 832 if (prev__cctx != next->cctx)
… …
813 prev__cctx->top_env = PL_top_env; 834 prev__cctx->top_env = PL_top_env;
814 PL_top_env = next->cctx->top_env; 835 PL_top_env = next->cctx->top_env;
815 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 836 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
816 } 837 }
817 838
818 free_coro_mortal (); 839 free_coro_mortal (aTHX);
819 UNLOCK; 840 UNLOCK;
820 } 841 }
821} 842}
822 843
823struct transfer_args 844struct transfer_args
824{ 845{
825 struct coro *prev, *next; 846 struct coro *prev, *next;
826}; 847};
827 848
828#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 849#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
829 850
830/** high level stuff ********************************************************/ 851/** high level stuff ********************************************************/
831 852
832static int 853static int
833coro_state_destroy (struct coro *coro) 854coro_state_destroy (pTHX_ struct coro *coro)
834{ 855{
835 if (coro->flags & CF_DESTROYED) 856 if (coro->flags & CF_DESTROYED)
836 return 0; 857 return 0;
837 858
838 coro->flags |= CF_DESTROYED; 859 coro->flags |= CF_DESTROYED;
… …
848 else 869 else
849 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 870 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
850 871
851 if (coro->mainstack && coro->mainstack != main_mainstack) 872 if (coro->mainstack && coro->mainstack != main_mainstack)
852 { 873 {
874 struct coro temp;
875
853 assert (!(coro->flags & CF_RUNNING)); 876 assert (!(coro->flags & CF_RUNNING));
854 877
855 struct coro temp;
856 Zero (&temp, 1, struct coro); 878 Zero (&temp, 1, struct coro);
857 temp.save = CORO_SAVE_ALL; 879 temp.save = CORO_SAVE_DEF;
858 880
859 if (coro->flags & CF_RUNNING) 881 if (coro->flags & CF_RUNNING)
860 croak ("FATAL: tried to destroy currently running coroutine"); 882 croak ("FATAL: tried to destroy currently running coroutine");
861 883
862 save_perl (&temp); 884 save_perl (aTHX_ &temp);
863 load_perl (coro); 885 load_perl (aTHX_ coro);
864 886
865 coro_destroy_stacks (); 887 coro_destroy_stacks (aTHX);
866 888
867 load_perl (&temp); /* this will get rid of defsv etc.. */ 889 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
868 890
869 coro->mainstack = 0; 891 coro->mainstack = 0;
870 } 892 }
871 893
872 cctx_destroy (coro->cctx); 894 cctx_destroy (coro->cctx);
… …
881 struct coro *coro = (struct coro *)mg->mg_ptr; 903 struct coro *coro = (struct coro *)mg->mg_ptr;
882 mg->mg_ptr = 0; 904 mg->mg_ptr = 0;
883 905
884 if (--coro->refcnt < 0) 906 if (--coro->refcnt < 0)
885 { 907 {
886 coro_state_destroy (coro); 908 coro_state_destroy (aTHX_ coro);
887 Safefree (coro); 909 Safefree (coro);
888 } 910 }
889 911
890 return 0; 912 return 0;
891} 913}
… …
910# define MGf_DUP 0 932# define MGf_DUP 0
911#endif 933#endif
912}; 934};
913 935
914static struct coro * 936static struct coro *
915SvSTATE (SV *coro) 937SvSTATE_ (pTHX_ SV *coro)
916{ 938{
917 HV *stash; 939 HV *stash;
918 MAGIC *mg; 940 MAGIC *mg;
919 941
920 if (SvROK (coro)) 942 if (SvROK (coro))
… …
926 /* very slow, but rare, check */ 948 /* very slow, but rare, check */
927 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 949 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
928 croak ("Coro::State object required"); 950 croak ("Coro::State object required");
929 } 951 }
930 952
931 mg = SvMAGIC (coro); 953 mg = CORO_MAGIC (coro);
932 assert (mg->mg_type == PERL_MAGIC_ext);
933 return (struct coro *)mg->mg_ptr; 954 return (struct coro *)mg->mg_ptr;
934} 955}
935 956
957#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
958
936static void 959static void
937prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 960prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
938{ 961{
939 ta->prev = SvSTATE (prev_sv); 962 ta->prev = SvSTATE (prev_sv);
940 ta->next = SvSTATE (next_sv); 963 ta->next = SvSTATE (next_sv);
941} 964}
942 965
943static void 966static void
944api_transfer (SV *prev_sv, SV *next_sv) 967api_transfer (SV *prev_sv, SV *next_sv)
945{ 968{
969 dTHX;
946 struct transfer_args ta; 970 struct transfer_args ta;
947 971
948 prepare_transfer (&ta, prev_sv, next_sv); 972 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
949 TRANSFER (ta); 973 TRANSFER (ta);
950} 974}
951 975
952static int 976static int
953api_save (SV *coro_sv, int new_save) 977api_save (SV *coro_sv, int new_save)
954{ 978{
979 dTHX;
955 struct coro *coro = SvSTATE (coro_sv); 980 struct coro *coro = SvSTATE (coro_sv);
956 int old_save = coro->save; 981 int old_save = coro->save;
957 982
958 if (new_save >= 0) 983 if (new_save >= 0)
959 coro->save = new_save; 984 coro->save = new_save;
… …
962} 987}
963 988
964/** Coro ********************************************************************/ 989/** Coro ********************************************************************/
965 990
966static void 991static void
967coro_enq (SV *coro_sv) 992coro_enq (pTHX_ SV *coro_sv)
968{ 993{
969 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 994 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
970} 995}
971 996
972static SV * 997static SV *
973coro_deq (int min_prio) 998coro_deq (pTHX_ int min_prio)
974{ 999{
975 int prio = PRIO_MAX - PRIO_MIN; 1000 int prio = PRIO_MAX - PRIO_MIN;
976 1001
977 min_prio -= PRIO_MIN; 1002 min_prio -= PRIO_MIN;
978 if (min_prio < 0) 1003 if (min_prio < 0)
… …
986} 1011}
987 1012
988static int 1013static int
989api_ready (SV *coro_sv) 1014api_ready (SV *coro_sv)
990{ 1015{
1016 dTHX;
991 struct coro *coro; 1017 struct coro *coro;
992 1018
993 if (SvROK (coro_sv)) 1019 if (SvROK (coro_sv))
994 coro_sv = SvRV (coro_sv); 1020 coro_sv = SvRV (coro_sv);
995 1021
… …
999 return 0; 1025 return 0;
1000 1026
1001 coro->flags |= CF_READY; 1027 coro->flags |= CF_READY;
1002 1028
1003 LOCK; 1029 LOCK;
1004 coro_enq (SvREFCNT_inc (coro_sv)); 1030 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1005 ++coro_nready; 1031 ++coro_nready;
1006 UNLOCK; 1032 UNLOCK;
1007 1033
1008 return 1; 1034 return 1;
1009} 1035}
1010 1036
1011static int 1037static int
1012api_is_ready (SV *coro_sv) 1038api_is_ready (SV *coro_sv)
1013{ 1039{
1040 dTHX;
1014 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1041 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1015} 1042}
1016 1043
1017static void 1044static void
1018prepare_schedule (struct transfer_args *ta) 1045prepare_schedule (pTHX_ struct transfer_args *ta)
1019{ 1046{
1020 SV *prev_sv, *next_sv; 1047 SV *prev_sv, *next_sv;
1021 1048
1022 for (;;) 1049 for (;;)
1023 { 1050 {
1024 LOCK; 1051 LOCK;
1025 next_sv = coro_deq (PRIO_MIN); 1052 next_sv = coro_deq (aTHX_ PRIO_MIN);
1026 1053
1027 /* nothing to schedule: call the idle handler */ 1054 /* nothing to schedule: call the idle handler */
1028 if (!next_sv) 1055 if (!next_sv)
1029 { 1056 {
1057 dSP;
1030 UNLOCK; 1058 UNLOCK;
1031 dSP;
1032 1059
1033 ENTER; 1060 ENTER;
1034 SAVETMPS; 1061 SAVETMPS;
1035 1062
1036 PUSHMARK (SP); 1063 PUSHMARK (SP);
… …
1065 1092
1066 assert (ta->next->flags & CF_READY); 1093 assert (ta->next->flags & CF_READY);
1067 ta->next->flags &= ~CF_READY; 1094 ta->next->flags &= ~CF_READY;
1068 1095
1069 LOCK; 1096 LOCK;
1070 free_coro_mortal (); 1097 free_coro_mortal (aTHX);
1071 coro_mortal = prev_sv; 1098 coro_mortal = prev_sv;
1072 UNLOCK; 1099 UNLOCK;
1073} 1100}
1074 1101
1075static void 1102static void
1076prepare_cede (struct transfer_args *ta) 1103prepare_cede (pTHX_ struct transfer_args *ta)
1077{ 1104{
1078 api_ready (coro_current); 1105 api_ready (coro_current);
1079 prepare_schedule (ta); 1106 prepare_schedule (aTHX_ ta);
1080} 1107}
1081 1108
1082static int 1109static int
1083prepare_cede_notself (struct transfer_args *ta) 1110prepare_cede_notself (pTHX_ struct transfer_args *ta)
1084{ 1111{
1085 if (coro_nready) 1112 if (coro_nready)
1086 { 1113 {
1087 SV *prev = SvRV (coro_current); 1114 SV *prev = SvRV (coro_current);
1088 prepare_schedule (ta); 1115 prepare_schedule (aTHX_ ta);
1089 api_ready (prev); 1116 api_ready (prev);
1090 return 1; 1117 return 1;
1091 } 1118 }
1092 else 1119 else
1093 return 0; 1120 return 0;
1094} 1121}
1095 1122
1096static void 1123static void
1097api_schedule (void) 1124api_schedule (void)
1098{ 1125{
1126 dTHX;
1099 struct transfer_args ta; 1127 struct transfer_args ta;
1100 1128
1101 prepare_schedule (&ta); 1129 prepare_schedule (aTHX_ &ta);
1102 TRANSFER (ta); 1130 TRANSFER (ta);
1103} 1131}
1104 1132
1105static int 1133static int
1106api_cede (void) 1134api_cede (void)
1107{ 1135{
1136 dTHX;
1108 struct transfer_args ta; 1137 struct transfer_args ta;
1109 1138
1110 prepare_cede (&ta); 1139 prepare_cede (aTHX_ &ta);
1111 1140
1112 if (ta.prev != ta.next) 1141 if (ta.prev != ta.next)
1113 { 1142 {
1114 TRANSFER (ta); 1143 TRANSFER (ta);
1115 return 1; 1144 return 1;
… …
1119} 1148}
1120 1149
1121static int 1150static int
1122api_cede_notself (void) 1151api_cede_notself (void)
1123{ 1152{
1153 dTHX;
1124 struct transfer_args ta; 1154 struct transfer_args ta;
1125 1155
1126 if (prepare_cede_notself (&ta)) 1156 if (prepare_cede_notself (aTHX_ &ta))
1127 { 1157 {
1128 TRANSFER (ta); 1158 TRANSFER (ta);
1129 return 1; 1159 return 1;
1130 } 1160 }
1131 else 1161 else
… …
1147 1177
1148 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1178 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1149 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1179 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1150 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1180 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1151 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1181 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1182 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1183 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1152 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1184 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1153 1185
1154 main_mainstack = PL_mainstack; 1186 main_mainstack = PL_mainstack;
1187 main_top_env = PL_top_env;
1188
1189 while (main_top_env->je_prev)
1190 main_top_env = main_top_env->je_prev;
1155 1191
1156 coroapi.ver = CORO_API_VERSION; 1192 coroapi.ver = CORO_API_VERSION;
1157 coroapi.transfer = api_transfer; 1193 coroapi.transfer = api_transfer;
1158 1194
1159 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1195 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
… …
1167 HV *hv; 1203 HV *hv;
1168 int i; 1204 int i;
1169 1205
1170 Newz (0, coro, 1, struct coro); 1206 Newz (0, coro, 1, struct coro);
1171 coro->args = newAV (); 1207 coro->args = newAV ();
1172 coro->save = CORO_SAVE_ALL; 1208 coro->save = CORO_SAVE_DEF;
1173 coro->flags = CF_NEW; 1209 coro->flags = CF_NEW;
1174 1210
1175 hv = newHV (); 1211 hv = newHV ();
1176 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1212 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1177 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1213 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
1184 1220
1185int 1221int
1186save (SV *coro, int new_save = -1) 1222save (SV *coro, int new_save = -1)
1187 CODE: 1223 CODE:
1188 RETVAL = api_save (coro, new_save); 1224 RETVAL = api_save (coro, new_save);
1225 OUTPUT:
1226 RETVAL
1227
1228int
1229save_also (SV *coro_sv, int save_also)
1230 CODE:
1231{
1232 struct coro *coro = SvSTATE (coro_sv);
1233 RETVAL = coro->save;
1234 coro->save |= save_also;
1235}
1189 OUTPUT: 1236 OUTPUT:
1190 RETVAL 1237 RETVAL
1191 1238
1192void 1239void
1193_set_stacklevel (...) 1240_set_stacklevel (...)
… …
1209 1256
1210 case 1: 1257 case 1:
1211 if (items != 2) 1258 if (items != 2)
1212 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1259 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1213 1260
1214 prepare_transfer (&ta, ST (0), ST (1)); 1261 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1215 break; 1262 break;
1216 1263
1217 case 2: 1264 case 2:
1218 prepare_schedule (&ta); 1265 prepare_schedule (aTHX_ &ta);
1219 break; 1266 break;
1220 1267
1221 case 3: 1268 case 3:
1222 prepare_cede (&ta); 1269 prepare_cede (aTHX_ &ta);
1223 break; 1270 break;
1224 1271
1225 case 4: 1272 case 4:
1226 if (!prepare_cede_notself (&ta)) 1273 if (!prepare_cede_notself (aTHX_ &ta))
1227 XSRETURN_EMPTY; 1274 XSRETURN_EMPTY;
1228 1275
1229 break; 1276 break;
1230 } 1277 }
1231 1278
… …
1237} 1284}
1238 1285
1239bool 1286bool
1240_destroy (SV *coro_sv) 1287_destroy (SV *coro_sv)
1241 CODE: 1288 CODE:
1242 RETVAL = coro_state_destroy (SvSTATE (coro_sv)); 1289 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1243 OUTPUT: 1290 OUTPUT:
1244 RETVAL 1291 RETVAL
1245 1292
1246void 1293void
1247_exit (code) 1294_exit (code)
1248 int code 1295 int code
1249 PROTOTYPE: $ 1296 PROTOTYPE: $
1250 CODE: 1297 CODE:
1251 _exit (code); 1298 _exit (code);
1299
1300int
1301cctx_stacksize (int new_stacksize = 0)
1302 CODE:
1303 RETVAL = coro_stacksize;
1304 if (new_stacksize)
1305 coro_stacksize = new_stacksize;
1306 OUTPUT:
1307 RETVAL
1252 1308
1253int 1309int
1254cctx_count () 1310cctx_count ()
1255 CODE: 1311 CODE:
1256 RETVAL = cctx_count; 1312 RETVAL = cctx_count;

Diff Legend

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