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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines