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.309 by root, Wed Nov 19 15:29:57 2008 UTC vs.
Revision 1.340 by root, Mon Dec 15 00:30: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
165static size_t cctx_stacksize = CORO_STACKSIZE; 171static size_t cctx_stacksize = CORO_STACKSIZE;
166static struct CoroAPI coroapi; 172static struct CoroAPI coroapi;
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 CV *coro_run_cv;
171static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
172 181
173static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
174static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
175static SV *rv_diehook; 184static SV *rv_diehook;
176static SV *rv_warnhook; 185static SV *rv_warnhook;
177static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
178 187
179/* async_pool helper stuff */ 188/* async_pool helper stuff */
180static SV *sv_pool_rss; 189static SV *sv_pool_rss;
181static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
182static 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;
183 196
184/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
185static SV *sv_activity; 198static SV *sv_activity;
186 199
187static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
216 int valgrind_id; 229 int valgrind_id;
217#endif 230#endif
218 unsigned char flags; 231 unsigned char flags;
219} coro_cctx; 232} coro_cctx;
220 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
221enum { 238enum {
222 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
223 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
224 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
225 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
230{ 247{
231 SV *defsv; 248 SV *defsv;
232 AV *defav; 249 AV *defav;
233 SV *errsv; 250 SV *errsv;
234 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
235#define VAR(name,type) type name; 253#define VAR(name,type) type name;
236# include "state.h" 254# include "state.h"
237#undef VAR 255#undef VAR
238} perl_slots; 256} perl_slots;
239 257
264 SV *except; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
265 SV *rouse_cb; 283 SV *rouse_cb;
266 284
267 /* async_pool */ 285 /* async_pool */
268 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
289
290 /* on_enter/on_leave */
291 AV *on_enter;
292 AV *on_leave;
269 293
270 /* linked list */ 294 /* linked list */
271 struct coro *next, *prev; 295 struct coro *next, *prev;
272}; 296};
273 297
290 314
291/* for Coro.pm */ 315/* for Coro.pm */
292static SV *coro_current; 316static SV *coro_current;
293static SV *coro_readyhook; 317static SV *coro_readyhook;
294static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
319static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 320static struct coro *coro_first;
296#define coro_nready coroapi.nready 321#define coro_nready coroapi.nready
297 322
298/** lowlevel stuff **********************************************************/ 323/** lowlevel stuff **********************************************************/
299 324
327 return get_hv (name, create); 352 return get_hv (name, create);
328} 353}
329 354
330/* may croak */ 355/* may croak */
331INLINE CV * 356INLINE CV *
332coro_sv_2cv (SV *sv) 357coro_sv_2cv (pTHX_ SV *sv)
333{ 358{
334 HV *st; 359 HV *st;
335 GV *gvp; 360 GV *gvp;
336 return sv_2cv (sv, &st, &gvp, 0); 361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362
363 if (!cv)
364 croak ("code reference expected");
365
366 return cv;
337} 367}
368
369/*****************************************************************************/
370/* magic glue */
371
372#define CORO_MAGIC_type_cv 26
373#define CORO_MAGIC_type_state PERL_MAGIC_ext
374
375#define CORO_MAGIC_NN(sv, type) \
376 (expect_true (SvMAGIC (sv)->mg_type == type) \
377 ? SvMAGIC (sv) \
378 : mg_find (sv, type))
379
380#define CORO_MAGIC(sv, type) \
381 (expect_true (SvMAGIC (sv)) \
382 ? CORO_MAGIC_NN (sv, type) \
383 : 0)
384
385#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
386#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
387
388INLINE struct coro *
389SvSTATE_ (pTHX_ SV *coro)
390{
391 HV *stash;
392 MAGIC *mg;
393
394 if (SvROK (coro))
395 coro = SvRV (coro);
396
397 if (expect_false (SvTYPE (coro) != SVt_PVHV))
398 croak ("Coro::State object required");
399
400 stash = SvSTASH (coro);
401 if (expect_false (stash != coro_stash && stash != coro_state_stash))
402 {
403 /* very slow, but rare, check */
404 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
405 croak ("Coro::State object required");
406 }
407
408 mg = CORO_MAGIC_state (coro);
409 return (struct coro *)mg->mg_ptr;
410}
411
412#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
413
414/* faster than SvSTATE, but expects a coroutine hv */
415#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
416#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
417
418/*****************************************************************************/
419/* padlist management and caching */
338 420
339static AV * 421static AV *
340coro_clone_padlist (pTHX_ CV *cv) 422coro_derive_padlist (pTHX_ CV *cv)
341{ 423{
342 AV *padlist = CvPADLIST (cv); 424 AV *padlist = CvPADLIST (cv);
343 AV *newpadlist, *newpad; 425 AV *newpadlist, *newpad;
344 426
345 newpadlist = newAV (); 427 newpadlist = newAV ();
350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 432 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
351#endif 433#endif
352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 434 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
353 --AvFILLp (padlist); 435 --AvFILLp (padlist);
354 436
355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 437 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
356 av_store (newpadlist, 1, (SV *)newpad); 438 av_store (newpadlist, 1, (SV *)newpad);
357 439
358 return newpadlist; 440 return newpadlist;
359} 441}
360 442
361static void 443static void
362free_padlist (pTHX_ AV *padlist) 444free_padlist (pTHX_ AV *padlist)
363{ 445{
364 /* may be during global destruction */ 446 /* may be during global destruction */
365 if (SvREFCNT (padlist)) 447 if (!IN_DESTRUCT)
366 { 448 {
367 I32 i = AvFILLp (padlist); 449 I32 i = AvFILLp (padlist);
368 while (i >= 0) 450
451 while (i > 0) /* special-case index 0 */
369 { 452 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 453 /* we try to be extra-careful here */
371 if (svp) 454 AV *av = (AV *)AvARRAY (padlist)[i--];
372 { 455 I32 j = AvFILLp (av);
373 SV *sv; 456
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 457 while (j >= 0)
458 SvREFCNT_dec (AvARRAY (av)[j--]);
459
460 AvFILLp (av) = -1;
375 SvREFCNT_dec (sv); 461 SvREFCNT_dec (av);
376
377 SvREFCNT_dec (*svp);
378 }
379 } 462 }
380 463
464 SvREFCNT_dec (AvARRAY (padlist)[0]);
465
466 AvFILLp (padlist) = -1;
381 SvREFCNT_dec ((SV*)padlist); 467 SvREFCNT_dec ((SV*)padlist);
382 } 468 }
383} 469}
384 470
385static int 471static int
394 480
395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 481 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
396 482
397 return 0; 483 return 0;
398} 484}
399
400#define CORO_MAGIC_type_cv 26
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
402 485
403static MGVTBL coro_cv_vtbl = { 486static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0, 487 0, 0, 0, 0,
405 coro_cv_free 488 coro_cv_free
406}; 489};
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 490
451/* the next two functions merely cache the padlists */ 491/* the next two functions merely cache the padlists */
452static void 492static void
453get_padlist (pTHX_ CV *cv) 493get_padlist (pTHX_ CV *cv)
454{ 494{
465 CV *cp = Perl_cv_clone (aTHX_ cv); 505 CV *cp = Perl_cv_clone (aTHX_ cv);
466 CvPADLIST (cv) = CvPADLIST (cp); 506 CvPADLIST (cv) = CvPADLIST (cp);
467 CvPADLIST (cp) = 0; 507 CvPADLIST (cp) = 0;
468 SvREFCNT_dec (cp); 508 SvREFCNT_dec (cp);
469#else 509#else
470 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 510 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
471#endif 511#endif
472 } 512 }
473} 513}
474 514
475static void 515static void
482 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 522 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
483 523
484 av = (AV *)mg->mg_obj; 524 av = (AV *)mg->mg_obj;
485 525
486 if (expect_false (AvFILLp (av) >= AvMAX (av))) 526 if (expect_false (AvFILLp (av) >= AvMAX (av)))
487 av_extend (av, AvMAX (av) + 1); 527 av_extend (av, AvFILLp (av) + 1);
488 528
489 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
490} 530}
491 531
492/** load & save, init *******************************************************/ 532/** load & save, init *******************************************************/
533
534static void
535on_enterleave_call (pTHX_ SV *cb);
493 536
494static void 537static void
495load_perl (pTHX_ Coro__State c) 538load_perl (pTHX_ Coro__State c)
496{ 539{
497 perl_slots *slot = c->slot; 540 perl_slots *slot = c->slot;
498 c->slot = 0; 541 c->slot = 0;
499 542
500 PL_mainstack = c->mainstack; 543 PL_mainstack = c->mainstack;
501 544
502 GvSV (PL_defgv) = slot->defsv; 545 GvSV (PL_defgv) = slot->defsv;
503 GvAV (PL_defgv) = slot->defav; 546 GvAV (PL_defgv) = slot->defav;
504 GvSV (PL_errgv) = slot->errsv; 547 GvSV (PL_errgv) = slot->errsv;
505 GvSV (irsgv) = slot->irsgv; 548 GvSV (irsgv) = slot->irsgv;
549 GvHV (PL_hintgv) = slot->hinthv;
506 550
507 #define VAR(name,type) PL_ ## name = slot->name; 551 #define VAR(name,type) PL_ ## name = slot->name;
508 # include "state.h" 552 # include "state.h"
509 #undef VAR 553 #undef VAR
510 554
524 PUTBACK; 568 PUTBACK;
525 } 569 }
526 570
527 slf_frame = c->slf_frame; 571 slf_frame = c->slf_frame;
528 CORO_THROW = c->except; 572 CORO_THROW = c->except;
573
574 if (expect_false (c->on_enter))
575 {
576 int i;
577
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 }
529} 581}
530 582
531static void 583static void
532save_perl (pTHX_ Coro__State c) 584save_perl (pTHX_ Coro__State c)
533{ 585{
586 if (expect_false (c->on_leave))
587 {
588 int i;
589
590 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
592 }
593
534 c->except = CORO_THROW; 594 c->except = CORO_THROW;
535 c->slf_frame = slf_frame; 595 c->slf_frame = slf_frame;
536 596
537 { 597 {
538 dSP; 598 dSP;
596 c->mainstack = PL_mainstack; 656 c->mainstack = PL_mainstack;
597 657
598 { 658 {
599 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
600 660
601 slot->defav = GvAV (PL_defgv); 661 slot->defav = GvAV (PL_defgv);
602 slot->defsv = DEFSV; 662 slot->defsv = DEFSV;
603 slot->errsv = ERRSV; 663 slot->errsv = ERRSV;
604 slot->irsgv = GvSV (irsgv); 664 slot->irsgv = GvSV (irsgv);
665 slot->hinthv = GvHV (PL_hintgv);
605 666
606 #define VAR(name,type) slot->name = PL_ ## name; 667 #define VAR(name,type) slot->name = PL_ ## name;
607 # include "state.h" 668 # include "state.h"
608 #undef VAR 669 #undef VAR
609 } 670 }
687#if !PERL_VERSION_ATLEAST (5,10,0) 748#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 749 Safefree (PL_retstack);
689#endif 750#endif
690} 751}
691 752
753#define CORO_RSS \
754 rss += sizeof (SYM (curstackinfo)); \
755 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
756 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
757 rss += SYM (tmps_max) * sizeof (SV *); \
758 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
759 rss += SYM (scopestack_max) * sizeof (I32); \
760 rss += SYM (savestack_max) * sizeof (ANY);
761
692static size_t 762static size_t
693coro_rss (pTHX_ struct coro *coro) 763coro_rss (pTHX_ struct coro *coro)
694{ 764{
695 size_t rss = sizeof (*coro); 765 size_t rss = sizeof (*coro);
696 766
697 if (coro->mainstack) 767 if (coro->mainstack)
698 { 768 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 769 if (coro->flags & CF_RUNNING)
703 { 770 {
704 slot = &tmp_slot; 771 #define SYM(sym) PL_ ## sym
705 772 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 773 #undef SYM
709 } 774 }
710 else 775 else
711 slot = coro->slot;
712
713 if (slot)
714 { 776 {
715 rss += sizeof (slot->curstackinfo); 777 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 778 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 779 #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 } 780 }
727 } 781 }
728 782
729 return rss; 783 return rss;
730} 784}
743#endif 797#endif
744 798
745/* 799/*
746 * This overrides the default magic get method of %SIG elements. 800 * 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 801 * 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 802 * and instead of trying to save and restore the hash elements, we just provide
749 * readback here. 803 * 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 */ 804 */
754static int 805static int
755coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 806coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
756{ 807{
757 const char *s = MgPV_nolen_const (mg); 808 const char *s = MgPV_nolen_const (mg);
810 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 861 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
811 862
812 if (svp) 863 if (svp)
813 { 864 {
814 SV *old = *svp; 865 SV *old = *svp;
815 *svp = newSVsv (sv); 866 *svp = SvOK (sv) ? newSVsv (sv) : 0;
816 SvREFCNT_dec (old); 867 SvREFCNT_dec (old);
817 return 0; 868 return 0;
818 } 869 }
819 } 870 }
820 871
830 881
831static int 882static int
832slf_check_nop (pTHX_ struct CoroSLF *frame) 883slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 884{
834 return 0; 885 return 0;
886}
887
888static int
889slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{
891 return 1;
835} 892}
836 893
837static UNOP coro_setup_op; 894static UNOP coro_setup_op;
838 895
839static void NOINLINE /* noinline to keep it out of the transfer fast path */ 896static void NOINLINE /* noinline to keep it out of the transfer fast path */
846 903
847 PL_runops = RUNOPS_DEFAULT; 904 PL_runops = RUNOPS_DEFAULT;
848 PL_curcop = &PL_compiling; 905 PL_curcop = &PL_compiling;
849 PL_in_eval = EVAL_NULL; 906 PL_in_eval = EVAL_NULL;
850 PL_comppad = 0; 907 PL_comppad = 0;
908 PL_comppad_name = 0;
909 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0;
851 PL_curpm = 0; 911 PL_curpm = 0;
852 PL_curpad = 0; 912 PL_curpad = 0;
853 PL_localizing = 0; 913 PL_localizing = 0;
854 PL_dirty = 0; 914 PL_dirty = 0;
855 PL_restartop = 0; 915 PL_restartop = 0;
856#if PERL_VERSION_ATLEAST (5,10,0) 916#if PERL_VERSION_ATLEAST (5,10,0)
857 PL_parser = 0; 917 PL_parser = 0;
858#endif 918#endif
919 PL_hints = 0;
859 920
860 /* recreate the die/warn hooks */ 921 /* recreate the die/warn hooks */
861 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 922 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); 923 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
863 924
864 GvSV (PL_defgv) = newSV (0); 925 GvSV (PL_defgv) = newSV (0);
865 GvAV (PL_defgv) = coro->args; coro->args = 0; 926 GvAV (PL_defgv) = coro->args; coro->args = 0;
866 GvSV (PL_errgv) = newSV (0); 927 GvSV (PL_errgv) = newSV (0);
867 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 928 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
929 GvHV (PL_hintgv) = 0;
868 PL_rs = newSVsv (GvSV (irsgv)); 930 PL_rs = newSVsv (GvSV (irsgv));
869 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 931 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
870 932
871 { 933 {
872 dSP; 934 dSP;
890 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 952 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 */ 953 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
892 954
893 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 955 /* 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; 956 coro_setup_op.op_next = PL_op;
895 coro_setup_op.op_type = OP_CUSTOM; 957 coro_setup_op.op_type = OP_ENTERSUB;
896 coro_setup_op.op_ppaddr = pp_slf; 958 coro_setup_op.op_ppaddr = pp_slf;
897 /* no flags etc. required, as an init function won't be called */ 959 /* no flags etc. required, as an init function won't be called */
898 960
899 PL_op = (OP *)&coro_setup_op; 961 PL_op = (OP *)&coro_setup_op;
900 962
901 /* copy throw, in case it was set before coro_setup */ 963 /* copy throw, in case it was set before coro_setup */
902 CORO_THROW = coro->except; 964 CORO_THROW = coro->except;
903} 965}
904 966
905static void 967static void
906coro_destruct (pTHX_ struct coro *coro) 968coro_unwind_stacks (pTHX)
907{ 969{
908 if (!IN_DESTRUCT) 970 if (!IN_DESTRUCT)
909 { 971 {
910 /* restore all saved variables and stuff */ 972 /* restore all saved variables and stuff */
911 LEAVE_SCOPE (0); 973 LEAVE_SCOPE (0);
919 POPSTACK_TO (PL_mainstack); 981 POPSTACK_TO (PL_mainstack);
920 982
921 /* unwind main stack */ 983 /* unwind main stack */
922 dounwind (-1); 984 dounwind (-1);
923 } 985 }
986}
987
988static void
989coro_destruct_perl (pTHX_ struct coro *coro)
990{
991 coro_unwind_stacks (aTHX);
924 992
925 SvREFCNT_dec (GvSV (PL_defgv)); 993 SvREFCNT_dec (GvSV (PL_defgv));
926 SvREFCNT_dec (GvAV (PL_defgv)); 994 SvREFCNT_dec (GvAV (PL_defgv));
927 SvREFCNT_dec (GvSV (PL_errgv)); 995 SvREFCNT_dec (GvSV (PL_errgv));
928 SvREFCNT_dec (PL_defoutgv); 996 SvREFCNT_dec (PL_defoutgv);
929 SvREFCNT_dec (PL_rs); 997 SvREFCNT_dec (PL_rs);
930 SvREFCNT_dec (GvSV (irsgv)); 998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
931 1000
932 SvREFCNT_dec (PL_diehook); 1001 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook); 1002 SvREFCNT_dec (PL_warnhook);
934 1003
935 SvREFCNT_dec (coro->saved_deffh); 1004 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1005 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av);
937 1008
938 coro_destruct_stacks (aTHX); 1009 coro_destruct_stacks (aTHX);
939} 1010}
940 1011
941INLINE void 1012INLINE void
951static int 1022static int
952runops_trace (pTHX) 1023runops_trace (pTHX)
953{ 1024{
954 COP *oldcop = 0; 1025 COP *oldcop = 0;
955 int oldcxix = -2; 1026 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1027
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1028 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1029 {
961 PERL_ASYNC_CHECK (); 1030 PERL_ASYNC_CHECK ();
962 1031
963 if (cctx->flags & CC_TRACE_ALL) 1032 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1033 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1034 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1035 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1036 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1037 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1038 AV *av = newAV (); /* return values */
970 SV **cb; 1039 SV **cb;
1007 1076
1008 if (PL_curcop != &PL_compiling) 1077 if (PL_curcop != &PL_compiling)
1009 { 1078 {
1010 SV **cb; 1079 SV **cb;
1011 1080
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1081 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1082 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1083 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1084
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1085 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1086 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1087 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1088 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1089 SV *fullname = sv_2mortal (newSV (0));
1022 1090
1023 if (isGV (gv)) 1091 if (isGV (gv))
1041 } 1109 }
1042 1110
1043 oldcxix = cxstack_ix; 1111 oldcxix = cxstack_ix;
1044 } 1112 }
1045 1113
1046 if (cctx->flags & CC_TRACE_LINE) 1114 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1115 {
1048 dSP; 1116 dSP;
1049 1117
1050 PL_runops = RUNOPS_DEFAULT; 1118 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1119 ENTER;
1070 1138
1071 TAINT_NOT; 1139 TAINT_NOT;
1072 return 0; 1140 return 0;
1073} 1141}
1074 1142
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1143static struct CoroSLF cctx_ssl_frame;
1077 1144
1078static void 1145static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1146slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1147{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1148 ta->prev = 0;
1083} 1149}
1084 1150
1085static int 1151static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1152slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1153{
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1156 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1157}
1092 1158
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1159/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1160static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1161cctx_prepare (pTHX)
1096{ 1162{
1097 PL_top_env = &PL_start_env; 1163 PL_top_env = &PL_start_env;
1098 1164
1099 if (cctx->flags & CC_TRACE) 1165 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1166 PL_runops = runops_trace;
1101 1167
1102 /* we already must be executing an SLF op, there is no other valid way 1168 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1169 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1170 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1171 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1172
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1173 /* 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; 1174 cctx_ssl_frame = slf_frame;
1110 1175
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1176 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1177 slf_frame.check = slf_check_set_stacklevel;
1113} 1178}
1136 /* normally we would need to skip the entersub here */ 1201 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1202 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1203 /* PL_nop = PL_nop->op_next */
1139 1204
1140 /* inject a fake subroutine call to cctx_init */ 1205 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1206 cctx_prepare (aTHX);
1142 1207
1143 /* cctx_run is the alternative tail of transfer() */ 1208 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1209 transfer_tail (aTHX);
1145 1210
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1211 /* somebody or something will hit me for both perl_run and PL_restartop */
1154 /* 1219 /*
1155 * If perl-run returns we assume exit() was being called or the coro 1220 * 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) 1221 * 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 1222 * 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" 1223 * bootstrap-time "top" top_env, as we cannot restore the "main"
1159 * coroutine as Coro has no such concept 1224 * coroutine as Coro has no such concept.
1225 * This actually isn't valid with the pthread backend, but OSes requiring
1226 * that backend are too broken to do it in a standards-compliant way.
1160 */ 1227 */
1161 PL_top_env = main_top_env; 1228 PL_top_env = main_top_env;
1162 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1229 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1163 } 1230 }
1164} 1231}
1241cctx_destroy (coro_cctx *cctx) 1308cctx_destroy (coro_cctx *cctx)
1242{ 1309{
1243 if (!cctx) 1310 if (!cctx)
1244 return; 1311 return;
1245 1312
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1314
1246 --cctx_count; 1315 --cctx_count;
1247 coro_destroy (&cctx->cctx); 1316 coro_destroy (&cctx->cctx);
1248 1317
1249 /* coro_transfer creates new, empty cctx's */ 1318 /* coro_transfer creates new, empty cctx's */
1250 if (cctx->sptr) 1319 if (cctx->sptr)
1313 /* TODO: throwing up here is considered harmful */ 1382 /* TODO: throwing up here is considered harmful */
1314 1383
1315 if (expect_true (prev != next)) 1384 if (expect_true (prev != next))
1316 { 1385 {
1317 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1386 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,"); 1387 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1319 1388
1320 if (expect_false (next->flags & CF_RUNNING)) 1389 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,"); 1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1322 1391
1323 if (expect_false (next->flags & CF_DESTROYED)) 1392 if (expect_false (next->flags & CF_DESTROYED))
1335transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1404transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1336{ 1405{
1337 dSTACKLEVEL; 1406 dSTACKLEVEL;
1338 1407
1339 /* sometimes transfer is only called to set idle_sp */ 1408 /* sometimes transfer is only called to set idle_sp */
1340 if (expect_false (!next)) 1409 if (expect_false (!prev))
1341 { 1410 {
1342 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1411 cctx_current->idle_sp = STACKLEVEL;
1343 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1412 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1344 } 1413 }
1345 else if (expect_true (prev != next)) 1414 else if (expect_true (prev != next))
1346 { 1415 {
1347 coro_cctx *prev__cctx; 1416 coro_cctx *cctx_prev;
1348 1417
1349 if (expect_false (prev->flags & CF_NEW)) 1418 if (expect_false (prev->flags & CF_NEW))
1350 { 1419 {
1351 /* create a new empty/source context */ 1420 /* create a new empty/source context */
1352 prev->cctx = cctx_new_empty ();
1353 prev->flags &= ~CF_NEW; 1421 prev->flags &= ~CF_NEW;
1354 prev->flags |= CF_RUNNING; 1422 prev->flags |= CF_RUNNING;
1355 } 1423 }
1356 1424
1357 prev->flags &= ~CF_RUNNING; 1425 prev->flags &= ~CF_RUNNING;
1368 coro_setup (aTHX_ next); 1436 coro_setup (aTHX_ next);
1369 } 1437 }
1370 else 1438 else
1371 load_perl (aTHX_ next); 1439 load_perl (aTHX_ next);
1372 1440
1373 prev__cctx = prev->cctx;
1374
1375 /* possibly untie and reuse the cctx */ 1441 /* possibly untie and reuse the cctx */
1376 if (expect_true ( 1442 if (expect_true (
1377 prev__cctx->idle_sp == STACKLEVEL 1443 cctx_current->idle_sp == STACKLEVEL
1378 && !(prev__cctx->flags & CC_TRACE) 1444 && !(cctx_current->flags & CC_TRACE)
1379 && !force_cctx 1445 && !force_cctx
1380 )) 1446 ))
1381 { 1447 {
1382 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1448 /* 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)); 1449 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1384 1450
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 */ 1451 /* 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 */ 1452 /* without this the next cctx_get might destroy the running cctx while still in use */
1389 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1453 if (expect_false (CCTX_EXPIRED (cctx_current)))
1390 if (!next->cctx) 1454 if (expect_true (!next->cctx))
1391 next->cctx = cctx_get (aTHX); 1455 next->cctx = cctx_get (aTHX);
1392 1456
1393 cctx_put (prev__cctx); 1457 cctx_put (cctx_current);
1394 } 1458 }
1459 else
1460 prev->cctx = cctx_current;
1395 1461
1396 ++next->usecount; 1462 ++next->usecount;
1397 1463
1398 if (expect_true (!next->cctx)) 1464 cctx_prev = cctx_current;
1399 next->cctx = cctx_get (aTHX); 1465 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1400 1466
1401 if (expect_false (prev__cctx != next->cctx)) 1467 next->cctx = 0;
1468
1469 if (expect_false (cctx_prev != cctx_current))
1402 { 1470 {
1403 prev__cctx->top_env = PL_top_env; 1471 cctx_prev->top_env = PL_top_env;
1404 PL_top_env = next->cctx->top_env; 1472 PL_top_env = cctx_current->top_env;
1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1473 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1406 } 1474 }
1407 1475
1408 transfer_tail (aTHX); 1476 transfer_tail (aTHX);
1409 } 1477 }
1410} 1478}
1432 --coro_nready; 1500 --coro_nready;
1433 } 1501 }
1434 else 1502 else
1435 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1503 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1436 1504
1437 if (coro->mainstack && coro->mainstack != main_mainstack) 1505 if (coro->mainstack
1506 && coro->mainstack != main_mainstack
1507 && coro->slot
1508 && !PL_dirty)
1438 { 1509 {
1439 struct coro temp; 1510 struct coro *current = SvSTATE_current;
1440 1511
1441 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1442 1513
1443 save_perl (aTHX_ &temp); 1514 save_perl (aTHX_ current);
1444 load_perl (aTHX_ coro); 1515 load_perl (aTHX_ coro);
1445 1516
1446 coro_destruct (aTHX_ coro); 1517 coro_destruct_perl (aTHX_ coro);
1447 1518
1448 load_perl (aTHX_ &temp); 1519 load_perl (aTHX_ current);
1449 1520
1450 coro->slot = 0; 1521 coro->slot = 0;
1451 } 1522 }
1452 1523
1453 cctx_destroy (coro->cctx); 1524 cctx_destroy (coro->cctx);
1565{ 1636{
1566 struct coro *coro; 1637 struct coro *coro;
1567 SV *sv_hook; 1638 SV *sv_hook;
1568 void (*xs_hook)(void); 1639 void (*xs_hook)(void);
1569 1640
1570 if (SvROK (coro_sv))
1571 coro_sv = SvRV (coro_sv);
1572
1573 coro = SvSTATE (coro_sv); 1641 coro = SvSTATE (coro_sv);
1574 1642
1575 if (coro->flags & CF_READY) 1643 if (coro->flags & CF_READY)
1576 return 0; 1644 return 0;
1577 1645
1608api_is_ready (pTHX_ SV *coro_sv) 1676api_is_ready (pTHX_ SV *coro_sv)
1609{ 1677{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1678 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1679}
1612 1680
1681/* expects to own a reference to next->hv */
1613INLINE void 1682INLINE void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1683prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1615{ 1684{
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); 1685 SV *prev_sv = SvRV (coro_current);
1686
1655 ta->prev = SvSTATE_hv (prev_sv); 1687 ta->prev = SvSTATE_hv (prev_sv);
1688 ta->next = next;
1689
1656 TRANSFER_CHECK (*ta); 1690 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1691
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv); 1692 SvRV_set (coro_current, (SV *)next->hv);
1660 1693
1661 free_coro_mortal (aTHX); 1694 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv; 1695 coro_mortal = prev_sv;
1663} 1696}
1664 1697
1698static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{
1701 for (;;)
1702 {
1703 SV *next_sv = coro_deq (aTHX);
1704
1705 if (expect_true (next_sv))
1706 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1712 else
1713 {
1714 next->flags &= ~CF_READY;
1715 --coro_nready;
1716
1717 prepare_schedule_to (aTHX_ ta, next);
1718 break;
1719 }
1720 }
1721 else
1722 {
1723 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle)))
1726 {
1727 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1728 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready;
1730 }
1731 else
1732 {
1733 dSP;
1734
1735 ENTER;
1736 SAVETMPS;
1737
1738 PUSHMARK (SP);
1739 PUTBACK;
1740 call_sv (sv_idle, G_VOID | G_DISCARD);
1741
1742 FREETMPS;
1743 LEAVE;
1744 }
1745 }
1746 }
1747}
1748
1665INLINE void 1749INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1750prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1751{
1668 api_ready (aTHX_ coro_current); 1752 api_ready (aTHX_ coro_current);
1669 prepare_schedule (aTHX_ ta); 1753 prepare_schedule (aTHX_ ta);
1688{ 1772{
1689 struct coro_transfer_args ta; 1773 struct coro_transfer_args ta;
1690 1774
1691 prepare_schedule (aTHX_ &ta); 1775 prepare_schedule (aTHX_ &ta);
1692 TRANSFER (ta, 1); 1776 TRANSFER (ta, 1);
1777}
1778
1779static void
1780api_schedule_to (pTHX_ SV *coro_sv)
1781{
1782 struct coro_transfer_args ta;
1783 struct coro *next = SvSTATE (coro_sv);
1784
1785 SvREFCNT_inc_NN (coro_sv);
1786 prepare_schedule_to (aTHX_ &ta, next);
1693} 1787}
1694 1788
1695static int 1789static int
1696api_cede (pTHX) 1790api_cede (pTHX)
1697{ 1791{
1726static void 1820static void
1727api_trace (pTHX_ SV *coro_sv, int flags) 1821api_trace (pTHX_ SV *coro_sv, int flags)
1728{ 1822{
1729 struct coro *coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1730 1824
1825 if (coro->flags & CF_RUNNING)
1826 croak ("cannot enable tracing on a running coroutine, caught");
1827
1731 if (flags & CC_TRACE) 1828 if (flags & CC_TRACE)
1732 { 1829 {
1733 if (!coro->cctx) 1830 if (!coro->cctx)
1734 coro->cctx = cctx_new_run (); 1831 coro->cctx = cctx_new_run ();
1735 else if (!(coro->cctx->flags & CC_TRACE)) 1832 else if (!(coro->cctx->flags & CC_TRACE))
1736 croak ("cannot enable tracing on coroutine with custom stack,"); 1833 croak ("cannot enable tracing on coroutine with custom stack, caught");
1737 1834
1738 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1835 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1739 } 1836 }
1740 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1837 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1741 { 1838 {
1746 else 1843 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1844 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1845 }
1749} 1846}
1750 1847
1848static void
1849coro_call_on_destroy (pTHX_ struct coro *coro)
1850{
1851 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1852 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1853
1854 if (on_destroyp)
1855 {
1856 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1857
1858 while (AvFILLp (on_destroy) >= 0)
1859 {
1860 dSP; /* don't disturb outer sp */
1861 SV *cb = av_pop (on_destroy);
1862
1863 PUSHMARK (SP);
1864
1865 if (statusp)
1866 {
1867 int i;
1868 AV *status = (AV *)SvRV (*statusp);
1869 EXTEND (SP, AvFILLp (status) + 1);
1870
1871 for (i = 0; i <= AvFILLp (status); ++i)
1872 PUSHs (AvARRAY (status)[i]);
1873 }
1874
1875 PUTBACK;
1876 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1877 }
1878 }
1879}
1880
1881static void
1882slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1883{
1884 int i;
1885 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV ();
1887
1888 av_extend (av, items - 1);
1889 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i]));
1891
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1893
1894 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1895 api_ready (aTHX_ sv_manager);
1896
1897 frame->prepare = prepare_schedule;
1898 frame->check = slf_check_repeat;
1899
1900 /* as a minor optimisation, we could unwind all stacks here */
1901 /* but that puts extra pressure on pp_slf, and is not worth much */
1902 /*coro_unwind_stacks (aTHX);*/
1903}
1904
1905/*****************************************************************************/
1906/* async pool handler */
1907
1908static int
1909slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1910{
1911 HV *hv = (HV *)SvRV (coro_current);
1912 struct coro *coro = (struct coro *)frame->data;
1913
1914 if (!coro->invoke_cb)
1915 return 1; /* loop till we have invoke */
1916 else
1917 {
1918 hv_store (hv, "desc", sizeof ("desc") - 1,
1919 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1920
1921 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1922
1923 {
1924 dSP;
1925 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1926 PUTBACK;
1927 }
1928
1929 SvREFCNT_dec (GvAV (PL_defgv));
1930 GvAV (PL_defgv) = coro->invoke_av;
1931 coro->invoke_av = 0;
1932
1933 return 0;
1934 }
1935}
1936
1937static void
1938slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1939{
1940 HV *hv = (HV *)SvRV (coro_current);
1941 struct coro *coro = SvSTATE_hv ((SV *)hv);
1942
1943 if (expect_true (coro->saved_deffh))
1944 {
1945 /* subsequent iteration */
1946 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1947 coro->saved_deffh = 0;
1948
1949 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1950 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1951 {
1952 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1953 coro->invoke_av = newAV ();
1954
1955 frame->prepare = prepare_nop;
1956 }
1957 else
1958 {
1959 av_clear (GvAV (PL_defgv));
1960 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1961
1962 coro->prio = 0;
1963
1964 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1965 api_trace (aTHX_ coro_current, 0);
1966
1967 frame->prepare = prepare_schedule;
1968 av_push (av_async_pool, SvREFCNT_inc (hv));
1969 }
1970 }
1971 else
1972 {
1973 /* first iteration, simply fall through */
1974 frame->prepare = prepare_nop;
1975 }
1976
1977 frame->check = slf_check_pool_handler;
1978 frame->data = (void *)coro;
1979}
1980
1751/*****************************************************************************/ 1981/*****************************************************************************/
1752/* rouse callback */ 1982/* rouse callback */
1753 1983
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1984#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 1985
1760 SV *data = (SV *)GENSUB_ARG; 1990 SV *data = (SV *)GENSUB_ARG;
1761 1991
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1992 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 1993 {
1764 /* first call, set args */ 1994 /* first call, set args */
1765 int i;
1766 AV *av = newAV (); 1995 AV *av = newAV ();
1767 SV *coro = SvRV (data); 1996 SV *coro = SvRV (data);
1768 1997
1769 SvRV_set (data, (SV *)av); 1998 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro); 1999 api_ready (aTHX_ coro);
1911static void 2140static void
1912slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2141slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1913{ 2142{
1914 frame->prepare = prepare_schedule; 2143 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_nop; 2144 frame->check = slf_check_nop;
2145}
2146
2147static void
2148slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2149{
2150 struct coro *next = (struct coro *)slf_frame.data;
2151
2152 SvREFCNT_inc_NN (next->hv);
2153 prepare_schedule_to (aTHX_ ta, next);
2154}
2155
2156static void
2157slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2158{
2159 if (!items)
2160 croak ("Coro::schedule_to expects a coroutine argument, caught");
2161
2162 frame->data = (void *)SvSTATE (arg [0]);
2163 frame->prepare = slf_prepare_schedule_to;
2164 frame->check = slf_check_nop;
2165}
2166
2167static void
2168slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2169{
2170 api_ready (aTHX_ SvRV (coro_current));
2171
2172 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1916} 2173}
1917 2174
1918static void 2175static void
1919slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1920{ 2177{
2066 } 2323 }
2067 else 2324 else
2068 slf_argc = 0; 2325 slf_argc = 0;
2069 2326
2070 PL_op->op_ppaddr = pp_slf; 2327 PL_op->op_ppaddr = pp_slf;
2071 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2328 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2072 2329
2073 PL_op = (OP *)&slf_restore; 2330 PL_op = (OP *)&slf_restore;
2331}
2332
2333/*****************************************************************************/
2334/* dynamic wind */
2335
2336static void
2337on_enterleave_call (pTHX_ SV *cb)
2338{
2339 dSP;
2340
2341 PUSHSTACK;
2342
2343 PUSHMARK (SP);
2344 PUTBACK;
2345 call_sv (cb, G_VOID | G_DISCARD);
2346 SPAGAIN;
2347
2348 POPSTACK;
2349}
2350
2351static SV *
2352coro_avp_pop_and_free (pTHX_ AV **avp)
2353{
2354 AV *av = *avp;
2355 SV *res = av_pop (av);
2356
2357 if (AvFILLp (av) < 0)
2358 {
2359 *avp = 0;
2360 SvREFCNT_dec (av);
2361 }
2362
2363 return res;
2364}
2365
2366static void
2367coro_pop_on_enter (pTHX_ void *coro)
2368{
2369 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2370 SvREFCNT_dec (cb);
2371}
2372
2373static void
2374coro_pop_on_leave (pTHX_ void *coro)
2375{
2376 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2377 on_enterleave_call (aTHX_ sv_2mortal (cb));
2074} 2378}
2075 2379
2076/*****************************************************************************/ 2380/*****************************************************************************/
2077/* PerlIO::cede */ 2381/* PerlIO::cede */
2078 2382
2159 SV **ary; 2463 SV **ary;
2160 2464
2161 /* unfortunately, building manually saves memory */ 2465 /* unfortunately, building manually saves memory */
2162 Newx (ary, 2, SV *); 2466 Newx (ary, 2, SV *);
2163 AvALLOC (av) = ary; 2467 AvALLOC (av) = ary;
2468#if PERL_VERSION_ATLEAST (5,10,0)
2164 /*AvARRAY (av) = ary;*/ 2469 AvARRAY (av) = ary;
2470#else
2165 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2471 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2472 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2473 SvPVX ((SV *)av) = (char *)ary;
2474#endif
2166 AvMAX (av) = 1; 2475 AvMAX (av) = 1;
2167 AvFILLp (av) = 0; 2476 AvFILLp (av) = 0;
2168 ary [0] = newSViv (count); 2477 ary [0] = newSViv (count);
2169 2478
2170 return newRV_noinc ((SV *)av); 2479 return newRV_noinc ((SV *)av);
2299{ 2608{
2300 if (items >= 2) 2609 if (items >= 2)
2301 { 2610 {
2302 /* callback form */ 2611 /* callback form */
2303 AV *av = (AV *)SvRV (arg [0]); 2612 AV *av = (AV *)SvRV (arg [0]);
2304 CV *cb_cv = coro_sv_2cv (arg [1]); 2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2305 2614
2306 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2307 2616
2308 if (SvIVX (AvARRAY (av)[0]) > 0) 2617 if (SvIVX (AvARRAY (av)[0]) > 0)
2309 coro_semaphore_adjust (aTHX_ av, 0); 2618 coro_semaphore_adjust (aTHX_ av, 0);
2395 dXSARGS; 2704 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2705 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2706 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2707 SV *data_sv = newSV (sizeof (struct io_state));
2399 2708
2400 av_extend (state, items); 2709 av_extend (state, items - 1);
2401 2710
2402 sv_upgrade (data_sv, SVt_PV); 2711 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2712 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2713 SvPOK_only (data_sv);
2405 2714
2540 XSRETURN_EMPTY; 2849 XSRETURN_EMPTY;
2541} 2850}
2542 2851
2543/*****************************************************************************/ 2852/*****************************************************************************/
2544 2853
2854#if CORO_CLONE
2855# include "clone.c"
2856#endif
2857
2545MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2546 2859
2547PROTOTYPES: DISABLE 2860PROTOTYPES: DISABLE
2548 2861
2549BOOT: 2862BOOT:
2553 coro_thx = PERL_GET_CONTEXT; 2866 coro_thx = PERL_GET_CONTEXT;
2554# endif 2867# endif
2555#endif 2868#endif
2556 BOOT_PAGESIZE; 2869 BOOT_PAGESIZE;
2557 2870
2871 cctx_current = cctx_new_empty ();
2872
2558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2873 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2874 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2560 2875
2561 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2876 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; 2877 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2581 2896
2582 { 2897 {
2583 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2898 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2584 2899
2585 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2900 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2586 hv_store_ent (PL_custom_op_names, slf, 2901 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2587 newSVpv ("coro_slf", 0), 0);
2588 2902
2589 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2903 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2590 hv_store_ent (PL_custom_op_descs, slf, 2904 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2591 newSVpv ("coro schedule like function", 0), 0);
2592 } 2905 }
2593 2906
2594 coroapi.ver = CORO_API_VERSION; 2907 coroapi.ver = CORO_API_VERSION;
2595 coroapi.rev = CORO_API_REVISION; 2908 coroapi.rev = CORO_API_REVISION;
2596 2909
2627 CV *cb; 2940 CV *cb;
2628 int i; 2941 int i;
2629 2942
2630 if (items > 1) 2943 if (items > 1)
2631 { 2944 {
2632 cb = coro_sv_2cv (ST (1)); 2945 cb = coro_sv_2cv (aTHX_ ST (1));
2633 2946
2947 if (!ix)
2948 {
2634 if (CvISXSUB (cb)) 2949 if (CvISXSUB (cb))
2635 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2636 2951
2637 if (!CvROOT (cb)) 2952 if (!CvROOT (cb))
2638 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2639 } 2955 }
2640 2956
2641 Newz (0, coro, 1, struct coro); 2957 Newz (0, coro, 1, struct coro);
2642 coro->args = newAV (); 2958 coro->args = newAV ();
2643 coro->flags = CF_NEW; 2959 coro->flags = CF_NEW;
2651 mg->mg_flags |= MGf_DUP; 2967 mg->mg_flags |= MGf_DUP;
2652 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2653 2969
2654 if (items > 1) 2970 if (items > 1)
2655 { 2971 {
2656 av_extend (coro->args, items - 1 + ix); 2972 av_extend (coro->args, items - 1 + ix - 1);
2657 2973
2658 if (ix) 2974 if (ix)
2659 { 2975 {
2660 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2661 cb = coro_run_cv; 2977 cb = cv_coro_run;
2662 } 2978 }
2663 2979
2664 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2665 2981
2666 for (i = 2; i < items; i++) 2982 for (i = 2; i < items; i++)
2686void 3002void
2687_exit (int code) 3003_exit (int code)
2688 PROTOTYPE: $ 3004 PROTOTYPE: $
2689 CODE: 3005 CODE:
2690 _exit (code); 3006 _exit (code);
3007
3008SV *
3009clone (Coro::State coro)
3010 CODE:
3011{
3012#if CORO_CLONE
3013 struct coro *ncoro = coro_clone (aTHX_ coro);
3014 MAGIC *mg;
3015 /* TODO: too much duplication */
3016 ncoro->hv = newHV ();
3017 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3018 mg->mg_flags |= MGf_DUP;
3019 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3020#else
3021 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3022#endif
3023}
3024 OUTPUT:
3025 RETVAL
2691 3026
2692int 3027int
2693cctx_stacksize (int new_stacksize = 0) 3028cctx_stacksize (int new_stacksize = 0)
2694 PROTOTYPE: ;$ 3029 PROTOTYPE: ;$
2695 CODE: 3030 CODE:
2745 eval = 1 3080 eval = 1
2746 CODE: 3081 CODE:
2747{ 3082{
2748 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2749 { 3084 {
2750 struct coro temp; 3085 struct coro *current = SvSTATE_current;
2751 3086
2752 if (!(coro->flags & CF_RUNNING)) 3087 if (current != coro)
2753 { 3088 {
2754 PUTBACK; 3089 PUTBACK;
2755 save_perl (aTHX_ &temp); 3090 save_perl (aTHX_ current);
2756 load_perl (aTHX_ coro); 3091 load_perl (aTHX_ coro);
3092 SPAGAIN;
2757 } 3093 }
2758 3094
2759 {
2760 dSP;
2761 ENTER;
2762 SAVETMPS;
2763 PUTBACK;
2764 PUSHSTACK; 3095 PUSHSTACK;
3096
2765 PUSHMARK (SP); 3097 PUSHMARK (SP);
3098 PUTBACK;
2766 3099
2767 if (ix) 3100 if (ix)
2768 eval_sv (coderef, 0); 3101 eval_sv (coderef, 0);
2769 else 3102 else
2770 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2771 3104
3105 SPAGAIN;
2772 POPSTACK; 3106 POPSTACK;
2773 SPAGAIN;
2774 FREETMPS;
2775 LEAVE;
2776 PUTBACK;
2777 }
2778 3107
2779 if (!(coro->flags & CF_RUNNING)) 3108 if (current != coro)
2780 { 3109 {
3110 PUTBACK;
2781 save_perl (aTHX_ coro); 3111 save_perl (aTHX_ coro);
2782 load_perl (aTHX_ &temp); 3112 load_perl (aTHX_ current);
2783 SPAGAIN; 3113 SPAGAIN;
2784 } 3114 }
2785 } 3115 }
2786} 3116}
2787 3117
2816 3146
2817SV * 3147SV *
2818has_cctx (Coro::State coro) 3148has_cctx (Coro::State coro)
2819 PROTOTYPE: $ 3149 PROTOTYPE: $
2820 CODE: 3150 CODE:
2821 RETVAL = boolSV (!!coro->cctx); 3151 /* maybe manage the running flag differently */
3152 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2822 OUTPUT: 3153 OUTPUT:
2823 RETVAL 3154 RETVAL
2824 3155
2825int 3156int
2826is_traced (Coro::State coro) 3157is_traced (Coro::State coro)
2846 3177
2847void 3178void
2848force_cctx () 3179force_cctx ()
2849 PROTOTYPE: 3180 PROTOTYPE:
2850 CODE: 3181 CODE:
2851 SvSTATE_current->cctx->idle_sp = 0; 3182 cctx_current->idle_sp = 0;
2852 3183
2853void 3184void
2854swap_defsv (Coro::State self) 3185swap_defsv (Coro::State self)
2855 PROTOTYPE: $ 3186 PROTOTYPE: $
2856 ALIAS: 3187 ALIAS:
2871 3202
2872BOOT: 3203BOOT:
2873{ 3204{
2874 int i; 3205 int i;
2875 3206
2876 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2877 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2878 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2879 coro_run_cv = get_cv (aTHX_ "Coro::_terminate", GV_ADD); 3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2880 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2881 SvREADONLY_on (coro_current); 3212 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3213 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3214 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216
3217 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3220 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2882 3221
2883 coro_stash = gv_stashpv ("Coro", TRUE); 3222 coro_stash = gv_stashpv ("Coro", TRUE);
2884 3223
2885 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2886 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2894 3233
2895 { 3234 {
2896 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2897 3236
2898 coroapi.schedule = api_schedule; 3237 coroapi.schedule = api_schedule;
3238 coroapi.schedule_to = api_schedule_to;
2899 coroapi.cede = api_cede; 3239 coroapi.cede = api_cede;
2900 coroapi.cede_notself = api_cede_notself; 3240 coroapi.cede_notself = api_cede_notself;
2901 coroapi.ready = api_ready; 3241 coroapi.ready = api_ready;
2902 coroapi.is_ready = api_is_ready; 3242 coroapi.is_ready = api_is_ready;
2903 coroapi.nready = coro_nready; 3243 coroapi.nready = coro_nready;
2908 SvREADONLY_on (sv); 3248 SvREADONLY_on (sv);
2909 } 3249 }
2910} 3250}
2911 3251
2912void 3252void
3253terminate (...)
3254 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256
3257void
2913schedule (...) 3258schedule (...)
2914 CODE: 3259 CODE:
2915 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3260 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3261
3262void
3263schedule_to (...)
3264 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3266
3267void
3268cede_to (...)
3269 CODE:
3270 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2916 3271
2917void 3272void
2918cede (...) 3273cede (...)
2919 CODE: 3274 CODE:
2920 CORO_EXECUTE_SLF_XS (slf_init_cede); 3275 CORO_EXECUTE_SLF_XS (slf_init_cede);
2921 3276
2922void 3277void
2923cede_notself (...) 3278cede_notself (...)
2924 CODE: 3279 CODE:
2925 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281
3282void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
2926 3287
2927void 3288void
2928_set_current (SV *current) 3289_set_current (SV *current)
2929 PROTOTYPE: $ 3290 PROTOTYPE: $
2930 CODE: 3291 CODE:
2975 CODE: 3336 CODE:
2976 RETVAL = coro_nready; 3337 RETVAL = coro_nready;
2977 OUTPUT: 3338 OUTPUT:
2978 RETVAL 3339 RETVAL
2979 3340
2980# for async_pool speedup
2981void 3341void
2982_pool_1 (SV *cb) 3342_pool_handler (...)
2983 CODE: 3343 CODE:
2984{ 3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2985 HV *hv = (HV *)SvRV (coro_current);
2986 struct coro *coro = SvSTATE_hv ((SV *)hv);
2987 AV *defav = GvAV (PL_defgv);
2988 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2989 AV *invoke_av;
2990 int i, len;
2991 3345
2992 if (!invoke) 3346void
3347async_pool (SV *cv, ...)
3348 PROTOTYPE: &@
3349 PPCODE:
3350{
3351 HV *hv = (HV *)av_pop (av_async_pool);
3352 AV *av = newAV ();
3353 SV *cb = ST (0);
3354 int i;
3355
3356 av_extend (av, items - 2);
3357 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359
3360 if ((SV *)hv == &PL_sv_undef)
2993 { 3361 {
2994 SV *old = PL_diehook; 3362 PUSHMARK (SP);
2995 PL_diehook = 0; 3363 EXTEND (SP, 2);
2996 SvREFCNT_dec (old); 3364 PUSHs (sv_Coro);
2997 croak ("\3async_pool terminate\2\n"); 3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2998 } 3371 }
2999 3372
3000 SvREFCNT_dec (coro->saved_deffh);
3001 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3002
3003 hv_store (hv, "desc", sizeof ("desc") - 1,
3004 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3005
3006 invoke_av = (AV *)SvRV (invoke);
3007 len = av_len (invoke_av);
3008
3009 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3010
3011 if (len > 0)
3012 { 3373 {
3013 av_fill (defav, len - 1); 3374 struct coro *coro = SvSTATE_hv (hv);
3014 for (i = 0; i < len; ++i) 3375
3015 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3376 assert (!coro->invoke_cb);
3377 assert (!coro->invoke_av);
3378 coro->invoke_cb = SvREFCNT_inc (cb);
3379 coro->invoke_av = av;
3016 } 3380 }
3017}
3018 3381
3019void 3382 api_ready (aTHX_ (SV *)hv);
3020_pool_2 (SV *cb)
3021 CODE:
3022{
3023 HV *hv = (HV *)SvRV (coro_current);
3024 struct coro *coro = SvSTATE_hv ((SV *)hv);
3025 3383
3026 sv_setsv (cb, &PL_sv_undef); 3384 if (GIMME_V != G_VOID)
3027 3385 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3028 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3386 else
3029 coro->saved_deffh = 0;
3030
3031 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3032 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3033 {
3034 SV *old = PL_diehook;
3035 PL_diehook = 0;
3036 SvREFCNT_dec (old); 3387 SvREFCNT_dec (hv);
3037 croak ("\3async_pool terminate\2\n");
3038 }
3039
3040 av_clear (GvAV (PL_defgv));
3041 hv_store (hv, "desc", sizeof ("desc") - 1,
3042 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3043
3044 coro->prio = 0;
3045
3046 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3047 api_trace (aTHX_ coro_current, 0);
3048
3049 av_push (av_async_pool, newSVsv (coro_current));
3050} 3388}
3051 3389
3052SV * 3390SV *
3053rouse_cb () 3391rouse_cb ()
3054 PROTOTYPE: 3392 PROTOTYPE:
3060void 3398void
3061rouse_wait (...) 3399rouse_wait (...)
3062 PROTOTYPE: ;$ 3400 PROTOTYPE: ;$
3063 PPCODE: 3401 PPCODE:
3064 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3402 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3403
3404void
3405on_enter (SV *block)
3406 ALIAS:
3407 on_leave = 1
3408 PROTOTYPE: &
3409 CODE:
3410{
3411 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413
3414 block = (SV *)coro_sv_2cv (aTHX_ block);
3415
3416 if (!*avp)
3417 *avp = newAV ();
3418
3419 av_push (*avp, SvREFCNT_inc (block));
3420
3421 if (!ix)
3422 on_enterleave_call (aTHX_ block);
3423
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
3427}
3065 3428
3066 3429
3067MODULE = Coro::State PACKAGE = PerlIO::cede 3430MODULE = Coro::State PACKAGE = PerlIO::cede
3068 3431
3069BOOT: 3432BOOT:
3228 3591
3229void 3592void
3230_register (char *target, char *proto, SV *req) 3593_register (char *target, char *proto, SV *req)
3231 CODE: 3594 CODE:
3232{ 3595{
3233 CV *req_cv = coro_sv_2cv (req); 3596 CV *req_cv = coro_sv_2cv (aTHX_ req);
3234 /* newXSproto doesn't return the CV on 5.8 */ 3597 /* newXSproto doesn't return the CV on 5.8 */
3235 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3236 sv_setpv ((SV *)slf_cv, proto); 3599 sv_setpv ((SV *)slf_cv, proto);
3237 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3600 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3238} 3601}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines