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.310 by root, Wed Nov 19 16:01:32 2008 UTC vs.
Revision 1.345 by root, Wed Dec 17 04:57:07 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];
294static CV *cv_coro_run; 320static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 321static struct coro *coro_first;
296#define coro_nready coroapi.nready 322#define coro_nready coroapi.nready
297 323
298/** lowlevel stuff **********************************************************/ 324/** lowlevel stuff **********************************************************/
299 325
327 return get_hv (name, create); 353 return get_hv (name, create);
328} 354}
329 355
330/* may croak */ 356/* may croak */
331INLINE CV * 357INLINE CV *
332coro_sv_2cv (SV *sv) 358coro_sv_2cv (pTHX_ SV *sv)
333{ 359{
334 HV *st; 360 HV *st;
335 GV *gvp; 361 GV *gvp;
336 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;
337} 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 */
338 421
339static AV * 422static AV *
340coro_clone_padlist (pTHX_ CV *cv) 423coro_derive_padlist (pTHX_ CV *cv)
341{ 424{
342 AV *padlist = CvPADLIST (cv); 425 AV *padlist = CvPADLIST (cv);
343 AV *newpadlist, *newpad; 426 AV *newpadlist, *newpad;
344 427
345 newpadlist = newAV (); 428 newpadlist = newAV ();
350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 433 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
351#endif 434#endif
352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 435 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
353 --AvFILLp (padlist); 436 --AvFILLp (padlist);
354 437
355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 438 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
356 av_store (newpadlist, 1, (SV *)newpad); 439 av_store (newpadlist, 1, (SV *)newpad);
357 440
358 return newpadlist; 441 return newpadlist;
359} 442}
360 443
361static void 444static void
362free_padlist (pTHX_ AV *padlist) 445free_padlist (pTHX_ AV *padlist)
363{ 446{
364 /* may be during global destruction */ 447 /* may be during global destruction */
365 if (SvREFCNT (padlist)) 448 if (!IN_DESTRUCT)
366 { 449 {
367 I32 i = AvFILLp (padlist); 450 I32 i = AvFILLp (padlist);
368 while (i >= 0) 451
452 while (i > 0) /* special-case index 0 */
369 { 453 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 454 /* we try to be extra-careful here */
371 if (svp) 455 AV *av = (AV *)AvARRAY (padlist)[i--];
372 { 456 I32 j = AvFILLp (av);
373 SV *sv; 457
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 458 while (j >= 0)
459 SvREFCNT_dec (AvARRAY (av)[j--]);
460
461 AvFILLp (av) = -1;
375 SvREFCNT_dec (sv); 462 SvREFCNT_dec (av);
376
377 SvREFCNT_dec (*svp);
378 }
379 } 463 }
380 464
465 SvREFCNT_dec (AvARRAY (padlist)[0]);
466
467 AvFILLp (padlist) = -1;
381 SvREFCNT_dec ((SV*)padlist); 468 SvREFCNT_dec ((SV*)padlist);
382 } 469 }
383} 470}
384 471
385static int 472static int
394 481
395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 482 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
396 483
397 return 0; 484 return 0;
398} 485}
399
400#define CORO_MAGIC_type_cv 26
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
402 486
403static MGVTBL coro_cv_vtbl = { 487static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0, 488 0, 0, 0, 0,
405 coro_cv_free 489 coro_cv_free
406}; 490};
407
408#define CORO_MAGIC_NN(sv, type) \
409 (expect_true (SvMAGIC (sv)->mg_type == type) \
410 ? SvMAGIC (sv) \
411 : mg_find (sv, type))
412
413#define CORO_MAGIC(sv, type) \
414 (expect_true (SvMAGIC (sv)) \
415 ? CORO_MAGIC_NN (sv, type) \
416 : 0)
417
418#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
419#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
420
421INLINE struct coro *
422SvSTATE_ (pTHX_ SV *coro)
423{
424 HV *stash;
425 MAGIC *mg;
426
427 if (SvROK (coro))
428 coro = SvRV (coro);
429
430 if (expect_false (SvTYPE (coro) != SVt_PVHV))
431 croak ("Coro::State object required");
432
433 stash = SvSTASH (coro);
434 if (expect_false (stash != coro_stash && stash != coro_state_stash))
435 {
436 /* very slow, but rare, check */
437 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
438 croak ("Coro::State object required");
439 }
440
441 mg = CORO_MAGIC_state (coro);
442 return (struct coro *)mg->mg_ptr;
443}
444
445#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
446
447/* faster than SvSTATE, but expects a coroutine hv */
448#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
449#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
450 491
451/* the next two functions merely cache the padlists */ 492/* the next two functions merely cache the padlists */
452static void 493static void
453get_padlist (pTHX_ CV *cv) 494get_padlist (pTHX_ CV *cv)
454{ 495{
465 CV *cp = Perl_cv_clone (aTHX_ cv); 506 CV *cp = Perl_cv_clone (aTHX_ cv);
466 CvPADLIST (cv) = CvPADLIST (cp); 507 CvPADLIST (cv) = CvPADLIST (cp);
467 CvPADLIST (cp) = 0; 508 CvPADLIST (cp) = 0;
468 SvREFCNT_dec (cp); 509 SvREFCNT_dec (cp);
469#else 510#else
470 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 511 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
471#endif 512#endif
472 } 513 }
473} 514}
474 515
475static void 516static void
482 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);
483 524
484 av = (AV *)mg->mg_obj; 525 av = (AV *)mg->mg_obj;
485 526
486 if (expect_false (AvFILLp (av) >= AvMAX (av))) 527 if (expect_false (AvFILLp (av) >= AvMAX (av)))
487 av_extend (av, AvMAX (av) + 1); 528 av_extend (av, AvFILLp (av) + 1);
488 529
489 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
490} 531}
491 532
492/** load & save, init *******************************************************/ 533/** load & save, init *******************************************************/
534
535static void
536on_enterleave_call (pTHX_ SV *cb);
493 537
494static void 538static void
495load_perl (pTHX_ Coro__State c) 539load_perl (pTHX_ Coro__State c)
496{ 540{
497 perl_slots *slot = c->slot; 541 perl_slots *slot = c->slot;
498 c->slot = 0; 542 c->slot = 0;
499 543
500 PL_mainstack = c->mainstack; 544 PL_mainstack = c->mainstack;
501 545
502 GvSV (PL_defgv) = slot->defsv; 546 GvSV (PL_defgv) = slot->defsv;
503 GvAV (PL_defgv) = slot->defav; 547 GvAV (PL_defgv) = slot->defav;
504 GvSV (PL_errgv) = slot->errsv; 548 GvSV (PL_errgv) = slot->errsv;
505 GvSV (irsgv) = slot->irsgv; 549 GvSV (irsgv) = slot->irsgv;
550 GvHV (PL_hintgv) = slot->hinthv;
506 551
507 #define VAR(name,type) PL_ ## name = slot->name; 552 #define VAR(name,type) PL_ ## name = slot->name;
508 # include "state.h" 553 # include "state.h"
509 #undef VAR 554 #undef VAR
510 555
524 PUTBACK; 569 PUTBACK;
525 } 570 }
526 571
527 slf_frame = c->slf_frame; 572 slf_frame = c->slf_frame;
528 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 }
529} 582}
530 583
531static void 584static void
532save_perl (pTHX_ Coro__State c) 585save_perl (pTHX_ Coro__State c)
533{ 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
534 c->except = CORO_THROW; 595 c->except = CORO_THROW;
535 c->slf_frame = slf_frame; 596 c->slf_frame = slf_frame;
536 597
537 { 598 {
538 dSP; 599 dSP;
596 c->mainstack = PL_mainstack; 657 c->mainstack = PL_mainstack;
597 658
598 { 659 {
599 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 660 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
600 661
601 slot->defav = GvAV (PL_defgv); 662 slot->defav = GvAV (PL_defgv);
602 slot->defsv = DEFSV; 663 slot->defsv = DEFSV;
603 slot->errsv = ERRSV; 664 slot->errsv = ERRSV;
604 slot->irsgv = GvSV (irsgv); 665 slot->irsgv = GvSV (irsgv);
666 slot->hinthv = GvHV (PL_hintgv);
605 667
606 #define VAR(name,type) slot->name = PL_ ## name; 668 #define VAR(name,type) slot->name = PL_ ## name;
607 # include "state.h" 669 # include "state.h"
608 #undef VAR 670 #undef VAR
609 } 671 }
687#if !PERL_VERSION_ATLEAST (5,10,0) 749#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 750 Safefree (PL_retstack);
689#endif 751#endif
690} 752}
691 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
692static size_t 763static size_t
693coro_rss (pTHX_ struct coro *coro) 764coro_rss (pTHX_ struct coro *coro)
694{ 765{
695 size_t rss = sizeof (*coro); 766 size_t rss = sizeof (*coro);
696 767
697 if (coro->mainstack) 768 if (coro->mainstack)
698 { 769 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 770 if (coro->flags & CF_RUNNING)
703 { 771 {
704 slot = &tmp_slot; 772 #define SYM(sym) PL_ ## sym
705 773 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 774 #undef SYM
709 } 775 }
710 else 776 else
711 slot = coro->slot;
712
713 if (slot)
714 { 777 {
715 rss += sizeof (slot->curstackinfo); 778 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 779 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 780 #undef SYM
718 rss += slot->tmps_max * sizeof (SV *);
719 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
720 rss += slot->scopestack_max * sizeof (I32);
721 rss += slot->savestack_max * sizeof (ANY);
722
723#if !PERL_VERSION_ATLEAST (5,10,0)
724 rss += slot->retstack_max * sizeof (OP *);
725#endif
726 } 781 }
727 } 782 }
728 783
729 return rss; 784 return rss;
730} 785}
743#endif 798#endif
744 799
745/* 800/*
746 * This overrides the default magic get method of %SIG elements. 801 * This overrides the default magic get method of %SIG elements.
747 * 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
748 * 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
749 * readback here. 804 * readback here.
750 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
751 * not expecting this to actually change the hook. This is a potential problem
752 * when a schedule happens then, but we ignore this.
753 */ 805 */
754static int 806static int
755coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
756{ 808{
757 const char *s = MgPV_nolen_const (mg); 809 const char *s = MgPV_nolen_const (mg);
810 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 862 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
811 863
812 if (svp) 864 if (svp)
813 { 865 {
814 SV *old = *svp; 866 SV *old = *svp;
815 *svp = newSVsv (sv); 867 *svp = SvOK (sv) ? newSVsv (sv) : 0;
816 SvREFCNT_dec (old); 868 SvREFCNT_dec (old);
817 return 0; 869 return 0;
818 } 870 }
819 } 871 }
820 872
830 882
831static int 883static int
832slf_check_nop (pTHX_ struct CoroSLF *frame) 884slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 885{
834 return 0; 886 return 0;
887}
888
889static int
890slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{
892 return 1;
835} 893}
836 894
837static UNOP coro_setup_op; 895static UNOP coro_setup_op;
838 896
839static 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 */
846 904
847 PL_runops = RUNOPS_DEFAULT; 905 PL_runops = RUNOPS_DEFAULT;
848 PL_curcop = &PL_compiling; 906 PL_curcop = &PL_compiling;
849 PL_in_eval = EVAL_NULL; 907 PL_in_eval = EVAL_NULL;
850 PL_comppad = 0; 908 PL_comppad = 0;
909 PL_comppad_name = 0;
910 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0;
851 PL_curpm = 0; 912 PL_curpm = 0;
852 PL_curpad = 0; 913 PL_curpad = 0;
853 PL_localizing = 0; 914 PL_localizing = 0;
854 PL_dirty = 0; 915 PL_dirty = 0;
855 PL_restartop = 0; 916 PL_restartop = 0;
856#if PERL_VERSION_ATLEAST (5,10,0) 917#if PERL_VERSION_ATLEAST (5,10,0)
857 PL_parser = 0; 918 PL_parser = 0;
858#endif 919#endif
920 PL_hints = 0;
859 921
860 /* recreate the die/warn hooks */ 922 /* recreate the die/warn hooks */
861 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 );
862 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);
863 925
864 GvSV (PL_defgv) = newSV (0); 926 GvSV (PL_defgv) = newSV (0);
865 GvAV (PL_defgv) = coro->args; coro->args = 0; 927 GvAV (PL_defgv) = coro->args; coro->args = 0;
866 GvSV (PL_errgv) = newSV (0); 928 GvSV (PL_errgv) = newSV (0);
867 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;
868 PL_rs = newSVsv (GvSV (irsgv)); 931 PL_rs = newSVsv (GvSV (irsgv));
869 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 932 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
870 933
871 { 934 {
872 dSP; 935 dSP;
890 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 */
891 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 */
892 955
893 /* 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 */
894 coro_setup_op.op_next = PL_op; 957 coro_setup_op.op_next = PL_op;
895 coro_setup_op.op_type = OP_CUSTOM; 958 coro_setup_op.op_type = OP_ENTERSUB;
896 coro_setup_op.op_ppaddr = pp_slf; 959 coro_setup_op.op_ppaddr = pp_slf;
897 /* no flags etc. required, as an init function won't be called */ 960 /* no flags etc. required, as an init function won't be called */
898 961
899 PL_op = (OP *)&coro_setup_op; 962 PL_op = (OP *)&coro_setup_op;
900 963
901 /* copy throw, in case it was set before coro_setup */ 964 /* copy throw, in case it was set before coro_setup */
902 CORO_THROW = coro->except; 965 CORO_THROW = coro->except;
903} 966}
904 967
905static void 968static void
906coro_destruct (pTHX_ struct coro *coro) 969coro_unwind_stacks (pTHX)
907{ 970{
908 if (!IN_DESTRUCT) 971 if (!IN_DESTRUCT)
909 { 972 {
910 /* restore all saved variables and stuff */ 973 /* restore all saved variables and stuff */
911 LEAVE_SCOPE (0); 974 LEAVE_SCOPE (0);
919 POPSTACK_TO (PL_mainstack); 982 POPSTACK_TO (PL_mainstack);
920 983
921 /* unwind main stack */ 984 /* unwind main stack */
922 dounwind (-1); 985 dounwind (-1);
923 } 986 }
987}
988
989static void
990coro_destruct_perl (pTHX_ struct coro *coro)
991{
992 coro_unwind_stacks (aTHX);
924 993
925 SvREFCNT_dec (GvSV (PL_defgv)); 994 SvREFCNT_dec (GvSV (PL_defgv));
926 SvREFCNT_dec (GvAV (PL_defgv)); 995 SvREFCNT_dec (GvAV (PL_defgv));
927 SvREFCNT_dec (GvSV (PL_errgv)); 996 SvREFCNT_dec (GvSV (PL_errgv));
928 SvREFCNT_dec (PL_defoutgv); 997 SvREFCNT_dec (PL_defoutgv);
929 SvREFCNT_dec (PL_rs); 998 SvREFCNT_dec (PL_rs);
930 SvREFCNT_dec (GvSV (irsgv)); 999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
931 1001
932 SvREFCNT_dec (PL_diehook); 1002 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook); 1003 SvREFCNT_dec (PL_warnhook);
934 1004
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 */
1154 /* 1220 /*
1155 * 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
1156 * 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)
1157 * 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
1158 * bootstrap-time "top" top_env, as we cannot restore the "main" 1224 * bootstrap-time "top" top_env, as we cannot restore the "main"
1159 * 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.
1160 */ 1228 */
1161 PL_top_env = main_top_env; 1229 PL_top_env = main_top_env;
1162 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 */
1163 } 1231 }
1164} 1232}
1241cctx_destroy (coro_cctx *cctx) 1309cctx_destroy (coro_cctx *cctx)
1242{ 1310{
1243 if (!cctx) 1311 if (!cctx)
1244 return; 1312 return;
1245 1313
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1315
1246 --cctx_count; 1316 --cctx_count;
1247 coro_destroy (&cctx->cctx); 1317 coro_destroy (&cctx->cctx);
1248 1318
1249 /* coro_transfer creates new, empty cctx's */ 1319 /* coro_transfer creates new, empty cctx's */
1250 if (cctx->sptr) 1320 if (cctx->sptr)
1313 /* TODO: throwing up here is considered harmful */ 1383 /* TODO: throwing up here is considered harmful */
1314 1384
1315 if (expect_true (prev != next)) 1385 if (expect_true (prev != next))
1316 { 1386 {
1317 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1318 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,");
1319 1389
1320 if (expect_false (next->flags & CF_RUNNING))
1321 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1322
1323 if (expect_false (next->flags & CF_DESTROYED)) 1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1324 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,");
1325 1392
1326#if !PERL_VERSION_ATLEAST (5,10,0) 1393#if !PERL_VERSION_ATLEAST (5,10,0)
1327 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1394 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1328 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,");
1329#endif 1396#endif
1335transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1336{ 1403{
1337 dSTACKLEVEL; 1404 dSTACKLEVEL;
1338 1405
1339 /* sometimes transfer is only called to set idle_sp */ 1406 /* sometimes transfer is only called to set idle_sp */
1340 if (expect_false (!next)) 1407 if (expect_false (!prev))
1341 { 1408 {
1342 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1409 cctx_current->idle_sp = STACKLEVEL;
1343 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 */
1344 } 1411 }
1345 else if (expect_true (prev != next)) 1412 else if (expect_true (prev != next))
1346 { 1413 {
1347 coro_cctx *prev__cctx; 1414 coro_cctx *cctx_prev;
1348 1415
1349 if (expect_false (prev->flags & CF_NEW)) 1416 if (expect_false (prev->flags & CF_NEW))
1350 { 1417 {
1351 /* create a new empty/source context */ 1418 /* create a new empty/source context */
1352 prev->cctx = cctx_new_empty ();
1353 prev->flags &= ~CF_NEW; 1419 prev->flags &= ~CF_NEW;
1354 prev->flags |= CF_RUNNING; 1420 prev->flags |= CF_RUNNING;
1355 } 1421 }
1356 1422
1357 prev->flags &= ~CF_RUNNING; 1423 prev->flags &= ~CF_RUNNING;
1368 coro_setup (aTHX_ next); 1434 coro_setup (aTHX_ next);
1369 } 1435 }
1370 else 1436 else
1371 load_perl (aTHX_ next); 1437 load_perl (aTHX_ next);
1372 1438
1373 prev__cctx = prev->cctx;
1374
1375 /* possibly untie and reuse the cctx */ 1439 /* possibly untie and reuse the cctx */
1376 if (expect_true ( 1440 if (expect_true (
1377 prev__cctx->idle_sp == STACKLEVEL 1441 cctx_current->idle_sp == STACKLEVEL
1378 && !(prev__cctx->flags & CC_TRACE) 1442 && !(cctx_current->flags & CC_TRACE)
1379 && !force_cctx 1443 && !force_cctx
1380 )) 1444 ))
1381 { 1445 {
1382 /* 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 */
1383 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));
1384 1448
1385 prev->cctx = 0;
1386
1387 /* 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. */
1388 /* 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 */
1389 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1451 if (expect_false (CCTX_EXPIRED (cctx_current)))
1390 if (!next->cctx) 1452 if (expect_true (!next->cctx))
1391 next->cctx = cctx_get (aTHX); 1453 next->cctx = cctx_get (aTHX);
1392 1454
1393 cctx_put (prev__cctx); 1455 cctx_put (cctx_current);
1394 } 1456 }
1457 else
1458 prev->cctx = cctx_current;
1395 1459
1396 ++next->usecount; 1460 ++next->usecount;
1397 1461
1398 if (expect_true (!next->cctx)) 1462 cctx_prev = cctx_current;
1399 next->cctx = cctx_get (aTHX); 1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1400 1464
1401 if (expect_false (prev__cctx != next->cctx)) 1465 next->cctx = 0;
1466
1467 if (expect_false (cctx_prev != cctx_current))
1402 { 1468 {
1403 prev__cctx->top_env = PL_top_env; 1469 cctx_prev->top_env = PL_top_env;
1404 PL_top_env = next->cctx->top_env; 1470 PL_top_env = cctx_current->top_env;
1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1406 } 1472 }
1407 1473
1408 transfer_tail (aTHX); 1474 transfer_tail (aTHX);
1409 } 1475 }
1410} 1476}
1418coro_state_destroy (pTHX_ struct coro *coro) 1484coro_state_destroy (pTHX_ struct coro *coro)
1419{ 1485{
1420 if (coro->flags & CF_DESTROYED) 1486 if (coro->flags & CF_DESTROYED)
1421 return 0; 1487 return 0;
1422 1488
1423 if (coro->on_destroy) 1489 if (coro->on_destroy && !PL_dirty)
1424 coro->on_destroy (aTHX_ coro); 1490 coro->on_destroy (aTHX_ coro);
1425 1491
1426 coro->flags |= CF_DESTROYED; 1492 coro->flags |= CF_DESTROYED;
1427 1493
1428 if (coro->flags & CF_READY) 1494 if (coro->flags & CF_READY)
1432 --coro_nready; 1498 --coro_nready;
1433 } 1499 }
1434 else 1500 else
1435 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 */
1436 1502
1437 if (coro->mainstack && coro->mainstack != main_mainstack) 1503 if (coro->mainstack
1504 && coro->mainstack != main_mainstack
1505 && coro->slot
1506 && !PL_dirty)
1438 { 1507 {
1439 struct coro temp; 1508 struct coro *current = SvSTATE_current;
1440 1509
1441 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));
1442 1511
1443 save_perl (aTHX_ &temp); 1512 save_perl (aTHX_ current);
1444 load_perl (aTHX_ coro); 1513 load_perl (aTHX_ coro);
1445 1514
1446 coro_destruct (aTHX_ coro); 1515 coro_destruct_perl (aTHX_ coro);
1447 1516
1448 load_perl (aTHX_ &temp); 1517 load_perl (aTHX_ current);
1449 1518
1450 coro->slot = 0; 1519 coro->slot = 0;
1451 } 1520 }
1452 1521
1453 cctx_destroy (coro->cctx); 1522 cctx_destroy (coro->cctx);
1565{ 1634{
1566 struct coro *coro; 1635 struct coro *coro;
1567 SV *sv_hook; 1636 SV *sv_hook;
1568 void (*xs_hook)(void); 1637 void (*xs_hook)(void);
1569 1638
1570 if (SvROK (coro_sv))
1571 coro_sv = SvRV (coro_sv);
1572
1573 coro = SvSTATE (coro_sv); 1639 coro = SvSTATE (coro_sv);
1574 1640
1575 if (coro->flags & CF_READY) 1641 if (coro->flags & CF_READY)
1576 return 0; 1642 return 0;
1577 1643
1608api_is_ready (pTHX_ SV *coro_sv) 1674api_is_ready (pTHX_ SV *coro_sv)
1609{ 1675{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1676 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1677}
1612 1678
1679/* expects to own a reference to next->hv */
1613INLINE void 1680INLINE void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1615{ 1682{
1616 SV *prev_sv, *next_sv;
1617
1618 for (;;)
1619 {
1620 next_sv = coro_deq (aTHX);
1621
1622 /* nothing to schedule: call the idle handler */
1623 if (expect_false (!next_sv))
1624 {
1625 dSP;
1626
1627 ENTER;
1628 SAVETMPS;
1629
1630 PUSHMARK (SP);
1631 PUTBACK;
1632 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1633
1634 FREETMPS;
1635 LEAVE;
1636 continue;
1637 }
1638
1639 ta->next = SvSTATE_hv (next_sv);
1640
1641 /* cannot transfer to destroyed coros, skip and look for next */
1642 if (expect_false (ta->next->flags & CF_DESTROYED))
1643 {
1644 SvREFCNT_dec (next_sv);
1645 /* coro_nready has already been taken care of by destroy */
1646 continue;
1647 }
1648
1649 --coro_nready;
1650 break;
1651 }
1652
1653 /* free this only after the transfer */
1654 prev_sv = SvRV (coro_current); 1683 SV *prev_sv = SvRV (coro_current);
1684
1655 ta->prev = SvSTATE_hv (prev_sv); 1685 ta->prev = SvSTATE_hv (prev_sv);
1686 ta->next = next;
1687
1656 TRANSFER_CHECK (*ta); 1688 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1689
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv); 1690 SvRV_set (coro_current, (SV *)next->hv);
1660 1691
1661 free_coro_mortal (aTHX); 1692 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv; 1693 coro_mortal = prev_sv;
1663} 1694}
1664 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
1665INLINE void 1747INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1748prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1749{
1668 api_ready (aTHX_ coro_current); 1750 api_ready (aTHX_ coro_current);
1669 prepare_schedule (aTHX_ ta); 1751 prepare_schedule (aTHX_ ta);
1688{ 1770{
1689 struct coro_transfer_args ta; 1771 struct coro_transfer_args ta;
1690 1772
1691 prepare_schedule (aTHX_ &ta); 1773 prepare_schedule (aTHX_ &ta);
1692 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);
1693} 1785}
1694 1786
1695static int 1787static int
1696api_cede (pTHX) 1788api_cede (pTHX)
1697{ 1789{
1726static void 1818static void
1727api_trace (pTHX_ SV *coro_sv, int flags) 1819api_trace (pTHX_ SV *coro_sv, int flags)
1728{ 1820{
1729 struct coro *coro = SvSTATE (coro_sv); 1821 struct coro *coro = SvSTATE (coro_sv);
1730 1822
1823 if (coro->flags & CF_RUNNING)
1824 croak ("cannot enable tracing on a running coroutine, caught");
1825
1731 if (flags & CC_TRACE) 1826 if (flags & CC_TRACE)
1732 { 1827 {
1733 if (!coro->cctx) 1828 if (!coro->cctx)
1734 coro->cctx = cctx_new_run (); 1829 coro->cctx = cctx_new_run ();
1735 else if (!(coro->cctx->flags & CC_TRACE)) 1830 else if (!(coro->cctx->flags & CC_TRACE))
1736 croak ("cannot enable tracing on coroutine with custom stack,"); 1831 croak ("cannot enable tracing on coroutine with custom stack, caught");
1737 1832
1738 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1833 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1739 } 1834 }
1740 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1835 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1741 { 1836 {
1746 else 1841 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1842 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1843 }
1749} 1844}
1750 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
1751/*****************************************************************************/ 1979/*****************************************************************************/
1752/* rouse callback */ 1980/* rouse callback */
1753 1981
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1982#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 1983
1760 SV *data = (SV *)GENSUB_ARG; 1988 SV *data = (SV *)GENSUB_ARG;
1761 1989
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1990 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 1991 {
1764 /* first call, set args */ 1992 /* first call, set args */
1765 int i;
1766 AV *av = newAV (); 1993 AV *av = newAV ();
1767 SV *coro = SvRV (data); 1994 SV *coro = SvRV (data);
1768 1995
1769 SvRV_set (data, (SV *)av); 1996 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro); 1997 api_ready (aTHX_ coro);
1911static void 2138static void
1912slf_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)
1913{ 2140{
1914 frame->prepare = prepare_schedule; 2141 frame->prepare = prepare_schedule;
1915 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);
1916} 2171}
1917 2172
1918static void 2173static void
1919slf_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)
1920{ 2175{
2066 } 2321 }
2067 else 2322 else
2068 slf_argc = 0; 2323 slf_argc = 0;
2069 2324
2070 PL_op->op_ppaddr = pp_slf; 2325 PL_op->op_ppaddr = pp_slf;
2071 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 */
2072 2327
2073 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));
2074} 2376}
2075 2377
2076/*****************************************************************************/ 2378/*****************************************************************************/
2077/* PerlIO::cede */ 2379/* PerlIO::cede */
2078 2380
2159 SV **ary; 2461 SV **ary;
2160 2462
2161 /* unfortunately, building manually saves memory */ 2463 /* unfortunately, building manually saves memory */
2162 Newx (ary, 2, SV *); 2464 Newx (ary, 2, SV *);
2163 AvALLOC (av) = ary; 2465 AvALLOC (av) = ary;
2466#if PERL_VERSION_ATLEAST (5,10,0)
2164 /*AvARRAY (av) = ary;*/ 2467 AvARRAY (av) = ary;
2468#else
2165 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
2166 AvMAX (av) = 1; 2473 AvMAX (av) = 1;
2167 AvFILLp (av) = 0; 2474 AvFILLp (av) = 0;
2168 ary [0] = newSViv (count); 2475 ary [0] = newSViv (count);
2169 2476
2170 return newRV_noinc ((SV *)av); 2477 return newRV_noinc ((SV *)av);
2299{ 2606{
2300 if (items >= 2) 2607 if (items >= 2)
2301 { 2608 {
2302 /* callback form */ 2609 /* callback form */
2303 AV *av = (AV *)SvRV (arg [0]); 2610 AV *av = (AV *)SvRV (arg [0]);
2304 CV *cb_cv = coro_sv_2cv (arg [1]); 2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2305 2612
2306 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2307 2614
2308 if (SvIVX (AvARRAY (av)[0]) > 0) 2615 if (SvIVX (AvARRAY (av)[0]) > 0)
2309 coro_semaphore_adjust (aTHX_ av, 0); 2616 coro_semaphore_adjust (aTHX_ av, 0);
2395 dXSARGS; 2702 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2703 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2704 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2705 SV *data_sv = newSV (sizeof (struct io_state));
2399 2706
2400 av_extend (state, items); 2707 av_extend (state, items - 1);
2401 2708
2402 sv_upgrade (data_sv, SVt_PV); 2709 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2710 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2711 SvPOK_only (data_sv);
2405 2712
2540 XSRETURN_EMPTY; 2847 XSRETURN_EMPTY;
2541} 2848}
2542 2849
2543/*****************************************************************************/ 2850/*****************************************************************************/
2544 2851
2852#if CORO_CLONE
2853# include "clone.c"
2854#endif
2855
2545MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2546 2857
2547PROTOTYPES: DISABLE 2858PROTOTYPES: DISABLE
2548 2859
2549BOOT: 2860BOOT:
2553 coro_thx = PERL_GET_CONTEXT; 2864 coro_thx = PERL_GET_CONTEXT;
2554# endif 2865# endif
2555#endif 2866#endif
2556 BOOT_PAGESIZE; 2867 BOOT_PAGESIZE;
2557 2868
2869 cctx_current = cctx_new_empty ();
2870
2558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2871 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2872 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2560 2873
2561 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;
2562 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;
2581 2894
2582 { 2895 {
2583 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2896 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2584 2897
2585 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2898 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2586 hv_store_ent (PL_custom_op_names, slf, 2899 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2587 newSVpv ("coro_slf", 0), 0);
2588 2900
2589 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2901 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2590 hv_store_ent (PL_custom_op_descs, slf, 2902 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2591 newSVpv ("coro schedule like function", 0), 0);
2592 } 2903 }
2593 2904
2594 coroapi.ver = CORO_API_VERSION; 2905 coroapi.ver = CORO_API_VERSION;
2595 coroapi.rev = CORO_API_REVISION; 2906 coroapi.rev = CORO_API_REVISION;
2596 2907
2627 CV *cb; 2938 CV *cb;
2628 int i; 2939 int i;
2629 2940
2630 if (items > 1) 2941 if (items > 1)
2631 { 2942 {
2632 cb = coro_sv_2cv (ST (1)); 2943 cb = coro_sv_2cv (aTHX_ ST (1));
2633 2944
2634 if (!ix) 2945 if (!ix)
2635 { 2946 {
2636 if (CvISXSUB (cb)) 2947 if (CvISXSUB (cb))
2637 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");
2654 mg->mg_flags |= MGf_DUP; 2965 mg->mg_flags |= MGf_DUP;
2655 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2656 2967
2657 if (items > 1) 2968 if (items > 1)
2658 { 2969 {
2659 av_extend (coro->args, items - 1 + ix); 2970 av_extend (coro->args, items - 1 + ix - 1);
2660 2971
2661 if (ix) 2972 if (ix)
2662 { 2973 {
2663 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2664 cb = cv_coro_run; 2975 cb = cv_coro_run;
2689void 3000void
2690_exit (int code) 3001_exit (int code)
2691 PROTOTYPE: $ 3002 PROTOTYPE: $
2692 CODE: 3003 CODE:
2693 _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
2694 3024
2695int 3025int
2696cctx_stacksize (int new_stacksize = 0) 3026cctx_stacksize (int new_stacksize = 0)
2697 PROTOTYPE: ;$ 3027 PROTOTYPE: ;$
2698 CODE: 3028 CODE:
2748 eval = 1 3078 eval = 1
2749 CODE: 3079 CODE:
2750{ 3080{
2751 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2752 { 3082 {
2753 struct coro temp; 3083 struct coro *current = SvSTATE_current;
2754 3084
2755 if (!(coro->flags & CF_RUNNING)) 3085 if (current != coro)
2756 { 3086 {
2757 PUTBACK; 3087 PUTBACK;
2758 save_perl (aTHX_ &temp); 3088 save_perl (aTHX_ current);
2759 load_perl (aTHX_ coro); 3089 load_perl (aTHX_ coro);
3090 SPAGAIN;
2760 } 3091 }
2761 3092
2762 {
2763 dSP;
2764 ENTER;
2765 SAVETMPS;
2766 PUTBACK;
2767 PUSHSTACK; 3093 PUSHSTACK;
3094
2768 PUSHMARK (SP); 3095 PUSHMARK (SP);
3096 PUTBACK;
2769 3097
2770 if (ix) 3098 if (ix)
2771 eval_sv (coderef, 0); 3099 eval_sv (coderef, 0);
2772 else 3100 else
2773 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3101 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2774 3102
2775 POPSTACK; 3103 POPSTACK;
2776 SPAGAIN; 3104 SPAGAIN;
2777 FREETMPS;
2778 LEAVE;
2779 PUTBACK;
2780 }
2781 3105
2782 if (!(coro->flags & CF_RUNNING)) 3106 if (current != coro)
2783 { 3107 {
3108 PUTBACK;
2784 save_perl (aTHX_ coro); 3109 save_perl (aTHX_ coro);
2785 load_perl (aTHX_ &temp); 3110 load_perl (aTHX_ current);
2786 SPAGAIN; 3111 SPAGAIN;
2787 } 3112 }
2788 } 3113 }
2789} 3114}
2790 3115
2794 ALIAS: 3119 ALIAS:
2795 is_ready = CF_READY 3120 is_ready = CF_READY
2796 is_running = CF_RUNNING 3121 is_running = CF_RUNNING
2797 is_new = CF_NEW 3122 is_new = CF_NEW
2798 is_destroyed = CF_DESTROYED 3123 is_destroyed = CF_DESTROYED
3124 is_suspended = CF_SUSPENDED
2799 CODE: 3125 CODE:
2800 RETVAL = boolSV (coro->flags & ix); 3126 RETVAL = boolSV (coro->flags & ix);
2801 OUTPUT: 3127 OUTPUT:
2802 RETVAL 3128 RETVAL
2803 3129
2819 3145
2820SV * 3146SV *
2821has_cctx (Coro::State coro) 3147has_cctx (Coro::State coro)
2822 PROTOTYPE: $ 3148 PROTOTYPE: $
2823 CODE: 3149 CODE:
2824 RETVAL = boolSV (!!coro->cctx); 3150 /* maybe manage the running flag differently */
3151 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2825 OUTPUT: 3152 OUTPUT:
2826 RETVAL 3153 RETVAL
2827 3154
2828int 3155int
2829is_traced (Coro::State coro) 3156is_traced (Coro::State coro)
2849 3176
2850void 3177void
2851force_cctx () 3178force_cctx ()
2852 PROTOTYPE: 3179 PROTOTYPE:
2853 CODE: 3180 CODE:
2854 SvSTATE_current->cctx->idle_sp = 0; 3181 cctx_current->idle_sp = 0;
2855 3182
2856void 3183void
2857swap_defsv (Coro::State self) 3184swap_defsv (Coro::State self)
2858 PROTOTYPE: $ 3185 PROTOTYPE: $
2859 ALIAS: 3186 ALIAS:
2867 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3194 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2868 3195
2869 SV *tmp = *src; *src = *dst; *dst = tmp; 3196 SV *tmp = *src; *src = *dst; *dst = tmp;
2870 } 3197 }
2871 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
2872 3205
2873MODULE = Coro::State PACKAGE = Coro 3206MODULE = Coro::State PACKAGE = Coro
2874 3207
2875BOOT: 3208BOOT:
2876{ 3209{
2877 int i; 3210 int i;
2878 3211
2879 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2880 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2881 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2882 cv_coro_run = get_cv (aTHX_ "Coro::_terminate", GV_ADD); 3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2883 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2884 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);
2885 3226
2886 coro_stash = gv_stashpv ("Coro", TRUE); 3227 coro_stash = gv_stashpv ("Coro", TRUE);
2887 3228
2888 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2889 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2897 3238
2898 { 3239 {
2899 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2900 3241
2901 coroapi.schedule = api_schedule; 3242 coroapi.schedule = api_schedule;
3243 coroapi.schedule_to = api_schedule_to;
2902 coroapi.cede = api_cede; 3244 coroapi.cede = api_cede;
2903 coroapi.cede_notself = api_cede_notself; 3245 coroapi.cede_notself = api_cede_notself;
2904 coroapi.ready = api_ready; 3246 coroapi.ready = api_ready;
2905 coroapi.is_ready = api_is_ready; 3247 coroapi.is_ready = api_is_ready;
2906 coroapi.nready = coro_nready; 3248 coroapi.nready = coro_nready;
2911 SvREADONLY_on (sv); 3253 SvREADONLY_on (sv);
2912 } 3254 }
2913} 3255}
2914 3256
2915void 3257void
3258terminate (...)
3259 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3261
3262void
2916schedule (...) 3263schedule (...)
2917 CODE: 3264 CODE:
2918 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);
2919 3276
2920void 3277void
2921cede (...) 3278cede (...)
2922 CODE: 3279 CODE:
2923 CORO_EXECUTE_SLF_XS (slf_init_cede); 3280 CORO_EXECUTE_SLF_XS (slf_init_cede);
2978 CODE: 3335 CODE:
2979 RETVAL = coro_nready; 3336 RETVAL = coro_nready;
2980 OUTPUT: 3337 OUTPUT:
2981 RETVAL 3338 RETVAL
2982 3339
2983# for async_pool speedup
2984void 3340void
2985_pool_1 (SV *cb) 3341suspend (Coro::State self)
3342 PROTOTYPE: $
2986 CODE: 3343 CODE:
2987{ 3344 self->flags |= CF_SUSPENDED;
2988 HV *hv = (HV *)SvRV (coro_current);
2989 struct coro *coro = SvSTATE_hv ((SV *)hv);
2990 AV *defav = GvAV (PL_defgv);
2991 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2992 AV *invoke_av;
2993 int i, len;
2994 3345
2995 if (!invoke) 3346void
3347resume (Coro::State self)
3348 PROTOTYPE: $
3349 CODE:
3350 self->flags &= ~CF_SUSPENDED;
3351
3352void
3353_pool_handler (...)
3354 CODE:
3355 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3356
3357void
3358async_pool (SV *cv, ...)
3359 PROTOTYPE: &@
3360 PPCODE:
3361{
3362 HV *hv = (HV *)av_pop (av_async_pool);
3363 AV *av = newAV ();
3364 SV *cb = ST (0);
3365 int i;
3366
3367 av_extend (av, items - 2);
3368 for (i = 1; i < items; ++i)
3369 av_push (av, SvREFCNT_inc_NN (ST (i)));
3370
3371 if ((SV *)hv == &PL_sv_undef)
2996 { 3372 {
2997 SV *old = PL_diehook; 3373 PUSHMARK (SP);
2998 PL_diehook = 0; 3374 EXTEND (SP, 2);
2999 SvREFCNT_dec (old); 3375 PUSHs (sv_Coro);
3000 croak ("\3async_pool terminate\2\n"); 3376 PUSHs ((SV *)cv_pool_handler);
3377 PUTBACK;
3378 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3379 SPAGAIN;
3380
3381 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3001 } 3382 }
3002 3383
3003 SvREFCNT_dec (coro->saved_deffh);
3004 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3005
3006 hv_store (hv, "desc", sizeof ("desc") - 1,
3007 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3008
3009 invoke_av = (AV *)SvRV (invoke);
3010 len = av_len (invoke_av);
3011
3012 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3013
3014 if (len > 0)
3015 { 3384 {
3016 av_fill (defav, len - 1); 3385 struct coro *coro = SvSTATE_hv (hv);
3017 for (i = 0; i < len; ++i) 3386
3018 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3387 assert (!coro->invoke_cb);
3388 assert (!coro->invoke_av);
3389 coro->invoke_cb = SvREFCNT_inc (cb);
3390 coro->invoke_av = av;
3019 } 3391 }
3020}
3021 3392
3022void 3393 api_ready (aTHX_ (SV *)hv);
3023_pool_2 (SV *cb)
3024 CODE:
3025{
3026 HV *hv = (HV *)SvRV (coro_current);
3027 struct coro *coro = SvSTATE_hv ((SV *)hv);
3028 3394
3029 sv_setsv (cb, &PL_sv_undef); 3395 if (GIMME_V != G_VOID)
3030 3396 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3397 else
3032 coro->saved_deffh = 0;
3033
3034 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3035 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3036 {
3037 SV *old = PL_diehook;
3038 PL_diehook = 0;
3039 SvREFCNT_dec (old); 3398 SvREFCNT_dec (hv);
3040 croak ("\3async_pool terminate\2\n");
3041 }
3042
3043 av_clear (GvAV (PL_defgv));
3044 hv_store (hv, "desc", sizeof ("desc") - 1,
3045 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3046
3047 coro->prio = 0;
3048
3049 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3050 api_trace (aTHX_ coro_current, 0);
3051
3052 av_push (av_async_pool, newSVsv (coro_current));
3053} 3399}
3054 3400
3055SV * 3401SV *
3056rouse_cb () 3402rouse_cb ()
3057 PROTOTYPE: 3403 PROTOTYPE:
3063void 3409void
3064rouse_wait (...) 3410rouse_wait (...)
3065 PROTOTYPE: ;$ 3411 PROTOTYPE: ;$
3066 PPCODE: 3412 PPCODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3413 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3414
3415void
3416on_enter (SV *block)
3417 ALIAS:
3418 on_leave = 1
3419 PROTOTYPE: &
3420 CODE:
3421{
3422 struct coro *coro = SvSTATE_current;
3423 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3424
3425 block = (SV *)coro_sv_2cv (aTHX_ block);
3426
3427 if (!*avp)
3428 *avp = newAV ();
3429
3430 av_push (*avp, SvREFCNT_inc (block));
3431
3432 if (!ix)
3433 on_enterleave_call (aTHX_ block);
3434
3435 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
3436 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3437 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
3438}
3068 3439
3069 3440
3070MODULE = Coro::State PACKAGE = PerlIO::cede 3441MODULE = Coro::State PACKAGE = PerlIO::cede
3071 3442
3072BOOT: 3443BOOT:
3083 GvSTASH (CvGV (cv)) 3454 GvSTASH (CvGV (cv))
3084 ); 3455 );
3085 OUTPUT: 3456 OUTPUT:
3086 RETVAL 3457 RETVAL
3087 3458
3088# helper for Coro::Channel 3459# helper for Coro::Channel and others
3089SV * 3460SV *
3090_alloc (int count) 3461_alloc (int count)
3091 CODE: 3462 CODE:
3092 RETVAL = coro_waitarray_new (aTHX_ count); 3463 RETVAL = coro_waitarray_new (aTHX_ count);
3093 OUTPUT: 3464 OUTPUT:
3151 for (i = 1; i <= wcount; ++i) 3522 for (i = 1; i <= wcount; ++i)
3152 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3523 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3153 } 3524 }
3154} 3525}
3155 3526
3527MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3528
3529void
3530_may_delete (SV *sem, int count, int extra_refs)
3531 PPCODE:
3532{
3533 AV *av = (AV *)SvRV (sem);
3534
3535 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3536 && AvFILLp (av) == 0 /* no waiters, just count */
3537 && SvIV (AvARRAY (av)[0]) == count)
3538 XSRETURN_YES;
3539
3540 XSRETURN_NO;
3541}
3542
3156MODULE = Coro::State PACKAGE = Coro::Signal 3543MODULE = Coro::State PACKAGE = Coro::Signal
3157 3544
3158SV * 3545SV *
3159new (SV *klass) 3546new (SV *klass)
3160 CODE: 3547 CODE:
3231 3618
3232void 3619void
3233_register (char *target, char *proto, SV *req) 3620_register (char *target, char *proto, SV *req)
3234 CODE: 3621 CODE:
3235{ 3622{
3236 CV *req_cv = coro_sv_2cv (req); 3623 CV *req_cv = coro_sv_2cv (aTHX_ req);
3237 /* newXSproto doesn't return the CV on 5.8 */ 3624 /* newXSproto doesn't return the CV on 5.8 */
3238 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3625 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3239 sv_setpv ((SV *)slf_cv, proto); 3626 sv_setpv ((SV *)slf_cv, proto);
3240 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3627 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3241} 3628}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines