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.342 by root, Mon Dec 15 16:22:34 2008 UTC vs.
Revision 1.392 by root, Fri Apr 29 15:43:27 2011 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>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
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 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
137 88
138#define IN_DESTRUCT PL_dirty 89#define IN_DESTRUCT PL_dirty
139 90
140#if __GNUC__ >= 3 91#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 94# define INLINE static inline
144#else 95#else
145# define attribute(x) 96# define attribute(x)
146# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
147# define INLINE static 98# define INLINE static
159# if CORO_PTHREAD 110# if CORO_PTHREAD
160static void *coro_thx; 111static void *coro_thx;
161# endif 112# endif
162#endif 113#endif
163 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
164static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
165 127
166/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
169 131
190static SV *sv_pool_size; 152static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 156static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 157
197/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
198static SV *sv_activity; 159static SV *sv_activity;
160
161/* enable processtime/realtime profiling */
162static char enable_times;
163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
199 166
200static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
202 169
203enum { 170enum {
261/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
262struct coro { 229struct coro {
263 /* the C coroutine allocated to this perl coroutine, if any */ 230 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 231 coro_cctx *cctx;
265 232
233 /* ready queue */
234 struct coro *next_ready;
235
266 /* state data */ 236 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 237 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 238 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 239 perl_slots *slot; /* basically the saved sp */
270 240
271 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
272 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
273 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
274 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
275 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
276 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
277 247
278 /* statistics */ 248 /* statistics */
279 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
280 250
281 /* coro process data */ 251 /* coro process data */
290 260
291 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
292 AV *on_enter; 262 AV *on_enter;
293 AV *on_leave; 263 AV *on_leave;
294 264
265 /* swap_sv */
266 AV *swap_sv;
267
268 /* times */
269 coro_ts t_cpu, t_real;
270
295 /* linked list */ 271 /* linked list */
296 struct coro *next, *prev; 272 struct coro *next, *prev;
297}; 273};
298 274
299typedef struct coro *Coro__State; 275typedef struct coro *Coro__State;
304/* the mainr easonw e don't support windows process emulation */ 280/* the mainr easonw e don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 281static struct CoroSLF slf_frame; /* the current slf frame */
306 282
307/** Coro ********************************************************************/ 283/** Coro ********************************************************************/
308 284
309#define PRIO_MAX 3 285#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 286#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 287#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 288#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 289#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 290#define CORO_PRIO_MIN -4
315 291
316/* for Coro.pm */ 292/* for Coro.pm */
317static SV *coro_current; 293static SV *coro_current;
318static SV *coro_readyhook; 294static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
321static struct coro *coro_first; 297static struct coro *coro_first;
322#define coro_nready coroapi.nready 298#define coro_nready coroapi.nready
299
300/** Coro::Select ************************************************************/
301
302static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select;
304
305/* horrible hack, but if it works... */
306static OP *
307coro_pp_sselect (pTHX)
308{
309 dSP;
310 PUSHMARK (SP - 4); /* fake argument list */
311 XPUSHs (coro_select_select);
312 PUTBACK;
313
314 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
315 PL_op->op_flags |= OPf_STACKED;
316 PL_op->op_private = 0;
317 return PL_ppaddr [OP_ENTERSUB](aTHX);
318}
319
320/** time stuff **************************************************************/
321
322#ifdef HAS_GETTIMEOFDAY
323
324static void
325coro_u2time (pTHX_ UV ret[2])
326{
327 struct timeval tv;
328 gettimeofday (&tv, 0);
329
330 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec;
332}
333
334static double
335coro_nvtime ()
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 return tv.tv_sec + tv.tv_usec * 1e-6;
341}
342
343static void
344time_init (pTHX)
345{
346 nvtime = coro_nvtime;
347 u2time = coro_u2time;
348}
349
350#else
351
352static void
353time_init (pTHX)
354{
355 SV **svp;
356
357 require_pv ("Time/HiRes.pm");
358
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360
361 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363
364 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
368}
369
370#endif
323 371
324/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
325 373
326static SV * 374static SV *
327coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
351 get_hv (name, create); 399 get_hv (name, create);
352#endif 400#endif
353 return get_hv (name, create); 401 return get_hv (name, create);
354} 402}
355 403
356/* may croak */ 404INLINE void
357INLINE CV * 405coro_times_update ()
358coro_sv_2cv (pTHX_ SV *sv)
359{ 406{
360 HV *st; 407#ifdef coro_clock_gettime
361 GV *gvp; 408 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 409
364 if (!cv) 410 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 411 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
412 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 413
367 return cv; 414 ts.tv_sec = ts.tv_nsec = 0;
415 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
416 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
417#else
418 dTHX;
419 UV tv[2];
420
421 u2time (aTHX_ tv);
422 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000;
424#endif
425}
426
427INLINE void
428coro_times_add (struct coro *c)
429{
430 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0];
433
434 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0];
437}
438
439INLINE void
440coro_times_sub (struct coro *c)
441{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0];
445
446 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
447 c->t_cpu [1] -= time_cpu [1];
448 c->t_cpu [0] -= time_cpu [0];
368} 449}
369 450
370/*****************************************************************************/ 451/*****************************************************************************/
371/* magic glue */ 452/* magic glue */
372 453
472static int 553static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 554coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 555{
475 AV *padlist; 556 AV *padlist;
476 AV *av = (AV *)mg->mg_obj; 557 AV *av = (AV *)mg->mg_obj;
558
559 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT)
561 return 0;
477 562
478 /* casting is fun. */ 563 /* casting is fun. */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
480 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
481 566
530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
531} 616}
532 617
533/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
534 619
620/* swap sv heads, at least logically */
621static void
622swap_svs (pTHX_ Coro__State c)
623{
624 int i;
625
626 for (i = 0; i <= AvFILLp (c->swap_sv); )
627 {
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665}
666
667#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro))
670
535static void 671static void
536on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
537 673
538static void 674static void
539load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
570 } 706 }
571 707
572 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 709 CORO_THROW = c->except;
574 710
711 if (expect_false (enable_times))
712 {
713 if (expect_false (!times_valid))
714 coro_times_update ();
715
716 coro_times_sub (c);
717 }
718
575 if (expect_false (c->on_enter)) 719 if (expect_false (c->on_enter))
576 { 720 {
577 int i; 721 int i;
578 722
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 } 725 }
726
727 SWAP_SVS (c);
582} 728}
583 729
584static void 730static void
585save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
586{ 732{
733 SWAP_SVS (c);
734
587 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
588 { 736 {
589 int i; 737 int i;
590 738
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 }
742
743 times_valid = 0;
744
745 if (expect_false (enable_times))
746 {
747 coro_times_update (); times_valid = 1;
748 coro_times_add (c);
593 } 749 }
594 750
595 c->except = CORO_THROW; 751 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
597 753
612 { 768 {
613 while (expect_true (cxix >= 0)) 769 while (expect_true (cxix >= 0))
614 { 770 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 771 PERL_CONTEXT *cx = &ccstk[cxix--];
616 772
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 774 {
619 CV *cv = cx->blk_sub.cv; 775 CV *cv = cx->blk_sub.cv;
620 776
621 if (expect_true (CvDEPTH (cv))) 777 if (expect_true (CvDEPTH (cv)))
622 { 778 {
646 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
647 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
650 { 806 {
651 int i; 807 unsigned int i;
652 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
653 CXINC; 809 CXINC;
654 } 810 }
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
656 812
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 1047{
892 return 1; 1048 return 1;
893} 1049}
894 1050
895static UNOP coro_setup_op; 1051static UNOP init_perl_op;
896 1052
897static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053static void NOINLINE /* noinline to keep it out of the transfer fast path */
898coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
899{ 1055{
900 /* 1056 /*
901 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
902 */ 1058 */
903 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
910 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
912 PL_curpm = 0; 1068 PL_curpm = 0;
913 PL_curpad = 0; 1069 PL_curpad = 0;
914 PL_localizing = 0; 1070 PL_localizing = 0;
915 PL_dirty = 0;
916 PL_restartop = 0; 1071 PL_restartop = 0;
917#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
918 PL_parser = 0; 1073 PL_parser = 0;
919#endif 1074#endif
920 PL_hints = 0; 1075 PL_hints = 0;
952 */ 1107 */
953 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
954 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
955 1110
956 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
957 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
960 /* no flags etc. required, as an init function won't be called */ 1115 /* no flags etc. required, as an init function won't be called */
961 1116
962 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
963 1118
964 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
965 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
1121
1122 SWAP_SVS (coro);
1123
1124 if (expect_false (enable_times))
1125 {
1126 coro_times_update ();
1127 coro_times_sub (coro);
1128 }
966} 1129}
967 1130
968static void 1131static void
969coro_unwind_stacks (pTHX) 1132coro_unwind_stacks (pTHX)
970{ 1133{
985 dounwind (-1); 1148 dounwind (-1);
986 } 1149 }
987} 1150}
988 1151
989static void 1152static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
991{ 1154{
1155 SV *svf [9];
1156
1157 {
1158 struct coro *current = SvSTATE_current;
1159
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161
1162 save_perl (aTHX_ current);
1163 load_perl (aTHX_ coro);
1164
992 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
993 1167
994 SvREFCNT_dec (GvSV (PL_defgv)); 1168 /* restore swapped sv's */
995 SvREFCNT_dec (GvAV (PL_defgv)); 1169 SWAP_SVS (coro);
996 SvREFCNT_dec (GvSV (PL_errgv));
997 SvREFCNT_dec (PL_defoutgv);
998 SvREFCNT_dec (PL_rs);
999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
1001 1170
1002 SvREFCNT_dec (PL_diehook); 1171 // now save some sv's to be free'd later
1003 SvREFCNT_dec (PL_warnhook); 1172 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs;
1177 svf [5] = GvSV (irsgv);
1178 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf));
1182
1183 load_perl (aTHX_ current);
1004 1184 }
1185
1186 {
1187 unsigned int i;
1188
1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1190 SvREFCNT_dec (svf [i]);
1191
1005 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1193 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1194 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1195 SvREFCNT_dec (coro->invoke_av);
1009 1196 }
1010 coro_destruct_stacks (aTHX);
1011} 1197}
1012 1198
1013INLINE void 1199INLINE void
1014free_coro_mortal (pTHX) 1200free_coro_mortal (pTHX)
1015{ 1201{
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1398 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1215 /* 1401 /*
1216 * Unfortunately, there is no way to get at the return values of the 1402 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1403 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1404 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1405 */
1219 1406
1220 /* 1407 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1408 * If perl-run returns we assume exit() was being called or the coro
1222 * fell off the end, which seems to be the only valid (non-bug) 1409 * fell off the end, which seems to be the only valid (non-bug)
1429 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1430 { 1617 {
1431 /* need to start coroutine */ 1618 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1620 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1435 } 1622 }
1436 else 1623 else
1437 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1438 1625
1439 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
1484coro_state_destroy (pTHX_ struct coro *coro) 1671coro_state_destroy (pTHX_ struct coro *coro)
1485{ 1672{
1486 if (coro->flags & CF_DESTROYED) 1673 if (coro->flags & CF_DESTROYED)
1487 return 0; 1674 return 0;
1488 1675
1489 if (coro->on_destroy) 1676 if (coro->on_destroy && !PL_dirty)
1490 coro->on_destroy (aTHX_ coro); 1677 coro->on_destroy (aTHX_ coro);
1491 1678
1492 coro->flags |= CF_DESTROYED; 1679 coro->flags |= CF_DESTROYED;
1493 1680
1494 if (coro->flags & CF_READY) 1681 if (coro->flags & CF_READY)
1502 1689
1503 if (coro->mainstack 1690 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1505 && coro->slot 1692 && coro->slot
1506 && !PL_dirty) 1693 && !PL_dirty)
1507 {
1508 struct coro *current = SvSTATE_current;
1509
1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1511
1512 save_perl (aTHX_ current);
1513 load_perl (aTHX_ coro);
1514
1515 coro_destruct_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1516 1695
1517 load_perl (aTHX_ current); 1696 if (coro->next) coro->next->prev = coro->prev;
1518 1697 if (coro->prev) coro->prev->next = coro->next;
1519 coro->slot = 0; 1698 if (coro == coro_first) coro_first = coro->next;
1520 }
1521 1699
1522 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1526
1527 if (coro->next) coro->next->prev = coro->prev;
1528 if (coro->prev) coro->prev->next = coro->next;
1529 if (coro == coro_first) coro_first = coro->next;
1530 1705
1531 return 1; 1706 return 1;
1532} 1707}
1533 1708
1534static int 1709static int
1584 1759
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1587} 1762}
1588 1763
1589/*****************************************************************************/
1590/* gensub: simple closure generation utility */
1591
1592#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1593
1594/* create a closure from XS, returns a code reference */
1595/* the arg can be accessed via GENSUB_ARG from the callback */
1596/* the callback must use dXSARGS/XSRETURN */
1597static SV *
1598gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1599{
1600 CV *cv = (CV *)newSV (0);
1601
1602 sv_upgrade ((SV *)cv, SVt_PVCV);
1603
1604 CvANON_on (cv);
1605 CvISXSUB_on (cv);
1606 CvXSUB (cv) = xsub;
1607 GENSUB_ARG = arg;
1608
1609 return newRV_noinc ((SV *)cv);
1610}
1611
1612/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1613 1765
1614INLINE void 1766INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1616{ 1768{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1770
1620INLINE SV * 1771 SvREFCNT_inc_NN (coro->hv);
1772
1773 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro;
1776}
1777
1778INLINE struct coro *
1621coro_deq (pTHX) 1779coro_deq (pTHX)
1622{ 1780{
1623 int prio; 1781 int prio;
1624 1782
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1784 {
1627 return av_shift (coro_ready [prio]); 1785 struct coro **ready = coro_ready [prio];
1786
1787 if (ready [0])
1788 {
1789 struct coro *coro = ready [0];
1790 ready [0] = coro->next_ready;
1791 return coro;
1792 }
1793 }
1628 1794
1629 return 0; 1795 return 0;
1796}
1797
1798static void
1799invoke_sv_ready_hook_helper (void)
1800{
1801 dTHX;
1802 dSP;
1803
1804 ENTER;
1805 SAVETMPS;
1806
1807 PUSHMARK (SP);
1808 PUTBACK;
1809 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1810
1811 FREETMPS;
1812 LEAVE;
1630} 1813}
1631 1814
1632static int 1815static int
1633api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1634{ 1817{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1640 1819
1641 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1642 return 0; 1821 return 0;
1643 1822
1644 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1645 1824
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1826
1652 if (sv_hook) 1827 if (!coro_nready++)
1653 { 1828 if (coroapi.readyhook)
1654 dSP; 1829 coroapi.readyhook ();
1655
1656 ENTER;
1657 SAVETMPS;
1658
1659 PUSHMARK (SP);
1660 PUTBACK;
1661 call_sv (sv_hook, G_VOID | G_DISCARD);
1662
1663 FREETMPS;
1664 LEAVE;
1665 }
1666
1667 if (xs_hook)
1668 xs_hook ();
1669 1830
1670 return 1; 1831 return 1;
1671} 1832}
1672 1833
1673static int 1834static int
1696static void 1857static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1858prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1859{
1699 for (;;) 1860 for (;;)
1700 { 1861 {
1701 SV *next_sv = coro_deq (aTHX); 1862 struct coro *next = coro_deq (aTHX);
1702 1863
1703 if (expect_true (next_sv)) 1864 if (expect_true (next))
1704 { 1865 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1866 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1869 else
1711 { 1870 {
1712 next->flags &= ~CF_READY; 1871 next->flags &= ~CF_READY;
1713 --coro_nready; 1872 --coro_nready;
1714 1873
1720 { 1879 {
1721 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1724 { 1883 {
1884 if (SvRV (sv_idle) == SvRV (coro_current))
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1886
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 1889 --coro_nready;
1728 } 1890 }
1729 else 1891 else
1730 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 1894 dSP;
1732 1895
1733 ENTER; 1896 ENTER;
1734 SAVETMPS; 1897 SAVETMPS;
1735 1898
1845 2008
1846static void 2009static void
1847coro_call_on_destroy (pTHX_ struct coro *coro) 2010coro_call_on_destroy (pTHX_ struct coro *coro)
1848{ 2011{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851 2013
1852 if (on_destroyp) 2014 if (on_destroyp)
1853 { 2015 {
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1855 2019
1856 while (AvFILLp (on_destroy) >= 0) 2020 while (AvFILLp (on_destroy) >= 0)
1857 { 2021 {
1858 dSP; /* don't disturb outer sp */ 2022 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy); 2023 SV *cb = av_pop (on_destroy);
1861 PUSHMARK (SP); 2025 PUSHMARK (SP);
1862 2026
1863 if (statusp) 2027 if (statusp)
1864 { 2028 {
1865 int i; 2029 int i;
1866 AV *status = (AV *)SvRV (*statusp);
1867 EXTEND (SP, AvFILLp (status) + 1); 2030 EXTEND (SP, AvFILLp (status) + 1);
1868 2031
1869 for (i = 0; i <= AvFILLp (status); ++i) 2032 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]); 2033 PUSHs (AvARRAY (status)[i]);
1871 } 2034 }
1875 } 2038 }
1876 } 2039 }
1877} 2040}
1878 2041
1879static void 2042static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2043coro_set_status (HV *coro_hv, SV **arg, int items)
1881{ 2044{
1882 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV (); 2045 AV *av = newAV ();
1885 2046
2047 /* items are actually not so common, so optimise for this case */
2048 if (items)
2049 {
2050 int i;
2051
1886 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1887 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1889 2057
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2058 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2059}
1891 2060
2061static void
2062slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2063{
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2064 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 2065 api_ready (aTHX_ sv_manager);
1894 2066
1895 frame->prepare = prepare_schedule; 2067 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat; 2068 frame->check = slf_check_repeat;
1897 2069
1898 /* as a minor optimisation, we could unwind all stacks here */ 2070 /* as a minor optimisation, we could unwind all stacks here */
1899 /* but that puts extra pressure on pp_slf, and is not worth much */ 2071 /* but that puts extra pressure on pp_slf, and is not worth much */
1900 /*coro_unwind_stacks (aTHX);*/ 2072 /*coro_unwind_stacks (aTHX);*/
2073}
2074
2075static void
2076slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2077{
2078 HV *coro_hv = (HV *)SvRV (coro_current);
2079
2080 coro_set_status (coro_hv, arg, items);
2081 slf_init_terminate_cancel_common (frame, coro_hv);
2082}
2083
2084static void
2085slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{
2087 HV *coro_hv;
2088 struct coro *coro;
2089
2090 if (items <= 0)
2091 croak ("Coro::cancel called without coro object,");
2092
2093 coro = SvSTATE (arg [0]);
2094 coro_hv = coro->hv;
2095
2096 coro_set_status (coro_hv, arg + 1, items - 1);
2097
2098 /* cancelling the current coro is allowed, and equals terminate */
2099 if (coro_hv == (HV *)SvRV (coro_current))
2100 slf_init_terminate_cancel_common (frame, coro_hv);
2101 else
2102 {
2103 /* otherwise we cancel ourselves */
2104 coro_state_destroy (aTHX_ coro);
2105 coro_call_on_destroy (aTHX_ coro);
2106
2107 frame->prepare = prepare_nop;
2108 frame->check = slf_check_nop;
2109 }
1901} 2110}
1902 2111
1903/*****************************************************************************/ 2112/*****************************************************************************/
1904/* async pool handler */ 2113/* async pool handler */
1905 2114
1983 2192
1984static void 2193static void
1985coro_rouse_callback (pTHX_ CV *cv) 2194coro_rouse_callback (pTHX_ CV *cv)
1986{ 2195{
1987 dXSARGS; 2196 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2197 SV *data = (SV *)S_GENSUB_ARG;
1989 2198
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2199 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2200 {
1992 /* first call, set args */ 2201 /* first call, set args */
2202 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2203 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2204
1996 SvRV_set (data, (SV *)av); 2205 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2206
2000 /* better take a full copy of the arguments */ 2207 /* better take a full copy of the arguments */
2001 while (items--) 2208 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2209 av_store (av, items, newSVsv (ST (items)));
2210
2211 api_ready (aTHX_ coro);
2212 SvREFCNT_dec (coro);
2003 } 2213 }
2004 2214
2005 XSRETURN_EMPTY; 2215 XSRETURN_EMPTY;
2006} 2216}
2007 2217
2024 2234
2025 EXTEND (SP, AvFILLp (av) + 1); 2235 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2236 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2237 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2238
2029 /* we have stolen the elements, so ste length to zero and free */ 2239 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2240 AvFILLp (av) = -1;
2031 av_undef (av); 2241 av_undef (av);
2032 2242
2033 PUTBACK; 2243 PUTBACK;
2034 } 2244 }
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2268 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2269 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2270 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2271
2062 { 2272 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2273 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2274 SV *data = (SV *)S_GENSUB_ARG;
2065 2275
2066 frame->data = (void *)data; 2276 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2277 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2278 frame->check = slf_check_rouse_wait;
2069 } 2279 }
2073coro_new_rouse_cb (pTHX) 2283coro_new_rouse_cb (pTHX)
2074{ 2284{
2075 HV *hv = (HV *)SvRV (coro_current); 2285 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2286 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2287 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2288 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2289
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2290 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2291 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2292
2083 SvREFCNT_dec (coro->rouse_cb); 2293 SvREFCNT_dec (coro->rouse_cb);
2308 if (PL_op->op_flags & OPf_STACKED) 2518 if (PL_op->op_flags & OPf_STACKED)
2309 { 2519 {
2310 if (items > slf_arga) 2520 if (items > slf_arga)
2311 { 2521 {
2312 slf_arga = items; 2522 slf_arga = items;
2313 free (slf_argv); 2523 Safefree (slf_argv);
2314 slf_argv = malloc (slf_arga * sizeof (SV *)); 2524 New (0, slf_argv, slf_arga, SV *);
2315 } 2525 }
2316 2526
2317 slf_argc = items; 2527 slf_argc = items;
2318 2528
2319 for (i = 0; i < items; ++i) 2529 for (i = 0; i < items; ++i)
2454/* Coro::Semaphore & Coro::Signal */ 2664/* Coro::Semaphore & Coro::Signal */
2455 2665
2456static SV * 2666static SV *
2457coro_waitarray_new (pTHX_ int count) 2667coro_waitarray_new (pTHX_ int count)
2458{ 2668{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2669 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 2670 AV *av = newAV ();
2461 SV **ary; 2671 SV **ary;
2462 2672
2463 /* unfortunately, building manually saves memory */ 2673 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 2674 Newx (ary, 2, SV *);
2606{ 2816{
2607 if (items >= 2) 2817 if (items >= 2)
2608 { 2818 {
2609 /* callback form */ 2819 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 2820 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2821 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 2822
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2823 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 2824
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 2825 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 2826 coro_semaphore_adjust (aTHX_ av, 0);
2617 2827
2618 frame->prepare = prepare_nop; 2828 frame->prepare = prepare_nop;
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 2852 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 2853 AvARRAY (av)[1] = cb;
2644 2854
2645 cb = av_shift (av); 2855 cb = av_shift (av);
2646 2856
2857 if (SvTYPE (cb) == SVt_PVCV)
2858 {
2859 dSP;
2860 PUSHMARK (SP);
2861 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2862 PUTBACK;
2863 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2864 }
2865 else
2866 {
2647 api_ready (aTHX_ cb); 2867 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 2868 sv_setiv (cb, 0); /* signal waiter */
2869 }
2870
2649 SvREFCNT_dec (cb); 2871 SvREFCNT_dec (cb);
2650 2872
2651 --count; 2873 --count;
2652 } 2874 }
2653} 2875}
2662static void 2884static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2885slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 2886{
2665 AV *av = (AV *)SvRV (arg [0]); 2887 AV *av = (AV *)SvRV (arg [0]);
2666 2888
2889 if (items >= 2)
2890 {
2891 SV *cb_cv = s_get_cv_croak (arg [1]);
2892 av_push (av, SvREFCNT_inc_NN (cb_cv));
2893
2667 if (SvIVX (AvARRAY (av)[0])) 2894 if (SvIVX (AvARRAY (av)[0]))
2895 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2896
2897 frame->prepare = prepare_nop;
2898 frame->check = slf_check_nop;
2899 }
2900 else if (SvIVX (AvARRAY (av)[0]))
2668 { 2901 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 2902 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 2903 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 2904 frame->check = slf_check_nop;
2672 } 2905 }
2673 else 2906 else
2674 { 2907 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2908 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 2909
2677 av_push (av, waiter); 2910 av_push (av, waiter);
2678 2911
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2912 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 2913 frame->prepare = prepare_schedule;
2698 2931
2699static void 2932static void
2700coro_aio_callback (pTHX_ CV *cv) 2933coro_aio_callback (pTHX_ CV *cv)
2701{ 2934{
2702 dXSARGS; 2935 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 2936 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 2937 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 2938 SV *data_sv = newSV (sizeof (struct io_state));
2706 2939
2707 av_extend (state, items - 1); 2940 av_extend (state, items - 1);
2708 2941
2822 3055
2823 for (i = 0; i < items; ++i) 3056 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 3057 PUSHs (arg [i]);
2825 3058
2826 /* now push the callback closure */ 3059 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3060 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 3061
2829 /* now call the AIO function - we assume our request is uncancelable */ 3062 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 3063 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 3064 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 3065 }
2833 3066
2834 /* now that the requets is going, we loop toll we have a result */ 3067 /* now that the request is going, we loop till we have a result */
2835 frame->data = (void *)state; 3068 frame->data = (void *)state;
2836 frame->prepare = prepare_schedule; 3069 frame->prepare = prepare_schedule;
2837 frame->check = slf_check_aio_req; 3070 frame->check = slf_check_aio_req;
2838} 3071}
2839 3072
2850/*****************************************************************************/ 3083/*****************************************************************************/
2851 3084
2852#if CORO_CLONE 3085#if CORO_CLONE
2853# include "clone.c" 3086# include "clone.c"
2854#endif 3087#endif
3088
3089/*****************************************************************************/
3090
3091static SV *
3092coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3093{
3094 SV *coro_sv;
3095 struct coro *coro;
3096 MAGIC *mg;
3097 HV *hv;
3098 SV *cb;
3099 int i;
3100
3101 if (argc > 0)
3102 {
3103 cb = s_get_cv_croak (argv [0]);
3104
3105 if (!is_coro)
3106 {
3107 if (CvISXSUB (cb))
3108 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3109
3110 if (!CvROOT (cb))
3111 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3112 }
3113 }
3114
3115 Newz (0, coro, 1, struct coro);
3116 coro->args = newAV ();
3117 coro->flags = CF_NEW;
3118
3119 if (coro_first) coro_first->prev = coro;
3120 coro->next = coro_first;
3121 coro_first = coro;
3122
3123 coro->hv = hv = newHV ();
3124 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3125 mg->mg_flags |= MGf_DUP;
3126 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3127
3128 if (argc > 0)
3129 {
3130 av_extend (coro->args, argc + is_coro - 1);
3131
3132 if (is_coro)
3133 {
3134 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3135 cb = (SV *)cv_coro_run;
3136 }
3137
3138 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3139
3140 for (i = 1; i < argc; i++)
3141 av_push (coro->args, newSVsv (argv [i]));
3142 }
3143
3144 return coro_sv;
3145}
2855 3146
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3147MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 3148
2858PROTOTYPES: DISABLE 3149PROTOTYPES: DISABLE
2859 3150
2912 coroapi.prepare_nop = prepare_nop; 3203 coroapi.prepare_nop = prepare_nop;
2913 coroapi.prepare_schedule = prepare_schedule; 3204 coroapi.prepare_schedule = prepare_schedule;
2914 coroapi.prepare_cede = prepare_cede; 3205 coroapi.prepare_cede = prepare_cede;
2915 coroapi.prepare_cede_notself = prepare_cede_notself; 3206 coroapi.prepare_cede_notself = prepare_cede_notself;
2916 3207
2917 { 3208 time_init (aTHX);
2918 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2919 3209
2920 if (!svp) croak ("Time::HiRes is required");
2921 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2922
2923 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2924 }
2925
2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3210 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2927} 3211}
2928 3212
2929SV * 3213SV *
2930new (char *klass, ...) 3214new (SV *klass, ...)
2931 ALIAS: 3215 ALIAS:
2932 Coro::new = 1 3216 Coro::new = 1
2933 CODE: 3217 CODE:
2934{ 3218 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3219 OUTPUT:
2936 MAGIC *mg;
2937 HV *hv;
2938 CV *cb;
2939 int i;
2940
2941 if (items > 1)
2942 {
2943 cb = coro_sv_2cv (aTHX_ ST (1));
2944
2945 if (!ix)
2946 {
2947 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2949
2950 if (!CvROOT (cb))
2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2953 }
2954
2955 Newz (0, coro, 1, struct coro);
2956 coro->args = newAV ();
2957 coro->flags = CF_NEW;
2958
2959 if (coro_first) coro_first->prev = coro;
2960 coro->next = coro_first;
2961 coro_first = coro;
2962
2963 coro->hv = hv = newHV ();
2964 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2965 mg->mg_flags |= MGf_DUP;
2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2967
2968 if (items > 1)
2969 {
2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2980 for (i = 2; i < items; i++)
2981 av_push (coro->args, newSVsv (ST (i)));
2982 }
2983}
2984 OUTPUT:
2985 RETVAL 3220 RETVAL
2986 3221
2987void 3222void
2988transfer (...) 3223transfer (...)
2989 PROTOTYPE: $$ 3224 PROTOTYPE: $$
2990 CODE: 3225 CODE:
2991 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3226 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2992
2993bool
2994_destroy (SV *coro_sv)
2995 CODE:
2996 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2997 OUTPUT:
2998 RETVAL
2999 3227
3000void 3228void
3001_exit (int code) 3229_exit (int code)
3002 PROTOTYPE: $ 3230 PROTOTYPE: $
3003 CODE: 3231 CODE:
3126 RETVAL = boolSV (coro->flags & ix); 3354 RETVAL = boolSV (coro->flags & ix);
3127 OUTPUT: 3355 OUTPUT:
3128 RETVAL 3356 RETVAL
3129 3357
3130void 3358void
3131throw (Coro::State self, SV *throw = &PL_sv_undef) 3359throw (Coro::State self, SV *exception = &PL_sv_undef)
3132 PROTOTYPE: $;$ 3360 PROTOTYPE: $;$
3133 CODE: 3361 CODE:
3134{ 3362{
3135 struct coro *current = SvSTATE_current; 3363 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3364 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3137 SvREFCNT_dec (*throwp); 3365 SvREFCNT_dec (*exceptionp);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3366 SvGETMAGIC (exception);
3367 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3139} 3368}
3140 3369
3141void 3370void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3371api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3143 PROTOTYPE: $;$ 3372 PROTOTYPE: $;$
3198 3427
3199void 3428void
3200cancel (Coro::State self) 3429cancel (Coro::State self)
3201 CODE: 3430 CODE:
3202 coro_state_destroy (aTHX_ self); 3431 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3432
3433SV *
3434enable_times (int enabled = enable_times)
3435 CODE:
3436{
3437 RETVAL = boolSV (enable_times);
3438
3439 if (enabled != enable_times)
3440 {
3441 enable_times = enabled;
3442
3443 coro_times_update ();
3444 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3445 }
3446}
3447 OUTPUT:
3448 RETVAL
3449
3450void
3451times (Coro::State self)
3452 PPCODE:
3453{
3454 struct coro *current = SvSTATE (coro_current);
3455
3456 if (expect_false (current == self))
3457 {
3458 coro_times_update ();
3459 coro_times_add (SvSTATE (coro_current));
3460 }
3461
3462 EXTEND (SP, 2);
3463 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3464 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3465
3466 if (expect_false (current == self))
3467 coro_times_sub (SvSTATE (coro_current));
3468}
3469
3470void
3471swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3472 CODE:
3473{
3474 struct coro *current = SvSTATE_current;
3475
3476 if (current == coro)
3477 SWAP_SVS (current);
3478
3479 if (!coro->swap_sv)
3480 coro->swap_sv = newAV ();
3481
3482 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3483 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3484
3485 if (current == coro)
3486 SWAP_SVS (current);
3487}
3204 3488
3205 3489
3206MODULE = Coro::State PACKAGE = Coro 3490MODULE = Coro::State PACKAGE = Coro
3207 3491
3208BOOT: 3492BOOT:
3209{ 3493{
3210 int i;
3211
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3494 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3495 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3496 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3497 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3498 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3502 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221 3503
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3504 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3505 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3506 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3507 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3226 3508
3227 coro_stash = gv_stashpv ("Coro", TRUE); 3509 coro_stash = gv_stashpv ("Coro", TRUE);
3228 3510
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3511 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3512 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3513 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3514 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3515 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3516 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3235
3236 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3237 coro_ready[i] = newAV ();
3238 3517
3239 { 3518 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3519 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 3520
3242 coroapi.schedule = api_schedule; 3521 coroapi.schedule = api_schedule;
3252 sv_setiv (sv, (IV)&coroapi); 3531 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 3532 SvREADONLY_on (sv);
3254 } 3533 }
3255} 3534}
3256 3535
3536SV *
3537async (...)
3538 PROTOTYPE: &@
3539 CODE:
3540 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3541 api_ready (aTHX_ RETVAL);
3542 OUTPUT:
3543 RETVAL
3544
3545void
3546_destroy (Coro::State coro)
3547 CODE:
3548 /* used by the manager thread */
3549 coro_state_destroy (aTHX_ coro);
3550 coro_call_on_destroy (aTHX_ coro);
3551
3257void 3552void
3258terminate (...) 3553terminate (...)
3259 CODE: 3554 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3555 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3556
3557void
3558cancel (...)
3559 CODE:
3560 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3261 3561
3262void 3562void
3263schedule (...) 3563schedule (...)
3264 CODE: 3564 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3565 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3294void 3594void
3295_set_readyhook (SV *hook) 3595_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 3596 PROTOTYPE: $
3297 CODE: 3597 CODE:
3298 SvREFCNT_dec (coro_readyhook); 3598 SvREFCNT_dec (coro_readyhook);
3599 SvGETMAGIC (hook);
3600 if (SvOK (hook))
3601 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3602 coro_readyhook = newSVsv (hook);
3603 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3604 }
3605 else
3606 {
3607 coro_readyhook = 0;
3608 CORO_READYHOOK = 0;
3609 }
3300 3610
3301int 3611int
3302prio (Coro::State coro, int newprio = 0) 3612prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 3613 PROTOTYPE: $;$
3304 ALIAS: 3614 ALIAS:
3310 if (items > 1) 3620 if (items > 1)
3311 { 3621 {
3312 if (ix) 3622 if (ix)
3313 newprio = coro->prio - newprio; 3623 newprio = coro->prio - newprio;
3314 3624
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3625 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3626 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 3627
3318 coro->prio = newprio; 3628 coro->prio = newprio;
3319 } 3629 }
3320} 3630}
3321 OUTPUT: 3631 OUTPUT:
3336 RETVAL = coro_nready; 3646 RETVAL = coro_nready;
3337 OUTPUT: 3647 OUTPUT:
3338 RETVAL 3648 RETVAL
3339 3649
3340void 3650void
3651suspend (Coro::State self)
3652 PROTOTYPE: $
3653 CODE:
3654 self->flags |= CF_SUSPENDED;
3655
3656void
3657resume (Coro::State self)
3658 PROTOTYPE: $
3659 CODE:
3660 self->flags &= ~CF_SUSPENDED;
3661
3662void
3341_pool_handler (...) 3663_pool_handler (...)
3342 CODE: 3664 CODE:
3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3665 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3344 3666
3345void 3667void
3356 for (i = 1; i < items; ++i) 3678 for (i = 1; i < items; ++i)
3357 av_push (av, SvREFCNT_inc_NN (ST (i))); 3679 av_push (av, SvREFCNT_inc_NN (ST (i)));
3358 3680
3359 if ((SV *)hv == &PL_sv_undef) 3681 if ((SV *)hv == &PL_sv_undef)
3360 { 3682 {
3361 PUSHMARK (SP); 3683 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3362 EXTEND (SP, 2);
3363 PUSHs (sv_Coro);
3364 PUSHs ((SV *)cv_pool_handler);
3365 PUTBACK;
3366 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3367 SPAGAIN;
3368
3369 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3684 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3685 SvREFCNT_dec (sv);
3370 } 3686 }
3371 3687
3372 { 3688 {
3373 struct coro *coro = SvSTATE_hv (hv); 3689 struct coro *coro = SvSTATE_hv (hv);
3374 3690
3408 CODE: 3724 CODE:
3409{ 3725{
3410 struct coro *coro = SvSTATE_current; 3726 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3727 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412 3728
3413 block = (SV *)coro_sv_2cv (aTHX_ block); 3729 block = s_get_cv_croak (block);
3414 3730
3415 if (!*avp) 3731 if (!*avp)
3416 *avp = newAV (); 3732 *avp = newAV ();
3417 3733
3418 av_push (*avp, SvREFCNT_inc (block)); 3734 av_push (*avp, SvREFCNT_inc (block));
3419 3735
3420 if (!ix) 3736 if (!ix)
3421 on_enterleave_call (aTHX_ block); 3737 on_enterleave_call (aTHX_ block);
3422 3738
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3739 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3424 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 3740 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3425 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3741 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3426} 3742}
3427 3743
3428 3744
3429MODULE = Coro::State PACKAGE = PerlIO::cede 3745MODULE = Coro::State PACKAGE = PerlIO::cede
3430 3746
3435MODULE = Coro::State PACKAGE = Coro::Semaphore 3751MODULE = Coro::State PACKAGE = Coro::Semaphore
3436 3752
3437SV * 3753SV *
3438new (SV *klass, SV *count = 0) 3754new (SV *klass, SV *count = 0)
3439 CODE: 3755 CODE:
3756{
3757 int semcnt = 1;
3758
3759 if (count)
3760 {
3761 SvGETMAGIC (count);
3762
3763 if (SvOK (count))
3764 semcnt = SvIV (count);
3765 }
3766
3440 RETVAL = sv_bless ( 3767 RETVAL = sv_bless (
3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3768 coro_waitarray_new (aTHX_ semcnt),
3442 GvSTASH (CvGV (cv)) 3769 GvSTASH (CvGV (cv))
3443 ); 3770 );
3771}
3444 OUTPUT: 3772 OUTPUT:
3445 RETVAL 3773 RETVAL
3446 3774
3447# helper for Coro::Channel 3775# helper for Coro::Channel and others
3448SV * 3776SV *
3449_alloc (int count) 3777_alloc (int count)
3450 CODE: 3778 CODE:
3451 RETVAL = coro_waitarray_new (aTHX_ count); 3779 RETVAL = coro_waitarray_new (aTHX_ count);
3452 OUTPUT: 3780 OUTPUT:
3510 for (i = 1; i <= wcount; ++i) 3838 for (i = 1; i <= wcount; ++i)
3511 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3839 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3512 } 3840 }
3513} 3841}
3514 3842
3843MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3844
3845void
3846_may_delete (SV *sem, int count, int extra_refs)
3847 PPCODE:
3848{
3849 AV *av = (AV *)SvRV (sem);
3850
3851 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3852 && AvFILLp (av) == 0 /* no waiters, just count */
3853 && SvIV (AvARRAY (av)[0]) == count)
3854 XSRETURN_YES;
3855
3856 XSRETURN_NO;
3857}
3858
3515MODULE = Coro::State PACKAGE = Coro::Signal 3859MODULE = Coro::State PACKAGE = Coro::Signal
3516 3860
3517SV * 3861SV *
3518new (SV *klass) 3862new (SV *klass)
3519 CODE: 3863 CODE:
3590 3934
3591void 3935void
3592_register (char *target, char *proto, SV *req) 3936_register (char *target, char *proto, SV *req)
3593 CODE: 3937 CODE:
3594{ 3938{
3595 CV *req_cv = coro_sv_2cv (aTHX_ req); 3939 SV *req_cv = s_get_cv_croak (req);
3596 /* newXSproto doesn't return the CV on 5.8 */ 3940 /* newXSproto doesn't return the CV on 5.8 */
3597 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3941 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3598 sv_setpv ((SV *)slf_cv, proto); 3942 sv_setpv ((SV *)slf_cv, proto);
3599 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3943 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3600} 3944}
3601 3945
3946MODULE = Coro::State PACKAGE = Coro::Select
3947
3948void
3949patch_pp_sselect ()
3950 CODE:
3951 if (!coro_old_pp_sselect)
3952 {
3953 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3954 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3955 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3956 }
3957
3958void
3959unpatch_pp_sselect ()
3960 CODE:
3961 if (coro_old_pp_sselect)
3962 {
3963 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3964 coro_old_pp_sselect = 0;
3965 }
3966

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines