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.299 by root, Wed Nov 19 00:06:55 2008 UTC vs.
Revision 1.331 by root, Thu Nov 27 12:00:59 2008 UTC

16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
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
260 /* coro process data */ 280 /* coro process data */
261 int prio; 281 int prio;
262 SV *except; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
283 SV *rouse_cb;
263 284
264 /* async_pool */ 285 /* async_pool */
265 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
266 289
267 /* linked list */ 290 /* linked list */
268 struct coro *next, *prev; 291 struct coro *next, *prev;
269}; 292};
270 293
287 310
288/* for Coro.pm */ 311/* for Coro.pm */
289static SV *coro_current; 312static SV *coro_current;
290static SV *coro_readyhook; 313static SV *coro_readyhook;
291static 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;
292static struct coro *coro_first; 316static struct coro *coro_first;
293#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
294 318
295/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
296 320
322 get_hv (name, create); 346 get_hv (name, create);
323#endif 347#endif
324 return get_hv (name, create); 348 return get_hv (name, create);
325} 349}
326 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
327static AV * 360static AV *
328coro_clone_padlist (pTHX_ CV *cv) 361coro_derive_padlist (pTHX_ CV *cv)
329{ 362{
330 AV *padlist = CvPADLIST (cv); 363 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 364 AV *newpadlist, *newpad;
332 365
333 newpadlist = newAV (); 366 newpadlist = newAV ();
348 381
349static void 382static void
350free_padlist (pTHX_ AV *padlist) 383free_padlist (pTHX_ AV *padlist)
351{ 384{
352 /* may be during global destruction */ 385 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 386 if (!IN_DESTRUCT)
354 { 387 {
355 I32 i = AvFILLp (padlist); 388 I32 i = AvFILLp (padlist);
389
356 while (i >= 0) 390 while (i >= 0)
357 { 391 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 392 /* we try to be extra-careful here */
359 if (svp) 393 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 394
361 SV *sv; 395 I32 i = AvFILLp (av);
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 396
397 while (i >= 0)
398 SvREFCNT_dec (AvARRAY (av)[i--]);
399
400 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 401 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 402 }
368 403
404 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 405 SvREFCNT_dec ((SV*)padlist);
370 } 406 }
371} 407}
372 408
373static int 409static int
448 else 484 else
449 { 485 {
450#if CORO_PREFER_PERL_FUNCTIONS 486#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 487 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 488 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 489 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 490 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 491 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 492 SvREFCNT_dec (cp);
457#else 493#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 494 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 495#endif
460 } 496 }
461} 497}
462 498
463static void 499static void
470 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 506 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
471 507
472 av = (AV *)mg->mg_obj; 508 av = (AV *)mg->mg_obj;
473 509
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 510 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 511 av_extend (av, AvFILLp (av) + 1);
476 512
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 513 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 514}
479 515
480/** load & save, init *******************************************************/ 516/** load & save, init *******************************************************/
485 perl_slots *slot = c->slot; 521 perl_slots *slot = c->slot;
486 c->slot = 0; 522 c->slot = 0;
487 523
488 PL_mainstack = c->mainstack; 524 PL_mainstack = c->mainstack;
489 525
490 GvSV (PL_defgv) = slot->defsv; 526 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 527 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 528 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 529 GvSV (irsgv) = slot->irsgv;
530 GvHV (PL_hintgv) = slot->hinthv;
494 531
495 #define VAR(name,type) PL_ ## name = slot->name; 532 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 533 # include "state.h"
497 #undef VAR 534 #undef VAR
498 535
584 c->mainstack = PL_mainstack; 621 c->mainstack = PL_mainstack;
585 622
586 { 623 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 624 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 625
589 slot->defav = GvAV (PL_defgv); 626 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 627 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 628 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 629 slot->irsgv = GvSV (irsgv);
630 slot->hinthv = GvHV (PL_hintgv);
593 631
594 #define VAR(name,type) slot->name = PL_ ## name; 632 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 633 # include "state.h"
596 #undef VAR 634 #undef VAR
597 } 635 }
602 * of perl.c:init_stacks, except that it uses less memory 640 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 641 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 642 * not usually need a lot of stackspace.
605 */ 643 */
606#if CORO_PREFER_PERL_FUNCTIONS 644#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 645# define coro_init_stacks(thx) init_stacks ()
608#else 646#else
609static void 647static void
610coro_init_stacks (pTHX) 648coro_init_stacks (pTHX)
611{ 649{
612 PL_curstackinfo = new_stackinfo(32, 8); 650 PL_curstackinfo = new_stackinfo(32, 8);
675#if !PERL_VERSION_ATLEAST (5,10,0) 713#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 714 Safefree (PL_retstack);
677#endif 715#endif
678} 716}
679 717
718#define CORO_RSS \
719 rss += sizeof (SYM (curstackinfo)); \
720 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
721 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
722 rss += SYM (tmps_max) * sizeof (SV *); \
723 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
724 rss += SYM (scopestack_max) * sizeof (I32); \
725 rss += SYM (savestack_max) * sizeof (ANY);
726
680static size_t 727static size_t
681coro_rss (pTHX_ struct coro *coro) 728coro_rss (pTHX_ struct coro *coro)
682{ 729{
683 size_t rss = sizeof (*coro); 730 size_t rss = sizeof (*coro);
684 731
685 if (coro->mainstack) 732 if (coro->mainstack)
686 { 733 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 734 if (coro->flags & CF_RUNNING)
691 { 735 {
692 slot = &tmp_slot; 736 #define SYM(sym) PL_ ## sym
693 737 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 738 #undef SYM
697 } 739 }
698 else 740 else
699 slot = coro->slot;
700
701 if (slot)
702 { 741 {
703 rss += sizeof (slot->curstackinfo); 742 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 743 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 744 #undef SYM
706 rss += slot->tmps_max * sizeof (SV *);
707 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
708 rss += slot->scopestack_max * sizeof (I32);
709 rss += slot->savestack_max * sizeof (ANY);
710
711#if !PERL_VERSION_ATLEAST (5,10,0)
712 rss += slot->retstack_max * sizeof (OP *);
713#endif
714 } 745 }
715 } 746 }
716 747
717 return rss; 748 return rss;
718} 749}
820slf_check_nop (pTHX_ struct CoroSLF *frame) 851slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 852{
822 return 0; 853 return 0;
823} 854}
824 855
856static int
857slf_check_repeat (pTHX_ struct CoroSLF *frame)
858{
859 return 1;
860}
861
825static UNOP coro_setup_op; 862static UNOP coro_setup_op;
826 863
827static void NOINLINE /* noinline to keep it out of the transfer fast path */ 864static void NOINLINE /* noinline to keep it out of the transfer fast path */
828coro_setup (pTHX_ struct coro *coro) 865coro_setup (pTHX_ struct coro *coro)
829{ 866{
834 871
835 PL_runops = RUNOPS_DEFAULT; 872 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 873 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 874 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 875 PL_comppad = 0;
876 PL_comppad_name = 0;
877 PL_comppad_name_fill = 0;
878 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 879 PL_curpm = 0;
840 PL_curpad = 0; 880 PL_curpad = 0;
841 PL_localizing = 0; 881 PL_localizing = 0;
842 PL_dirty = 0; 882 PL_dirty = 0;
843 PL_restartop = 0; 883 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 884#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 885 PL_parser = 0;
846#endif 886#endif
887 PL_hints = 0;
847 888
848 /* recreate the die/warn hooks */ 889 /* recreate the die/warn hooks */
849 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 890 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
850 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 891 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
851 892
852 GvSV (PL_defgv) = newSV (0); 893 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 894 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 895 GvSV (PL_errgv) = newSV (0);
855 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 896 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
897 GvHV (PL_hintgv) = 0;
856 PL_rs = newSVsv (GvSV (irsgv)); 898 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 899 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 900
859 { 901 {
860 dSP; 902 dSP;
861 UNOP myop; 903 UNOP myop;
862 904
863 Zero (&myop, 1, UNOP); 905 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 906 myop.op_next = Nullop;
907 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 908 myop.op_flags = OPf_WANT_VOID;
866 909
867 PUSHMARK (SP); 910 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 911 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 912 PUTBACK;
870 PL_op = (OP *)&myop; 913 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 914 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 915 }
874 916
875 /* this newly created coroutine might be run on an existing cctx which most 917 /* this newly created coroutine might be run on an existing cctx which most
876 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 918 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
877 */ 919 */
878 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 920 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
879 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 921 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
880 922
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 923 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
882 coro_setup_op.op_next = PL_op; 924 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 925 coro_setup_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 926 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 927 /* no flags etc. required, as an init function won't be called */
886 928
887 PL_op = (OP *)&coro_setup_op; 929 PL_op = (OP *)&coro_setup_op;
888 930
889 /* copy throw, in case it was set before coro_setup */ 931 /* copy throw, in case it was set before coro_setup */
890 CORO_THROW = coro->except; 932 CORO_THROW = coro->except;
914 SvREFCNT_dec (GvAV (PL_defgv)); 956 SvREFCNT_dec (GvAV (PL_defgv));
915 SvREFCNT_dec (GvSV (PL_errgv)); 957 SvREFCNT_dec (GvSV (PL_errgv));
916 SvREFCNT_dec (PL_defoutgv); 958 SvREFCNT_dec (PL_defoutgv);
917 SvREFCNT_dec (PL_rs); 959 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv)); 960 SvREFCNT_dec (GvSV (irsgv));
961 SvREFCNT_dec (GvHV (PL_hintgv));
919 962
920 SvREFCNT_dec (PL_diehook); 963 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook); 964 SvREFCNT_dec (PL_warnhook);
922 965
923 SvREFCNT_dec (coro->saved_deffh); 966 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (CORO_THROW); 967 SvREFCNT_dec (coro->rouse_cb);
968 SvREFCNT_dec (coro->invoke_cb);
969 SvREFCNT_dec (coro->invoke_av);
925 970
926 coro_destruct_stacks (aTHX); 971 coro_destruct_stacks (aTHX);
927} 972}
928 973
929INLINE void 974INLINE void
939static int 984static int
940runops_trace (pTHX) 985runops_trace (pTHX)
941{ 986{
942 COP *oldcop = 0; 987 COP *oldcop = 0;
943 int oldcxix = -2; 988 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 989
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 990 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 991 {
949 PERL_ASYNC_CHECK (); 992 PERL_ASYNC_CHECK ();
950 993
951 if (cctx->flags & CC_TRACE_ALL) 994 if (cctx_current->flags & CC_TRACE_ALL)
952 { 995 {
953 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 996 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
954 { 997 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 998 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 999 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1000 AV *av = newAV (); /* return values */
958 SV **cb; 1001 SV **cb;
995 1038
996 if (PL_curcop != &PL_compiling) 1039 if (PL_curcop != &PL_compiling)
997 { 1040 {
998 SV **cb; 1041 SV **cb;
999 1042
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1043 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1044 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1045 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1046
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1047 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1048 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1049 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1050 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1051 SV *fullname = sv_2mortal (newSV (0));
1010 1052
1011 if (isGV (gv)) 1053 if (isGV (gv))
1016 SAVETMPS; 1058 SAVETMPS;
1017 EXTEND (SP, 3); 1059 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1060 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1061 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1062 PUSHs (fullname);
1021 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1063 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1022 PUTBACK; 1064 PUTBACK;
1023 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1065 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1024 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1066 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1025 SPAGAIN; 1067 SPAGAIN;
1026 FREETMPS; 1068 FREETMPS;
1029 } 1071 }
1030 1072
1031 oldcxix = cxstack_ix; 1073 oldcxix = cxstack_ix;
1032 } 1074 }
1033 1075
1034 if (cctx->flags & CC_TRACE_LINE) 1076 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1077 {
1036 dSP; 1078 dSP;
1037 1079
1038 PL_runops = RUNOPS_DEFAULT; 1080 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1081 ENTER;
1058 1100
1059 TAINT_NOT; 1101 TAINT_NOT;
1060 return 0; 1102 return 0;
1061} 1103}
1062 1104
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1105static struct CoroSLF cctx_ssl_frame;
1065 1106
1066static void 1107static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1108slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1109{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1110 ta->prev = 0;
1071} 1111}
1072 1112
1073static int 1113static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1114slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1115{
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1118 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079} 1119}
1080 1120
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1121/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1082static void NOINLINE 1122static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1123cctx_prepare (pTHX)
1084{ 1124{
1085 PL_top_env = &PL_start_env; 1125 PL_top_env = &PL_start_env;
1086 1126
1087 if (cctx->flags & CC_TRACE) 1127 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1128 PL_runops = runops_trace;
1089 1129
1090 /* we already must be executing an SLF op, there is no other valid way 1130 /* we already must be executing an SLF op, there is no other valid way
1091 * that can lead to creation of a new cctx */ 1131 * that can lead to creation of a new cctx */
1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1132 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1133 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1134
1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1135 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1096 cctx_ssl_cctx = cctx;
1097 cctx_ssl_frame = slf_frame; 1136 cctx_ssl_frame = slf_frame;
1098 1137
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1138 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1139 slf_frame.check = slf_check_set_stacklevel;
1101} 1140}
1124 /* normally we would need to skip the entersub here */ 1163 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */ 1164 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */ 1165 /* PL_nop = PL_nop->op_next */
1127 1166
1128 /* inject a fake subroutine call to cctx_init */ 1167 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1168 cctx_prepare (aTHX);
1130 1169
1131 /* cctx_run is the alternative tail of transfer() */ 1170 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1171 transfer_tail (aTHX);
1133 1172
1134 /* somebody or something will hit me for both perl_run and PL_restartop */ 1173 /* somebody or something will hit me for both perl_run and PL_restartop */
1135 PL_restartop = PL_op; 1174 PL_restartop = PL_op;
1136 perl_run (PL_curinterp); 1175 perl_run (PL_curinterp);
1176 /*
1177 * Unfortunately, there is no way to get at the return values of the
1178 * coro body here, as perl_run destroys these
1179 */
1137 1180
1138 /* 1181 /*
1139 * If perl-run returns we assume exit() was being called or the coro 1182 * If perl-run returns we assume exit() was being called or the coro
1140 * fell off the end, which seems to be the only valid (non-bug) 1183 * fell off the end, which seems to be the only valid (non-bug)
1141 * reason for perl_run to return. We try to exit by jumping to the 1184 * reason for perl_run to return. We try to exit by jumping to the
1142 * bootstrap-time "top" top_env, as we cannot restore the "main" 1185 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * coroutine as Coro has no such concept 1186 * coroutine as Coro has no such concept.
1187 * This actually isn't valid with the pthread backend, but OSes requiring
1188 * that backend are too broken to do it in a standards-compliant way.
1144 */ 1189 */
1145 PL_top_env = main_top_env; 1190 PL_top_env = main_top_env;
1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1191 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 } 1192 }
1148} 1193}
1225cctx_destroy (coro_cctx *cctx) 1270cctx_destroy (coro_cctx *cctx)
1226{ 1271{
1227 if (!cctx) 1272 if (!cctx)
1228 return; 1273 return;
1229 1274
1275 assert (cctx != cctx_current);//D temporary
1276
1230 --cctx_count; 1277 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1278 coro_destroy (&cctx->cctx);
1232 1279
1233 /* coro_transfer creates new, empty cctx's */ 1280 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1281 if (cctx->sptr)
1297 /* TODO: throwing up here is considered harmful */ 1344 /* TODO: throwing up here is considered harmful */
1298 1345
1299 if (expect_true (prev != next)) 1346 if (expect_true (prev != next))
1300 { 1347 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1348 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1302 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1349 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1303 1350
1304 if (expect_false (next->flags & CF_RUNNING)) 1351 if (expect_false (next->flags & CF_RUNNING))
1305 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1352 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1306 1353
1307 if (expect_false (next->flags & CF_DESTROYED)) 1354 if (expect_false (next->flags & CF_DESTROYED))
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1366transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1367{
1321 dSTACKLEVEL; 1368 dSTACKLEVEL;
1322 1369
1323 /* sometimes transfer is only called to set idle_sp */ 1370 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1371 if (expect_false (!prev))
1325 { 1372 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1373 cctx_current->idle_sp = STACKLEVEL;
1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1374 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1328 } 1375 }
1329 else if (expect_true (prev != next)) 1376 else if (expect_true (prev != next))
1330 { 1377 {
1331 coro_cctx *prev__cctx; 1378 coro_cctx *cctx_prev;
1332 1379
1333 if (expect_false (prev->flags & CF_NEW)) 1380 if (expect_false (prev->flags & CF_NEW))
1334 { 1381 {
1335 /* create a new empty/source context */ 1382 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1383 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1384 prev->flags |= CF_RUNNING;
1339 } 1385 }
1340 1386
1341 prev->flags &= ~CF_RUNNING; 1387 prev->flags &= ~CF_RUNNING;
1352 coro_setup (aTHX_ next); 1398 coro_setup (aTHX_ next);
1353 } 1399 }
1354 else 1400 else
1355 load_perl (aTHX_ next); 1401 load_perl (aTHX_ next);
1356 1402
1357 prev__cctx = prev->cctx; 1403 assert (!prev->cctx);//D temporary
1358 1404
1359 /* possibly untie and reuse the cctx */ 1405 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1406 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1407 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1408 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1409 && !force_cctx
1364 )) 1410 ))
1365 { 1411 {
1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1412 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1367 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1413 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1368 1414
1369 prev->cctx = 0;
1370
1371 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1415 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1372 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1416 /* without this the next cctx_get might destroy the running cctx while still in use */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1417 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1418 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1419 next->cctx = cctx_get (aTHX);
1376 1420
1377 cctx_put (prev__cctx); 1421 cctx_put (cctx_current);
1378 } 1422 }
1423 else
1424 prev->cctx = cctx_current;
1379 1425
1380 ++next->usecount; 1426 ++next->usecount;
1381 1427
1382 if (expect_true (!next->cctx)) 1428 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1429 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1430
1385 if (expect_false (prev__cctx != next->cctx)) 1431 next->cctx = 0;
1432
1433 if (expect_false (cctx_prev != cctx_current))
1386 { 1434 {
1387 prev__cctx->top_env = PL_top_env; 1435 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1436 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1437 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1438 }
1391 1439
1392 transfer_tail (aTHX); 1440 transfer_tail (aTHX);
1393 } 1441 }
1394} 1442}
1433 1481
1434 coro->slot = 0; 1482 coro->slot = 0;
1435 } 1483 }
1436 1484
1437 cctx_destroy (coro->cctx); 1485 cctx_destroy (coro->cctx);
1486 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1487 SvREFCNT_dec (coro->args);
1488 SvREFCNT_dec (CORO_THROW);
1439 1489
1440 if (coro->next) coro->next->prev = coro->prev; 1490 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1491 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1492 if (coro == coro_first) coro_first = coro->next;
1443 1493
1497 1547
1498 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1548 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1499 TRANSFER (ta, 1); 1549 TRANSFER (ta, 1);
1500} 1550}
1501 1551
1552/*****************************************************************************/
1553/* gensub: simple closure generation utility */
1554
1555#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1556
1557/* create a closure from XS, returns a code reference */
1558/* the arg can be accessed via GENSUB_ARG from the callback */
1559/* the callback must use dXSARGS/XSRETURN */
1560static SV *
1561gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1562{
1563 CV *cv = (CV *)newSV (0);
1564
1565 sv_upgrade ((SV *)cv, SVt_PVCV);
1566
1567 CvANON_on (cv);
1568 CvISXSUB_on (cv);
1569 CvXSUB (cv) = xsub;
1570 GENSUB_ARG = arg;
1571
1572 return newRV_noinc ((SV *)cv);
1573}
1574
1502/** Coro ********************************************************************/ 1575/** Coro ********************************************************************/
1503 1576
1504INLINE void 1577INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1578coro_enq (pTHX_ struct coro *coro)
1506{ 1579{
1524{ 1597{
1525 struct coro *coro; 1598 struct coro *coro;
1526 SV *sv_hook; 1599 SV *sv_hook;
1527 void (*xs_hook)(void); 1600 void (*xs_hook)(void);
1528 1601
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1602 coro = SvSTATE (coro_sv);
1533 1603
1534 if (coro->flags & CF_READY) 1604 if (coro->flags & CF_READY)
1535 return 0; 1605 return 0;
1536 1606
1567api_is_ready (pTHX_ SV *coro_sv) 1637api_is_ready (pTHX_ SV *coro_sv)
1568{ 1638{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1639 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1640}
1571 1641
1642/* expects to own a reference to next->hv */
1572INLINE void 1643INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1644prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1645{
1575 SV *prev_sv, *next_sv;
1576
1577 for (;;)
1578 {
1579 next_sv = coro_deq (aTHX);
1580
1581 /* nothing to schedule: call the idle handler */
1582 if (expect_false (!next_sv))
1583 {
1584 dSP;
1585
1586 ENTER;
1587 SAVETMPS;
1588
1589 PUSHMARK (SP);
1590 PUTBACK;
1591 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1592
1593 FREETMPS;
1594 LEAVE;
1595 continue;
1596 }
1597
1598 ta->next = SvSTATE_hv (next_sv);
1599
1600 /* cannot transfer to destroyed coros, skip and look for next */
1601 if (expect_false (ta->next->flags & CF_DESTROYED))
1602 {
1603 SvREFCNT_dec (next_sv);
1604 /* coro_nready has already been taken care of by destroy */
1605 continue;
1606 }
1607
1608 --coro_nready;
1609 break;
1610 }
1611
1612 /* free this only after the transfer */
1613 prev_sv = SvRV (coro_current); 1646 SV *prev_sv = SvRV (coro_current);
1647
1614 ta->prev = SvSTATE_hv (prev_sv); 1648 ta->prev = SvSTATE_hv (prev_sv);
1649 ta->next = next;
1650
1615 TRANSFER_CHECK (*ta); 1651 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1652
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1653 SvRV_set (coro_current, (SV *)next->hv);
1619 1654
1620 free_coro_mortal (aTHX); 1655 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1656 coro_mortal = prev_sv;
1622} 1657}
1623 1658
1659static void
1660prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1661{
1662 for (;;)
1663 {
1664 SV *next_sv = coro_deq (aTHX);
1665
1666 if (expect_true (next_sv))
1667 {
1668 struct coro *next = SvSTATE_hv (next_sv);
1669
1670 /* cannot transfer to destroyed coros, skip and look for next */
1671 if (expect_false (next->flags & CF_DESTROYED))
1672 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1673 else
1674 {
1675 next->flags &= ~CF_READY;
1676 --coro_nready;
1677
1678 prepare_schedule_to (aTHX_ ta, next);
1679 break;
1680 }
1681 }
1682 else
1683 {
1684 /* nothing to schedule: call the idle handler */
1685 if (SvROK (sv_idle)
1686 && SvOBJECT (SvRV (sv_idle)))
1687 {
1688 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1689 api_ready (aTHX_ SvRV (sv_idle));
1690 --coro_nready;
1691 }
1692 else
1693 {
1694 dSP;
1695
1696 ENTER;
1697 SAVETMPS;
1698
1699 PUSHMARK (SP);
1700 PUTBACK;
1701 call_sv (sv_idle, G_VOID | G_DISCARD);
1702
1703 FREETMPS;
1704 LEAVE;
1705 }
1706 }
1707 }
1708}
1709
1624INLINE void 1710INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1711prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1712{
1627 api_ready (aTHX_ coro_current); 1713 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1714 prepare_schedule (aTHX_ ta);
1647{ 1733{
1648 struct coro_transfer_args ta; 1734 struct coro_transfer_args ta;
1649 1735
1650 prepare_schedule (aTHX_ &ta); 1736 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1); 1737 TRANSFER (ta, 1);
1738}
1739
1740static void
1741api_schedule_to (pTHX_ SV *coro_sv)
1742{
1743 struct coro_transfer_args ta;
1744 struct coro *next = SvSTATE (coro_sv);
1745
1746 SvREFCNT_inc_NN (coro_sv);
1747 prepare_schedule_to (aTHX_ &ta, next);
1652} 1748}
1653 1749
1654static int 1750static int
1655api_cede (pTHX) 1751api_cede (pTHX)
1656{ 1752{
1685static void 1781static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1782api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1783{
1688 struct coro *coro = SvSTATE (coro_sv); 1784 struct coro *coro = SvSTATE (coro_sv);
1689 1785
1786 if (coro->flags & CF_RUNNING)
1787 croak ("cannot enable tracing on a running coroutine, caught");
1788
1690 if (flags & CC_TRACE) 1789 if (flags & CC_TRACE)
1691 { 1790 {
1692 if (!coro->cctx) 1791 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1792 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1793 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1794 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1795
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1796 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1797 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1798 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1799 {
1703 if (coro->flags & CF_RUNNING) 1802 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1803 PL_runops = RUNOPS_DEFAULT;
1705 else 1804 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1805 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1806 }
1807}
1808
1809static void
1810coro_call_on_destroy (pTHX_ struct coro *coro)
1811{
1812 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1813 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1814
1815 if (on_destroyp)
1816 {
1817 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1818
1819 while (AvFILLp (on_destroy) >= 0)
1820 {
1821 dSP; /* don't disturb outer sp */
1822 SV *cb = av_pop (on_destroy);
1823
1824 PUSHMARK (SP);
1825
1826 if (statusp)
1827 {
1828 int i;
1829 AV *status = (AV *)SvRV (*statusp);
1830 EXTEND (SP, AvFILLp (status) + 1);
1831
1832 for (i = 0; i <= AvFILLp (status); ++i)
1833 PUSHs (AvARRAY (status)[i]);
1834 }
1835
1836 PUTBACK;
1837 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1838 }
1839 }
1840}
1841
1842static void
1843slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1844{
1845 int i;
1846 HV *hv = (HV *)SvRV (coro_current);
1847 AV *av = newAV ();
1848
1849 av_extend (av, items - 1);
1850 for (i = 0; i < items; ++i)
1851 av_push (av, SvREFCNT_inc_NN (arg [i]));
1852
1853 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1854
1855 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1856 api_ready (aTHX_ sv_manager);
1857
1858 frame->prepare = prepare_schedule;
1859 frame->check = slf_check_repeat;
1860}
1861
1862/*****************************************************************************/
1863/* async pool handler */
1864
1865static int
1866slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1867{
1868 HV *hv = (HV *)SvRV (coro_current);
1869 struct coro *coro = (struct coro *)frame->data;
1870
1871 if (!coro->invoke_cb)
1872 return 1; /* loop till we have invoke */
1873 else
1874 {
1875 hv_store (hv, "desc", sizeof ("desc") - 1,
1876 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1877
1878 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1879
1880 {
1881 dSP;
1882 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1883 PUTBACK;
1884 }
1885
1886 SvREFCNT_dec (GvAV (PL_defgv));
1887 GvAV (PL_defgv) = coro->invoke_av;
1888 coro->invoke_av = 0;
1889
1890 return 0;
1891 }
1892}
1893
1894static void
1895slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1896{
1897 HV *hv = (HV *)SvRV (coro_current);
1898 struct coro *coro = SvSTATE_hv ((SV *)hv);
1899
1900 if (expect_true (coro->saved_deffh))
1901 {
1902 /* subsequent iteration */
1903 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1904 coro->saved_deffh = 0;
1905
1906 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1907 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1908 {
1909 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1910 coro->invoke_av = newAV ();
1911
1912 frame->prepare = prepare_nop;
1913 }
1914 else
1915 {
1916 av_clear (GvAV (PL_defgv));
1917 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1918
1919 coro->prio = 0;
1920
1921 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1922 api_trace (aTHX_ coro_current, 0);
1923
1924 frame->prepare = prepare_schedule;
1925 av_push (av_async_pool, SvREFCNT_inc (hv));
1926 }
1927 }
1928 else
1929 {
1930 /* first iteration, simply fall through */
1931 frame->prepare = prepare_nop;
1932 }
1933
1934 frame->check = slf_check_pool_handler;
1935 frame->data = (void *)coro;
1936}
1937
1938/*****************************************************************************/
1939/* rouse callback */
1940
1941#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1942
1943static void
1944coro_rouse_callback (pTHX_ CV *cv)
1945{
1946 dXSARGS;
1947 SV *data = (SV *)GENSUB_ARG;
1948
1949 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1950 {
1951 /* first call, set args */
1952 AV *av = newAV ();
1953 SV *coro = SvRV (data);
1954
1955 SvRV_set (data, (SV *)av);
1956 api_ready (aTHX_ coro);
1957 SvREFCNT_dec (coro);
1958
1959 /* better take a full copy of the arguments */
1960 while (items--)
1961 av_store (av, items, newSVsv (ST (items)));
1962 }
1963
1964 XSRETURN_EMPTY;
1965}
1966
1967static int
1968slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1969{
1970 SV *data = (SV *)frame->data;
1971
1972 if (CORO_THROW)
1973 return 0;
1974
1975 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1976 return 1;
1977
1978 /* now push all results on the stack */
1979 {
1980 dSP;
1981 AV *av = (AV *)SvRV (data);
1982 int i;
1983
1984 EXTEND (SP, AvFILLp (av) + 1);
1985 for (i = 0; i <= AvFILLp (av); ++i)
1986 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1987
1988 /* we have stolen the elements, so ste length to zero and free */
1989 AvFILLp (av) = -1;
1990 av_undef (av);
1991
1992 PUTBACK;
1993 }
1994
1995 return 0;
1996}
1997
1998static void
1999slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2000{
2001 SV *cb;
2002
2003 if (items)
2004 cb = arg [0];
2005 else
2006 {
2007 struct coro *coro = SvSTATE_current;
2008
2009 if (!coro->rouse_cb)
2010 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2011
2012 cb = sv_2mortal (coro->rouse_cb);
2013 coro->rouse_cb = 0;
2014 }
2015
2016 if (!SvROK (cb)
2017 || SvTYPE (SvRV (cb)) != SVt_PVCV
2018 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2019 croak ("Coro::rouse_wait called with illegal callback argument,");
2020
2021 {
2022 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2023 SV *data = (SV *)GENSUB_ARG;
2024
2025 frame->data = (void *)data;
2026 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2027 frame->check = slf_check_rouse_wait;
2028 }
2029}
2030
2031static SV *
2032coro_new_rouse_cb (pTHX)
2033{
2034 HV *hv = (HV *)SvRV (coro_current);
2035 struct coro *coro = SvSTATE_hv (hv);
2036 SV *data = newRV_inc ((SV *)hv);
2037 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2038
2039 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2040 SvREFCNT_dec (data); /* magicext increases the refcount */
2041
2042 SvREFCNT_dec (coro->rouse_cb);
2043 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2044
2045 return cb;
1708} 2046}
1709 2047
1710/*****************************************************************************/ 2048/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2049/* schedule-like-function opcode (SLF) */
1712 2050
1759static void 2097static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2098slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2099{
1762 frame->prepare = prepare_schedule; 2100 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2101 frame->check = slf_check_nop;
2102}
2103
2104static void
2105slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2106{
2107 struct coro *next = (struct coro *)slf_frame.data;
2108
2109 SvREFCNT_inc_NN (next->hv);
2110 prepare_schedule_to (aTHX_ ta, next);
2111}
2112
2113static void
2114slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2115{
2116 if (!items)
2117 croak ("Coro::schedule_to expects a coroutine argument, caught");
2118
2119 frame->data = (void *)SvSTATE (arg [0]);
2120 frame->prepare = slf_prepare_schedule_to;
2121 frame->check = slf_check_nop;
2122}
2123
2124static void
2125slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2126{
2127 api_ready (aTHX_ SvRV (coro_current));
2128
2129 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1764} 2130}
1765 2131
1766static void 2132static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{ 2134{
1914 } 2280 }
1915 else 2281 else
1916 slf_argc = 0; 2282 slf_argc = 0;
1917 2283
1918 PL_op->op_ppaddr = pp_slf; 2284 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2285 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1920 2286
1921 PL_op = (OP *)&slf_restore; 2287 PL_op = (OP *)&slf_restore;
1922} 2288}
1923 2289
1924/*****************************************************************************/ 2290/*****************************************************************************/
1995 PerlIOBuf_get_cnt, 2361 PerlIOBuf_get_cnt,
1996 PerlIOBuf_set_ptrcnt, 2362 PerlIOBuf_set_ptrcnt,
1997}; 2363};
1998 2364
1999/*****************************************************************************/ 2365/*****************************************************************************/
2000/* Coro::Semaphore */ 2366/* Coro::Semaphore & Coro::Signal */
2001 2367
2002static SV * 2368static SV *
2003coro_semaphore_new (int count) 2369coro_waitarray_new (pTHX_ int count)
2004{ 2370{
2005 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2371 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2006 AV *av = newAV (); 2372 AV *av = newAV ();
2007 SV **ary; 2373 SV **ary;
2008 2374
2009 /* unfortunately, building manually saves memory */ 2375 /* unfortunately, building manually saves memory */
2010 Newx (ary, 2, SV *); 2376 Newx (ary, 2, SV *);
2011 AvALLOC (av) = ary; 2377 AvALLOC (av) = ary;
2378#if PERL_VERSION_ATLEAST (5,10,0)
2012 AvARRAY (av) = ary; 2379 AvARRAY (av) = ary;
2380#else
2381 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2382 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2383 SvPVX ((SV *)av) = (char *)ary;
2384#endif
2013 AvMAX (av) = 1; 2385 AvMAX (av) = 1;
2014 AvFILLp (av) = 0; 2386 AvFILLp (av) = 0;
2015 ary [0] = newSViv (count); 2387 ary [0] = newSViv (count);
2016 2388
2017 return newRV_noinc ((SV *)av); 2389 return newRV_noinc ((SV *)av);
2018} 2390}
2391
2392/* semaphore */
2019 2393
2020static void 2394static void
2021coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2395coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2022{ 2396{
2023 SV *count_sv = AvARRAY (av)[0]; 2397 SV *count_sv = AvARRAY (av)[0];
2035 AvARRAY (av)[0] = AvARRAY (av)[1]; 2409 AvARRAY (av)[0] = AvARRAY (av)[1];
2036 AvARRAY (av)[1] = count_sv; 2410 AvARRAY (av)[1] = count_sv;
2037 cb = av_shift (av); 2411 cb = av_shift (av);
2038 2412
2039 if (SvOBJECT (cb)) 2413 if (SvOBJECT (cb))
2414 {
2040 api_ready (aTHX_ cb); 2415 api_ready (aTHX_ cb);
2041 else 2416 --count;
2042 croak ("callbacks not yet supported"); 2417 }
2418 else if (SvTYPE (cb) == SVt_PVCV)
2419 {
2420 dSP;
2421 PUSHMARK (SP);
2422 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2423 PUTBACK;
2424 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2425 }
2043 2426
2044 SvREFCNT_dec (cb); 2427 SvREFCNT_dec (cb);
2045
2046 --count;
2047 } 2428 }
2048} 2429}
2049 2430
2050static void 2431static void
2051coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2432coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2133} 2514}
2134 2515
2135static void 2516static void
2136slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2517slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2137{ 2518{
2519 if (items >= 2)
2520 {
2521 /* callback form */
2522 AV *av = (AV *)SvRV (arg [0]);
2523 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2524
2525 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2526
2527 if (SvIVX (AvARRAY (av)[0]) > 0)
2528 coro_semaphore_adjust (aTHX_ av, 0);
2529
2530 frame->prepare = prepare_nop;
2531 frame->check = slf_check_nop;
2532 }
2533 else
2534 {
2138 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2535 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2139 frame->check = slf_check_semaphore_wait; 2536 frame->check = slf_check_semaphore_wait;
2537 }
2140} 2538}
2141 2539
2142/*****************************************************************************/ 2540/* signal */
2143/* gensub: simple closure generation utility */
2144 2541
2145#define GENSUB_ARG CvXSUBANY (cv).any_ptr 2542static void
2146 2543coro_signal_wake (pTHX_ AV *av, int count)
2147/* create a closure from XS, returns a code reference */
2148/* the arg can be accessed via GENSUB_ARG from the callback */
2149/* the callback must use dXSARGS/XSRETURN */
2150static SV *
2151gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2152{ 2544{
2153 CV *cv = (CV *)newSV (0); 2545 SvIVX (AvARRAY (av)[0]) = 0;
2154 2546
2155 sv_upgrade ((SV *)cv, SVt_PVCV); 2547 /* now signal count waiters */
2548 while (count > 0 && AvFILLp (av) > 0)
2549 {
2550 SV *cb;
2156 2551
2157 CvANON_on (cv); 2552 /* swap first two elements so we can shift a waiter */
2158 CvISXSUB_on (cv); 2553 cb = AvARRAY (av)[0];
2159 CvXSUB (cv) = xsub; 2554 AvARRAY (av)[0] = AvARRAY (av)[1];
2160 GENSUB_ARG = arg; 2555 AvARRAY (av)[1] = cb;
2161 2556
2162 return newRV_noinc ((SV *)cv); 2557 cb = av_shift (av);
2558
2559 api_ready (aTHX_ cb);
2560 sv_setiv (cb, 0); /* signal waiter */
2561 SvREFCNT_dec (cb);
2562
2563 --count;
2564 }
2565}
2566
2567static int
2568slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2569{
2570 /* if we are about to throw, also stop waiting */
2571 return SvROK ((SV *)frame->data) && !CORO_THROW;
2572}
2573
2574static void
2575slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2576{
2577 AV *av = (AV *)SvRV (arg [0]);
2578
2579 if (SvIVX (AvARRAY (av)[0]))
2580 {
2581 SvIVX (AvARRAY (av)[0]) = 0;
2582 frame->prepare = prepare_nop;
2583 frame->check = slf_check_nop;
2584 }
2585 else
2586 {
2587 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */
2588
2589 av_push (av, waiter);
2590
2591 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2592 frame->prepare = prepare_schedule;
2593 frame->check = slf_check_signal_wait;
2594 }
2163} 2595}
2164 2596
2165/*****************************************************************************/ 2597/*****************************************************************************/
2166/* Coro::AIO */ 2598/* Coro::AIO */
2167 2599
2182 dXSARGS; 2614 dXSARGS;
2183 AV *state = (AV *)GENSUB_ARG; 2615 AV *state = (AV *)GENSUB_ARG;
2184 SV *coro = av_pop (state); 2616 SV *coro = av_pop (state);
2185 SV *data_sv = newSV (sizeof (struct io_state)); 2617 SV *data_sv = newSV (sizeof (struct io_state));
2186 2618
2187 av_extend (state, items); 2619 av_extend (state, items - 1);
2188 2620
2189 sv_upgrade (data_sv, SVt_PV); 2621 sv_upgrade (data_sv, SVt_PV);
2190 SvCUR_set (data_sv, sizeof (struct io_state)); 2622 SvCUR_set (data_sv, sizeof (struct io_state));
2191 SvPOK_only (data_sv); 2623 SvPOK_only (data_sv);
2192 2624
2327 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2328} 2760}
2329 2761
2330/*****************************************************************************/ 2762/*****************************************************************************/
2331 2763
2764#if CORO_CLONE
2765# include "clone.c"
2766#endif
2767
2332MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2768MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2333 2769
2334PROTOTYPES: DISABLE 2770PROTOTYPES: DISABLE
2335 2771
2336BOOT: 2772BOOT:
2340 coro_thx = PERL_GET_CONTEXT; 2776 coro_thx = PERL_GET_CONTEXT;
2341# endif 2777# endif
2342#endif 2778#endif
2343 BOOT_PAGESIZE; 2779 BOOT_PAGESIZE;
2344 2780
2781 cctx_current = cctx_new_empty ();
2782
2345 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2783 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2346 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2784 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2347 2785
2348 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2786 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2349 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2787 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2368 2806
2369 { 2807 {
2370 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2808 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2371 2809
2372 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2810 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2373 hv_store_ent (PL_custom_op_names, slf, 2811 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2374 newSVpv ("coro_slf", 0), 0);
2375 2812
2376 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2813 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2377 hv_store_ent (PL_custom_op_descs, slf, 2814 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2378 newSVpv ("coro schedule like function", 0), 0);
2379 } 2815 }
2380 2816
2381 coroapi.ver = CORO_API_VERSION; 2817 coroapi.ver = CORO_API_VERSION;
2382 coroapi.rev = CORO_API_REVISION; 2818 coroapi.rev = CORO_API_REVISION;
2383 2819
2402 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2838 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2403} 2839}
2404 2840
2405SV * 2841SV *
2406new (char *klass, ...) 2842new (char *klass, ...)
2843 ALIAS:
2844 Coro::new = 1
2407 CODE: 2845 CODE:
2408{ 2846{
2409 struct coro *coro; 2847 struct coro *coro;
2410 MAGIC *mg; 2848 MAGIC *mg;
2411 HV *hv; 2849 HV *hv;
2850 CV *cb;
2412 int i; 2851 int i;
2852
2853 if (items > 1)
2854 {
2855 cb = coro_sv_2cv (aTHX_ ST (1));
2856
2857 if (!ix)
2858 {
2859 if (CvISXSUB (cb))
2860 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2861
2862 if (!CvROOT (cb))
2863 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2864 }
2865 }
2413 2866
2414 Newz (0, coro, 1, struct coro); 2867 Newz (0, coro, 1, struct coro);
2415 coro->args = newAV (); 2868 coro->args = newAV ();
2416 coro->flags = CF_NEW; 2869 coro->flags = CF_NEW;
2417 2870
2422 coro->hv = hv = newHV (); 2875 coro->hv = hv = newHV ();
2423 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2876 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2424 mg->mg_flags |= MGf_DUP; 2877 mg->mg_flags |= MGf_DUP;
2425 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2878 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2426 2879
2880 if (items > 1)
2881 {
2427 av_extend (coro->args, items - 1); 2882 av_extend (coro->args, items - 1 + ix - 1);
2883
2884 if (ix)
2885 {
2886 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2887 cb = cv_coro_run;
2888 }
2889
2890 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2891
2428 for (i = 1; i < items; i++) 2892 for (i = 2; i < items; i++)
2429 av_push (coro->args, newSVsv (ST (i))); 2893 av_push (coro->args, newSVsv (ST (i)));
2894 }
2430} 2895}
2431 OUTPUT: 2896 OUTPUT:
2432 RETVAL 2897 RETVAL
2433 2898
2434void 2899void
2447void 2912void
2448_exit (int code) 2913_exit (int code)
2449 PROTOTYPE: $ 2914 PROTOTYPE: $
2450 CODE: 2915 CODE:
2451 _exit (code); 2916 _exit (code);
2917
2918SV *
2919clone (Coro::State coro)
2920 CODE:
2921{
2922#if CORO_CLONE
2923 struct coro *ncoro = coro_clone (coro);
2924 MAGIC *mg;
2925 /* TODO: too much duplication */
2926 ncoro->hv = newHV ();
2927 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2928 mg->mg_flags |= MGf_DUP;
2929 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2930#else
2931 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2932#endif
2933}
2934 OUTPUT:
2935 RETVAL
2452 2936
2453int 2937int
2454cctx_stacksize (int new_stacksize = 0) 2938cctx_stacksize (int new_stacksize = 0)
2455 PROTOTYPE: ;$ 2939 PROTOTYPE: ;$
2456 CODE: 2940 CODE:
2577 3061
2578SV * 3062SV *
2579has_cctx (Coro::State coro) 3063has_cctx (Coro::State coro)
2580 PROTOTYPE: $ 3064 PROTOTYPE: $
2581 CODE: 3065 CODE:
2582 RETVAL = boolSV (!!coro->cctx); 3066 /* maybe manage the running flag differently */
3067 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2583 OUTPUT: 3068 OUTPUT:
2584 RETVAL 3069 RETVAL
2585 3070
2586int 3071int
2587is_traced (Coro::State coro) 3072is_traced (Coro::State coro)
2607 3092
2608void 3093void
2609force_cctx () 3094force_cctx ()
2610 PROTOTYPE: 3095 PROTOTYPE:
2611 CODE: 3096 CODE:
2612 SvSTATE_current->cctx->idle_sp = 0; 3097 cctx_current->idle_sp = 0;
2613 3098
2614void 3099void
2615swap_defsv (Coro::State self) 3100swap_defsv (Coro::State self)
2616 PROTOTYPE: $ 3101 PROTOTYPE: $
2617 ALIAS: 3102 ALIAS:
2632 3117
2633BOOT: 3118BOOT:
2634{ 3119{
2635 int i; 3120 int i;
2636 3121
2637 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2638 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3122 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2639 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3123 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2640 3124 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3125 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2641 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3126 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2642 SvREADONLY_on (coro_current); 3127 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3128 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3129 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3130 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3131
3132 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3133 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3134 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3135 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2643 3136
2644 coro_stash = gv_stashpv ("Coro", TRUE); 3137 coro_stash = gv_stashpv ("Coro", TRUE);
2645 3138
2646 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3139 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2647 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3140 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2655 3148
2656 { 3149 {
2657 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3150 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2658 3151
2659 coroapi.schedule = api_schedule; 3152 coroapi.schedule = api_schedule;
3153 coroapi.schedule_to = api_schedule_to;
2660 coroapi.cede = api_cede; 3154 coroapi.cede = api_cede;
2661 coroapi.cede_notself = api_cede_notself; 3155 coroapi.cede_notself = api_cede_notself;
2662 coroapi.ready = api_ready; 3156 coroapi.ready = api_ready;
2663 coroapi.is_ready = api_is_ready; 3157 coroapi.is_ready = api_is_ready;
2664 coroapi.nready = coro_nready; 3158 coroapi.nready = coro_nready;
2669 SvREADONLY_on (sv); 3163 SvREADONLY_on (sv);
2670 } 3164 }
2671} 3165}
2672 3166
2673void 3167void
3168terminate (...)
3169 CODE:
3170 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3171
3172void
2674schedule (...) 3173schedule (...)
2675 CODE: 3174 CODE:
2676 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3175 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3176
3177void
3178schedule_to (...)
3179 CODE:
3180 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3181
3182void
3183cede_to (...)
3184 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2677 3186
2678void 3187void
2679cede (...) 3188cede (...)
2680 CODE: 3189 CODE:
2681 CORO_EXECUTE_SLF_XS (slf_init_cede); 3190 CORO_EXECUTE_SLF_XS (slf_init_cede);
2682 3191
2683void 3192void
2684cede_notself (...) 3193cede_notself (...)
2685 CODE: 3194 CODE:
2686 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3195 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3196
3197void
3198_cancel (Coro::State self)
3199 CODE:
3200 coro_state_destroy (aTHX_ self);
3201 coro_call_on_destroy (aTHX_ self);
2687 3202
2688void 3203void
2689_set_current (SV *current) 3204_set_current (SV *current)
2690 PROTOTYPE: $ 3205 PROTOTYPE: $
2691 CODE: 3206 CODE:
2736 CODE: 3251 CODE:
2737 RETVAL = coro_nready; 3252 RETVAL = coro_nready;
2738 OUTPUT: 3253 OUTPUT:
2739 RETVAL 3254 RETVAL
2740 3255
2741# for async_pool speedup
2742void 3256void
2743_pool_1 (SV *cb) 3257_pool_handler (...)
2744 CODE: 3258 CODE:
2745{ 3259 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2746 HV *hv = (HV *)SvRV (coro_current);
2747 struct coro *coro = SvSTATE_hv ((SV *)hv);
2748 AV *defav = GvAV (PL_defgv);
2749 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2750 AV *invoke_av;
2751 int i, len;
2752 3260
2753 if (!invoke) 3261void
3262async_pool (SV *cv, ...)
3263 PROTOTYPE: &@
3264 PPCODE:
3265{
3266 HV *hv = (HV *)av_pop (av_async_pool);
3267 AV *av = newAV ();
3268 SV *cb = ST (0);
3269 int i;
3270
3271 av_extend (av, items - 2);
3272 for (i = 1; i < items; ++i)
3273 av_push (av, SvREFCNT_inc_NN (ST (i)));
3274
3275 if ((SV *)hv == &PL_sv_undef)
2754 { 3276 {
2755 SV *old = PL_diehook; 3277 PUSHMARK (SP);
2756 PL_diehook = 0; 3278 EXTEND (SP, 2);
2757 SvREFCNT_dec (old); 3279 PUSHs (sv_Coro);
2758 croak ("\3async_pool terminate\2\n"); 3280 PUSHs ((SV *)cv_pool_handler);
3281 PUTBACK;
3282 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3283 SPAGAIN;
3284
3285 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2759 } 3286 }
2760 3287
2761 SvREFCNT_dec (coro->saved_deffh);
2762 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2763
2764 hv_store (hv, "desc", sizeof ("desc") - 1,
2765 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2766
2767 invoke_av = (AV *)SvRV (invoke);
2768 len = av_len (invoke_av);
2769
2770 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2771
2772 if (len > 0)
2773 { 3288 {
2774 av_fill (defav, len - 1); 3289 struct coro *coro = SvSTATE_hv (hv);
2775 for (i = 0; i < len; ++i) 3290
2776 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3291 assert (!coro->invoke_cb);
3292 assert (!coro->invoke_av);
3293 coro->invoke_cb = SvREFCNT_inc (cb);
3294 coro->invoke_av = av;
2777 } 3295 }
3296
3297 api_ready (aTHX_ (SV *)hv);
3298
3299 if (GIMME_V != G_VOID)
3300 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3301 else
3302 SvREFCNT_dec (hv);
2778} 3303}
3304
3305SV *
3306rouse_cb ()
3307 PROTOTYPE:
3308 CODE:
3309 RETVAL = coro_new_rouse_cb (aTHX);
3310 OUTPUT:
3311 RETVAL
2779 3312
2780void 3313void
2781_pool_2 (SV *cb) 3314rouse_wait (...)
3315 PROTOTYPE: ;$
2782 CODE: 3316 PPCODE:
2783{ 3317 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2784 HV *hv = (HV *)SvRV (coro_current);
2785 struct coro *coro = SvSTATE_hv ((SV *)hv);
2786
2787 sv_setsv (cb, &PL_sv_undef);
2788
2789 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2790 coro->saved_deffh = 0;
2791
2792 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2793 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2794 {
2795 SV *old = PL_diehook;
2796 PL_diehook = 0;
2797 SvREFCNT_dec (old);
2798 croak ("\3async_pool terminate\2\n");
2799 }
2800
2801 av_clear (GvAV (PL_defgv));
2802 hv_store (hv, "desc", sizeof ("desc") - 1,
2803 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2804
2805 coro->prio = 0;
2806
2807 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2808 api_trace (aTHX_ coro_current, 0);
2809
2810 av_push (av_async_pool, newSVsv (coro_current));
2811}
2812 3318
2813 3319
2814MODULE = Coro::State PACKAGE = PerlIO::cede 3320MODULE = Coro::State PACKAGE = PerlIO::cede
2815 3321
2816BOOT: 3322BOOT:
2821 3327
2822SV * 3328SV *
2823new (SV *klass, SV *count = 0) 3329new (SV *klass, SV *count = 0)
2824 CODE: 3330 CODE:
2825 RETVAL = sv_bless ( 3331 RETVAL = sv_bless (
2826 coro_semaphore_new (count && SvOK (count) ? SvIV (count) : 1), 3332 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),
2827 GvSTASH (CvGV (cv)) 3333 GvSTASH (CvGV (cv))
2828 ); 3334 );
2829 OUTPUT: 3335 OUTPUT:
2830 RETVAL 3336 RETVAL
2831 3337
2832# helper for Coro::Channel 3338# helper for Coro::Channel
2833SV * 3339SV *
2834_alloc (int count) 3340_alloc (int count)
2835 CODE: 3341 CODE:
2836 RETVAL = coro_semaphore_new (count); 3342 RETVAL = coro_waitarray_new (aTHX_ count);
2837 OUTPUT: 3343 OUTPUT:
2838 RETVAL 3344 RETVAL
2839 3345
2840SV * 3346SV *
2841count (SV *self) 3347count (SV *self)
2850 adjust = 1 3356 adjust = 1
2851 CODE: 3357 CODE:
2852 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2853 3359
2854void 3360void
2855down (SV *self) 3361down (...)
2856 ALIAS:
2857 Coro::Signal::wait = 0
2858 CODE: 3362 CODE:
2859 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2860 3364
2861void 3365void
2862wait (SV *self) 3366wait (...)
2863 CODE: 3367 CODE:
2864 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3368 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2865 3369
2866void 3370void
2867try (SV *self) 3371try (SV *self)
2903 3407
2904SV * 3408SV *
2905new (SV *klass) 3409new (SV *klass)
2906 CODE: 3410 CODE:
2907 RETVAL = sv_bless ( 3411 RETVAL = sv_bless (
2908 coro_semaphore_new (0), 3412 coro_waitarray_new (aTHX_ 0),
2909 GvSTASH (CvGV (cv)) 3413 GvSTASH (CvGV (cv))
2910 ); 3414 );
2911 OUTPUT: 3415 OUTPUT:
2912 RETVAL 3416 RETVAL
2913 3417
2914void 3418void
2915broadcast (SV *self, int adjust = 1) 3419wait (...)
2916 CODE: 3420 CODE:
3421 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3422
3423void
3424broadcast (SV *self)
3425 CODE:
3426{
3427 AV *av = (AV *)SvRV (self);
3428 coro_signal_wake (aTHX_ av, AvFILLp (av));
3429}
3430
3431void
3432send (SV *self)
3433 CODE:
2917{ 3434{
2918 AV *av = (AV *)SvRV (self); 3435 AV *av = (AV *)SvRV (self);
2919 SvIVX (AvARRAY (av)[0]) = 0; /* not necessary, but gives me fuzzy warm feelings */ 3436
2920 coro_semaphore_adjust (aTHX_ av, AvFILLp (av) + 1 - 1); 3437 if (AvFILLp (av))
3438 coro_signal_wake (aTHX_ av, 1);
3439 else
2921 SvIVX (AvARRAY (av)[0]) = 0; /* necessary */ 3440 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
2922} 3441}
3442
3443IV
3444awaited (SV *self)
3445 CODE:
3446 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3447 OUTPUT:
3448 RETVAL
2923 3449
2924 3450
2925MODULE = Coro::State PACKAGE = Coro::AnyEvent 3451MODULE = Coro::State PACKAGE = Coro::AnyEvent
2926 3452
2927BOOT: 3453BOOT:
2955 3481
2956void 3482void
2957_register (char *target, char *proto, SV *req) 3483_register (char *target, char *proto, SV *req)
2958 CODE: 3484 CODE:
2959{ 3485{
2960 HV *st; 3486 CV *req_cv = coro_sv_2cv (aTHX_ req);
2961 GV *gvp;
2962 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2963 /* newXSproto doesn't return the CV on 5.8 */ 3487 /* newXSproto doesn't return the CV on 5.8 */
2964 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3488 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2965 sv_setpv ((SV *)slf_cv, proto); 3489 sv_setpv ((SV *)slf_cv, proto);
2966 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3490 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2967} 3491}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines