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.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.336 by root, Thu Dec 4 17:29:40 2008 UTC

55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
137# define INLINE static inline 143# define INLINE static inline
167static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 174static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
172static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 184static SV *rv_diehook;
175static SV *rv_warnhook; 185static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
177 187
178/* async_pool helper stuff */ 188/* async_pool helper stuff */
179static SV *sv_pool_rss; 189static SV *sv_pool_rss;
180static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
182 196
183/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
184static SV *sv_activity; 198static SV *sv_activity;
185 199
186static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
215 int valgrind_id; 229 int valgrind_id;
216#endif 230#endif
217 unsigned char flags; 231 unsigned char flags;
218} coro_cctx; 232} coro_cctx;
219 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
220enum { 238enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
229{ 247{
230 SV *defsv; 248 SV *defsv;
231 AV *defav; 249 AV *defav;
232 SV *errsv; 250 SV *errsv;
233 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
234#define VAR(name,type) type name; 253#define VAR(name,type) type name;
235# include "state.h" 254# include "state.h"
236#undef VAR 255#undef VAR
237} perl_slots; 256} perl_slots;
238 257
246 /* state data */ 265 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 266 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 267 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 268 perl_slots *slot; /* basically the saved sp */
250 269
270 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 271 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 272 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 273 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 274 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 275 void (*on_destroy)(pTHX_ struct coro *coro);
256 276
257 /* statistics */ 277 /* statistics */
258 int usecount; /* number of transfers to this coro */ 278 int usecount; /* number of transfers to this coro */
259 279
262 SV *except; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 283 SV *rouse_cb;
264 284
265 /* async_pool */ 285 /* async_pool */
266 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
267 289
268 /* linked list */ 290 /* linked list */
269 struct coro *next, *prev; 291 struct coro *next, *prev;
270}; 292};
271 293
288 310
289/* for Coro.pm */ 311/* for Coro.pm */
290static SV *coro_current; 312static SV *coro_current;
291static SV *coro_readyhook; 313static SV *coro_readyhook;
292static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
315static CV *cv_coro_run, *cv_coro_terminate;
293static struct coro *coro_first; 316static struct coro *coro_first;
294#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
295 318
296/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
297 320
323 get_hv (name, create); 346 get_hv (name, create);
324#endif 347#endif
325 return get_hv (name, create); 348 return get_hv (name, create);
326} 349}
327 350
351/* may croak */
352INLINE CV *
353coro_sv_2cv (pTHX_ SV *sv)
354{
355 HV *st;
356 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0);
358}
359
360/*****************************************************************************/
361/* magic glue */
362
363#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext
365
366#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \
369 : mg_find (sv, type))
370
371#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \
374 : 0)
375
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378
379INLINE struct coro *
380SvSTATE_ (pTHX_ SV *coro)
381{
382 HV *stash;
383 MAGIC *mg;
384
385 if (SvROK (coro))
386 coro = SvRV (coro);
387
388 if (expect_false (SvTYPE (coro) != SVt_PVHV))
389 croak ("Coro::State object required");
390
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr;
401}
402
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404
405/* faster than SvSTATE, but expects a coroutine hv */
406#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408
409/*****************************************************************************/
410/* padlist management and caching */
411
328static AV * 412static AV *
329coro_clone_padlist (pTHX_ CV *cv) 413coro_derive_padlist (pTHX_ CV *cv)
330{ 414{
331 AV *padlist = CvPADLIST (cv); 415 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 416 AV *newpadlist, *newpad;
333 417
334 newpadlist = newAV (); 418 newpadlist = newAV ();
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 424#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 426 --AvFILLp (padlist);
343 427
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 429 av_store (newpadlist, 1, (SV *)newpad);
346 430
347 return newpadlist; 431 return newpadlist;
348} 432}
349 433
350static void 434static void
351free_padlist (pTHX_ AV *padlist) 435free_padlist (pTHX_ AV *padlist)
352{ 436{
353 /* may be during global destruction */ 437 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 438 if (!IN_DESTRUCT)
355 { 439 {
356 I32 i = AvFILLp (padlist); 440 I32 i = AvFILLp (padlist);
357 while (i >= 0) 441
442 while (i > 0) /* special-case index 0 */
358 { 443 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 444 /* we try to be extra-careful here */
360 if (svp) 445 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 446 I32 j = AvFILLp (av);
362 SV *sv; 447
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 448 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]);
450
451 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 452 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 453 }
369 454
455 SvREFCNT_dec (AvARRAY (padlist)[0]);
456
457 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 458 SvREFCNT_dec ((SV*)padlist);
371 } 459 }
372} 460}
373 461
374static int 462static int
383 471
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 473
386 return 0; 474 return 0;
387} 475}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 476
392static MGVTBL coro_cv_vtbl = { 477static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 478 0, 0, 0, 0,
394 coro_cv_free 479 coro_cv_free
395}; 480};
396
397#define CORO_MAGIC_NN(sv, type) \
398 (expect_true (SvMAGIC (sv)->mg_type == type) \
399 ? SvMAGIC (sv) \
400 : mg_find (sv, type))
401
402#define CORO_MAGIC(sv, type) \
403 (expect_true (SvMAGIC (sv)) \
404 ? CORO_MAGIC_NN (sv, type) \
405 : 0)
406
407#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
408#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
409
410INLINE struct coro *
411SvSTATE_ (pTHX_ SV *coro)
412{
413 HV *stash;
414 MAGIC *mg;
415
416 if (SvROK (coro))
417 coro = SvRV (coro);
418
419 if (expect_false (SvTYPE (coro) != SVt_PVHV))
420 croak ("Coro::State object required");
421
422 stash = SvSTASH (coro);
423 if (expect_false (stash != coro_stash && stash != coro_state_stash))
424 {
425 /* very slow, but rare, check */
426 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
427 croak ("Coro::State object required");
428 }
429
430 mg = CORO_MAGIC_state (coro);
431 return (struct coro *)mg->mg_ptr;
432}
433
434#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
435
436/* faster than SvSTATE, but expects a coroutine hv */
437#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
438#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
439 481
440/* the next two functions merely cache the padlists */ 482/* the next two functions merely cache the padlists */
441static void 483static void
442get_padlist (pTHX_ CV *cv) 484get_padlist (pTHX_ CV *cv)
443{ 485{
449 else 491 else
450 { 492 {
451#if CORO_PREFER_PERL_FUNCTIONS 493#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 494 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 495 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (cv); 496 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 497 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 498 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 499 SvREFCNT_dec (cp);
458#else 500#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 502#endif
461 } 503 }
462} 504}
463 505
464static void 506static void
471 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 513 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
472 514
473 av = (AV *)mg->mg_obj; 515 av = (AV *)mg->mg_obj;
474 516
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 518 av_extend (av, AvFILLp (av) + 1);
477 519
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 521}
480 522
481/** load & save, init *******************************************************/ 523/** load & save, init *******************************************************/
486 perl_slots *slot = c->slot; 528 perl_slots *slot = c->slot;
487 c->slot = 0; 529 c->slot = 0;
488 530
489 PL_mainstack = c->mainstack; 531 PL_mainstack = c->mainstack;
490 532
491 GvSV (PL_defgv) = slot->defsv; 533 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 534 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 535 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
495 538
496 #define VAR(name,type) PL_ ## name = slot->name; 539 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 540 # include "state.h"
498 #undef VAR 541 #undef VAR
499 542
585 c->mainstack = PL_mainstack; 628 c->mainstack = PL_mainstack;
586 629
587 { 630 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 632
590 slot->defav = GvAV (PL_defgv); 633 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 634 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 635 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
594 638
595 #define VAR(name,type) slot->name = PL_ ## name; 639 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 640 # include "state.h"
597 #undef VAR 641 #undef VAR
598 } 642 }
603 * of perl.c:init_stacks, except that it uses less memory 647 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 648 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 649 * not usually need a lot of stackspace.
606 */ 650 */
607#if CORO_PREFER_PERL_FUNCTIONS 651#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 652# define coro_init_stacks(thx) init_stacks ()
609#else 653#else
610static void 654static void
611coro_init_stacks (pTHX) 655coro_init_stacks (pTHX)
612{ 656{
613 PL_curstackinfo = new_stackinfo(32, 8); 657 PL_curstackinfo = new_stackinfo(32, 8);
676#if !PERL_VERSION_ATLEAST (5,10,0) 720#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 721 Safefree (PL_retstack);
678#endif 722#endif
679} 723}
680 724
725#define CORO_RSS \
726 rss += sizeof (SYM (curstackinfo)); \
727 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
728 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
729 rss += SYM (tmps_max) * sizeof (SV *); \
730 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
731 rss += SYM (scopestack_max) * sizeof (I32); \
732 rss += SYM (savestack_max) * sizeof (ANY);
733
681static size_t 734static size_t
682coro_rss (pTHX_ struct coro *coro) 735coro_rss (pTHX_ struct coro *coro)
683{ 736{
684 size_t rss = sizeof (*coro); 737 size_t rss = sizeof (*coro);
685 738
686 if (coro->mainstack) 739 if (coro->mainstack)
687 { 740 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 741 if (coro->flags & CF_RUNNING)
692 { 742 {
693 slot = &tmp_slot; 743 #define SYM(sym) PL_ ## sym
694 744 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 745 #undef SYM
698 } 746 }
699 else 747 else
700 slot = coro->slot;
701
702 if (slot)
703 { 748 {
704 rss += sizeof (slot->curstackinfo); 749 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 750 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 751 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 752 }
716 } 753 }
717 754
718 return rss; 755 return rss;
719} 756}
821slf_check_nop (pTHX_ struct CoroSLF *frame) 858slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 859{
823 return 0; 860 return 0;
824} 861}
825 862
863static int
864slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{
866 return 1;
867}
868
826static UNOP coro_setup_op; 869static UNOP coro_setup_op;
827 870
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 871static void NOINLINE /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 872coro_setup (pTHX_ struct coro *coro)
830{ 873{
835 878
836 PL_runops = RUNOPS_DEFAULT; 879 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 880 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 881 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 882 PL_comppad = 0;
883 PL_comppad_name = 0;
884 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 886 PL_curpm = 0;
841 PL_curpad = 0; 887 PL_curpad = 0;
842 PL_localizing = 0; 888 PL_localizing = 0;
843 PL_dirty = 0; 889 PL_dirty = 0;
844 PL_restartop = 0; 890 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 891#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 892 PL_parser = 0;
847#endif 893#endif
894 PL_hints = 0;
848 895
849 /* recreate the die/warn hooks */ 896 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
852 899
853 GvSV (PL_defgv) = newSV (0); 900 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 901 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 902 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 905 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 907
860 { 908 {
861 dSP; 909 dSP;
862 UNOP myop; 910 UNOP myop;
863 911
864 Zero (&myop, 1, UNOP); 912 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 913 myop.op_next = Nullop;
914 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 915 myop.op_flags = OPf_WANT_VOID;
867 916
868 PUSHMARK (SP); 917 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 918 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 919 PUTBACK;
871 PL_op = (OP *)&myop; 920 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 921 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 922 }
875 923
876 /* this newly created coroutine might be run on an existing cctx which most 924 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 925 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 926 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 929
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
883 coro_setup_op.op_next = PL_op; 931 coro_setup_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 932 coro_setup_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 933 coro_setup_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 934 /* no flags etc. required, as an init function won't be called */
887 935
888 PL_op = (OP *)&coro_setup_op; 936 PL_op = (OP *)&coro_setup_op;
889 937
890 /* copy throw, in case it was set before coro_setup */ 938 /* copy throw, in case it was set before coro_setup */
891 CORO_THROW = coro->except; 939 CORO_THROW = coro->except;
892} 940}
893 941
894static void 942static void
895coro_destruct (pTHX_ struct coro *coro) 943coro_destruct_perl (pTHX_ struct coro *coro)
896{ 944{
897 if (!IN_DESTRUCT) 945 if (!IN_DESTRUCT)
898 { 946 {
899 /* restore all saved variables and stuff */ 947 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 948 LEAVE_SCOPE (0);
915 SvREFCNT_dec (GvAV (PL_defgv)); 963 SvREFCNT_dec (GvAV (PL_defgv));
916 SvREFCNT_dec (GvSV (PL_errgv)); 964 SvREFCNT_dec (GvSV (PL_errgv));
917 SvREFCNT_dec (PL_defoutgv); 965 SvREFCNT_dec (PL_defoutgv);
918 SvREFCNT_dec (PL_rs); 966 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv)); 967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
920 969
921 SvREFCNT_dec (PL_diehook); 970 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook); 971 SvREFCNT_dec (PL_warnhook);
923 972
924 SvREFCNT_dec (CORO_THROW);
925 SvREFCNT_dec (coro->saved_deffh); 973 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 974 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av);
927 977
928 coro_destruct_stacks (aTHX); 978 coro_destruct_stacks (aTHX);
929} 979}
930 980
931INLINE void 981INLINE void
941static int 991static int
942runops_trace (pTHX) 992runops_trace (pTHX)
943{ 993{
944 COP *oldcop = 0; 994 COP *oldcop = 0;
945 int oldcxix = -2; 995 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 996
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 997 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 998 {
951 PERL_ASYNC_CHECK (); 999 PERL_ASYNC_CHECK ();
952 1000
953 if (cctx->flags & CC_TRACE_ALL) 1001 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1002 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1003 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1004 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1005 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1006 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1007 AV *av = newAV (); /* return values */
960 SV **cb; 1008 SV **cb;
997 1045
998 if (PL_curcop != &PL_compiling) 1046 if (PL_curcop != &PL_compiling)
999 { 1047 {
1000 SV **cb; 1048 SV **cb;
1001 1049
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1050 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1051 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1052 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1053
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1054 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1055 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1056 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1057 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1058 SV *fullname = sv_2mortal (newSV (0));
1012 1059
1013 if (isGV (gv)) 1060 if (isGV (gv))
1018 SAVETMPS; 1065 SAVETMPS;
1019 EXTEND (SP, 3); 1066 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1067 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1068 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1069 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1070 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1071 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1072 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1073 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1074 SPAGAIN;
1028 FREETMPS; 1075 FREETMPS;
1031 } 1078 }
1032 1079
1033 oldcxix = cxstack_ix; 1080 oldcxix = cxstack_ix;
1034 } 1081 }
1035 1082
1036 if (cctx->flags & CC_TRACE_LINE) 1083 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1084 {
1038 dSP; 1085 dSP;
1039 1086
1040 PL_runops = RUNOPS_DEFAULT; 1087 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1088 ENTER;
1060 1107
1061 TAINT_NOT; 1108 TAINT_NOT;
1062 return 0; 1109 return 0;
1063} 1110}
1064 1111
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1112static struct CoroSLF cctx_ssl_frame;
1067 1113
1068static void 1114static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1115slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1116{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1117 ta->prev = 0;
1073} 1118}
1074 1119
1075static int 1120static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1121slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1122{
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1125 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1126}
1082 1127
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1128/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1129static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1130cctx_prepare (pTHX)
1086{ 1131{
1087 PL_top_env = &PL_start_env; 1132 PL_top_env = &PL_start_env;
1088 1133
1089 if (cctx->flags & CC_TRACE) 1134 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1135 PL_runops = runops_trace;
1091 1136
1092 /* we already must be executing an SLF op, there is no other valid way 1137 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1138 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1139 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1140 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1141
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1142 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1143 cctx_ssl_frame = slf_frame;
1100 1144
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1145 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1146 slf_frame.check = slf_check_set_stacklevel;
1103} 1147}
1126 /* normally we would need to skip the entersub here */ 1170 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1171 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1172 /* PL_nop = PL_nop->op_next */
1129 1173
1130 /* inject a fake subroutine call to cctx_init */ 1174 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1175 cctx_prepare (aTHX);
1132 1176
1133 /* cctx_run is the alternative tail of transfer() */ 1177 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1178 transfer_tail (aTHX);
1135 1179
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1180 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1181 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1182 perl_run (PL_curinterp);
1183 /*
1184 * Unfortunately, there is no way to get at the return values of the
1185 * coro body here, as perl_run destroys these
1186 */
1139 1187
1140 /* 1188 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1189 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1190 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1191 * reason for perl_run to return. We try to exit by jumping to the
1144 * bootstrap-time "top" top_env, as we cannot restore the "main" 1192 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1193 * coroutine as Coro has no such concept.
1194 * This actually isn't valid with the pthread backend, but OSes requiring
1195 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1196 */
1147 PL_top_env = main_top_env; 1197 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1199 }
1150} 1200}
1227cctx_destroy (coro_cctx *cctx) 1277cctx_destroy (coro_cctx *cctx)
1228{ 1278{
1229 if (!cctx) 1279 if (!cctx)
1230 return; 1280 return;
1231 1281
1282 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1283
1232 --cctx_count; 1284 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1285 coro_destroy (&cctx->cctx);
1234 1286
1235 /* coro_transfer creates new, empty cctx's */ 1287 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1288 if (cctx->sptr)
1299 /* TODO: throwing up here is considered harmful */ 1351 /* TODO: throwing up here is considered harmful */
1300 1352
1301 if (expect_true (prev != next)) 1353 if (expect_true (prev != next))
1302 { 1354 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1305 1357
1306 if (expect_false (next->flags & CF_RUNNING)) 1358 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308 1360
1309 if (expect_false (next->flags & CF_DESTROYED)) 1361 if (expect_false (next->flags & CF_DESTROYED))
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1374{
1323 dSTACKLEVEL; 1375 dSTACKLEVEL;
1324 1376
1325 /* sometimes transfer is only called to set idle_sp */ 1377 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1378 if (expect_false (!prev))
1327 { 1379 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1380 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1382 }
1331 else if (expect_true (prev != next)) 1383 else if (expect_true (prev != next))
1332 { 1384 {
1333 coro_cctx *prev__cctx; 1385 coro_cctx *cctx_prev;
1334 1386
1335 if (expect_false (prev->flags & CF_NEW)) 1387 if (expect_false (prev->flags & CF_NEW))
1336 { 1388 {
1337 /* create a new empty/source context */ 1389 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1390 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1391 prev->flags |= CF_RUNNING;
1341 } 1392 }
1342 1393
1343 prev->flags &= ~CF_RUNNING; 1394 prev->flags &= ~CF_RUNNING;
1354 coro_setup (aTHX_ next); 1405 coro_setup (aTHX_ next);
1355 } 1406 }
1356 else 1407 else
1357 load_perl (aTHX_ next); 1408 load_perl (aTHX_ next);
1358 1409
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1410 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1411 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1412 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1413 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1414 && !force_cctx
1366 )) 1415 ))
1367 { 1416 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1417 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1418 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1419
1371 prev->cctx = 0;
1372
1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1420 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1421 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1422 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1423 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1424 next->cctx = cctx_get (aTHX);
1378 1425
1379 cctx_put (prev__cctx); 1426 cctx_put (cctx_current);
1380 } 1427 }
1428 else
1429 prev->cctx = cctx_current;
1381 1430
1382 ++next->usecount; 1431 ++next->usecount;
1383 1432
1384 if (expect_true (!next->cctx)) 1433 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1434 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1435
1387 if (expect_false (prev__cctx != next->cctx)) 1436 next->cctx = 0;
1437
1438 if (expect_false (cctx_prev != cctx_current))
1388 { 1439 {
1389 prev__cctx->top_env = PL_top_env; 1440 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1441 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1442 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1443 }
1393 1444
1394 transfer_tail (aTHX); 1445 transfer_tail (aTHX);
1395 } 1446 }
1396} 1447}
1418 --coro_nready; 1469 --coro_nready;
1419 } 1470 }
1420 else 1471 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1472 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1473
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1474 if (coro->mainstack
1475 && coro->mainstack != main_mainstack
1476 && coro->slot
1477 && !PL_dirty)
1424 { 1478 {
1425 struct coro temp; 1479 struct coro temp;
1426 1480
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1481 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1428 1482
1429 save_perl (aTHX_ &temp); 1483 save_perl (aTHX_ &temp);
1430 load_perl (aTHX_ coro); 1484 load_perl (aTHX_ coro);
1431 1485
1432 coro_destruct (aTHX_ coro); 1486 coro_destruct_perl (aTHX_ coro);
1433 1487
1434 load_perl (aTHX_ &temp); 1488 load_perl (aTHX_ &temp);
1435 1489
1436 coro->slot = 0; 1490 coro->slot = 0;
1437 } 1491 }
1438 1492
1439 cctx_destroy (coro->cctx); 1493 cctx_destroy (coro->cctx);
1494 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1495 SvREFCNT_dec (coro->args);
1496 SvREFCNT_dec (CORO_THROW);
1441 1497
1442 if (coro->next) coro->next->prev = coro->prev; 1498 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1499 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1500 if (coro == coro_first) coro_first = coro->next;
1445 1501
1549{ 1605{
1550 struct coro *coro; 1606 struct coro *coro;
1551 SV *sv_hook; 1607 SV *sv_hook;
1552 void (*xs_hook)(void); 1608 void (*xs_hook)(void);
1553 1609
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1610 coro = SvSTATE (coro_sv);
1558 1611
1559 if (coro->flags & CF_READY) 1612 if (coro->flags & CF_READY)
1560 return 0; 1613 return 0;
1561 1614
1592api_is_ready (pTHX_ SV *coro_sv) 1645api_is_ready (pTHX_ SV *coro_sv)
1593{ 1646{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1647 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1648}
1596 1649
1650/* expects to own a reference to next->hv */
1597INLINE void 1651INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1652prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1653{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;)
1603 {
1604 next_sv = coro_deq (aTHX);
1605
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv))
1608 {
1609 dSP;
1610
1611 ENTER;
1612 SAVETMPS;
1613
1614 PUSHMARK (SP);
1615 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617
1618 FREETMPS;
1619 LEAVE;
1620 continue;
1621 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current); 1654 SV *prev_sv = SvRV (coro_current);
1655
1639 ta->prev = SvSTATE_hv (prev_sv); 1656 ta->prev = SvSTATE_hv (prev_sv);
1657 ta->next = next;
1658
1640 TRANSFER_CHECK (*ta); 1659 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1660
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1661 SvRV_set (coro_current, (SV *)next->hv);
1644 1662
1645 free_coro_mortal (aTHX); 1663 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1664 coro_mortal = prev_sv;
1647} 1665}
1648 1666
1667static void
1668prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1669{
1670 for (;;)
1671 {
1672 SV *next_sv = coro_deq (aTHX);
1673
1674 if (expect_true (next_sv))
1675 {
1676 struct coro *next = SvSTATE_hv (next_sv);
1677
1678 /* cannot transfer to destroyed coros, skip and look for next */
1679 if (expect_false (next->flags & CF_DESTROYED))
1680 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1681 else
1682 {
1683 next->flags &= ~CF_READY;
1684 --coro_nready;
1685
1686 prepare_schedule_to (aTHX_ ta, next);
1687 break;
1688 }
1689 }
1690 else
1691 {
1692 /* nothing to schedule: call the idle handler */
1693 if (SvROK (sv_idle)
1694 && SvOBJECT (SvRV (sv_idle)))
1695 {
1696 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1697 api_ready (aTHX_ SvRV (sv_idle));
1698 --coro_nready;
1699 }
1700 else
1701 {
1702 dSP;
1703
1704 ENTER;
1705 SAVETMPS;
1706
1707 PUSHMARK (SP);
1708 PUTBACK;
1709 call_sv (sv_idle, G_VOID | G_DISCARD);
1710
1711 FREETMPS;
1712 LEAVE;
1713 }
1714 }
1715 }
1716}
1717
1649INLINE void 1718INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1719prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1720{
1652 api_ready (aTHX_ coro_current); 1721 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1722 prepare_schedule (aTHX_ ta);
1672{ 1741{
1673 struct coro_transfer_args ta; 1742 struct coro_transfer_args ta;
1674 1743
1675 prepare_schedule (aTHX_ &ta); 1744 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1745 TRANSFER (ta, 1);
1746}
1747
1748static void
1749api_schedule_to (pTHX_ SV *coro_sv)
1750{
1751 struct coro_transfer_args ta;
1752 struct coro *next = SvSTATE (coro_sv);
1753
1754 SvREFCNT_inc_NN (coro_sv);
1755 prepare_schedule_to (aTHX_ &ta, next);
1677} 1756}
1678 1757
1679static int 1758static int
1680api_cede (pTHX) 1759api_cede (pTHX)
1681{ 1760{
1710static void 1789static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1790api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1791{
1713 struct coro *coro = SvSTATE (coro_sv); 1792 struct coro *coro = SvSTATE (coro_sv);
1714 1793
1794 if (coro->flags & CF_RUNNING)
1795 croak ("cannot enable tracing on a running coroutine, caught");
1796
1715 if (flags & CC_TRACE) 1797 if (flags & CC_TRACE)
1716 { 1798 {
1717 if (!coro->cctx) 1799 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1800 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1801 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1802 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1803
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1804 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1805 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1806 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1807 {
1730 else 1812 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1813 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1814 }
1733} 1815}
1734 1816
1817static void
1818coro_call_on_destroy (pTHX_ struct coro *coro)
1819{
1820 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1821 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1822
1823 if (on_destroyp)
1824 {
1825 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1826
1827 while (AvFILLp (on_destroy) >= 0)
1828 {
1829 dSP; /* don't disturb outer sp */
1830 SV *cb = av_pop (on_destroy);
1831
1832 PUSHMARK (SP);
1833
1834 if (statusp)
1835 {
1836 int i;
1837 AV *status = (AV *)SvRV (*statusp);
1838 EXTEND (SP, AvFILLp (status) + 1);
1839
1840 for (i = 0; i <= AvFILLp (status); ++i)
1841 PUSHs (AvARRAY (status)[i]);
1842 }
1843
1844 PUTBACK;
1845 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1846 }
1847 }
1848}
1849
1850static void
1851slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1852{
1853 int i;
1854 HV *hv = (HV *)SvRV (coro_current);
1855 AV *av = newAV ();
1856
1857 av_extend (av, items - 1);
1858 for (i = 0; i < items; ++i)
1859 av_push (av, SvREFCNT_inc_NN (arg [i]));
1860
1861 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1862
1863 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1864 api_ready (aTHX_ sv_manager);
1865
1866 frame->prepare = prepare_schedule;
1867 frame->check = slf_check_repeat;
1868}
1869
1870/*****************************************************************************/
1871/* async pool handler */
1872
1873static int
1874slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1875{
1876 HV *hv = (HV *)SvRV (coro_current);
1877 struct coro *coro = (struct coro *)frame->data;
1878
1879 if (!coro->invoke_cb)
1880 return 1; /* loop till we have invoke */
1881 else
1882 {
1883 hv_store (hv, "desc", sizeof ("desc") - 1,
1884 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1885
1886 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1887
1888 {
1889 dSP;
1890 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1891 PUTBACK;
1892 }
1893
1894 SvREFCNT_dec (GvAV (PL_defgv));
1895 GvAV (PL_defgv) = coro->invoke_av;
1896 coro->invoke_av = 0;
1897
1898 return 0;
1899 }
1900}
1901
1902static void
1903slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{
1905 HV *hv = (HV *)SvRV (coro_current);
1906 struct coro *coro = SvSTATE_hv ((SV *)hv);
1907
1908 if (expect_true (coro->saved_deffh))
1909 {
1910 /* subsequent iteration */
1911 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1912 coro->saved_deffh = 0;
1913
1914 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1915 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1916 {
1917 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1918 coro->invoke_av = newAV ();
1919
1920 frame->prepare = prepare_nop;
1921 }
1922 else
1923 {
1924 av_clear (GvAV (PL_defgv));
1925 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1926
1927 coro->prio = 0;
1928
1929 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1930 api_trace (aTHX_ coro_current, 0);
1931
1932 frame->prepare = prepare_schedule;
1933 av_push (av_async_pool, SvREFCNT_inc (hv));
1934 }
1935 }
1936 else
1937 {
1938 /* first iteration, simply fall through */
1939 frame->prepare = prepare_nop;
1940 }
1941
1942 frame->check = slf_check_pool_handler;
1943 frame->data = (void *)coro;
1944}
1945
1735/*****************************************************************************/ 1946/*****************************************************************************/
1736/* rouse callback */ 1947/* rouse callback */
1737 1948
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1949#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 1950
1744 SV *data = (SV *)GENSUB_ARG; 1955 SV *data = (SV *)GENSUB_ARG;
1745 1956
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1957 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 1958 {
1748 /* first call, set args */ 1959 /* first call, set args */
1749 int i;
1750 AV *av = newAV (); 1960 AV *av = newAV ();
1751 SV *coro = SvRV (data); 1961 SV *coro = SvRV (data);
1752 1962
1753 SvRV_set (data, (SV *)av); 1963 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro); 1964 api_ready (aTHX_ coro);
1895static void 2105static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2106slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2107{
1898 frame->prepare = prepare_schedule; 2108 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2109 frame->check = slf_check_nop;
2110}
2111
2112static void
2113slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2114{
2115 struct coro *next = (struct coro *)slf_frame.data;
2116
2117 SvREFCNT_inc_NN (next->hv);
2118 prepare_schedule_to (aTHX_ ta, next);
2119}
2120
2121static void
2122slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2123{
2124 if (!items)
2125 croak ("Coro::schedule_to expects a coroutine argument, caught");
2126
2127 frame->data = (void *)SvSTATE (arg [0]);
2128 frame->prepare = slf_prepare_schedule_to;
2129 frame->check = slf_check_nop;
2130}
2131
2132static void
2133slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2134{
2135 api_ready (aTHX_ SvRV (coro_current));
2136
2137 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2138}
1901 2139
1902static void 2140static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2141slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2142{
2050 } 2288 }
2051 else 2289 else
2052 slf_argc = 0; 2290 slf_argc = 0;
2053 2291
2054 PL_op->op_ppaddr = pp_slf; 2292 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2293 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2294
2057 PL_op = (OP *)&slf_restore; 2295 PL_op = (OP *)&slf_restore;
2058} 2296}
2059 2297
2060/*****************************************************************************/ 2298/*****************************************************************************/
2143 SV **ary; 2381 SV **ary;
2144 2382
2145 /* unfortunately, building manually saves memory */ 2383 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2384 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2385 AvALLOC (av) = ary;
2386#if PERL_VERSION_ATLEAST (5,10,0)
2148 AvARRAY (av) = ary; 2387 AvARRAY (av) = ary;
2388#else
2389 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2390 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2391 SvPVX ((SV *)av) = (char *)ary;
2392#endif
2149 AvMAX (av) = 1; 2393 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2394 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2395 ary [0] = newSViv (count);
2152 2396
2153 return newRV_noinc ((SV *)av); 2397 return newRV_noinc ((SV *)av);
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2417 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2418 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2419 cb = av_shift (av);
2176 2420
2177 if (SvOBJECT (cb)) 2421 if (SvOBJECT (cb))
2422 {
2178 api_ready (aTHX_ cb); 2423 api_ready (aTHX_ cb);
2179 else 2424 --count;
2180 croak ("callbacks not yet supported"); 2425 }
2426 else if (SvTYPE (cb) == SVt_PVCV)
2427 {
2428 dSP;
2429 PUSHMARK (SP);
2430 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2431 PUTBACK;
2432 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2433 }
2181 2434
2182 SvREFCNT_dec (cb); 2435 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2436 }
2186} 2437}
2187 2438
2188static void 2439static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2440coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2271} 2522}
2272 2523
2273static void 2524static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2525slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2526{
2527 if (items >= 2)
2528 {
2529 /* callback form */
2530 AV *av = (AV *)SvRV (arg [0]);
2531 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2532
2533 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2534
2535 if (SvIVX (AvARRAY (av)[0]) > 0)
2536 coro_semaphore_adjust (aTHX_ av, 0);
2537
2538 frame->prepare = prepare_nop;
2539 frame->check = slf_check_nop;
2540 }
2541 else
2542 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2543 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2544 frame->check = slf_check_semaphore_wait;
2545 }
2278} 2546}
2279 2547
2280/* signal */ 2548/* signal */
2281 2549
2282static void 2550static void
2354 dXSARGS; 2622 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2623 AV *state = (AV *)GENSUB_ARG;
2356 SV *coro = av_pop (state); 2624 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2625 SV *data_sv = newSV (sizeof (struct io_state));
2358 2626
2359 av_extend (state, items); 2627 av_extend (state, items - 1);
2360 2628
2361 sv_upgrade (data_sv, SVt_PV); 2629 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2630 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2631 SvPOK_only (data_sv);
2364 2632
2499 XSRETURN_EMPTY; 2767 XSRETURN_EMPTY;
2500} 2768}
2501 2769
2502/*****************************************************************************/ 2770/*****************************************************************************/
2503 2771
2772#if CORO_CLONE
2773# include "clone.c"
2774#endif
2775
2504MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2776MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2505 2777
2506PROTOTYPES: DISABLE 2778PROTOTYPES: DISABLE
2507 2779
2508BOOT: 2780BOOT:
2512 coro_thx = PERL_GET_CONTEXT; 2784 coro_thx = PERL_GET_CONTEXT;
2513# endif 2785# endif
2514#endif 2786#endif
2515 BOOT_PAGESIZE; 2787 BOOT_PAGESIZE;
2516 2788
2789 cctx_current = cctx_new_empty ();
2790
2517 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2791 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2518 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2792 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2519 2793
2520 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2794 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2521 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2795 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2540 2814
2541 { 2815 {
2542 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2816 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2543 2817
2544 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2818 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2545 hv_store_ent (PL_custom_op_names, slf, 2819 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2546 newSVpv ("coro_slf", 0), 0);
2547 2820
2548 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2821 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2549 hv_store_ent (PL_custom_op_descs, slf, 2822 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2550 newSVpv ("coro schedule like function", 0), 0);
2551 } 2823 }
2552 2824
2553 coroapi.ver = CORO_API_VERSION; 2825 coroapi.ver = CORO_API_VERSION;
2554 coroapi.rev = CORO_API_REVISION; 2826 coroapi.rev = CORO_API_REVISION;
2555 2827
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2846 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2575} 2847}
2576 2848
2577SV * 2849SV *
2578new (char *klass, ...) 2850new (char *klass, ...)
2851 ALIAS:
2852 Coro::new = 1
2579 CODE: 2853 CODE:
2580{ 2854{
2581 struct coro *coro; 2855 struct coro *coro;
2582 MAGIC *mg; 2856 MAGIC *mg;
2583 HV *hv; 2857 HV *hv;
2858 CV *cb;
2584 int i; 2859 int i;
2860
2861 if (items > 1)
2862 {
2863 cb = coro_sv_2cv (aTHX_ ST (1));
2864
2865 if (!ix)
2866 {
2867 if (CvISXSUB (cb))
2868 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2869
2870 if (!CvROOT (cb))
2871 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2872 }
2873 }
2585 2874
2586 Newz (0, coro, 1, struct coro); 2875 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV (); 2876 coro->args = newAV ();
2588 coro->flags = CF_NEW; 2877 coro->flags = CF_NEW;
2589 2878
2594 coro->hv = hv = newHV (); 2883 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2884 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP; 2885 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2886 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598 2887
2888 if (items > 1)
2889 {
2599 av_extend (coro->args, items - 1); 2890 av_extend (coro->args, items - 1 + ix - 1);
2891
2892 if (ix)
2893 {
2894 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2895 cb = cv_coro_run;
2896 }
2897
2898 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2899
2600 for (i = 1; i < items; i++) 2900 for (i = 2; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i))); 2901 av_push (coro->args, newSVsv (ST (i)));
2902 }
2602} 2903}
2603 OUTPUT: 2904 OUTPUT:
2604 RETVAL 2905 RETVAL
2605 2906
2606void 2907void
2619void 2920void
2620_exit (int code) 2921_exit (int code)
2621 PROTOTYPE: $ 2922 PROTOTYPE: $
2622 CODE: 2923 CODE:
2623 _exit (code); 2924 _exit (code);
2925
2926SV *
2927clone (Coro::State coro)
2928 CODE:
2929{
2930#if CORO_CLONE
2931 struct coro *ncoro = coro_clone (aTHX_ coro);
2932 MAGIC *mg;
2933 /* TODO: too much duplication */
2934 ncoro->hv = newHV ();
2935 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2936 mg->mg_flags |= MGf_DUP;
2937 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2938#else
2939 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2940#endif
2941}
2942 OUTPUT:
2943 RETVAL
2624 2944
2625int 2945int
2626cctx_stacksize (int new_stacksize = 0) 2946cctx_stacksize (int new_stacksize = 0)
2627 PROTOTYPE: ;$ 2947 PROTOTYPE: ;$
2628 CODE: 2948 CODE:
2749 3069
2750SV * 3070SV *
2751has_cctx (Coro::State coro) 3071has_cctx (Coro::State coro)
2752 PROTOTYPE: $ 3072 PROTOTYPE: $
2753 CODE: 3073 CODE:
2754 RETVAL = boolSV (!!coro->cctx); 3074 /* maybe manage the running flag differently */
3075 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2755 OUTPUT: 3076 OUTPUT:
2756 RETVAL 3077 RETVAL
2757 3078
2758int 3079int
2759is_traced (Coro::State coro) 3080is_traced (Coro::State coro)
2779 3100
2780void 3101void
2781force_cctx () 3102force_cctx ()
2782 PROTOTYPE: 3103 PROTOTYPE:
2783 CODE: 3104 CODE:
2784 SvSTATE_current->cctx->idle_sp = 0; 3105 cctx_current->idle_sp = 0;
2785 3106
2786void 3107void
2787swap_defsv (Coro::State self) 3108swap_defsv (Coro::State self)
2788 PROTOTYPE: $ 3109 PROTOTYPE: $
2789 ALIAS: 3110 ALIAS:
2804 3125
2805BOOT: 3126BOOT:
2806{ 3127{
2807 int i; 3128 int i;
2808 3129
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3130 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3131 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 3132 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3133 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3134 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814 SvREADONLY_on (coro_current); 3135 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3136 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3137 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3138 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3139
3140 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3141 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3142 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3143 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2815 3144
2816 coro_stash = gv_stashpv ("Coro", TRUE); 3145 coro_stash = gv_stashpv ("Coro", TRUE);
2817 3146
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3147 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3148 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2827 3156
2828 { 3157 {
2829 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3158 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830 3159
2831 coroapi.schedule = api_schedule; 3160 coroapi.schedule = api_schedule;
3161 coroapi.schedule_to = api_schedule_to;
2832 coroapi.cede = api_cede; 3162 coroapi.cede = api_cede;
2833 coroapi.cede_notself = api_cede_notself; 3163 coroapi.cede_notself = api_cede_notself;
2834 coroapi.ready = api_ready; 3164 coroapi.ready = api_ready;
2835 coroapi.is_ready = api_is_ready; 3165 coroapi.is_ready = api_is_ready;
2836 coroapi.nready = coro_nready; 3166 coroapi.nready = coro_nready;
2841 SvREADONLY_on (sv); 3171 SvREADONLY_on (sv);
2842 } 3172 }
2843} 3173}
2844 3174
2845void 3175void
3176terminate (...)
3177 CODE:
3178 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3179
3180void
2846schedule (...) 3181schedule (...)
2847 CODE: 3182 CODE:
2848 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3183 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3184
3185void
3186schedule_to (...)
3187 CODE:
3188 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3189
3190void
3191cede_to (...)
3192 CODE:
3193 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849 3194
2850void 3195void
2851cede (...) 3196cede (...)
2852 CODE: 3197 CODE:
2853 CORO_EXECUTE_SLF_XS (slf_init_cede); 3198 CORO_EXECUTE_SLF_XS (slf_init_cede);
2854 3199
2855void 3200void
2856cede_notself (...) 3201cede_notself (...)
2857 CODE: 3202 CODE:
2858 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3203 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3204
3205void
3206_cancel (Coro::State self)
3207 CODE:
3208 coro_state_destroy (aTHX_ self);
3209 coro_call_on_destroy (aTHX_ self);
2859 3210
2860void 3211void
2861_set_current (SV *current) 3212_set_current (SV *current)
2862 PROTOTYPE: $ 3213 PROTOTYPE: $
2863 CODE: 3214 CODE:
2908 CODE: 3259 CODE:
2909 RETVAL = coro_nready; 3260 RETVAL = coro_nready;
2910 OUTPUT: 3261 OUTPUT:
2911 RETVAL 3262 RETVAL
2912 3263
2913# for async_pool speedup
2914void 3264void
2915_pool_1 (SV *cb) 3265_pool_handler (...)
2916 CODE: 3266 CODE:
2917{ 3267 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2918 HV *hv = (HV *)SvRV (coro_current);
2919 struct coro *coro = SvSTATE_hv ((SV *)hv);
2920 AV *defav = GvAV (PL_defgv);
2921 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2922 AV *invoke_av;
2923 int i, len;
2924 3268
2925 if (!invoke) 3269void
3270async_pool (SV *cv, ...)
3271 PROTOTYPE: &@
3272 PPCODE:
3273{
3274 HV *hv = (HV *)av_pop (av_async_pool);
3275 AV *av = newAV ();
3276 SV *cb = ST (0);
3277 int i;
3278
3279 av_extend (av, items - 2);
3280 for (i = 1; i < items; ++i)
3281 av_push (av, SvREFCNT_inc_NN (ST (i)));
3282
3283 if ((SV *)hv == &PL_sv_undef)
2926 { 3284 {
2927 SV *old = PL_diehook; 3285 PUSHMARK (SP);
2928 PL_diehook = 0; 3286 EXTEND (SP, 2);
2929 SvREFCNT_dec (old); 3287 PUSHs (sv_Coro);
2930 croak ("\3async_pool terminate\2\n"); 3288 PUSHs ((SV *)cv_pool_handler);
3289 PUTBACK;
3290 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3291 SPAGAIN;
3292
3293 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2931 } 3294 }
2932 3295
2933 SvREFCNT_dec (coro->saved_deffh);
2934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2935
2936 hv_store (hv, "desc", sizeof ("desc") - 1,
2937 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2938
2939 invoke_av = (AV *)SvRV (invoke);
2940 len = av_len (invoke_av);
2941
2942 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2943
2944 if (len > 0)
2945 { 3296 {
2946 av_fill (defav, len - 1); 3297 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3298
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3299 assert (!coro->invoke_cb);
3300 assert (!coro->invoke_av);
3301 coro->invoke_cb = SvREFCNT_inc (cb);
3302 coro->invoke_av = av;
2949 } 3303 }
2950}
2951 3304
2952void 3305 api_ready (aTHX_ (SV *)hv);
2953_pool_2 (SV *cb)
2954 CODE:
2955{
2956 HV *hv = (HV *)SvRV (coro_current);
2957 struct coro *coro = SvSTATE_hv ((SV *)hv);
2958 3306
2959 sv_setsv (cb, &PL_sv_undef); 3307 if (GIMME_V != G_VOID)
2960 3308 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3309 else
2962 coro->saved_deffh = 0;
2963
2964 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2965 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2966 {
2967 SV *old = PL_diehook;
2968 PL_diehook = 0;
2969 SvREFCNT_dec (old); 3310 SvREFCNT_dec (hv);
2970 croak ("\3async_pool terminate\2\n");
2971 }
2972
2973 av_clear (GvAV (PL_defgv));
2974 hv_store (hv, "desc", sizeof ("desc") - 1,
2975 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2976
2977 coro->prio = 0;
2978
2979 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2980 api_trace (aTHX_ coro_current, 0);
2981
2982 av_push (av_async_pool, newSVsv (coro_current));
2983} 3311}
2984 3312
2985SV * 3313SV *
2986rouse_cb () 3314rouse_cb ()
2987 PROTOTYPE: 3315 PROTOTYPE:
2989 RETVAL = coro_new_rouse_cb (aTHX); 3317 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3318 OUTPUT:
2991 RETVAL 3319 RETVAL
2992 3320
2993void 3321void
2994rouse_wait (SV *cb = 0) 3322rouse_wait (...)
2995 PROTOTYPE: ;$ 3323 PROTOTYPE: ;$
2996 PPCODE: 3324 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3325 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998 3326
2999 3327
3036 adjust = 1 3364 adjust = 1
3037 CODE: 3365 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3366 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3367
3040void 3368void
3041down (SV *self) 3369down (...)
3042 CODE: 3370 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3371 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3372
3045void 3373void
3046wait (SV *self) 3374wait (...)
3047 CODE: 3375 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3376 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3377
3050void 3378void
3051try (SV *self) 3379try (SV *self)
3094 ); 3422 );
3095 OUTPUT: 3423 OUTPUT:
3096 RETVAL 3424 RETVAL
3097 3425
3098void 3426void
3099wait (SV *self) 3427wait (...)
3100 CODE: 3428 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3429 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3430
3103void 3431void
3104broadcast (SV *self) 3432broadcast (SV *self)
3161 3489
3162void 3490void
3163_register (char *target, char *proto, SV *req) 3491_register (char *target, char *proto, SV *req)
3164 CODE: 3492 CODE:
3165{ 3493{
3166 HV *st; 3494 CV *req_cv = coro_sv_2cv (aTHX_ req);
3167 GV *gvp;
3168 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3169 /* newXSproto doesn't return the CV on 5.8 */ 3495 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3496 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3497 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3498 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3499}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines