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.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.335 by root, Thu Dec 4 04:31:41 2008 UTC

55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
137# define INLINE static inline 143# define INLINE static inline
167static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 174static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
172static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 184static SV *rv_diehook;
175static SV *rv_warnhook; 185static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
177 187
178/* async_pool helper stuff */ 188/* async_pool helper stuff */
179static SV *sv_pool_rss; 189static SV *sv_pool_rss;
180static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
182 196
183/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
184static SV *sv_activity; 198static SV *sv_activity;
185 199
186static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
215 int valgrind_id; 229 int valgrind_id;
216#endif 230#endif
217 unsigned char flags; 231 unsigned char flags;
218} coro_cctx; 232} coro_cctx;
219 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
220enum { 238enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
229{ 247{
230 SV *defsv; 248 SV *defsv;
231 AV *defav; 249 AV *defav;
232 SV *errsv; 250 SV *errsv;
233 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
234#define VAR(name,type) type name; 253#define VAR(name,type) type name;
235# include "state.h" 254# include "state.h"
236#undef VAR 255#undef VAR
237} perl_slots; 256} perl_slots;
238 257
263 SV *except; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 283 SV *rouse_cb;
265 284
266 /* async_pool */ 285 /* async_pool */
267 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
268 289
269 /* linked list */ 290 /* linked list */
270 struct coro *next, *prev; 291 struct coro *next, *prev;
271}; 292};
272 293
289 310
290/* for Coro.pm */ 311/* for Coro.pm */
291static SV *coro_current; 312static SV *coro_current;
292static SV *coro_readyhook; 313static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
315static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 316static struct coro *coro_first;
295#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
296 318
297/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
298 320
326 return get_hv (name, create); 348 return get_hv (name, create);
327} 349}
328 350
329/* may croak */ 351/* may croak */
330INLINE CV * 352INLINE CV *
331coro_sv_2cv (SV *sv) 353coro_sv_2cv (pTHX_ SV *sv)
332{ 354{
333 HV *st; 355 HV *st;
334 GV *gvp; 356 GV *gvp;
335 return sv_2cv (sv, &st, &gvp, 0); 357 return sv_2cv (sv, &st, &gvp, 0);
336} 358}
337 359
360/*****************************************************************************/
361/* magic glue */
362
363#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext
365
366#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \
369 : mg_find (sv, type))
370
371#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \
374 : 0)
375
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378
379INLINE struct coro *
380SvSTATE_ (pTHX_ SV *coro)
381{
382 HV *stash;
383 MAGIC *mg;
384
385 if (SvROK (coro))
386 coro = SvRV (coro);
387
388 if (expect_false (SvTYPE (coro) != SVt_PVHV))
389 croak ("Coro::State object required");
390
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr;
401}
402
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404
405/* faster than SvSTATE, but expects a coroutine hv */
406#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408
409/*****************************************************************************/
410/* padlist management and caching */
411
338static AV * 412static AV *
339coro_clone_padlist (pTHX_ CV *cv) 413coro_derive_padlist (pTHX_ CV *cv)
340{ 414{
341 AV *padlist = CvPADLIST (cv); 415 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 416 AV *newpadlist, *newpad;
343 417
344 newpadlist = newAV (); 418 newpadlist = newAV ();
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
350#endif 424#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
352 --AvFILLp (padlist); 426 --AvFILLp (padlist);
353 427
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
355 av_store (newpadlist, 1, (SV *)newpad); 429 av_store (newpadlist, 1, (SV *)newpad);
356 430
357 return newpadlist; 431 return newpadlist;
358} 432}
359 433
360static void 434static void
361free_padlist (pTHX_ AV *padlist) 435free_padlist (pTHX_ AV *padlist)
362{ 436{
363 /* may be during global destruction */ 437 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 438 if (!IN_DESTRUCT)
365 { 439 {
366 I32 i = AvFILLp (padlist); 440 I32 i = AvFILLp (padlist);
367 while (i >= 0) 441
442 while (i > 0) /* special-case index 0 */
368 { 443 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 444 /* we try to be extra-careful here */
370 if (svp) 445 AV *av = (AV *)AvARRAY (padlist)[i--];
371 { 446 I32 j = AvFILLp (av);
372 SV *sv; 447
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 448 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]);
450
451 AvFILLp (av) = -1;
374 SvREFCNT_dec (sv); 452 SvREFCNT_dec (av);
375
376 SvREFCNT_dec (*svp);
377 }
378 } 453 }
379 454
455 SvREFCNT_dec (AvARRAY (padlist)[0]);
456
457 AvFILLp (padlist) = -1;
380 SvREFCNT_dec ((SV*)padlist); 458 SvREFCNT_dec ((SV*)padlist);
381 } 459 }
382} 460}
383 461
384static int 462static int
393 471
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 473
396 return 0; 474 return 0;
397} 475}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 476
402static MGVTBL coro_cv_vtbl = { 477static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 478 0, 0, 0, 0,
404 coro_cv_free 479 coro_cv_free
405}; 480};
406
407#define CORO_MAGIC_NN(sv, type) \
408 (expect_true (SvMAGIC (sv)->mg_type == type) \
409 ? SvMAGIC (sv) \
410 : mg_find (sv, type))
411
412#define CORO_MAGIC(sv, type) \
413 (expect_true (SvMAGIC (sv)) \
414 ? CORO_MAGIC_NN (sv, type) \
415 : 0)
416
417#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
418#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
419
420INLINE struct coro *
421SvSTATE_ (pTHX_ SV *coro)
422{
423 HV *stash;
424 MAGIC *mg;
425
426 if (SvROK (coro))
427 coro = SvRV (coro);
428
429 if (expect_false (SvTYPE (coro) != SVt_PVHV))
430 croak ("Coro::State object required");
431
432 stash = SvSTASH (coro);
433 if (expect_false (stash != coro_stash && stash != coro_state_stash))
434 {
435 /* very slow, but rare, check */
436 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
437 croak ("Coro::State object required");
438 }
439
440 mg = CORO_MAGIC_state (coro);
441 return (struct coro *)mg->mg_ptr;
442}
443
444#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
445
446/* faster than SvSTATE, but expects a coroutine hv */
447#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
448#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
449 481
450/* the next two functions merely cache the padlists */ 482/* the next two functions merely cache the padlists */
451static void 483static void
452get_padlist (pTHX_ CV *cv) 484get_padlist (pTHX_ CV *cv)
453{ 485{
464 CV *cp = Perl_cv_clone (aTHX_ cv); 496 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 497 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 498 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 499 SvREFCNT_dec (cp);
468#else 500#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 502#endif
471 } 503 }
472} 504}
473 505
474static void 506static void
481 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 513 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
482 514
483 av = (AV *)mg->mg_obj; 515 av = (AV *)mg->mg_obj;
484 516
485 if (expect_false (AvFILLp (av) >= AvMAX (av))) 517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1); 518 av_extend (av, AvFILLp (av) + 1);
487 519
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 521}
490 522
491/** load & save, init *******************************************************/ 523/** load & save, init *******************************************************/
496 perl_slots *slot = c->slot; 528 perl_slots *slot = c->slot;
497 c->slot = 0; 529 c->slot = 0;
498 530
499 PL_mainstack = c->mainstack; 531 PL_mainstack = c->mainstack;
500 532
501 GvSV (PL_defgv) = slot->defsv; 533 GvSV (PL_defgv) = slot->defsv;
502 GvAV (PL_defgv) = slot->defav; 534 GvAV (PL_defgv) = slot->defav;
503 GvSV (PL_errgv) = slot->errsv; 535 GvSV (PL_errgv) = slot->errsv;
504 GvSV (irsgv) = slot->irsgv; 536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
505 538
506 #define VAR(name,type) PL_ ## name = slot->name; 539 #define VAR(name,type) PL_ ## name = slot->name;
507 # include "state.h" 540 # include "state.h"
508 #undef VAR 541 #undef VAR
509 542
595 c->mainstack = PL_mainstack; 628 c->mainstack = PL_mainstack;
596 629
597 { 630 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 632
600 slot->defav = GvAV (PL_defgv); 633 slot->defav = GvAV (PL_defgv);
601 slot->defsv = DEFSV; 634 slot->defsv = DEFSV;
602 slot->errsv = ERRSV; 635 slot->errsv = ERRSV;
603 slot->irsgv = GvSV (irsgv); 636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
604 638
605 #define VAR(name,type) slot->name = PL_ ## name; 639 #define VAR(name,type) slot->name = PL_ ## name;
606 # include "state.h" 640 # include "state.h"
607 #undef VAR 641 #undef VAR
608 } 642 }
686#if !PERL_VERSION_ATLEAST (5,10,0) 720#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 721 Safefree (PL_retstack);
688#endif 722#endif
689} 723}
690 724
725#define CORO_RSS \
726 rss += sizeof (SYM (curstackinfo)); \
727 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
728 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
729 rss += SYM (tmps_max) * sizeof (SV *); \
730 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
731 rss += SYM (scopestack_max) * sizeof (I32); \
732 rss += SYM (savestack_max) * sizeof (ANY);
733
691static size_t 734static size_t
692coro_rss (pTHX_ struct coro *coro) 735coro_rss (pTHX_ struct coro *coro)
693{ 736{
694 size_t rss = sizeof (*coro); 737 size_t rss = sizeof (*coro);
695 738
696 if (coro->mainstack) 739 if (coro->mainstack)
697 { 740 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 741 if (coro->flags & CF_RUNNING)
702 { 742 {
703 slot = &tmp_slot; 743 #define SYM(sym) PL_ ## sym
704 744 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 745 #undef SYM
708 } 746 }
709 else 747 else
710 slot = coro->slot;
711
712 if (slot)
713 { 748 {
714 rss += sizeof (slot->curstackinfo); 749 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 750 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 751 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 752 }
726 } 753 }
727 754
728 return rss; 755 return rss;
729} 756}
831slf_check_nop (pTHX_ struct CoroSLF *frame) 858slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 859{
833 return 0; 860 return 0;
834} 861}
835 862
863static int
864slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{
866 return 1;
867}
868
836static UNOP coro_setup_op; 869static UNOP coro_setup_op;
837 870
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 871static void NOINLINE /* noinline to keep it out of the transfer fast path */
839coro_setup (pTHX_ struct coro *coro) 872coro_setup (pTHX_ struct coro *coro)
840{ 873{
845 878
846 PL_runops = RUNOPS_DEFAULT; 879 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 880 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 881 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 882 PL_comppad = 0;
883 PL_comppad_name = 0;
884 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 886 PL_curpm = 0;
851 PL_curpad = 0; 887 PL_curpad = 0;
852 PL_localizing = 0; 888 PL_localizing = 0;
853 PL_dirty = 0; 889 PL_dirty = 0;
854 PL_restartop = 0; 890 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 891#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 892 PL_parser = 0;
857#endif 893#endif
894 PL_hints = 0;
858 895
859 /* recreate the die/warn hooks */ 896 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 899
863 GvSV (PL_defgv) = newSV (0); 900 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 901 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 902 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 905 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 907
870 { 908 {
871 dSP; 909 dSP;
872 UNOP myop; 910 UNOP myop;
873 911
874 Zero (&myop, 1, UNOP); 912 Zero (&myop, 1, UNOP);
875 myop.op_next = Nullop; 913 myop.op_next = Nullop;
914 myop.op_type = OP_ENTERSUB;
876 myop.op_flags = OPf_WANT_VOID; 915 myop.op_flags = OPf_WANT_VOID;
877 916
878 PUSHMARK (SP); 917 PUSHMARK (SP);
879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 918 PUSHs ((SV *)coro->startcv);
880 PUTBACK; 919 PUTBACK;
881 PL_op = (OP *)&myop; 920 PL_op = (OP *)&myop;
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 921 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN;
884 } 922 }
885 923
886 /* this newly created coroutine might be run on an existing cctx which most 924 /* this newly created coroutine might be run on an existing cctx which most
887 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 925 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 */ 926 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 929
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 931 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 932 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 933 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags required, as an init function won't be called */ 934 /* no flags etc. required, as an init function won't be called */
897 935
898 PL_op = (OP *)&coro_setup_op; 936 PL_op = (OP *)&coro_setup_op;
899 937
900 /* copy throw, in case it was set before coro_setup */ 938 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 939 CORO_THROW = coro->except;
902} 940}
903 941
904static void 942static void
905coro_destruct (pTHX_ struct coro *coro) 943coro_destruct_perl (pTHX_ struct coro *coro)
906{ 944{
907 if (!IN_DESTRUCT) 945 if (!IN_DESTRUCT)
908 { 946 {
909 /* restore all saved variables and stuff */ 947 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 948 LEAVE_SCOPE (0);
925 SvREFCNT_dec (GvAV (PL_defgv)); 963 SvREFCNT_dec (GvAV (PL_defgv));
926 SvREFCNT_dec (GvSV (PL_errgv)); 964 SvREFCNT_dec (GvSV (PL_errgv));
927 SvREFCNT_dec (PL_defoutgv); 965 SvREFCNT_dec (PL_defoutgv);
928 SvREFCNT_dec (PL_rs); 966 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv)); 967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
930 969
931 SvREFCNT_dec (PL_diehook); 970 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook); 971 SvREFCNT_dec (PL_warnhook);
933 972
934 SvREFCNT_dec (CORO_THROW);
935 SvREFCNT_dec (coro->saved_deffh); 973 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 974 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av);
937 977
938 coro_destruct_stacks (aTHX); 978 coro_destruct_stacks (aTHX);
939} 979}
940 980
941INLINE void 981INLINE void
951static int 991static int
952runops_trace (pTHX) 992runops_trace (pTHX)
953{ 993{
954 COP *oldcop = 0; 994 COP *oldcop = 0;
955 int oldcxix = -2; 995 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 996
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 997 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 998 {
961 PERL_ASYNC_CHECK (); 999 PERL_ASYNC_CHECK ();
962 1000
963 if (cctx->flags & CC_TRACE_ALL) 1001 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1002 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1003 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1004 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1005 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1006 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1007 AV *av = newAV (); /* return values */
970 SV **cb; 1008 SV **cb;
1007 1045
1008 if (PL_curcop != &PL_compiling) 1046 if (PL_curcop != &PL_compiling)
1009 { 1047 {
1010 SV **cb; 1048 SV **cb;
1011 1049
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1050 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1051 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1052 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1053
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1054 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1055 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1056 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1057 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1058 SV *fullname = sv_2mortal (newSV (0));
1022 1059
1023 if (isGV (gv)) 1060 if (isGV (gv))
1041 } 1078 }
1042 1079
1043 oldcxix = cxstack_ix; 1080 oldcxix = cxstack_ix;
1044 } 1081 }
1045 1082
1046 if (cctx->flags & CC_TRACE_LINE) 1083 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1084 {
1048 dSP; 1085 dSP;
1049 1086
1050 PL_runops = RUNOPS_DEFAULT; 1087 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1088 ENTER;
1070 1107
1071 TAINT_NOT; 1108 TAINT_NOT;
1072 return 0; 1109 return 0;
1073} 1110}
1074 1111
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1112static struct CoroSLF cctx_ssl_frame;
1077 1113
1078static void 1114static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1115slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1116{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1117 ta->prev = 0;
1083} 1118}
1084 1119
1085static int 1120static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1121slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1122{
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1125 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1126}
1092 1127
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1128/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1129static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1130cctx_prepare (pTHX)
1096{ 1131{
1097 PL_top_env = &PL_start_env; 1132 PL_top_env = &PL_start_env;
1098 1133
1099 if (cctx->flags & CC_TRACE) 1134 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1135 PL_runops = runops_trace;
1101 1136
1102 /* we already must be executing an SLF op, there is no other valid way 1137 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1138 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1139 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1140 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1141
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1142 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1143 cctx_ssl_frame = slf_frame;
1110 1144
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1145 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1146 slf_frame.check = slf_check_set_stacklevel;
1113} 1147}
1136 /* normally we would need to skip the entersub here */ 1170 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1171 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1172 /* PL_nop = PL_nop->op_next */
1139 1173
1140 /* inject a fake subroutine call to cctx_init */ 1174 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1175 cctx_prepare (aTHX);
1142 1176
1143 /* cctx_run is the alternative tail of transfer() */ 1177 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1178 transfer_tail (aTHX);
1145 1179
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1180 /* somebody or something will hit me for both perl_run and PL_restartop */
1147 PL_restartop = PL_op; 1181 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1182 perl_run (PL_curinterp);
1183 /*
1184 * Unfortunately, there is no way to get at the return values of the
1185 * coro body here, as perl_run destroys these
1186 */
1149 1187
1150 /* 1188 /*
1151 * If perl-run returns we assume exit() was being called or the coro 1189 * If perl-run returns we assume exit() was being called or the coro
1152 * fell off the end, which seems to be the only valid (non-bug) 1190 * fell off the end, which seems to be the only valid (non-bug)
1153 * reason for perl_run to return. We try to exit by jumping to the 1191 * reason for perl_run to return. We try to exit by jumping to the
1154 * bootstrap-time "top" top_env, as we cannot restore the "main" 1192 * bootstrap-time "top" top_env, as we cannot restore the "main"
1155 * coroutine as Coro has no such concept 1193 * coroutine as Coro has no such concept.
1194 * This actually isn't valid with the pthread backend, but OSes requiring
1195 * that backend are too broken to do it in a standards-compliant way.
1156 */ 1196 */
1157 PL_top_env = main_top_env; 1197 PL_top_env = main_top_env;
1158 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1159 } 1199 }
1160} 1200}
1237cctx_destroy (coro_cctx *cctx) 1277cctx_destroy (coro_cctx *cctx)
1238{ 1278{
1239 if (!cctx) 1279 if (!cctx)
1240 return; 1280 return;
1241 1281
1282 assert (cctx != cctx_current);//D temporary
1283
1242 --cctx_count; 1284 --cctx_count;
1243 coro_destroy (&cctx->cctx); 1285 coro_destroy (&cctx->cctx);
1244 1286
1245 /* coro_transfer creates new, empty cctx's */ 1287 /* coro_transfer creates new, empty cctx's */
1246 if (cctx->sptr) 1288 if (cctx->sptr)
1309 /* TODO: throwing up here is considered harmful */ 1351 /* TODO: throwing up here is considered harmful */
1310 1352
1311 if (expect_true (prev != next)) 1353 if (expect_true (prev != next))
1312 { 1354 {
1313 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1314 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1315 1357
1316 if (expect_false (next->flags & CF_RUNNING)) 1358 if (expect_false (next->flags & CF_RUNNING))
1317 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1318 1360
1319 if (expect_false (next->flags & CF_DESTROYED)) 1361 if (expect_false (next->flags & CF_DESTROYED))
1331transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1332{ 1374{
1333 dSTACKLEVEL; 1375 dSTACKLEVEL;
1334 1376
1335 /* sometimes transfer is only called to set idle_sp */ 1377 /* sometimes transfer is only called to set idle_sp */
1336 if (expect_false (!next)) 1378 if (expect_false (!prev))
1337 { 1379 {
1338 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1380 cctx_current->idle_sp = STACKLEVEL;
1339 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1340 } 1382 }
1341 else if (expect_true (prev != next)) 1383 else if (expect_true (prev != next))
1342 { 1384 {
1343 coro_cctx *prev__cctx; 1385 coro_cctx *cctx_prev;
1344 1386
1345 if (expect_false (prev->flags & CF_NEW)) 1387 if (expect_false (prev->flags & CF_NEW))
1346 { 1388 {
1347 /* create a new empty/source context */ 1389 /* create a new empty/source context */
1348 prev->cctx = cctx_new_empty ();
1349 prev->flags &= ~CF_NEW; 1390 prev->flags &= ~CF_NEW;
1350 prev->flags |= CF_RUNNING; 1391 prev->flags |= CF_RUNNING;
1351 } 1392 }
1352 1393
1353 prev->flags &= ~CF_RUNNING; 1394 prev->flags &= ~CF_RUNNING;
1364 coro_setup (aTHX_ next); 1405 coro_setup (aTHX_ next);
1365 } 1406 }
1366 else 1407 else
1367 load_perl (aTHX_ next); 1408 load_perl (aTHX_ next);
1368 1409
1369 prev__cctx = prev->cctx; 1410 assert (!prev->cctx);//D temporary
1370 1411
1371 /* possibly untie and reuse the cctx */ 1412 /* possibly untie and reuse the cctx */
1372 if (expect_true ( 1413 if (expect_true (
1373 prev__cctx->idle_sp == STACKLEVEL 1414 cctx_current->idle_sp == STACKLEVEL
1374 && !(prev__cctx->flags & CC_TRACE) 1415 && !(cctx_current->flags & CC_TRACE)
1375 && !force_cctx 1416 && !force_cctx
1376 )) 1417 ))
1377 { 1418 {
1378 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1419 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1379 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1420 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1380 1421
1381 prev->cctx = 0;
1382
1383 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1422 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1384 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1423 /* without this the next cctx_get might destroy the running cctx while still in use */
1385 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1424 if (expect_false (CCTX_EXPIRED (cctx_current)))
1386 if (!next->cctx) 1425 if (expect_true (!next->cctx))
1387 next->cctx = cctx_get (aTHX); 1426 next->cctx = cctx_get (aTHX);
1388 1427
1389 cctx_put (prev__cctx); 1428 cctx_put (cctx_current);
1390 } 1429 }
1430 else
1431 prev->cctx = cctx_current;
1391 1432
1392 ++next->usecount; 1433 ++next->usecount;
1393 1434
1394 if (expect_true (!next->cctx)) 1435 cctx_prev = cctx_current;
1395 next->cctx = cctx_get (aTHX); 1436 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1396 1437
1397 if (expect_false (prev__cctx != next->cctx)) 1438 next->cctx = 0;
1439
1440 if (expect_false (cctx_prev != cctx_current))
1398 { 1441 {
1399 prev__cctx->top_env = PL_top_env; 1442 cctx_prev->top_env = PL_top_env;
1400 PL_top_env = next->cctx->top_env; 1443 PL_top_env = cctx_current->top_env;
1401 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1444 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1402 } 1445 }
1403 1446
1404 transfer_tail (aTHX); 1447 transfer_tail (aTHX);
1405 } 1448 }
1406} 1449}
1428 --coro_nready; 1471 --coro_nready;
1429 } 1472 }
1430 else 1473 else
1431 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1432 1475
1433 if (coro->mainstack && coro->mainstack != main_mainstack) 1476 if (coro->mainstack
1477 && coro->mainstack != main_mainstack
1478 && !PL_dirty)
1434 { 1479 {
1435 struct coro temp; 1480 struct coro temp;
1436 1481
1437 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1482 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1438 1483
1439 save_perl (aTHX_ &temp); 1484 save_perl (aTHX_ &temp);
1440 load_perl (aTHX_ coro); 1485 load_perl (aTHX_ coro);
1441 1486
1442 coro_destruct (aTHX_ coro); 1487 coro_destruct_perl (aTHX_ coro);
1443 1488
1444 load_perl (aTHX_ &temp); 1489 load_perl (aTHX_ &temp);
1445 1490
1446 coro->slot = 0; 1491 coro->slot = 0;
1447 } 1492 }
1448 1493
1449 cctx_destroy (coro->cctx); 1494 cctx_destroy (coro->cctx);
1450 SvREFCNT_dec (coro->startcv); 1495 SvREFCNT_dec (coro->startcv);
1451 SvREFCNT_dec (coro->args); 1496 SvREFCNT_dec (coro->args);
1497 SvREFCNT_dec (CORO_THROW);
1452 1498
1453 if (coro->next) coro->next->prev = coro->prev; 1499 if (coro->next) coro->next->prev = coro->prev;
1454 if (coro->prev) coro->prev->next = coro->next; 1500 if (coro->prev) coro->prev->next = coro->next;
1455 if (coro == coro_first) coro_first = coro->next; 1501 if (coro == coro_first) coro_first = coro->next;
1456 1502
1560{ 1606{
1561 struct coro *coro; 1607 struct coro *coro;
1562 SV *sv_hook; 1608 SV *sv_hook;
1563 void (*xs_hook)(void); 1609 void (*xs_hook)(void);
1564 1610
1565 if (SvROK (coro_sv))
1566 coro_sv = SvRV (coro_sv);
1567
1568 coro = SvSTATE (coro_sv); 1611 coro = SvSTATE (coro_sv);
1569 1612
1570 if (coro->flags & CF_READY) 1613 if (coro->flags & CF_READY)
1571 return 0; 1614 return 0;
1572 1615
1603api_is_ready (pTHX_ SV *coro_sv) 1646api_is_ready (pTHX_ SV *coro_sv)
1604{ 1647{
1605 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1648 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606} 1649}
1607 1650
1651/* expects to own a reference to next->hv */
1608INLINE void 1652INLINE void
1609prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1653prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1610{ 1654{
1611 SV *prev_sv, *next_sv;
1612
1613 for (;;)
1614 {
1615 next_sv = coro_deq (aTHX);
1616
1617 /* nothing to schedule: call the idle handler */
1618 if (expect_false (!next_sv))
1619 {
1620 dSP;
1621
1622 ENTER;
1623 SAVETMPS;
1624
1625 PUSHMARK (SP);
1626 PUTBACK;
1627 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1628
1629 FREETMPS;
1630 LEAVE;
1631 continue;
1632 }
1633
1634 ta->next = SvSTATE_hv (next_sv);
1635
1636 /* cannot transfer to destroyed coros, skip and look for next */
1637 if (expect_false (ta->next->flags & CF_DESTROYED))
1638 {
1639 SvREFCNT_dec (next_sv);
1640 /* coro_nready has already been taken care of by destroy */
1641 continue;
1642 }
1643
1644 --coro_nready;
1645 break;
1646 }
1647
1648 /* free this only after the transfer */
1649 prev_sv = SvRV (coro_current); 1655 SV *prev_sv = SvRV (coro_current);
1656
1650 ta->prev = SvSTATE_hv (prev_sv); 1657 ta->prev = SvSTATE_hv (prev_sv);
1658 ta->next = next;
1659
1651 TRANSFER_CHECK (*ta); 1660 TRANSFER_CHECK (*ta);
1652 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1661
1653 ta->next->flags &= ~CF_READY;
1654 SvRV_set (coro_current, next_sv); 1662 SvRV_set (coro_current, (SV *)next->hv);
1655 1663
1656 free_coro_mortal (aTHX); 1664 free_coro_mortal (aTHX);
1657 coro_mortal = prev_sv; 1665 coro_mortal = prev_sv;
1658} 1666}
1659 1667
1668static void
1669prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1670{
1671 for (;;)
1672 {
1673 SV *next_sv = coro_deq (aTHX);
1674
1675 if (expect_true (next_sv))
1676 {
1677 struct coro *next = SvSTATE_hv (next_sv);
1678
1679 /* cannot transfer to destroyed coros, skip and look for next */
1680 if (expect_false (next->flags & CF_DESTROYED))
1681 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1682 else
1683 {
1684 next->flags &= ~CF_READY;
1685 --coro_nready;
1686
1687 prepare_schedule_to (aTHX_ ta, next);
1688 break;
1689 }
1690 }
1691 else
1692 {
1693 /* nothing to schedule: call the idle handler */
1694 if (SvROK (sv_idle)
1695 && SvOBJECT (SvRV (sv_idle)))
1696 {
1697 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1698 api_ready (aTHX_ SvRV (sv_idle));
1699 --coro_nready;
1700 }
1701 else
1702 {
1703 dSP;
1704
1705 ENTER;
1706 SAVETMPS;
1707
1708 PUSHMARK (SP);
1709 PUTBACK;
1710 call_sv (sv_idle, G_VOID | G_DISCARD);
1711
1712 FREETMPS;
1713 LEAVE;
1714 }
1715 }
1716 }
1717}
1718
1660INLINE void 1719INLINE void
1661prepare_cede (pTHX_ struct coro_transfer_args *ta) 1720prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662{ 1721{
1663 api_ready (aTHX_ coro_current); 1722 api_ready (aTHX_ coro_current);
1664 prepare_schedule (aTHX_ ta); 1723 prepare_schedule (aTHX_ ta);
1683{ 1742{
1684 struct coro_transfer_args ta; 1743 struct coro_transfer_args ta;
1685 1744
1686 prepare_schedule (aTHX_ &ta); 1745 prepare_schedule (aTHX_ &ta);
1687 TRANSFER (ta, 1); 1746 TRANSFER (ta, 1);
1747}
1748
1749static void
1750api_schedule_to (pTHX_ SV *coro_sv)
1751{
1752 struct coro_transfer_args ta;
1753 struct coro *next = SvSTATE (coro_sv);
1754
1755 SvREFCNT_inc_NN (coro_sv);
1756 prepare_schedule_to (aTHX_ &ta, next);
1688} 1757}
1689 1758
1690static int 1759static int
1691api_cede (pTHX) 1760api_cede (pTHX)
1692{ 1761{
1721static void 1790static void
1722api_trace (pTHX_ SV *coro_sv, int flags) 1791api_trace (pTHX_ SV *coro_sv, int flags)
1723{ 1792{
1724 struct coro *coro = SvSTATE (coro_sv); 1793 struct coro *coro = SvSTATE (coro_sv);
1725 1794
1795 if (coro->flags & CF_RUNNING)
1796 croak ("cannot enable tracing on a running coroutine, caught");
1797
1726 if (flags & CC_TRACE) 1798 if (flags & CC_TRACE)
1727 { 1799 {
1728 if (!coro->cctx) 1800 if (!coro->cctx)
1729 coro->cctx = cctx_new_run (); 1801 coro->cctx = cctx_new_run ();
1730 else if (!(coro->cctx->flags & CC_TRACE)) 1802 else if (!(coro->cctx->flags & CC_TRACE))
1731 croak ("cannot enable tracing on coroutine with custom stack,"); 1803 croak ("cannot enable tracing on coroutine with custom stack, caught");
1732 1804
1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1805 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1734 } 1806 }
1735 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1807 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1736 { 1808 {
1741 else 1813 else
1742 coro->slot->runops = RUNOPS_DEFAULT; 1814 coro->slot->runops = RUNOPS_DEFAULT;
1743 } 1815 }
1744} 1816}
1745 1817
1818static void
1819coro_call_on_destroy (pTHX_ struct coro *coro)
1820{
1821 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1822 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1823
1824 if (on_destroyp)
1825 {
1826 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1827
1828 while (AvFILLp (on_destroy) >= 0)
1829 {
1830 dSP; /* don't disturb outer sp */
1831 SV *cb = av_pop (on_destroy);
1832
1833 PUSHMARK (SP);
1834
1835 if (statusp)
1836 {
1837 int i;
1838 AV *status = (AV *)SvRV (*statusp);
1839 EXTEND (SP, AvFILLp (status) + 1);
1840
1841 for (i = 0; i <= AvFILLp (status); ++i)
1842 PUSHs (AvARRAY (status)[i]);
1843 }
1844
1845 PUTBACK;
1846 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1847 }
1848 }
1849}
1850
1851static void
1852slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1853{
1854 int i;
1855 HV *hv = (HV *)SvRV (coro_current);
1856 AV *av = newAV ();
1857
1858 av_extend (av, items - 1);
1859 for (i = 0; i < items; ++i)
1860 av_push (av, SvREFCNT_inc_NN (arg [i]));
1861
1862 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1863
1864 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1865 api_ready (aTHX_ sv_manager);
1866
1867 frame->prepare = prepare_schedule;
1868 frame->check = slf_check_repeat;
1869}
1870
1871/*****************************************************************************/
1872/* async pool handler */
1873
1874static int
1875slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1876{
1877 HV *hv = (HV *)SvRV (coro_current);
1878 struct coro *coro = (struct coro *)frame->data;
1879
1880 if (!coro->invoke_cb)
1881 return 1; /* loop till we have invoke */
1882 else
1883 {
1884 hv_store (hv, "desc", sizeof ("desc") - 1,
1885 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1886
1887 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1888
1889 {
1890 dSP;
1891 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1892 PUTBACK;
1893 }
1894
1895 SvREFCNT_dec (GvAV (PL_defgv));
1896 GvAV (PL_defgv) = coro->invoke_av;
1897 coro->invoke_av = 0;
1898
1899 return 0;
1900 }
1901}
1902
1903static void
1904slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1905{
1906 HV *hv = (HV *)SvRV (coro_current);
1907 struct coro *coro = SvSTATE_hv ((SV *)hv);
1908
1909 if (expect_true (coro->saved_deffh))
1910 {
1911 /* subsequent iteration */
1912 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1913 coro->saved_deffh = 0;
1914
1915 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1916 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1917 {
1918 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1919 coro->invoke_av = newAV ();
1920
1921 frame->prepare = prepare_nop;
1922 }
1923 else
1924 {
1925 av_clear (GvAV (PL_defgv));
1926 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1927
1928 coro->prio = 0;
1929
1930 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1931 api_trace (aTHX_ coro_current, 0);
1932
1933 frame->prepare = prepare_schedule;
1934 av_push (av_async_pool, SvREFCNT_inc (hv));
1935 }
1936 }
1937 else
1938 {
1939 /* first iteration, simply fall through */
1940 frame->prepare = prepare_nop;
1941 }
1942
1943 frame->check = slf_check_pool_handler;
1944 frame->data = (void *)coro;
1945}
1946
1746/*****************************************************************************/ 1947/*****************************************************************************/
1747/* rouse callback */ 1948/* rouse callback */
1748 1949
1749#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1950#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750 1951
1755 SV *data = (SV *)GENSUB_ARG; 1956 SV *data = (SV *)GENSUB_ARG;
1756 1957
1757 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1958 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758 { 1959 {
1759 /* first call, set args */ 1960 /* first call, set args */
1760 int i;
1761 AV *av = newAV (); 1961 AV *av = newAV ();
1762 SV *coro = SvRV (data); 1962 SV *coro = SvRV (data);
1763 1963
1764 SvRV_set (data, (SV *)av); 1964 SvRV_set (data, (SV *)av);
1765 api_ready (aTHX_ coro); 1965 api_ready (aTHX_ coro);
1906static void 2106static void
1907slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2107slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1908{ 2108{
1909 frame->prepare = prepare_schedule; 2109 frame->prepare = prepare_schedule;
1910 frame->check = slf_check_nop; 2110 frame->check = slf_check_nop;
2111}
2112
2113static void
2114slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2115{
2116 struct coro *next = (struct coro *)slf_frame.data;
2117
2118 SvREFCNT_inc_NN (next->hv);
2119 prepare_schedule_to (aTHX_ ta, next);
2120}
2121
2122static void
2123slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2124{
2125 if (!items)
2126 croak ("Coro::schedule_to expects a coroutine argument, caught");
2127
2128 frame->data = (void *)SvSTATE (arg [0]);
2129 frame->prepare = slf_prepare_schedule_to;
2130 frame->check = slf_check_nop;
2131}
2132
2133static void
2134slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2135{
2136 api_ready (aTHX_ SvRV (coro_current));
2137
2138 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1911} 2139}
1912 2140
1913static void 2141static void
1914slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2142slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{ 2143{
2061 } 2289 }
2062 else 2290 else
2063 slf_argc = 0; 2291 slf_argc = 0;
2064 2292
2065 PL_op->op_ppaddr = pp_slf; 2293 PL_op->op_ppaddr = pp_slf;
2066 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2294 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2067 2295
2068 PL_op = (OP *)&slf_restore; 2296 PL_op = (OP *)&slf_restore;
2069} 2297}
2070 2298
2071/*****************************************************************************/ 2299/*****************************************************************************/
2154 SV **ary; 2382 SV **ary;
2155 2383
2156 /* unfortunately, building manually saves memory */ 2384 /* unfortunately, building manually saves memory */
2157 Newx (ary, 2, SV *); 2385 Newx (ary, 2, SV *);
2158 AvALLOC (av) = ary; 2386 AvALLOC (av) = ary;
2387#if PERL_VERSION_ATLEAST (5,10,0)
2159 /*AvARRAY (av) = ary;*/ 2388 AvARRAY (av) = ary;
2389#else
2160 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2390 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2391 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2392 SvPVX ((SV *)av) = (char *)ary;
2393#endif
2161 AvMAX (av) = 1; 2394 AvMAX (av) = 1;
2162 AvFILLp (av) = 0; 2395 AvFILLp (av) = 0;
2163 ary [0] = newSViv (count); 2396 ary [0] = newSViv (count);
2164 2397
2165 return newRV_noinc ((SV *)av); 2398 return newRV_noinc ((SV *)av);
2294{ 2527{
2295 if (items >= 2) 2528 if (items >= 2)
2296 { 2529 {
2297 /* callback form */ 2530 /* callback form */
2298 AV *av = (AV *)SvRV (arg [0]); 2531 AV *av = (AV *)SvRV (arg [0]);
2299 CV *cb_cv = coro_sv_2cv (arg [1]); 2532 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2300 2533
2301 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2534 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2302 2535
2303 if (SvIVX (AvARRAY (av)[0]) > 0) 2536 if (SvIVX (AvARRAY (av)[0]) > 0)
2304 coro_semaphore_adjust (aTHX_ av, 0); 2537 coro_semaphore_adjust (aTHX_ av, 0);
2390 dXSARGS; 2623 dXSARGS;
2391 AV *state = (AV *)GENSUB_ARG; 2624 AV *state = (AV *)GENSUB_ARG;
2392 SV *coro = av_pop (state); 2625 SV *coro = av_pop (state);
2393 SV *data_sv = newSV (sizeof (struct io_state)); 2626 SV *data_sv = newSV (sizeof (struct io_state));
2394 2627
2395 av_extend (state, items); 2628 av_extend (state, items - 1);
2396 2629
2397 sv_upgrade (data_sv, SVt_PV); 2630 sv_upgrade (data_sv, SVt_PV);
2398 SvCUR_set (data_sv, sizeof (struct io_state)); 2631 SvCUR_set (data_sv, sizeof (struct io_state));
2399 SvPOK_only (data_sv); 2632 SvPOK_only (data_sv);
2400 2633
2535 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2536} 2769}
2537 2770
2538/*****************************************************************************/ 2771/*****************************************************************************/
2539 2772
2773#if CORO_CLONE
2774# include "clone.c"
2775#endif
2776
2540MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2777MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2541 2778
2542PROTOTYPES: DISABLE 2779PROTOTYPES: DISABLE
2543 2780
2544BOOT: 2781BOOT:
2548 coro_thx = PERL_GET_CONTEXT; 2785 coro_thx = PERL_GET_CONTEXT;
2549# endif 2786# endif
2550#endif 2787#endif
2551 BOOT_PAGESIZE; 2788 BOOT_PAGESIZE;
2552 2789
2790 cctx_current = cctx_new_empty ();
2791
2553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2792 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2793 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2555 2794
2556 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2795 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2557 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2796 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2576 2815
2577 { 2816 {
2578 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2817 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579 2818
2580 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2819 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581 hv_store_ent (PL_custom_op_names, slf, 2820 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582 newSVpv ("coro_slf", 0), 0);
2583 2821
2584 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2822 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585 hv_store_ent (PL_custom_op_descs, slf, 2823 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586 newSVpv ("coro schedule like function", 0), 0);
2587 } 2824 }
2588 2825
2589 coroapi.ver = CORO_API_VERSION; 2826 coroapi.ver = CORO_API_VERSION;
2590 coroapi.rev = CORO_API_REVISION; 2827 coroapi.rev = CORO_API_REVISION;
2591 2828
2610 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2847 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2611} 2848}
2612 2849
2613SV * 2850SV *
2614new (char *klass, ...) 2851new (char *klass, ...)
2852 ALIAS:
2853 Coro::new = 1
2615 CODE: 2854 CODE:
2616{ 2855{
2617 struct coro *coro; 2856 struct coro *coro;
2618 MAGIC *mg; 2857 MAGIC *mg;
2619 HV *hv; 2858 HV *hv;
2620 CV *cb; 2859 CV *cb;
2621 int i; 2860 int i;
2622 2861
2623 if (items > 1) 2862 if (items > 1)
2624 { 2863 {
2625 cb = coro_sv_2cv (ST (1)); 2864 cb = coro_sv_2cv (aTHX_ ST (1));
2626 2865
2866 if (!ix)
2867 {
2627 if (CvISXSUB (cb)) 2868 if (CvISXSUB (cb))
2628 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2869 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629 2870
2630 if (!CvROOT (cb)) 2871 if (!CvROOT (cb))
2631 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2872 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2873 }
2632 } 2874 }
2633 2875
2634 Newz (0, coro, 1, struct coro); 2876 Newz (0, coro, 1, struct coro);
2635 coro->args = newAV (); 2877 coro->args = newAV ();
2636 coro->flags = CF_NEW; 2878 coro->flags = CF_NEW;
2644 mg->mg_flags |= MGf_DUP; 2886 mg->mg_flags |= MGf_DUP;
2645 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2887 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646 2888
2647 if (items > 1) 2889 if (items > 1)
2648 { 2890 {
2649 coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651 av_extend (coro->args, items - 1); 2891 av_extend (coro->args, items - 1 + ix - 1);
2892
2893 if (ix)
2894 {
2652 av_push (coro->args, SvREFCNT_inc (cb)); 2895 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2896 cb = cv_coro_run;
2897 }
2898
2899 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2900
2653 for (i = 2; i < items; i++) 2901 for (i = 2; i < items; i++)
2654 av_push (coro->args, newSVsv (ST (i))); 2902 av_push (coro->args, newSVsv (ST (i)));
2655 } 2903 }
2656} 2904}
2657 OUTPUT: 2905 OUTPUT:
2673void 2921void
2674_exit (int code) 2922_exit (int code)
2675 PROTOTYPE: $ 2923 PROTOTYPE: $
2676 CODE: 2924 CODE:
2677 _exit (code); 2925 _exit (code);
2926
2927SV *
2928clone (Coro::State coro)
2929 CODE:
2930{
2931#if CORO_CLONE
2932 struct coro *ncoro = coro_clone (aTHX_ coro);
2933 MAGIC *mg;
2934 /* TODO: too much duplication */
2935 ncoro->hv = newHV ();
2936 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2937 mg->mg_flags |= MGf_DUP;
2938 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2939#else
2940 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2941#endif
2942}
2943 OUTPUT:
2944 RETVAL
2678 2945
2679int 2946int
2680cctx_stacksize (int new_stacksize = 0) 2947cctx_stacksize (int new_stacksize = 0)
2681 PROTOTYPE: ;$ 2948 PROTOTYPE: ;$
2682 CODE: 2949 CODE:
2803 3070
2804SV * 3071SV *
2805has_cctx (Coro::State coro) 3072has_cctx (Coro::State coro)
2806 PROTOTYPE: $ 3073 PROTOTYPE: $
2807 CODE: 3074 CODE:
2808 RETVAL = boolSV (!!coro->cctx); 3075 /* maybe manage the running flag differently */
3076 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2809 OUTPUT: 3077 OUTPUT:
2810 RETVAL 3078 RETVAL
2811 3079
2812int 3080int
2813is_traced (Coro::State coro) 3081is_traced (Coro::State coro)
2833 3101
2834void 3102void
2835force_cctx () 3103force_cctx ()
2836 PROTOTYPE: 3104 PROTOTYPE:
2837 CODE: 3105 CODE:
2838 SvSTATE_current->cctx->idle_sp = 0; 3106 cctx_current->idle_sp = 0;
2839 3107
2840void 3108void
2841swap_defsv (Coro::State self) 3109swap_defsv (Coro::State self)
2842 PROTOTYPE: $ 3110 PROTOTYPE: $
2843 ALIAS: 3111 ALIAS:
2858 3126
2859BOOT: 3127BOOT:
2860{ 3128{
2861 int i; 3129 int i;
2862 3130
2863 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3131 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3132 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866 3133 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3134 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2867 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3135 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868 SvREADONLY_on (coro_current); 3136 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3137 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3138 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3139 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3140
3141 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3142 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3143 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3144 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2869 3145
2870 coro_stash = gv_stashpv ("Coro", TRUE); 3146 coro_stash = gv_stashpv ("Coro", TRUE);
2871 3147
2872 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3148 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2873 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3149 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2881 3157
2882 { 3158 {
2883 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3159 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884 3160
2885 coroapi.schedule = api_schedule; 3161 coroapi.schedule = api_schedule;
3162 coroapi.schedule_to = api_schedule_to;
2886 coroapi.cede = api_cede; 3163 coroapi.cede = api_cede;
2887 coroapi.cede_notself = api_cede_notself; 3164 coroapi.cede_notself = api_cede_notself;
2888 coroapi.ready = api_ready; 3165 coroapi.ready = api_ready;
2889 coroapi.is_ready = api_is_ready; 3166 coroapi.is_ready = api_is_ready;
2890 coroapi.nready = coro_nready; 3167 coroapi.nready = coro_nready;
2895 SvREADONLY_on (sv); 3172 SvREADONLY_on (sv);
2896 } 3173 }
2897} 3174}
2898 3175
2899void 3176void
3177terminate (...)
3178 CODE:
3179 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3180
3181void
2900schedule (...) 3182schedule (...)
2901 CODE: 3183 CODE:
2902 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3184 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3185
3186void
3187schedule_to (...)
3188 CODE:
3189 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3190
3191void
3192cede_to (...)
3193 CODE:
3194 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903 3195
2904void 3196void
2905cede (...) 3197cede (...)
2906 CODE: 3198 CODE:
2907 CORO_EXECUTE_SLF_XS (slf_init_cede); 3199 CORO_EXECUTE_SLF_XS (slf_init_cede);
2908 3200
2909void 3201void
2910cede_notself (...) 3202cede_notself (...)
2911 CODE: 3203 CODE:
2912 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3204 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3205
3206void
3207_cancel (Coro::State self)
3208 CODE:
3209 coro_state_destroy (aTHX_ self);
3210 coro_call_on_destroy (aTHX_ self);
2913 3211
2914void 3212void
2915_set_current (SV *current) 3213_set_current (SV *current)
2916 PROTOTYPE: $ 3214 PROTOTYPE: $
2917 CODE: 3215 CODE:
2962 CODE: 3260 CODE:
2963 RETVAL = coro_nready; 3261 RETVAL = coro_nready;
2964 OUTPUT: 3262 OUTPUT:
2965 RETVAL 3263 RETVAL
2966 3264
2967# for async_pool speedup
2968void 3265void
2969_pool_1 (SV *cb) 3266_pool_handler (...)
2970 CODE: 3267 CODE:
2971{ 3268 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2972 HV *hv = (HV *)SvRV (coro_current);
2973 struct coro *coro = SvSTATE_hv ((SV *)hv);
2974 AV *defav = GvAV (PL_defgv);
2975 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2976 AV *invoke_av;
2977 int i, len;
2978 3269
2979 if (!invoke) 3270void
3271async_pool (SV *cv, ...)
3272 PROTOTYPE: &@
3273 PPCODE:
3274{
3275 HV *hv = (HV *)av_pop (av_async_pool);
3276 AV *av = newAV ();
3277 SV *cb = ST (0);
3278 int i;
3279
3280 av_extend (av, items - 2);
3281 for (i = 1; i < items; ++i)
3282 av_push (av, SvREFCNT_inc_NN (ST (i)));
3283
3284 if ((SV *)hv == &PL_sv_undef)
2980 { 3285 {
2981 SV *old = PL_diehook; 3286 PUSHMARK (SP);
2982 PL_diehook = 0; 3287 EXTEND (SP, 2);
2983 SvREFCNT_dec (old); 3288 PUSHs (sv_Coro);
2984 croak ("\3async_pool terminate\2\n"); 3289 PUSHs ((SV *)cv_pool_handler);
3290 PUTBACK;
3291 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3292 SPAGAIN;
3293
3294 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2985 } 3295 }
2986 3296
2987 SvREFCNT_dec (coro->saved_deffh);
2988 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2989
2990 hv_store (hv, "desc", sizeof ("desc") - 1,
2991 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2992
2993 invoke_av = (AV *)SvRV (invoke);
2994 len = av_len (invoke_av);
2995
2996 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2997
2998 if (len > 0)
2999 { 3297 {
3000 av_fill (defav, len - 1); 3298 struct coro *coro = SvSTATE_hv (hv);
3001 for (i = 0; i < len; ++i) 3299
3002 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3300 assert (!coro->invoke_cb);
3301 assert (!coro->invoke_av);
3302 coro->invoke_cb = SvREFCNT_inc (cb);
3303 coro->invoke_av = av;
3003 } 3304 }
3004}
3005 3305
3006void 3306 api_ready (aTHX_ (SV *)hv);
3007_pool_2 (SV *cb)
3008 CODE:
3009{
3010 HV *hv = (HV *)SvRV (coro_current);
3011 struct coro *coro = SvSTATE_hv ((SV *)hv);
3012 3307
3013 sv_setsv (cb, &PL_sv_undef); 3308 if (GIMME_V != G_VOID)
3014 3309 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3310 else
3016 coro->saved_deffh = 0;
3017
3018 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3019 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3020 {
3021 SV *old = PL_diehook;
3022 PL_diehook = 0;
3023 SvREFCNT_dec (old); 3311 SvREFCNT_dec (hv);
3024 croak ("\3async_pool terminate\2\n");
3025 }
3026
3027 av_clear (GvAV (PL_defgv));
3028 hv_store (hv, "desc", sizeof ("desc") - 1,
3029 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3030
3031 coro->prio = 0;
3032
3033 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3034 api_trace (aTHX_ coro_current, 0);
3035
3036 av_push (av_async_pool, newSVsv (coro_current));
3037} 3312}
3038 3313
3039SV * 3314SV *
3040rouse_cb () 3315rouse_cb ()
3041 PROTOTYPE: 3316 PROTOTYPE:
3215 3490
3216void 3491void
3217_register (char *target, char *proto, SV *req) 3492_register (char *target, char *proto, SV *req)
3218 CODE: 3493 CODE:
3219{ 3494{
3220 CV *req_cv = coro_sv_2cv (req); 3495 CV *req_cv = coro_sv_2cv (aTHX_ req);
3221 /* newXSproto doesn't return the CV on 5.8 */ 3496 /* newXSproto doesn't return the CV on 5.8 */
3222 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3497 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223 sv_setpv ((SV *)slf_cv, proto); 3498 sv_setpv ((SV *)slf_cv, proto);
3224 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3499 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225} 3500}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines