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.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 */
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
525 Zero (&myop, 1, LOGOP); 567 Zero (&myop, 1, LOGOP);
526 myop.op_next = Nullop; 568 myop.op_next = Nullop;
527 myop.op_flags = OPf_WANT_VOID; 569 myop.op_flags = OPf_WANT_VOID;
528 570
529 PUSHMARK (SP); 571 PUSHMARK (SP);
530 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 572 XPUSHs (av_shift (GvAV (PL_defgv)));
531 PUTBACK; 573 PUTBACK;
532 PL_op = (OP *)&myop; 574 PL_op = (OP *)&myop;
533 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 575 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
534 SPAGAIN; 576 SPAGAIN;
535 } 577 }
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 /*
590 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 */
591} 644}
592 645
593static coro_cctx * 646static coro_cctx *
594cctx_new () 647cctx_new ()
595{ 648{
596 coro_cctx *cctx; 649 coro_cctx *cctx;
650 void *stack_start;
651 size_t stack_size;
597 652
598 ++cctx_count; 653 ++cctx_count;
599 654
600 Newz (0, cctx, 1, coro_cctx); 655 Newz (0, cctx, 1, coro_cctx);
601 656
602#if HAVE_MMAP 657#if HAVE_MMAP
603 658
604 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 659 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
605 /* mmap supposedly does allocate-on-write for us */ 660 /* 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); 661 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
607 662
608 if (cctx->sptr == (void *)-1) 663 if (cctx->sptr != (void *)-1)
609 {
610 perror ("FATAL: unable to mmap stack for coroutine");
611 _exit (EXIT_FAILURE);
612 } 664 {
613
614# if STACKGUARD 665# if CORO_STACKGUARD
615 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 666 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
616# 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);
617 677
618#else
619
620 cctx->ssize = STACKSIZE * (long)sizeof (long);
621 New (0, cctx->sptr, STACKSIZE, long);
622
623 if (!cctx->sptr) 678 if (!cctx->sptr)
624 { 679 {
625 perror ("FATAL: unable to malloc stack for coroutine"); 680 perror ("FATAL: unable to allocate stack for coroutine");
626 _exit (EXIT_FAILURE); 681 _exit (EXIT_FAILURE);
627 } 682 }
628 683
629#endif 684 stack_start = cctx->sptr;
685 stack_size = cctx->ssize;
686 }
630 687
631#if USE_VALGRIND 688 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); 689 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
639 690
640 return cctx; 691 return cctx;
641} 692}
642 693
643static void 694static void
646 if (!cctx) 697 if (!cctx)
647 return; 698 return;
648 699
649 --cctx_count; 700 --cctx_count;
650 701
651#if USE_VALGRIND 702#if CORO_USE_VALGRIND
652 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 703 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
653#endif 704#endif
654 705
655#if HAVE_MMAP 706#if HAVE_MMAP
707 if (cctx->mapped)
656 munmap (cctx->sptr, cctx->ssize); 708 munmap (cctx->sptr, cctx->ssize);
657#else 709 else
710#endif
658 Safefree (cctx->sptr); 711 Safefree (cctx->sptr);
659#endif
660 712
661 Safefree (cctx); 713 Safefree (cctx);
662} 714}
663 715
664static coro_cctx * 716static coro_cctx *
665cctx_get () 717cctx_get (pTHX)
666{ 718{
667 coro_cctx *cctx;
668
669 if (cctx_first) 719 while (cctx_first)
670 { 720 {
671 cctx = cctx_first; 721 coro_cctx *cctx = cctx_first;
672 cctx_first = cctx->next; 722 cctx_first = cctx->next;
673 --cctx_idle; 723 --cctx_idle;
724
725 if (cctx->ssize >= coro_stacksize)
726 return cctx;
727
728 cctx_destroy (cctx);
674 } 729 }
675 else 730
676 {
677 cctx = cctx_new ();
678 PL_op = PL_op->op_next; 731 PL_op = PL_op->op_next;
679 }
680
681 return cctx; 732 return cctx_new ();
682} 733}
683 734
684static void 735static void
685cctx_put (coro_cctx *cctx) 736cctx_put (coro_cctx *cctx)
686{ 737{
698 ++cctx_idle; 749 ++cctx_idle;
699 cctx->next = cctx_first; 750 cctx->next = cctx_first;
700 cctx_first = cctx; 751 cctx_first = cctx;
701} 752}
702 753
754/** coroutine switching *****************************************************/
755
703/* never call directly, always through the coro_state_transfer global variable */ 756/* never call directly, always through the coro_state_transfer global variable */
704static void NOINLINE 757static void NOINLINE
705transfer (struct coro *prev, struct coro *next) 758transfer (pTHX_ struct coro *prev, struct coro *next)
706{ 759{
707 dSTACKLEVEL; 760 dSTACKLEVEL;
708 761
709 /* sometimes transfer is only called to set idle_sp */ 762 /* sometimes transfer is only called to set idle_sp */
710 if (!next) 763 if (!next)
711 { 764 {
712 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 765 ((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 */ 766 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
714 } 767 }
715 else if (prev != next) 768 else if (prev != next)
716 { 769 {
717 coro_cctx *prev__cctx; 770 coro_cctx *prev__cctx;
718 771
730 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");
731 784
732 if (next->flags & CF_RUNNING) 785 if (next->flags & CF_RUNNING)
733 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");
734 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
735 prev->flags &= ~CF_RUNNING; 791 prev->flags &= ~CF_RUNNING;
736 next->flags |= CF_RUNNING; 792 next->flags |= CF_RUNNING;
737 793
738 LOCK; 794 LOCK;
739 795
740 if (next->flags & CF_NEW) 796 if (next->flags & CF_NEW)
741 { 797 {
742 /* need to start coroutine */ 798 /* need to start coroutine */
743 next->flags &= ~CF_NEW; 799 next->flags &= ~CF_NEW;
744 /* first get rid of the old state */ 800 /* first get rid of the old state */
745 save_perl (prev); 801 save_perl (aTHX_ prev);
746 /* setup coroutine call */ 802 /* setup coroutine call */
747 setup_coro (next); 803 setup_coro (aTHX_ next);
748 /* need a new stack */ 804 /* need a new stack */
749 assert (!next->cctx); 805 assert (!next->cctx);
750 } 806 }
751 else 807 else
752 { 808 {
753 /* coroutine already started */ 809 /* coroutine already started */
754 save_perl (prev); 810 save_perl (aTHX_ prev);
755 load_perl (next); 811 load_perl (aTHX_ next);
756 } 812 }
757 813
758 prev__cctx = prev->cctx; 814 prev__cctx = prev->cctx;
759 815
760 /* possibly "free" the cctx */ 816 /* possibly "free" the cctx */
761 if (prev__cctx->idle_sp == STACKLEVEL) 817 if (prev__cctx->idle_sp == STACKLEVEL)
762 { 818 {
763 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 819 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
764 assert (PL_top_env == prev__cctx->top_env); 820 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
765 821
766 prev->cctx = 0; 822 prev->cctx = 0;
767 823
768 cctx_put (prev__cctx); 824 cctx_put (prev__cctx);
769 prev__cctx->inuse = 0; 825 prev__cctx->inuse = 0;
770 } 826 }
771 827
772 if (!next->cctx) 828 if (!next->cctx)
773 { 829 {
774 next->cctx = cctx_get (); 830 next->cctx = cctx_get (aTHX);
775 assert (!next->cctx->inuse); 831 assert (!next->cctx->inuse);
776 next->cctx->inuse = 1; 832 next->cctx->inuse = 1;
777 } 833 }
778 834
779 if (prev__cctx != next->cctx) 835 if (prev__cctx != next->cctx)
781 prev__cctx->top_env = PL_top_env; 837 prev__cctx->top_env = PL_top_env;
782 PL_top_env = next->cctx->top_env; 838 PL_top_env = next->cctx->top_env;
783 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 839 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
784 } 840 }
785 841
786 free_coro_mortal (); 842 free_coro_mortal (aTHX);
787
788 UNLOCK; 843 UNLOCK;
789 } 844 }
790} 845}
791 846
792struct transfer_args 847struct transfer_args
793{ 848{
794 struct coro *prev, *next; 849 struct coro *prev, *next;
795}; 850};
796 851
797#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 852#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
798 853
854/** high level stuff ********************************************************/
855
799static void 856static int
800coro_state_destroy (struct coro *coro) 857coro_state_destroy (pTHX_ struct coro *coro)
801{ 858{
802 if (coro->refcnt--) 859 if (coro->flags & CF_DESTROYED)
803 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 */
804 874
805 if (coro->mainstack && coro->mainstack != main_mainstack) 875 if (coro->mainstack && coro->mainstack != main_mainstack)
806 { 876 {
807 struct coro temp; 877 struct coro temp;
878
879 assert (!(coro->flags & CF_RUNNING));
880
808 Zero (&temp, 1, struct coro); 881 Zero (&temp, 1, struct coro);
809 temp.save = CORO_SAVE_ALL; 882 temp.save = CORO_SAVE_DEF;
810 883
811 if (coro->flags & CF_RUNNING) 884 if (coro->flags & CF_RUNNING)
812 croak ("FATAL: tried to destroy currently running coroutine"); 885 croak ("FATAL: tried to destroy currently running coroutine");
813 886
814 save_perl (&temp); 887 save_perl (aTHX_ &temp);
815 load_perl (coro); 888 load_perl (aTHX_ coro);
816 889
817 coro_destroy_stacks (); 890 coro_destroy_stacks (aTHX);
818 891
819 load_perl (&temp); /* this will get rid of defsv etc.. */ 892 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
820 893
821 coro->mainstack = 0; 894 coro->mainstack = 0;
822 } 895 }
823 896
824 cctx_destroy (coro->cctx); 897 cctx_destroy (coro->cctx);
825 SvREFCNT_dec (coro->args); 898 SvREFCNT_dec (coro->args);
826 Safefree (coro); 899
900 return 1;
827} 901}
828 902
829static int 903static int
830coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 904coro_state_free (pTHX_ SV *sv, MAGIC *mg)
831{ 905{
832 struct coro *coro = (struct coro *)mg->mg_ptr; 906 struct coro *coro = (struct coro *)mg->mg_ptr;
833 mg->mg_ptr = 0; 907 mg->mg_ptr = 0;
834 908
909 if (--coro->refcnt < 0)
910 {
835 coro_state_destroy (coro); 911 coro_state_destroy (aTHX_ coro);
912 Safefree (coro);
913 }
836 914
837 return 0; 915 return 0;
838} 916}
839 917
840static int 918static int
847 return 0; 925 return 0;
848} 926}
849 927
850static MGVTBL coro_state_vtbl = { 928static MGVTBL coro_state_vtbl = {
851 0, 0, 0, 0, 929 0, 0, 0, 0,
852 coro_state_clear, 930 coro_state_free,
853 0, 931 0,
854#ifdef MGf_DUP 932#ifdef MGf_DUP
855 coro_state_dup, 933 coro_state_dup,
856#else 934#else
857# define MGf_DUP 0 935# define MGf_DUP 0
858#endif 936#endif
859}; 937};
860 938
861static struct coro * 939static struct coro *
862SvSTATE (SV *coro) 940SvSTATE_ (pTHX_ SV *coro)
863{ 941{
864 HV *stash; 942 HV *stash;
865 MAGIC *mg; 943 MAGIC *mg;
866 944
867 if (SvROK (coro)) 945 if (SvROK (coro))
873 /* very slow, but rare, check */ 951 /* very slow, but rare, check */
874 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 952 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
875 croak ("Coro::State object required"); 953 croak ("Coro::State object required");
876 } 954 }
877 955
878 mg = SvMAGIC (coro); 956 mg = CORO_MAGIC (coro);
879 assert (mg->mg_type == PERL_MAGIC_ext);
880 return (struct coro *)mg->mg_ptr; 957 return (struct coro *)mg->mg_ptr;
881} 958}
882 959
960#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
961
883static void 962static void
884prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 963prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
885{ 964{
886 ta->prev = SvSTATE (prev_sv); 965 ta->prev = SvSTATE (prev_sv);
887 ta->next = SvSTATE (next_sv); 966 ta->next = SvSTATE (next_sv);
888} 967}
889 968
890static void 969static void
891api_transfer (SV *prev_sv, SV *next_sv) 970api_transfer (SV *prev_sv, SV *next_sv)
892{ 971{
972 dTHX;
893 struct transfer_args ta; 973 struct transfer_args ta;
894 974
895 prepare_transfer (&ta, prev_sv, next_sv); 975 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
896 TRANSFER (ta); 976 TRANSFER (ta);
897} 977}
898 978
899static int 979static int
900api_save (SV *coro_sv, int new_save) 980api_save (SV *coro_sv, int new_save)
901{ 981{
982 dTHX;
902 struct coro *coro = SvSTATE (coro_sv); 983 struct coro *coro = SvSTATE (coro_sv);
903 int old_save = coro->save; 984 int old_save = coro->save;
904 985
905 if (new_save >= 0) 986 if (new_save >= 0)
906 coro->save = new_save; 987 coro->save = new_save;
908 return old_save; 989 return old_save;
909} 990}
910 991
911/** Coro ********************************************************************/ 992/** Coro ********************************************************************/
912 993
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 994static void
926coro_enq (SV *coro_sv) 995coro_enq (pTHX_ SV *coro_sv)
927{ 996{
928 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);
929 coro_nready++;
930} 998}
931 999
932static SV * 1000static SV *
933coro_deq (int min_prio) 1001coro_deq (pTHX_ int min_prio)
934{ 1002{
935 int prio = PRIO_MAX - PRIO_MIN; 1003 int prio = PRIO_MAX - PRIO_MIN;
936 1004
937 min_prio -= PRIO_MIN; 1005 min_prio -= PRIO_MIN;
938 if (min_prio < 0) 1006 if (min_prio < 0)
939 min_prio = 0; 1007 min_prio = 0;
940 1008
941 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1009 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
942 if (AvFILLp (coro_ready [prio]) >= 0) 1010 if (AvFILLp (coro_ready [prio]) >= 0)
943 {
944 coro_nready--;
945 return av_shift (coro_ready [prio]); 1011 return av_shift (coro_ready [prio]);
946 }
947 1012
948 return 0; 1013 return 0;
949} 1014}
950 1015
951static int 1016static int
952api_ready (SV *coro_sv) 1017api_ready (SV *coro_sv)
953{ 1018{
1019 dTHX;
954 struct coro *coro; 1020 struct coro *coro;
955 1021
956 if (SvROK (coro_sv)) 1022 if (SvROK (coro_sv))
957 coro_sv = SvRV (coro_sv); 1023 coro_sv = SvRV (coro_sv);
958 1024
962 return 0; 1028 return 0;
963 1029
964 coro->flags |= CF_READY; 1030 coro->flags |= CF_READY;
965 1031
966 LOCK; 1032 LOCK;
967 coro_enq (SvREFCNT_inc (coro_sv)); 1033 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1034 ++coro_nready;
968 UNLOCK; 1035 UNLOCK;
969 1036
970 return 1; 1037 return 1;
971} 1038}
972 1039
973static int 1040static int
974api_is_ready (SV *coro_sv) 1041api_is_ready (SV *coro_sv)
975{ 1042{
1043 dTHX;
976 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1044 return !!(SvSTATE (coro_sv)->flags & CF_READY);
977} 1045}
978 1046
979static void 1047static void
980prepare_schedule (struct transfer_args *ta) 1048prepare_schedule (pTHX_ struct transfer_args *ta)
981{ 1049{
982 SV *prev, *next; 1050 SV *prev_sv, *next_sv;
983 1051
984 for (;;) 1052 for (;;)
985 { 1053 {
986 LOCK; 1054 LOCK;
987 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;
988 UNLOCK; 1087 UNLOCK;
989
990 if (next)
991 break; 1088 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 } 1089 }
1006 }
1007
1008 prev = SvRV (coro_current);
1009 SvRV_set (coro_current, next);
1010 1090
1011 /* free this only after the transfer */ 1091 /* free this only after the transfer */
1012 LOCK; 1092 prev_sv = SvRV (coro_current);
1013 free_coro_mortal (); 1093 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); 1094 ta->prev = SvSTATE (prev_sv);
1021 ta->next = SvSTATE (next);
1022 1095
1023 assert (ta->next->flags & CF_READY); 1096 assert (ta->next->flags & CF_READY);
1024 ta->next->flags &= ~CF_READY; 1097 ta->next->flags &= ~CF_READY;
1025}
1026 1098
1099 LOCK;
1100 free_coro_mortal (aTHX);
1101 coro_mortal = prev_sv;
1102 UNLOCK;
1103}
1104
1027static void 1105static void
1028prepare_cede (struct transfer_args *ta) 1106prepare_cede (pTHX_ struct transfer_args *ta)
1029{ 1107{
1030 api_ready (coro_current); 1108 api_ready (coro_current);
1031 prepare_schedule (ta); 1109 prepare_schedule (aTHX_ ta);
1032} 1110}
1033 1111
1034static int 1112static int
1035prepare_cede_notself (struct transfer_args *ta) 1113prepare_cede_notself (pTHX_ struct transfer_args *ta)
1036{ 1114{
1037 if (coro_nready) 1115 if (coro_nready)
1038 { 1116 {
1039 SV *prev = SvRV (coro_current); 1117 SV *prev = SvRV (coro_current);
1040 prepare_schedule (ta); 1118 prepare_schedule (aTHX_ ta);
1041 api_ready (prev); 1119 api_ready (prev);
1042 return 1; 1120 return 1;
1043 } 1121 }
1044 else 1122 else
1045 return 0; 1123 return 0;
1046} 1124}
1047 1125
1048static void 1126static void
1049api_schedule (void) 1127api_schedule (void)
1050{ 1128{
1129 dTHX;
1051 struct transfer_args ta; 1130 struct transfer_args ta;
1052 1131
1053 prepare_schedule (&ta); 1132 prepare_schedule (aTHX_ &ta);
1054 TRANSFER (ta); 1133 TRANSFER (ta);
1055} 1134}
1056 1135
1057static int 1136static int
1058api_cede (void) 1137api_cede (void)
1059{ 1138{
1139 dTHX;
1060 struct transfer_args ta; 1140 struct transfer_args ta;
1061 1141
1062 prepare_cede (&ta); 1142 prepare_cede (aTHX_ &ta);
1063 1143
1064 if (ta.prev != ta.next) 1144 if (ta.prev != ta.next)
1065 { 1145 {
1066 TRANSFER (ta); 1146 TRANSFER (ta);
1067 return 1; 1147 return 1;
1071} 1151}
1072 1152
1073static int 1153static int
1074api_cede_notself (void) 1154api_cede_notself (void)
1075{ 1155{
1156 dTHX;
1076 struct transfer_args ta; 1157 struct transfer_args ta;
1077 1158
1078 if (prepare_cede_notself (&ta)) 1159 if (prepare_cede_notself (aTHX_ &ta))
1079 { 1160 {
1080 TRANSFER (ta); 1161 TRANSFER (ta);
1081 return 1; 1162 return 1;
1082 } 1163 }
1083 else 1164 else
1099 1180
1100 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1181 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1101 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1182 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1102 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1183 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1103 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));
1104 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1187 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1105 1188
1106 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;
1107 1194
1108 coroapi.ver = CORO_API_VERSION; 1195 coroapi.ver = CORO_API_VERSION;
1109 coroapi.transfer = api_transfer; 1196 coroapi.transfer = api_transfer;
1110 1197
1111 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1198 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1119 HV *hv; 1206 HV *hv;
1120 int i; 1207 int i;
1121 1208
1122 Newz (0, coro, 1, struct coro); 1209 Newz (0, coro, 1, struct coro);
1123 coro->args = newAV (); 1210 coro->args = newAV ();
1124 coro->save = CORO_SAVE_ALL; 1211 coro->save = CORO_SAVE_DEF;
1125 coro->flags = CF_NEW; 1212 coro->flags = CF_NEW;
1126 1213
1127 hv = newHV (); 1214 hv = newHV ();
1128 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;
1129 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1216 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1136 1223
1137int 1224int
1138save (SV *coro, int new_save = -1) 1225save (SV *coro, int new_save = -1)
1139 CODE: 1226 CODE:
1140 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}
1141 OUTPUT: 1239 OUTPUT:
1142 RETVAL 1240 RETVAL
1143 1241
1144void 1242void
1145_set_stacklevel (...) 1243_set_stacklevel (...)
1161 1259
1162 case 1: 1260 case 1:
1163 if (items != 2) 1261 if (items != 2)
1164 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);
1165 1263
1166 prepare_transfer (&ta, ST (0), ST (1)); 1264 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1167 break; 1265 break;
1168 1266
1169 case 2: 1267 case 2:
1170 prepare_schedule (&ta); 1268 prepare_schedule (aTHX_ &ta);
1171 break; 1269 break;
1172 1270
1173 case 3: 1271 case 3:
1174 prepare_cede (&ta); 1272 prepare_cede (aTHX_ &ta);
1175 break; 1273 break;
1176 1274
1177 case 4: 1275 case 4:
1178 if (!prepare_cede_notself (&ta)) 1276 if (!prepare_cede_notself (aTHX_ &ta))
1179 XSRETURN_EMPTY; 1277 XSRETURN_EMPTY;
1180 1278
1181 break; 1279 break;
1182 } 1280 }
1183 1281
1184 BARRIER; 1282 BARRIER;
1185 TRANSFER (ta); 1283 TRANSFER (ta);
1186}
1187 1284
1188void 1285 if (GIMME_V != G_VOID && ta.next != ta.prev)
1189_clone_state_from (SV *dst, SV *src) 1286 XSRETURN_YES;
1287}
1288
1289bool
1290_destroy (SV *coro_sv)
1190 CODE: 1291 CODE:
1191{ 1292 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1192 struct coro *coro_src = SvSTATE (src); 1293 OUTPUT:
1193 1294 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 1295
1200void 1296void
1201_exit (code) 1297_exit (code)
1202 int code 1298 int code
1203 PROTOTYPE: $ 1299 PROTOTYPE: $
1204 CODE: 1300 CODE:
1205 _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
1206 1311
1207int 1312int
1208cctx_count () 1313cctx_count ()
1209 CODE: 1314 CODE:
1210 RETVAL = cctx_count; 1315 RETVAL = cctx_count;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines