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.131 by root, Fri Dec 29 11:37:49 2006 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. */
112#else 117#else
113# define LOCK (void)0 118# define LOCK (void)0
114# define UNLOCK (void)0 119# define UNLOCK (void)0
115#endif 120#endif
116 121
122/* helper storage struct for Coro::AIO */
117struct io_state 123struct io_state
118{ 124{
119 int errorno; 125 int errorno;
120 I32 laststype; 126 I32 laststype;
121 int laststatval; 127 int laststatval;
122 Stat_t statcache; 128 Stat_t statcache;
123}; 129};
124 130
131static size_t coro_stacksize = CORO_STACKSIZE;
125static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
126static 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;
127static HV *coro_state_stash, *coro_stash; 135static HV *coro_state_stash, *coro_stash;
128static SV *coro_mortal; /* will be freed after next transfer */ 136static SV *coro_mortal; /* will be freed after next transfer */
129 137
130static struct coro_cctx *cctx_first; 138static struct coro_cctx *cctx_first;
131static int cctx_count, cctx_idle; 139static int cctx_count, cctx_idle;
134typedef struct coro_cctx { 142typedef struct coro_cctx {
135 struct coro_cctx *next; 143 struct coro_cctx *next;
136 144
137 /* the stack */ 145 /* the stack */
138 void *sptr; 146 void *sptr;
139 long ssize; /* positive == mmap, otherwise malloc */ 147 size_t ssize;
140 148
141 /* cpu state */ 149 /* cpu state */
142 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 150 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
151 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
143 JMPENV *top_env; 152 JMPENV *top_env;
144 coro_context cctx; 153 coro_context cctx;
145 154
146 int inuse;
147
148#if USE_VALGRIND 155#if CORO_USE_VALGRIND
149 int valgrind_id; 156 int valgrind_id;
150#endif 157#endif
158 char inuse, mapped;
151} coro_cctx; 159} coro_cctx;
152 160
153enum { 161enum {
154 CF_RUNNING = 0x0001, /* coroutine is running */ 162 CF_RUNNING = 0x0001, /* coroutine is running */
155 CF_READY = 0x0002, /* coroutine is ready */ 163 CF_READY = 0x0002, /* coroutine is ready */
156 CF_NEW = 0x0004, /* ahs never been switched to */ 164 CF_NEW = 0x0004, /* has never been switched to */
165 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
157}; 166};
158 167
159/* this is a structure representing a perl-level coroutine */ 168/* this is a structure representing a perl-level coroutine */
160struct coro { 169struct coro {
161 /* the c coroutine allocated to this perl coroutine, if any */ 170 /* the c coroutine allocated to this perl coroutine, if any */
169 178
170 /* optionally saved, might be zero */ 179 /* optionally saved, might be zero */
171 AV *defav; /* @_ */ 180 AV *defav; /* @_ */
172 SV *defsv; /* $_ */ 181 SV *defsv; /* $_ */
173 SV *errsv; /* $@ */ 182 SV *errsv; /* $@ */
183 GV *deffh; /* default filehandle */
174 SV *irssv; /* $/ */ 184 SV *irssv; /* $/ */
175 SV *irssv_sv; /* real $/ cache */ 185 SV *irssv_sv; /* real $/ cache */
176 186
177#define VAR(name,type) type name; 187#define VAR(name,type) type name;
178# include "state.h" 188# include "state.h"
183}; 193};
184 194
185typedef struct coro *Coro__State; 195typedef struct coro *Coro__State;
186typedef struct coro *Coro__State_or_hashref; 196typedef struct coro *Coro__State_or_hashref;
187 197
198/** Coro ********************************************************************/
199
200#define PRIO_MAX 3
201#define PRIO_HIGH 1
202#define PRIO_NORMAL 0
203#define PRIO_LOW -1
204#define PRIO_IDLE -3
205#define PRIO_MIN -4
206
207/* for Coro.pm */
208static SV *coro_current;
209static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
210static int coro_nready;
211
212/** lowlevel stuff **********************************************************/
213
188static AV * 214static AV *
189coro_clone_padlist (CV *cv) 215coro_clone_padlist (pTHX_ CV *cv)
190{ 216{
191 AV *padlist = CvPADLIST (cv); 217 AV *padlist = CvPADLIST (cv);
192 AV *newpadlist, *newpad; 218 AV *newpadlist, *newpad;
193 219
194 newpadlist = newAV (); 220 newpadlist = newAV ();
206 232
207 return newpadlist; 233 return newpadlist;
208} 234}
209 235
210static void 236static void
211free_padlist (AV *padlist) 237free_padlist (pTHX_ AV *padlist)
212{ 238{
213 /* may be during global destruction */ 239 /* may be during global destruction */
214 if (SvREFCNT (padlist)) 240 if (SvREFCNT (padlist))
215 { 241 {
216 I32 i = AvFILLp (padlist); 242 I32 i = AvFILLp (padlist);
237 AV *padlist; 263 AV *padlist;
238 AV *av = (AV *)mg->mg_obj; 264 AV *av = (AV *)mg->mg_obj;
239 265
240 /* casting is fun. */ 266 /* casting is fun. */
241 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
242 free_padlist (padlist); 268 free_padlist (aTHX_ padlist);
243 269
244 SvREFCNT_dec (av); 270 SvREFCNT_dec (av);
245 271
246 return 0; 272 return 0;
247} 273}
257 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 283 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
258 : 0 284 : 0
259 285
260/* the next two functions merely cache the padlists */ 286/* the next two functions merely cache the padlists */
261static void 287static void
262get_padlist (CV *cv) 288get_padlist (pTHX_ CV *cv)
263{ 289{
264 MAGIC *mg = CORO_MAGIC (cv); 290 MAGIC *mg = CORO_MAGIC (cv);
265 AV *av; 291 AV *av;
266 292
267 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 293 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
268 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 294 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
269 else 295 else
270 { 296 {
271#if PREFER_PERL_FUNCTIONS 297#if CORO_PREFER_PERL_FUNCTIONS
272 /* this is probably cleaner, but also slower? */ 298 /* this is probably cleaner, but also slower? */
273 CV *cp = Perl_cv_clone (cv); 299 CV *cp = Perl_cv_clone (cv);
274 CvPADLIST (cv) = CvPADLIST (cp); 300 CvPADLIST (cv) = CvPADLIST (cp);
275 CvPADLIST (cp) = 0; 301 CvPADLIST (cp) = 0;
276 SvREFCNT_dec (cp); 302 SvREFCNT_dec (cp);
277#else 303#else
278 CvPADLIST (cv) = coro_clone_padlist (cv); 304 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
279#endif 305#endif
280 } 306 }
281} 307}
282 308
283static void 309static void
284put_padlist (CV *cv) 310put_padlist (pTHX_ CV *cv)
285{ 311{
286 MAGIC *mg = CORO_MAGIC (cv); 312 MAGIC *mg = CORO_MAGIC (cv);
287 AV *av; 313 AV *av;
288 314
289 if (!mg) 315 if (!mg)
300 av_extend (av, AvMAX (av) + 1); 326 av_extend (av, AvMAX (av) + 1);
301 327
302 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 328 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
303} 329}
304 330
331/** load & save, init *******************************************************/
332
305#define SB do { 333#define SB do {
306#define SE } while (0) 334#define SE } while (0)
307 335
308#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
309 337
310static void 338static void
311load_perl (Coro__State c) 339load_perl (pTHX_ Coro__State c)
312{ 340{
313#define VAR(name,type) PL_ ## name = c->name; 341#define VAR(name,type) PL_ ## name = c->name;
314# include "state.h" 342# include "state.h"
315#undef VAR 343#undef VAR
316 344
317 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 345 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
318 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 346 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
319 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
320 if (c->irssv) 350 if (c->irssv)
321 { 351 {
322 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) 352 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
353 {
323 SvREFCNT_dec (c->irssv); 354 SvREFCNT_dec (c->irssv);
355 c->irssv = 0;
356 }
324 else 357 else
325 { 358 {
326 REPLACE_SV (PL_rs, c->irssv); 359 REPLACE_SV (PL_rs, c->irssv);
327 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); 360 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
328 sv_setsv (c->irssv_sv, PL_rs); 361 sv_setsv (c->irssv_sv, PL_rs);
334 CV *cv; 367 CV *cv;
335 368
336 /* now do the ugly restore mess */ 369 /* now do the ugly restore mess */
337 while ((cv = (CV *)POPs)) 370 while ((cv = (CV *)POPs))
338 { 371 {
339 put_padlist (cv); /* mark this padlist as available */ 372 put_padlist (aTHX_ cv); /* mark this padlist as available */
340 CvDEPTH (cv) = PTR2IV (POPs); 373 CvDEPTH (cv) = PTR2IV (POPs);
341 CvPADLIST (cv) = (AV *)POPs; 374 CvPADLIST (cv) = (AV *)POPs;
342 } 375 }
343 376
344 PUTBACK; 377 PUTBACK;
345 } 378 }
379 assert (!PL_comppad || AvARRAY (PL_comppad));//D
346} 380}
347 381
348static void 382static void
349save_perl (Coro__State c) 383save_perl (pTHX_ Coro__State c)
350{ 384{
385 assert (!PL_comppad || AvARRAY (PL_comppad));//D
351 { 386 {
352 dSP; 387 dSP;
353 I32 cxix = cxstack_ix; 388 I32 cxix = cxstack_ix;
354 PERL_CONTEXT *ccstk = cxstack; 389 PERL_CONTEXT *ccstk = cxstack;
355 PERL_SI *top_si = PL_curstackinfo; 390 PERL_SI *top_si = PL_curstackinfo;
378 PUSHs ((SV *)CvPADLIST (cv)); 413 PUSHs ((SV *)CvPADLIST (cv));
379 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 414 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
380 PUSHs ((SV *)cv); 415 PUSHs ((SV *)cv);
381 416
382 CvDEPTH (cv) = 0; 417 CvDEPTH (cv) = 0;
383 get_padlist (cv); 418 get_padlist (aTHX_ cv);
384 } 419 }
385 } 420 }
386 } 421 }
387 422
388 if (top_si->si_type == PERLSI_MAIN) 423 if (top_si->si_type == PERLSI_MAIN)
397 } 432 }
398 433
399 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;
400 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 435 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
401 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;
402 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;
403 439
404#define VAR(name,type)c->name = PL_ ## name; 440#define VAR(name,type)c->name = PL_ ## name;
405# include "state.h" 441# include "state.h"
406#undef VAR 442#undef VAR
410 * allocate various perl stacks. This is an exact copy 446 * allocate various perl stacks. This is an exact copy
411 * of perl.c:init_stacks, except that it uses less memory 447 * of perl.c:init_stacks, except that it uses less memory
412 * on the (sometimes correct) assumption that coroutines do 448 * on the (sometimes correct) assumption that coroutines do
413 * not usually need a lot of stackspace. 449 * not usually need a lot of stackspace.
414 */ 450 */
415#if PREFER_PERL_FUNCTIONS 451#if CORO_PREFER_PERL_FUNCTIONS
416# define coro_init_stacks init_stacks 452# define coro_init_stacks init_stacks
417#else 453#else
418static void 454static void
419coro_init_stacks () 455coro_init_stacks (pTHX)
420{ 456{
421 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 457 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
422 PL_curstackinfo->si_type = PERLSI_MAIN; 458 PL_curstackinfo->si_type = PERLSI_MAIN;
423 PL_curstack = PL_curstackinfo->si_stack; 459 PL_curstack = PL_curstackinfo->si_stack;
424 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 460 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
458 494
459/* 495/*
460 * destroy the stacks, the callchain etc... 496 * destroy the stacks, the callchain etc...
461 */ 497 */
462static void 498static void
463coro_destroy_stacks () 499coro_destroy_stacks (pTHX)
464{ 500{
465 if (!IN_DESTRUCT) 501 if (!IN_DESTRUCT)
466 { 502 {
467 /* restore all saved variables and stuff */ 503 /* restore all saved variables and stuff */
468 LEAVE_SCOPE (0); 504 LEAVE_SCOPE (0);
470 506
471 /* free all temporaries */ 507 /* free all temporaries */
472 FREETMPS; 508 FREETMPS;
473 assert (PL_tmps_ix == -1); 509 assert (PL_tmps_ix == -1);
474 510
511 /* unwind all extra stacks */
475 POPSTACK_TO (PL_mainstack); 512 POPSTACK_TO (PL_mainstack);
513
514 /* unwind main stack */
515 dounwind (-1);
476 } 516 }
477 517
478 while (PL_curstackinfo->si_next) 518 while (PL_curstackinfo->si_next)
479 PL_curstackinfo = PL_curstackinfo->si_next; 519 PL_curstackinfo = PL_curstackinfo->si_next;
480 520
497#if !PERL_VERSION_ATLEAST (5,9,0) 537#if !PERL_VERSION_ATLEAST (5,9,0)
498 Safefree (PL_retstack); 538 Safefree (PL_retstack);
499#endif 539#endif
500} 540}
501 541
542/** coroutine stack handling ************************************************/
543
502static void 544static void
503setup_coro (struct coro *coro) 545setup_coro (pTHX_ struct coro *coro)
504{ 546{
505 /* 547 /*
506 * emulate part of the perl startup here. 548 * emulate part of the perl startup here.
507 */ 549 */
508
509 coro_init_stacks (); 550 coro_init_stacks (aTHX);
510 551
511 PL_curcop = &PL_compiling; 552 PL_curcop = &PL_compiling;
512 PL_in_eval = EVAL_NULL; 553 PL_in_eval = EVAL_NULL;
554 PL_comppad = 0;
513 PL_curpm = 0; 555 PL_curpm = 0;
514 PL_localizing = 0; 556 PL_localizing = 0;
515 PL_dirty = 0; 557 PL_dirty = 0;
516 PL_restartop = 0; 558 PL_restartop = 0;
517 559
536 578
537 ENTER; /* necessary e.g. for dounwind */ 579 ENTER; /* necessary e.g. for dounwind */
538} 580}
539 581
540static void 582static void
541free_coro_mortal () 583free_coro_mortal (pTHX)
542{ 584{
543 if (coro_mortal) 585 if (coro_mortal)
544 { 586 {
545 SvREFCNT_dec (coro_mortal); 587 SvREFCNT_dec (coro_mortal);
546 coro_mortal = 0; 588 coro_mortal = 0;
547 } 589 }
548} 590}
549 591
550/* 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 */
551static void NOINLINE 595static void NOINLINE
552prepare_cctx (coro_cctx *cctx) 596prepare_cctx (pTHX_ coro_cctx *cctx)
553{ 597{
554 dSP; 598 dSP;
555 LOGOP myop; 599 LOGOP myop;
556 600
557 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
566 PL_op = (OP *)&myop; 610 PL_op = (OP *)&myop;
567 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 611 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
568 SPAGAIN; 612 SPAGAIN;
569} 613}
570 614
615/*
616 * this is a _very_ stripped down perl interpreter ;)
617 */
571static void 618static void
572coro_run (void *arg) 619coro_run (void *arg)
573{ 620{
621 dTHX;
622
574 /* coro_run is the alternative tail of transfer(), so unlock here. */ 623 /* coro_run is the alternative tail of transfer(), so unlock here. */
575 UNLOCK; 624 UNLOCK;
576 625
577 /*
578 * this is a _very_ stripped down perl interpreter ;)
579 */
580 PL_top_env = &PL_start_env; 626 PL_top_env = &PL_start_env;
581 627
582 /* inject call to cctx_init */ 628 /* inject a fake subroutine call to cctx_init */
583 prepare_cctx ((coro_cctx *)arg); 629 prepare_cctx (aTHX_ (coro_cctx *)arg);
584 630
585 /* 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 */
586 PL_restartop = PL_op; 632 PL_restartop = PL_op;
587 perl_run (PL_curinterp); 633 perl_run (PL_curinterp);
588 634
589 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 */
590 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 */
591} 641}
592 642
593static coro_cctx * 643static coro_cctx *
594cctx_new () 644cctx_new ()
595{ 645{
596 coro_cctx *cctx; 646 coro_cctx *cctx;
647 void *stack_start;
648 size_t stack_size;
597 649
598 ++cctx_count; 650 ++cctx_count;
599 651
600 Newz (0, cctx, 1, coro_cctx); 652 Newz (0, cctx, 1, coro_cctx);
601 653
602#if HAVE_MMAP 654#if HAVE_MMAP
603 655
604 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 656 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
605 /* mmap supposedly does allocate-on-write for us */ 657 /* mmap supposedly does allocate-on-write for us */
606 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);
607 659
608 if (cctx->sptr == (void *)-1) 660 if (cctx->sptr != (void *)-1)
609 {
610 perror ("FATAL: unable to mmap stack for coroutine");
611 _exit (EXIT_FAILURE);
612 } 661 {
613
614# if STACKGUARD 662# if CORO_STACKGUARD
615 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 663 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
616# 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);
617 674
618#else
619
620 cctx->ssize = STACKSIZE * (long)sizeof (long);
621 New (0, cctx->sptr, STACKSIZE, long);
622
623 if (!cctx->sptr) 675 if (!cctx->sptr)
624 { 676 {
625 perror ("FATAL: unable to malloc stack for coroutine"); 677 perror ("FATAL: unable to allocate stack for coroutine");
626 _exit (EXIT_FAILURE); 678 _exit (EXIT_FAILURE);
627 } 679 }
628 680
629#endif 681 stack_start = cctx->sptr;
682 stack_size = cctx->ssize;
683 }
630 684
631#if USE_VALGRIND 685 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
632 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
633 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
634 cctx->ssize + (char *)cctx->sptr
635 );
636#endif
637
638 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);
639 687
640 return cctx; 688 return cctx;
641} 689}
642 690
643static void 691static void
646 if (!cctx) 694 if (!cctx)
647 return; 695 return;
648 696
649 --cctx_count; 697 --cctx_count;
650 698
651#if USE_VALGRIND 699#if CORO_USE_VALGRIND
652 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 700 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
653#endif 701#endif
654 702
655#if HAVE_MMAP 703#if HAVE_MMAP
704 if (cctx->mapped)
656 munmap (cctx->sptr, cctx->ssize); 705 munmap (cctx->sptr, cctx->ssize);
657#else 706 else
707#endif
658 Safefree (cctx->sptr); 708 Safefree (cctx->sptr);
659#endif
660 709
661 Safefree (cctx); 710 Safefree (cctx);
662} 711}
663 712
664static coro_cctx * 713static coro_cctx *
665cctx_get () 714cctx_get (pTHX)
666{ 715{
667 coro_cctx *cctx;
668
669 if (cctx_first) 716 while (cctx_first)
670 { 717 {
671 cctx = cctx_first; 718 coro_cctx *cctx = cctx_first;
672 cctx_first = cctx->next; 719 cctx_first = cctx->next;
673 --cctx_idle; 720 --cctx_idle;
721
722 if (cctx->ssize >= coro_stacksize)
723 return cctx;
724
725 cctx_destroy (cctx);
674 } 726 }
675 else 727
676 {
677 cctx = cctx_new ();
678 PL_op = PL_op->op_next; 728 PL_op = PL_op->op_next;
679 }
680
681 return cctx; 729 return cctx_new ();
682} 730}
683 731
684static void 732static void
685cctx_put (coro_cctx *cctx) 733cctx_put (coro_cctx *cctx)
686{ 734{
698 ++cctx_idle; 746 ++cctx_idle;
699 cctx->next = cctx_first; 747 cctx->next = cctx_first;
700 cctx_first = cctx; 748 cctx_first = cctx;
701} 749}
702 750
751/** coroutine switching *****************************************************/
752
703/* never call directly, always through the coro_state_transfer global variable */ 753/* never call directly, always through the coro_state_transfer global variable */
704static void NOINLINE 754static void NOINLINE
705transfer (struct coro *prev, struct coro *next) 755transfer (pTHX_ struct coro *prev, struct coro *next)
706{ 756{
707 dSTACKLEVEL; 757 dSTACKLEVEL;
708 758
709 /* sometimes transfer is only called to set idle_sp */ 759 /* sometimes transfer is only called to set idle_sp */
710 if (!next) 760 if (!next)
711 { 761 {
712 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 762 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
713 assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */ 763 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
714 } 764 }
715 else if (prev != next) 765 else if (prev != next)
716 { 766 {
717 coro_cctx *prev__cctx; 767 coro_cctx *prev__cctx;
718 768
730 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); 780 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
731 781
732 if (next->flags & CF_RUNNING) 782 if (next->flags & CF_RUNNING)
733 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 783 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
734 784
785 if (next->flags & CF_DESTROYED)
786 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
787
735 prev->flags &= ~CF_RUNNING; 788 prev->flags &= ~CF_RUNNING;
736 next->flags |= CF_RUNNING; 789 next->flags |= CF_RUNNING;
737 790
738 LOCK; 791 LOCK;
739 792
740 if (next->flags & CF_NEW) 793 if (next->flags & CF_NEW)
741 { 794 {
742 /* need to start coroutine */ 795 /* need to start coroutine */
743 next->flags &= ~CF_NEW; 796 next->flags &= ~CF_NEW;
744 /* first get rid of the old state */ 797 /* first get rid of the old state */
745 save_perl (prev); 798 save_perl (aTHX_ prev);
746 /* setup coroutine call */ 799 /* setup coroutine call */
747 setup_coro (next); 800 setup_coro (aTHX_ next);
748 /* need a new stack */ 801 /* need a new stack */
749 assert (!next->cctx); 802 assert (!next->cctx);
750 } 803 }
751 else 804 else
752 { 805 {
753 /* coroutine already started */ 806 /* coroutine already started */
754 save_perl (prev); 807 save_perl (aTHX_ prev);
755 load_perl (next); 808 load_perl (aTHX_ next);
756 } 809 }
757 810
758 prev__cctx = prev->cctx; 811 prev__cctx = prev->cctx;
759 812
760 /* possibly "free" the cctx */ 813 /* possibly "free" the cctx */
761 if (prev__cctx->idle_sp == STACKLEVEL) 814 if (prev__cctx->idle_sp == STACKLEVEL)
762 { 815 {
763 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 816 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
764 assert (PL_top_env == prev__cctx->top_env); 817 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
765 818
766 prev->cctx = 0; 819 prev->cctx = 0;
767 820
768 cctx_put (prev__cctx); 821 cctx_put (prev__cctx);
769 prev__cctx->inuse = 0; 822 prev__cctx->inuse = 0;
770 } 823 }
771 824
772 if (!next->cctx) 825 if (!next->cctx)
773 { 826 {
774 next->cctx = cctx_get (); 827 next->cctx = cctx_get (aTHX);
775 assert (!next->cctx->inuse); 828 assert (!next->cctx->inuse);
776 next->cctx->inuse = 1; 829 next->cctx->inuse = 1;
777 } 830 }
778 831
779 if (prev__cctx != next->cctx) 832 if (prev__cctx != next->cctx)
781 prev__cctx->top_env = PL_top_env; 834 prev__cctx->top_env = PL_top_env;
782 PL_top_env = next->cctx->top_env; 835 PL_top_env = next->cctx->top_env;
783 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 836 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
784 } 837 }
785 838
786 free_coro_mortal (); 839 free_coro_mortal (aTHX);
787
788 UNLOCK; 840 UNLOCK;
789 } 841 }
790} 842}
791 843
792struct transfer_args 844struct transfer_args
793{ 845{
794 struct coro *prev, *next; 846 struct coro *prev, *next;
795}; 847};
796 848
797#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 849#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
798 850
851/** high level stuff ********************************************************/
852
799static void 853static int
800coro_state_destroy (struct coro *coro) 854coro_state_destroy (pTHX_ struct coro *coro)
801{ 855{
802 if (coro->refcnt--) 856 if (coro->flags & CF_DESTROYED)
803 return; 857 return 0;
858
859 coro->flags |= CF_DESTROYED;
860
861 if (coro->flags & CF_READY)
862 {
863 /* reduce nready, as destroying a ready coro effectively unreadies it */
864 /* alternative: look through all ready queues and remove the coro */
865 LOCK;
866 --coro_nready;
867 UNLOCK;
868 }
869 else
870 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
804 871
805 if (coro->mainstack && coro->mainstack != main_mainstack) 872 if (coro->mainstack && coro->mainstack != main_mainstack)
806 { 873 {
807 struct coro temp; 874 struct coro temp;
875
876 assert (!(coro->flags & CF_RUNNING));
877
808 Zero (&temp, 1, struct coro); 878 Zero (&temp, 1, struct coro);
809 temp.save = CORO_SAVE_ALL; 879 temp.save = CORO_SAVE_DEF;
810 880
811 if (coro->flags & CF_RUNNING) 881 if (coro->flags & CF_RUNNING)
812 croak ("FATAL: tried to destroy currently running coroutine"); 882 croak ("FATAL: tried to destroy currently running coroutine");
813 883
814 save_perl (&temp); 884 save_perl (aTHX_ &temp);
815 load_perl (coro); 885 load_perl (aTHX_ coro);
816 886
817 coro_destroy_stacks (); 887 coro_destroy_stacks (aTHX);
818 888
819 load_perl (&temp); /* this will get rid of defsv etc.. */ 889 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
820 890
821 coro->mainstack = 0; 891 coro->mainstack = 0;
822 } 892 }
823 893
824 cctx_destroy (coro->cctx); 894 cctx_destroy (coro->cctx);
825 SvREFCNT_dec (coro->args); 895 SvREFCNT_dec (coro->args);
826 Safefree (coro); 896
897 return 1;
827} 898}
828 899
829static int 900static int
830coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 901coro_state_free (pTHX_ SV *sv, MAGIC *mg)
831{ 902{
832 struct coro *coro = (struct coro *)mg->mg_ptr; 903 struct coro *coro = (struct coro *)mg->mg_ptr;
833 mg->mg_ptr = 0; 904 mg->mg_ptr = 0;
834 905
906 if (--coro->refcnt < 0)
907 {
835 coro_state_destroy (coro); 908 coro_state_destroy (aTHX_ coro);
909 Safefree (coro);
910 }
836 911
837 return 0; 912 return 0;
838} 913}
839 914
840static int 915static int
847 return 0; 922 return 0;
848} 923}
849 924
850static MGVTBL coro_state_vtbl = { 925static MGVTBL coro_state_vtbl = {
851 0, 0, 0, 0, 926 0, 0, 0, 0,
852 coro_state_clear, 927 coro_state_free,
853 0, 928 0,
854#ifdef MGf_DUP 929#ifdef MGf_DUP
855 coro_state_dup, 930 coro_state_dup,
856#else 931#else
857# define MGf_DUP 0 932# define MGf_DUP 0
858#endif 933#endif
859}; 934};
860 935
861static struct coro * 936static struct coro *
862SvSTATE (SV *coro) 937SvSTATE_ (pTHX_ SV *coro)
863{ 938{
864 HV *stash; 939 HV *stash;
865 MAGIC *mg; 940 MAGIC *mg;
866 941
867 if (SvROK (coro)) 942 if (SvROK (coro))
873 /* very slow, but rare, check */ 948 /* very slow, but rare, check */
874 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 949 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
875 croak ("Coro::State object required"); 950 croak ("Coro::State object required");
876 } 951 }
877 952
878 mg = SvMAGIC (coro); 953 mg = CORO_MAGIC (coro);
879 assert (mg->mg_type == PERL_MAGIC_ext);
880 return (struct coro *)mg->mg_ptr; 954 return (struct coro *)mg->mg_ptr;
881} 955}
882 956
957#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
958
883static void 959static void
884prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 960prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
885{ 961{
886 ta->prev = SvSTATE (prev_sv); 962 ta->prev = SvSTATE (prev_sv);
887 ta->next = SvSTATE (next_sv); 963 ta->next = SvSTATE (next_sv);
888} 964}
889 965
890static void 966static void
891api_transfer (SV *prev_sv, SV *next_sv) 967api_transfer (SV *prev_sv, SV *next_sv)
892{ 968{
969 dTHX;
893 struct transfer_args ta; 970 struct transfer_args ta;
894 971
895 prepare_transfer (&ta, prev_sv, next_sv); 972 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
896 TRANSFER (ta); 973 TRANSFER (ta);
897} 974}
898 975
899static int 976static int
900api_save (SV *coro_sv, int new_save) 977api_save (SV *coro_sv, int new_save)
901{ 978{
979 dTHX;
902 struct coro *coro = SvSTATE (coro_sv); 980 struct coro *coro = SvSTATE (coro_sv);
903 int old_save = coro->save; 981 int old_save = coro->save;
904 982
905 if (new_save >= 0) 983 if (new_save >= 0)
906 coro->save = new_save; 984 coro->save = new_save;
908 return old_save; 986 return old_save;
909} 987}
910 988
911/** Coro ********************************************************************/ 989/** Coro ********************************************************************/
912 990
913#define PRIO_MAX 3
914#define PRIO_HIGH 1
915#define PRIO_NORMAL 0
916#define PRIO_LOW -1
917#define PRIO_IDLE -3
918#define PRIO_MIN -4
919
920/* for Coro.pm */
921static SV *coro_current;
922static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
923static int coro_nready;
924
925static void 991static void
926coro_enq (SV *coro_sv) 992coro_enq (pTHX_ SV *coro_sv)
927{ 993{
928 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);
929 coro_nready++;
930} 995}
931 996
932static SV * 997static SV *
933coro_deq (int min_prio) 998coro_deq (pTHX_ int min_prio)
934{ 999{
935 int prio = PRIO_MAX - PRIO_MIN; 1000 int prio = PRIO_MAX - PRIO_MIN;
936 1001
937 min_prio -= PRIO_MIN; 1002 min_prio -= PRIO_MIN;
938 if (min_prio < 0) 1003 if (min_prio < 0)
939 min_prio = 0; 1004 min_prio = 0;
940 1005
941 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1006 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
942 if (AvFILLp (coro_ready [prio]) >= 0) 1007 if (AvFILLp (coro_ready [prio]) >= 0)
943 {
944 coro_nready--;
945 return av_shift (coro_ready [prio]); 1008 return av_shift (coro_ready [prio]);
946 }
947 1009
948 return 0; 1010 return 0;
949} 1011}
950 1012
951static int 1013static int
952api_ready (SV *coro_sv) 1014api_ready (SV *coro_sv)
953{ 1015{
1016 dTHX;
954 struct coro *coro; 1017 struct coro *coro;
955 1018
956 if (SvROK (coro_sv)) 1019 if (SvROK (coro_sv))
957 coro_sv = SvRV (coro_sv); 1020 coro_sv = SvRV (coro_sv);
958 1021
962 return 0; 1025 return 0;
963 1026
964 coro->flags |= CF_READY; 1027 coro->flags |= CF_READY;
965 1028
966 LOCK; 1029 LOCK;
967 coro_enq (SvREFCNT_inc (coro_sv)); 1030 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1031 ++coro_nready;
968 UNLOCK; 1032 UNLOCK;
969 1033
970 return 1; 1034 return 1;
971} 1035}
972 1036
973static int 1037static int
974api_is_ready (SV *coro_sv) 1038api_is_ready (SV *coro_sv)
975{ 1039{
1040 dTHX;
976 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1041 return !!(SvSTATE (coro_sv)->flags & CF_READY);
977} 1042}
978 1043
979static void 1044static void
980prepare_schedule (struct transfer_args *ta) 1045prepare_schedule (pTHX_ struct transfer_args *ta)
981{ 1046{
982 SV *prev, *next; 1047 SV *prev_sv, *next_sv;
983 1048
984 for (;;) 1049 for (;;)
985 { 1050 {
986 LOCK; 1051 LOCK;
987 next = coro_deq (PRIO_MIN); 1052 next_sv = coro_deq (aTHX_ PRIO_MIN);
1053
1054 /* nothing to schedule: call the idle handler */
1055 if (!next_sv)
1056 {
1057 dSP;
1058 UNLOCK;
1059
1060 ENTER;
1061 SAVETMPS;
1062
1063 PUSHMARK (SP);
1064 PUTBACK;
1065 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1066
1067 FREETMPS;
1068 LEAVE;
1069 continue;
1070 }
1071
1072 ta->next = SvSTATE (next_sv);
1073
1074 /* cannot transfer to destroyed coros, skip and look for next */
1075 if (ta->next->flags & CF_DESTROYED)
1076 {
1077 UNLOCK;
1078 SvREFCNT_dec (next_sv);
1079 /* coro_nready is already taken care of by destroy */
1080 continue;
1081 }
1082
1083 --coro_nready;
988 UNLOCK; 1084 UNLOCK;
989
990 if (next)
991 break; 1085 break;
992
993 {
994 dSP;
995
996 ENTER;
997 SAVETMPS;
998
999 PUSHMARK (SP);
1000 PUTBACK;
1001 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1002
1003 FREETMPS;
1004 LEAVE;
1005 } 1086 }
1006 }
1007
1008 prev = SvRV (coro_current);
1009 SvRV_set (coro_current, next);
1010 1087
1011 /* free this only after the transfer */ 1088 /* free this only after the transfer */
1012 LOCK; 1089 prev_sv = SvRV (coro_current);
1013 free_coro_mortal (); 1090 SvRV_set (coro_current, next_sv);
1014 UNLOCK;
1015 coro_mortal = prev;
1016
1017 assert (!SvROK(prev));//D
1018 assert (!SvROK(next));//D
1019
1020 ta->prev = SvSTATE (prev); 1091 ta->prev = SvSTATE (prev_sv);
1021 ta->next = SvSTATE (next);
1022 1092
1023 assert (ta->next->flags & CF_READY); 1093 assert (ta->next->flags & CF_READY);
1024 ta->next->flags &= ~CF_READY; 1094 ta->next->flags &= ~CF_READY;
1025}
1026 1095
1096 LOCK;
1097 free_coro_mortal (aTHX);
1098 coro_mortal = prev_sv;
1099 UNLOCK;
1100}
1101
1027static void 1102static void
1028prepare_cede (struct transfer_args *ta) 1103prepare_cede (pTHX_ struct transfer_args *ta)
1029{ 1104{
1030 api_ready (coro_current); 1105 api_ready (coro_current);
1031 prepare_schedule (ta); 1106 prepare_schedule (aTHX_ ta);
1032} 1107}
1033 1108
1034static int 1109static int
1035prepare_cede_notself (struct transfer_args *ta) 1110prepare_cede_notself (pTHX_ struct transfer_args *ta)
1036{ 1111{
1037 if (coro_nready) 1112 if (coro_nready)
1038 { 1113 {
1039 SV *prev = SvRV (coro_current); 1114 SV *prev = SvRV (coro_current);
1040 prepare_schedule (ta); 1115 prepare_schedule (aTHX_ ta);
1041 api_ready (prev); 1116 api_ready (prev);
1042 return 1; 1117 return 1;
1043 } 1118 }
1044 else 1119 else
1045 return 0; 1120 return 0;
1046} 1121}
1047 1122
1048static void 1123static void
1049api_schedule (void) 1124api_schedule (void)
1050{ 1125{
1126 dTHX;
1051 struct transfer_args ta; 1127 struct transfer_args ta;
1052 1128
1053 prepare_schedule (&ta); 1129 prepare_schedule (aTHX_ &ta);
1054 TRANSFER (ta); 1130 TRANSFER (ta);
1055} 1131}
1056 1132
1057static int 1133static int
1058api_cede (void) 1134api_cede (void)
1059{ 1135{
1136 dTHX;
1060 struct transfer_args ta; 1137 struct transfer_args ta;
1061 1138
1062 prepare_cede (&ta); 1139 prepare_cede (aTHX_ &ta);
1063 1140
1064 if (ta.prev != ta.next) 1141 if (ta.prev != ta.next)
1065 { 1142 {
1066 TRANSFER (ta); 1143 TRANSFER (ta);
1067 return 1; 1144 return 1;
1071} 1148}
1072 1149
1073static int 1150static int
1074api_cede_notself (void) 1151api_cede_notself (void)
1075{ 1152{
1153 dTHX;
1076 struct transfer_args ta; 1154 struct transfer_args ta;
1077 1155
1078 if (prepare_cede_notself (&ta)) 1156 if (prepare_cede_notself (aTHX_ &ta))
1079 { 1157 {
1080 TRANSFER (ta); 1158 TRANSFER (ta);
1081 return 1; 1159 return 1;
1082 } 1160 }
1083 else 1161 else
1099 1177
1100 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1178 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1101 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1179 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1102 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1180 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1103 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));
1104 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1184 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1105 1185
1106 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;
1107 1191
1108 coroapi.ver = CORO_API_VERSION; 1192 coroapi.ver = CORO_API_VERSION;
1109 coroapi.transfer = api_transfer; 1193 coroapi.transfer = api_transfer;
1110 1194
1111 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1195 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1119 HV *hv; 1203 HV *hv;
1120 int i; 1204 int i;
1121 1205
1122 Newz (0, coro, 1, struct coro); 1206 Newz (0, coro, 1, struct coro);
1123 coro->args = newAV (); 1207 coro->args = newAV ();
1124 coro->save = CORO_SAVE_ALL; 1208 coro->save = CORO_SAVE_DEF;
1125 coro->flags = CF_NEW; 1209 coro->flags = CF_NEW;
1126 1210
1127 hv = newHV (); 1211 hv = newHV ();
1128 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;
1129 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1213 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1136 1220
1137int 1221int
1138save (SV *coro, int new_save = -1) 1222save (SV *coro, int new_save = -1)
1139 CODE: 1223 CODE:
1140 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}
1141 OUTPUT: 1236 OUTPUT:
1142 RETVAL 1237 RETVAL
1143 1238
1144void 1239void
1145_set_stacklevel (...) 1240_set_stacklevel (...)
1161 1256
1162 case 1: 1257 case 1:
1163 if (items != 2) 1258 if (items != 2)
1164 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);
1165 1260
1166 prepare_transfer (&ta, ST (0), ST (1)); 1261 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1167 break; 1262 break;
1168 1263
1169 case 2: 1264 case 2:
1170 prepare_schedule (&ta); 1265 prepare_schedule (aTHX_ &ta);
1171 break; 1266 break;
1172 1267
1173 case 3: 1268 case 3:
1174 prepare_cede (&ta); 1269 prepare_cede (aTHX_ &ta);
1175 break; 1270 break;
1176 1271
1177 case 4: 1272 case 4:
1178 if (!prepare_cede_notself (&ta)) 1273 if (!prepare_cede_notself (aTHX_ &ta))
1179 XSRETURN_EMPTY; 1274 XSRETURN_EMPTY;
1180 1275
1181 break; 1276 break;
1182 } 1277 }
1183 1278
1184 BARRIER; 1279 BARRIER;
1185 TRANSFER (ta); 1280 TRANSFER (ta);
1186}
1187 1281
1188void 1282 if (GIMME_V != G_VOID && ta.next != ta.prev)
1189_clone_state_from (SV *dst, SV *src) 1283 XSRETURN_YES;
1284}
1285
1286bool
1287_destroy (SV *coro_sv)
1190 CODE: 1288 CODE:
1191{ 1289 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1192 struct coro *coro_src = SvSTATE (src); 1290 OUTPUT:
1193 1291 RETVAL
1194 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1195
1196 ++coro_src->refcnt;
1197 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1198}
1199 1292
1200void 1293void
1201_exit (code) 1294_exit (code)
1202 int code 1295 int code
1203 PROTOTYPE: $ 1296 PROTOTYPE: $
1204 CODE: 1297 CODE:
1205 _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
1206 1308
1207int 1309int
1208cctx_count () 1310cctx_count ()
1209 CODE: 1311 CODE:
1210 RETVAL = cctx_count; 1312 RETVAL = cctx_count;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines