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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines