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.356 by root, Sat Jun 27 14:06:59 2009 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
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 {
274 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
280 247
281 /* statistics */ 248 /* statistics */
282 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
283 250
284 /* coro process data */ 251 /* coro process data */
293 260
294 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
295 AV *on_enter; 262 AV *on_enter;
296 AV *on_leave; 263 AV *on_leave;
297 264
265 /* swap_sv */
266 AV *swap_sv;
267
268 /* times */
269 coro_ts t_cpu, t_real;
270
298 /* linked list */ 271 /* linked list */
299 struct coro *next, *prev; 272 struct coro *next, *prev;
300}; 273};
301 274
302typedef struct coro *Coro__State; 275typedef struct coro *Coro__State;
307/* the mainr easonw e don't support windows process emulation */ 280/* the mainr easonw e don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 281static struct CoroSLF slf_frame; /* the current slf frame */
309 282
310/** Coro ********************************************************************/ 283/** Coro ********************************************************************/
311 284
312#define PRIO_MAX 3 285#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 286#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 287#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 288#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 289#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 290#define CORO_PRIO_MIN -4
318 291
319/* for Coro.pm */ 292/* for Coro.pm */
320static SV *coro_current; 293static SV *coro_current;
321static SV *coro_readyhook; 294static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 297static struct coro *coro_first;
325#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
326 371
327/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
328 373
329static SV * 374static SV *
330coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
354 get_hv (name, create); 399 get_hv (name, create);
355#endif 400#endif
356 return get_hv (name, create); 401 return get_hv (name, create);
357} 402}
358 403
359/* may croak */ 404INLINE void
360INLINE CV * 405coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 406{
363 HV *st; 407#ifdef coro_clock_gettime
364 GV *gvp; 408 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 409
367 if (!cv) 410 ts.tv_sec = ts.tv_nsec = 0;
368 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;
369 413
370 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];
371} 449}
372 450
373/*****************************************************************************/ 451/*****************************************************************************/
374/* magic glue */ 452/* magic glue */
375 453
475static int 553static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 554coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 555{
478 AV *padlist; 556 AV *padlist;
479 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;
480 562
481 /* casting is fun. */ 563 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
484 566
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 616}
535 617
536/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
537 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
538static void 671static void
539on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
540 673
541static void 674static void
542load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
573 } 706 }
574 707
575 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 709 CORO_THROW = c->except;
577 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
578 if (expect_false (c->on_enter)) 719 if (expect_false (c->on_enter))
579 { 720 {
580 int i; 721 int i;
581 722
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 725 }
726
727 SWAP_SVS (c);
585} 728}
586 729
587static void 730static void
588save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
589{ 732{
733 SWAP_SVS (c);
734
590 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
591 { 736 {
592 int i; 737 int i;
593 738
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 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);
596 } 749 }
597 750
598 c->except = CORO_THROW; 751 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
600 753
649 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
653 { 806 {
654 int i; 807 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 809 CXINC;
657 } 810 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 812
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1047{
895 return 1; 1048 return 1;
896} 1049}
897 1050
898static UNOP coro_setup_op; 1051static UNOP init_perl_op;
899 1052
900static 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 */
901coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
902{ 1055{
903 /* 1056 /*
904 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
905 */ 1058 */
906 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
913 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1068 PL_curpm = 0;
916 PL_curpad = 0; 1069 PL_curpad = 0;
917 PL_localizing = 0; 1070 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1071 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1073 PL_parser = 0;
922#endif 1074#endif
923 PL_hints = 0; 1075 PL_hints = 0;
955 */ 1107 */
956 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 */
957 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 */
958 1110
959 /* 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 */
960 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
963 /* 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 */
964 1116
965 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
966 1118
967 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
968 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 }
969} 1129}
970 1130
971static void 1131static void
972coro_unwind_stacks (pTHX) 1132coro_unwind_stacks (pTHX)
973{ 1133{
988 dounwind (-1); 1148 dounwind (-1);
989 } 1149 }
990} 1150}
991 1151
992static void 1152static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
994{ 1154{
995 SV *svf [9]; 1155 SV *svf [9];
996 1156
997 { 1157 {
998 struct coro *current = SvSTATE_current; 1158 struct coro *current = SvSTATE_current;
1002 save_perl (aTHX_ current); 1162 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro); 1163 load_perl (aTHX_ coro);
1004 1164
1005 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX); 1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1007 1170
1008 // now save some sv's to be free'd later 1171 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv); 1172 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1173 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv); 1174 svf [2] = GvSV (PL_errgv);
1019 1182
1020 load_perl (aTHX_ current); 1183 load_perl (aTHX_ current);
1021 } 1184 }
1022 1185
1023 { 1186 {
1024 int i; 1187 unsigned int i;
1025 1188
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1190 SvREFCNT_dec (svf [i]);
1028 1191
1029 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
1235 /* 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 */
1236 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1238 /* 1401 /*
1239 * 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
1240 * 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.
1241 */ 1405 */
1242 1406
1243 /* 1407 /*
1244 * 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
1245 * 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)
1452 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1453 { 1617 {
1454 /* need to start coroutine */ 1618 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1620 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1458 } 1622 }
1459 else 1623 else
1460 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1461 1625
1462 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
1525 1689
1526 if (coro->mainstack 1690 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1528 && coro->slot 1692 && coro->slot
1529 && !PL_dirty) 1693 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1695
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1531 1699
1532 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1536
1537 if (coro->next) coro->next->prev = coro->prev;
1538 if (coro->prev) coro->prev->next = coro->next;
1539 if (coro == coro_first) coro_first = coro->next;
1540 1705
1541 return 1; 1706 return 1;
1542} 1707}
1543 1708
1544static int 1709static int
1594 1759
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1597} 1762}
1598 1763
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1623 1765
1624INLINE void 1766INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1626{ 1768{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1770
1629 SvREFCNT_inc_NN (coro->hv); 1771 SvREFCNT_inc_NN (coro->hv);
1630 1772
1631 coro->next_ready = 0; 1773 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1636INLINE struct coro * 1778INLINE struct coro *
1637coro_deq (pTHX) 1779coro_deq (pTHX)
1638{ 1780{
1639 int prio; 1781 int prio;
1640 1782
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1784 {
1643 struct coro **ready = coro_ready [prio]; 1785 struct coro **ready = coro_ready [prio];
1644 1786
1645 if (ready [0]) 1787 if (ready [0])
1646 { 1788 {
1651 } 1793 }
1652 1794
1653 return 0; 1795 return 0;
1654} 1796}
1655 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;
1813}
1814
1656static int 1815static int
1657api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1658{ 1817{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1664 1819
1665 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1666 return 0; 1821 return 0;
1667 1822
1668 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1669 1824
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1826
1676 if (sv_hook) 1827 if (!coro_nready++)
1677 { 1828 if (coroapi.readyhook)
1678 dSP; 1829 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1830
1694 return 1; 1831 return 1;
1695} 1832}
1696 1833
1697static int 1834static int
1742 { 1879 {
1743 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1746 { 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
1747 ++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 */
1748 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1889 --coro_nready;
1750 } 1890 }
1751 else 1891 else
1752 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1894 dSP;
1754 1895
1755 ENTER; 1896 ENTER;
1756 SAVETMPS; 1897 SAVETMPS;
1757 1898
1867 2008
1868static void 2009static void
1869coro_call_on_destroy (pTHX_ struct coro *coro) 2010coro_call_on_destroy (pTHX_ struct coro *coro)
1870{ 2011{
1871 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);
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873 2013
1874 if (on_destroyp) 2014 if (on_destroyp)
1875 { 2015 {
1876 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;
1877 2019
1878 while (AvFILLp (on_destroy) >= 0) 2020 while (AvFILLp (on_destroy) >= 0)
1879 { 2021 {
1880 dSP; /* don't disturb outer sp */ 2022 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy); 2023 SV *cb = av_pop (on_destroy);
1883 PUSHMARK (SP); 2025 PUSHMARK (SP);
1884 2026
1885 if (statusp) 2027 if (statusp)
1886 { 2028 {
1887 int i; 2029 int i;
1888 AV *status = (AV *)SvRV (*statusp);
1889 EXTEND (SP, AvFILLp (status) + 1); 2030 EXTEND (SP, AvFILLp (status) + 1);
1890 2031
1891 for (i = 0; i <= AvFILLp (status); ++i) 2032 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]); 2033 PUSHs (AvARRAY (status)[i]);
1893 } 2034 }
1897 } 2038 }
1898 } 2039 }
1899} 2040}
1900 2041
1901static void 2042static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2043coro_set_status (HV *coro_hv, SV **arg, int items)
1903{ 2044{
1904 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV (); 2045 AV *av = newAV ();
1907 2046
2047 /* items are actually not so common, so optimise for this case */
2048 if (items)
2049 {
2050 int i;
2051
1908 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1909 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1911 2057
1912 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}
1913 2060
2061static void
2062slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2063{
1914 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 */
1915 api_ready (aTHX_ sv_manager); 2065 api_ready (aTHX_ sv_manager);
1916 2066
1917 frame->prepare = prepare_schedule; 2067 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat; 2068 frame->check = slf_check_repeat;
1919 2069
1920 /* as a minor optimisation, we could unwind all stacks here */ 2070 /* as a minor optimisation, we could unwind all stacks here */
1921 /* 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 */
1922 /*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 }
1923} 2110}
1924 2111
1925/*****************************************************************************/ 2112/*****************************************************************************/
1926/* async pool handler */ 2113/* async pool handler */
1927 2114
2005 2192
2006static void 2193static void
2007coro_rouse_callback (pTHX_ CV *cv) 2194coro_rouse_callback (pTHX_ CV *cv)
2008{ 2195{
2009 dXSARGS; 2196 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2197 SV *data = (SV *)S_GENSUB_ARG;
2011 2198
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2199 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2200 {
2014 /* first call, set args */ 2201 /* first call, set args */
2015 SV *coro = SvRV (data); 2202 SV *coro = SvRV (data);
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2268 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2269 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2270 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2271
2085 { 2272 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2273 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2274 SV *data = (SV *)S_GENSUB_ARG;
2088 2275
2089 frame->data = (void *)data; 2276 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2277 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2278 frame->check = slf_check_rouse_wait;
2092 } 2279 }
2096coro_new_rouse_cb (pTHX) 2283coro_new_rouse_cb (pTHX)
2097{ 2284{
2098 HV *hv = (HV *)SvRV (coro_current); 2285 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2286 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2287 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2288 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2289
2103 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);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2291 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2292
2106 SvREFCNT_dec (coro->rouse_cb); 2293 SvREFCNT_dec (coro->rouse_cb);
2331 if (PL_op->op_flags & OPf_STACKED) 2518 if (PL_op->op_flags & OPf_STACKED)
2332 { 2519 {
2333 if (items > slf_arga) 2520 if (items > slf_arga)
2334 { 2521 {
2335 slf_arga = items; 2522 slf_arga = items;
2336 free (slf_argv); 2523 Safefree (slf_argv);
2337 slf_argv = malloc (slf_arga * sizeof (SV *)); 2524 New (0, slf_argv, slf_arga, SV *);
2338 } 2525 }
2339 2526
2340 slf_argc = items; 2527 slf_argc = items;
2341 2528
2342 for (i = 0; i < items; ++i) 2529 for (i = 0; i < items; ++i)
2629{ 2816{
2630 if (items >= 2) 2817 if (items >= 2)
2631 { 2818 {
2632 /* callback form */ 2819 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 2820 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2821 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 2822
2636 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2823 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 2824
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 2825 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 2826 coro_semaphore_adjust (aTHX_ av, 0);
2699{ 2886{
2700 AV *av = (AV *)SvRV (arg [0]); 2887 AV *av = (AV *)SvRV (arg [0]);
2701 2888
2702 if (items >= 2) 2889 if (items >= 2)
2703 { 2890 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2891 SV *cb_cv = s_get_cv_croak (arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2892 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706 2893
2707 if (SvIVX (AvARRAY (av)[0])) 2894 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2895 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2709 2896
2710 frame->prepare = prepare_nop; 2897 frame->prepare = prepare_nop;
2711 frame->check = slf_check_nop; 2898 frame->check = slf_check_nop;
2712 } 2899 }
2713 else if (SvIVX (AvARRAY (av)[0])) 2900 else if (SvIVX (AvARRAY (av)[0]))
2744 2931
2745static void 2932static void
2746coro_aio_callback (pTHX_ CV *cv) 2933coro_aio_callback (pTHX_ CV *cv)
2747{ 2934{
2748 dXSARGS; 2935 dXSARGS;
2749 AV *state = (AV *)GENSUB_ARG; 2936 AV *state = (AV *)S_GENSUB_ARG;
2750 SV *coro = av_pop (state); 2937 SV *coro = av_pop (state);
2751 SV *data_sv = newSV (sizeof (struct io_state)); 2938 SV *data_sv = newSV (sizeof (struct io_state));
2752 2939
2753 av_extend (state, items - 1); 2940 av_extend (state, items - 1);
2754 2941
2868 3055
2869 for (i = 0; i < items; ++i) 3056 for (i = 0; i < items; ++i)
2870 PUSHs (arg [i]); 3057 PUSHs (arg [i]);
2871 3058
2872 /* now push the callback closure */ 3059 /* now push the callback closure */
2873 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))));
2874 3061
2875 /* now call the AIO function - we assume our request is uncancelable */ 3062 /* now call the AIO function - we assume our request is uncancelable */
2876 PUTBACK; 3063 PUTBACK;
2877 call_sv ((SV *)req, G_VOID | G_DISCARD); 3064 call_sv ((SV *)req, G_VOID | G_DISCARD);
2878 } 3065 }
2879 3066
2880 /* 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 */
2881 frame->data = (void *)state; 3068 frame->data = (void *)state;
2882 frame->prepare = prepare_schedule; 3069 frame->prepare = prepare_schedule;
2883 frame->check = slf_check_aio_req; 3070 frame->check = slf_check_aio_req;
2884} 3071}
2885 3072
2896/*****************************************************************************/ 3083/*****************************************************************************/
2897 3084
2898#if CORO_CLONE 3085#if CORO_CLONE
2899# include "clone.c" 3086# include "clone.c"
2900#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}
2901 3146
2902MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3147MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2903 3148
2904PROTOTYPES: DISABLE 3149PROTOTYPES: DISABLE
2905 3150
2958 coroapi.prepare_nop = prepare_nop; 3203 coroapi.prepare_nop = prepare_nop;
2959 coroapi.prepare_schedule = prepare_schedule; 3204 coroapi.prepare_schedule = prepare_schedule;
2960 coroapi.prepare_cede = prepare_cede; 3205 coroapi.prepare_cede = prepare_cede;
2961 coroapi.prepare_cede_notself = prepare_cede_notself; 3206 coroapi.prepare_cede_notself = prepare_cede_notself;
2962 3207
2963 { 3208 time_init (aTHX);
2964 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2965 3209
2966 if (!svp) croak ("Time::HiRes is required");
2967 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2968
2969 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2970 }
2971
2972 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3210 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2973} 3211}
2974 3212
2975SV * 3213SV *
2976new (char *klass, ...) 3214new (SV *klass, ...)
2977 ALIAS: 3215 ALIAS:
2978 Coro::new = 1 3216 Coro::new = 1
2979 CODE: 3217 CODE:
2980{ 3218 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2981 struct coro *coro; 3219 OUTPUT:
2982 MAGIC *mg;
2983 HV *hv;
2984 CV *cb;
2985 int i;
2986
2987 if (items > 1)
2988 {
2989 cb = coro_sv_2cv (aTHX_ ST (1));
2990
2991 if (!ix)
2992 {
2993 if (CvISXSUB (cb))
2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2995
2996 if (!CvROOT (cb))
2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2999 }
3000
3001 Newz (0, coro, 1, struct coro);
3002 coro->args = newAV ();
3003 coro->flags = CF_NEW;
3004
3005 if (coro_first) coro_first->prev = coro;
3006 coro->next = coro_first;
3007 coro_first = coro;
3008
3009 coro->hv = hv = newHV ();
3010 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3011 mg->mg_flags |= MGf_DUP;
3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3013
3014 if (items > 1)
3015 {
3016 av_extend (coro->args, items - 1 + ix - 1);
3017
3018 if (ix)
3019 {
3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3021 cb = cv_coro_run;
3022 }
3023
3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3025
3026 for (i = 2; i < items; i++)
3027 av_push (coro->args, newSVsv (ST (i)));
3028 }
3029}
3030 OUTPUT:
3031 RETVAL 3220 RETVAL
3032 3221
3033void 3222void
3034transfer (...) 3223transfer (...)
3035 PROTOTYPE: $$ 3224 PROTOTYPE: $$
3036 CODE: 3225 CODE:
3037 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3226 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3038
3039bool
3040_destroy (SV *coro_sv)
3041 CODE:
3042 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3043 OUTPUT:
3044 RETVAL
3045 3227
3046void 3228void
3047_exit (int code) 3229_exit (int code)
3048 PROTOTYPE: $ 3230 PROTOTYPE: $
3049 CODE: 3231 CODE:
3172 RETVAL = boolSV (coro->flags & ix); 3354 RETVAL = boolSV (coro->flags & ix);
3173 OUTPUT: 3355 OUTPUT:
3174 RETVAL 3356 RETVAL
3175 3357
3176void 3358void
3177throw (Coro::State self, SV *throw = &PL_sv_undef) 3359throw (Coro::State self, SV *exception = &PL_sv_undef)
3178 PROTOTYPE: $;$ 3360 PROTOTYPE: $;$
3179 CODE: 3361 CODE:
3180{ 3362{
3181 struct coro *current = SvSTATE_current; 3363 struct coro *current = SvSTATE_current;
3182 SV **throwp = self == current ? &CORO_THROW : &self->except; 3364 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3183 SvREFCNT_dec (*throwp); 3365 SvREFCNT_dec (*exceptionp);
3184 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3366 SvGETMAGIC (exception);
3367 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3185} 3368}
3186 3369
3187void 3370void
3188api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3371api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3189 PROTOTYPE: $;$ 3372 PROTOTYPE: $;$
3244 3427
3245void 3428void
3246cancel (Coro::State self) 3429cancel (Coro::State self)
3247 CODE: 3430 CODE:
3248 coro_state_destroy (aTHX_ self); 3431 coro_state_destroy (aTHX_ self);
3249 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}
3250 3488
3251 3489
3252MODULE = Coro::State PACKAGE = Coro 3490MODULE = Coro::State PACKAGE = Coro
3253 3491
3254BOOT: 3492BOOT:
3264 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3502 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3265 3503
3266 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);
3267 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3505 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3268 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);
3269 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 */
3270 3508
3271 coro_stash = gv_stashpv ("Coro", TRUE); 3509 coro_stash = gv_stashpv ("Coro", TRUE);
3272 3510
3273 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3511 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3274 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3512 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3275 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3513 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3276 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3514 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3277 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3515 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3278 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3516 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3279 3517
3280 { 3518 {
3281 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3519 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3282 3520
3283 coroapi.schedule = api_schedule; 3521 coroapi.schedule = api_schedule;
3293 sv_setiv (sv, (IV)&coroapi); 3531 sv_setiv (sv, (IV)&coroapi);
3294 SvREADONLY_on (sv); 3532 SvREADONLY_on (sv);
3295 } 3533 }
3296} 3534}
3297 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
3298void 3552void
3299terminate (...) 3553terminate (...)
3300 CODE: 3554 CODE:
3301 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);
3302 3561
3303void 3562void
3304schedule (...) 3563schedule (...)
3305 CODE: 3564 CODE:
3306 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3565 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3335void 3594void
3336_set_readyhook (SV *hook) 3595_set_readyhook (SV *hook)
3337 PROTOTYPE: $ 3596 PROTOTYPE: $
3338 CODE: 3597 CODE:
3339 SvREFCNT_dec (coro_readyhook); 3598 SvREFCNT_dec (coro_readyhook);
3599 SvGETMAGIC (hook);
3600 if (SvOK (hook))
3601 {
3340 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 }
3341 3610
3342int 3611int
3343prio (Coro::State coro, int newprio = 0) 3612prio (Coro::State coro, int newprio = 0)
3344 PROTOTYPE: $;$ 3613 PROTOTYPE: $;$
3345 ALIAS: 3614 ALIAS:
3351 if (items > 1) 3620 if (items > 1)
3352 { 3621 {
3353 if (ix) 3622 if (ix)
3354 newprio = coro->prio - newprio; 3623 newprio = coro->prio - newprio;
3355 3624
3356 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3625 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3357 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3626 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3358 3627
3359 coro->prio = newprio; 3628 coro->prio = newprio;
3360 } 3629 }
3361} 3630}
3362 OUTPUT: 3631 OUTPUT:
3409 for (i = 1; i < items; ++i) 3678 for (i = 1; i < items; ++i)
3410 av_push (av, SvREFCNT_inc_NN (ST (i))); 3679 av_push (av, SvREFCNT_inc_NN (ST (i)));
3411 3680
3412 if ((SV *)hv == &PL_sv_undef) 3681 if ((SV *)hv == &PL_sv_undef)
3413 { 3682 {
3414 PUSHMARK (SP); 3683 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3415 EXTEND (SP, 2);
3416 PUSHs (sv_Coro);
3417 PUSHs ((SV *)cv_pool_handler);
3418 PUTBACK;
3419 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3420 SPAGAIN;
3421
3422 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3684 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3685 SvREFCNT_dec (sv);
3423 } 3686 }
3424 3687
3425 { 3688 {
3426 struct coro *coro = SvSTATE_hv (hv); 3689 struct coro *coro = SvSTATE_hv (hv);
3427 3690
3461 CODE: 3724 CODE:
3462{ 3725{
3463 struct coro *coro = SvSTATE_current; 3726 struct coro *coro = SvSTATE_current;
3464 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3727 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3465 3728
3466 block = (SV *)coro_sv_2cv (aTHX_ block); 3729 block = s_get_cv_croak (block);
3467 3730
3468 if (!*avp) 3731 if (!*avp)
3469 *avp = newAV (); 3732 *avp = newAV ();
3470 3733
3471 av_push (*avp, SvREFCNT_inc (block)); 3734 av_push (*avp, SvREFCNT_inc (block));
3671 3934
3672void 3935void
3673_register (char *target, char *proto, SV *req) 3936_register (char *target, char *proto, SV *req)
3674 CODE: 3937 CODE:
3675{ 3938{
3676 CV *req_cv = coro_sv_2cv (aTHX_ req); 3939 SV *req_cv = s_get_cv_croak (req);
3677 /* newXSproto doesn't return the CV on 5.8 */ 3940 /* newXSproto doesn't return the CV on 5.8 */
3678 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3941 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3679 sv_setpv ((SV *)slf_cv, proto); 3942 sv_setpv ((SV *)slf_cv, proto);
3680 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);
3681} 3944}
3682 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