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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.349 by root, Wed Jun 10 00:47:24 2009 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
240 260
241/* this is a structure representing a perl-level coroutine */ 261/* this is a structure representing a perl-level coroutine */
242struct coro { 262struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 263 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 264 coro_cctx *cctx;
265
266 /* ready queue */
267 struct coro *next_ready;
245 268
246 /* state data */ 269 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 270 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 271 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 272 perl_slots *slot; /* basically the saved sp */
263 SV *except; /* exception to be thrown */ 286 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 287 SV *rouse_cb;
265 288
266 /* async_pool */ 289 /* async_pool */
267 SV *saved_deffh; 290 SV *saved_deffh;
291 SV *invoke_cb;
292 AV *invoke_av;
293
294 /* on_enter/on_leave */
295 AV *on_enter;
296 AV *on_leave;
268 297
269 /* linked list */ 298 /* linked list */
270 struct coro *next, *prev; 299 struct coro *next, *prev;
271}; 300};
272 301
288#define PRIO_MIN -4 317#define PRIO_MIN -4
289 318
290/* for Coro.pm */ 319/* for Coro.pm */
291static SV *coro_current; 320static SV *coro_current;
292static SV *coro_readyhook; 321static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 324static struct coro *coro_first;
295#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
296 326
297/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
298 328
326 return get_hv (name, create); 356 return get_hv (name, create);
327} 357}
328 358
329/* may croak */ 359/* may croak */
330INLINE CV * 360INLINE CV *
331coro_sv_2cv (SV *sv) 361coro_sv_2cv (pTHX_ SV *sv)
332{ 362{
333 HV *st; 363 HV *st;
334 GV *gvp; 364 GV *gvp;
335 return sv_2cv (sv, &st, &gvp, 0); 365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366
367 if (!cv)
368 croak ("code reference expected");
369
370 return cv;
336} 371}
372
373/*****************************************************************************/
374/* magic glue */
375
376#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext
378
379#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \
382 : mg_find (sv, type))
383
384#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \
387 : 0)
388
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391
392INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro)
394{
395 HV *stash;
396 MAGIC *mg;
397
398 if (SvROK (coro))
399 coro = SvRV (coro);
400
401 if (expect_false (SvTYPE (coro) != SVt_PVHV))
402 croak ("Coro::State object required");
403
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr;
414}
415
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417
418/* faster than SvSTATE, but expects a coroutine hv */
419#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421
422/*****************************************************************************/
423/* padlist management and caching */
337 424
338static AV * 425static AV *
339coro_clone_padlist (pTHX_ CV *cv) 426coro_derive_padlist (pTHX_ CV *cv)
340{ 427{
341 AV *padlist = CvPADLIST (cv); 428 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 429 AV *newpadlist, *newpad;
343 430
344 newpadlist = newAV (); 431 newpadlist = newAV ();
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
350#endif 437#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
352 --AvFILLp (padlist); 439 --AvFILLp (padlist);
353 440
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
355 av_store (newpadlist, 1, (SV *)newpad); 442 av_store (newpadlist, 1, (SV *)newpad);
356 443
357 return newpadlist; 444 return newpadlist;
358} 445}
359 446
360static void 447static void
361free_padlist (pTHX_ AV *padlist) 448free_padlist (pTHX_ AV *padlist)
362{ 449{
363 /* may be during global destruction */ 450 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 451 if (!IN_DESTRUCT)
365 { 452 {
366 I32 i = AvFILLp (padlist); 453 I32 i = AvFILLp (padlist);
367 while (i >= 0) 454
455 while (i > 0) /* special-case index 0 */
368 { 456 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 457 /* we try to be extra-careful here */
370 if (svp) 458 AV *av = (AV *)AvARRAY (padlist)[i--];
371 { 459 I32 j = AvFILLp (av);
372 SV *sv; 460
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 461 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]);
463
464 AvFILLp (av) = -1;
374 SvREFCNT_dec (sv); 465 SvREFCNT_dec (av);
375
376 SvREFCNT_dec (*svp);
377 }
378 } 466 }
379 467
468 SvREFCNT_dec (AvARRAY (padlist)[0]);
469
470 AvFILLp (padlist) = -1;
380 SvREFCNT_dec ((SV*)padlist); 471 SvREFCNT_dec ((SV*)padlist);
381 } 472 }
382} 473}
383 474
384static int 475static int
393 484
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 486
396 return 0; 487 return 0;
397} 488}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 489
402static MGVTBL coro_cv_vtbl = { 490static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 491 0, 0, 0, 0,
404 coro_cv_free 492 coro_cv_free
405}; 493};
406
407#define CORO_MAGIC_NN(sv, type) \
408 (expect_true (SvMAGIC (sv)->mg_type == type) \
409 ? SvMAGIC (sv) \
410 : mg_find (sv, type))
411
412#define CORO_MAGIC(sv, type) \
413 (expect_true (SvMAGIC (sv)) \
414 ? CORO_MAGIC_NN (sv, type) \
415 : 0)
416
417#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
418#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
419
420INLINE struct coro *
421SvSTATE_ (pTHX_ SV *coro)
422{
423 HV *stash;
424 MAGIC *mg;
425
426 if (SvROK (coro))
427 coro = SvRV (coro);
428
429 if (expect_false (SvTYPE (coro) != SVt_PVHV))
430 croak ("Coro::State object required");
431
432 stash = SvSTASH (coro);
433 if (expect_false (stash != coro_stash && stash != coro_state_stash))
434 {
435 /* very slow, but rare, check */
436 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
437 croak ("Coro::State object required");
438 }
439
440 mg = CORO_MAGIC_state (coro);
441 return (struct coro *)mg->mg_ptr;
442}
443
444#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
445
446/* faster than SvSTATE, but expects a coroutine hv */
447#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
448#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
449 494
450/* the next two functions merely cache the padlists */ 495/* the next two functions merely cache the padlists */
451static void 496static void
452get_padlist (pTHX_ CV *cv) 497get_padlist (pTHX_ CV *cv)
453{ 498{
464 CV *cp = Perl_cv_clone (aTHX_ cv); 509 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 510 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 511 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 512 SvREFCNT_dec (cp);
468#else 513#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 515#endif
471 } 516 }
472} 517}
473 518
474static void 519static void
481 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
482 527
483 av = (AV *)mg->mg_obj; 528 av = (AV *)mg->mg_obj;
484 529
485 if (expect_false (AvFILLp (av) >= AvMAX (av))) 530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1); 531 av_extend (av, AvFILLp (av) + 1);
487 532
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 534}
490 535
491/** load & save, init *******************************************************/ 536/** load & save, init *******************************************************/
537
538static void
539on_enterleave_call (pTHX_ SV *cb);
492 540
493static void 541static void
494load_perl (pTHX_ Coro__State c) 542load_perl (pTHX_ Coro__State c)
495{ 543{
496 perl_slots *slot = c->slot; 544 perl_slots *slot = c->slot;
497 c->slot = 0; 545 c->slot = 0;
498 546
499 PL_mainstack = c->mainstack; 547 PL_mainstack = c->mainstack;
500 548
501 GvSV (PL_defgv) = slot->defsv; 549 GvSV (PL_defgv) = slot->defsv;
502 GvAV (PL_defgv) = slot->defav; 550 GvAV (PL_defgv) = slot->defav;
503 GvSV (PL_errgv) = slot->errsv; 551 GvSV (PL_errgv) = slot->errsv;
504 GvSV (irsgv) = slot->irsgv; 552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
505 554
506 #define VAR(name,type) PL_ ## name = slot->name; 555 #define VAR(name,type) PL_ ## name = slot->name;
507 # include "state.h" 556 # include "state.h"
508 #undef VAR 557 #undef VAR
509 558
523 PUTBACK; 572 PUTBACK;
524 } 573 }
525 574
526 slf_frame = c->slf_frame; 575 slf_frame = c->slf_frame;
527 CORO_THROW = c->except; 576 CORO_THROW = c->except;
577
578 if (expect_false (c->on_enter))
579 {
580 int i;
581
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 }
528} 585}
529 586
530static void 587static void
531save_perl (pTHX_ Coro__State c) 588save_perl (pTHX_ Coro__State c)
532{ 589{
590 if (expect_false (c->on_leave))
591 {
592 int i;
593
594 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
596 }
597
533 c->except = CORO_THROW; 598 c->except = CORO_THROW;
534 c->slf_frame = slf_frame; 599 c->slf_frame = slf_frame;
535 600
536 { 601 {
537 dSP; 602 dSP;
595 c->mainstack = PL_mainstack; 660 c->mainstack = PL_mainstack;
596 661
597 { 662 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 664
600 slot->defav = GvAV (PL_defgv); 665 slot->defav = GvAV (PL_defgv);
601 slot->defsv = DEFSV; 666 slot->defsv = DEFSV;
602 slot->errsv = ERRSV; 667 slot->errsv = ERRSV;
603 slot->irsgv = GvSV (irsgv); 668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
604 670
605 #define VAR(name,type) slot->name = PL_ ## name; 671 #define VAR(name,type) slot->name = PL_ ## name;
606 # include "state.h" 672 # include "state.h"
607 #undef VAR 673 #undef VAR
608 } 674 }
686#if !PERL_VERSION_ATLEAST (5,10,0) 752#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 753 Safefree (PL_retstack);
688#endif 754#endif
689} 755}
690 756
757#define CORO_RSS \
758 rss += sizeof (SYM (curstackinfo)); \
759 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
760 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
761 rss += SYM (tmps_max) * sizeof (SV *); \
762 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
763 rss += SYM (scopestack_max) * sizeof (I32); \
764 rss += SYM (savestack_max) * sizeof (ANY);
765
691static size_t 766static size_t
692coro_rss (pTHX_ struct coro *coro) 767coro_rss (pTHX_ struct coro *coro)
693{ 768{
694 size_t rss = sizeof (*coro); 769 size_t rss = sizeof (*coro);
695 770
696 if (coro->mainstack) 771 if (coro->mainstack)
697 { 772 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 773 if (coro->flags & CF_RUNNING)
702 { 774 {
703 slot = &tmp_slot; 775 #define SYM(sym) PL_ ## sym
704 776 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 777 #undef SYM
708 } 778 }
709 else 779 else
710 slot = coro->slot;
711
712 if (slot)
713 { 780 {
714 rss += sizeof (slot->curstackinfo); 781 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 782 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 783 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 784 }
726 } 785 }
727 786
728 return rss; 787 return rss;
729} 788}
742#endif 801#endif
743 802
744/* 803/*
745 * This overrides the default magic get method of %SIG elements. 804 * This overrides the default magic get method of %SIG elements.
746 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
747 * and instead of tryign to save and restore the hash elements, we just provide 806 * and instead of trying to save and restore the hash elements, we just provide
748 * readback here. 807 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 808 */
753static int 809static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 811{
756 const char *s = MgPV_nolen_const (mg); 812 const char *s = MgPV_nolen_const (mg);
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 866
811 if (svp) 867 if (svp)
812 { 868 {
813 SV *old = *svp; 869 SV *old = *svp;
814 *svp = newSVsv (sv); 870 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 871 SvREFCNT_dec (old);
816 return 0; 872 return 0;
817 } 873 }
818 } 874 }
819 875
829 885
830static int 886static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 887slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 888{
833 return 0; 889 return 0;
890}
891
892static int
893slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{
895 return 1;
834} 896}
835 897
836static UNOP coro_setup_op; 898static UNOP coro_setup_op;
837 899
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 900static void NOINLINE /* noinline to keep it out of the transfer fast path */
845 907
846 PL_runops = RUNOPS_DEFAULT; 908 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 909 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 910 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 911 PL_comppad = 0;
912 PL_comppad_name = 0;
913 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 915 PL_curpm = 0;
851 PL_curpad = 0; 916 PL_curpad = 0;
852 PL_localizing = 0; 917 PL_localizing = 0;
853 PL_dirty = 0; 918 PL_dirty = 0;
854 PL_restartop = 0; 919 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 920#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 921 PL_parser = 0;
857#endif 922#endif
923 PL_hints = 0;
858 924
859 /* recreate the die/warn hooks */ 925 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 928
863 GvSV (PL_defgv) = newSV (0); 929 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 930 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 931 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
933 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 934 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 936
870 { 937 {
871 dSP; 938 dSP;
872 UNOP myop; 939 UNOP myop;
873 940
874 Zero (&myop, 1, UNOP); 941 Zero (&myop, 1, UNOP);
875 myop.op_next = Nullop; 942 myop.op_next = Nullop;
943 myop.op_type = OP_ENTERSUB;
876 myop.op_flags = OPf_WANT_VOID; 944 myop.op_flags = OPf_WANT_VOID;
877 945
878 PUSHMARK (SP); 946 PUSHMARK (SP);
879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 947 PUSHs ((SV *)coro->startcv);
880 PUTBACK; 948 PUTBACK;
881 PL_op = (OP *)&myop; 949 PL_op = (OP *)&myop;
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 950 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN;
884 } 951 }
885 952
886 /* this newly created coroutine might be run on an existing cctx which most 953 /* this newly created coroutine might be run on an existing cctx which most
887 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 */ 955 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 958
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 960 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 961 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 962 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags required, as an init function won't be called */ 963 /* no flags etc. required, as an init function won't be called */
897 964
898 PL_op = (OP *)&coro_setup_op; 965 PL_op = (OP *)&coro_setup_op;
899 966
900 /* copy throw, in case it was set before coro_setup */ 967 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 968 CORO_THROW = coro->except;
902} 969}
903 970
904static void 971static void
905coro_destruct (pTHX_ struct coro *coro) 972coro_unwind_stacks (pTHX)
906{ 973{
907 if (!IN_DESTRUCT) 974 if (!IN_DESTRUCT)
908 { 975 {
909 /* restore all saved variables and stuff */ 976 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 977 LEAVE_SCOPE (0);
918 POPSTACK_TO (PL_mainstack); 985 POPSTACK_TO (PL_mainstack);
919 986
920 /* unwind main stack */ 987 /* unwind main stack */
921 dounwind (-1); 988 dounwind (-1);
922 } 989 }
990}
991
992static void
993coro_destruct_perl (pTHX_ struct coro *coro)
994{
995 coro_unwind_stacks (aTHX);
923 996
924 SvREFCNT_dec (GvSV (PL_defgv)); 997 SvREFCNT_dec (GvSV (PL_defgv));
925 SvREFCNT_dec (GvAV (PL_defgv)); 998 SvREFCNT_dec (GvAV (PL_defgv));
926 SvREFCNT_dec (GvSV (PL_errgv)); 999 SvREFCNT_dec (GvSV (PL_errgv));
927 SvREFCNT_dec (PL_defoutgv); 1000 SvREFCNT_dec (PL_defoutgv);
928 SvREFCNT_dec (PL_rs); 1001 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv)); 1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
930 1004
931 SvREFCNT_dec (PL_diehook); 1005 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook); 1006 SvREFCNT_dec (PL_warnhook);
933 1007
934 SvREFCNT_dec (CORO_THROW);
935 SvREFCNT_dec (coro->saved_deffh); 1008 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1009 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av);
937 1012
938 coro_destruct_stacks (aTHX); 1013 coro_destruct_stacks (aTHX);
939} 1014}
940 1015
941INLINE void 1016INLINE void
951static int 1026static int
952runops_trace (pTHX) 1027runops_trace (pTHX)
953{ 1028{
954 COP *oldcop = 0; 1029 COP *oldcop = 0;
955 int oldcxix = -2; 1030 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1031
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1032 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1033 {
961 PERL_ASYNC_CHECK (); 1034 PERL_ASYNC_CHECK ();
962 1035
963 if (cctx->flags & CC_TRACE_ALL) 1036 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1037 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1038 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1039 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1040 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1041 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1042 AV *av = newAV (); /* return values */
970 SV **cb; 1043 SV **cb;
1007 1080
1008 if (PL_curcop != &PL_compiling) 1081 if (PL_curcop != &PL_compiling)
1009 { 1082 {
1010 SV **cb; 1083 SV **cb;
1011 1084
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1085 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1086 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1087 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1088
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1089 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1090 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1091 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1092 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1093 SV *fullname = sv_2mortal (newSV (0));
1022 1094
1023 if (isGV (gv)) 1095 if (isGV (gv))
1041 } 1113 }
1042 1114
1043 oldcxix = cxstack_ix; 1115 oldcxix = cxstack_ix;
1044 } 1116 }
1045 1117
1046 if (cctx->flags & CC_TRACE_LINE) 1118 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1119 {
1048 dSP; 1120 dSP;
1049 1121
1050 PL_runops = RUNOPS_DEFAULT; 1122 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1123 ENTER;
1070 1142
1071 TAINT_NOT; 1143 TAINT_NOT;
1072 return 0; 1144 return 0;
1073} 1145}
1074 1146
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1147static struct CoroSLF cctx_ssl_frame;
1077 1148
1078static void 1149static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1150slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1151{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1152 ta->prev = 0;
1083} 1153}
1084 1154
1085static int 1155static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1156slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1157{
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1160 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1161}
1092 1162
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1163/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1164static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1165cctx_prepare (pTHX)
1096{ 1166{
1097 PL_top_env = &PL_start_env; 1167 PL_top_env = &PL_start_env;
1098 1168
1099 if (cctx->flags & CC_TRACE) 1169 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1170 PL_runops = runops_trace;
1101 1171
1102 /* we already must be executing an SLF op, there is no other valid way 1172 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1173 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1174 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1175 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1176
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1177 /* 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; 1178 cctx_ssl_frame = slf_frame;
1110 1179
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1180 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1181 slf_frame.check = slf_check_set_stacklevel;
1113} 1182}
1136 /* normally we would need to skip the entersub here */ 1205 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1206 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1207 /* PL_nop = PL_nop->op_next */
1139 1208
1140 /* inject a fake subroutine call to cctx_init */ 1209 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1210 cctx_prepare (aTHX);
1142 1211
1143 /* cctx_run is the alternative tail of transfer() */ 1212 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1213 transfer_tail (aTHX);
1145 1214
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1215 /* somebody or something will hit me for both perl_run and PL_restartop */
1147 PL_restartop = PL_op; 1216 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1217 perl_run (PL_curinterp);
1218 /*
1219 * Unfortunately, there is no way to get at the return values of the
1220 * coro body here, as perl_run destroys these
1221 */
1149 1222
1150 /* 1223 /*
1151 * If perl-run returns we assume exit() was being called or the coro 1224 * If perl-run returns we assume exit() was being called or the coro
1152 * fell off the end, which seems to be the only valid (non-bug) 1225 * fell off the end, which seems to be the only valid (non-bug)
1153 * reason for perl_run to return. We try to exit by jumping to the 1226 * reason for perl_run to return. We try to exit by jumping to the
1154 * bootstrap-time "top" top_env, as we cannot restore the "main" 1227 * bootstrap-time "top" top_env, as we cannot restore the "main"
1155 * coroutine as Coro has no such concept 1228 * coroutine as Coro has no such concept.
1229 * This actually isn't valid with the pthread backend, but OSes requiring
1230 * that backend are too broken to do it in a standards-compliant way.
1156 */ 1231 */
1157 PL_top_env = main_top_env; 1232 PL_top_env = main_top_env;
1158 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1233 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1159 } 1234 }
1160} 1235}
1237cctx_destroy (coro_cctx *cctx) 1312cctx_destroy (coro_cctx *cctx)
1238{ 1313{
1239 if (!cctx) 1314 if (!cctx)
1240 return; 1315 return;
1241 1316
1317 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1318
1242 --cctx_count; 1319 --cctx_count;
1243 coro_destroy (&cctx->cctx); 1320 coro_destroy (&cctx->cctx);
1244 1321
1245 /* coro_transfer creates new, empty cctx's */ 1322 /* coro_transfer creates new, empty cctx's */
1246 if (cctx->sptr) 1323 if (cctx->sptr)
1309 /* TODO: throwing up here is considered harmful */ 1386 /* TODO: throwing up here is considered harmful */
1310 1387
1311 if (expect_true (prev != next)) 1388 if (expect_true (prev != next))
1312 { 1389 {
1313 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1390 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1314 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1391 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1315 1392
1316 if (expect_false (next->flags & CF_RUNNING))
1317 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1318
1319 if (expect_false (next->flags & CF_DESTROYED)) 1393 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1320 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1394 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1321 1395
1322#if !PERL_VERSION_ATLEAST (5,10,0) 1396#if !PERL_VERSION_ATLEAST (5,10,0)
1323 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1397 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1324 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1398 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1325#endif 1399#endif
1331transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1405transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1332{ 1406{
1333 dSTACKLEVEL; 1407 dSTACKLEVEL;
1334 1408
1335 /* sometimes transfer is only called to set idle_sp */ 1409 /* sometimes transfer is only called to set idle_sp */
1336 if (expect_false (!next)) 1410 if (expect_false (!prev))
1337 { 1411 {
1338 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1412 cctx_current->idle_sp = STACKLEVEL;
1339 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1413 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1340 } 1414 }
1341 else if (expect_true (prev != next)) 1415 else if (expect_true (prev != next))
1342 { 1416 {
1343 coro_cctx *prev__cctx; 1417 coro_cctx *cctx_prev;
1344 1418
1345 if (expect_false (prev->flags & CF_NEW)) 1419 if (expect_false (prev->flags & CF_NEW))
1346 { 1420 {
1347 /* create a new empty/source context */ 1421 /* create a new empty/source context */
1348 prev->cctx = cctx_new_empty ();
1349 prev->flags &= ~CF_NEW; 1422 prev->flags &= ~CF_NEW;
1350 prev->flags |= CF_RUNNING; 1423 prev->flags |= CF_RUNNING;
1351 } 1424 }
1352 1425
1353 prev->flags &= ~CF_RUNNING; 1426 prev->flags &= ~CF_RUNNING;
1364 coro_setup (aTHX_ next); 1437 coro_setup (aTHX_ next);
1365 } 1438 }
1366 else 1439 else
1367 load_perl (aTHX_ next); 1440 load_perl (aTHX_ next);
1368 1441
1369 prev__cctx = prev->cctx;
1370
1371 /* possibly untie and reuse the cctx */ 1442 /* possibly untie and reuse the cctx */
1372 if (expect_true ( 1443 if (expect_true (
1373 prev__cctx->idle_sp == STACKLEVEL 1444 cctx_current->idle_sp == STACKLEVEL
1374 && !(prev__cctx->flags & CC_TRACE) 1445 && !(cctx_current->flags & CC_TRACE)
1375 && !force_cctx 1446 && !force_cctx
1376 )) 1447 ))
1377 { 1448 {
1378 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1449 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1379 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1450 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1380 1451
1381 prev->cctx = 0;
1382
1383 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1452 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1384 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1453 /* without this the next cctx_get might destroy the running cctx while still in use */
1385 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1454 if (expect_false (CCTX_EXPIRED (cctx_current)))
1386 if (!next->cctx) 1455 if (expect_true (!next->cctx))
1387 next->cctx = cctx_get (aTHX); 1456 next->cctx = cctx_get (aTHX);
1388 1457
1389 cctx_put (prev__cctx); 1458 cctx_put (cctx_current);
1390 } 1459 }
1460 else
1461 prev->cctx = cctx_current;
1391 1462
1392 ++next->usecount; 1463 ++next->usecount;
1393 1464
1394 if (expect_true (!next->cctx)) 1465 cctx_prev = cctx_current;
1395 next->cctx = cctx_get (aTHX); 1466 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1396 1467
1397 if (expect_false (prev__cctx != next->cctx)) 1468 next->cctx = 0;
1469
1470 if (expect_false (cctx_prev != cctx_current))
1398 { 1471 {
1399 prev__cctx->top_env = PL_top_env; 1472 cctx_prev->top_env = PL_top_env;
1400 PL_top_env = next->cctx->top_env; 1473 PL_top_env = cctx_current->top_env;
1401 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1474 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1402 } 1475 }
1403 1476
1404 transfer_tail (aTHX); 1477 transfer_tail (aTHX);
1405 } 1478 }
1406} 1479}
1414coro_state_destroy (pTHX_ struct coro *coro) 1487coro_state_destroy (pTHX_ struct coro *coro)
1415{ 1488{
1416 if (coro->flags & CF_DESTROYED) 1489 if (coro->flags & CF_DESTROYED)
1417 return 0; 1490 return 0;
1418 1491
1419 if (coro->on_destroy) 1492 if (coro->on_destroy && !PL_dirty)
1420 coro->on_destroy (aTHX_ coro); 1493 coro->on_destroy (aTHX_ coro);
1421 1494
1422 coro->flags |= CF_DESTROYED; 1495 coro->flags |= CF_DESTROYED;
1423 1496
1424 if (coro->flags & CF_READY) 1497 if (coro->flags & CF_READY)
1428 --coro_nready; 1501 --coro_nready;
1429 } 1502 }
1430 else 1503 else
1431 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1504 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1432 1505
1433 if (coro->mainstack && coro->mainstack != main_mainstack) 1506 if (coro->mainstack
1507 && coro->mainstack != main_mainstack
1508 && coro->slot
1509 && !PL_dirty)
1434 { 1510 {
1435 struct coro temp; 1511 struct coro *current = SvSTATE_current;
1436 1512
1437 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1438 1514
1439 save_perl (aTHX_ &temp); 1515 save_perl (aTHX_ current);
1440 load_perl (aTHX_ coro); 1516 load_perl (aTHX_ coro);
1441 1517
1442 coro_destruct (aTHX_ coro); 1518 coro_destruct_perl (aTHX_ coro);
1443 1519
1444 load_perl (aTHX_ &temp); 1520 load_perl (aTHX_ current);
1445 1521
1446 coro->slot = 0; 1522 coro->slot = 0;
1447 } 1523 }
1448 1524
1449 cctx_destroy (coro->cctx); 1525 cctx_destroy (coro->cctx);
1450 SvREFCNT_dec (coro->startcv); 1526 SvREFCNT_dec (coro->startcv);
1451 SvREFCNT_dec (coro->args); 1527 SvREFCNT_dec (coro->args);
1528 SvREFCNT_dec (CORO_THROW);
1452 1529
1453 if (coro->next) coro->next->prev = coro->prev; 1530 if (coro->next) coro->next->prev = coro->prev;
1454 if (coro->prev) coro->prev->next = coro->next; 1531 if (coro->prev) coro->prev->next = coro->next;
1455 if (coro == coro_first) coro_first = coro->next; 1532 if (coro == coro_first) coro_first = coro->next;
1456 1533
1538/** Coro ********************************************************************/ 1615/** Coro ********************************************************************/
1539 1616
1540INLINE void 1617INLINE void
1541coro_enq (pTHX_ struct coro *coro) 1618coro_enq (pTHX_ struct coro *coro)
1542{ 1619{
1543 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1544}
1545 1621
1546INLINE SV * 1622 SvREFCNT_inc_NN (coro->hv);
1623
1624 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1626 ready [1] = coro;
1627}
1628
1629INLINE struct coro *
1547coro_deq (pTHX) 1630coro_deq (pTHX)
1548{ 1631{
1549 int prio; 1632 int prio;
1550 1633
1551 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1552 if (AvFILLp (coro_ready [prio]) >= 0) 1635 {
1553 return av_shift (coro_ready [prio]); 1636 struct coro **ready = coro_ready [prio];
1637
1638 if (ready [0])
1639 {
1640 struct coro *coro = ready [0];
1641 ready [0] = coro->next_ready;
1642 return coro;
1643 }
1644 }
1554 1645
1555 return 0; 1646 return 0;
1556} 1647}
1557 1648
1558static int 1649static int
1560{ 1651{
1561 struct coro *coro; 1652 struct coro *coro;
1562 SV *sv_hook; 1653 SV *sv_hook;
1563 void (*xs_hook)(void); 1654 void (*xs_hook)(void);
1564 1655
1565 if (SvROK (coro_sv))
1566 coro_sv = SvRV (coro_sv);
1567
1568 coro = SvSTATE (coro_sv); 1656 coro = SvSTATE (coro_sv);
1569 1657
1570 if (coro->flags & CF_READY) 1658 if (coro->flags & CF_READY)
1571 return 0; 1659 return 0;
1572 1660
1603api_is_ready (pTHX_ SV *coro_sv) 1691api_is_ready (pTHX_ SV *coro_sv)
1604{ 1692{
1605 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1693 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606} 1694}
1607 1695
1696/* expects to own a reference to next->hv */
1608INLINE void 1697INLINE void
1609prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1698prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1610{ 1699{
1611 SV *prev_sv, *next_sv;
1612
1613 for (;;)
1614 {
1615 next_sv = coro_deq (aTHX);
1616
1617 /* nothing to schedule: call the idle handler */
1618 if (expect_false (!next_sv))
1619 {
1620 dSP;
1621
1622 ENTER;
1623 SAVETMPS;
1624
1625 PUSHMARK (SP);
1626 PUTBACK;
1627 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1628
1629 FREETMPS;
1630 LEAVE;
1631 continue;
1632 }
1633
1634 ta->next = SvSTATE_hv (next_sv);
1635
1636 /* cannot transfer to destroyed coros, skip and look for next */
1637 if (expect_false (ta->next->flags & CF_DESTROYED))
1638 {
1639 SvREFCNT_dec (next_sv);
1640 /* coro_nready has already been taken care of by destroy */
1641 continue;
1642 }
1643
1644 --coro_nready;
1645 break;
1646 }
1647
1648 /* free this only after the transfer */
1649 prev_sv = SvRV (coro_current); 1700 SV *prev_sv = SvRV (coro_current);
1701
1650 ta->prev = SvSTATE_hv (prev_sv); 1702 ta->prev = SvSTATE_hv (prev_sv);
1703 ta->next = next;
1704
1651 TRANSFER_CHECK (*ta); 1705 TRANSFER_CHECK (*ta);
1652 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1706
1653 ta->next->flags &= ~CF_READY;
1654 SvRV_set (coro_current, next_sv); 1707 SvRV_set (coro_current, (SV *)next->hv);
1655 1708
1656 free_coro_mortal (aTHX); 1709 free_coro_mortal (aTHX);
1657 coro_mortal = prev_sv; 1710 coro_mortal = prev_sv;
1658} 1711}
1659 1712
1713static void
1714prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1715{
1716 for (;;)
1717 {
1718 struct coro *next = coro_deq (aTHX);
1719
1720 if (expect_true (next))
1721 {
1722 /* cannot transfer to destroyed coros, skip and look for next */
1723 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1724 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1725 else
1726 {
1727 next->flags &= ~CF_READY;
1728 --coro_nready;
1729
1730 prepare_schedule_to (aTHX_ ta, next);
1731 break;
1732 }
1733 }
1734 else
1735 {
1736 /* nothing to schedule: call the idle handler */
1737 if (SvROK (sv_idle)
1738 && SvOBJECT (SvRV (sv_idle)))
1739 {
1740 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1741 api_ready (aTHX_ SvRV (sv_idle));
1742 --coro_nready;
1743 }
1744 else
1745 {
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (sv_idle, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1757 }
1758 }
1759 }
1760}
1761
1660INLINE void 1762INLINE void
1661prepare_cede (pTHX_ struct coro_transfer_args *ta) 1763prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662{ 1764{
1663 api_ready (aTHX_ coro_current); 1765 api_ready (aTHX_ coro_current);
1664 prepare_schedule (aTHX_ ta); 1766 prepare_schedule (aTHX_ ta);
1683{ 1785{
1684 struct coro_transfer_args ta; 1786 struct coro_transfer_args ta;
1685 1787
1686 prepare_schedule (aTHX_ &ta); 1788 prepare_schedule (aTHX_ &ta);
1687 TRANSFER (ta, 1); 1789 TRANSFER (ta, 1);
1790}
1791
1792static void
1793api_schedule_to (pTHX_ SV *coro_sv)
1794{
1795 struct coro_transfer_args ta;
1796 struct coro *next = SvSTATE (coro_sv);
1797
1798 SvREFCNT_inc_NN (coro_sv);
1799 prepare_schedule_to (aTHX_ &ta, next);
1688} 1800}
1689 1801
1690static int 1802static int
1691api_cede (pTHX) 1803api_cede (pTHX)
1692{ 1804{
1721static void 1833static void
1722api_trace (pTHX_ SV *coro_sv, int flags) 1834api_trace (pTHX_ SV *coro_sv, int flags)
1723{ 1835{
1724 struct coro *coro = SvSTATE (coro_sv); 1836 struct coro *coro = SvSTATE (coro_sv);
1725 1837
1838 if (coro->flags & CF_RUNNING)
1839 croak ("cannot enable tracing on a running coroutine, caught");
1840
1726 if (flags & CC_TRACE) 1841 if (flags & CC_TRACE)
1727 { 1842 {
1728 if (!coro->cctx) 1843 if (!coro->cctx)
1729 coro->cctx = cctx_new_run (); 1844 coro->cctx = cctx_new_run ();
1730 else if (!(coro->cctx->flags & CC_TRACE)) 1845 else if (!(coro->cctx->flags & CC_TRACE))
1731 croak ("cannot enable tracing on coroutine with custom stack,"); 1846 croak ("cannot enable tracing on coroutine with custom stack, caught");
1732 1847
1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1848 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1734 } 1849 }
1735 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1850 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1736 { 1851 {
1741 else 1856 else
1742 coro->slot->runops = RUNOPS_DEFAULT; 1857 coro->slot->runops = RUNOPS_DEFAULT;
1743 } 1858 }
1744} 1859}
1745 1860
1861static void
1862coro_call_on_destroy (pTHX_ struct coro *coro)
1863{
1864 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1865 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1866
1867 if (on_destroyp)
1868 {
1869 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1870
1871 while (AvFILLp (on_destroy) >= 0)
1872 {
1873 dSP; /* don't disturb outer sp */
1874 SV *cb = av_pop (on_destroy);
1875
1876 PUSHMARK (SP);
1877
1878 if (statusp)
1879 {
1880 int i;
1881 AV *status = (AV *)SvRV (*statusp);
1882 EXTEND (SP, AvFILLp (status) + 1);
1883
1884 for (i = 0; i <= AvFILLp (status); ++i)
1885 PUSHs (AvARRAY (status)[i]);
1886 }
1887
1888 PUTBACK;
1889 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1890 }
1891 }
1892}
1893
1894static void
1895slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1896{
1897 int i;
1898 HV *hv = (HV *)SvRV (coro_current);
1899 AV *av = newAV ();
1900
1901 av_extend (av, items - 1);
1902 for (i = 0; i < items; ++i)
1903 av_push (av, SvREFCNT_inc_NN (arg [i]));
1904
1905 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1906
1907 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1908 api_ready (aTHX_ sv_manager);
1909
1910 frame->prepare = prepare_schedule;
1911 frame->check = slf_check_repeat;
1912
1913 /* as a minor optimisation, we could unwind all stacks here */
1914 /* but that puts extra pressure on pp_slf, and is not worth much */
1915 /*coro_unwind_stacks (aTHX);*/
1916}
1917
1918/*****************************************************************************/
1919/* async pool handler */
1920
1921static int
1922slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1923{
1924 HV *hv = (HV *)SvRV (coro_current);
1925 struct coro *coro = (struct coro *)frame->data;
1926
1927 if (!coro->invoke_cb)
1928 return 1; /* loop till we have invoke */
1929 else
1930 {
1931 hv_store (hv, "desc", sizeof ("desc") - 1,
1932 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1933
1934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1935
1936 {
1937 dSP;
1938 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1939 PUTBACK;
1940 }
1941
1942 SvREFCNT_dec (GvAV (PL_defgv));
1943 GvAV (PL_defgv) = coro->invoke_av;
1944 coro->invoke_av = 0;
1945
1946 return 0;
1947 }
1948}
1949
1950static void
1951slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1952{
1953 HV *hv = (HV *)SvRV (coro_current);
1954 struct coro *coro = SvSTATE_hv ((SV *)hv);
1955
1956 if (expect_true (coro->saved_deffh))
1957 {
1958 /* subsequent iteration */
1959 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1960 coro->saved_deffh = 0;
1961
1962 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1963 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1964 {
1965 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1966 coro->invoke_av = newAV ();
1967
1968 frame->prepare = prepare_nop;
1969 }
1970 else
1971 {
1972 av_clear (GvAV (PL_defgv));
1973 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1974
1975 coro->prio = 0;
1976
1977 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1978 api_trace (aTHX_ coro_current, 0);
1979
1980 frame->prepare = prepare_schedule;
1981 av_push (av_async_pool, SvREFCNT_inc (hv));
1982 }
1983 }
1984 else
1985 {
1986 /* first iteration, simply fall through */
1987 frame->prepare = prepare_nop;
1988 }
1989
1990 frame->check = slf_check_pool_handler;
1991 frame->data = (void *)coro;
1992}
1993
1746/*****************************************************************************/ 1994/*****************************************************************************/
1747/* rouse callback */ 1995/* rouse callback */
1748 1996
1749#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1997#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750 1998
1755 SV *data = (SV *)GENSUB_ARG; 2003 SV *data = (SV *)GENSUB_ARG;
1756 2004
1757 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2005 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758 { 2006 {
1759 /* first call, set args */ 2007 /* first call, set args */
1760 int i; 2008 SV *coro = SvRV (data);
1761 AV *av = newAV (); 2009 AV *av = newAV ();
1762 SV *coro = SvRV (data);
1763 2010
1764 SvRV_set (data, (SV *)av); 2011 SvRV_set (data, (SV *)av);
1765 api_ready (aTHX_ coro);
1766 SvREFCNT_dec (coro);
1767 2012
1768 /* better take a full copy of the arguments */ 2013 /* better take a full copy of the arguments */
1769 while (items--) 2014 while (items--)
1770 av_store (av, items, newSVsv (ST (items))); 2015 av_store (av, items, newSVsv (ST (items)));
2016
2017 api_ready (aTHX_ coro);
2018 SvREFCNT_dec (coro);
1771 } 2019 }
1772 2020
1773 XSRETURN_EMPTY; 2021 XSRETURN_EMPTY;
1774} 2022}
1775 2023
1792 2040
1793 EXTEND (SP, AvFILLp (av) + 1); 2041 EXTEND (SP, AvFILLp (av) + 1);
1794 for (i = 0; i <= AvFILLp (av); ++i) 2042 for (i = 0; i <= AvFILLp (av); ++i)
1795 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2043 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1796 2044
1797 /* we have stolen the elements, so ste length to zero and free */ 2045 /* we have stolen the elements, so set length to zero and free */
1798 AvFILLp (av) = -1; 2046 AvFILLp (av) = -1;
1799 av_undef (av); 2047 av_undef (av);
1800 2048
1801 PUTBACK; 2049 PUTBACK;
1802 } 2050 }
1906static void 2154static void
1907slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2155slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1908{ 2156{
1909 frame->prepare = prepare_schedule; 2157 frame->prepare = prepare_schedule;
1910 frame->check = slf_check_nop; 2158 frame->check = slf_check_nop;
2159}
2160
2161static void
2162slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2163{
2164 struct coro *next = (struct coro *)slf_frame.data;
2165
2166 SvREFCNT_inc_NN (next->hv);
2167 prepare_schedule_to (aTHX_ ta, next);
2168}
2169
2170static void
2171slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2172{
2173 if (!items)
2174 croak ("Coro::schedule_to expects a coroutine argument, caught");
2175
2176 frame->data = (void *)SvSTATE (arg [0]);
2177 frame->prepare = slf_prepare_schedule_to;
2178 frame->check = slf_check_nop;
2179}
2180
2181static void
2182slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2183{
2184 api_ready (aTHX_ SvRV (coro_current));
2185
2186 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1911} 2187}
1912 2188
1913static void 2189static void
1914slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2190slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{ 2191{
2061 } 2337 }
2062 else 2338 else
2063 slf_argc = 0; 2339 slf_argc = 0;
2064 2340
2065 PL_op->op_ppaddr = pp_slf; 2341 PL_op->op_ppaddr = pp_slf;
2066 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2342 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2067 2343
2068 PL_op = (OP *)&slf_restore; 2344 PL_op = (OP *)&slf_restore;
2345}
2346
2347/*****************************************************************************/
2348/* dynamic wind */
2349
2350static void
2351on_enterleave_call (pTHX_ SV *cb)
2352{
2353 dSP;
2354
2355 PUSHSTACK;
2356
2357 PUSHMARK (SP);
2358 PUTBACK;
2359 call_sv (cb, G_VOID | G_DISCARD);
2360 SPAGAIN;
2361
2362 POPSTACK;
2363}
2364
2365static SV *
2366coro_avp_pop_and_free (pTHX_ AV **avp)
2367{
2368 AV *av = *avp;
2369 SV *res = av_pop (av);
2370
2371 if (AvFILLp (av) < 0)
2372 {
2373 *avp = 0;
2374 SvREFCNT_dec (av);
2375 }
2376
2377 return res;
2378}
2379
2380static void
2381coro_pop_on_enter (pTHX_ void *coro)
2382{
2383 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2384 SvREFCNT_dec (cb);
2385}
2386
2387static void
2388coro_pop_on_leave (pTHX_ void *coro)
2389{
2390 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2391 on_enterleave_call (aTHX_ sv_2mortal (cb));
2069} 2392}
2070 2393
2071/*****************************************************************************/ 2394/*****************************************************************************/
2072/* PerlIO::cede */ 2395/* PerlIO::cede */
2073 2396
2154 SV **ary; 2477 SV **ary;
2155 2478
2156 /* unfortunately, building manually saves memory */ 2479 /* unfortunately, building manually saves memory */
2157 Newx (ary, 2, SV *); 2480 Newx (ary, 2, SV *);
2158 AvALLOC (av) = ary; 2481 AvALLOC (av) = ary;
2482#if PERL_VERSION_ATLEAST (5,10,0)
2159 /*AvARRAY (av) = ary;*/ 2483 AvARRAY (av) = ary;
2484#else
2160 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2485 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2486 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2487 SvPVX ((SV *)av) = (char *)ary;
2488#endif
2161 AvMAX (av) = 1; 2489 AvMAX (av) = 1;
2162 AvFILLp (av) = 0; 2490 AvFILLp (av) = 0;
2163 ary [0] = newSViv (count); 2491 ary [0] = newSViv (count);
2164 2492
2165 return newRV_noinc ((SV *)av); 2493 return newRV_noinc ((SV *)av);
2294{ 2622{
2295 if (items >= 2) 2623 if (items >= 2)
2296 { 2624 {
2297 /* callback form */ 2625 /* callback form */
2298 AV *av = (AV *)SvRV (arg [0]); 2626 AV *av = (AV *)SvRV (arg [0]);
2299 CV *cb_cv = coro_sv_2cv (arg [1]); 2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2300 2628
2301 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2302 2630
2303 if (SvIVX (AvARRAY (av)[0]) > 0) 2631 if (SvIVX (AvARRAY (av)[0]) > 0)
2304 coro_semaphore_adjust (aTHX_ av, 0); 2632 coro_semaphore_adjust (aTHX_ av, 0);
2390 dXSARGS; 2718 dXSARGS;
2391 AV *state = (AV *)GENSUB_ARG; 2719 AV *state = (AV *)GENSUB_ARG;
2392 SV *coro = av_pop (state); 2720 SV *coro = av_pop (state);
2393 SV *data_sv = newSV (sizeof (struct io_state)); 2721 SV *data_sv = newSV (sizeof (struct io_state));
2394 2722
2395 av_extend (state, items); 2723 av_extend (state, items - 1);
2396 2724
2397 sv_upgrade (data_sv, SVt_PV); 2725 sv_upgrade (data_sv, SVt_PV);
2398 SvCUR_set (data_sv, sizeof (struct io_state)); 2726 SvCUR_set (data_sv, sizeof (struct io_state));
2399 SvPOK_only (data_sv); 2727 SvPOK_only (data_sv);
2400 2728
2535 XSRETURN_EMPTY; 2863 XSRETURN_EMPTY;
2536} 2864}
2537 2865
2538/*****************************************************************************/ 2866/*****************************************************************************/
2539 2867
2868#if CORO_CLONE
2869# include "clone.c"
2870#endif
2871
2540MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2872MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2541 2873
2542PROTOTYPES: DISABLE 2874PROTOTYPES: DISABLE
2543 2875
2544BOOT: 2876BOOT:
2548 coro_thx = PERL_GET_CONTEXT; 2880 coro_thx = PERL_GET_CONTEXT;
2549# endif 2881# endif
2550#endif 2882#endif
2551 BOOT_PAGESIZE; 2883 BOOT_PAGESIZE;
2552 2884
2885 cctx_current = cctx_new_empty ();
2886
2553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2887 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2888 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2555 2889
2556 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2890 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2557 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2891 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2576 2910
2577 { 2911 {
2578 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2912 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579 2913
2580 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2914 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581 hv_store_ent (PL_custom_op_names, slf, 2915 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582 newSVpv ("coro_slf", 0), 0);
2583 2916
2584 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2917 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585 hv_store_ent (PL_custom_op_descs, slf, 2918 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586 newSVpv ("coro schedule like function", 0), 0);
2587 } 2919 }
2588 2920
2589 coroapi.ver = CORO_API_VERSION; 2921 coroapi.ver = CORO_API_VERSION;
2590 coroapi.rev = CORO_API_REVISION; 2922 coroapi.rev = CORO_API_REVISION;
2591 2923
2610 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2611} 2943}
2612 2944
2613SV * 2945SV *
2614new (char *klass, ...) 2946new (char *klass, ...)
2947 ALIAS:
2948 Coro::new = 1
2615 CODE: 2949 CODE:
2616{ 2950{
2617 struct coro *coro; 2951 struct coro *coro;
2618 MAGIC *mg; 2952 MAGIC *mg;
2619 HV *hv; 2953 HV *hv;
2620 CV *cb; 2954 CV *cb;
2621 int i; 2955 int i;
2622 2956
2623 if (items > 1) 2957 if (items > 1)
2624 { 2958 {
2625 cb = coro_sv_2cv (ST (1)); 2959 cb = coro_sv_2cv (aTHX_ ST (1));
2626 2960
2961 if (!ix)
2962 {
2627 if (CvISXSUB (cb)) 2963 if (CvISXSUB (cb))
2628 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2964 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629 2965
2630 if (!CvROOT (cb)) 2966 if (!CvROOT (cb))
2631 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2967 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2968 }
2632 } 2969 }
2633 2970
2634 Newz (0, coro, 1, struct coro); 2971 Newz (0, coro, 1, struct coro);
2635 coro->args = newAV (); 2972 coro->args = newAV ();
2636 coro->flags = CF_NEW; 2973 coro->flags = CF_NEW;
2644 mg->mg_flags |= MGf_DUP; 2981 mg->mg_flags |= MGf_DUP;
2645 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2982 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646 2983
2647 if (items > 1) 2984 if (items > 1)
2648 { 2985 {
2649 coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651 av_extend (coro->args, items - 1); 2986 av_extend (coro->args, items - 1 + ix - 1);
2987
2988 if (ix)
2989 {
2652 av_push (coro->args, SvREFCNT_inc (cb)); 2990 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991 cb = cv_coro_run;
2992 }
2993
2994 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2995
2653 for (i = 2; i < items; i++) 2996 for (i = 2; i < items; i++)
2654 av_push (coro->args, newSVsv (ST (i))); 2997 av_push (coro->args, newSVsv (ST (i)));
2655 } 2998 }
2656} 2999}
2657 OUTPUT: 3000 OUTPUT:
2673void 3016void
2674_exit (int code) 3017_exit (int code)
2675 PROTOTYPE: $ 3018 PROTOTYPE: $
2676 CODE: 3019 CODE:
2677 _exit (code); 3020 _exit (code);
3021
3022SV *
3023clone (Coro::State coro)
3024 CODE:
3025{
3026#if CORO_CLONE
3027 struct coro *ncoro = coro_clone (aTHX_ coro);
3028 MAGIC *mg;
3029 /* TODO: too much duplication */
3030 ncoro->hv = newHV ();
3031 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3032 mg->mg_flags |= MGf_DUP;
3033 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3034#else
3035 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3036#endif
3037}
3038 OUTPUT:
3039 RETVAL
2678 3040
2679int 3041int
2680cctx_stacksize (int new_stacksize = 0) 3042cctx_stacksize (int new_stacksize = 0)
2681 PROTOTYPE: ;$ 3043 PROTOTYPE: ;$
2682 CODE: 3044 CODE:
2732 eval = 1 3094 eval = 1
2733 CODE: 3095 CODE:
2734{ 3096{
2735 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3097 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2736 { 3098 {
2737 struct coro temp; 3099 struct coro *current = SvSTATE_current;
2738 3100
2739 if (!(coro->flags & CF_RUNNING)) 3101 if (current != coro)
2740 { 3102 {
2741 PUTBACK; 3103 PUTBACK;
2742 save_perl (aTHX_ &temp); 3104 save_perl (aTHX_ current);
2743 load_perl (aTHX_ coro); 3105 load_perl (aTHX_ coro);
3106 SPAGAIN;
2744 } 3107 }
2745 3108
2746 {
2747 dSP;
2748 ENTER;
2749 SAVETMPS;
2750 PUTBACK;
2751 PUSHSTACK; 3109 PUSHSTACK;
3110
2752 PUSHMARK (SP); 3111 PUSHMARK (SP);
3112 PUTBACK;
2753 3113
2754 if (ix) 3114 if (ix)
2755 eval_sv (coderef, 0); 3115 eval_sv (coderef, 0);
2756 else 3116 else
2757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3117 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2758 3118
2759 POPSTACK; 3119 POPSTACK;
2760 SPAGAIN; 3120 SPAGAIN;
2761 FREETMPS;
2762 LEAVE;
2763 PUTBACK;
2764 }
2765 3121
2766 if (!(coro->flags & CF_RUNNING)) 3122 if (current != coro)
2767 { 3123 {
3124 PUTBACK;
2768 save_perl (aTHX_ coro); 3125 save_perl (aTHX_ coro);
2769 load_perl (aTHX_ &temp); 3126 load_perl (aTHX_ current);
2770 SPAGAIN; 3127 SPAGAIN;
2771 } 3128 }
2772 } 3129 }
2773} 3130}
2774 3131
2778 ALIAS: 3135 ALIAS:
2779 is_ready = CF_READY 3136 is_ready = CF_READY
2780 is_running = CF_RUNNING 3137 is_running = CF_RUNNING
2781 is_new = CF_NEW 3138 is_new = CF_NEW
2782 is_destroyed = CF_DESTROYED 3139 is_destroyed = CF_DESTROYED
3140 is_suspended = CF_SUSPENDED
2783 CODE: 3141 CODE:
2784 RETVAL = boolSV (coro->flags & ix); 3142 RETVAL = boolSV (coro->flags & ix);
2785 OUTPUT: 3143 OUTPUT:
2786 RETVAL 3144 RETVAL
2787 3145
2803 3161
2804SV * 3162SV *
2805has_cctx (Coro::State coro) 3163has_cctx (Coro::State coro)
2806 PROTOTYPE: $ 3164 PROTOTYPE: $
2807 CODE: 3165 CODE:
2808 RETVAL = boolSV (!!coro->cctx); 3166 /* maybe manage the running flag differently */
3167 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2809 OUTPUT: 3168 OUTPUT:
2810 RETVAL 3169 RETVAL
2811 3170
2812int 3171int
2813is_traced (Coro::State coro) 3172is_traced (Coro::State coro)
2833 3192
2834void 3193void
2835force_cctx () 3194force_cctx ()
2836 PROTOTYPE: 3195 PROTOTYPE:
2837 CODE: 3196 CODE:
2838 SvSTATE_current->cctx->idle_sp = 0; 3197 cctx_current->idle_sp = 0;
2839 3198
2840void 3199void
2841swap_defsv (Coro::State self) 3200swap_defsv (Coro::State self)
2842 PROTOTYPE: $ 3201 PROTOTYPE: $
2843 ALIAS: 3202 ALIAS:
2851 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3210 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2852 3211
2853 SV *tmp = *src; *src = *dst; *dst = tmp; 3212 SV *tmp = *src; *src = *dst; *dst = tmp;
2854 } 3213 }
2855 3214
3215void
3216cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3220
2856 3221
2857MODULE = Coro::State PACKAGE = Coro 3222MODULE = Coro::State PACKAGE = Coro
2858 3223
2859BOOT: 3224BOOT:
2860{ 3225{
2861 int i;
2862
2863 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3226 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3227 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866 3228 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3229 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2867 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3230 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868 SvREADONLY_on (coro_current); 3231 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3232 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3233 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3234 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3235
3236 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3237 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3238 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2869 3240
2870 coro_stash = gv_stashpv ("Coro", TRUE); 3241 coro_stash = gv_stashpv ("Coro", TRUE);
2871 3242
2872 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3243 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2873 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3244 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2874 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3245 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2875 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3246 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2876 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3247 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2877 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3248 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2878 3249
2879 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2880 coro_ready[i] = newAV ();
2881
2882 { 3250 {
2883 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3251 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884 3252
2885 coroapi.schedule = api_schedule; 3253 coroapi.schedule = api_schedule;
3254 coroapi.schedule_to = api_schedule_to;
2886 coroapi.cede = api_cede; 3255 coroapi.cede = api_cede;
2887 coroapi.cede_notself = api_cede_notself; 3256 coroapi.cede_notself = api_cede_notself;
2888 coroapi.ready = api_ready; 3257 coroapi.ready = api_ready;
2889 coroapi.is_ready = api_is_ready; 3258 coroapi.is_ready = api_is_ready;
2890 coroapi.nready = coro_nready; 3259 coroapi.nready = coro_nready;
2895 SvREADONLY_on (sv); 3264 SvREADONLY_on (sv);
2896 } 3265 }
2897} 3266}
2898 3267
2899void 3268void
3269terminate (...)
3270 CODE:
3271 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3272
3273void
2900schedule (...) 3274schedule (...)
2901 CODE: 3275 CODE:
2902 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3276 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3277
3278void
3279schedule_to (...)
3280 CODE:
3281 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3282
3283void
3284cede_to (...)
3285 CODE:
3286 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903 3287
2904void 3288void
2905cede (...) 3289cede (...)
2906 CODE: 3290 CODE:
2907 CORO_EXECUTE_SLF_XS (slf_init_cede); 3291 CORO_EXECUTE_SLF_XS (slf_init_cede);
2962 CODE: 3346 CODE:
2963 RETVAL = coro_nready; 3347 RETVAL = coro_nready;
2964 OUTPUT: 3348 OUTPUT:
2965 RETVAL 3349 RETVAL
2966 3350
2967# for async_pool speedup
2968void 3351void
2969_pool_1 (SV *cb) 3352suspend (Coro::State self)
3353 PROTOTYPE: $
2970 CODE: 3354 CODE:
2971{ 3355 self->flags |= CF_SUSPENDED;
2972 HV *hv = (HV *)SvRV (coro_current);
2973 struct coro *coro = SvSTATE_hv ((SV *)hv);
2974 AV *defav = GvAV (PL_defgv);
2975 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2976 AV *invoke_av;
2977 int i, len;
2978 3356
2979 if (!invoke) 3357void
3358resume (Coro::State self)
3359 PROTOTYPE: $
3360 CODE:
3361 self->flags &= ~CF_SUSPENDED;
3362
3363void
3364_pool_handler (...)
3365 CODE:
3366 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3367
3368void
3369async_pool (SV *cv, ...)
3370 PROTOTYPE: &@
3371 PPCODE:
3372{
3373 HV *hv = (HV *)av_pop (av_async_pool);
3374 AV *av = newAV ();
3375 SV *cb = ST (0);
3376 int i;
3377
3378 av_extend (av, items - 2);
3379 for (i = 1; i < items; ++i)
3380 av_push (av, SvREFCNT_inc_NN (ST (i)));
3381
3382 if ((SV *)hv == &PL_sv_undef)
2980 { 3383 {
2981 SV *old = PL_diehook; 3384 PUSHMARK (SP);
2982 PL_diehook = 0; 3385 EXTEND (SP, 2);
2983 SvREFCNT_dec (old); 3386 PUSHs (sv_Coro);
2984 croak ("\3async_pool terminate\2\n"); 3387 PUSHs ((SV *)cv_pool_handler);
3388 PUTBACK;
3389 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3390 SPAGAIN;
3391
3392 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2985 } 3393 }
2986 3394
2987 SvREFCNT_dec (coro->saved_deffh);
2988 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2989
2990 hv_store (hv, "desc", sizeof ("desc") - 1,
2991 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2992
2993 invoke_av = (AV *)SvRV (invoke);
2994 len = av_len (invoke_av);
2995
2996 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2997
2998 if (len > 0)
2999 { 3395 {
3000 av_fill (defav, len - 1); 3396 struct coro *coro = SvSTATE_hv (hv);
3001 for (i = 0; i < len; ++i) 3397
3002 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3398 assert (!coro->invoke_cb);
3399 assert (!coro->invoke_av);
3400 coro->invoke_cb = SvREFCNT_inc (cb);
3401 coro->invoke_av = av;
3003 } 3402 }
3004}
3005 3403
3006void 3404 api_ready (aTHX_ (SV *)hv);
3007_pool_2 (SV *cb)
3008 CODE:
3009{
3010 HV *hv = (HV *)SvRV (coro_current);
3011 struct coro *coro = SvSTATE_hv ((SV *)hv);
3012 3405
3013 sv_setsv (cb, &PL_sv_undef); 3406 if (GIMME_V != G_VOID)
3014 3407 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3408 else
3016 coro->saved_deffh = 0;
3017
3018 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3019 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3020 {
3021 SV *old = PL_diehook;
3022 PL_diehook = 0;
3023 SvREFCNT_dec (old); 3409 SvREFCNT_dec (hv);
3024 croak ("\3async_pool terminate\2\n");
3025 }
3026
3027 av_clear (GvAV (PL_defgv));
3028 hv_store (hv, "desc", sizeof ("desc") - 1,
3029 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3030
3031 coro->prio = 0;
3032
3033 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3034 api_trace (aTHX_ coro_current, 0);
3035
3036 av_push (av_async_pool, newSVsv (coro_current));
3037} 3410}
3038 3411
3039SV * 3412SV *
3040rouse_cb () 3413rouse_cb ()
3041 PROTOTYPE: 3414 PROTOTYPE:
3047void 3420void
3048rouse_wait (...) 3421rouse_wait (...)
3049 PROTOTYPE: ;$ 3422 PROTOTYPE: ;$
3050 PPCODE: 3423 PPCODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3424 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3425
3426void
3427on_enter (SV *block)
3428 ALIAS:
3429 on_leave = 1
3430 PROTOTYPE: &
3431 CODE:
3432{
3433 struct coro *coro = SvSTATE_current;
3434 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3435
3436 block = (SV *)coro_sv_2cv (aTHX_ block);
3437
3438 if (!*avp)
3439 *avp = newAV ();
3440
3441 av_push (*avp, SvREFCNT_inc (block));
3442
3443 if (!ix)
3444 on_enterleave_call (aTHX_ block);
3445
3446 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3447 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3448 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3449}
3052 3450
3053 3451
3054MODULE = Coro::State PACKAGE = PerlIO::cede 3452MODULE = Coro::State PACKAGE = PerlIO::cede
3055 3453
3056BOOT: 3454BOOT:
3067 GvSTASH (CvGV (cv)) 3465 GvSTASH (CvGV (cv))
3068 ); 3466 );
3069 OUTPUT: 3467 OUTPUT:
3070 RETVAL 3468 RETVAL
3071 3469
3072# helper for Coro::Channel 3470# helper for Coro::Channel and others
3073SV * 3471SV *
3074_alloc (int count) 3472_alloc (int count)
3075 CODE: 3473 CODE:
3076 RETVAL = coro_waitarray_new (aTHX_ count); 3474 RETVAL = coro_waitarray_new (aTHX_ count);
3077 OUTPUT: 3475 OUTPUT:
3135 for (i = 1; i <= wcount; ++i) 3533 for (i = 1; i <= wcount; ++i)
3136 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3534 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3137 } 3535 }
3138} 3536}
3139 3537
3538MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3539
3540void
3541_may_delete (SV *sem, int count, int extra_refs)
3542 PPCODE:
3543{
3544 AV *av = (AV *)SvRV (sem);
3545
3546 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3547 && AvFILLp (av) == 0 /* no waiters, just count */
3548 && SvIV (AvARRAY (av)[0]) == count)
3549 XSRETURN_YES;
3550
3551 XSRETURN_NO;
3552}
3553
3140MODULE = Coro::State PACKAGE = Coro::Signal 3554MODULE = Coro::State PACKAGE = Coro::Signal
3141 3555
3142SV * 3556SV *
3143new (SV *klass) 3557new (SV *klass)
3144 CODE: 3558 CODE:
3215 3629
3216void 3630void
3217_register (char *target, char *proto, SV *req) 3631_register (char *target, char *proto, SV *req)
3218 CODE: 3632 CODE:
3219{ 3633{
3220 CV *req_cv = coro_sv_2cv (req); 3634 CV *req_cv = coro_sv_2cv (aTHX_ req);
3221 /* newXSproto doesn't return the CV on 5.8 */ 3635 /* newXSproto doesn't return the CV on 5.8 */
3222 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3636 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223 sv_setpv ((SV *)slf_cv, proto); 3637 sv_setpv ((SV *)slf_cv, proto);
3224 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3638 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225} 3639}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines