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.335 by root, Thu Dec 4 04:31:41 2008 UTC vs.
Revision 1.381 by root, Sat Oct 23 09:28:50 2010 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
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
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
117#endif 67#endif
118 68
119#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
137 87
138#define IN_DESTRUCT PL_dirty 88#define IN_DESTRUCT PL_dirty
139 89
140#if __GNUC__ >= 3 90#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 93# define INLINE static inline
144#else 94#else
145# define attribute(x) 95# define attribute(x)
146# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
147# define INLINE static 97# define INLINE static
159# if CORO_PTHREAD 109# if CORO_PTHREAD
160static void *coro_thx; 110static void *coro_thx;
161# endif 111# endif
162#endif 112#endif
163 113
114#ifdef __linux
115# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime
118# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
119# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif
122#endif
123
164static double (*nvtime)(); /* so why doesn't it take void? */ 124static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]);
165 126
166/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
169 130
190static SV *sv_pool_size; 151static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 155static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 156
197/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
198static SV *sv_activity; 158static SV *sv_activity;
159
160/* enable processtime/realtime profiling */
161static char enable_times;
162typedef U32 coro_ts[2];
163static coro_ts time_real, time_cpu;
164static char times_valid;
199 165
200static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
202 168
203enum { 169enum {
238enum { 204enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 210};
244 211
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 213typedef struct
247{ 214{
260/* this is a structure representing a perl-level coroutine */ 227/* this is a structure representing a perl-level coroutine */
261struct coro { 228struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 230 coro_cctx *cctx;
264 231
232 /* ready queue */
233 struct coro *next_ready;
234
265 /* state data */ 235 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 237 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
269 239
285 /* async_pool */ 255 /* async_pool */
286 SV *saved_deffh; 256 SV *saved_deffh;
287 SV *invoke_cb; 257 SV *invoke_cb;
288 AV *invoke_av; 258 AV *invoke_av;
289 259
260 /* on_enter/on_leave */
261 AV *on_enter;
262 AV *on_leave;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
290 /* linked list */ 270 /* linked list */
291 struct coro *next, *prev; 271 struct coro *next, *prev;
292}; 272};
293 273
294typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
299/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
301 281
302/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
303 283
304#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
310 290
311/* for Coro.pm */ 291/* for Coro.pm */
312static SV *coro_current; 292static SV *coro_current;
313static SV *coro_readyhook; 293static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 296static struct coro *coro_first;
317#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
318 318
319/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
320 320
321static SV * 321static SV *
322coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
346 get_hv (name, create); 346 get_hv (name, create);
347#endif 347#endif
348 return get_hv (name, create); 348 return get_hv (name, create);
349} 349}
350 350
351/* may croak */ 351INLINE void
352INLINE CV * 352coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 353{
355 HV *st; 354#ifdef coro_clock_gettime
356 GV *gvp; 355 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 356
357 ts.tv_sec = ts.tv_nsec = 0;
358 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
359 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
360
361 ts.tv_sec = ts.tv_nsec = 0;
362 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
363 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
364#else
365 dTHX;
366 UV tv[2];
367
368 u2time (aTHX_ tv);
369 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000;
371#endif
372}
373
374INLINE void
375coro_times_add (struct coro *c)
376{
377 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0];
380
381 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0];
384}
385
386INLINE void
387coro_times_sub (struct coro *c)
388{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0];
392
393 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
394 c->t_cpu [1] -= time_cpu [1];
395 c->t_cpu [0] -= time_cpu [0];
358} 396}
359 397
360/*****************************************************************************/ 398/*****************************************************************************/
361/* magic glue */ 399/* magic glue */
362 400
462static int 500static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 501coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 502{
465 AV *padlist; 503 AV *padlist;
466 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
505
506 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT)
508 return 0;
467 509
468 /* casting is fun. */ 510 /* casting is fun. */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
470 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
471 513
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 563}
522 564
523/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
524 566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
618static void
619on_enterleave_call (pTHX_ SV *cb);
620
525static void 621static void
526load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
527{ 623{
528 perl_slots *slot = c->slot; 624 perl_slots *slot = c->slot;
529 c->slot = 0; 625 c->slot = 0;
556 PUTBACK; 652 PUTBACK;
557 } 653 }
558 654
559 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 656 CORO_THROW = c->except;
657
658 if (expect_false (enable_times))
659 {
660 if (expect_false (!times_valid))
661 coro_times_update ();
662
663 coro_times_sub (c);
664 }
665
666 if (expect_false (c->on_enter))
667 {
668 int i;
669
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 }
673
674 SWAP_SVS (c);
561} 675}
562 676
563static void 677static void
564save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
565{ 679{
680 SWAP_SVS (c);
681
682 if (expect_false (c->on_leave))
683 {
684 int i;
685
686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 }
689
690 times_valid = 0;
691
692 if (expect_false (enable_times))
693 {
694 coro_times_update (); times_valid = 1;
695 coro_times_add (c);
696 }
697
566 c->except = CORO_THROW; 698 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
568 700
569 { 701 {
570 dSP; 702 dSP;
583 { 715 {
584 while (expect_true (cxix >= 0)) 716 while (expect_true (cxix >= 0))
585 { 717 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 718 PERL_CONTEXT *cx = &ccstk[cxix--];
587 719
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 721 {
590 CV *cv = cx->blk_sub.cv; 722 CV *cv = cx->blk_sub.cv;
591 723
592 if (expect_true (CvDEPTH (cv))) 724 if (expect_true (CvDEPTH (cv)))
593 { 725 {
617 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
618 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
621 { 753 {
622 int i; 754 unsigned int i;
623 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
624 CXINC; 756 CXINC;
625 } 757 }
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
627 759
769#endif 901#endif
770 902
771/* 903/*
772 * This overrides the default magic get method of %SIG elements. 904 * This overrides the default magic get method of %SIG elements.
773 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 905 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
774 * and instead of tryign to save and restore the hash elements, we just provide 906 * and instead of trying to save and restore the hash elements, we just provide
775 * readback here. 907 * readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 908 */
780static int 909static int
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 911{
783 const char *s = MgPV_nolen_const (mg); 912 const char *s = MgPV_nolen_const (mg);
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 965 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 966
838 if (svp) 967 if (svp)
839 { 968 {
840 SV *old = *svp; 969 SV *old = *svp;
841 *svp = newSVsv (sv); 970 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 971 SvREFCNT_dec (old);
843 return 0; 972 return 0;
844 } 973 }
845 } 974 }
846 975
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 994{
866 return 1; 995 return 1;
867} 996}
868 997
869static UNOP coro_setup_op; 998static UNOP init_perl_op;
870 999
871static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
872coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
873{ 1002{
874 /* 1003 /*
875 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
876 */ 1005 */
877 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
926 */ 1055 */
927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
929 1058
930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
931 coro_setup_op.op_next = PL_op; 1060 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1061 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1062 init_perl_op.op_ppaddr = pp_slf;
934 /* no flags etc. required, as an init function won't be called */ 1063 /* no flags etc. required, as an init function won't be called */
935 1064
936 PL_op = (OP *)&coro_setup_op; 1065 PL_op = (OP *)&init_perl_op;
937 1066
938 /* copy throw, in case it was set before coro_setup */ 1067 /* copy throw, in case it was set before init_perl */
939 CORO_THROW = coro->except; 1068 CORO_THROW = coro->except;
940}
941 1069
1070 SWAP_SVS (coro);
1071
1072 if (expect_false (enable_times))
1073 {
1074 coro_times_update ();
1075 coro_times_sub (coro);
1076 }
1077}
1078
942static void 1079static void
943coro_destruct_perl (pTHX_ struct coro *coro) 1080coro_unwind_stacks (pTHX)
944{ 1081{
945 if (!IN_DESTRUCT) 1082 if (!IN_DESTRUCT)
946 { 1083 {
947 /* restore all saved variables and stuff */ 1084 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 1085 LEAVE_SCOPE (0);
956 POPSTACK_TO (PL_mainstack); 1093 POPSTACK_TO (PL_mainstack);
957 1094
958 /* unwind main stack */ 1095 /* unwind main stack */
959 dounwind (-1); 1096 dounwind (-1);
960 } 1097 }
1098}
961 1099
962 SvREFCNT_dec (GvSV (PL_defgv)); 1100static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 1101destroy_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 1102{
965 SvREFCNT_dec (PL_defoutgv); 1103 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 1104
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 1105 {
1106 struct coro *current = SvSTATE_current;
1107
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109
1110 save_perl (aTHX_ current);
1111 load_perl (aTHX_ coro);
1112
1113 coro_unwind_stacks (aTHX);
1114 coro_destruct_stacks (aTHX);
1115
1116 /* restore swapped sv's */
1117 SWAP_SVS (coro);
1118
1119 // now save some sv's to be free'd later
1120 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs;
1125 svf [5] = GvSV (irsgv);
1126 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf));
1130
1131 load_perl (aTHX_ current);
1132 }
1133
1134 {
1135 unsigned int i;
1136
1137 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1138 SvREFCNT_dec (svf [i]);
1139
973 SvREFCNT_dec (coro->saved_deffh); 1140 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1141 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1142 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1143 SvREFCNT_dec (coro->invoke_av);
977 1144 }
978 coro_destruct_stacks (aTHX);
979} 1145}
980 1146
981INLINE void 1147INLINE void
982free_coro_mortal (pTHX) 1148free_coro_mortal (pTHX)
983{ 1149{
1180 /* somebody or something will hit me for both perl_run and PL_restartop */ 1346 /* somebody or something will hit me for both perl_run and PL_restartop */
1181 PL_restartop = PL_op; 1347 PL_restartop = PL_op;
1182 perl_run (PL_curinterp); 1348 perl_run (PL_curinterp);
1183 /* 1349 /*
1184 * Unfortunately, there is no way to get at the return values of the 1350 * Unfortunately, there is no way to get at the return values of the
1185 * coro body here, as perl_run destroys these 1351 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1352 * runtime errors here, as this is just a random interpreter, not a thread.
1186 */ 1353 */
1187 1354
1188 /* 1355 /*
1189 * If perl-run returns we assume exit() was being called or the coro 1356 * If perl-run returns we assume exit() was being called or the coro
1190 * fell off the end, which seems to be the only valid (non-bug) 1357 * fell off the end, which seems to be the only valid (non-bug)
1277cctx_destroy (coro_cctx *cctx) 1444cctx_destroy (coro_cctx *cctx)
1278{ 1445{
1279 if (!cctx) 1446 if (!cctx)
1280 return; 1447 return;
1281 1448
1282 assert (cctx != cctx_current);//D temporary 1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1283 1450
1284 --cctx_count; 1451 --cctx_count;
1285 coro_destroy (&cctx->cctx); 1452 coro_destroy (&cctx->cctx);
1286 1453
1287 /* coro_transfer creates new, empty cctx's */ 1454 /* coro_transfer creates new, empty cctx's */
1351 /* TODO: throwing up here is considered harmful */ 1518 /* TODO: throwing up here is considered harmful */
1352 1519
1353 if (expect_true (prev != next)) 1520 if (expect_true (prev != next))
1354 { 1521 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1357 1524
1358 if (expect_false (next->flags & CF_RUNNING))
1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1360
1361 if (expect_false (next->flags & CF_DESTROYED)) 1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1362 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1363 1527
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1528#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1529 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1366 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1367#endif 1531#endif
1400 if (expect_false (next->flags & CF_NEW)) 1564 if (expect_false (next->flags & CF_NEW))
1401 { 1565 {
1402 /* need to start coroutine */ 1566 /* need to start coroutine */
1403 next->flags &= ~CF_NEW; 1567 next->flags &= ~CF_NEW;
1404 /* setup coroutine call */ 1568 /* setup coroutine call */
1405 coro_setup (aTHX_ next); 1569 init_perl (aTHX_ next);
1406 } 1570 }
1407 else 1571 else
1408 load_perl (aTHX_ next); 1572 load_perl (aTHX_ next);
1409
1410 assert (!prev->cctx);//D temporary
1411 1573
1412 /* possibly untie and reuse the cctx */ 1574 /* possibly untie and reuse the cctx */
1413 if (expect_true ( 1575 if (expect_true (
1414 cctx_current->idle_sp == STACKLEVEL 1576 cctx_current->idle_sp == STACKLEVEL
1415 && !(cctx_current->flags & CC_TRACE) 1577 && !(cctx_current->flags & CC_TRACE)
1457coro_state_destroy (pTHX_ struct coro *coro) 1619coro_state_destroy (pTHX_ struct coro *coro)
1458{ 1620{
1459 if (coro->flags & CF_DESTROYED) 1621 if (coro->flags & CF_DESTROYED)
1460 return 0; 1622 return 0;
1461 1623
1462 if (coro->on_destroy) 1624 if (coro->on_destroy && !PL_dirty)
1463 coro->on_destroy (aTHX_ coro); 1625 coro->on_destroy (aTHX_ coro);
1464 1626
1465 coro->flags |= CF_DESTROYED; 1627 coro->flags |= CF_DESTROYED;
1466 1628
1467 if (coro->flags & CF_READY) 1629 if (coro->flags & CF_READY)
1473 else 1635 else
1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1475 1637
1476 if (coro->mainstack 1638 if (coro->mainstack
1477 && coro->mainstack != main_mainstack 1639 && coro->mainstack != main_mainstack
1640 && coro->slot
1478 && !PL_dirty) 1641 && !PL_dirty)
1479 {
1480 struct coro temp;
1481
1482 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1483
1484 save_perl (aTHX_ &temp);
1485 load_perl (aTHX_ coro);
1486
1487 coro_destruct_perl (aTHX_ coro); 1642 destroy_perl (aTHX_ coro);
1488 1643
1489 load_perl (aTHX_ &temp); 1644 if (coro->next) coro->next->prev = coro->prev;
1490 1645 if (coro->prev) coro->prev->next = coro->next;
1491 coro->slot = 0; 1646 if (coro == coro_first) coro_first = coro->next;
1492 }
1493 1647
1494 cctx_destroy (coro->cctx); 1648 cctx_destroy (coro->cctx);
1495 SvREFCNT_dec (coro->startcv); 1649 SvREFCNT_dec (coro->startcv);
1496 SvREFCNT_dec (coro->args); 1650 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv);
1497 SvREFCNT_dec (CORO_THROW); 1652 SvREFCNT_dec (CORO_THROW);
1498
1499 if (coro->next) coro->next->prev = coro->prev;
1500 if (coro->prev) coro->prev->next = coro->next;
1501 if (coro == coro_first) coro_first = coro->next;
1502 1653
1503 return 1; 1654 return 1;
1504} 1655}
1505 1656
1506static int 1657static int
1556 1707
1557 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1708 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1558 TRANSFER (ta, 1); 1709 TRANSFER (ta, 1);
1559} 1710}
1560 1711
1561/*****************************************************************************/
1562/* gensub: simple closure generation utility */
1563
1564#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1565
1566/* create a closure from XS, returns a code reference */
1567/* the arg can be accessed via GENSUB_ARG from the callback */
1568/* the callback must use dXSARGS/XSRETURN */
1569static SV *
1570gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1571{
1572 CV *cv = (CV *)newSV (0);
1573
1574 sv_upgrade ((SV *)cv, SVt_PVCV);
1575
1576 CvANON_on (cv);
1577 CvISXSUB_on (cv);
1578 CvXSUB (cv) = xsub;
1579 GENSUB_ARG = arg;
1580
1581 return newRV_noinc ((SV *)cv);
1582}
1583
1584/** Coro ********************************************************************/ 1712/** Coro ********************************************************************/
1585 1713
1586INLINE void 1714INLINE void
1587coro_enq (pTHX_ struct coro *coro) 1715coro_enq (pTHX_ struct coro *coro)
1588{ 1716{
1589 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1590}
1591 1718
1592INLINE SV * 1719 SvREFCNT_inc_NN (coro->hv);
1720
1721 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro;
1724}
1725
1726INLINE struct coro *
1593coro_deq (pTHX) 1727coro_deq (pTHX)
1594{ 1728{
1595 int prio; 1729 int prio;
1596 1730
1597 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1598 if (AvFILLp (coro_ready [prio]) >= 0) 1732 {
1599 return av_shift (coro_ready [prio]); 1733 struct coro **ready = coro_ready [prio];
1734
1735 if (ready [0])
1736 {
1737 struct coro *coro = ready [0];
1738 ready [0] = coro->next_ready;
1739 return coro;
1740 }
1741 }
1600 1742
1601 return 0; 1743 return 0;
1744}
1745
1746static void
1747invoke_sv_ready_hook_helper (void)
1748{
1749 dTHX;
1750 dSP;
1751
1752 ENTER;
1753 SAVETMPS;
1754
1755 PUSHMARK (SP);
1756 PUTBACK;
1757 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1758
1759 FREETMPS;
1760 LEAVE;
1602} 1761}
1603 1762
1604static int 1763static int
1605api_ready (pTHX_ SV *coro_sv) 1764api_ready (pTHX_ SV *coro_sv)
1606{ 1765{
1607 struct coro *coro;
1608 SV *sv_hook;
1609 void (*xs_hook)(void);
1610
1611 coro = SvSTATE (coro_sv); 1766 struct coro *coro = SvSTATE (coro_sv);
1612 1767
1613 if (coro->flags & CF_READY) 1768 if (coro->flags & CF_READY)
1614 return 0; 1769 return 0;
1615 1770
1616 coro->flags |= CF_READY; 1771 coro->flags |= CF_READY;
1617 1772
1618 sv_hook = coro_nready ? 0 : coro_readyhook;
1619 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1620
1621 coro_enq (aTHX_ coro); 1773 coro_enq (aTHX_ coro);
1622 ++coro_nready;
1623 1774
1624 if (sv_hook) 1775 if (!coro_nready++)
1625 { 1776 if (coroapi.readyhook)
1626 dSP; 1777 coroapi.readyhook ();
1627
1628 ENTER;
1629 SAVETMPS;
1630
1631 PUSHMARK (SP);
1632 PUTBACK;
1633 call_sv (sv_hook, G_VOID | G_DISCARD);
1634
1635 FREETMPS;
1636 LEAVE;
1637 }
1638
1639 if (xs_hook)
1640 xs_hook ();
1641 1778
1642 return 1; 1779 return 1;
1643} 1780}
1644 1781
1645static int 1782static int
1668static void 1805static void
1669prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1806prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1670{ 1807{
1671 for (;;) 1808 for (;;)
1672 { 1809 {
1673 SV *next_sv = coro_deq (aTHX); 1810 struct coro *next = coro_deq (aTHX);
1674 1811
1675 if (expect_true (next_sv)) 1812 if (expect_true (next))
1676 { 1813 {
1677 struct coro *next = SvSTATE_hv (next_sv);
1678
1679 /* cannot transfer to destroyed coros, skip and look for next */ 1814 /* cannot transfer to destroyed coros, skip and look for next */
1680 if (expect_false (next->flags & CF_DESTROYED)) 1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1681 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1682 else 1817 else
1683 { 1818 {
1684 next->flags &= ~CF_READY; 1819 next->flags &= ~CF_READY;
1685 --coro_nready; 1820 --coro_nready;
1686 1821
1692 { 1827 {
1693 /* nothing to schedule: call the idle handler */ 1828 /* nothing to schedule: call the idle handler */
1694 if (SvROK (sv_idle) 1829 if (SvROK (sv_idle)
1695 && SvOBJECT (SvRV (sv_idle))) 1830 && SvOBJECT (SvRV (sv_idle)))
1696 { 1831 {
1832 if (SvRV (sv_idle) == SvRV (coro_current))
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1834
1697 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1698 api_ready (aTHX_ SvRV (sv_idle)); 1836 api_ready (aTHX_ SvRV (sv_idle));
1699 --coro_nready; 1837 --coro_nready;
1700 } 1838 }
1701 else 1839 else
1702 { 1840 {
1841 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1703 dSP; 1842 dSP;
1704 1843
1705 ENTER; 1844 ENTER;
1706 SAVETMPS; 1845 SAVETMPS;
1707 1846
1853{ 1992{
1854 int i; 1993 int i;
1855 HV *hv = (HV *)SvRV (coro_current); 1994 HV *hv = (HV *)SvRV (coro_current);
1856 AV *av = newAV (); 1995 AV *av = newAV ();
1857 1996
1997 /* items are actually not so common, so optimise for this case */
1998 if (items)
1999 {
1858 av_extend (av, items - 1); 2000 av_extend (av, items - 1);
2001
1859 for (i = 0; i < items; ++i) 2002 for (i = 0; i < items; ++i)
1860 av_push (av, SvREFCNT_inc_NN (arg [i])); 2003 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 }
1861 2005
1862 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1863 2007
1864 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1865 api_ready (aTHX_ sv_manager); 2009 api_ready (aTHX_ sv_manager);
1866 2010
1867 frame->prepare = prepare_schedule; 2011 frame->prepare = prepare_schedule;
1868 frame->check = slf_check_repeat; 2012 frame->check = slf_check_repeat;
2013
2014 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/
1869} 2017}
1870 2018
1871/*****************************************************************************/ 2019/*****************************************************************************/
1872/* async pool handler */ 2020/* async pool handler */
1873 2021
1951 2099
1952static void 2100static void
1953coro_rouse_callback (pTHX_ CV *cv) 2101coro_rouse_callback (pTHX_ CV *cv)
1954{ 2102{
1955 dXSARGS; 2103 dXSARGS;
1956 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
1957 2105
1958 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2106 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1959 { 2107 {
1960 /* first call, set args */ 2108 /* first call, set args */
2109 SV *coro = SvRV (data);
1961 AV *av = newAV (); 2110 AV *av = newAV ();
1962 SV *coro = SvRV (data);
1963 2111
1964 SvRV_set (data, (SV *)av); 2112 SvRV_set (data, (SV *)av);
1965 api_ready (aTHX_ coro);
1966 SvREFCNT_dec (coro);
1967 2113
1968 /* better take a full copy of the arguments */ 2114 /* better take a full copy of the arguments */
1969 while (items--) 2115 while (items--)
1970 av_store (av, items, newSVsv (ST (items))); 2116 av_store (av, items, newSVsv (ST (items)));
2117
2118 api_ready (aTHX_ coro);
2119 SvREFCNT_dec (coro);
1971 } 2120 }
1972 2121
1973 XSRETURN_EMPTY; 2122 XSRETURN_EMPTY;
1974} 2123}
1975 2124
1992 2141
1993 EXTEND (SP, AvFILLp (av) + 1); 2142 EXTEND (SP, AvFILLp (av) + 1);
1994 for (i = 0; i <= AvFILLp (av); ++i) 2143 for (i = 0; i <= AvFILLp (av); ++i)
1995 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2144 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1996 2145
1997 /* we have stolen the elements, so ste length to zero and free */ 2146 /* we have stolen the elements, so set length to zero and free */
1998 AvFILLp (av) = -1; 2147 AvFILLp (av) = -1;
1999 av_undef (av); 2148 av_undef (av);
2000 2149
2001 PUTBACK; 2150 PUTBACK;
2002 } 2151 }
2026 || SvTYPE (SvRV (cb)) != SVt_PVCV 2175 || SvTYPE (SvRV (cb)) != SVt_PVCV
2027 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2028 croak ("Coro::rouse_wait called with illegal callback argument,"); 2177 croak ("Coro::rouse_wait called with illegal callback argument,");
2029 2178
2030 { 2179 {
2031 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2032 SV *data = (SV *)GENSUB_ARG; 2181 SV *data = (SV *)S_GENSUB_ARG;
2033 2182
2034 frame->data = (void *)data; 2183 frame->data = (void *)data;
2035 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2184 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2036 frame->check = slf_check_rouse_wait; 2185 frame->check = slf_check_rouse_wait;
2037 } 2186 }
2041coro_new_rouse_cb (pTHX) 2190coro_new_rouse_cb (pTHX)
2042{ 2191{
2043 HV *hv = (HV *)SvRV (coro_current); 2192 HV *hv = (HV *)SvRV (coro_current);
2044 struct coro *coro = SvSTATE_hv (hv); 2193 struct coro *coro = SvSTATE_hv (hv);
2045 SV *data = newRV_inc ((SV *)hv); 2194 SV *data = newRV_inc ((SV *)hv);
2046 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2195 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2047 2196
2048 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2197 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2049 SvREFCNT_dec (data); /* magicext increases the refcount */ 2198 SvREFCNT_dec (data); /* magicext increases the refcount */
2050 2199
2051 SvREFCNT_dec (coro->rouse_cb); 2200 SvREFCNT_dec (coro->rouse_cb);
2276 if (PL_op->op_flags & OPf_STACKED) 2425 if (PL_op->op_flags & OPf_STACKED)
2277 { 2426 {
2278 if (items > slf_arga) 2427 if (items > slf_arga)
2279 { 2428 {
2280 slf_arga = items; 2429 slf_arga = items;
2281 free (slf_argv); 2430 Safefree (slf_argv);
2282 slf_argv = malloc (slf_arga * sizeof (SV *)); 2431 New (0, slf_argv, slf_arga, SV *);
2283 } 2432 }
2284 2433
2285 slf_argc = items; 2434 slf_argc = items;
2286 2435
2287 for (i = 0; i < items; ++i) 2436 for (i = 0; i < items; ++i)
2292 2441
2293 PL_op->op_ppaddr = pp_slf; 2442 PL_op->op_ppaddr = pp_slf;
2294 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2443 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2295 2444
2296 PL_op = (OP *)&slf_restore; 2445 PL_op = (OP *)&slf_restore;
2446}
2447
2448/*****************************************************************************/
2449/* dynamic wind */
2450
2451static void
2452on_enterleave_call (pTHX_ SV *cb)
2453{
2454 dSP;
2455
2456 PUSHSTACK;
2457
2458 PUSHMARK (SP);
2459 PUTBACK;
2460 call_sv (cb, G_VOID | G_DISCARD);
2461 SPAGAIN;
2462
2463 POPSTACK;
2464}
2465
2466static SV *
2467coro_avp_pop_and_free (pTHX_ AV **avp)
2468{
2469 AV *av = *avp;
2470 SV *res = av_pop (av);
2471
2472 if (AvFILLp (av) < 0)
2473 {
2474 *avp = 0;
2475 SvREFCNT_dec (av);
2476 }
2477
2478 return res;
2479}
2480
2481static void
2482coro_pop_on_enter (pTHX_ void *coro)
2483{
2484 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2485 SvREFCNT_dec (cb);
2486}
2487
2488static void
2489coro_pop_on_leave (pTHX_ void *coro)
2490{
2491 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2492 on_enterleave_call (aTHX_ sv_2mortal (cb));
2297} 2493}
2298 2494
2299/*****************************************************************************/ 2495/*****************************************************************************/
2300/* PerlIO::cede */ 2496/* PerlIO::cede */
2301 2497
2375/* Coro::Semaphore & Coro::Signal */ 2571/* Coro::Semaphore & Coro::Signal */
2376 2572
2377static SV * 2573static SV *
2378coro_waitarray_new (pTHX_ int count) 2574coro_waitarray_new (pTHX_ int count)
2379{ 2575{
2380 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2576 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2381 AV *av = newAV (); 2577 AV *av = newAV ();
2382 SV **ary; 2578 SV **ary;
2383 2579
2384 /* unfortunately, building manually saves memory */ 2580 /* unfortunately, building manually saves memory */
2385 Newx (ary, 2, SV *); 2581 Newx (ary, 2, SV *);
2527{ 2723{
2528 if (items >= 2) 2724 if (items >= 2)
2529 { 2725 {
2530 /* callback form */ 2726 /* callback form */
2531 AV *av = (AV *)SvRV (arg [0]); 2727 AV *av = (AV *)SvRV (arg [0]);
2532 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2728 SV *cb_cv = s_get_cv_croak (arg [1]);
2533 2729
2534 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2730 av_push (av, SvREFCNT_inc_NN (cb_cv));
2535 2731
2536 if (SvIVX (AvARRAY (av)[0]) > 0) 2732 if (SvIVX (AvARRAY (av)[0]) > 0)
2537 coro_semaphore_adjust (aTHX_ av, 0); 2733 coro_semaphore_adjust (aTHX_ av, 0);
2538 2734
2539 frame->prepare = prepare_nop; 2735 frame->prepare = prepare_nop;
2563 AvARRAY (av)[0] = AvARRAY (av)[1]; 2759 AvARRAY (av)[0] = AvARRAY (av)[1];
2564 AvARRAY (av)[1] = cb; 2760 AvARRAY (av)[1] = cb;
2565 2761
2566 cb = av_shift (av); 2762 cb = av_shift (av);
2567 2763
2764 if (SvTYPE (cb) == SVt_PVCV)
2765 {
2766 dSP;
2767 PUSHMARK (SP);
2768 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2769 PUTBACK;
2770 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2771 }
2772 else
2773 {
2568 api_ready (aTHX_ cb); 2774 api_ready (aTHX_ cb);
2569 sv_setiv (cb, 0); /* signal waiter */ 2775 sv_setiv (cb, 0); /* signal waiter */
2776 }
2777
2570 SvREFCNT_dec (cb); 2778 SvREFCNT_dec (cb);
2571 2779
2572 --count; 2780 --count;
2573 } 2781 }
2574} 2782}
2583static void 2791static void
2584slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2792slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2585{ 2793{
2586 AV *av = (AV *)SvRV (arg [0]); 2794 AV *av = (AV *)SvRV (arg [0]);
2587 2795
2796 if (items >= 2)
2797 {
2798 SV *cb_cv = s_get_cv_croak (arg [1]);
2799 av_push (av, SvREFCNT_inc_NN (cb_cv));
2800
2588 if (SvIVX (AvARRAY (av)[0])) 2801 if (SvIVX (AvARRAY (av)[0]))
2802 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2803
2804 frame->prepare = prepare_nop;
2805 frame->check = slf_check_nop;
2806 }
2807 else if (SvIVX (AvARRAY (av)[0]))
2589 { 2808 {
2590 SvIVX (AvARRAY (av)[0]) = 0; 2809 SvIVX (AvARRAY (av)[0]) = 0;
2591 frame->prepare = prepare_nop; 2810 frame->prepare = prepare_nop;
2592 frame->check = slf_check_nop; 2811 frame->check = slf_check_nop;
2593 } 2812 }
2594 else 2813 else
2595 { 2814 {
2596 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2815 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2597 2816
2598 av_push (av, waiter); 2817 av_push (av, waiter);
2599 2818
2600 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2819 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2601 frame->prepare = prepare_schedule; 2820 frame->prepare = prepare_schedule;
2619 2838
2620static void 2839static void
2621coro_aio_callback (pTHX_ CV *cv) 2840coro_aio_callback (pTHX_ CV *cv)
2622{ 2841{
2623 dXSARGS; 2842 dXSARGS;
2624 AV *state = (AV *)GENSUB_ARG; 2843 AV *state = (AV *)S_GENSUB_ARG;
2625 SV *coro = av_pop (state); 2844 SV *coro = av_pop (state);
2626 SV *data_sv = newSV (sizeof (struct io_state)); 2845 SV *data_sv = newSV (sizeof (struct io_state));
2627 2846
2628 av_extend (state, items - 1); 2847 av_extend (state, items - 1);
2629 2848
2743 2962
2744 for (i = 0; i < items; ++i) 2963 for (i = 0; i < items; ++i)
2745 PUSHs (arg [i]); 2964 PUSHs (arg [i]);
2746 2965
2747 /* now push the callback closure */ 2966 /* now push the callback closure */
2748 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2967 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2749 2968
2750 /* now call the AIO function - we assume our request is uncancelable */ 2969 /* now call the AIO function - we assume our request is uncancelable */
2751 PUTBACK; 2970 PUTBACK;
2752 call_sv ((SV *)req, G_VOID | G_DISCARD); 2971 call_sv ((SV *)req, G_VOID | G_DISCARD);
2753 } 2972 }
2754 2973
2755 /* now that the requets is going, we loop toll we have a result */ 2974 /* now that the request is going, we loop till we have a result */
2756 frame->data = (void *)state; 2975 frame->data = (void *)state;
2757 frame->prepare = prepare_schedule; 2976 frame->prepare = prepare_schedule;
2758 frame->check = slf_check_aio_req; 2977 frame->check = slf_check_aio_req;
2759} 2978}
2760 2979
2771/*****************************************************************************/ 2990/*****************************************************************************/
2772 2991
2773#if CORO_CLONE 2992#if CORO_CLONE
2774# include "clone.c" 2993# include "clone.c"
2775#endif 2994#endif
2995
2996/*****************************************************************************/
2997
2998static SV *
2999coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3000{
3001 SV *coro_sv;
3002 struct coro *coro;
3003 MAGIC *mg;
3004 HV *hv;
3005 SV *cb;
3006 int i;
3007
3008 if (argc > 0)
3009 {
3010 cb = s_get_cv_croak (argv [0]);
3011
3012 if (!is_coro)
3013 {
3014 if (CvISXSUB (cb))
3015 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3016
3017 if (!CvROOT (cb))
3018 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3019 }
3020 }
3021
3022 Newz (0, coro, 1, struct coro);
3023 coro->args = newAV ();
3024 coro->flags = CF_NEW;
3025
3026 if (coro_first) coro_first->prev = coro;
3027 coro->next = coro_first;
3028 coro_first = coro;
3029
3030 coro->hv = hv = newHV ();
3031 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3032 mg->mg_flags |= MGf_DUP;
3033 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3034
3035 if (argc > 0)
3036 {
3037 av_extend (coro->args, argc + is_coro - 1);
3038
3039 if (is_coro)
3040 {
3041 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3042 cb = (SV *)cv_coro_run;
3043 }
3044
3045 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3046
3047 for (i = 1; i < argc; i++)
3048 av_push (coro->args, newSVsv (argv [i]));
3049 }
3050
3051 return coro_sv;
3052}
2776 3053
2777MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2778 3055
2779PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2780 3057
2840 3117
2841 if (!svp) croak ("Time::HiRes is required"); 3118 if (!svp) croak ("Time::HiRes is required");
2842 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2843 3120
2844 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2845 } 3125 }
2846 3126
2847 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2848} 3128}
2849 3129
2850SV * 3130SV *
2851new (char *klass, ...) 3131new (SV *klass, ...)
2852 ALIAS: 3132 ALIAS:
2853 Coro::new = 1 3133 Coro::new = 1
2854 CODE: 3134 CODE:
2855{ 3135 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2856 struct coro *coro; 3136 OUTPUT:
2857 MAGIC *mg;
2858 HV *hv;
2859 CV *cb;
2860 int i;
2861
2862 if (items > 1)
2863 {
2864 cb = coro_sv_2cv (aTHX_ ST (1));
2865
2866 if (!ix)
2867 {
2868 if (CvISXSUB (cb))
2869 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2870
2871 if (!CvROOT (cb))
2872 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2873 }
2874 }
2875
2876 Newz (0, coro, 1, struct coro);
2877 coro->args = newAV ();
2878 coro->flags = CF_NEW;
2879
2880 if (coro_first) coro_first->prev = coro;
2881 coro->next = coro_first;
2882 coro_first = coro;
2883
2884 coro->hv = hv = newHV ();
2885 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2886 mg->mg_flags |= MGf_DUP;
2887 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2888
2889 if (items > 1)
2890 {
2891 av_extend (coro->args, items - 1 + ix - 1);
2892
2893 if (ix)
2894 {
2895 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2896 cb = cv_coro_run;
2897 }
2898
2899 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2900
2901 for (i = 2; i < items; i++)
2902 av_push (coro->args, newSVsv (ST (i)));
2903 }
2904}
2905 OUTPUT:
2906 RETVAL 3137 RETVAL
2907 3138
2908void 3139void
2909transfer (...) 3140transfer (...)
2910 PROTOTYPE: $$ 3141 PROTOTYPE: $$
2999 eval = 1 3230 eval = 1
3000 CODE: 3231 CODE:
3001{ 3232{
3002 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3003 { 3234 {
3004 struct coro temp; 3235 struct coro *current = SvSTATE_current;
3005 3236
3006 if (!(coro->flags & CF_RUNNING)) 3237 if (current != coro)
3007 { 3238 {
3008 PUTBACK; 3239 PUTBACK;
3009 save_perl (aTHX_ &temp); 3240 save_perl (aTHX_ current);
3010 load_perl (aTHX_ coro); 3241 load_perl (aTHX_ coro);
3242 SPAGAIN;
3011 } 3243 }
3012 3244
3013 {
3014 dSP;
3015 ENTER;
3016 SAVETMPS;
3017 PUTBACK;
3018 PUSHSTACK; 3245 PUSHSTACK;
3246
3019 PUSHMARK (SP); 3247 PUSHMARK (SP);
3248 PUTBACK;
3020 3249
3021 if (ix) 3250 if (ix)
3022 eval_sv (coderef, 0); 3251 eval_sv (coderef, 0);
3023 else 3252 else
3024 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3253 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3025 3254
3026 POPSTACK; 3255 POPSTACK;
3027 SPAGAIN; 3256 SPAGAIN;
3028 FREETMPS;
3029 LEAVE;
3030 PUTBACK;
3031 }
3032 3257
3033 if (!(coro->flags & CF_RUNNING)) 3258 if (current != coro)
3034 { 3259 {
3260 PUTBACK;
3035 save_perl (aTHX_ coro); 3261 save_perl (aTHX_ coro);
3036 load_perl (aTHX_ &temp); 3262 load_perl (aTHX_ current);
3037 SPAGAIN; 3263 SPAGAIN;
3038 } 3264 }
3039 } 3265 }
3040} 3266}
3041 3267
3045 ALIAS: 3271 ALIAS:
3046 is_ready = CF_READY 3272 is_ready = CF_READY
3047 is_running = CF_RUNNING 3273 is_running = CF_RUNNING
3048 is_new = CF_NEW 3274 is_new = CF_NEW
3049 is_destroyed = CF_DESTROYED 3275 is_destroyed = CF_DESTROYED
3276 is_suspended = CF_SUSPENDED
3050 CODE: 3277 CODE:
3051 RETVAL = boolSV (coro->flags & ix); 3278 RETVAL = boolSV (coro->flags & ix);
3052 OUTPUT: 3279 OUTPUT:
3053 RETVAL 3280 RETVAL
3054 3281
3055void 3282void
3056throw (Coro::State self, SV *throw = &PL_sv_undef) 3283throw (Coro::State self, SV *exception = &PL_sv_undef)
3057 PROTOTYPE: $;$ 3284 PROTOTYPE: $;$
3058 CODE: 3285 CODE:
3059{ 3286{
3060 struct coro *current = SvSTATE_current; 3287 struct coro *current = SvSTATE_current;
3061 SV **throwp = self == current ? &CORO_THROW : &self->except; 3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3062 SvREFCNT_dec (*throwp); 3289 SvREFCNT_dec (*exceptionp);
3063 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3290 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3064} 3292}
3065 3293
3066void 3294void
3067api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3068 PROTOTYPE: $;$ 3296 PROTOTYPE: $;$
3119 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3347 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3120 3348
3121 SV *tmp = *src; *src = *dst; *dst = tmp; 3349 SV *tmp = *src; *src = *dst; *dst = tmp;
3122 } 3350 }
3123 3351
3352void
3353cancel (Coro::State self)
3354 CODE:
3355 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358
3359SV *
3360enable_times (int enabled = enable_times)
3361 CODE:
3362{
3363 RETVAL = boolSV (enable_times);
3364
3365 if (enabled != enable_times)
3366 {
3367 enable_times = enabled;
3368
3369 coro_times_update ();
3370 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3371 }
3372}
3373 OUTPUT:
3374 RETVAL
3375
3376void
3377times (Coro::State self)
3378 PPCODE:
3379{
3380 struct coro *current = SvSTATE (coro_current);
3381
3382 if (expect_false (current == self))
3383 {
3384 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current));
3386 }
3387
3388 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391
3392 if (expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current));
3394}
3395
3396void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3398 CODE:
3399{
3400 struct coro *current = SvSTATE_current;
3401
3402 if (current == coro)
3403 SWAP_SVS (current);
3404
3405 if (!coro->swap_sv)
3406 coro->swap_sv = newAV ();
3407
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3409 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3410
3411 if (current == coro)
3412 SWAP_SVS (current);
3413}
3414
3124 3415
3125MODULE = Coro::State PACKAGE = Coro 3416MODULE = Coro::State PACKAGE = Coro
3126 3417
3127BOOT: 3418BOOT:
3128{ 3419{
3129 int i;
3130
3131 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3132 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3133 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3134 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3135 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3139 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3140 3429
3141 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3142 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3143 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3144 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3145 3434
3146 coro_stash = gv_stashpv ("Coro", TRUE); 3435 coro_stash = gv_stashpv ("Coro", TRUE);
3147 3436
3148 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3149 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3150 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3151 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3440 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3152 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3441 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3153 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3442 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3154
3155 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3156 coro_ready[i] = newAV ();
3157 3443
3158 { 3444 {
3159 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3445 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3160 3446
3161 coroapi.schedule = api_schedule; 3447 coroapi.schedule = api_schedule;
3171 sv_setiv (sv, (IV)&coroapi); 3457 sv_setiv (sv, (IV)&coroapi);
3172 SvREADONLY_on (sv); 3458 SvREADONLY_on (sv);
3173 } 3459 }
3174} 3460}
3175 3461
3462SV *
3463async (...)
3464 PROTOTYPE: &@
3465 CODE:
3466 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3467 api_ready (aTHX_ RETVAL);
3468 OUTPUT:
3469 RETVAL
3470
3176void 3471void
3177terminate (...) 3472terminate (...)
3178 CODE: 3473 CODE:
3179 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3474 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3180 3475
3200 3495
3201void 3496void
3202cede_notself (...) 3497cede_notself (...)
3203 CODE: 3498 CODE:
3204 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3499 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3205
3206void
3207_cancel (Coro::State self)
3208 CODE:
3209 coro_state_destroy (aTHX_ self);
3210 coro_call_on_destroy (aTHX_ self);
3211 3500
3212void 3501void
3213_set_current (SV *current) 3502_set_current (SV *current)
3214 PROTOTYPE: $ 3503 PROTOTYPE: $
3215 CODE: 3504 CODE:
3219void 3508void
3220_set_readyhook (SV *hook) 3509_set_readyhook (SV *hook)
3221 PROTOTYPE: $ 3510 PROTOTYPE: $
3222 CODE: 3511 CODE:
3223 SvREFCNT_dec (coro_readyhook); 3512 SvREFCNT_dec (coro_readyhook);
3513 SvGETMAGIC (hook);
3514 if (SvOK (hook))
3515 {
3224 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3516 coro_readyhook = newSVsv (hook);
3517 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3518 }
3519 else
3520 {
3521 coro_readyhook = 0;
3522 CORO_READYHOOK = 0;
3523 }
3225 3524
3226int 3525int
3227prio (Coro::State coro, int newprio = 0) 3526prio (Coro::State coro, int newprio = 0)
3228 PROTOTYPE: $;$ 3527 PROTOTYPE: $;$
3229 ALIAS: 3528 ALIAS:
3235 if (items > 1) 3534 if (items > 1)
3236 { 3535 {
3237 if (ix) 3536 if (ix)
3238 newprio = coro->prio - newprio; 3537 newprio = coro->prio - newprio;
3239 3538
3240 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3539 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3241 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3540 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3242 3541
3243 coro->prio = newprio; 3542 coro->prio = newprio;
3244 } 3543 }
3245} 3544}
3246 OUTPUT: 3545 OUTPUT:
3261 RETVAL = coro_nready; 3560 RETVAL = coro_nready;
3262 OUTPUT: 3561 OUTPUT:
3263 RETVAL 3562 RETVAL
3264 3563
3265void 3564void
3565suspend (Coro::State self)
3566 PROTOTYPE: $
3567 CODE:
3568 self->flags |= CF_SUSPENDED;
3569
3570void
3571resume (Coro::State self)
3572 PROTOTYPE: $
3573 CODE:
3574 self->flags &= ~CF_SUSPENDED;
3575
3576void
3266_pool_handler (...) 3577_pool_handler (...)
3267 CODE: 3578 CODE:
3268 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3579 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3269 3580
3270void 3581void
3281 for (i = 1; i < items; ++i) 3592 for (i = 1; i < items; ++i)
3282 av_push (av, SvREFCNT_inc_NN (ST (i))); 3593 av_push (av, SvREFCNT_inc_NN (ST (i)));
3283 3594
3284 if ((SV *)hv == &PL_sv_undef) 3595 if ((SV *)hv == &PL_sv_undef)
3285 { 3596 {
3286 PUSHMARK (SP); 3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3287 EXTEND (SP, 2);
3288 PUSHs (sv_Coro);
3289 PUSHs ((SV *)cv_pool_handler);
3290 PUTBACK;
3291 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3292 SPAGAIN;
3293
3294 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3599 SvREFCNT_dec (sv);
3295 } 3600 }
3296 3601
3297 { 3602 {
3298 struct coro *coro = SvSTATE_hv (hv); 3603 struct coro *coro = SvSTATE_hv (hv);
3299 3604
3323rouse_wait (...) 3628rouse_wait (...)
3324 PROTOTYPE: ;$ 3629 PROTOTYPE: ;$
3325 PPCODE: 3630 PPCODE:
3326 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3631 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3327 3632
3633void
3634on_enter (SV *block)
3635 ALIAS:
3636 on_leave = 1
3637 PROTOTYPE: &
3638 CODE:
3639{
3640 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642
3643 block = s_get_cv_croak (block);
3644
3645 if (!*avp)
3646 *avp = newAV ();
3647
3648 av_push (*avp, SvREFCNT_inc (block));
3649
3650 if (!ix)
3651 on_enterleave_call (aTHX_ block);
3652
3653 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3654 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3655 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3656}
3657
3328 3658
3329MODULE = Coro::State PACKAGE = PerlIO::cede 3659MODULE = Coro::State PACKAGE = PerlIO::cede
3330 3660
3331BOOT: 3661BOOT:
3332 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3662 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3335MODULE = Coro::State PACKAGE = Coro::Semaphore 3665MODULE = Coro::State PACKAGE = Coro::Semaphore
3336 3666
3337SV * 3667SV *
3338new (SV *klass, SV *count = 0) 3668new (SV *klass, SV *count = 0)
3339 CODE: 3669 CODE:
3670{
3671 int semcnt = 1;
3672
3673 if (count)
3674 {
3675 SvGETMAGIC (count);
3676
3677 if (SvOK (count))
3678 semcnt = SvIV (count);
3679 }
3680
3340 RETVAL = sv_bless ( 3681 RETVAL = sv_bless (
3341 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3682 coro_waitarray_new (aTHX_ semcnt),
3342 GvSTASH (CvGV (cv)) 3683 GvSTASH (CvGV (cv))
3343 ); 3684 );
3685}
3344 OUTPUT: 3686 OUTPUT:
3345 RETVAL 3687 RETVAL
3346 3688
3347# helper for Coro::Channel 3689# helper for Coro::Channel and others
3348SV * 3690SV *
3349_alloc (int count) 3691_alloc (int count)
3350 CODE: 3692 CODE:
3351 RETVAL = coro_waitarray_new (aTHX_ count); 3693 RETVAL = coro_waitarray_new (aTHX_ count);
3352 OUTPUT: 3694 OUTPUT:
3410 for (i = 1; i <= wcount; ++i) 3752 for (i = 1; i <= wcount; ++i)
3411 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3753 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3412 } 3754 }
3413} 3755}
3414 3756
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758
3759void
3760_may_delete (SV *sem, int count, int extra_refs)
3761 PPCODE:
3762{
3763 AV *av = (AV *)SvRV (sem);
3764
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES;
3769
3770 XSRETURN_NO;
3771}
3772
3415MODULE = Coro::State PACKAGE = Coro::Signal 3773MODULE = Coro::State PACKAGE = Coro::Signal
3416 3774
3417SV * 3775SV *
3418new (SV *klass) 3776new (SV *klass)
3419 CODE: 3777 CODE:
3490 3848
3491void 3849void
3492_register (char *target, char *proto, SV *req) 3850_register (char *target, char *proto, SV *req)
3493 CODE: 3851 CODE:
3494{ 3852{
3495 CV *req_cv = coro_sv_2cv (aTHX_ req); 3853 SV *req_cv = s_get_cv_croak (req);
3496 /* newXSproto doesn't return the CV on 5.8 */ 3854 /* newXSproto doesn't return the CV on 5.8 */
3497 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3855 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3498 sv_setpv ((SV *)slf_cv, proto); 3856 sv_setpv ((SV *)slf_cv, proto);
3499 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3857 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3500} 3858}
3501 3859
3860MODULE = Coro::State PACKAGE = Coro::Select
3861
3862void
3863patch_pp_sselect ()
3864 CODE:
3865 if (!coro_old_pp_sselect)
3866 {
3867 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3868 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3869 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3870 }
3871
3872void
3873unpatch_pp_sselect ()
3874 CODE:
3875 if (coro_old_pp_sselect)
3876 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0;
3879 }
3880
3881

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines