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.291 by root, Tue Nov 18 05:55:04 2008 UTC vs.
Revision 1.329 by root, Tue Nov 25 20:48:41 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
… …
120#endif 126#endif
121 127
122/* The next macros try to return the current stack pointer, in an as 128/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 129 * portable way as possible. */
124#if __GNUC__ >= 4 130#if __GNUC__ >= 4
131# define dSTACKLEVEL int stacklevel_dummy
125# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0) 132# define STACKLEVEL __builtin_frame_address (0)
126#else 133#else
127# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel)
128#endif 136#endif
129 137
130#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT (PL_main_cv == Nullcv)
131 139
132#if __GNUC__ >= 3 140#if __GNUC__ >= 3
… …
143#define expect_true(expr) expect ((expr) != 0, 1) 151#define expect_true(expr) expect ((expr) != 0, 1)
144 152
145#define NOINLINE attribute ((noinline)) 153#define NOINLINE attribute ((noinline))
146 154
147#include "CoroAPI.h" 155#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */
148 157
149#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
150# if CORO_PTHREAD 159# if CORO_PTHREAD
151static void *coro_thx; 160static void *coro_thx;
152# endif 161# endif
… …
164static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
165static JMPENV *main_top_env; 174static JMPENV *main_top_env;
166static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
167static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
168 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
169static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
170static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
171static SV *rv_diehook; 184static SV *rv_diehook;
172static SV *rv_warnhook; 185static SV *rv_warnhook;
173static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
174 187
175/* async_pool helper stuff */ 188/* async_pool helper stuff */
176static SV *sv_pool_rss; 189static SV *sv_pool_rss;
177static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
178static 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;
179 196
180/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
181static SV *sv_activity; 198static SV *sv_activity;
182 199
183static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
212 int valgrind_id; 229 int valgrind_id;
213#endif 230#endif
214 unsigned char flags; 231 unsigned char flags;
215} coro_cctx; 232} coro_cctx;
216 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
217enum { 238enum {
218 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
219 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
220 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
221 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
… …
226{ 247{
227 SV *defsv; 248 SV *defsv;
228 AV *defav; 249 AV *defav;
229 SV *errsv; 250 SV *errsv;
230 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
231#define VAR(name,type) type name; 253#define VAR(name,type) type name;
232# include "state.h" 254# include "state.h"
233#undef VAR 255#undef VAR
234} perl_slots; 256} perl_slots;
235 257
… …
243 /* state data */ 265 /* state data */
244 struct CoroSLF slf_frame; /* saved slf frame */ 266 struct CoroSLF slf_frame; /* saved slf frame */
245 AV *mainstack; 267 AV *mainstack;
246 perl_slots *slot; /* basically the saved sp */ 268 perl_slots *slot; /* basically the saved sp */
247 269
270 CV *startcv; /* the CV to execute */
248 AV *args; /* data associated with this coroutine (initial args) */ 271 AV *args; /* data associated with this coroutine (initial args) */
249 int refcnt; /* coroutines are refcounted, yes */ 272 int refcnt; /* coroutines are refcounted, yes */
250 int flags; /* CF_ flags */ 273 int flags; /* CF_ flags */
251 HV *hv; /* the perl hash associated with this coro, if any */ 274 HV *hv; /* the perl hash associated with this coro, if any */
252 void (*on_destroy)(pTHX_ struct coro *coro); 275 void (*on_destroy)(pTHX_ struct coro *coro);
253 276
254 /* statistics */ 277 /* statistics */
255 int usecount; /* number of transfers to this coro */ 278 int usecount; /* number of transfers to this coro */
256 279
257 /* coro process data */ 280 /* coro process data */
258 int prio; 281 int prio;
259 SV *throw; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
283 SV *rouse_cb;
260 284
261 /* async_pool */ 285 /* async_pool */
262 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
263 289
264 /* linked list */ 290 /* linked list */
265 struct coro *next, *prev; 291 struct coro *next, *prev;
266}; 292};
267 293
… …
270 296
271/* the following variables are effectively part of the perl context */ 297/* the following variables are effectively part of the perl context */
272/* and get copied between struct coro and these variables */ 298/* and get copied between struct coro and these variables */
273/* the mainr easonw e don't support windows process emulation */ 299/* the mainr easonw e don't support windows process emulation */
274static struct CoroSLF slf_frame; /* the current slf frame */ 300static struct CoroSLF slf_frame; /* the current slf frame */
275static SV *coro_throw;
276 301
277/** Coro ********************************************************************/ 302/** Coro ********************************************************************/
278 303
279#define PRIO_MAX 3 304#define PRIO_MAX 3
280#define PRIO_HIGH 1 305#define PRIO_HIGH 1
… …
285 310
286/* for Coro.pm */ 311/* for Coro.pm */
287static SV *coro_current; 312static SV *coro_current;
288static SV *coro_readyhook; 313static SV *coro_readyhook;
289static 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;
290static struct coro *coro_first; 316static struct coro *coro_first;
291#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
292 318
293/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
294 320
… …
320 get_hv (name, create); 346 get_hv (name, create);
321#endif 347#endif
322 return get_hv (name, create); 348 return get_hv (name, create);
323} 349}
324 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
325static AV * 360static AV *
326coro_clone_padlist (pTHX_ CV *cv) 361coro_derive_padlist (pTHX_ CV *cv)
327{ 362{
328 AV *padlist = CvPADLIST (cv); 363 AV *padlist = CvPADLIST (cv);
329 AV *newpadlist, *newpad; 364 AV *newpadlist, *newpad;
330 365
331 newpadlist = newAV (); 366 newpadlist = newAV ();
… …
446 else 481 else
447 { 482 {
448#if CORO_PREFER_PERL_FUNCTIONS 483#if CORO_PREFER_PERL_FUNCTIONS
449 /* this is probably cleaner? but also slower! */ 484 /* this is probably cleaner? but also slower! */
450 /* in practise, it seems to be less stable */ 485 /* in practise, it seems to be less stable */
451 CV *cp = Perl_cv_clone (cv); 486 CV *cp = Perl_cv_clone (aTHX_ cv);
452 CvPADLIST (cv) = CvPADLIST (cp); 487 CvPADLIST (cv) = CvPADLIST (cp);
453 CvPADLIST (cp) = 0; 488 CvPADLIST (cp) = 0;
454 SvREFCNT_dec (cp); 489 SvREFCNT_dec (cp);
455#else 490#else
456 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 491 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
457#endif 492#endif
458 } 493 }
459} 494}
460 495
461static void 496static void
… …
483 perl_slots *slot = c->slot; 518 perl_slots *slot = c->slot;
484 c->slot = 0; 519 c->slot = 0;
485 520
486 PL_mainstack = c->mainstack; 521 PL_mainstack = c->mainstack;
487 522
488 GvSV (PL_defgv) = slot->defsv; 523 GvSV (PL_defgv) = slot->defsv;
489 GvAV (PL_defgv) = slot->defav; 524 GvAV (PL_defgv) = slot->defav;
490 GvSV (PL_errgv) = slot->errsv; 525 GvSV (PL_errgv) = slot->errsv;
491 GvSV (irsgv) = slot->irsgv; 526 GvSV (irsgv) = slot->irsgv;
527 GvHV (PL_hintgv) = slot->hinthv;
492 528
493 #define VAR(name,type) PL_ ## name = slot->name; 529 #define VAR(name,type) PL_ ## name = slot->name;
494 # include "state.h" 530 # include "state.h"
495 #undef VAR 531 #undef VAR
496 532
… …
509 545
510 PUTBACK; 546 PUTBACK;
511 } 547 }
512 548
513 slf_frame = c->slf_frame; 549 slf_frame = c->slf_frame;
514 coro_throw = c->throw; 550 CORO_THROW = c->except;
515} 551}
516 552
517static void 553static void
518save_perl (pTHX_ Coro__State c) 554save_perl (pTHX_ Coro__State c)
519{ 555{
520 c->throw = coro_throw; 556 c->except = CORO_THROW;
521 c->slf_frame = slf_frame; 557 c->slf_frame = slf_frame;
522 558
523 { 559 {
524 dSP; 560 dSP;
525 I32 cxix = cxstack_ix; 561 I32 cxix = cxstack_ix;
… …
582 c->mainstack = PL_mainstack; 618 c->mainstack = PL_mainstack;
583 619
584 { 620 {
585 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 621 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
586 622
587 slot->defav = GvAV (PL_defgv); 623 slot->defav = GvAV (PL_defgv);
588 slot->defsv = DEFSV; 624 slot->defsv = DEFSV;
589 slot->errsv = ERRSV; 625 slot->errsv = ERRSV;
590 slot->irsgv = GvSV (irsgv); 626 slot->irsgv = GvSV (irsgv);
627 slot->hinthv = GvHV (PL_hintgv);
591 628
592 #define VAR(name,type) slot->name = PL_ ## name; 629 #define VAR(name,type) slot->name = PL_ ## name;
593 # include "state.h" 630 # include "state.h"
594 #undef VAR 631 #undef VAR
595 } 632 }
… …
600 * of perl.c:init_stacks, except that it uses less memory 637 * of perl.c:init_stacks, except that it uses less memory
601 * on the (sometimes correct) assumption that coroutines do 638 * on the (sometimes correct) assumption that coroutines do
602 * not usually need a lot of stackspace. 639 * not usually need a lot of stackspace.
603 */ 640 */
604#if CORO_PREFER_PERL_FUNCTIONS 641#if CORO_PREFER_PERL_FUNCTIONS
605# define coro_init_stacks init_stacks 642# define coro_init_stacks(thx) init_stacks ()
606#else 643#else
607static void 644static void
608coro_init_stacks (pTHX) 645coro_init_stacks (pTHX)
609{ 646{
610 PL_curstackinfo = new_stackinfo(32, 8); 647 PL_curstackinfo = new_stackinfo(32, 8);
… …
673#if !PERL_VERSION_ATLEAST (5,10,0) 710#if !PERL_VERSION_ATLEAST (5,10,0)
674 Safefree (PL_retstack); 711 Safefree (PL_retstack);
675#endif 712#endif
676} 713}
677 714
715#define CORO_RSS \
716 rss += sizeof (SYM (curstackinfo)); \
717 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
718 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
719 rss += SYM (tmps_max) * sizeof (SV *); \
720 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
721 rss += SYM (scopestack_max) * sizeof (I32); \
722 rss += SYM (savestack_max) * sizeof (ANY);
723
678static size_t 724static size_t
679coro_rss (pTHX_ struct coro *coro) 725coro_rss (pTHX_ struct coro *coro)
680{ 726{
681 size_t rss = sizeof (*coro); 727 size_t rss = sizeof (*coro);
682 728
683 if (coro->mainstack) 729 if (coro->mainstack)
684 { 730 {
685 perl_slots tmp_slot;
686 perl_slots *slot;
687
688 if (coro->flags & CF_RUNNING) 731 if (coro->flags & CF_RUNNING)
689 { 732 {
690 slot = &tmp_slot; 733 #define SYM(sym) PL_ ## sym
691 734 CORO_RSS;
692 #define VAR(name,type) slot->name = PL_ ## name;
693 # include "state.h"
694 #undef VAR 735 #undef SYM
695 } 736 }
696 else 737 else
697 slot = coro->slot;
698
699 if (slot)
700 { 738 {
701 rss += sizeof (slot->curstackinfo); 739 #define SYM(sym) coro->slot->sym
702 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 740 CORO_RSS;
703 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 741 #undef SYM
704 rss += slot->tmps_max * sizeof (SV *);
705 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
706 rss += slot->scopestack_max * sizeof (I32);
707 rss += slot->savestack_max * sizeof (ANY);
708
709#if !PERL_VERSION_ATLEAST (5,10,0)
710 rss += slot->retstack_max * sizeof (OP *);
711#endif
712 } 742 }
713 } 743 }
714 744
715 return rss; 745 return rss;
716} 746}
… …
818slf_check_nop (pTHX_ struct CoroSLF *frame) 848slf_check_nop (pTHX_ struct CoroSLF *frame)
819{ 849{
820 return 0; 850 return 0;
821} 851}
822 852
853static int
854slf_check_repeat (pTHX_ struct CoroSLF *frame)
855{
856 return 1;
857}
858
823static UNOP coro_setup_op; 859static UNOP coro_setup_op;
824 860
825static void NOINLINE /* noinline to keep it out of the transfer fast path */ 861static void NOINLINE /* noinline to keep it out of the transfer fast path */
826coro_setup (pTHX_ struct coro *coro) 862coro_setup (pTHX_ struct coro *coro)
827{ 863{
… …
832 868
833 PL_runops = RUNOPS_DEFAULT; 869 PL_runops = RUNOPS_DEFAULT;
834 PL_curcop = &PL_compiling; 870 PL_curcop = &PL_compiling;
835 PL_in_eval = EVAL_NULL; 871 PL_in_eval = EVAL_NULL;
836 PL_comppad = 0; 872 PL_comppad = 0;
873 PL_comppad_name = 0;
874 PL_comppad_name_fill = 0;
875 PL_comppad_name_floor = 0;
837 PL_curpm = 0; 876 PL_curpm = 0;
838 PL_curpad = 0; 877 PL_curpad = 0;
839 PL_localizing = 0; 878 PL_localizing = 0;
840 PL_dirty = 0; 879 PL_dirty = 0;
841 PL_restartop = 0; 880 PL_restartop = 0;
842#if PERL_VERSION_ATLEAST (5,10,0) 881#if PERL_VERSION_ATLEAST (5,10,0)
843 PL_parser = 0; 882 PL_parser = 0;
844#endif 883#endif
884 PL_hints = 0;
845 885
846 /* recreate the die/warn hooks */ 886 /* recreate the die/warn hooks */
847 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 887 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
848 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 888 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
849 889
850 GvSV (PL_defgv) = newSV (0); 890 GvSV (PL_defgv) = newSV (0);
851 GvAV (PL_defgv) = coro->args; coro->args = 0; 891 GvAV (PL_defgv) = coro->args; coro->args = 0;
852 GvSV (PL_errgv) = newSV (0); 892 GvSV (PL_errgv) = newSV (0);
853 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 893 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
894 GvHV (PL_hintgv) = 0;
854 PL_rs = newSVsv (GvSV (irsgv)); 895 PL_rs = newSVsv (GvSV (irsgv));
855 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 896 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
856 897
857 { 898 {
858 dSP; 899 dSP;
859 UNOP myop; 900 UNOP myop;
860 901
861 Zero (&myop, 1, UNOP); 902 Zero (&myop, 1, UNOP);
862 myop.op_next = Nullop; 903 myop.op_next = Nullop;
904 myop.op_type = OP_ENTERSUB;
863 myop.op_flags = OPf_WANT_VOID; 905 myop.op_flags = OPf_WANT_VOID;
864 906
865 PUSHMARK (SP); 907 PUSHMARK (SP);
866 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 908 PUSHs ((SV *)coro->startcv);
867 PUTBACK; 909 PUTBACK;
868 PL_op = (OP *)&myop; 910 PL_op = (OP *)&myop;
869 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 911 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
870 SPAGAIN;
871 } 912 }
872 913
873 /* this newly created coroutine might be run on an existing cctx which most 914 /* this newly created coroutine might be run on an existing cctx which most
874 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 915 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
875 */ 916 */
876 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 917 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
877 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 918 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
878 919
879 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 920 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
921 coro_setup_op.op_next = PL_op;
880 coro_setup_op.op_type = OP_CUSTOM; 922 coro_setup_op.op_type = OP_ENTERSUB;
881 coro_setup_op.op_ppaddr = pp_slf; 923 coro_setup_op.op_ppaddr = pp_slf;
882 coro_setup_op.op_next = PL_op; 924 /* no flags etc. required, as an init function won't be called */
883 925
884 PL_op = (OP *)&coro_setup_op; 926 PL_op = (OP *)&coro_setup_op;
885 927
886 /* copy throw, in case it was set before coro_setup */ 928 /* copy throw, in case it was set before coro_setup */
887 coro_throw = coro->throw; 929 CORO_THROW = coro->except;
888} 930}
889 931
890static void 932static void
891coro_destruct (pTHX_ struct coro *coro) 933coro_destruct (pTHX_ struct coro *coro)
892{ 934{
… …
911 SvREFCNT_dec (GvAV (PL_defgv)); 953 SvREFCNT_dec (GvAV (PL_defgv));
912 SvREFCNT_dec (GvSV (PL_errgv)); 954 SvREFCNT_dec (GvSV (PL_errgv));
913 SvREFCNT_dec (PL_defoutgv); 955 SvREFCNT_dec (PL_defoutgv);
914 SvREFCNT_dec (PL_rs); 956 SvREFCNT_dec (PL_rs);
915 SvREFCNT_dec (GvSV (irsgv)); 957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
916 959
917 SvREFCNT_dec (PL_diehook); 960 SvREFCNT_dec (PL_diehook);
918 SvREFCNT_dec (PL_warnhook); 961 SvREFCNT_dec (PL_warnhook);
919 962
920 SvREFCNT_dec (coro->saved_deffh); 963 SvREFCNT_dec (coro->saved_deffh);
921 SvREFCNT_dec (coro_throw); 964 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av);
922 967
923 coro_destruct_stacks (aTHX); 968 coro_destruct_stacks (aTHX);
924} 969}
925 970
926INLINE void 971INLINE void
… …
936static int 981static int
937runops_trace (pTHX) 982runops_trace (pTHX)
938{ 983{
939 COP *oldcop = 0; 984 COP *oldcop = 0;
940 int oldcxix = -2; 985 int oldcxix = -2;
941 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
942 coro_cctx *cctx = coro->cctx;
943 986
944 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 987 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
945 { 988 {
946 PERL_ASYNC_CHECK (); 989 PERL_ASYNC_CHECK ();
947 990
948 if (cctx->flags & CC_TRACE_ALL) 991 if (cctx_current->flags & CC_TRACE_ALL)
949 { 992 {
950 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 993 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
951 { 994 {
952 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 995 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
953 SV **bot, **top; 996 SV **bot, **top;
954 AV *av = newAV (); /* return values */ 997 AV *av = newAV (); /* return values */
955 SV **cb; 998 SV **cb;
… …
992 1035
993 if (PL_curcop != &PL_compiling) 1036 if (PL_curcop != &PL_compiling)
994 { 1037 {
995 SV **cb; 1038 SV **cb;
996 1039
997 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1040 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
998 { 1041 {
999 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1042 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1000 1043
1001 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1044 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1002 { 1045 {
1003 runops_proc_t old_runops = PL_runops;
1004 dSP; 1046 dSP;
1005 GV *gv = CvGV (cx->blk_sub.cv); 1047 GV *gv = CvGV (cx->blk_sub.cv);
1006 SV *fullname = sv_2mortal (newSV (0)); 1048 SV *fullname = sv_2mortal (newSV (0));
1007 1049
1008 if (isGV (gv)) 1050 if (isGV (gv))
… …
1013 SAVETMPS; 1055 SAVETMPS;
1014 EXTEND (SP, 3); 1056 EXTEND (SP, 3);
1015 PUSHMARK (SP); 1057 PUSHMARK (SP);
1016 PUSHs (&PL_sv_yes); 1058 PUSHs (&PL_sv_yes);
1017 PUSHs (fullname); 1059 PUSHs (fullname);
1018 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1060 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1019 PUTBACK; 1061 PUTBACK;
1020 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1062 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1021 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1063 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1022 SPAGAIN; 1064 SPAGAIN;
1023 FREETMPS; 1065 FREETMPS;
… …
1026 } 1068 }
1027 1069
1028 oldcxix = cxstack_ix; 1070 oldcxix = cxstack_ix;
1029 } 1071 }
1030 1072
1031 if (cctx->flags & CC_TRACE_LINE) 1073 if (cctx_current->flags & CC_TRACE_LINE)
1032 { 1074 {
1033 dSP; 1075 dSP;
1034 1076
1035 PL_runops = RUNOPS_DEFAULT; 1077 PL_runops = RUNOPS_DEFAULT;
1036 ENTER; 1078 ENTER;
… …
1055 1097
1056 TAINT_NOT; 1098 TAINT_NOT;
1057 return 0; 1099 return 0;
1058} 1100}
1059 1101
1060static struct coro_cctx *cctx_ssl_cctx;
1061static struct CoroSLF cctx_ssl_frame; 1102static struct CoroSLF cctx_ssl_frame;
1062 1103
1063static void 1104static void
1064slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1105slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1065{ 1106{
1066 ta->prev = (struct coro *)cctx_ssl_cctx;
1067 ta->next = 0; 1107 ta->prev = 0;
1068} 1108}
1069 1109
1070static int 1110static int
1071slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1111slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1072{ 1112{
1073 *frame = cctx_ssl_frame; 1113 *frame = cctx_ssl_frame;
1074 1114
1075 return 1; 1115 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1076} 1116}
1077 1117
1078/* initialises PL_top_env and injects a pseudo-slf-call to sett he stacklevel */ 1118/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1079static void NOINLINE 1119static void NOINLINE
1080cctx_prepare (pTHX_ coro_cctx *cctx) 1120cctx_prepare (pTHX)
1081{ 1121{
1082 PL_top_env = &PL_start_env; 1122 PL_top_env = &PL_start_env;
1083 1123
1084 if (cctx->flags & CC_TRACE) 1124 if (cctx_current->flags & CC_TRACE)
1085 PL_runops = runops_trace; 1125 PL_runops = runops_trace;
1086 1126
1087 /* we already must be in an SLF call, there is no other valid way 1127 /* we already must be executing an SLF op, there is no other valid way
1088 * that can lead to creation of a new cctx */ 1128 * that can lead to creation of a new cctx */
1089 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1129 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1090 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1130 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1091 1131
1092 cctx_ssl_cctx = cctx; 1132 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1093 cctx_ssl_frame = slf_frame; 1133 cctx_ssl_frame = slf_frame;
1094 1134
1095 slf_frame.prepare = slf_prepare_set_stacklevel; 1135 slf_frame.prepare = slf_prepare_set_stacklevel;
1096 slf_frame.check = slf_check_set_stacklevel; 1136 slf_frame.check = slf_check_set_stacklevel;
1097} 1137}
… …
1120 /* normally we would need to skip the entersub here */ 1160 /* normally we would need to skip the entersub here */
1121 /* not doing so will re-execute it, which is exactly what we want */ 1161 /* not doing so will re-execute it, which is exactly what we want */
1122 /* PL_nop = PL_nop->op_next */ 1162 /* PL_nop = PL_nop->op_next */
1123 1163
1124 /* inject a fake subroutine call to cctx_init */ 1164 /* inject a fake subroutine call to cctx_init */
1125 cctx_prepare (aTHX_ (coro_cctx *)arg); 1165 cctx_prepare (aTHX);
1126 1166
1127 /* cctx_run is the alternative tail of transfer() */ 1167 /* cctx_run is the alternative tail of transfer() */
1128 transfer_tail (aTHX); 1168 transfer_tail (aTHX);
1129 1169
1130 /* somebody or something will hit me for both perl_run and PL_restartop */ 1170 /* somebody or something will hit me for both perl_run and PL_restartop */
1131 PL_restartop = PL_op; 1171 PL_restartop = PL_op;
1132 perl_run (PL_curinterp); 1172 perl_run (PL_curinterp);
1173 /*
1174 * Unfortunately, there is no way to get at the return values of the
1175 * coro body here, as perl_run destroys these
1176 */
1133 1177
1134 /* 1178 /*
1135 * If perl-run returns we assume exit() was being called or the coro 1179 * If perl-run returns we assume exit() was being called or the coro
1136 * fell off the end, which seems to be the only valid (non-bug) 1180 * fell off the end, which seems to be the only valid (non-bug)
1137 * reason for perl_run to return. We try to exit by jumping to the 1181 * reason for perl_run to return. We try to exit by jumping to the
1138 * bootstrap-time "top" top_env, as we cannot restore the "main" 1182 * bootstrap-time "top" top_env, as we cannot restore the "main"
1139 * coroutine as Coro has no such concept 1183 * coroutine as Coro has no such concept.
1184 * This actually isn't valid with the pthread backend, but OSes requiring
1185 * that backend are too broken to do it in a standards-compliant way.
1140 */ 1186 */
1141 PL_top_env = main_top_env; 1187 PL_top_env = main_top_env;
1142 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1188 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1143 } 1189 }
1144} 1190}
… …
1221cctx_destroy (coro_cctx *cctx) 1267cctx_destroy (coro_cctx *cctx)
1222{ 1268{
1223 if (!cctx) 1269 if (!cctx)
1224 return; 1270 return;
1225 1271
1272 assert (cctx != cctx_current);//D temporary
1273
1226 --cctx_count; 1274 --cctx_count;
1227 coro_destroy (&cctx->cctx); 1275 coro_destroy (&cctx->cctx);
1228 1276
1229 /* coro_transfer creates new, empty cctx's */ 1277 /* coro_transfer creates new, empty cctx's */
1230 if (cctx->sptr) 1278 if (cctx->sptr)
… …
1293 /* TODO: throwing up here is considered harmful */ 1341 /* TODO: throwing up here is considered harmful */
1294 1342
1295 if (expect_true (prev != next)) 1343 if (expect_true (prev != next))
1296 { 1344 {
1297 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1345 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1298 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1346 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1299 1347
1300 if (expect_false (next->flags & CF_RUNNING)) 1348 if (expect_false (next->flags & CF_RUNNING))
1301 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1349 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1302 1350
1303 if (expect_false (next->flags & CF_DESTROYED)) 1351 if (expect_false (next->flags & CF_DESTROYED))
… …
1315transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1363transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1316{ 1364{
1317 dSTACKLEVEL; 1365 dSTACKLEVEL;
1318 1366
1319 /* sometimes transfer is only called to set idle_sp */ 1367 /* sometimes transfer is only called to set idle_sp */
1320 if (expect_false (!next)) 1368 if (expect_false (!prev))
1321 { 1369 {
1322 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1370 cctx_current->idle_sp = STACKLEVEL;
1323 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1371 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1324 } 1372 }
1325 else if (expect_true (prev != next)) 1373 else if (expect_true (prev != next))
1326 { 1374 {
1327 coro_cctx *prev__cctx; 1375 coro_cctx *cctx_prev;
1328 1376
1329 if (expect_false (prev->flags & CF_NEW)) 1377 if (expect_false (prev->flags & CF_NEW))
1330 { 1378 {
1331 /* create a new empty/source context */ 1379 /* create a new empty/source context */
1332 prev->cctx = cctx_new_empty ();
1333 prev->flags &= ~CF_NEW; 1380 prev->flags &= ~CF_NEW;
1334 prev->flags |= CF_RUNNING; 1381 prev->flags |= CF_RUNNING;
1335 } 1382 }
1336 1383
1337 prev->flags &= ~CF_RUNNING; 1384 prev->flags &= ~CF_RUNNING;
… …
1348 coro_setup (aTHX_ next); 1395 coro_setup (aTHX_ next);
1349 } 1396 }
1350 else 1397 else
1351 load_perl (aTHX_ next); 1398 load_perl (aTHX_ next);
1352 1399
1353 prev__cctx = prev->cctx; 1400 assert (!prev->cctx);//D temporary
1354 1401
1355 /* possibly untie and reuse the cctx */ 1402 /* possibly untie and reuse the cctx */
1356 if (expect_true ( 1403 if (expect_true (
1357 prev__cctx->idle_sp == (void *)stacklevel 1404 cctx_current->idle_sp == STACKLEVEL
1358 && !(prev__cctx->flags & CC_TRACE) 1405 && !(cctx_current->flags & CC_TRACE)
1359 && !force_cctx 1406 && !force_cctx
1360 )) 1407 ))
1361 { 1408 {
1362 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1409 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1363 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1410 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1364 1411
1365 prev->cctx = 0;
1366
1367 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1412 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1368 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1413 /* without this the next cctx_get might destroy the running cctx while still in use */
1369 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1414 if (expect_false (CCTX_EXPIRED (cctx_current)))
1370 if (!next->cctx) 1415 if (expect_true (!next->cctx))
1371 next->cctx = cctx_get (aTHX); 1416 next->cctx = cctx_get (aTHX);
1372 1417
1373 cctx_put (prev__cctx); 1418 cctx_put (cctx_current);
1374 } 1419 }
1420 else
1421 prev->cctx = cctx_current;
1375 1422
1376 ++next->usecount; 1423 ++next->usecount;
1377 1424
1378 if (expect_true (!next->cctx)) 1425 cctx_prev = cctx_current;
1379 next->cctx = cctx_get (aTHX); 1426 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1380 1427
1381 if (expect_false (prev__cctx != next->cctx)) 1428 next->cctx = 0;
1429
1430 if (expect_false (cctx_prev != cctx_current))
1382 { 1431 {
1383 prev__cctx->top_env = PL_top_env; 1432 cctx_prev->top_env = PL_top_env;
1384 PL_top_env = next->cctx->top_env; 1433 PL_top_env = cctx_current->top_env;
1385 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1434 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1386 } 1435 }
1387 1436
1388 transfer_tail (aTHX); 1437 transfer_tail (aTHX);
1389 } 1438 }
1390} 1439}
… …
1429 1478
1430 coro->slot = 0; 1479 coro->slot = 0;
1431 } 1480 }
1432 1481
1433 cctx_destroy (coro->cctx); 1482 cctx_destroy (coro->cctx);
1483 SvREFCNT_dec (coro->startcv);
1434 SvREFCNT_dec (coro->args); 1484 SvREFCNT_dec (coro->args);
1485 SvREFCNT_dec (CORO_THROW);
1435 1486
1436 if (coro->next) coro->next->prev = coro->prev; 1487 if (coro->next) coro->next->prev = coro->prev;
1437 if (coro->prev) coro->prev->next = coro->next; 1488 if (coro->prev) coro->prev->next = coro->next;
1438 if (coro == coro_first) coro_first = coro->next; 1489 if (coro == coro_first) coro_first = coro->next;
1439 1490
… …
1493 1544
1494 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1545 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1495 TRANSFER (ta, 1); 1546 TRANSFER (ta, 1);
1496} 1547}
1497 1548
1549/*****************************************************************************/
1550/* gensub: simple closure generation utility */
1551
1552#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1553
1554/* create a closure from XS, returns a code reference */
1555/* the arg can be accessed via GENSUB_ARG from the callback */
1556/* the callback must use dXSARGS/XSRETURN */
1557static SV *
1558gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1559{
1560 CV *cv = (CV *)newSV (0);
1561
1562 sv_upgrade ((SV *)cv, SVt_PVCV);
1563
1564 CvANON_on (cv);
1565 CvISXSUB_on (cv);
1566 CvXSUB (cv) = xsub;
1567 GENSUB_ARG = arg;
1568
1569 return newRV_noinc ((SV *)cv);
1570}
1571
1498/** Coro ********************************************************************/ 1572/** Coro ********************************************************************/
1499 1573
1500INLINE void 1574INLINE void
1501coro_enq (pTHX_ struct coro *coro) 1575coro_enq (pTHX_ struct coro *coro)
1502{ 1576{
… …
1520{ 1594{
1521 struct coro *coro; 1595 struct coro *coro;
1522 SV *sv_hook; 1596 SV *sv_hook;
1523 void (*xs_hook)(void); 1597 void (*xs_hook)(void);
1524 1598
1525 if (SvROK (coro_sv))
1526 coro_sv = SvRV (coro_sv);
1527
1528 coro = SvSTATE (coro_sv); 1599 coro = SvSTATE (coro_sv);
1529 1600
1530 if (coro->flags & CF_READY) 1601 if (coro->flags & CF_READY)
1531 return 0; 1602 return 0;
1532 1603
… …
1563api_is_ready (pTHX_ SV *coro_sv) 1634api_is_ready (pTHX_ SV *coro_sv)
1564{ 1635{
1565 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1636 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1566} 1637}
1567 1638
1639/* expects to own a reference to next->hv */
1568INLINE void 1640INLINE void
1569prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1641prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1570{ 1642{
1571 SV *prev_sv, *next_sv;
1572
1573 for (;;)
1574 {
1575 next_sv = coro_deq (aTHX);
1576
1577 /* nothing to schedule: call the idle handler */
1578 if (expect_false (!next_sv))
1579 {
1580 dSP;
1581
1582 ENTER;
1583 SAVETMPS;
1584
1585 PUSHMARK (SP);
1586 PUTBACK;
1587 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1588
1589 FREETMPS;
1590 LEAVE;
1591 continue;
1592 }
1593
1594 ta->next = SvSTATE_hv (next_sv);
1595
1596 /* cannot transfer to destroyed coros, skip and look for next */
1597 if (expect_false (ta->next->flags & CF_DESTROYED))
1598 {
1599 SvREFCNT_dec (next_sv);
1600 /* coro_nready has already been taken care of by destroy */
1601 continue;
1602 }
1603
1604 --coro_nready;
1605 break;
1606 }
1607
1608 /* free this only after the transfer */
1609 prev_sv = SvRV (coro_current); 1643 SV *prev_sv = SvRV (coro_current);
1644
1610 ta->prev = SvSTATE_hv (prev_sv); 1645 ta->prev = SvSTATE_hv (prev_sv);
1646 ta->next = next;
1647
1611 TRANSFER_CHECK (*ta); 1648 TRANSFER_CHECK (*ta);
1612 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1649
1613 ta->next->flags &= ~CF_READY;
1614 SvRV_set (coro_current, next_sv); 1650 SvRV_set (coro_current, (SV *)next->hv);
1615 1651
1616 free_coro_mortal (aTHX); 1652 free_coro_mortal (aTHX);
1617 coro_mortal = prev_sv; 1653 coro_mortal = prev_sv;
1618} 1654}
1619 1655
1656static void
1657prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1658{
1659 for (;;)
1660 {
1661 SV *next_sv = coro_deq (aTHX);
1662
1663 if (expect_true (next_sv))
1664 {
1665 struct coro *next = SvSTATE_hv (next_sv);
1666
1667 /* cannot transfer to destroyed coros, skip and look for next */
1668 if (expect_false (next->flags & CF_DESTROYED))
1669 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1670 else
1671 {
1672 next->flags &= ~CF_READY;
1673 --coro_nready;
1674
1675 prepare_schedule_to (aTHX_ ta, next);
1676 break;
1677 }
1678 }
1679 else
1680 {
1681 /* nothing to schedule: call the idle handler */
1682 if (SvROK (sv_idle)
1683 && SvOBJECT (SvRV (sv_idle)))
1684 {
1685 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1686 api_ready (aTHX_ SvRV (sv_idle));
1687 --coro_nready;
1688 }
1689 else
1690 {
1691 dSP;
1692
1693 ENTER;
1694 SAVETMPS;
1695
1696 PUSHMARK (SP);
1697 PUTBACK;
1698 call_sv (sv_idle, G_VOID | G_DISCARD);
1699
1700 FREETMPS;
1701 LEAVE;
1702 }
1703 }
1704 }
1705}
1706
1620INLINE void 1707INLINE void
1621prepare_cede (pTHX_ struct coro_transfer_args *ta) 1708prepare_cede (pTHX_ struct coro_transfer_args *ta)
1622{ 1709{
1623 api_ready (aTHX_ coro_current); 1710 api_ready (aTHX_ coro_current);
1624 prepare_schedule (aTHX_ ta); 1711 prepare_schedule (aTHX_ ta);
… …
1643{ 1730{
1644 struct coro_transfer_args ta; 1731 struct coro_transfer_args ta;
1645 1732
1646 prepare_schedule (aTHX_ &ta); 1733 prepare_schedule (aTHX_ &ta);
1647 TRANSFER (ta, 1); 1734 TRANSFER (ta, 1);
1735}
1736
1737static void
1738api_schedule_to (pTHX_ SV *coro_sv)
1739{
1740 struct coro_transfer_args ta;
1741 struct coro *next = SvSTATE (coro_sv);
1742
1743 SvREFCNT_inc_NN (coro_sv);
1744 prepare_schedule_to (aTHX_ &ta, next);
1648} 1745}
1649 1746
1650static int 1747static int
1651api_cede (pTHX) 1748api_cede (pTHX)
1652{ 1749{
… …
1681static void 1778static void
1682api_trace (pTHX_ SV *coro_sv, int flags) 1779api_trace (pTHX_ SV *coro_sv, int flags)
1683{ 1780{
1684 struct coro *coro = SvSTATE (coro_sv); 1781 struct coro *coro = SvSTATE (coro_sv);
1685 1782
1783 if (coro->flags & CF_RUNNING)
1784 croak ("cannot enable tracing on a running coroutine, caught");
1785
1686 if (flags & CC_TRACE) 1786 if (flags & CC_TRACE)
1687 { 1787 {
1688 if (!coro->cctx) 1788 if (!coro->cctx)
1689 coro->cctx = cctx_new_run (); 1789 coro->cctx = cctx_new_run ();
1690 else if (!(coro->cctx->flags & CC_TRACE)) 1790 else if (!(coro->cctx->flags & CC_TRACE))
1691 croak ("cannot enable tracing on coroutine with custom stack,"); 1791 croak ("cannot enable tracing on coroutine with custom stack, caught");
1692 1792
1693 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1793 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1694 } 1794 }
1695 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1795 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1696 { 1796 {
… …
1699 if (coro->flags & CF_RUNNING) 1799 if (coro->flags & CF_RUNNING)
1700 PL_runops = RUNOPS_DEFAULT; 1800 PL_runops = RUNOPS_DEFAULT;
1701 else 1801 else
1702 coro->slot->runops = RUNOPS_DEFAULT; 1802 coro->slot->runops = RUNOPS_DEFAULT;
1703 } 1803 }
1804}
1805
1806static void
1807coro_call_on_destroy (pTHX_ struct coro *coro)
1808{
1809 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1810 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1811
1812 if (on_destroyp)
1813 {
1814 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1815
1816 while (AvFILLp (on_destroy) >= 0)
1817 {
1818 dSP; /* don't disturb outer sp */
1819 SV *cb = av_pop (on_destroy);
1820
1821 PUSHMARK (SP);
1822
1823 if (statusp)
1824 {
1825 int i;
1826 AV *status = (AV *)SvRV (*statusp);
1827 EXTEND (SP, AvFILLp (status) + 1);
1828
1829 for (i = 0; i <= AvFILLp (status); ++i)
1830 PUSHs (AvARRAY (status)[i]);
1831 }
1832
1833 PUTBACK;
1834 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1835 }
1836 }
1837}
1838
1839static void
1840slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1841{
1842 int i;
1843 HV *hv = (HV *)SvRV (coro_current);
1844 AV *av = newAV ();
1845
1846 av_extend (av, items - 1);
1847 for (i = 0; i < items; ++i)
1848 av_push (av, SvREFCNT_inc_NN (arg [i]));
1849
1850 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1851
1852 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1853 api_ready (aTHX_ sv_manager);
1854
1855 frame->prepare = prepare_schedule;
1856 frame->check = slf_check_repeat;
1857}
1858
1859/*****************************************************************************/
1860/* async pool handler */
1861
1862static int
1863slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1864{
1865 HV *hv = (HV *)SvRV (coro_current);
1866 struct coro *coro = (struct coro *)frame->data;
1867
1868 if (!coro->invoke_cb)
1869 return 1; /* loop till we have invoke */
1870 else
1871 {
1872 hv_store (hv, "desc", sizeof ("desc") - 1,
1873 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1874
1875 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1876
1877 {
1878 dSP;
1879 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1880 PUTBACK;
1881 }
1882
1883 SvREFCNT_dec (GvAV (PL_defgv));
1884 GvAV (PL_defgv) = coro->invoke_av;
1885 coro->invoke_av = 0;
1886
1887 return 0;
1888 }
1889}
1890
1891static void
1892slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1893{
1894 HV *hv = (HV *)SvRV (coro_current);
1895 struct coro *coro = SvSTATE_hv ((SV *)hv);
1896
1897 if (expect_true (coro->saved_deffh))
1898 {
1899 /* subsequent iteration */
1900 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1901 coro->saved_deffh = 0;
1902
1903 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1904 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1905 {
1906 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1907 coro->invoke_av = newAV ();
1908
1909 frame->prepare = prepare_nop;
1910 }
1911 else
1912 {
1913 av_clear (GvAV (PL_defgv));
1914 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1915
1916 coro->prio = 0;
1917
1918 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1919 api_trace (aTHX_ coro_current, 0);
1920
1921 frame->prepare = prepare_schedule;
1922 av_push (av_async_pool, SvREFCNT_inc (hv));
1923 }
1924 }
1925 else
1926 {
1927 /* first iteration, simply fall through */
1928 frame->prepare = prepare_nop;
1929 }
1930
1931 frame->check = slf_check_pool_handler;
1932 frame->data = (void *)coro;
1933}
1934
1935/*****************************************************************************/
1936/* rouse callback */
1937
1938#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1939
1940static void
1941coro_rouse_callback (pTHX_ CV *cv)
1942{
1943 dXSARGS;
1944 SV *data = (SV *)GENSUB_ARG;
1945
1946 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1947 {
1948 /* first call, set args */
1949 AV *av = newAV ();
1950 SV *coro = SvRV (data);
1951
1952 SvRV_set (data, (SV *)av);
1953 api_ready (aTHX_ coro);
1954 SvREFCNT_dec (coro);
1955
1956 /* better take a full copy of the arguments */
1957 while (items--)
1958 av_store (av, items, newSVsv (ST (items)));
1959 }
1960
1961 XSRETURN_EMPTY;
1962}
1963
1964static int
1965slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1966{
1967 SV *data = (SV *)frame->data;
1968
1969 if (CORO_THROW)
1970 return 0;
1971
1972 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1973 return 1;
1974
1975 /* now push all results on the stack */
1976 {
1977 dSP;
1978 AV *av = (AV *)SvRV (data);
1979 int i;
1980
1981 EXTEND (SP, AvFILLp (av) + 1);
1982 for (i = 0; i <= AvFILLp (av); ++i)
1983 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1984
1985 /* we have stolen the elements, so ste length to zero and free */
1986 AvFILLp (av) = -1;
1987 av_undef (av);
1988
1989 PUTBACK;
1990 }
1991
1992 return 0;
1993}
1994
1995static void
1996slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1997{
1998 SV *cb;
1999
2000 if (items)
2001 cb = arg [0];
2002 else
2003 {
2004 struct coro *coro = SvSTATE_current;
2005
2006 if (!coro->rouse_cb)
2007 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2008
2009 cb = sv_2mortal (coro->rouse_cb);
2010 coro->rouse_cb = 0;
2011 }
2012
2013 if (!SvROK (cb)
2014 || SvTYPE (SvRV (cb)) != SVt_PVCV
2015 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2016 croak ("Coro::rouse_wait called with illegal callback argument,");
2017
2018 {
2019 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2020 SV *data = (SV *)GENSUB_ARG;
2021
2022 frame->data = (void *)data;
2023 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2024 frame->check = slf_check_rouse_wait;
2025 }
2026}
2027
2028static SV *
2029coro_new_rouse_cb (pTHX)
2030{
2031 HV *hv = (HV *)SvRV (coro_current);
2032 struct coro *coro = SvSTATE_hv (hv);
2033 SV *data = newRV_inc ((SV *)hv);
2034 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2035
2036 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2037 SvREFCNT_dec (data); /* magicext increases the refcount */
2038
2039 SvREFCNT_dec (coro->rouse_cb);
2040 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2041
2042 return cb;
1704} 2043}
1705 2044
1706/*****************************************************************************/ 2045/*****************************************************************************/
1707/* schedule-like-function opcode (SLF) */ 2046/* schedule-like-function opcode (SLF) */
1708 2047
… …
1755static void 2094static void
1756slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2095slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1757{ 2096{
1758 frame->prepare = prepare_schedule; 2097 frame->prepare = prepare_schedule;
1759 frame->check = slf_check_nop; 2098 frame->check = slf_check_nop;
2099}
2100
2101static void
2102slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2103{
2104 struct coro *next = (struct coro *)slf_frame.data;
2105
2106 SvREFCNT_inc_NN (next->hv);
2107 prepare_schedule_to (aTHX_ ta, next);
2108}
2109
2110static void
2111slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2112{
2113 if (!items)
2114 croak ("Coro::schedule_to expects a coroutine argument, caught");
2115
2116 frame->data = (void *)SvSTATE (arg [0]);
2117 frame->prepare = slf_prepare_schedule_to;
2118 frame->check = slf_check_nop;
2119}
2120
2121static void
2122slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2123{
2124 api_ready (aTHX_ SvRV (coro_current));
2125
2126 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1760} 2127}
1761 2128
1762static void 2129static void
1763slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2130slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1764{ 2131{
… …
1835 } 2202 }
1836 while (slf_frame.check (aTHX_ &slf_frame)); 2203 while (slf_frame.check (aTHX_ &slf_frame));
1837 2204
1838 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2205 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1839 2206
2207 /* exception handling */
2208 if (expect_false (CORO_THROW))
2209 {
2210 SV *exception = sv_2mortal (CORO_THROW);
2211
2212 CORO_THROW = 0;
2213 sv_setsv (ERRSV, exception);
2214 croak (0);
2215 }
2216
1840 /* return value handling - mostly like entersub */ 2217 /* return value handling - mostly like entersub */
1841 /* make sure we put something on the stack in scalar context */ 2218 /* make sure we put something on the stack in scalar context */
1842 if (GIMME_V == G_SCALAR) 2219 if (GIMME_V == G_SCALAR)
1843 { 2220 {
1844 dSP; 2221 dSP;
… …
1850 bot [1] = *sp; 2227 bot [1] = *sp;
1851 2228
1852 SP = bot + 1; 2229 SP = bot + 1;
1853 2230
1854 PUTBACK; 2231 PUTBACK;
1855 }
1856
1857 /* exception handling */
1858 if (expect_false (coro_throw))
1859 {
1860 SV *exception = sv_2mortal (coro_throw);
1861
1862 coro_throw = 0;
1863 sv_setsv (ERRSV, exception);
1864 croak (0);
1865 } 2232 }
1866 2233
1867 return NORMAL; 2234 return NORMAL;
1868} 2235}
1869 2236
… …
1910 } 2277 }
1911 else 2278 else
1912 slf_argc = 0; 2279 slf_argc = 0;
1913 2280
1914 PL_op->op_ppaddr = pp_slf; 2281 PL_op->op_ppaddr = pp_slf;
1915 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2282 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1916 2283
1917 PL_op = (OP *)&slf_restore; 2284 PL_op = (OP *)&slf_restore;
1918} 2285}
1919 2286
1920/*****************************************************************************/ 2287/*****************************************************************************/
… …
1991 PerlIOBuf_get_cnt, 2358 PerlIOBuf_get_cnt,
1992 PerlIOBuf_set_ptrcnt, 2359 PerlIOBuf_set_ptrcnt,
1993}; 2360};
1994 2361
1995/*****************************************************************************/ 2362/*****************************************************************************/
2363/* Coro::Semaphore & Coro::Signal */
2364
2365static SV *
2366coro_waitarray_new (pTHX_ int count)
2367{
2368 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2369 AV *av = newAV ();
2370 SV **ary;
2371
2372 /* unfortunately, building manually saves memory */
2373 Newx (ary, 2, SV *);
2374 AvALLOC (av) = ary;
2375#if PERL_VERSION_ATLEAST (5,10,0)
2376 AvARRAY (av) = ary;
2377#else
2378 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2379 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2380 SvPVX ((SV *)av) = (char *)ary;
2381#endif
2382 AvMAX (av) = 1;
2383 AvFILLp (av) = 0;
2384 ary [0] = newSViv (count);
2385
2386 return newRV_noinc ((SV *)av);
2387}
2388
1996/* Coro::Semaphore */ 2389/* semaphore */
1997 2390
1998static void 2391static void
1999coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2392coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2000{ 2393{
2001 SV *count_sv = AvARRAY (av)[0]; 2394 SV *count_sv = AvARRAY (av)[0];
… …
2013 AvARRAY (av)[0] = AvARRAY (av)[1]; 2406 AvARRAY (av)[0] = AvARRAY (av)[1];
2014 AvARRAY (av)[1] = count_sv; 2407 AvARRAY (av)[1] = count_sv;
2015 cb = av_shift (av); 2408 cb = av_shift (av);
2016 2409
2017 if (SvOBJECT (cb)) 2410 if (SvOBJECT (cb))
2411 {
2018 api_ready (aTHX_ cb); 2412 api_ready (aTHX_ cb);
2019 else 2413 --count;
2020 croak ("callbacks not yet supported"); 2414 }
2415 else if (SvTYPE (cb) == SVt_PVCV)
2416 {
2417 dSP;
2418 PUSHMARK (SP);
2419 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2420 PUTBACK;
2421 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2422 }
2021 2423
2022 SvREFCNT_dec (cb); 2424 SvREFCNT_dec (cb);
2023
2024 --count;
2025 } 2425 }
2026} 2426}
2027 2427
2028static void 2428static void
2029coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2429coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2031 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2431 /* call $sem->adjust (0) to possibly wake up some other waiters */
2032 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2432 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2033} 2433}
2034 2434
2035static int 2435static int
2036slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2436slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2037{ 2437{
2038 AV *av = (AV *)frame->data; 2438 AV *av = (AV *)frame->data;
2039 SV *count_sv = AvARRAY (av)[0]; 2439 SV *count_sv = AvARRAY (av)[0];
2040 2440
2441 /* if we are about to throw, don't actually acquire the lock, just throw */
2442 if (CORO_THROW)
2443 return 0;
2041 if (SvIVX (count_sv) > 0) 2444 else if (SvIVX (count_sv) > 0)
2042 { 2445 {
2043 SvSTATE_current->on_destroy = 0; 2446 SvSTATE_current->on_destroy = 0;
2447
2448 if (acquire)
2044 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2449 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2450 else
2451 coro_semaphore_adjust (aTHX_ av, 0);
2452
2045 return 0; 2453 return 0;
2046 } 2454 }
2047 else 2455 else
2048 { 2456 {
2049 int i; 2457 int i;
… …
2058 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2466 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2059 return 1; 2467 return 1;
2060 } 2468 }
2061} 2469}
2062 2470
2063static void 2471static int
2472slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2473{
2474 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2475}
2476
2477static int
2478slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2479{
2480 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2481}
2482
2483static void
2064slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2484slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2065{ 2485{
2066 AV *av = (AV *)SvRV (arg [0]); 2486 AV *av = (AV *)SvRV (arg [0]);
2067 2487
2068 if (SvIVX (AvARRAY (av)[0]) > 0) 2488 if (SvIVX (AvARRAY (av)[0]) > 0)
2069 { 2489 {
2070 frame->data = (void *)av; 2490 frame->data = (void *)av;
2071 frame->prepare = prepare_nop; 2491 frame->prepare = prepare_nop;
2072 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2073 } 2492 }
2074 else 2493 else
2075 { 2494 {
2076 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2495 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2077 2496
2078 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2497 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2079 frame->prepare = prepare_schedule; 2498 frame->prepare = prepare_schedule;
2080 2499
2081 /* to avoid race conditions when a woken-up coro gets terminated */ 2500 /* to avoid race conditions when a woken-up coro gets terminated */
2082 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2501 /* we arrange for a temporary on_destroy that calls adjust (0) */
2083 assert (!SvSTATE_current->on_destroy);//D
2084 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2502 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2085 } 2503 }
2504}
2086 2505
2506static void
2507slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2508{
2509 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2087 frame->check = slf_check_semaphore_down; 2510 frame->check = slf_check_semaphore_down;
2088
2089} 2511}
2090 2512
2091/*****************************************************************************/ 2513static void
2092/* gensub: simple closure generation utility */ 2514slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093
2094#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2095
2096/* create a closure from XS, returns a code reference */
2097/* the arg can be accessed via GENSUB_ARG from the callback */
2098/* the callback must use dXSARGS/XSRETURN */
2099static SV *
2100gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2101{ 2515{
2102 CV *cv = (CV *)newSV (0); 2516 if (items >= 2)
2517 {
2518 /* callback form */
2519 AV *av = (AV *)SvRV (arg [0]);
2520 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2103 2521
2104 sv_upgrade ((SV *)cv, SVt_PVCV); 2522 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2105 2523
2106 CvANON_on (cv); 2524 if (SvIVX (AvARRAY (av)[0]) > 0)
2107 CvISXSUB_on (cv); 2525 coro_semaphore_adjust (aTHX_ av, 0);
2108 CvXSUB (cv) = xsub;
2109 GENSUB_ARG = arg;
2110 2526
2111 return newRV_noinc ((SV *)cv); 2527 frame->prepare = prepare_nop;
2528 frame->check = slf_check_nop;
2529 }
2530 else
2531 {
2532 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2533 frame->check = slf_check_semaphore_wait;
2534 }
2535}
2536
2537/* signal */
2538
2539static void
2540coro_signal_wake (pTHX_ AV *av, int count)
2541{
2542 SvIVX (AvARRAY (av)[0]) = 0;
2543
2544 /* now signal count waiters */
2545 while (count > 0 && AvFILLp (av) > 0)
2546 {
2547 SV *cb;
2548
2549 /* swap first two elements so we can shift a waiter */
2550 cb = AvARRAY (av)[0];
2551 AvARRAY (av)[0] = AvARRAY (av)[1];
2552 AvARRAY (av)[1] = cb;
2553
2554 cb = av_shift (av);
2555
2556 api_ready (aTHX_ cb);
2557 sv_setiv (cb, 0); /* signal waiter */
2558 SvREFCNT_dec (cb);
2559
2560 --count;
2561 }
2562}
2563
2564static int
2565slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2566{
2567 /* if we are about to throw, also stop waiting */
2568 return SvROK ((SV *)frame->data) && !CORO_THROW;
2569}
2570
2571static void
2572slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2573{
2574 AV *av = (AV *)SvRV (arg [0]);
2575
2576 if (SvIVX (AvARRAY (av)[0]))
2577 {
2578 SvIVX (AvARRAY (av)[0]) = 0;
2579 frame->prepare = prepare_nop;
2580 frame->check = slf_check_nop;
2581 }
2582 else
2583 {
2584 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */
2585
2586 av_push (av, waiter);
2587
2588 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2589 frame->prepare = prepare_schedule;
2590 frame->check = slf_check_signal_wait;
2591 }
2112} 2592}
2113 2593
2114/*****************************************************************************/ 2594/*****************************************************************************/
2115/* Coro::AIO */ 2595/* Coro::AIO */
2116 2596
… …
2131 dXSARGS; 2611 dXSARGS;
2132 AV *state = (AV *)GENSUB_ARG; 2612 AV *state = (AV *)GENSUB_ARG;
2133 SV *coro = av_pop (state); 2613 SV *coro = av_pop (state);
2134 SV *data_sv = newSV (sizeof (struct io_state)); 2614 SV *data_sv = newSV (sizeof (struct io_state));
2135 2615
2136 av_extend (state, items); 2616 av_extend (state, items - 1);
2137 2617
2138 sv_upgrade (data_sv, SVt_PV); 2618 sv_upgrade (data_sv, SVt_PV);
2139 SvCUR_set (data_sv, sizeof (struct io_state)); 2619 SvCUR_set (data_sv, sizeof (struct io_state));
2140 SvPOK_only (data_sv); 2620 SvPOK_only (data_sv);
2141 2621
… …
2166static int 2646static int
2167slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2647slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2168{ 2648{
2169 AV *state = (AV *)frame->data; 2649 AV *state = (AV *)frame->data;
2170 2650
2651 /* if we are about to throw, return early */
2652 /* this does not cancel the aio request, but at least */
2653 /* it quickly returns */
2654 if (CORO_THROW)
2655 return 0;
2656
2171 /* one element that is an RV? repeat! */ 2657 /* one element that is an RV? repeat! */
2172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2658 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2173 return 1; 2659 return 1;
2174 2660
2175 /* restore status */ 2661 /* restore status */
… …
2270 XSRETURN_EMPTY; 2756 XSRETURN_EMPTY;
2271} 2757}
2272 2758
2273/*****************************************************************************/ 2759/*****************************************************************************/
2274 2760
2761#if CORO_CLONE
2762# include "clone.c"
2763#endif
2764
2275MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2765MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2276 2766
2277PROTOTYPES: DISABLE 2767PROTOTYPES: DISABLE
2278 2768
2279BOOT: 2769BOOT:
… …
2283 coro_thx = PERL_GET_CONTEXT; 2773 coro_thx = PERL_GET_CONTEXT;
2284# endif 2774# endif
2285#endif 2775#endif
2286 BOOT_PAGESIZE; 2776 BOOT_PAGESIZE;
2287 2777
2778 cctx_current = cctx_new_empty ();
2779
2288 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2780 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2289 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2781 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2290 2782
2291 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2783 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2292 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2784 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2311 2803
2312 { 2804 {
2313 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2805 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2314 2806
2315 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2807 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2316 hv_store_ent (PL_custom_op_names, slf, 2808 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2317 newSVpv ("coro_slf", 0), 0);
2318 2809
2319 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2810 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2320 hv_store_ent (PL_custom_op_descs, slf, 2811 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2321 newSVpv ("coro schedule like function", 0), 0);
2322 } 2812 }
2323 2813
2324 coroapi.ver = CORO_API_VERSION; 2814 coroapi.ver = CORO_API_VERSION;
2325 coroapi.rev = CORO_API_REVISION; 2815 coroapi.rev = CORO_API_REVISION;
2326 2816
… …
2345 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2835 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2346} 2836}
2347 2837
2348SV * 2838SV *
2349new (char *klass, ...) 2839new (char *klass, ...)
2840 ALIAS:
2841 Coro::new = 1
2350 CODE: 2842 CODE:
2351{ 2843{
2352 struct coro *coro; 2844 struct coro *coro;
2353 MAGIC *mg; 2845 MAGIC *mg;
2354 HV *hv; 2846 HV *hv;
2847 CV *cb;
2355 int i; 2848 int i;
2849
2850 if (items > 1)
2851 {
2852 cb = coro_sv_2cv (aTHX_ ST (1));
2853
2854 if (!ix)
2855 {
2856 if (CvISXSUB (cb))
2857 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2858
2859 if (!CvROOT (cb))
2860 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2861 }
2862 }
2356 2863
2357 Newz (0, coro, 1, struct coro); 2864 Newz (0, coro, 1, struct coro);
2358 coro->args = newAV (); 2865 coro->args = newAV ();
2359 coro->flags = CF_NEW; 2866 coro->flags = CF_NEW;
2360 2867
… …
2365 coro->hv = hv = newHV (); 2872 coro->hv = hv = newHV ();
2366 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2873 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2367 mg->mg_flags |= MGf_DUP; 2874 mg->mg_flags |= MGf_DUP;
2368 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2875 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2369 2876
2877 if (items > 1)
2878 {
2370 av_extend (coro->args, items - 1); 2879 av_extend (coro->args, items - 1 + ix - 1);
2880
2881 if (ix)
2882 {
2883 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2884 cb = cv_coro_run;
2885 }
2886
2887 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2888
2371 for (i = 1; i < items; i++) 2889 for (i = 2; i < items; i++)
2372 av_push (coro->args, newSVsv (ST (i))); 2890 av_push (coro->args, newSVsv (ST (i)));
2891 }
2373} 2892}
2374 OUTPUT: 2893 OUTPUT:
2375 RETVAL 2894 RETVAL
2376 2895
2377void 2896void
… …
2390void 2909void
2391_exit (int code) 2910_exit (int code)
2392 PROTOTYPE: $ 2911 PROTOTYPE: $
2393 CODE: 2912 CODE:
2394 _exit (code); 2913 _exit (code);
2914
2915SV *
2916clone (Coro::State coro)
2917 CODE:
2918{
2919#if CORO_CLONE
2920 struct coro *ncoro = coro_clone (coro);
2921 MAGIC *mg;
2922 /* TODO: too much duplication */
2923 ncoro->hv = newHV ();
2924 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2925 mg->mg_flags |= MGf_DUP;
2926 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2927#else
2928 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2929#endif
2930}
2931 OUTPUT:
2932 RETVAL
2395 2933
2396int 2934int
2397cctx_stacksize (int new_stacksize = 0) 2935cctx_stacksize (int new_stacksize = 0)
2398 PROTOTYPE: ;$ 2936 PROTOTYPE: ;$
2399 CODE: 2937 CODE:
… …
2506throw (Coro::State self, SV *throw = &PL_sv_undef) 3044throw (Coro::State self, SV *throw = &PL_sv_undef)
2507 PROTOTYPE: $;$ 3045 PROTOTYPE: $;$
2508 CODE: 3046 CODE:
2509{ 3047{
2510 struct coro *current = SvSTATE_current; 3048 struct coro *current = SvSTATE_current;
2511 SV **throwp = self == current ? &coro_throw : &self->throw; 3049 SV **throwp = self == current ? &CORO_THROW : &self->except;
2512 SvREFCNT_dec (*throwp); 3050 SvREFCNT_dec (*throwp);
2513 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3051 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2514} 3052}
2515 3053
2516void 3054void
… …
2520 3058
2521SV * 3059SV *
2522has_cctx (Coro::State coro) 3060has_cctx (Coro::State coro)
2523 PROTOTYPE: $ 3061 PROTOTYPE: $
2524 CODE: 3062 CODE:
2525 RETVAL = boolSV (!!coro->cctx); 3063 /* maybe manage the running flag differently */
3064 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2526 OUTPUT: 3065 OUTPUT:
2527 RETVAL 3066 RETVAL
2528 3067
2529int 3068int
2530is_traced (Coro::State coro) 3069is_traced (Coro::State coro)
… …
2550 3089
2551void 3090void
2552force_cctx () 3091force_cctx ()
2553 PROTOTYPE: 3092 PROTOTYPE:
2554 CODE: 3093 CODE:
2555 SvSTATE_current->cctx->idle_sp = 0; 3094 cctx_current->idle_sp = 0;
2556 3095
2557void 3096void
2558swap_defsv (Coro::State self) 3097swap_defsv (Coro::State self)
2559 PROTOTYPE: $ 3098 PROTOTYPE: $
2560 ALIAS: 3099 ALIAS:
… …
2575 3114
2576BOOT: 3115BOOT:
2577{ 3116{
2578 int i; 3117 int i;
2579 3118
2580 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2581 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3119 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2582 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3120 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2583 3121 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3122 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2584 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3123 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2585 SvREADONLY_on (coro_current); 3124 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3125 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3126 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3127 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3128
3129 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3130 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3131 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3132 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2586 3133
2587 coro_stash = gv_stashpv ("Coro", TRUE); 3134 coro_stash = gv_stashpv ("Coro", TRUE);
2588 3135
2589 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3136 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2590 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3137 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2598 3145
2599 { 3146 {
2600 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3147 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2601 3148
2602 coroapi.schedule = api_schedule; 3149 coroapi.schedule = api_schedule;
3150 coroapi.schedule_to = api_schedule_to;
2603 coroapi.cede = api_cede; 3151 coroapi.cede = api_cede;
2604 coroapi.cede_notself = api_cede_notself; 3152 coroapi.cede_notself = api_cede_notself;
2605 coroapi.ready = api_ready; 3153 coroapi.ready = api_ready;
2606 coroapi.is_ready = api_is_ready; 3154 coroapi.is_ready = api_is_ready;
2607 coroapi.nready = coro_nready; 3155 coroapi.nready = coro_nready;
2608 coroapi.current = coro_current; 3156 coroapi.current = coro_current;
2609 3157
2610 GCoroAPI = &coroapi; 3158 /*GCoroAPI = &coroapi;*/
2611 sv_setiv (sv, (IV)&coroapi); 3159 sv_setiv (sv, (IV)&coroapi);
2612 SvREADONLY_on (sv); 3160 SvREADONLY_on (sv);
2613 } 3161 }
2614} 3162}
3163
3164void
3165terminate (...)
3166 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2615 3168
2616void 3169void
2617schedule (...) 3170schedule (...)
2618 CODE: 3171 CODE:
2619 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3172 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2620 3173
2621void 3174void
3175schedule_to (...)
3176 CODE:
3177 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3178
3179void
3180cede_to (...)
3181 CODE:
3182 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3183
3184void
2622cede (...) 3185cede (...)
2623 CODE: 3186 CODE:
2624 CORO_EXECUTE_SLF_XS (slf_init_cede); 3187 CORO_EXECUTE_SLF_XS (slf_init_cede);
2625 3188
2626void 3189void
2627cede_notself (...) 3190cede_notself (...)
2628 CODE: 3191 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3192 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3193
3194void
3195_cancel (Coro::State self)
3196 CODE:
3197 coro_state_destroy (aTHX_ self);
3198 coro_call_on_destroy (aTHX_ self);
2630 3199
2631void 3200void
2632_set_current (SV *current) 3201_set_current (SV *current)
2633 PROTOTYPE: $ 3202 PROTOTYPE: $
2634 CODE: 3203 CODE:
… …
2679 CODE: 3248 CODE:
2680 RETVAL = coro_nready; 3249 RETVAL = coro_nready;
2681 OUTPUT: 3250 OUTPUT:
2682 RETVAL 3251 RETVAL
2683 3252
2684# for async_pool speedup
2685void 3253void
2686_pool_1 (SV *cb) 3254_pool_handler (...)
2687 CODE: 3255 CODE:
2688{ 3256 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2689 HV *hv = (HV *)SvRV (coro_current);
2690 struct coro *coro = SvSTATE_hv ((SV *)hv);
2691 AV *defav = GvAV (PL_defgv);
2692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2693 AV *invoke_av;
2694 int i, len;
2695 3257
2696 if (!invoke) 3258void
3259async_pool (SV *cv, ...)
3260 PROTOTYPE: &@
3261 PPCODE:
3262{
3263 HV *hv = (HV *)av_pop (av_async_pool);
3264 AV *av = newAV ();
3265 SV *cb = ST (0);
3266 int i;
3267
3268 av_extend (av, items - 2);
3269 for (i = 1; i < items; ++i)
3270 av_push (av, SvREFCNT_inc_NN (ST (i)));
3271
3272 if ((SV *)hv == &PL_sv_undef)
2697 { 3273 {
2698 SV *old = PL_diehook; 3274 PUSHMARK (SP);
2699 PL_diehook = 0; 3275 EXTEND (SP, 2);
2700 SvREFCNT_dec (old); 3276 PUSHs (sv_Coro);
2701 croak ("\3async_pool terminate\2\n"); 3277 PUSHs ((SV *)cv_pool_handler);
3278 PUTBACK;
3279 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3280 SPAGAIN;
3281
3282 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2702 } 3283 }
2703 3284
2704 SvREFCNT_dec (coro->saved_deffh);
2705 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2706
2707 hv_store (hv, "desc", sizeof ("desc") - 1,
2708 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2709
2710 invoke_av = (AV *)SvRV (invoke);
2711 len = av_len (invoke_av);
2712
2713 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2714
2715 if (len > 0)
2716 { 3285 {
2717 av_fill (defav, len - 1); 3286 struct coro *coro = SvSTATE_hv (hv);
2718 for (i = 0; i < len; ++i) 3287
2719 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3288 assert (!coro->invoke_cb);
3289 assert (!coro->invoke_av);
3290 coro->invoke_cb = SvREFCNT_inc (cb);
3291 coro->invoke_av = av;
2720 } 3292 }
3293
3294 api_ready (aTHX_ (SV *)hv);
3295
3296 if (GIMME_V != G_VOID)
3297 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3298 else
3299 SvREFCNT_dec (hv);
2721} 3300}
3301
3302SV *
3303rouse_cb ()
3304 PROTOTYPE:
3305 CODE:
3306 RETVAL = coro_new_rouse_cb (aTHX);
3307 OUTPUT:
3308 RETVAL
2722 3309
2723void 3310void
2724_pool_2 (SV *cb) 3311rouse_wait (...)
3312 PROTOTYPE: ;$
2725 CODE: 3313 PPCODE:
2726{ 3314 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2727 HV *hv = (HV *)SvRV (coro_current);
2728 struct coro *coro = SvSTATE_hv ((SV *)hv);
2729
2730 sv_setsv (cb, &PL_sv_undef);
2731
2732 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2733 coro->saved_deffh = 0;
2734
2735 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2736 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2737 {
2738 SV *old = PL_diehook;
2739 PL_diehook = 0;
2740 SvREFCNT_dec (old);
2741 croak ("\3async_pool terminate\2\n");
2742 }
2743
2744 av_clear (GvAV (PL_defgv));
2745 hv_store (hv, "desc", sizeof ("desc") - 1,
2746 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2747
2748 coro->prio = 0;
2749
2750 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2751 api_trace (aTHX_ coro_current, 0);
2752
2753 av_push (av_async_pool, newSVsv (coro_current));
2754}
2755 3315
2756 3316
2757MODULE = Coro::State PACKAGE = PerlIO::cede 3317MODULE = Coro::State PACKAGE = PerlIO::cede
2758 3318
2759BOOT: 3319BOOT:
… …
2761 3321
2762 3322
2763MODULE = Coro::State PACKAGE = Coro::Semaphore 3323MODULE = Coro::State PACKAGE = Coro::Semaphore
2764 3324
2765SV * 3325SV *
2766new (SV *klass, SV *count_ = 0) 3326new (SV *klass, SV *count = 0)
2767 CODE: 3327 CODE:
2768{ 3328 RETVAL = sv_bless (
2769 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3329 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),
2770 AV *av = newAV (); 3330 GvSTASH (CvGV (cv))
2771 SV **ary; 3331 );
3332 OUTPUT:
3333 RETVAL
2772 3334
2773 /* unfortunately, building manually saves memory */ 3335# helper for Coro::Channel
2774 Newx (ary, 2, SV *); 3336SV *
2775 AvALLOC (av) = ary; 3337_alloc (int count)
2776 AvARRAY (av) = ary; 3338 CODE:
2777 AvMAX (av) = 1; 3339 RETVAL = coro_waitarray_new (aTHX_ count);
2778 AvFILLp (av) = 0;
2779 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2780
2781 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2782}
2783 OUTPUT: 3340 OUTPUT:
2784 RETVAL 3341 RETVAL
2785 3342
2786SV * 3343SV *
2787count (SV *self) 3344count (SV *self)
… …
2796 adjust = 1 3353 adjust = 1
2797 CODE: 3354 CODE:
2798 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3355 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2799 3356
2800void 3357void
2801down (SV *self) 3358down (...)
2802 CODE: 3359 CODE:
2803 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3360 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3361
3362void
3363wait (...)
3364 CODE:
3365 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2804 3366
2805void 3367void
2806try (SV *self) 3368try (SV *self)
2807 PPCODE: 3369 PPCODE:
2808{ 3370{
… …
2820 XSRETURN_NO; 3382 XSRETURN_NO;
2821} 3383}
2822 3384
2823void 3385void
2824waiters (SV *self) 3386waiters (SV *self)
2825 CODE: 3387 PPCODE:
2826{ 3388{
2827 AV *av = (AV *)SvRV (self); 3389 AV *av = (AV *)SvRV (self);
3390 int wcount = AvFILLp (av) + 1 - 1;
2828 3391
2829 if (GIMME_V == G_SCALAR) 3392 if (GIMME_V == G_SCALAR)
2830 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3393 XPUSHs (sv_2mortal (newSViv (wcount)));
2831 else 3394 else
2832 { 3395 {
2833 int i; 3396 int i;
2834 EXTEND (SP, AvFILLp (av) + 1 - 1); 3397 EXTEND (SP, wcount);
2835 for (i = 1; i <= AvFILLp (av); ++i) 3398 for (i = 1; i <= wcount; ++i)
2836 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3399 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2837 } 3400 }
2838} 3401}
3402
3403MODULE = Coro::State PACKAGE = Coro::Signal
3404
3405SV *
3406new (SV *klass)
3407 CODE:
3408 RETVAL = sv_bless (
3409 coro_waitarray_new (aTHX_ 0),
3410 GvSTASH (CvGV (cv))
3411 );
3412 OUTPUT:
3413 RETVAL
3414
3415void
3416wait (...)
3417 CODE:
3418 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3419
3420void
3421broadcast (SV *self)
3422 CODE:
3423{
3424 AV *av = (AV *)SvRV (self);
3425 coro_signal_wake (aTHX_ av, AvFILLp (av));
3426}
3427
3428void
3429send (SV *self)
3430 CODE:
3431{
3432 AV *av = (AV *)SvRV (self);
3433
3434 if (AvFILLp (av))
3435 coro_signal_wake (aTHX_ av, 1);
3436 else
3437 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3438}
3439
3440IV
3441awaited (SV *self)
3442 CODE:
3443 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3444 OUTPUT:
3445 RETVAL
2839 3446
2840 3447
2841MODULE = Coro::State PACKAGE = Coro::AnyEvent 3448MODULE = Coro::State PACKAGE = Coro::AnyEvent
2842 3449
2843BOOT: 3450BOOT:
… …
2871 3478
2872void 3479void
2873_register (char *target, char *proto, SV *req) 3480_register (char *target, char *proto, SV *req)
2874 CODE: 3481 CODE:
2875{ 3482{
2876 HV *st; 3483 CV *req_cv = coro_sv_2cv (aTHX_ req);
2877 GV *gvp;
2878 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2879 /* newXSproto doesn't return the CV on 5.8 */ 3484 /* newXSproto doesn't return the CV on 5.8 */
2880 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3485 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2881 sv_setpv ((SV *)slf_cv, proto); 3486 sv_setpv ((SV *)slf_cv, proto);
2882 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3487 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2883} 3488}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines