ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.133 by root, Thu Jan 4 20:14:19 2007 UTC vs.
Revision 1.155 by root, Fri Sep 21 01:09:36 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
31#else 33#else
32# define PAGESIZE 0 34# define PAGESIZE 0
33# define BOOT_PAGESIZE (void)0 35# define BOOT_PAGESIZE (void)0
34#endif 36#endif
35 37
36#if USE_VALGRIND 38#if CORO_USE_VALGRIND
37# include <valgrind/valgrind.h> 39# include <valgrind/valgrind.h>
40# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
41#else
42# define REGISTER_STACK(cctx,start,end)
38#endif 43#endif
39 44
40/* the maximum number of idle cctx that will be pooled */ 45/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8 46#define MAX_IDLE_CCTX 8
42 47
71#ifndef SvRV_set 76#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
73#endif 78#endif
74 79
75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
76# undef STACKGUARD 81# undef CORO_STACKGUARD
77#endif 82#endif
78 83
79#ifndef STACKGUARD 84#ifndef CORO_STACKGUARD
80# define STACKGUARD 0 85# define CORO_STACKGUARD 0
81#endif 86#endif
82 87
83/* prefer perl internal functions over our own? */ 88/* prefer perl internal functions over our own? */
84#ifndef PREFER_PERL_FUNCTIONS 89#ifndef CORO_PREFER_PERL_FUNCTIONS
85# define PREFER_PERL_FUNCTIONS 0 90# define CORO_PREFER_PERL_FUNCTIONS 0
86#endif 91#endif
87 92
88/* The next macro should declare a variable stacklevel that contains and approximation 93/* The next macro should declare a variable stacklevel that contains and approximation
89 * to the current C stack pointer. Its property is that it changes with each call 94 * to the current C stack pointer. Its property is that it changes with each call
90 * and should be unique. */ 95 * and should be unique. */
112#else 117#else
113# define LOCK (void)0 118# define LOCK (void)0
114# define UNLOCK (void)0 119# define UNLOCK (void)0
115#endif 120#endif
116 121
122/* helper storage struct for Coro::AIO */
117struct io_state 123struct io_state
118{ 124{
119 int errorno; 125 int errorno;
120 I32 laststype; 126 I32 laststype;
121 int laststatval; 127 int laststatval;
122 Stat_t statcache; 128 Stat_t statcache;
123}; 129};
124 130
131static size_t coro_stacksize = CORO_STACKSIZE;
125static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
126static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
134static JMPENV *main_top_env;
127static HV *coro_state_stash, *coro_stash; 135static HV *coro_state_stash, *coro_stash;
128static SV *coro_mortal; /* will be freed after next transfer */ 136static SV *coro_mortal; /* will be freed after next transfer */
129 137
130static struct coro_cctx *cctx_first; 138static struct coro_cctx *cctx_first;
131static int cctx_count, cctx_idle; 139static int cctx_count, cctx_idle;
134typedef struct coro_cctx { 142typedef struct coro_cctx {
135 struct coro_cctx *next; 143 struct coro_cctx *next;
136 144
137 /* the stack */ 145 /* the stack */
138 void *sptr; 146 void *sptr;
139 long ssize; /* positive == mmap, otherwise malloc */ 147 size_t ssize;
140 148
141 /* cpu state */ 149 /* cpu state */
142 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 150 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
143 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 151 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
144 JMPENV *top_env; 152 JMPENV *top_env;
145 coro_context cctx; 153 coro_context cctx;
146 154
147 int inuse;
148
149#if USE_VALGRIND 155#if CORO_USE_VALGRIND
150 int valgrind_id; 156 int valgrind_id;
151#endif 157#endif
158 char inuse, mapped;
152} coro_cctx; 159} coro_cctx;
153 160
154enum { 161enum {
155 CF_RUNNING = 0x0001, /* coroutine is running */ 162 CF_RUNNING = 0x0001, /* coroutine is running */
156 CF_READY = 0x0002, /* coroutine is ready */ 163 CF_READY = 0x0002, /* coroutine is ready */
171 178
172 /* optionally saved, might be zero */ 179 /* optionally saved, might be zero */
173 AV *defav; /* @_ */ 180 AV *defav; /* @_ */
174 SV *defsv; /* $_ */ 181 SV *defsv; /* $_ */
175 SV *errsv; /* $@ */ 182 SV *errsv; /* $@ */
183 GV *deffh; /* default filehandle */
176 SV *irssv; /* $/ */ 184 SV *irssv; /* $/ */
177 SV *irssv_sv; /* real $/ cache */ 185 SV *irssv_sv; /* real $/ cache */
178 186
179#define VAR(name,type) type name; 187#define VAR(name,type) type name;
180# include "state.h" 188# include "state.h"
181#undef VAR 189#undef VAR
182 190
183 /* coro process data */ 191 /* coro process data */
184 int prio; 192 int prio;
193
194 /* linked list */
195 struct coro *next, *prev;
196 HV *hv; /* the perl hash associated with this coro, if any */
185}; 197};
186 198
187typedef struct coro *Coro__State; 199typedef struct coro *Coro__State;
188typedef struct coro *Coro__State_or_hashref; 200typedef struct coro *Coro__State_or_hashref;
189 201
202/** Coro ********************************************************************/
203
204#define PRIO_MAX 3
205#define PRIO_HIGH 1
206#define PRIO_NORMAL 0
207#define PRIO_LOW -1
208#define PRIO_IDLE -3
209#define PRIO_MIN -4
210
211/* for Coro.pm */
212static SV *coro_current;
213static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
214static int coro_nready;
215static struct coro *coro_first;
216
217/** lowlevel stuff **********************************************************/
218
190static AV * 219static AV *
191coro_clone_padlist (CV *cv) 220coro_clone_padlist (pTHX_ CV *cv)
192{ 221{
193 AV *padlist = CvPADLIST (cv); 222 AV *padlist = CvPADLIST (cv);
194 AV *newpadlist, *newpad; 223 AV *newpadlist, *newpad;
195 224
196 newpadlist = newAV (); 225 newpadlist = newAV ();
208 237
209 return newpadlist; 238 return newpadlist;
210} 239}
211 240
212static void 241static void
213free_padlist (AV *padlist) 242free_padlist (pTHX_ AV *padlist)
214{ 243{
215 /* may be during global destruction */ 244 /* may be during global destruction */
216 if (SvREFCNT (padlist)) 245 if (SvREFCNT (padlist))
217 { 246 {
218 I32 i = AvFILLp (padlist); 247 I32 i = AvFILLp (padlist);
239 AV *padlist; 268 AV *padlist;
240 AV *av = (AV *)mg->mg_obj; 269 AV *av = (AV *)mg->mg_obj;
241 270
242 /* casting is fun. */ 271 /* casting is fun. */
243 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 272 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
244 free_padlist (padlist); 273 free_padlist (aTHX_ padlist);
245 274
246 SvREFCNT_dec (av); 275 SvREFCNT_dec (av);
247 276
248 return 0; 277 return 0;
249} 278}
259 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 288 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
260 : 0 289 : 0
261 290
262/* the next two functions merely cache the padlists */ 291/* the next two functions merely cache the padlists */
263static void 292static void
264get_padlist (CV *cv) 293get_padlist (pTHX_ CV *cv)
265{ 294{
266 MAGIC *mg = CORO_MAGIC (cv); 295 MAGIC *mg = CORO_MAGIC (cv);
267 AV *av; 296 AV *av;
268 297
269 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 298 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
270 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 299 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
271 else 300 else
272 { 301 {
273#if PREFER_PERL_FUNCTIONS 302#if CORO_PREFER_PERL_FUNCTIONS
274 /* this is probably cleaner, but also slower? */ 303 /* this is probably cleaner, but also slower? */
275 CV *cp = Perl_cv_clone (cv); 304 CV *cp = Perl_cv_clone (cv);
276 CvPADLIST (cv) = CvPADLIST (cp); 305 CvPADLIST (cv) = CvPADLIST (cp);
277 CvPADLIST (cp) = 0; 306 CvPADLIST (cp) = 0;
278 SvREFCNT_dec (cp); 307 SvREFCNT_dec (cp);
279#else 308#else
280 CvPADLIST (cv) = coro_clone_padlist (cv); 309 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
281#endif 310#endif
282 } 311 }
283} 312}
284 313
285static void 314static void
286put_padlist (CV *cv) 315put_padlist (pTHX_ CV *cv)
287{ 316{
288 MAGIC *mg = CORO_MAGIC (cv); 317 MAGIC *mg = CORO_MAGIC (cv);
289 AV *av; 318 AV *av;
290 319
291 if (!mg) 320 if (!mg)
302 av_extend (av, AvMAX (av) + 1); 331 av_extend (av, AvMAX (av) + 1);
303 332
304 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 333 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
305} 334}
306 335
336/** load & save, init *******************************************************/
337
307#define SB do { 338#define SB do {
308#define SE } while (0) 339#define SE } while (0)
309 340
310#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 341#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
311 342
312static void 343static void
313load_perl (Coro__State c) 344load_perl (pTHX_ Coro__State c)
314{ 345{
315#define VAR(name,type) PL_ ## name = c->name; 346#define VAR(name,type) PL_ ## name = c->name;
316# include "state.h" 347# include "state.h"
317#undef VAR 348#undef VAR
318 349
319 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 350 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
320 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 351 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
321 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 352 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
353 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
354
322 if (c->irssv) 355 if (c->irssv)
323 { 356 {
324 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) 357 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
358 {
325 SvREFCNT_dec (c->irssv); 359 SvREFCNT_dec (c->irssv);
360 c->irssv = 0;
361 }
326 else 362 else
327 { 363 {
328 REPLACE_SV (PL_rs, c->irssv); 364 REPLACE_SV (PL_rs, c->irssv);
329 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); 365 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
330 sv_setsv (c->irssv_sv, PL_rs); 366 sv_setsv (c->irssv_sv, PL_rs);
336 CV *cv; 372 CV *cv;
337 373
338 /* now do the ugly restore mess */ 374 /* now do the ugly restore mess */
339 while ((cv = (CV *)POPs)) 375 while ((cv = (CV *)POPs))
340 { 376 {
341 put_padlist (cv); /* mark this padlist as available */ 377 put_padlist (aTHX_ cv); /* mark this padlist as available */
342 CvDEPTH (cv) = PTR2IV (POPs); 378 CvDEPTH (cv) = PTR2IV (POPs);
343 CvPADLIST (cv) = (AV *)POPs; 379 CvPADLIST (cv) = (AV *)POPs;
344 } 380 }
345 381
346 PUTBACK; 382 PUTBACK;
347 } 383 }
348} 384}
349 385
350static void 386static void
351save_perl (Coro__State c) 387save_perl (pTHX_ Coro__State c)
352{ 388{
353 { 389 {
354 dSP; 390 dSP;
355 I32 cxix = cxstack_ix; 391 I32 cxix = cxstack_ix;
356 PERL_CONTEXT *ccstk = cxstack; 392 PERL_CONTEXT *ccstk = cxstack;
368 { 404 {
369 while (cxix >= 0) 405 while (cxix >= 0)
370 { 406 {
371 PERL_CONTEXT *cx = &ccstk[cxix--]; 407 PERL_CONTEXT *cx = &ccstk[cxix--];
372 408
373 if (CxTYPE (cx) == CXt_SUB) 409 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)
374 { 410 {
375 CV *cv = cx->blk_sub.cv; 411 CV *cv = cx->blk_sub.cv;
376 412
377 if (CvDEPTH (cv)) 413 if (CvDEPTH (cv))
378 { 414 {
380 PUSHs ((SV *)CvPADLIST (cv)); 416 PUSHs ((SV *)CvPADLIST (cv));
381 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 417 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
382 PUSHs ((SV *)cv); 418 PUSHs ((SV *)cv);
383 419
384 CvDEPTH (cv) = 0; 420 CvDEPTH (cv) = 0;
385 get_padlist (cv); 421 get_padlist (aTHX_ cv);
386 } 422 }
387 } 423 }
388 } 424 }
389 425
390 if (top_si->si_type == PERLSI_MAIN) 426 if (top_si->si_type == PERLSI_MAIN)
399 } 435 }
400 436
401 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 437 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
402 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 438 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
403 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 439 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
440 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
404 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 441 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
405 442
406#define VAR(name,type)c->name = PL_ ## name; 443#define VAR(name,type)c->name = PL_ ## name;
407# include "state.h" 444# include "state.h"
408#undef VAR 445#undef VAR
412 * allocate various perl stacks. This is an exact copy 449 * allocate various perl stacks. This is an exact copy
413 * of perl.c:init_stacks, except that it uses less memory 450 * of perl.c:init_stacks, except that it uses less memory
414 * on the (sometimes correct) assumption that coroutines do 451 * on the (sometimes correct) assumption that coroutines do
415 * not usually need a lot of stackspace. 452 * not usually need a lot of stackspace.
416 */ 453 */
417#if PREFER_PERL_FUNCTIONS 454#if CORO_PREFER_PERL_FUNCTIONS
418# define coro_init_stacks init_stacks 455# define coro_init_stacks init_stacks
419#else 456#else
420static void 457static void
421coro_init_stacks () 458coro_init_stacks (pTHX)
422{ 459{
423 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 460 PL_curstackinfo = new_stackinfo(64, 4);
424 PL_curstackinfo->si_type = PERLSI_MAIN; 461 PL_curstackinfo->si_type = PERLSI_MAIN;
425 PL_curstack = PL_curstackinfo->si_stack; 462 PL_curstack = PL_curstackinfo->si_stack;
426 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 463 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
427 464
428 PL_stack_base = AvARRAY(PL_curstack); 465 PL_stack_base = AvARRAY(PL_curstack);
429 PL_stack_sp = PL_stack_base; 466 PL_stack_sp = PL_stack_base;
430 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 467 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
431 468
432 New(50,PL_tmps_stack,128,SV*); 469 New(50,PL_tmps_stack,64,SV*);
433 PL_tmps_floor = -1; 470 PL_tmps_floor = -1;
434 PL_tmps_ix = -1; 471 PL_tmps_ix = -1;
435 PL_tmps_max = 128; 472 PL_tmps_max = 64;
436 473
437 New(54,PL_markstack,32,I32); 474 New(54,PL_markstack,16,I32);
438 PL_markstack_ptr = PL_markstack; 475 PL_markstack_ptr = PL_markstack;
439 PL_markstack_max = PL_markstack + 32; 476 PL_markstack_max = PL_markstack + 16;
440 477
441#ifdef SET_MARK_OFFSET 478#ifdef SET_MARK_OFFSET
442 SET_MARK_OFFSET; 479 SET_MARK_OFFSET;
443#endif 480#endif
444 481
445 New(54,PL_scopestack,32,I32); 482 New(54,PL_scopestack,16,I32);
446 PL_scopestack_ix = 0; 483 PL_scopestack_ix = 0;
447 PL_scopestack_max = 32; 484 PL_scopestack_max = 16;
448 485
449 New(54,PL_savestack,64,ANY); 486 New(54,PL_savestack,64,ANY);
450 PL_savestack_ix = 0; 487 PL_savestack_ix = 0;
451 PL_savestack_max = 64; 488 PL_savestack_max = 64;
452 489
453#if !PERL_VERSION_ATLEAST (5,9,0) 490#if !PERL_VERSION_ATLEAST (5,9,0)
454 New(54,PL_retstack,16,OP*); 491 New(54,PL_retstack,8,OP*);
455 PL_retstack_ix = 0; 492 PL_retstack_ix = 0;
456 PL_retstack_max = 16; 493 PL_retstack_max = 8;
457#endif 494#endif
458} 495}
459#endif 496#endif
460 497
461/* 498/*
462 * destroy the stacks, the callchain etc... 499 * destroy the stacks, the callchain etc...
463 */ 500 */
464static void 501static void
465coro_destroy_stacks () 502coro_destroy_stacks (pTHX)
466{ 503{
467 if (!IN_DESTRUCT) 504 if (!IN_DESTRUCT)
468 { 505 {
469 /* restore all saved variables and stuff */ 506 /* restore all saved variables and stuff */
470 LEAVE_SCOPE (0); 507 LEAVE_SCOPE (0);
472 509
473 /* free all temporaries */ 510 /* free all temporaries */
474 FREETMPS; 511 FREETMPS;
475 assert (PL_tmps_ix == -1); 512 assert (PL_tmps_ix == -1);
476 513
514 /* unwind all extra stacks */
477 POPSTACK_TO (PL_mainstack); 515 POPSTACK_TO (PL_mainstack);
516
517 /* unwind main stack */
518 dounwind (-1);
478 } 519 }
479 520
480 while (PL_curstackinfo->si_next) 521 while (PL_curstackinfo->si_next)
481 PL_curstackinfo = PL_curstackinfo->si_next; 522 PL_curstackinfo = PL_curstackinfo->si_next;
482 523
499#if !PERL_VERSION_ATLEAST (5,9,0) 540#if !PERL_VERSION_ATLEAST (5,9,0)
500 Safefree (PL_retstack); 541 Safefree (PL_retstack);
501#endif 542#endif
502} 543}
503 544
545static size_t
546coro_rss (struct coro *coro)
547{
548 size_t rss = sizeof (coro);
549
550 if (coro->mainstack)
551 {
552 if (coro->flags & CF_RUNNING)
553 {
554 #define VAR(name,type)coro->name = PL_ ## name;
555 # include "state.h"
556 #undef VAR
557 }
558
559 rss += sizeof (coro->curstackinfo);
560 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
561 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
562 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
563 rss += coro->tmps_max * sizeof (SV *);
564 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
565 rss += coro->scopestack_max * sizeof (I32);
566 rss += coro->savestack_max * sizeof (ANY);
567
568#if !PERL_VERSION_ATLEAST (5,9,0)
569 rss += coro->retstack_max * sizeof (OP *);
570#endif
571 }
572
573 return rss;
574}
575
576/** coroutine stack handling ************************************************/
577
504static void 578static void
505setup_coro (struct coro *coro) 579setup_coro (pTHX_ struct coro *coro)
506{ 580{
507 /* 581 /*
508 * emulate part of the perl startup here. 582 * emulate part of the perl startup here.
509 */ 583 */
510
511 coro_init_stacks (); 584 coro_init_stacks (aTHX);
512 585
513 PL_curcop = &PL_compiling; 586 PL_curcop = &PL_compiling;
514 PL_in_eval = EVAL_NULL; 587 PL_in_eval = EVAL_NULL;
588 PL_comppad = 0;
515 PL_curpm = 0; 589 PL_curpm = 0;
516 PL_localizing = 0; 590 PL_localizing = 0;
517 PL_dirty = 0; 591 PL_dirty = 0;
518 PL_restartop = 0; 592 PL_restartop = 0;
519 593
527 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
528 myop.op_next = Nullop; 602 myop.op_next = Nullop;
529 myop.op_flags = OPf_WANT_VOID; 603 myop.op_flags = OPf_WANT_VOID;
530 604
531 PUSHMARK (SP); 605 PUSHMARK (SP);
532 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 606 XPUSHs (av_shift (GvAV (PL_defgv)));
533 PUTBACK; 607 PUTBACK;
534 PL_op = (OP *)&myop; 608 PL_op = (OP *)&myop;
535 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 609 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
536 SPAGAIN; 610 SPAGAIN;
537 } 611 }
538 612
539 ENTER; /* necessary e.g. for dounwind */ 613 ENTER; /* necessary e.g. for dounwind */
540} 614}
541 615
542static void 616static void
543free_coro_mortal () 617free_coro_mortal (pTHX)
544{ 618{
545 if (coro_mortal) 619 if (coro_mortal)
546 { 620 {
547 SvREFCNT_dec (coro_mortal); 621 SvREFCNT_dec (coro_mortal);
548 coro_mortal = 0; 622 coro_mortal = 0;
549 } 623 }
550} 624}
551 625
552/* inject a fake call to Coro::State::_cctx_init into the execution */ 626/* inject a fake call to Coro::State::_cctx_init into the execution */
627/* _cctx_init should be careful, as it could be called at almost any time */
628/* during execution of a perl program */
553static void NOINLINE 629static void NOINLINE
554prepare_cctx (coro_cctx *cctx) 630prepare_cctx (pTHX_ coro_cctx *cctx)
555{ 631{
556 dSP; 632 dSP;
557 LOGOP myop; 633 LOGOP myop;
558 634
559 Zero (&myop, 1, LOGOP); 635 Zero (&myop, 1, LOGOP);
568 PL_op = (OP *)&myop; 644 PL_op = (OP *)&myop;
569 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
570 SPAGAIN; 646 SPAGAIN;
571} 647}
572 648
649/*
650 * this is a _very_ stripped down perl interpreter ;)
651 */
573static void 652static void
574coro_run (void *arg) 653coro_run (void *arg)
575{ 654{
655 dTHX;
656
576 /* coro_run is the alternative tail of transfer(), so unlock here. */ 657 /* coro_run is the alternative tail of transfer(), so unlock here. */
577 UNLOCK; 658 UNLOCK;
578 659
579 /*
580 * this is a _very_ stripped down perl interpreter ;)
581 */
582 PL_top_env = &PL_start_env; 660 PL_top_env = &PL_start_env;
583 661
584 /* inject call to cctx_init */ 662 /* inject a fake subroutine call to cctx_init */
585 prepare_cctx ((coro_cctx *)arg); 663 prepare_cctx (aTHX_ (coro_cctx *)arg);
586 664
587 /* somebody will hit me for both perl_run and PL_restartop */ 665 /* somebody or something will hit me for both perl_run and PL_restartop */
588 PL_restartop = PL_op; 666 PL_restartop = PL_op;
589 perl_run (PL_curinterp); 667 perl_run (PL_curinterp);
590 668
591 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 669 /*
592 abort (); 670 * If perl-run returns we assume exit() was being called or the coro
671 * fell off the end, which seems to be the only valid (non-bug)
672 * reason for perl_run to return. We try to exit by jumping to the
673 * bootstrap-time "top" top_env, as we cannot restore the "main"
674 * coroutine as Coro has no such concept
675 */
676 PL_top_env = main_top_env;
677 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
593} 678}
594 679
595static coro_cctx * 680static coro_cctx *
596cctx_new () 681cctx_new ()
597{ 682{
598 coro_cctx *cctx; 683 coro_cctx *cctx;
684 void *stack_start;
685 size_t stack_size;
599 686
600 ++cctx_count; 687 ++cctx_count;
601 688
602 Newz (0, cctx, 1, coro_cctx); 689 Newz (0, cctx, 1, coro_cctx);
603 690
604#if HAVE_MMAP 691#if HAVE_MMAP
605 692
606 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 693 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
607 /* mmap supposedly does allocate-on-write for us */ 694 /* mmap supposedly does allocate-on-write for us */
608 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 695 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
609 696
610 if (cctx->sptr == (void *)-1) 697 if (cctx->sptr != (void *)-1)
611 {
612 perror ("FATAL: unable to mmap stack for coroutine");
613 _exit (EXIT_FAILURE);
614 } 698 {
615
616# if STACKGUARD 699# if CORO_STACKGUARD
617 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 700 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
618# endif 701# endif
702 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
703 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
704 cctx->mapped = 1;
705 }
706 else
707#endif
708 {
709 cctx->ssize = coro_stacksize * (long)sizeof (long);
710 New (0, cctx->sptr, coro_stacksize, long);
619 711
620#else
621
622 cctx->ssize = STACKSIZE * (long)sizeof (long);
623 New (0, cctx->sptr, STACKSIZE, long);
624
625 if (!cctx->sptr) 712 if (!cctx->sptr)
626 { 713 {
627 perror ("FATAL: unable to malloc stack for coroutine"); 714 perror ("FATAL: unable to allocate stack for coroutine");
628 _exit (EXIT_FAILURE); 715 _exit (EXIT_FAILURE);
629 } 716 }
630 717
631#endif 718 stack_start = cctx->sptr;
719 stack_size = cctx->ssize;
720 }
632 721
633#if USE_VALGRIND 722 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
634 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
635 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
636 cctx->ssize + (char *)cctx->sptr
637 );
638#endif
639
640 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); 723 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
641 724
642 return cctx; 725 return cctx;
643} 726}
644 727
645static void 728static void
648 if (!cctx) 731 if (!cctx)
649 return; 732 return;
650 733
651 --cctx_count; 734 --cctx_count;
652 735
653#if USE_VALGRIND 736#if CORO_USE_VALGRIND
654 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 737 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
655#endif 738#endif
656 739
657#if HAVE_MMAP 740#if HAVE_MMAP
741 if (cctx->mapped)
658 munmap (cctx->sptr, cctx->ssize); 742 munmap (cctx->sptr, cctx->ssize);
659#else 743 else
744#endif
660 Safefree (cctx->sptr); 745 Safefree (cctx->sptr);
661#endif
662 746
663 Safefree (cctx); 747 Safefree (cctx);
664} 748}
665 749
666static coro_cctx * 750static coro_cctx *
667cctx_get () 751cctx_get (pTHX)
668{ 752{
669 coro_cctx *cctx;
670
671 if (cctx_first) 753 while (cctx_first)
672 { 754 {
673 cctx = cctx_first; 755 coro_cctx *cctx = cctx_first;
674 cctx_first = cctx->next; 756 cctx_first = cctx->next;
675 --cctx_idle; 757 --cctx_idle;
758
759 if (cctx->ssize >= coro_stacksize)
760 return cctx;
761
762 cctx_destroy (cctx);
676 } 763 }
677 else 764
678 {
679 cctx = cctx_new ();
680 PL_op = PL_op->op_next; 765 PL_op = PL_op->op_next;
681 }
682
683 return cctx; 766 return cctx_new ();
684} 767}
685 768
686static void 769static void
687cctx_put (coro_cctx *cctx) 770cctx_put (coro_cctx *cctx)
688{ 771{
700 ++cctx_idle; 783 ++cctx_idle;
701 cctx->next = cctx_first; 784 cctx->next = cctx_first;
702 cctx_first = cctx; 785 cctx_first = cctx;
703} 786}
704 787
788/** coroutine switching *****************************************************/
789
705/* never call directly, always through the coro_state_transfer global variable */ 790/* never call directly, always through the coro_state_transfer global variable */
706static void NOINLINE 791static void NOINLINE
707transfer (struct coro *prev, struct coro *next) 792transfer (pTHX_ struct coro *prev, struct coro *next)
708{ 793{
709 dSTACKLEVEL; 794 dSTACKLEVEL;
710 795
711 /* sometimes transfer is only called to set idle_sp */ 796 /* sometimes transfer is only called to set idle_sp */
712 if (!next) 797 if (!next)
745 if (next->flags & CF_NEW) 830 if (next->flags & CF_NEW)
746 { 831 {
747 /* need to start coroutine */ 832 /* need to start coroutine */
748 next->flags &= ~CF_NEW; 833 next->flags &= ~CF_NEW;
749 /* first get rid of the old state */ 834 /* first get rid of the old state */
750 save_perl (prev); 835 save_perl (aTHX_ prev);
751 /* setup coroutine call */ 836 /* setup coroutine call */
752 setup_coro (next); 837 setup_coro (aTHX_ next);
753 /* need a new stack */ 838 /* need a new stack */
754 assert (!next->cctx); 839 assert (!next->cctx);
755 } 840 }
756 else 841 else
757 { 842 {
758 /* coroutine already started */ 843 /* coroutine already started */
759 save_perl (prev); 844 save_perl (aTHX_ prev);
760 load_perl (next); 845 load_perl (aTHX_ next);
761 } 846 }
762 847
763 prev__cctx = prev->cctx; 848 prev__cctx = prev->cctx;
764 849
765 /* possibly "free" the cctx */ 850 /* possibly "free" the cctx */
774 prev__cctx->inuse = 0; 859 prev__cctx->inuse = 0;
775 } 860 }
776 861
777 if (!next->cctx) 862 if (!next->cctx)
778 { 863 {
779 next->cctx = cctx_get (); 864 next->cctx = cctx_get (aTHX);
780 assert (!next->cctx->inuse); 865 assert (!next->cctx->inuse);
781 next->cctx->inuse = 1; 866 next->cctx->inuse = 1;
782 } 867 }
783 868
784 if (prev__cctx != next->cctx) 869 if (prev__cctx != next->cctx)
786 prev__cctx->top_env = PL_top_env; 871 prev__cctx->top_env = PL_top_env;
787 PL_top_env = next->cctx->top_env; 872 PL_top_env = next->cctx->top_env;
788 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 873 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
789 } 874 }
790 875
791 free_coro_mortal (); 876 free_coro_mortal (aTHX);
792 UNLOCK; 877 UNLOCK;
793 } 878 }
794} 879}
795 880
796struct transfer_args 881struct transfer_args
797{ 882{
798 struct coro *prev, *next; 883 struct coro *prev, *next;
799}; 884};
800 885
801#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 886#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
887
888/** high level stuff ********************************************************/
802 889
803static int 890static int
804coro_state_destroy (struct coro *coro) 891coro_state_destroy (pTHX_ struct coro *coro)
805{ 892{
806 if (coro->refcnt--)
807 return 0;
808
809 if (coro->flags & CF_DESTROYED) 893 if (coro->flags & CF_DESTROYED)
810 return 0; 894 return 0;
811 895
812 coro->flags |= CF_DESTROYED; 896 coro->flags |= CF_DESTROYED;
897
898 if (coro->flags & CF_READY)
899 {
900 /* reduce nready, as destroying a ready coro effectively unreadies it */
901 /* alternative: look through all ready queues and remove the coro */
902 LOCK;
903 --coro_nready;
904 UNLOCK;
905 }
906 else
907 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
813 908
814 if (coro->mainstack && coro->mainstack != main_mainstack) 909 if (coro->mainstack && coro->mainstack != main_mainstack)
815 { 910 {
911 struct coro temp;
912
816 assert (!(coro->flags & CF_RUNNING)); 913 assert (!(coro->flags & CF_RUNNING));
817 914
818 struct coro temp;
819 Zero (&temp, 1, struct coro); 915 Zero (&temp, 1, struct coro);
820 temp.save = CORO_SAVE_ALL; 916 temp.save = CORO_SAVE_ALL;
821 917
822 if (coro->flags & CF_RUNNING) 918 if (coro->flags & CF_RUNNING)
823 croak ("FATAL: tried to destroy currently running coroutine"); 919 croak ("FATAL: tried to destroy currently running coroutine");
824 920
825 save_perl (&temp); 921 save_perl (aTHX_ &temp);
826 load_perl (coro); 922 load_perl (aTHX_ coro);
827 923
828 coro_destroy_stacks (); 924 coro_destroy_stacks (aTHX);
829 925
830 load_perl (&temp); /* this will get rid of defsv etc.. */ 926 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
831 927
832 coro->mainstack = 0; 928 coro->mainstack = 0;
833 } 929 }
834 930
835 cctx_destroy (coro->cctx); 931 cctx_destroy (coro->cctx);
836 SvREFCNT_dec (coro->args); 932 SvREFCNT_dec (coro->args);
837 933
934 if (coro->next) coro->next->prev = coro->prev;
935 if (coro->prev) coro->prev->next = coro->next;
936 if (coro == coro_first) coro_first = coro->next;
937
838 return 1; 938 return 1;
839} 939}
840 940
841static int 941static int
842coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 942coro_state_free (pTHX_ SV *sv, MAGIC *mg)
843{ 943{
844 struct coro *coro = (struct coro *)mg->mg_ptr; 944 struct coro *coro = (struct coro *)mg->mg_ptr;
845 mg->mg_ptr = 0; 945 mg->mg_ptr = 0;
846 946
947 coro->hv = 0;
948
949 if (--coro->refcnt < 0)
950 {
847 coro_state_destroy (coro); 951 coro_state_destroy (aTHX_ coro);
848
849 if (!coro->refcnt)
850 Safefree (coro); 952 Safefree (coro);
953 }
851 954
852 return 0; 955 return 0;
853} 956}
854 957
855static int 958static int
862 return 0; 965 return 0;
863} 966}
864 967
865static MGVTBL coro_state_vtbl = { 968static MGVTBL coro_state_vtbl = {
866 0, 0, 0, 0, 969 0, 0, 0, 0,
867 coro_state_clear, 970 coro_state_free,
868 0, 971 0,
869#ifdef MGf_DUP 972#ifdef MGf_DUP
870 coro_state_dup, 973 coro_state_dup,
871#else 974#else
872# define MGf_DUP 0 975# define MGf_DUP 0
873#endif 976#endif
874}; 977};
875 978
876static struct coro * 979static struct coro *
877SvSTATE (SV *coro) 980SvSTATE_ (pTHX_ SV *coro)
878{ 981{
879 HV *stash; 982 HV *stash;
880 MAGIC *mg; 983 MAGIC *mg;
881 984
882 if (SvROK (coro)) 985 if (SvROK (coro))
888 /* very slow, but rare, check */ 991 /* very slow, but rare, check */
889 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 992 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
890 croak ("Coro::State object required"); 993 croak ("Coro::State object required");
891 } 994 }
892 995
893 mg = SvMAGIC (coro); 996 mg = CORO_MAGIC (coro);
894 assert (mg->mg_type == PERL_MAGIC_ext);
895 return (struct coro *)mg->mg_ptr; 997 return (struct coro *)mg->mg_ptr;
896} 998}
897 999
1000#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1001
898static void 1002static void
899prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1003prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
900{ 1004{
901 ta->prev = SvSTATE (prev_sv); 1005 ta->prev = SvSTATE (prev_sv);
902 ta->next = SvSTATE (next_sv); 1006 ta->next = SvSTATE (next_sv);
903} 1007}
904 1008
905static void 1009static void
906api_transfer (SV *prev_sv, SV *next_sv) 1010api_transfer (SV *prev_sv, SV *next_sv)
907{ 1011{
1012 dTHX;
908 struct transfer_args ta; 1013 struct transfer_args ta;
909 1014
910 prepare_transfer (&ta, prev_sv, next_sv); 1015 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
911 TRANSFER (ta); 1016 TRANSFER (ta);
912} 1017}
913 1018
914static int 1019static int
915api_save (SV *coro_sv, int new_save) 1020api_save (SV *coro_sv, int new_save)
916{ 1021{
1022 dTHX;
917 struct coro *coro = SvSTATE (coro_sv); 1023 struct coro *coro = SvSTATE (coro_sv);
918 int old_save = coro->save; 1024 int old_save = coro->save;
919 1025
920 if (new_save >= 0) 1026 if (new_save >= 0)
921 coro->save = new_save; 1027 coro->save = new_save;
923 return old_save; 1029 return old_save;
924} 1030}
925 1031
926/** Coro ********************************************************************/ 1032/** Coro ********************************************************************/
927 1033
928#define PRIO_MAX 3
929#define PRIO_HIGH 1
930#define PRIO_NORMAL 0
931#define PRIO_LOW -1
932#define PRIO_IDLE -3
933#define PRIO_MIN -4
934
935/* for Coro.pm */
936static SV *coro_current;
937static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
938static int coro_nready;
939
940static void 1034static void
941coro_enq (SV *coro_sv) 1035coro_enq (pTHX_ SV *coro_sv)
942{ 1036{
943 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1037 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
944 coro_nready++;
945} 1038}
946 1039
947static SV * 1040static SV *
948coro_deq (int min_prio) 1041coro_deq (pTHX_ int min_prio)
949{ 1042{
950 int prio = PRIO_MAX - PRIO_MIN; 1043 int prio = PRIO_MAX - PRIO_MIN;
951 1044
952 min_prio -= PRIO_MIN; 1045 min_prio -= PRIO_MIN;
953 if (min_prio < 0) 1046 if (min_prio < 0)
954 min_prio = 0; 1047 min_prio = 0;
955 1048
956 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1049 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
957 if (AvFILLp (coro_ready [prio]) >= 0) 1050 if (AvFILLp (coro_ready [prio]) >= 0)
958 {
959 coro_nready--;
960 return av_shift (coro_ready [prio]); 1051 return av_shift (coro_ready [prio]);
961 }
962 1052
963 return 0; 1053 return 0;
964} 1054}
965 1055
966static int 1056static int
967api_ready (SV *coro_sv) 1057api_ready (SV *coro_sv)
968{ 1058{
1059 dTHX;
969 struct coro *coro; 1060 struct coro *coro;
970 1061
971 if (SvROK (coro_sv)) 1062 if (SvROK (coro_sv))
972 coro_sv = SvRV (coro_sv); 1063 coro_sv = SvRV (coro_sv);
973 1064
977 return 0; 1068 return 0;
978 1069
979 coro->flags |= CF_READY; 1070 coro->flags |= CF_READY;
980 1071
981 LOCK; 1072 LOCK;
982 coro_enq (SvREFCNT_inc (coro_sv)); 1073 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1074 ++coro_nready;
983 UNLOCK; 1075 UNLOCK;
984 1076
985 return 1; 1077 return 1;
986} 1078}
987 1079
988static int 1080static int
989api_is_ready (SV *coro_sv) 1081api_is_ready (SV *coro_sv)
990{ 1082{
1083 dTHX;
991 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1084 return !!(SvSTATE (coro_sv)->flags & CF_READY);
992} 1085}
993 1086
994static void 1087static void
995prepare_schedule (struct transfer_args *ta) 1088prepare_schedule (pTHX_ struct transfer_args *ta)
996{ 1089{
997 SV *prev_sv, *next_sv; 1090 SV *prev_sv, *next_sv;
998 1091
999 for (;;) 1092 for (;;)
1000 { 1093 {
1001 LOCK; 1094 LOCK;
1002 next_sv = coro_deq (PRIO_MIN); 1095 next_sv = coro_deq (aTHX_ PRIO_MIN);
1003 UNLOCK;
1004 1096
1005 /* nothing to schedule: call the idle handler */ 1097 /* nothing to schedule: call the idle handler */
1006 if (!next_sv) 1098 if (!next_sv)
1007 { 1099 {
1008 dSP; 1100 dSP;
1101 UNLOCK;
1009 1102
1010 ENTER; 1103 ENTER;
1011 SAVETMPS; 1104 SAVETMPS;
1012 1105
1013 PUSHMARK (SP); 1106 PUSHMARK (SP);
1022 ta->next = SvSTATE (next_sv); 1115 ta->next = SvSTATE (next_sv);
1023 1116
1024 /* cannot transfer to destroyed coros, skip and look for next */ 1117 /* cannot transfer to destroyed coros, skip and look for next */
1025 if (ta->next->flags & CF_DESTROYED) 1118 if (ta->next->flags & CF_DESTROYED)
1026 { 1119 {
1120 UNLOCK;
1027 SvREFCNT_dec (next_sv); 1121 SvREFCNT_dec (next_sv);
1122 /* coro_nready is already taken care of by destroy */
1028 continue; 1123 continue;
1029 } 1124 }
1030 1125
1126 --coro_nready;
1127 UNLOCK;
1031 break; 1128 break;
1032 } 1129 }
1033 1130
1034 /* free this only after the transfer */ 1131 /* free this only after the transfer */
1035 prev_sv = SvRV (coro_current); 1132 prev_sv = SvRV (coro_current);
1038 1135
1039 assert (ta->next->flags & CF_READY); 1136 assert (ta->next->flags & CF_READY);
1040 ta->next->flags &= ~CF_READY; 1137 ta->next->flags &= ~CF_READY;
1041 1138
1042 LOCK; 1139 LOCK;
1043 free_coro_mortal (); 1140 free_coro_mortal (aTHX);
1044 coro_mortal = prev_sv; 1141 coro_mortal = prev_sv;
1045 UNLOCK; 1142 UNLOCK;
1046} 1143}
1047 1144
1048static void 1145static void
1049prepare_cede (struct transfer_args *ta) 1146prepare_cede (pTHX_ struct transfer_args *ta)
1050{ 1147{
1051 api_ready (coro_current); 1148 api_ready (coro_current);
1052 prepare_schedule (ta); 1149 prepare_schedule (aTHX_ ta);
1053} 1150}
1054 1151
1055static int 1152static int
1056prepare_cede_notself (struct transfer_args *ta) 1153prepare_cede_notself (pTHX_ struct transfer_args *ta)
1057{ 1154{
1058 if (coro_nready) 1155 if (coro_nready)
1059 { 1156 {
1060 SV *prev = SvRV (coro_current); 1157 SV *prev = SvRV (coro_current);
1061 prepare_schedule (ta); 1158 prepare_schedule (aTHX_ ta);
1062 api_ready (prev); 1159 api_ready (prev);
1063 return 1; 1160 return 1;
1064 } 1161 }
1065 else 1162 else
1066 return 0; 1163 return 0;
1067} 1164}
1068 1165
1069static void 1166static void
1070api_schedule (void) 1167api_schedule (void)
1071{ 1168{
1169 dTHX;
1072 struct transfer_args ta; 1170 struct transfer_args ta;
1073 1171
1074 prepare_schedule (&ta); 1172 prepare_schedule (aTHX_ &ta);
1075 TRANSFER (ta); 1173 TRANSFER (ta);
1076} 1174}
1077 1175
1078static int 1176static int
1079api_cede (void) 1177api_cede (void)
1080{ 1178{
1179 dTHX;
1081 struct transfer_args ta; 1180 struct transfer_args ta;
1082 1181
1083 prepare_cede (&ta); 1182 prepare_cede (aTHX_ &ta);
1084 1183
1085 if (ta.prev != ta.next) 1184 if (ta.prev != ta.next)
1086 { 1185 {
1087 TRANSFER (ta); 1186 TRANSFER (ta);
1088 return 1; 1187 return 1;
1092} 1191}
1093 1192
1094static int 1193static int
1095api_cede_notself (void) 1194api_cede_notself (void)
1096{ 1195{
1196 dTHX;
1097 struct transfer_args ta; 1197 struct transfer_args ta;
1098 1198
1099 if (prepare_cede_notself (&ta)) 1199 if (prepare_cede_notself (aTHX_ &ta))
1100 { 1200 {
1101 TRANSFER (ta); 1201 TRANSFER (ta);
1102 return 1; 1202 return 1;
1103 } 1203 }
1104 else 1204 else
1120 1220
1121 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1221 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1122 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1222 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1123 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1223 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1124 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1224 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1225 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1226 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1125 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1227 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1126 1228
1127 main_mainstack = PL_mainstack; 1229 main_mainstack = PL_mainstack;
1230 main_top_env = PL_top_env;
1231
1232 while (main_top_env->je_prev)
1233 main_top_env = main_top_env->je_prev;
1128 1234
1129 coroapi.ver = CORO_API_VERSION; 1235 coroapi.ver = CORO_API_VERSION;
1130 coroapi.transfer = api_transfer; 1236 coroapi.transfer = api_transfer;
1131 1237
1132 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1238 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1140 HV *hv; 1246 HV *hv;
1141 int i; 1247 int i;
1142 1248
1143 Newz (0, coro, 1, struct coro); 1249 Newz (0, coro, 1, struct coro);
1144 coro->args = newAV (); 1250 coro->args = newAV ();
1145 coro->save = CORO_SAVE_ALL; 1251 coro->save = CORO_SAVE_DEF;
1146 coro->flags = CF_NEW; 1252 coro->flags = CF_NEW;
1147 1253
1254 if (coro_first) coro_first->prev = coro;
1255 coro->next = coro_first;
1256 coro_first = coro;
1257
1148 hv = newHV (); 1258 coro->hv = hv = newHV ();
1149 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1259 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1150 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1260 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1151 1261
1152 for (i = 1; i < items; i++) 1262 for (i = 1; i < items; i++)
1153 av_push (coro->args, newSVsv (ST (i))); 1263 av_push (coro->args, newSVsv (ST (i)));
1157 1267
1158int 1268int
1159save (SV *coro, int new_save = -1) 1269save (SV *coro, int new_save = -1)
1160 CODE: 1270 CODE:
1161 RETVAL = api_save (coro, new_save); 1271 RETVAL = api_save (coro, new_save);
1272 OUTPUT:
1273 RETVAL
1274
1275int
1276save_also (SV *coro_sv, int save_also)
1277 CODE:
1278{
1279 struct coro *coro = SvSTATE (coro_sv);
1280 RETVAL = coro->save;
1281 coro->save |= save_also;
1282}
1162 OUTPUT: 1283 OUTPUT:
1163 RETVAL 1284 RETVAL
1164 1285
1165void 1286void
1166_set_stacklevel (...) 1287_set_stacklevel (...)
1182 1303
1183 case 1: 1304 case 1:
1184 if (items != 2) 1305 if (items != 2)
1185 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1306 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1186 1307
1187 prepare_transfer (&ta, ST (0), ST (1)); 1308 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1188 break; 1309 break;
1189 1310
1190 case 2: 1311 case 2:
1191 prepare_schedule (&ta); 1312 prepare_schedule (aTHX_ &ta);
1192 break; 1313 break;
1193 1314
1194 case 3: 1315 case 3:
1195 prepare_cede (&ta); 1316 prepare_cede (aTHX_ &ta);
1196 break; 1317 break;
1197 1318
1198 case 4: 1319 case 4:
1199 if (!prepare_cede_notself (&ta)) 1320 if (!prepare_cede_notself (aTHX_ &ta))
1200 XSRETURN_EMPTY; 1321 XSRETURN_EMPTY;
1201 1322
1202 break; 1323 break;
1203 } 1324 }
1204 1325
1205 BARRIER; 1326 BARRIER;
1206 TRANSFER (ta); 1327 TRANSFER (ta);
1328
1329 if (GIMME_V != G_VOID && ta.next != ta.prev)
1330 XSRETURN_YES;
1207} 1331}
1208 1332
1209bool 1333bool
1210_destroy (SV *coro_sv) 1334_destroy (SV *coro_sv)
1211 CODE: 1335 CODE:
1212 RETVAL = coro_state_destroy (SvSTATE (coro_sv)); 1336 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1213 OUTPUT: 1337 OUTPUT:
1214 RETVAL 1338 RETVAL
1215 1339
1216void 1340void
1217_exit (code) 1341_exit (code)
1219 PROTOTYPE: $ 1343 PROTOTYPE: $
1220 CODE: 1344 CODE:
1221 _exit (code); 1345 _exit (code);
1222 1346
1223int 1347int
1348cctx_stacksize (int new_stacksize = 0)
1349 CODE:
1350 RETVAL = coro_stacksize;
1351 if (new_stacksize)
1352 coro_stacksize = new_stacksize;
1353 OUTPUT:
1354 RETVAL
1355
1356int
1224cctx_count () 1357cctx_count ()
1225 CODE: 1358 CODE:
1226 RETVAL = cctx_count; 1359 RETVAL = cctx_count;
1227 OUTPUT: 1360 OUTPUT:
1228 RETVAL 1361 RETVAL
1231cctx_idle () 1364cctx_idle ()
1232 CODE: 1365 CODE:
1233 RETVAL = cctx_idle; 1366 RETVAL = cctx_idle;
1234 OUTPUT: 1367 OUTPUT:
1235 RETVAL 1368 RETVAL
1369
1370void
1371list ()
1372 PPCODE:
1373{
1374 struct coro *coro;
1375 for (coro = coro_first; coro; coro = coro->next)
1376 if (coro->hv)
1377 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1378}
1379
1380void
1381_eval (Coro::State coro, SV *coderef)
1382 CODE:
1383{
1384 if (coro->mainstack)
1385 {
1386 struct coro temp;
1387 Zero (&temp, 1, struct coro);
1388 temp.save = CORO_SAVE_ALL;
1389
1390 if (!(coro->flags & CF_RUNNING))
1391 {
1392 save_perl (aTHX_ &temp);
1393 load_perl (aTHX_ coro);
1394 }
1395
1396 {
1397 dSP;
1398 ENTER;
1399 SAVETMPS;
1400 PUSHMARK (SP);
1401 PUTBACK;
1402 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1403 SPAGAIN;
1404 FREETMPS;
1405 LEAVE;
1406 PUTBACK;
1407 }
1408
1409 if (!(coro->flags & CF_RUNNING))
1410 {
1411 save_perl (aTHX_ coro);
1412 load_perl (aTHX_ &temp);
1413 }
1414 }
1415}
1416
1417SV *
1418is_ready (Coro::State coro)
1419 PROTOTYPE: $
1420 ALIAS:
1421 is_ready = CF_READY
1422 is_running = CF_RUNNING
1423 is_new = CF_NEW
1424 is_destroyed = CF_DESTROYED
1425 CODE:
1426 RETVAL = boolSV (coro->flags & ix);
1427 OUTPUT:
1428 RETVAL
1429
1430IV
1431rss (Coro::State coro)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = coro_rss (coro);
1435 OUTPUT:
1436 RETVAL
1437
1236 1438
1237MODULE = Coro::State PACKAGE = Coro 1439MODULE = Coro::State PACKAGE = Coro
1238 1440
1239BOOT: 1441BOOT:
1240{ 1442{
1308 CODE: 1510 CODE:
1309 RETVAL = boolSV (api_ready (self)); 1511 RETVAL = boolSV (api_ready (self));
1310 OUTPUT: 1512 OUTPUT:
1311 RETVAL 1513 RETVAL
1312 1514
1313SV *
1314is_ready (SV *self)
1315 PROTOTYPE: $
1316 CODE:
1317 RETVAL = boolSV (api_is_ready (self));
1318 OUTPUT:
1319 RETVAL
1320
1321int 1515int
1322nready (...) 1516nready (...)
1323 PROTOTYPE: 1517 PROTOTYPE:
1324 CODE: 1518 CODE:
1325 RETVAL = coro_nready; 1519 RETVAL = coro_nready;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines