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.362 by root, Wed Jul 1 07:58:45 2009 UTC vs.
Revision 1.396 by root, Fri May 6 18:01:13 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
… …
201static SV *sv_pool_size; 152static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 156static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 157
208/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
209static SV *sv_activity; 159static SV *sv_activity;
210 160
211/* enable processtime/realtime profiling */ 161/* enable processtime/realtime profiling */
… …
246 int valgrind_id; 196 int valgrind_id;
247#endif 197#endif
248 unsigned char flags; 198 unsigned char flags;
249} coro_cctx; 199} coro_cctx;
250 200
251coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
252 202
253/*****************************************************************************/ 203/*****************************************************************************/
254 204
255enum { 205enum {
256 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 212};
262 213
263/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
264typedef struct 215typedef struct
265{ 216{
… …
291 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
297 248
298 /* statistics */ 249 /* statistics */
299 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
300 251
301 /* coro process data */ 252 /* coro process data */
… …
310 261
311 /* on_enter/on_leave */ 262 /* on_enter/on_leave */
312 AV *on_enter; 263 AV *on_enter;
313 AV *on_leave; 264 AV *on_leave;
314 265
266 /* swap_sv */
267 AV *swap_sv;
268
315 /* times */ 269 /* times */
316 coro_ts t_cpu, t_real; 270 coro_ts t_cpu, t_real;
317 271
318 /* linked list */ 272 /* linked list */
319 struct coro *next, *prev; 273 struct coro *next, *prev;
… …
322typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
324 278
325/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
329 283
330/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
331 285
332#define CORO_PRIO_MAX 3 286#define CORO_PRIO_MAX 3
… …
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run, *cv_coro_terminate;
344static struct coro *coro_first; 298static struct coro *coro_first;
345#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
346 300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
347/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
348 374
349static SV * 375static SV *
350coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
351{ 377{
… …
372#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 400 get_hv (name, create);
375#endif 401#endif
376 return get_hv (name, create); 402 return get_hv (name, create);
377}
378
379/* may croak */
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391} 403}
392 404
393INLINE void 405INLINE void
394coro_times_update () 406coro_times_update ()
395{ 407{
… …
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 617}
606 618
607/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
608 620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
609static void 672static void
610on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
611 674
612static void 675static void
613load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
… …
659 int i; 722 int i;
660 723
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 726 }
727
728 SWAP_SVS (c);
664} 729}
665 730
666static void 731static void
667save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
668{ 733{
734 SWAP_SVS (c);
735
669 if (expect_false (c->on_leave)) 736 if (expect_false (c->on_leave))
670 { 737 {
671 int i; 738 int i;
672 739
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1048{
982 return 1; 1049 return 1;
983} 1050}
984 1051
985static UNOP coro_setup_op; 1052static UNOP init_perl_op;
986 1053
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
989{ 1056{
990 /* 1057 /*
991 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
992 */ 1059 */
993 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1069 PL_curpm = 0;
1003 PL_curpad = 0; 1070 PL_curpad = 0;
1004 PL_localizing = 0; 1071 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1072 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1074 PL_parser = 0;
1009#endif 1075#endif
1010 PL_hints = 0; 1076 PL_hints = 0;
… …
1042 */ 1108 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1045 1111
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1047 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
1051 1117
1052 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
1053 1119
1054 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122
1123 SWAP_SVS (coro);
1056 1124
1057 if (expect_false (enable_times)) 1125 if (expect_false (enable_times))
1058 { 1126 {
1059 coro_times_update (); 1127 coro_times_update ();
1060 coro_times_sub (coro); 1128 coro_times_sub (coro);
… …
1081 dounwind (-1); 1149 dounwind (-1);
1082 } 1150 }
1083} 1151}
1084 1152
1085static void 1153static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1087{ 1155{
1088 SV *svf [9]; 1156 SV *svf [9];
1089 1157
1090 { 1158 {
1091 struct coro *current = SvSTATE_current; 1159 struct coro *current = SvSTATE_current;
1092 1160
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094 1162
1095 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1164 SvRV_set (coro_current, (SV *)coro->hv); /* this will cause acroak in transfer_check */
1096 load_perl (aTHX_ coro); 1165 load_perl (aTHX_ coro);
1097 1166
1098 coro_unwind_stacks (aTHX); 1167 coro_unwind_stacks (aTHX);
1099 coro_destruct_stacks (aTHX); 1168 coro_destruct_stacks (aTHX);
1169
1170 /* restore swapped sv's */
1171 SWAP_SVS (coro);
1100 1172
1101 // now save some sv's to be free'd later 1173 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1174 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1175 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1176 svf [2] = GvSV (PL_errgv);
… …
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1180 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1181 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1182 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1183 assert (9 == sizeof (svf) / sizeof (*svf));
1112 1184
1185 SvRV_set (coro_current, (SV *)current->hv);
1113 load_perl (aTHX_ current); 1186 load_perl (aTHX_ current);
1114 } 1187 }
1115 1188
1116 { 1189 {
1117 unsigned int i; 1190 unsigned int i;
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1401 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1402 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1403 perl_run (PL_curinterp);
1331 /* 1404 /*
1332 * Unfortunately, there is no way to get at the return values of the 1405 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1406 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1407 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1408 */
1335 1409
1336 /* 1410 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1411 * If perl-run returns we assume exit() was being called or the coro
1338 * fell off the end, which seems to be the only valid (non-bug) 1412 * fell off the end, which seems to be the only valid (non-bug)
… …
1425cctx_destroy (coro_cctx *cctx) 1499cctx_destroy (coro_cctx *cctx)
1426{ 1500{
1427 if (!cctx) 1501 if (!cctx)
1428 return; 1502 return;
1429 1503
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1505
1432 --cctx_count; 1506 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1507 coro_destroy (&cctx->cctx);
1434 1508
1435 /* coro_transfer creates new, empty cctx's */ 1509 /* coro_transfer creates new, empty cctx's */
… …
1545 if (expect_false (next->flags & CF_NEW)) 1619 if (expect_false (next->flags & CF_NEW))
1546 { 1620 {
1547 /* need to start coroutine */ 1621 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1623 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1551 } 1625 }
1552 else 1626 else
1553 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1554 1628
1555 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
… …
1594#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1595#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1670
1597/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1598 1672
1599static int 1673static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1674coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1675{
1602 if (coro->flags & CF_DESTROYED) 1676 if (coro->flags & CF_DESTROYED)
1603 return 0; 1677 return;
1604 1678
1679 /* this callback is reserved for slf functions needing to do cleanup */
1605 if (coro->on_destroy && !PL_dirty) 1680 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1681 coro->on_destroy (aTHX_ coro);
1682
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1607 1690
1608 coro->flags |= CF_DESTROYED; 1691 coro->flags |= CF_DESTROYED;
1609 1692
1610 if (coro->flags & CF_READY) 1693 if (coro->flags & CF_READY)
1611 { 1694 {
… …
1618 1701
1619 if (coro->mainstack 1702 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1703 && coro->mainstack != main_mainstack
1621 && coro->slot 1704 && coro->slot
1622 && !PL_dirty) 1705 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1706 destroy_perl (aTHX_ coro);
1707
1708 if (coro->next) coro->next->prev = coro->prev;
1709 if (coro->prev) coro->prev->next = coro->next;
1710 if (coro == coro_first) coro_first = coro->next;
1624 1711
1625 cctx_destroy (coro->cctx); 1712 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1713 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1714 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1716 SvREFCNT_dec (CORO_THROW);
1629
1630 if (coro->next) coro->next->prev = coro->prev;
1631 if (coro->prev) coro->prev->next = coro->next;
1632 if (coro == coro_first) coro_first = coro->next;
1633
1634 return 1;
1635} 1717}
1636 1718
1637static int 1719static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1720coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1721{
… …
1687 1769
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1770 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1771 TRANSFER (ta, 1);
1690} 1772}
1691 1773
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1774/** Coro ********************************************************************/
1716 1775
1717INLINE void 1776INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1777coro_enq (pTHX_ struct coro *coro)
1719{ 1778{
… …
1744 } 1803 }
1745 1804
1746 return 0; 1805 return 0;
1747} 1806}
1748 1807
1808static void
1809invoke_sv_ready_hook_helper (void)
1810{
1811 dTHX;
1812 dSP;
1813
1814 ENTER;
1815 SAVETMPS;
1816
1817 PUSHMARK (SP);
1818 PUTBACK;
1819 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1820
1821 FREETMPS;
1822 LEAVE;
1823}
1824
1749static int 1825static int
1750api_ready (pTHX_ SV *coro_sv) 1826api_ready (pTHX_ SV *coro_sv)
1751{ 1827{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1828 struct coro *coro = SvSTATE (coro_sv);
1757 1829
1758 if (coro->flags & CF_READY) 1830 if (coro->flags & CF_READY)
1759 return 0; 1831 return 0;
1760 1832
1761 coro->flags |= CF_READY; 1833 coro->flags |= CF_READY;
1762 1834
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1835 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1836
1769 if (sv_hook) 1837 if (!coro_nready++)
1770 { 1838 if (coroapi.readyhook)
1771 dSP; 1839 coroapi.readyhook ();
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_hook, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783
1784 if (xs_hook)
1785 xs_hook ();
1786 1840
1787 return 1; 1841 return 1;
1788} 1842}
1789 1843
1790static int 1844static int
… …
1835 { 1889 {
1836 /* nothing to schedule: call the idle handler */ 1890 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1891 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1892 && SvOBJECT (SvRV (sv_idle)))
1839 { 1893 {
1894 if (SvRV (sv_idle) == SvRV (coro_current))
1895 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1896
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1897 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1898 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1899 --coro_nready;
1843 } 1900 }
1844 else 1901 else
1845 { 1902 {
1903 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1904 dSP;
1847 1905
1848 ENTER; 1906 ENTER;
1849 SAVETMPS; 1907 SAVETMPS;
1850 1908
… …
1960 2018
1961static void 2019static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2020coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2021{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2023
1967 if (on_destroyp) 2024 if (on_destroyp)
1968 { 2025 {
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1970 2029
1971 while (AvFILLp (on_destroy) >= 0) 2030 while (AvFILLp (on_destroy) >= 0)
1972 { 2031 {
1973 dSP; /* don't disturb outer sp */ 2032 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy); 2033 SV *cb = av_pop (on_destroy);
… …
1976 PUSHMARK (SP); 2035 PUSHMARK (SP);
1977 2036
1978 if (statusp) 2037 if (statusp)
1979 { 2038 {
1980 int i; 2039 int i;
1981 AV *status = (AV *)SvRV (*statusp);
1982 EXTEND (SP, AvFILLp (status) + 1); 2040 EXTEND (SP, AvFILLp (status) + 1);
1983 2041
1984 for (i = 0; i <= AvFILLp (status); ++i) 2042 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]); 2043 PUSHs (AvARRAY (status)[i]);
1986 } 2044 }
… …
1990 } 2048 }
1991 } 2049 }
1992} 2050}
1993 2051
1994static void 2052static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2053coro_set_status (HV *coro_hv, SV **arg, int items)
1996{ 2054{
1997 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV (); 2055 AV *av = newAV ();
2000 2056
2057 /* items are actually not so common, so optimise for this case */
2058 if (items)
2059 {
2060 int i;
2061
2001 av_extend (av, items - 1); 2062 av_extend (av, items - 1);
2063
2002 for (i = 0; i < items; ++i) 2064 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2065 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 }
2004 2067
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069}
2006 2070
2071static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2074 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2075 api_ready (aTHX_ sv_manager);
2009 2076
2010 frame->prepare = prepare_schedule; 2077 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2078 frame->check = slf_check_repeat;
2012 2079
2013 /* as a minor optimisation, we could unwind all stacks here */ 2080 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2081 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2082 /*coro_unwind_stacks (aTHX);*/
2083}
2084
2085static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{
2088 HV *coro_hv = (HV *)SvRV (coro_current);
2089
2090 coro_set_status (coro_hv, arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv);
2092}
2093
2094static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 HV *coro_hv;
2098 struct coro *coro;
2099
2100 if (items <= 0)
2101 croak ("Coro::cancel called without coro object,");
2102
2103 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv;
2105
2106 coro_set_status (coro_hv, arg + 1, items - 1);
2107
2108 if (expect_false (coro->flags & CF_NOCANCEL))
2109 {
2110 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro;
2112
2113 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop;
2115 }
2116 else if (coro_hv == (HV *)SvRV (coro_current))
2117 {
2118 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv);
2120 }
2121 else
2122 {
2123 struct coro *self = SvSTATE_current;
2124
2125 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working...
2130 */
2131 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL;
2138
2139 if (slf_frame.data)
2140 {
2141 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv);
2143 }
2144 else
2145 {
2146 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop;
2148 }
2149 }
2016} 2150}
2017 2151
2018/*****************************************************************************/ 2152/*****************************************************************************/
2019/* async pool handler */ 2153/* async pool handler */
2020 2154
… …
2098 2232
2099static void 2233static void
2100coro_rouse_callback (pTHX_ CV *cv) 2234coro_rouse_callback (pTHX_ CV *cv)
2101{ 2235{
2102 dXSARGS; 2236 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2237 SV *data = (SV *)S_GENSUB_ARG;
2104 2238
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2239 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2240 {
2107 /* first call, set args */ 2241 /* first call, set args */
2108 SV *coro = SvRV (data); 2242 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2308 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2310 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2311
2178 { 2312 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2314 SV *data = (SV *)S_GENSUB_ARG;
2181 2315
2182 frame->data = (void *)data; 2316 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2317 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2318 frame->check = slf_check_rouse_wait;
2185 } 2319 }
… …
2189coro_new_rouse_cb (pTHX) 2323coro_new_rouse_cb (pTHX)
2190{ 2324{
2191 HV *hv = (HV *)SvRV (coro_current); 2325 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2326 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2327 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2328 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2329
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2330 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2331 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2332
2199 SvREFCNT_dec (coro->rouse_cb); 2333 SvREFCNT_dec (coro->rouse_cb);
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2558 if (PL_op->op_flags & OPf_STACKED)
2425 { 2559 {
2426 if (items > slf_arga) 2560 if (items > slf_arga)
2427 { 2561 {
2428 slf_arga = items; 2562 slf_arga = items;
2429 free (slf_argv); 2563 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2564 New (0, slf_argv, slf_arga, SV *);
2431 } 2565 }
2432 2566
2433 slf_argc = items; 2567 slf_argc = items;
2434 2568
2435 for (i = 0; i < items; ++i) 2569 for (i = 0; i < items; ++i)
… …
2722{ 2856{
2723 if (items >= 2) 2857 if (items >= 2)
2724 { 2858 {
2725 /* callback form */ 2859 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 2860 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2861 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 2862
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2863 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 2864
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 2865 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 2866 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 2926{
2793 AV *av = (AV *)SvRV (arg [0]); 2927 AV *av = (AV *)SvRV (arg [0]);
2794 2928
2795 if (items >= 2) 2929 if (items >= 2)
2796 { 2930 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2931 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2932 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 2933
2800 if (SvIVX (AvARRAY (av)[0])) 2934 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2935 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 2936
2803 frame->prepare = prepare_nop; 2937 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 2938 frame->check = slf_check_nop;
2805 } 2939 }
2806 else if (SvIVX (AvARRAY (av)[0])) 2940 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 2971
2838static void 2972static void
2839coro_aio_callback (pTHX_ CV *cv) 2973coro_aio_callback (pTHX_ CV *cv)
2840{ 2974{
2841 dXSARGS; 2975 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 2976 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 2977 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 2978 SV *data_sv = newSV (sizeof (struct io_state));
2845 2979
2846 av_extend (state, items - 1); 2980 av_extend (state, items - 1);
2847 2981
… …
2961 3095
2962 for (i = 0; i < items; ++i) 3096 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3097 PUSHs (arg [i]);
2964 3098
2965 /* now push the callback closure */ 3099 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3100 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3101
2968 /* now call the AIO function - we assume our request is uncancelable */ 3102 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3103 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3104 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3105 }
2972 3106
2973 /* now that the requets is going, we loop toll we have a result */ 3107 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3108 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3109 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3110 frame->check = slf_check_aio_req;
2977} 3111}
2978 3112
… …
2989/*****************************************************************************/ 3123/*****************************************************************************/
2990 3124
2991#if CORO_CLONE 3125#if CORO_CLONE
2992# include "clone.c" 3126# include "clone.c"
2993#endif 3127#endif
3128
3129/*****************************************************************************/
3130
3131static SV *
3132coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3133{
3134 SV *coro_sv;
3135 struct coro *coro;
3136 MAGIC *mg;
3137 HV *hv;
3138 SV *cb;
3139 int i;
3140
3141 if (argc > 0)
3142 {
3143 cb = s_get_cv_croak (argv [0]);
3144
3145 if (!is_coro)
3146 {
3147 if (CvISXSUB (cb))
3148 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3149
3150 if (!CvROOT (cb))
3151 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3152 }
3153 }
3154
3155 Newz (0, coro, 1, struct coro);
3156 coro->args = newAV ();
3157 coro->flags = CF_NEW;
3158
3159 if (coro_first) coro_first->prev = coro;
3160 coro->next = coro_first;
3161 coro_first = coro;
3162
3163 coro->hv = hv = newHV ();
3164 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3165 mg->mg_flags |= MGf_DUP;
3166 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3167
3168 if (argc > 0)
3169 {
3170 av_extend (coro->args, argc + is_coro - 1);
3171
3172 if (is_coro)
3173 {
3174 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3175 cb = (SV *)cv_coro_run;
3176 }
3177
3178 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3179
3180 for (i = 1; i < argc; i++)
3181 av_push (coro->args, newSVsv (argv [i]));
3182 }
3183
3184 return coro_sv;
3185}
2994 3186
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3188
2997PROTOTYPES: DISABLE 3189PROTOTYPES: DISABLE
2998 3190
… …
3051 coroapi.prepare_nop = prepare_nop; 3243 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3244 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3245 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3246 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3247
3056 { 3248 time_init (aTHX);
3057 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3058
3059 if (!svp) croak ("Time::HiRes is required");
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 }
3067 3249
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3069} 3251}
3070 3252
3071SV * 3253SV *
3072new (char *klass, ...) 3254new (SV *klass, ...)
3073 ALIAS: 3255 ALIAS:
3074 Coro::new = 1 3256 Coro::new = 1
3075 CODE: 3257 CODE:
3076{ 3258 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3259 OUTPUT:
3078 MAGIC *mg;
3079 HV *hv;
3080 CV *cb;
3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
3096
3097 Newz (0, coro, 1, struct coro);
3098 coro->args = newAV ();
3099 coro->flags = CF_NEW;
3100
3101 if (coro_first) coro_first->prev = coro;
3102 coro->next = coro_first;
3103 coro_first = coro;
3104
3105 coro->hv = hv = newHV ();
3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3107 mg->mg_flags |= MGf_DUP;
3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3109
3110 if (items > 1)
3111 {
3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
3122 for (i = 2; i < items; i++)
3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
3125}
3126 OUTPUT:
3127 RETVAL 3260 RETVAL
3128 3261
3129void 3262void
3130transfer (...) 3263transfer (...)
3131 PROTOTYPE: $$ 3264 PROTOTYPE: $$
3132 CODE: 3265 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3266 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3134
3135bool
3136_destroy (SV *coro_sv)
3137 CODE:
3138 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3139 OUTPUT:
3140 RETVAL
3141 3267
3142void 3268void
3143_exit (int code) 3269_exit (int code)
3144 PROTOTYPE: $ 3270 PROTOTYPE: $
3145 CODE: 3271 CODE:
… …
3221 CODE: 3347 CODE:
3222{ 3348{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3349 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3350 {
3225 struct coro *current = SvSTATE_current; 3351 struct coro *current = SvSTATE_current;
3352 struct CoroSLF slf_save;
3226 3353
3227 if (current != coro) 3354 if (current != coro)
3228 { 3355 {
3229 PUTBACK; 3356 PUTBACK;
3230 save_perl (aTHX_ current); 3357 save_perl (aTHX_ current);
3231 load_perl (aTHX_ coro); 3358 load_perl (aTHX_ coro);
3359 /* the coro is most likely in an active SLF call.
3360 * while not strictly required (the code we execute is
3361 * not allowed to call any SLF functions), it's cleaner
3362 * to reinitialise the slf_frame and restore it later.
3363 * This might one day allow us to actually do SLF calls
3364 * from code executed here.
3365 */
3366 slf_save = slf_frame;
3367 slf_frame.prepare = 0;
3232 SPAGAIN; 3368 SPAGAIN;
3233 } 3369 }
3234 3370
3235 PUSHSTACK; 3371 PUSHSTACK;
3236 3372
… …
3246 SPAGAIN; 3382 SPAGAIN;
3247 3383
3248 if (current != coro) 3384 if (current != coro)
3249 { 3385 {
3250 PUTBACK; 3386 PUTBACK;
3387 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3388 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3389 load_perl (aTHX_ current);
3253 SPAGAIN; 3390 SPAGAIN;
3254 } 3391 }
3255 } 3392 }
… …
3268 RETVAL = boolSV (coro->flags & ix); 3405 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3406 OUTPUT:
3270 RETVAL 3407 RETVAL
3271 3408
3272void 3409void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3410throw (Coro::State self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3411 PROTOTYPE: $;$
3275 CODE: 3412 CODE:
3276{ 3413{
3277 struct coro *current = SvSTATE_current; 3414 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3279 SvREFCNT_dec (*throwp); 3416 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3417 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3282} 3419}
3283 3420
3284void 3421void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3423 PROTOTYPE: $;$
… …
3341 3478
3342void 3479void
3343cancel (Coro::State self) 3480cancel (Coro::State self)
3344 CODE: 3481 CODE:
3345 coro_state_destroy (aTHX_ self); 3482 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3483
3349SV * 3484SV *
3350enable_times (int enabled = enable_times) 3485enable_times (int enabled = enable_times)
3351 CODE: 3486 CODE:
3352{ 3487{
… …
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3516
3382 if (expect_false (current == self)) 3517 if (expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3518 coro_times_sub (SvSTATE (coro_current));
3384} 3519}
3520
3521void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3523 CODE:
3524{
3525 struct coro *current = SvSTATE_current;
3526
3527 if (current == coro)
3528 SWAP_SVS (current);
3529
3530 if (!coro->swap_sv)
3531 coro->swap_sv = newAV ();
3532
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3534 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3535
3536 if (current == coro)
3537 SWAP_SVS (current);
3538}
3539
3385 3540
3386MODULE = Coro::State PACKAGE = Coro 3541MODULE = Coro::State PACKAGE = Coro
3387 3542
3388BOOT: 3543BOOT:
3389{ 3544{
… …
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3554
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3403 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3559
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3560 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3561
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3582 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3583 SvREADONLY_on (sv);
3429 } 3584 }
3430} 3585}
3431 3586
3587SV *
3588async (...)
3589 PROTOTYPE: &@
3590 CODE:
3591 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3592 api_ready (aTHX_ RETVAL);
3593 OUTPUT:
3594 RETVAL
3595
3596void
3597_destroy (Coro::State coro)
3598 CODE:
3599 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro);
3601 coro_call_on_destroy (aTHX_ coro);
3602
3432void 3603void
3433terminate (...) 3604terminate (...)
3434 CODE: 3605 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3606 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607
3608void
3609cancel (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3436 3612
3437void 3613void
3438schedule (...) 3614schedule (...)
3439 CODE: 3615 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3616 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3646_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3647 PROTOTYPE: $
3472 CODE: 3648 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3649 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3650 SvGETMAGIC (hook);
3651 if (SvOK (hook))
3652 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3653 coro_readyhook = newSVsv (hook);
3654 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3655 }
3656 else
3657 {
3658 coro_readyhook = 0;
3659 CORO_READYHOOK = 0;
3660 }
3476 3661
3477int 3662int
3478prio (Coro::State coro, int newprio = 0) 3663prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3664 PROTOTYPE: $;$
3480 ALIAS: 3665 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3729 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3730 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3731
3547 if ((SV *)hv == &PL_sv_undef) 3732 if ((SV *)hv == &PL_sv_undef)
3548 { 3733 {
3549 PUSHMARK (SP); 3734 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3550 EXTEND (SP, 2);
3551 PUSHs (sv_Coro);
3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3735 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3736 SvREFCNT_dec (sv);
3558 } 3737 }
3559 3738
3560 { 3739 {
3561 struct coro *coro = SvSTATE_hv (hv); 3740 struct coro *coro = SvSTATE_hv (hv);
3562 3741
… …
3596 CODE: 3775 CODE:
3597{ 3776{
3598 struct coro *coro = SvSTATE_current; 3777 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 3779
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 3780 block = s_get_cv_croak (block);
3602 3781
3603 if (!*avp) 3782 if (!*avp)
3604 *avp = newAV (); 3783 *avp = newAV ();
3605 3784
3606 av_push (*avp, SvREFCNT_inc (block)); 3785 av_push (*avp, SvREFCNT_inc (block));
… …
3806 3985
3807void 3986void
3808_register (char *target, char *proto, SV *req) 3987_register (char *target, char *proto, SV *req)
3809 CODE: 3988 CODE:
3810{ 3989{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 3990 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 3991 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3992 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 3993 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3994 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 3995}
3817 3996
3997MODULE = Coro::State PACKAGE = Coro::Select
3998
3999void
4000patch_pp_sselect ()
4001 CODE:
4002 if (!coro_old_pp_sselect)
4003 {
4004 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4005 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4006 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4007 }
4008
4009void
4010unpatch_pp_sselect ()
4011 CODE:
4012 if (coro_old_pp_sselect)
4013 {
4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4015 coro_old_pp_sselect = 0;
4016 }
4017

Diff Legend

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