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.344 by root, Mon Dec 15 19:39:40 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 */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 244};
226 245
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 246/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 247typedef struct
229{ 248{
230 SV *defsv; 249 SV *defsv;
231 AV *defav; 250 AV *defav;
232 SV *errsv; 251 SV *errsv;
233 SV *irsgv; 252 SV *irsgv;
253 HV *hinthv;
234#define VAR(name,type) type name; 254#define VAR(name,type) type name;
235# include "state.h" 255# include "state.h"
236#undef VAR 256#undef VAR
237} perl_slots; 257} perl_slots;
238 258
263 SV *except; /* exception to be thrown */ 283 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 284 SV *rouse_cb;
265 285
266 /* async_pool */ 286 /* async_pool */
267 SV *saved_deffh; 287 SV *saved_deffh;
288 SV *invoke_cb;
289 AV *invoke_av;
290
291 /* on_enter/on_leave */
292 AV *on_enter;
293 AV *on_leave;
268 294
269 /* linked list */ 295 /* linked list */
270 struct coro *next, *prev; 296 struct coro *next, *prev;
271}; 297};
272 298
289 315
290/* for Coro.pm */ 316/* for Coro.pm */
291static SV *coro_current; 317static SV *coro_current;
292static SV *coro_readyhook; 318static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
320static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 321static struct coro *coro_first;
295#define coro_nready coroapi.nready 322#define coro_nready coroapi.nready
296 323
297/** lowlevel stuff **********************************************************/ 324/** lowlevel stuff **********************************************************/
298 325
326 return get_hv (name, create); 353 return get_hv (name, create);
327} 354}
328 355
329/* may croak */ 356/* may croak */
330INLINE CV * 357INLINE CV *
331coro_sv_2cv (SV *sv) 358coro_sv_2cv (pTHX_ SV *sv)
332{ 359{
333 HV *st; 360 HV *st;
334 GV *gvp; 361 GV *gvp;
335 return sv_2cv (sv, &st, &gvp, 0); 362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363
364 if (!cv)
365 croak ("code reference expected");
366
367 return cv;
336} 368}
369
370/*****************************************************************************/
371/* magic glue */
372
373#define CORO_MAGIC_type_cv 26
374#define CORO_MAGIC_type_state PERL_MAGIC_ext
375
376#define CORO_MAGIC_NN(sv, type) \
377 (expect_true (SvMAGIC (sv)->mg_type == type) \
378 ? SvMAGIC (sv) \
379 : mg_find (sv, type))
380
381#define CORO_MAGIC(sv, type) \
382 (expect_true (SvMAGIC (sv)) \
383 ? CORO_MAGIC_NN (sv, type) \
384 : 0)
385
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
388
389INLINE struct coro *
390SvSTATE_ (pTHX_ SV *coro)
391{
392 HV *stash;
393 MAGIC *mg;
394
395 if (SvROK (coro))
396 coro = SvRV (coro);
397
398 if (expect_false (SvTYPE (coro) != SVt_PVHV))
399 croak ("Coro::State object required");
400
401 stash = SvSTASH (coro);
402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
403 {
404 /* very slow, but rare, check */
405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
406 croak ("Coro::State object required");
407 }
408
409 mg = CORO_MAGIC_state (coro);
410 return (struct coro *)mg->mg_ptr;
411}
412
413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
414
415/* faster than SvSTATE, but expects a coroutine hv */
416#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
417#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
418
419/*****************************************************************************/
420/* padlist management and caching */
337 421
338static AV * 422static AV *
339coro_clone_padlist (pTHX_ CV *cv) 423coro_derive_padlist (pTHX_ CV *cv)
340{ 424{
341 AV *padlist = CvPADLIST (cv); 425 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 426 AV *newpadlist, *newpad;
343 427
344 newpadlist = newAV (); 428 newpadlist = newAV ();
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 433 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
350#endif 434#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 435 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
352 --AvFILLp (padlist); 436 --AvFILLp (padlist);
353 437
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 438 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
355 av_store (newpadlist, 1, (SV *)newpad); 439 av_store (newpadlist, 1, (SV *)newpad);
356 440
357 return newpadlist; 441 return newpadlist;
358} 442}
359 443
360static void 444static void
361free_padlist (pTHX_ AV *padlist) 445free_padlist (pTHX_ AV *padlist)
362{ 446{
363 /* may be during global destruction */ 447 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 448 if (!IN_DESTRUCT)
365 { 449 {
366 I32 i = AvFILLp (padlist); 450 I32 i = AvFILLp (padlist);
367 while (i >= 0) 451
452 while (i > 0) /* special-case index 0 */
368 { 453 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 454 /* we try to be extra-careful here */
370 if (svp) 455 AV *av = (AV *)AvARRAY (padlist)[i--];
371 { 456 I32 j = AvFILLp (av);
372 SV *sv; 457
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 458 while (j >= 0)
459 SvREFCNT_dec (AvARRAY (av)[j--]);
460
461 AvFILLp (av) = -1;
374 SvREFCNT_dec (sv); 462 SvREFCNT_dec (av);
375
376 SvREFCNT_dec (*svp);
377 }
378 } 463 }
379 464
465 SvREFCNT_dec (AvARRAY (padlist)[0]);
466
467 AvFILLp (padlist) = -1;
380 SvREFCNT_dec ((SV*)padlist); 468 SvREFCNT_dec ((SV*)padlist);
381 } 469 }
382} 470}
383 471
384static int 472static int
393 481
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 482 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 483
396 return 0; 484 return 0;
397} 485}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 486
402static MGVTBL coro_cv_vtbl = { 487static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 488 0, 0, 0, 0,
404 coro_cv_free 489 coro_cv_free
405}; 490};
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 491
450/* the next two functions merely cache the padlists */ 492/* the next two functions merely cache the padlists */
451static void 493static void
452get_padlist (pTHX_ CV *cv) 494get_padlist (pTHX_ CV *cv)
453{ 495{
464 CV *cp = Perl_cv_clone (aTHX_ cv); 506 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 507 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 508 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 509 SvREFCNT_dec (cp);
468#else 510#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 511 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 512#endif
471 } 513 }
472} 514}
473 515
474static void 516static void
481 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 523 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
482 524
483 av = (AV *)mg->mg_obj; 525 av = (AV *)mg->mg_obj;
484 526
485 if (expect_false (AvFILLp (av) >= AvMAX (av))) 527 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1); 528 av_extend (av, AvFILLp (av) + 1);
487 529
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 531}
490 532
491/** load & save, init *******************************************************/ 533/** load & save, init *******************************************************/
534
535static void
536on_enterleave_call (pTHX_ SV *cb);
492 537
493static void 538static void
494load_perl (pTHX_ Coro__State c) 539load_perl (pTHX_ Coro__State c)
495{ 540{
496 perl_slots *slot = c->slot; 541 perl_slots *slot = c->slot;
497 c->slot = 0; 542 c->slot = 0;
498 543
499 PL_mainstack = c->mainstack; 544 PL_mainstack = c->mainstack;
500 545
501 GvSV (PL_defgv) = slot->defsv; 546 GvSV (PL_defgv) = slot->defsv;
502 GvAV (PL_defgv) = slot->defav; 547 GvAV (PL_defgv) = slot->defav;
503 GvSV (PL_errgv) = slot->errsv; 548 GvSV (PL_errgv) = slot->errsv;
504 GvSV (irsgv) = slot->irsgv; 549 GvSV (irsgv) = slot->irsgv;
550 GvHV (PL_hintgv) = slot->hinthv;
505 551
506 #define VAR(name,type) PL_ ## name = slot->name; 552 #define VAR(name,type) PL_ ## name = slot->name;
507 # include "state.h" 553 # include "state.h"
508 #undef VAR 554 #undef VAR
509 555
523 PUTBACK; 569 PUTBACK;
524 } 570 }
525 571
526 slf_frame = c->slf_frame; 572 slf_frame = c->slf_frame;
527 CORO_THROW = c->except; 573 CORO_THROW = c->except;
574
575 if (expect_false (c->on_enter))
576 {
577 int i;
578
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 }
528} 582}
529 583
530static void 584static void
531save_perl (pTHX_ Coro__State c) 585save_perl (pTHX_ Coro__State c)
532{ 586{
587 if (expect_false (c->on_leave))
588 {
589 int i;
590
591 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
593 }
594
533 c->except = CORO_THROW; 595 c->except = CORO_THROW;
534 c->slf_frame = slf_frame; 596 c->slf_frame = slf_frame;
535 597
536 { 598 {
537 dSP; 599 dSP;
595 c->mainstack = PL_mainstack; 657 c->mainstack = PL_mainstack;
596 658
597 { 659 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 660 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 661
600 slot->defav = GvAV (PL_defgv); 662 slot->defav = GvAV (PL_defgv);
601 slot->defsv = DEFSV; 663 slot->defsv = DEFSV;
602 slot->errsv = ERRSV; 664 slot->errsv = ERRSV;
603 slot->irsgv = GvSV (irsgv); 665 slot->irsgv = GvSV (irsgv);
666 slot->hinthv = GvHV (PL_hintgv);
604 667
605 #define VAR(name,type) slot->name = PL_ ## name; 668 #define VAR(name,type) slot->name = PL_ ## name;
606 # include "state.h" 669 # include "state.h"
607 #undef VAR 670 #undef VAR
608 } 671 }
686#if !PERL_VERSION_ATLEAST (5,10,0) 749#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 750 Safefree (PL_retstack);
688#endif 751#endif
689} 752}
690 753
754#define CORO_RSS \
755 rss += sizeof (SYM (curstackinfo)); \
756 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
757 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
758 rss += SYM (tmps_max) * sizeof (SV *); \
759 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
760 rss += SYM (scopestack_max) * sizeof (I32); \
761 rss += SYM (savestack_max) * sizeof (ANY);
762
691static size_t 763static size_t
692coro_rss (pTHX_ struct coro *coro) 764coro_rss (pTHX_ struct coro *coro)
693{ 765{
694 size_t rss = sizeof (*coro); 766 size_t rss = sizeof (*coro);
695 767
696 if (coro->mainstack) 768 if (coro->mainstack)
697 { 769 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 770 if (coro->flags & CF_RUNNING)
702 { 771 {
703 slot = &tmp_slot; 772 #define SYM(sym) PL_ ## sym
704 773 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 774 #undef SYM
708 } 775 }
709 else 776 else
710 slot = coro->slot;
711
712 if (slot)
713 { 777 {
714 rss += sizeof (slot->curstackinfo); 778 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 779 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 780 #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 } 781 }
726 } 782 }
727 783
728 return rss; 784 return rss;
729} 785}
742#endif 798#endif
743 799
744/* 800/*
745 * This overrides the default magic get method of %SIG elements. 801 * This overrides the default magic get method of %SIG elements.
746 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 802 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
747 * and instead of tryign to save and restore the hash elements, we just provide 803 * and instead of trying to save and restore the hash elements, we just provide
748 * readback here. 804 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 805 */
753static int 806static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 808{
756 const char *s = MgPV_nolen_const (mg); 809 const char *s = MgPV_nolen_const (mg);
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 862 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 863
811 if (svp) 864 if (svp)
812 { 865 {
813 SV *old = *svp; 866 SV *old = *svp;
814 *svp = newSVsv (sv); 867 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 868 SvREFCNT_dec (old);
816 return 0; 869 return 0;
817 } 870 }
818 } 871 }
819 872
829 882
830static int 883static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 884slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 885{
833 return 0; 886 return 0;
887}
888
889static int
890slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{
892 return 1;
834} 893}
835 894
836static UNOP coro_setup_op; 895static UNOP coro_setup_op;
837 896
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 897static void NOINLINE /* noinline to keep it out of the transfer fast path */
845 904
846 PL_runops = RUNOPS_DEFAULT; 905 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 906 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 907 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 908 PL_comppad = 0;
909 PL_comppad_name = 0;
910 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 912 PL_curpm = 0;
851 PL_curpad = 0; 913 PL_curpad = 0;
852 PL_localizing = 0; 914 PL_localizing = 0;
853 PL_dirty = 0; 915 PL_dirty = 0;
854 PL_restartop = 0; 916 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 917#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 918 PL_parser = 0;
857#endif 919#endif
920 PL_hints = 0;
858 921
859 /* recreate the die/warn hooks */ 922 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 923 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); 924 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 925
863 GvSV (PL_defgv) = newSV (0); 926 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 927 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 928 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 929 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
930 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 931 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 932 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 933
870 { 934 {
871 dSP; 935 dSP;
872 UNOP myop; 936 UNOP myop;
873 937
874 Zero (&myop, 1, UNOP); 938 Zero (&myop, 1, UNOP);
875 myop.op_next = Nullop; 939 myop.op_next = Nullop;
940 myop.op_type = OP_ENTERSUB;
876 myop.op_flags = OPf_WANT_VOID; 941 myop.op_flags = OPf_WANT_VOID;
877 942
878 PUSHMARK (SP); 943 PUSHMARK (SP);
879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 944 PUSHs ((SV *)coro->startcv);
880 PUTBACK; 945 PUTBACK;
881 PL_op = (OP *)&myop; 946 PL_op = (OP *)&myop;
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 947 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN;
884 } 948 }
885 949
886 /* this newly created coroutine might be run on an existing cctx which most 950 /* 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. 951 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 */ 952 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 953 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 */ 954 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 955
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 956 /* 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; 957 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 958 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 959 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags required, as an init function won't be called */ 960 /* no flags etc. required, as an init function won't be called */
897 961
898 PL_op = (OP *)&coro_setup_op; 962 PL_op = (OP *)&coro_setup_op;
899 963
900 /* copy throw, in case it was set before coro_setup */ 964 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 965 CORO_THROW = coro->except;
902} 966}
903 967
904static void 968static void
905coro_destruct (pTHX_ struct coro *coro) 969coro_unwind_stacks (pTHX)
906{ 970{
907 if (!IN_DESTRUCT) 971 if (!IN_DESTRUCT)
908 { 972 {
909 /* restore all saved variables and stuff */ 973 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 974 LEAVE_SCOPE (0);
918 POPSTACK_TO (PL_mainstack); 982 POPSTACK_TO (PL_mainstack);
919 983
920 /* unwind main stack */ 984 /* unwind main stack */
921 dounwind (-1); 985 dounwind (-1);
922 } 986 }
987}
988
989static void
990coro_destruct_perl (pTHX_ struct coro *coro)
991{
992 coro_unwind_stacks (aTHX);
923 993
924 SvREFCNT_dec (GvSV (PL_defgv)); 994 SvREFCNT_dec (GvSV (PL_defgv));
925 SvREFCNT_dec (GvAV (PL_defgv)); 995 SvREFCNT_dec (GvAV (PL_defgv));
926 SvREFCNT_dec (GvSV (PL_errgv)); 996 SvREFCNT_dec (GvSV (PL_errgv));
927 SvREFCNT_dec (PL_defoutgv); 997 SvREFCNT_dec (PL_defoutgv);
928 SvREFCNT_dec (PL_rs); 998 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv)); 999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
930 1001
931 SvREFCNT_dec (PL_diehook); 1002 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook); 1003 SvREFCNT_dec (PL_warnhook);
933 1004
934 SvREFCNT_dec (CORO_THROW);
935 SvREFCNT_dec (coro->saved_deffh); 1005 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1006 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av);
937 1009
938 coro_destruct_stacks (aTHX); 1010 coro_destruct_stacks (aTHX);
939} 1011}
940 1012
941INLINE void 1013INLINE void
951static int 1023static int
952runops_trace (pTHX) 1024runops_trace (pTHX)
953{ 1025{
954 COP *oldcop = 0; 1026 COP *oldcop = 0;
955 int oldcxix = -2; 1027 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1028
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1029 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1030 {
961 PERL_ASYNC_CHECK (); 1031 PERL_ASYNC_CHECK ();
962 1032
963 if (cctx->flags & CC_TRACE_ALL) 1033 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1034 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1035 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1036 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1037 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1038 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1039 AV *av = newAV (); /* return values */
970 SV **cb; 1040 SV **cb;
1007 1077
1008 if (PL_curcop != &PL_compiling) 1078 if (PL_curcop != &PL_compiling)
1009 { 1079 {
1010 SV **cb; 1080 SV **cb;
1011 1081
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1082 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1083 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1084 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1085
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1086 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1087 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1088 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1089 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1090 SV *fullname = sv_2mortal (newSV (0));
1022 1091
1023 if (isGV (gv)) 1092 if (isGV (gv))
1041 } 1110 }
1042 1111
1043 oldcxix = cxstack_ix; 1112 oldcxix = cxstack_ix;
1044 } 1113 }
1045 1114
1046 if (cctx->flags & CC_TRACE_LINE) 1115 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1116 {
1048 dSP; 1117 dSP;
1049 1118
1050 PL_runops = RUNOPS_DEFAULT; 1119 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1120 ENTER;
1070 1139
1071 TAINT_NOT; 1140 TAINT_NOT;
1072 return 0; 1141 return 0;
1073} 1142}
1074 1143
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1144static struct CoroSLF cctx_ssl_frame;
1077 1145
1078static void 1146static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1147slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1148{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1149 ta->prev = 0;
1083} 1150}
1084 1151
1085static int 1152static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1153slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1154{
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1157 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1158}
1092 1159
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1160/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1161static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1162cctx_prepare (pTHX)
1096{ 1163{
1097 PL_top_env = &PL_start_env; 1164 PL_top_env = &PL_start_env;
1098 1165
1099 if (cctx->flags & CC_TRACE) 1166 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1167 PL_runops = runops_trace;
1101 1168
1102 /* we already must be executing an SLF op, there is no other valid way 1169 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1170 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1171 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1172 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1173
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1174 /* 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; 1175 cctx_ssl_frame = slf_frame;
1110 1176
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1177 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1178 slf_frame.check = slf_check_set_stacklevel;
1113} 1179}
1136 /* normally we would need to skip the entersub here */ 1202 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1203 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1204 /* PL_nop = PL_nop->op_next */
1139 1205
1140 /* inject a fake subroutine call to cctx_init */ 1206 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1207 cctx_prepare (aTHX);
1142 1208
1143 /* cctx_run is the alternative tail of transfer() */ 1209 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1210 transfer_tail (aTHX);
1145 1211
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1212 /* somebody or something will hit me for both perl_run and PL_restartop */
1147 PL_restartop = PL_op; 1213 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1214 perl_run (PL_curinterp);
1215 /*
1216 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these
1218 */
1149 1219
1150 /* 1220 /*
1151 * If perl-run returns we assume exit() was being called or the coro 1221 * 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) 1222 * 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 1223 * 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" 1224 * bootstrap-time "top" top_env, as we cannot restore the "main"
1155 * coroutine as Coro has no such concept 1225 * coroutine as Coro has no such concept.
1226 * This actually isn't valid with the pthread backend, but OSes requiring
1227 * that backend are too broken to do it in a standards-compliant way.
1156 */ 1228 */
1157 PL_top_env = main_top_env; 1229 PL_top_env = main_top_env;
1158 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1230 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1159 } 1231 }
1160} 1232}
1237cctx_destroy (coro_cctx *cctx) 1309cctx_destroy (coro_cctx *cctx)
1238{ 1310{
1239 if (!cctx) 1311 if (!cctx)
1240 return; 1312 return;
1241 1313
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1315
1242 --cctx_count; 1316 --cctx_count;
1243 coro_destroy (&cctx->cctx); 1317 coro_destroy (&cctx->cctx);
1244 1318
1245 /* coro_transfer creates new, empty cctx's */ 1319 /* coro_transfer creates new, empty cctx's */
1246 if (cctx->sptr) 1320 if (cctx->sptr)
1309 /* TODO: throwing up here is considered harmful */ 1383 /* TODO: throwing up here is considered harmful */
1310 1384
1311 if (expect_true (prev != next)) 1385 if (expect_true (prev != next))
1312 { 1386 {
1313 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1387 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,"); 1388 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1315 1389
1316 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,");
1318
1319 if (expect_false (next->flags & CF_DESTROYED)) 1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1320 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1391 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1321 1392
1322#if !PERL_VERSION_ATLEAST (5,10,0) 1393#if !PERL_VERSION_ATLEAST (5,10,0)
1323 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1394 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1324 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1395 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1325#endif 1396#endif
1331transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1332{ 1403{
1333 dSTACKLEVEL; 1404 dSTACKLEVEL;
1334 1405
1335 /* sometimes transfer is only called to set idle_sp */ 1406 /* sometimes transfer is only called to set idle_sp */
1336 if (expect_false (!next)) 1407 if (expect_false (!prev))
1337 { 1408 {
1338 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1409 cctx_current->idle_sp = STACKLEVEL;
1339 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1410 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1340 } 1411 }
1341 else if (expect_true (prev != next)) 1412 else if (expect_true (prev != next))
1342 { 1413 {
1343 coro_cctx *prev__cctx; 1414 coro_cctx *cctx_prev;
1344 1415
1345 if (expect_false (prev->flags & CF_NEW)) 1416 if (expect_false (prev->flags & CF_NEW))
1346 { 1417 {
1347 /* create a new empty/source context */ 1418 /* create a new empty/source context */
1348 prev->cctx = cctx_new_empty ();
1349 prev->flags &= ~CF_NEW; 1419 prev->flags &= ~CF_NEW;
1350 prev->flags |= CF_RUNNING; 1420 prev->flags |= CF_RUNNING;
1351 } 1421 }
1352 1422
1353 prev->flags &= ~CF_RUNNING; 1423 prev->flags &= ~CF_RUNNING;
1364 coro_setup (aTHX_ next); 1434 coro_setup (aTHX_ next);
1365 } 1435 }
1366 else 1436 else
1367 load_perl (aTHX_ next); 1437 load_perl (aTHX_ next);
1368 1438
1369 prev__cctx = prev->cctx;
1370
1371 /* possibly untie and reuse the cctx */ 1439 /* possibly untie and reuse the cctx */
1372 if (expect_true ( 1440 if (expect_true (
1373 prev__cctx->idle_sp == STACKLEVEL 1441 cctx_current->idle_sp == STACKLEVEL
1374 && !(prev__cctx->flags & CC_TRACE) 1442 && !(cctx_current->flags & CC_TRACE)
1375 && !force_cctx 1443 && !force_cctx
1376 )) 1444 ))
1377 { 1445 {
1378 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1446 /* 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)); 1447 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1380 1448
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 */ 1449 /* 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 */ 1450 /* without this the next cctx_get might destroy the running cctx while still in use */
1385 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1451 if (expect_false (CCTX_EXPIRED (cctx_current)))
1386 if (!next->cctx) 1452 if (expect_true (!next->cctx))
1387 next->cctx = cctx_get (aTHX); 1453 next->cctx = cctx_get (aTHX);
1388 1454
1389 cctx_put (prev__cctx); 1455 cctx_put (cctx_current);
1390 } 1456 }
1457 else
1458 prev->cctx = cctx_current;
1391 1459
1392 ++next->usecount; 1460 ++next->usecount;
1393 1461
1394 if (expect_true (!next->cctx)) 1462 cctx_prev = cctx_current;
1395 next->cctx = cctx_get (aTHX); 1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1396 1464
1397 if (expect_false (prev__cctx != next->cctx)) 1465 next->cctx = 0;
1466
1467 if (expect_false (cctx_prev != cctx_current))
1398 { 1468 {
1399 prev__cctx->top_env = PL_top_env; 1469 cctx_prev->top_env = PL_top_env;
1400 PL_top_env = next->cctx->top_env; 1470 PL_top_env = cctx_current->top_env;
1401 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1402 } 1472 }
1403 1473
1404 transfer_tail (aTHX); 1474 transfer_tail (aTHX);
1405 } 1475 }
1406} 1476}
1414coro_state_destroy (pTHX_ struct coro *coro) 1484coro_state_destroy (pTHX_ struct coro *coro)
1415{ 1485{
1416 if (coro->flags & CF_DESTROYED) 1486 if (coro->flags & CF_DESTROYED)
1417 return 0; 1487 return 0;
1418 1488
1419 if (coro->on_destroy) 1489 if (coro->on_destroy && !PL_dirty)
1420 coro->on_destroy (aTHX_ coro); 1490 coro->on_destroy (aTHX_ coro);
1421 1491
1422 coro->flags |= CF_DESTROYED; 1492 coro->flags |= CF_DESTROYED;
1423 1493
1424 if (coro->flags & CF_READY) 1494 if (coro->flags & CF_READY)
1428 --coro_nready; 1498 --coro_nready;
1429 } 1499 }
1430 else 1500 else
1431 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1501 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1432 1502
1433 if (coro->mainstack && coro->mainstack != main_mainstack) 1503 if (coro->mainstack
1504 && coro->mainstack != main_mainstack
1505 && coro->slot
1506 && !PL_dirty)
1434 { 1507 {
1435 struct coro temp; 1508 struct coro *current = SvSTATE_current;
1436 1509
1437 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1438 1511
1439 save_perl (aTHX_ &temp); 1512 save_perl (aTHX_ current);
1440 load_perl (aTHX_ coro); 1513 load_perl (aTHX_ coro);
1441 1514
1442 coro_destruct (aTHX_ coro); 1515 coro_destruct_perl (aTHX_ coro);
1443 1516
1444 load_perl (aTHX_ &temp); 1517 load_perl (aTHX_ current);
1445 1518
1446 coro->slot = 0; 1519 coro->slot = 0;
1447 } 1520 }
1448 1521
1449 cctx_destroy (coro->cctx); 1522 cctx_destroy (coro->cctx);
1450 SvREFCNT_dec (coro->startcv); 1523 SvREFCNT_dec (coro->startcv);
1451 SvREFCNT_dec (coro->args); 1524 SvREFCNT_dec (coro->args);
1525 SvREFCNT_dec (CORO_THROW);
1452 1526
1453 if (coro->next) coro->next->prev = coro->prev; 1527 if (coro->next) coro->next->prev = coro->prev;
1454 if (coro->prev) coro->prev->next = coro->next; 1528 if (coro->prev) coro->prev->next = coro->next;
1455 if (coro == coro_first) coro_first = coro->next; 1529 if (coro == coro_first) coro_first = coro->next;
1456 1530
1560{ 1634{
1561 struct coro *coro; 1635 struct coro *coro;
1562 SV *sv_hook; 1636 SV *sv_hook;
1563 void (*xs_hook)(void); 1637 void (*xs_hook)(void);
1564 1638
1565 if (SvROK (coro_sv))
1566 coro_sv = SvRV (coro_sv);
1567
1568 coro = SvSTATE (coro_sv); 1639 coro = SvSTATE (coro_sv);
1569 1640
1570 if (coro->flags & CF_READY) 1641 if (coro->flags & CF_READY)
1571 return 0; 1642 return 0;
1572 1643
1603api_is_ready (pTHX_ SV *coro_sv) 1674api_is_ready (pTHX_ SV *coro_sv)
1604{ 1675{
1605 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1676 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606} 1677}
1607 1678
1679/* expects to own a reference to next->hv */
1608INLINE void 1680INLINE void
1609prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1610{ 1682{
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); 1683 SV *prev_sv = SvRV (coro_current);
1684
1650 ta->prev = SvSTATE_hv (prev_sv); 1685 ta->prev = SvSTATE_hv (prev_sv);
1686 ta->next = next;
1687
1651 TRANSFER_CHECK (*ta); 1688 TRANSFER_CHECK (*ta);
1652 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1689
1653 ta->next->flags &= ~CF_READY;
1654 SvRV_set (coro_current, next_sv); 1690 SvRV_set (coro_current, (SV *)next->hv);
1655 1691
1656 free_coro_mortal (aTHX); 1692 free_coro_mortal (aTHX);
1657 coro_mortal = prev_sv; 1693 coro_mortal = prev_sv;
1658} 1694}
1659 1695
1696static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{
1699 for (;;)
1700 {
1701 SV *next_sv = coro_deq (aTHX);
1702
1703 if (expect_true (next_sv))
1704 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1710 else
1711 {
1712 next->flags &= ~CF_READY;
1713 --coro_nready;
1714
1715 prepare_schedule_to (aTHX_ ta, next);
1716 break;
1717 }
1718 }
1719 else
1720 {
1721 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle)))
1724 {
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready;
1728 }
1729 else
1730 {
1731 dSP;
1732
1733 ENTER;
1734 SAVETMPS;
1735
1736 PUSHMARK (SP);
1737 PUTBACK;
1738 call_sv (sv_idle, G_VOID | G_DISCARD);
1739
1740 FREETMPS;
1741 LEAVE;
1742 }
1743 }
1744 }
1745}
1746
1660INLINE void 1747INLINE void
1661prepare_cede (pTHX_ struct coro_transfer_args *ta) 1748prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662{ 1749{
1663 api_ready (aTHX_ coro_current); 1750 api_ready (aTHX_ coro_current);
1664 prepare_schedule (aTHX_ ta); 1751 prepare_schedule (aTHX_ ta);
1683{ 1770{
1684 struct coro_transfer_args ta; 1771 struct coro_transfer_args ta;
1685 1772
1686 prepare_schedule (aTHX_ &ta); 1773 prepare_schedule (aTHX_ &ta);
1687 TRANSFER (ta, 1); 1774 TRANSFER (ta, 1);
1775}
1776
1777static void
1778api_schedule_to (pTHX_ SV *coro_sv)
1779{
1780 struct coro_transfer_args ta;
1781 struct coro *next = SvSTATE (coro_sv);
1782
1783 SvREFCNT_inc_NN (coro_sv);
1784 prepare_schedule_to (aTHX_ &ta, next);
1688} 1785}
1689 1786
1690static int 1787static int
1691api_cede (pTHX) 1788api_cede (pTHX)
1692{ 1789{
1721static void 1818static void
1722api_trace (pTHX_ SV *coro_sv, int flags) 1819api_trace (pTHX_ SV *coro_sv, int flags)
1723{ 1820{
1724 struct coro *coro = SvSTATE (coro_sv); 1821 struct coro *coro = SvSTATE (coro_sv);
1725 1822
1823 if (coro->flags & CF_RUNNING)
1824 croak ("cannot enable tracing on a running coroutine, caught");
1825
1726 if (flags & CC_TRACE) 1826 if (flags & CC_TRACE)
1727 { 1827 {
1728 if (!coro->cctx) 1828 if (!coro->cctx)
1729 coro->cctx = cctx_new_run (); 1829 coro->cctx = cctx_new_run ();
1730 else if (!(coro->cctx->flags & CC_TRACE)) 1830 else if (!(coro->cctx->flags & CC_TRACE))
1731 croak ("cannot enable tracing on coroutine with custom stack,"); 1831 croak ("cannot enable tracing on coroutine with custom stack, caught");
1732 1832
1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1833 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1734 } 1834 }
1735 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1835 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1736 { 1836 {
1741 else 1841 else
1742 coro->slot->runops = RUNOPS_DEFAULT; 1842 coro->slot->runops = RUNOPS_DEFAULT;
1743 } 1843 }
1744} 1844}
1745 1845
1846static void
1847coro_call_on_destroy (pTHX_ struct coro *coro)
1848{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851
1852 if (on_destroyp)
1853 {
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1855
1856 while (AvFILLp (on_destroy) >= 0)
1857 {
1858 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy);
1860
1861 PUSHMARK (SP);
1862
1863 if (statusp)
1864 {
1865 int i;
1866 AV *status = (AV *)SvRV (*statusp);
1867 EXTEND (SP, AvFILLp (status) + 1);
1868
1869 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]);
1871 }
1872
1873 PUTBACK;
1874 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1875 }
1876 }
1877}
1878
1879static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1881{
1882 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV ();
1885
1886 av_extend (av, items - 1);
1887 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i]));
1889
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1891
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager);
1894
1895 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat;
1897
1898 /* as a minor optimisation, we could unwind all stacks here */
1899 /* but that puts extra pressure on pp_slf, and is not worth much */
1900 /*coro_unwind_stacks (aTHX);*/
1901}
1902
1903/*****************************************************************************/
1904/* async pool handler */
1905
1906static int
1907slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1908{
1909 HV *hv = (HV *)SvRV (coro_current);
1910 struct coro *coro = (struct coro *)frame->data;
1911
1912 if (!coro->invoke_cb)
1913 return 1; /* loop till we have invoke */
1914 else
1915 {
1916 hv_store (hv, "desc", sizeof ("desc") - 1,
1917 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1918
1919 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1920
1921 {
1922 dSP;
1923 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1924 PUTBACK;
1925 }
1926
1927 SvREFCNT_dec (GvAV (PL_defgv));
1928 GvAV (PL_defgv) = coro->invoke_av;
1929 coro->invoke_av = 0;
1930
1931 return 0;
1932 }
1933}
1934
1935static void
1936slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1937{
1938 HV *hv = (HV *)SvRV (coro_current);
1939 struct coro *coro = SvSTATE_hv ((SV *)hv);
1940
1941 if (expect_true (coro->saved_deffh))
1942 {
1943 /* subsequent iteration */
1944 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1945 coro->saved_deffh = 0;
1946
1947 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1948 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1949 {
1950 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1951 coro->invoke_av = newAV ();
1952
1953 frame->prepare = prepare_nop;
1954 }
1955 else
1956 {
1957 av_clear (GvAV (PL_defgv));
1958 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1959
1960 coro->prio = 0;
1961
1962 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1963 api_trace (aTHX_ coro_current, 0);
1964
1965 frame->prepare = prepare_schedule;
1966 av_push (av_async_pool, SvREFCNT_inc (hv));
1967 }
1968 }
1969 else
1970 {
1971 /* first iteration, simply fall through */
1972 frame->prepare = prepare_nop;
1973 }
1974
1975 frame->check = slf_check_pool_handler;
1976 frame->data = (void *)coro;
1977}
1978
1746/*****************************************************************************/ 1979/*****************************************************************************/
1747/* rouse callback */ 1980/* rouse callback */
1748 1981
1749#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1982#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750 1983
1755 SV *data = (SV *)GENSUB_ARG; 1988 SV *data = (SV *)GENSUB_ARG;
1756 1989
1757 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1990 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758 { 1991 {
1759 /* first call, set args */ 1992 /* first call, set args */
1760 int i;
1761 AV *av = newAV (); 1993 AV *av = newAV ();
1762 SV *coro = SvRV (data); 1994 SV *coro = SvRV (data);
1763 1995
1764 SvRV_set (data, (SV *)av); 1996 SvRV_set (data, (SV *)av);
1765 api_ready (aTHX_ coro); 1997 api_ready (aTHX_ coro);
1906static void 2138static void
1907slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2139slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1908{ 2140{
1909 frame->prepare = prepare_schedule; 2141 frame->prepare = prepare_schedule;
1910 frame->check = slf_check_nop; 2142 frame->check = slf_check_nop;
2143}
2144
2145static void
2146slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2147{
2148 struct coro *next = (struct coro *)slf_frame.data;
2149
2150 SvREFCNT_inc_NN (next->hv);
2151 prepare_schedule_to (aTHX_ ta, next);
2152}
2153
2154static void
2155slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2156{
2157 if (!items)
2158 croak ("Coro::schedule_to expects a coroutine argument, caught");
2159
2160 frame->data = (void *)SvSTATE (arg [0]);
2161 frame->prepare = slf_prepare_schedule_to;
2162 frame->check = slf_check_nop;
2163}
2164
2165static void
2166slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2167{
2168 api_ready (aTHX_ SvRV (coro_current));
2169
2170 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1911} 2171}
1912 2172
1913static void 2173static void
1914slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2174slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{ 2175{
2061 } 2321 }
2062 else 2322 else
2063 slf_argc = 0; 2323 slf_argc = 0;
2064 2324
2065 PL_op->op_ppaddr = pp_slf; 2325 PL_op->op_ppaddr = pp_slf;
2066 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2326 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2067 2327
2068 PL_op = (OP *)&slf_restore; 2328 PL_op = (OP *)&slf_restore;
2329}
2330
2331/*****************************************************************************/
2332/* dynamic wind */
2333
2334static void
2335on_enterleave_call (pTHX_ SV *cb)
2336{
2337 dSP;
2338
2339 PUSHSTACK;
2340
2341 PUSHMARK (SP);
2342 PUTBACK;
2343 call_sv (cb, G_VOID | G_DISCARD);
2344 SPAGAIN;
2345
2346 POPSTACK;
2347}
2348
2349static SV *
2350coro_avp_pop_and_free (pTHX_ AV **avp)
2351{
2352 AV *av = *avp;
2353 SV *res = av_pop (av);
2354
2355 if (AvFILLp (av) < 0)
2356 {
2357 *avp = 0;
2358 SvREFCNT_dec (av);
2359 }
2360
2361 return res;
2362}
2363
2364static void
2365coro_pop_on_enter (pTHX_ void *coro)
2366{
2367 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2368 SvREFCNT_dec (cb);
2369}
2370
2371static void
2372coro_pop_on_leave (pTHX_ void *coro)
2373{
2374 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2375 on_enterleave_call (aTHX_ sv_2mortal (cb));
2069} 2376}
2070 2377
2071/*****************************************************************************/ 2378/*****************************************************************************/
2072/* PerlIO::cede */ 2379/* PerlIO::cede */
2073 2380
2154 SV **ary; 2461 SV **ary;
2155 2462
2156 /* unfortunately, building manually saves memory */ 2463 /* unfortunately, building manually saves memory */
2157 Newx (ary, 2, SV *); 2464 Newx (ary, 2, SV *);
2158 AvALLOC (av) = ary; 2465 AvALLOC (av) = ary;
2466#if PERL_VERSION_ATLEAST (5,10,0)
2159 /*AvARRAY (av) = ary;*/ 2467 AvARRAY (av) = ary;
2468#else
2160 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2469 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2470 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2471 SvPVX ((SV *)av) = (char *)ary;
2472#endif
2161 AvMAX (av) = 1; 2473 AvMAX (av) = 1;
2162 AvFILLp (av) = 0; 2474 AvFILLp (av) = 0;
2163 ary [0] = newSViv (count); 2475 ary [0] = newSViv (count);
2164 2476
2165 return newRV_noinc ((SV *)av); 2477 return newRV_noinc ((SV *)av);
2294{ 2606{
2295 if (items >= 2) 2607 if (items >= 2)
2296 { 2608 {
2297 /* callback form */ 2609 /* callback form */
2298 AV *av = (AV *)SvRV (arg [0]); 2610 AV *av = (AV *)SvRV (arg [0]);
2299 CV *cb_cv = coro_sv_2cv (arg [1]); 2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2300 2612
2301 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2302 2614
2303 if (SvIVX (AvARRAY (av)[0]) > 0) 2615 if (SvIVX (AvARRAY (av)[0]) > 0)
2304 coro_semaphore_adjust (aTHX_ av, 0); 2616 coro_semaphore_adjust (aTHX_ av, 0);
2390 dXSARGS; 2702 dXSARGS;
2391 AV *state = (AV *)GENSUB_ARG; 2703 AV *state = (AV *)GENSUB_ARG;
2392 SV *coro = av_pop (state); 2704 SV *coro = av_pop (state);
2393 SV *data_sv = newSV (sizeof (struct io_state)); 2705 SV *data_sv = newSV (sizeof (struct io_state));
2394 2706
2395 av_extend (state, items); 2707 av_extend (state, items - 1);
2396 2708
2397 sv_upgrade (data_sv, SVt_PV); 2709 sv_upgrade (data_sv, SVt_PV);
2398 SvCUR_set (data_sv, sizeof (struct io_state)); 2710 SvCUR_set (data_sv, sizeof (struct io_state));
2399 SvPOK_only (data_sv); 2711 SvPOK_only (data_sv);
2400 2712
2535 XSRETURN_EMPTY; 2847 XSRETURN_EMPTY;
2536} 2848}
2537 2849
2538/*****************************************************************************/ 2850/*****************************************************************************/
2539 2851
2852#if CORO_CLONE
2853# include "clone.c"
2854#endif
2855
2540MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2541 2857
2542PROTOTYPES: DISABLE 2858PROTOTYPES: DISABLE
2543 2859
2544BOOT: 2860BOOT:
2548 coro_thx = PERL_GET_CONTEXT; 2864 coro_thx = PERL_GET_CONTEXT;
2549# endif 2865# endif
2550#endif 2866#endif
2551 BOOT_PAGESIZE; 2867 BOOT_PAGESIZE;
2552 2868
2869 cctx_current = cctx_new_empty ();
2870
2553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2871 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2872 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2555 2873
2556 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2874 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; 2875 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2576 2894
2577 { 2895 {
2578 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2896 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579 2897
2580 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2898 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581 hv_store_ent (PL_custom_op_names, slf, 2899 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582 newSVpv ("coro_slf", 0), 0);
2583 2900
2584 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2901 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585 hv_store_ent (PL_custom_op_descs, slf, 2902 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586 newSVpv ("coro schedule like function", 0), 0);
2587 } 2903 }
2588 2904
2589 coroapi.ver = CORO_API_VERSION; 2905 coroapi.ver = CORO_API_VERSION;
2590 coroapi.rev = CORO_API_REVISION; 2906 coroapi.rev = CORO_API_REVISION;
2591 2907
2610 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2611} 2927}
2612 2928
2613SV * 2929SV *
2614new (char *klass, ...) 2930new (char *klass, ...)
2931 ALIAS:
2932 Coro::new = 1
2615 CODE: 2933 CODE:
2616{ 2934{
2617 struct coro *coro; 2935 struct coro *coro;
2618 MAGIC *mg; 2936 MAGIC *mg;
2619 HV *hv; 2937 HV *hv;
2620 CV *cb; 2938 CV *cb;
2621 int i; 2939 int i;
2622 2940
2623 if (items > 1) 2941 if (items > 1)
2624 { 2942 {
2625 cb = coro_sv_2cv (ST (1)); 2943 cb = coro_sv_2cv (aTHX_ ST (1));
2626 2944
2945 if (!ix)
2946 {
2627 if (CvISXSUB (cb)) 2947 if (CvISXSUB (cb))
2628 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629 2949
2630 if (!CvROOT (cb)) 2950 if (!CvROOT (cb))
2631 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2632 } 2953 }
2633 2954
2634 Newz (0, coro, 1, struct coro); 2955 Newz (0, coro, 1, struct coro);
2635 coro->args = newAV (); 2956 coro->args = newAV ();
2636 coro->flags = CF_NEW; 2957 coro->flags = CF_NEW;
2644 mg->mg_flags |= MGf_DUP; 2965 mg->mg_flags |= MGf_DUP;
2645 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646 2967
2647 if (items > 1) 2968 if (items > 1)
2648 { 2969 {
2649 coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651 av_extend (coro->args, items - 1); 2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2652 av_push (coro->args, SvREFCNT_inc (cb)); 2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2653 for (i = 2; i < items; i++) 2980 for (i = 2; i < items; i++)
2654 av_push (coro->args, newSVsv (ST (i))); 2981 av_push (coro->args, newSVsv (ST (i)));
2655 } 2982 }
2656} 2983}
2657 OUTPUT: 2984 OUTPUT:
2673void 3000void
2674_exit (int code) 3001_exit (int code)
2675 PROTOTYPE: $ 3002 PROTOTYPE: $
2676 CODE: 3003 CODE:
2677 _exit (code); 3004 _exit (code);
3005
3006SV *
3007clone (Coro::State coro)
3008 CODE:
3009{
3010#if CORO_CLONE
3011 struct coro *ncoro = coro_clone (aTHX_ coro);
3012 MAGIC *mg;
3013 /* TODO: too much duplication */
3014 ncoro->hv = newHV ();
3015 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3016 mg->mg_flags |= MGf_DUP;
3017 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3018#else
3019 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3020#endif
3021}
3022 OUTPUT:
3023 RETVAL
2678 3024
2679int 3025int
2680cctx_stacksize (int new_stacksize = 0) 3026cctx_stacksize (int new_stacksize = 0)
2681 PROTOTYPE: ;$ 3027 PROTOTYPE: ;$
2682 CODE: 3028 CODE:
2732 eval = 1 3078 eval = 1
2733 CODE: 3079 CODE:
2734{ 3080{
2735 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2736 { 3082 {
2737 struct coro temp; 3083 struct coro *current = SvSTATE_current;
2738 3084
2739 if (!(coro->flags & CF_RUNNING)) 3085 if (current != coro)
2740 { 3086 {
2741 PUTBACK; 3087 PUTBACK;
2742 save_perl (aTHX_ &temp); 3088 save_perl (aTHX_ current);
2743 load_perl (aTHX_ coro); 3089 load_perl (aTHX_ coro);
3090 SPAGAIN;
2744 } 3091 }
2745 3092
2746 {
2747 dSP;
2748 ENTER;
2749 SAVETMPS;
2750 PUTBACK;
2751 PUSHSTACK; 3093 PUSHSTACK;
3094
2752 PUSHMARK (SP); 3095 PUSHMARK (SP);
3096 PUTBACK;
2753 3097
2754 if (ix) 3098 if (ix)
2755 eval_sv (coderef, 0); 3099 eval_sv (coderef, 0);
2756 else 3100 else
2757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3101 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2758 3102
2759 POPSTACK; 3103 POPSTACK;
2760 SPAGAIN; 3104 SPAGAIN;
2761 FREETMPS;
2762 LEAVE;
2763 PUTBACK;
2764 }
2765 3105
2766 if (!(coro->flags & CF_RUNNING)) 3106 if (current != coro)
2767 { 3107 {
3108 PUTBACK;
2768 save_perl (aTHX_ coro); 3109 save_perl (aTHX_ coro);
2769 load_perl (aTHX_ &temp); 3110 load_perl (aTHX_ current);
2770 SPAGAIN; 3111 SPAGAIN;
2771 } 3112 }
2772 } 3113 }
2773} 3114}
2774 3115
2778 ALIAS: 3119 ALIAS:
2779 is_ready = CF_READY 3120 is_ready = CF_READY
2780 is_running = CF_RUNNING 3121 is_running = CF_RUNNING
2781 is_new = CF_NEW 3122 is_new = CF_NEW
2782 is_destroyed = CF_DESTROYED 3123 is_destroyed = CF_DESTROYED
3124 is_suspended = CF_SUSPENDED
2783 CODE: 3125 CODE:
2784 RETVAL = boolSV (coro->flags & ix); 3126 RETVAL = boolSV (coro->flags & ix);
2785 OUTPUT: 3127 OUTPUT:
2786 RETVAL 3128 RETVAL
2787 3129
2803 3145
2804SV * 3146SV *
2805has_cctx (Coro::State coro) 3147has_cctx (Coro::State coro)
2806 PROTOTYPE: $ 3148 PROTOTYPE: $
2807 CODE: 3149 CODE:
2808 RETVAL = boolSV (!!coro->cctx); 3150 /* maybe manage the running flag differently */
3151 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2809 OUTPUT: 3152 OUTPUT:
2810 RETVAL 3153 RETVAL
2811 3154
2812int 3155int
2813is_traced (Coro::State coro) 3156is_traced (Coro::State coro)
2833 3176
2834void 3177void
2835force_cctx () 3178force_cctx ()
2836 PROTOTYPE: 3179 PROTOTYPE:
2837 CODE: 3180 CODE:
2838 SvSTATE_current->cctx->idle_sp = 0; 3181 cctx_current->idle_sp = 0;
2839 3182
2840void 3183void
2841swap_defsv (Coro::State self) 3184swap_defsv (Coro::State self)
2842 PROTOTYPE: $ 3185 PROTOTYPE: $
2843 ALIAS: 3186 ALIAS:
2851 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3194 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2852 3195
2853 SV *tmp = *src; *src = *dst; *dst = tmp; 3196 SV *tmp = *src; *src = *dst; *dst = tmp;
2854 } 3197 }
2855 3198
3199void
3200cancel (Coro::State self)
3201 CODE:
3202 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3204
2856 3205
2857MODULE = Coro::State PACKAGE = Coro 3206MODULE = Coro::State PACKAGE = Coro
2858 3207
2859BOOT: 3208BOOT:
2860{ 3209{
2861 int i; 3210 int i;
2862 3211
2863 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866 3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2867 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868 SvREADONLY_on (coro_current); 3217 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3218 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3219 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2869 3226
2870 coro_stash = gv_stashpv ("Coro", TRUE); 3227 coro_stash = gv_stashpv ("Coro", TRUE);
2871 3228
2872 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2873 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2881 3238
2882 { 3239 {
2883 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884 3241
2885 coroapi.schedule = api_schedule; 3242 coroapi.schedule = api_schedule;
3243 coroapi.schedule_to = api_schedule_to;
2886 coroapi.cede = api_cede; 3244 coroapi.cede = api_cede;
2887 coroapi.cede_notself = api_cede_notself; 3245 coroapi.cede_notself = api_cede_notself;
2888 coroapi.ready = api_ready; 3246 coroapi.ready = api_ready;
2889 coroapi.is_ready = api_is_ready; 3247 coroapi.is_ready = api_is_ready;
2890 coroapi.nready = coro_nready; 3248 coroapi.nready = coro_nready;
2895 SvREADONLY_on (sv); 3253 SvREADONLY_on (sv);
2896 } 3254 }
2897} 3255}
2898 3256
2899void 3257void
3258terminate (...)
3259 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3261
3262void
2900schedule (...) 3263schedule (...)
2901 CODE: 3264 CODE:
2902 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3265 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3266
3267void
3268schedule_to (...)
3269 CODE:
3270 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3271
3272void
3273cede_to (...)
3274 CODE:
3275 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903 3276
2904void 3277void
2905cede (...) 3278cede (...)
2906 CODE: 3279 CODE:
2907 CORO_EXECUTE_SLF_XS (slf_init_cede); 3280 CORO_EXECUTE_SLF_XS (slf_init_cede);
2962 CODE: 3335 CODE:
2963 RETVAL = coro_nready; 3336 RETVAL = coro_nready;
2964 OUTPUT: 3337 OUTPUT:
2965 RETVAL 3338 RETVAL
2966 3339
2967# for async_pool speedup
2968void 3340void
2969_pool_1 (SV *cb) 3341_pool_handler (...)
2970 CODE: 3342 CODE:
2971{ 3343 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 3344
2979 if (!invoke) 3345void
3346async_pool (SV *cv, ...)
3347 PROTOTYPE: &@
3348 PPCODE:
3349{
3350 HV *hv = (HV *)av_pop (av_async_pool);
3351 AV *av = newAV ();
3352 SV *cb = ST (0);
3353 int i;
3354
3355 av_extend (av, items - 2);
3356 for (i = 1; i < items; ++i)
3357 av_push (av, SvREFCNT_inc_NN (ST (i)));
3358
3359 if ((SV *)hv == &PL_sv_undef)
2980 { 3360 {
2981 SV *old = PL_diehook; 3361 PUSHMARK (SP);
2982 PL_diehook = 0; 3362 EXTEND (SP, 2);
2983 SvREFCNT_dec (old); 3363 PUSHs (sv_Coro);
2984 croak ("\3async_pool terminate\2\n"); 3364 PUSHs ((SV *)cv_pool_handler);
3365 PUTBACK;
3366 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3367 SPAGAIN;
3368
3369 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2985 } 3370 }
2986 3371
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 { 3372 {
3000 av_fill (defav, len - 1); 3373 struct coro *coro = SvSTATE_hv (hv);
3001 for (i = 0; i < len; ++i) 3374
3002 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3375 assert (!coro->invoke_cb);
3376 assert (!coro->invoke_av);
3377 coro->invoke_cb = SvREFCNT_inc (cb);
3378 coro->invoke_av = av;
3003 } 3379 }
3004}
3005 3380
3006void 3381 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 3382
3013 sv_setsv (cb, &PL_sv_undef); 3383 if (GIMME_V != G_VOID)
3014 3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3385 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); 3386 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} 3387}
3038 3388
3039SV * 3389SV *
3040rouse_cb () 3390rouse_cb ()
3041 PROTOTYPE: 3391 PROTOTYPE:
3047void 3397void
3048rouse_wait (...) 3398rouse_wait (...)
3049 PROTOTYPE: ;$ 3399 PROTOTYPE: ;$
3050 PPCODE: 3400 PPCODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3401 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3402
3403void
3404on_enter (SV *block)
3405 ALIAS:
3406 on_leave = 1
3407 PROTOTYPE: &
3408 CODE:
3409{
3410 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412
3413 block = (SV *)coro_sv_2cv (aTHX_ block);
3414
3415 if (!*avp)
3416 *avp = newAV ();
3417
3418 av_push (*avp, SvREFCNT_inc (block));
3419
3420 if (!ix)
3421 on_enterleave_call (aTHX_ block);
3422
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
3424 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3425 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
3426}
3052 3427
3053 3428
3054MODULE = Coro::State PACKAGE = PerlIO::cede 3429MODULE = Coro::State PACKAGE = PerlIO::cede
3055 3430
3056BOOT: 3431BOOT:
3067 GvSTASH (CvGV (cv)) 3442 GvSTASH (CvGV (cv))
3068 ); 3443 );
3069 OUTPUT: 3444 OUTPUT:
3070 RETVAL 3445 RETVAL
3071 3446
3072# helper for Coro::Channel 3447# helper for Coro::Channel and others
3073SV * 3448SV *
3074_alloc (int count) 3449_alloc (int count)
3075 CODE: 3450 CODE:
3076 RETVAL = coro_waitarray_new (aTHX_ count); 3451 RETVAL = coro_waitarray_new (aTHX_ count);
3077 OUTPUT: 3452 OUTPUT:
3135 for (i = 1; i <= wcount; ++i) 3510 for (i = 1; i <= wcount; ++i)
3136 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3511 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3137 } 3512 }
3138} 3513}
3139 3514
3515MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3516
3517void
3518_may_delete (SV *sem, int count, int extra_refs)
3519 PPCODE:
3520{
3521 AV *av = (AV *)SvRV (sem);
3522
3523 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3524 && AvFILLp (av) == 0 /* no waiters, just count */
3525 && SvIV (AvARRAY (av)[0]) == count)
3526 XSRETURN_YES;
3527
3528 XSRETURN_NO;
3529}
3530
3140MODULE = Coro::State PACKAGE = Coro::Signal 3531MODULE = Coro::State PACKAGE = Coro::Signal
3141 3532
3142SV * 3533SV *
3143new (SV *klass) 3534new (SV *klass)
3144 CODE: 3535 CODE:
3215 3606
3216void 3607void
3217_register (char *target, char *proto, SV *req) 3608_register (char *target, char *proto, SV *req)
3218 CODE: 3609 CODE:
3219{ 3610{
3220 CV *req_cv = coro_sv_2cv (req); 3611 CV *req_cv = coro_sv_2cv (aTHX_ req);
3221 /* newXSproto doesn't return the CV on 5.8 */ 3612 /* newXSproto doesn't return the CV on 5.8 */
3222 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3613 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223 sv_setpv ((SV *)slf_cv, proto); 3614 sv_setpv ((SV *)slf_cv, proto);
3224 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3615 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225} 3616}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines