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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines