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.368 by root, Thu Aug 13 02:35:41 2009 UTC vs.
Revision 1.398 by root, Sat May 7 14:11:10 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
… …
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
… …
116static void (*u2time)(pTHX_ UV ret[2]); 126static void (*u2time)(pTHX_ UV ret[2]);
117 127
118/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
121 132
122static U32 cctx_gen; 133static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 153static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 154static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 155static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 156static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 157static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 158
149/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
150static SV *sv_activity; 160static SV *sv_activity;
151 161
152/* enable processtime/realtime profiling */ 162/* enable processtime/realtime profiling */
… …
187 int valgrind_id; 197 int valgrind_id;
188#endif 198#endif
189 unsigned char flags; 199 unsigned char flags;
190} coro_cctx; 200} coro_cctx;
191 201
192coro_cctx *cctx_current; /* the currently running cctx */ 202static coro_cctx *cctx_current; /* the currently running cctx */
193 203
194/*****************************************************************************/ 204/*****************************************************************************/
195 205
196enum { 206enum {
197 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 213};
203 214
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 216typedef struct
206{ 217{
… …
212#define VAR(name,type) type name; 223#define VAR(name,type) type name;
213# include "state.h" 224# include "state.h"
214#undef VAR 225#undef VAR
215} perl_slots; 226} perl_slots;
216 227
228// how many context stack entries do we need for perl_slots
217#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 230
219/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
220struct coro { 232struct coro {
221 /* the C coroutine allocated to this perl coroutine, if any */ 233 /* the C coroutine allocated to this perl coroutine, if any */
… …
232 CV *startcv; /* the CV to execute */ 244 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 245 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */ 246 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 249
239 /* statistics */ 250 /* statistics */
240 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
241 252
242 /* coro process data */ 253 /* coro process data */
… …
251 262
252 /* on_enter/on_leave */ 263 /* on_enter/on_leave */
253 AV *on_enter; 264 AV *on_enter;
254 AV *on_leave; 265 AV *on_leave;
255 266
267 /* swap_sv */
268 AV *swap_sv;
269
256 /* times */ 270 /* times */
257 coro_ts t_cpu, t_real; 271 coro_ts t_cpu, t_real;
258 272
259 /* linked list */ 273 /* linked list */
260 struct coro *next, *prev; 274 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 277typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 278typedef struct coro *Coro__State_or_hashref;
265 279
266/* the following variables are effectively part of the perl context */ 280/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 281/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 282/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 283static struct CoroSLF slf_frame; /* the current slf frame */
270 284
271/** Coro ********************************************************************/ 285/** Coro ********************************************************************/
272 286
273#define CORO_PRIO_MAX 3 287#define CORO_PRIO_MAX 3
… …
279 293
280/* for Coro.pm */ 294/* for Coro.pm */
281static SV *coro_current; 295static SV *coro_current;
282static SV *coro_readyhook; 296static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 298static CV *cv_coro_run;
285static struct coro *coro_first; 299static struct coro *coro_first;
286#define coro_nready coroapi.nready 300#define coro_nready coroapi.nready
287 301
288/** Coro::Select ************************************************************/ 302/** Coro::Select ************************************************************/
289 303
290static OP *(*coro_old_pp_sselect) (pTHX); 304static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 305static SV *coro_select_select;
292 306
293/* horrible hack, but if it works... */ 307/* horrible hack, but if it works... */
294static OP * 308static OP *
295coro_pp_sselect (aTHX) 309coro_pp_sselect (pTHX)
296{ 310{
297 dSP; 311 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 312 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 313 XPUSHs (coro_select_select);
300 PUTBACK; 314 PUTBACK;
… …
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 316 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED; 317 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 318 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 319 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 320}
321
322/** time stuff **************************************************************/
323
324#ifdef HAS_GETTIMEOFDAY
325
326static void
327coro_u2time (pTHX_ UV ret[2])
328{
329 struct timeval tv;
330 gettimeofday (&tv, 0);
331
332 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec;
334}
335
336static double
337coro_nvtime ()
338{
339 struct timeval tv;
340 gettimeofday (&tv, 0);
341
342 return tv.tv_sec + tv.tv_usec * 1e-6;
343}
344
345static void
346time_init (pTHX)
347{
348 nvtime = coro_nvtime;
349 u2time = coro_u2time;
350}
351
352#else
353
354static void
355time_init (pTHX)
356{
357 SV **svp;
358
359 require_pv ("Time/HiRes.pm");
360
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365
366 nvtime = INT2PTR (double (*)(), SvIV (*svp));
367
368 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
369 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
370}
371
372#endif
307 373
308/** lowlevel stuff **********************************************************/ 374/** lowlevel stuff **********************************************************/
309 375
310static SV * 376static SV *
311coro_get_sv (pTHX_ const char *name, int create) 377coro_get_sv (pTHX_ const char *name, int create)
… …
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 618}
553 619
554/** load & save, init *******************************************************/ 620/** load & save, init *******************************************************/
555 621
622/* swap sv heads, at least logically */
623static void
624swap_svs (pTHX_ Coro__State c)
625{
626 int i;
627
628 for (i = 0; i <= AvFILLp (c->swap_sv); )
629 {
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667}
668
669#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro))
672
556static void 673static void
557on_enterleave_call (pTHX_ SV *cb); 674on_enterleave_call (pTHX_ SV *cb);
558 675
559static void 676static void
560load_perl (pTHX_ Coro__State c) 677load_perl (pTHX_ Coro__State c)
… …
606 int i; 723 int i;
607 724
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 725 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 727 }
728
729 SWAP_SVS (c);
611} 730}
612 731
613static void 732static void
614save_perl (pTHX_ Coro__State c) 733save_perl (pTHX_ Coro__State c)
615{ 734{
735 SWAP_SVS (c);
736
616 if (expect_false (c->on_leave)) 737 if (expect_false (c->on_leave))
617 { 738 {
618 int i; 739 int i;
619 740
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 741 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
678 799
679 PUTBACK; 800 PUTBACK;
680 } 801 }
681 802
682 /* allocate some space on the context stack for our purposes */ 803 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
684 if (SLOT_COUNT >= 1) CXINC;
685 if (SLOT_COUNT >= 2) CXINC;
686 if (SLOT_COUNT >= 3) CXINC;
687 { 805 {
688 unsigned int i; 806 unsigned int i;
807
689 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 809 CXINC;
691 } 810
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
812 }
693 813
694 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
695 815
696 { 816 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
718# define coro_init_stacks(thx) init_stacks () 838# define coro_init_stacks(thx) init_stacks ()
719#else 839#else
720static void 840static void
721coro_init_stacks (pTHX) 841coro_init_stacks (pTHX)
722{ 842{
723 PL_curstackinfo = new_stackinfo(32, 8); 843 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
724 PL_curstackinfo->si_type = PERLSI_MAIN; 844 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 845 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 847
728 PL_stack_base = AvARRAY(PL_curstack); 848 PL_stack_base = AvARRAY(PL_curstack);
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1048{
929 return 1; 1049 return 1;
930} 1050}
931 1051
932static UNOP coro_setup_op; 1052static UNOP init_perl_op;
933 1053
934static 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 */
935coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
936{ 1056{
937 /* 1057 /*
938 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
939 */ 1059 */
940 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1069 PL_curpm = 0;
950 PL_curpad = 0; 1070 PL_curpad = 0;
951 PL_localizing = 0; 1071 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1072 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1074 PL_parser = 0;
956#endif 1075#endif
957 PL_hints = 0; 1076 PL_hints = 0;
… …
989 */ 1108 */
990 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 */
991 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 */
992 1111
993 /* 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 */
994 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
997 /* 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 */
998 1117
999 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
1000 1119
1001 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122
1123 SWAP_SVS (coro);
1003 1124
1004 if (expect_false (enable_times)) 1125 if (expect_false (enable_times))
1005 { 1126 {
1006 coro_times_update (); 1127 coro_times_update ();
1007 coro_times_sub (coro); 1128 coro_times_sub (coro);
… …
1028 dounwind (-1); 1149 dounwind (-1);
1029 } 1150 }
1030} 1151}
1031 1152
1032static void 1153static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1034{ 1155{
1035 SV *svf [9]; 1156 SV *svf [9];
1036 1157
1037 { 1158 {
1159 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1160 struct coro *current = SvSTATE (old_current);
1039 1161
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1163
1042 save_perl (aTHX_ current); 1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1043 load_perl (aTHX_ coro); 1169 load_perl (aTHX_ coro);
1044 1170
1045 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX); 1172 coro_destruct_stacks (aTHX);
1173
1174 /* restore swapped sv's */
1175 SWAP_SVS (coro);
1047 1176
1048 // now save some sv's to be free'd later 1177 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv); 1178 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1179 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1180 svf [2] = GvSV (PL_errgv);
… …
1054 svf [5] = GvSV (irsgv); 1183 svf [5] = GvSV (irsgv);
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1184 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1185 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1186 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1187 assert (9 == sizeof (svf) / sizeof (*svf));
1188
1189 SvRV_set (coro_current, old_current);
1059 1190
1060 load_perl (aTHX_ current); 1191 load_perl (aTHX_ current);
1061 } 1192 }
1062 1193
1063 { 1194 {
… …
1373cctx_destroy (coro_cctx *cctx) 1504cctx_destroy (coro_cctx *cctx)
1374{ 1505{
1375 if (!cctx) 1506 if (!cctx)
1376 return; 1507 return;
1377 1508
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1510
1380 --cctx_count; 1511 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1512 coro_destroy (&cctx->cctx);
1382 1513
1383 /* coro_transfer creates new, empty cctx's */ 1514 /* coro_transfer creates new, empty cctx's */
… …
1493 if (expect_false (next->flags & CF_NEW)) 1624 if (expect_false (next->flags & CF_NEW))
1494 { 1625 {
1495 /* need to start coroutine */ 1626 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1627 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1628 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1629 init_perl (aTHX_ next);
1499 } 1630 }
1500 else 1631 else
1501 load_perl (aTHX_ next); 1632 load_perl (aTHX_ next);
1502 1633
1503 /* possibly untie and reuse the cctx */ 1634 /* possibly untie and reuse the cctx */
… …
1542#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1543#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1675
1545/** high level stuff ********************************************************/ 1676/** high level stuff ********************************************************/
1546 1677
1547static int 1678static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1680{
1550 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_DESTROYED)
1551 return 0; 1682 return;
1552 1683
1553 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1555 1685
1556 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_DESTROYED;
1557 1687
1558 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1559 { 1689 {
… …
1566 1696
1567 if (coro->mainstack 1697 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1698 && coro->mainstack != main_mainstack
1569 && coro->slot 1699 && coro->slot
1570 && !PL_dirty) 1700 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1701 destroy_perl (aTHX_ coro);
1702
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1572 1706
1573 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1577
1578 if (coro->next) coro->next->prev = coro->prev;
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581
1582 return 1;
1583} 1712}
1584 1713
1585static int 1714static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1715coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1716{
… …
1755 { 1884 {
1756 /* nothing to schedule: call the idle handler */ 1885 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1886 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1887 && SvOBJECT (SvRV (sv_idle)))
1759 { 1888 {
1889 if (SvRV (sv_idle) == SvRV (coro_current))
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1891
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1893 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1894 --coro_nready;
1763 } 1895 }
1764 else 1896 else
1765 { 1897 {
1898 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1899 dSP;
1767 1900
1768 ENTER; 1901 ENTER;
1769 SAVETMPS; 1902 SAVETMPS;
1770 1903
… …
1880 2013
1881static void 2014static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2015coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2016{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2018
1887 if (on_destroyp) 2019 if (on_destroyp)
1888 { 2020 {
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1890 2024
1891 while (AvFILLp (on_destroy) >= 0) 2025 while (AvFILLp (on_destroy) >= 0)
1892 { 2026 {
1893 dSP; /* don't disturb outer sp */ 2027 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy); 2028 SV *cb = av_pop (on_destroy);
… …
1896 PUSHMARK (SP); 2030 PUSHMARK (SP);
1897 2031
1898 if (statusp) 2032 if (statusp)
1899 { 2033 {
1900 int i; 2034 int i;
1901 AV *status = (AV *)SvRV (*statusp);
1902 EXTEND (SP, AvFILLp (status) + 1); 2035 EXTEND (SP, AvFILLp (status) + 1);
1903 2036
1904 for (i = 0; i <= AvFILLp (status); ++i) 2037 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]); 2038 PUSHs (AvARRAY (status)[i]);
1906 } 2039 }
… …
1910 } 2043 }
1911 } 2044 }
1912} 2045}
1913 2046
1914static void 2047static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items)
1916{ 2049{
1917 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV (); 2050 AV *av = newAV ();
1920 2051
1921 /* items are actually not so common, so optimise for this case */ 2052 /* items are actually not so common, so optimise for this case */
1922 if (items) 2053 if (items)
1923 { 2054 {
2055 int i;
2056
1924 av_extend (av, items - 1); 2057 av_extend (av, items - 1);
1925 2058
1926 for (i = 0; i < items; ++i) 2059 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2060 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2061 }
1929 2062
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064}
1931 2065
2066static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2069 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2070 api_ready (aTHX_ sv_manager);
1934 2071
1935 frame->prepare = prepare_schedule; 2072 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2073 frame->check = slf_check_repeat;
1937 2074
1938 /* as a minor optimisation, we could unwind all stacks here */ 2075 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2076 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2077 /*coro_unwind_stacks (aTHX);*/
2078}
2079
2080static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{
2083 HV *coro_hv = (HV *)SvRV (coro_current);
2084
2085 coro_set_status (aTHX_ coro_hv, arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087}
2088
2089static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{
2092 HV *coro_hv;
2093 struct coro *coro;
2094
2095 if (items <= 0)
2096 croak ("Coro::cancel called without coro object,");
2097
2098 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv;
2100
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1);
2102
2103 if (expect_false (coro->flags & CF_NOCANCEL))
2104 {
2105 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro;
2107
2108 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop;
2110 }
2111 else if (coro_hv == (HV *)SvRV (coro_current))
2112 {
2113 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 }
2116 else
2117 {
2118 struct coro *self = SvSTATE_current;
2119
2120 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working...
2125 */
2126 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL;
2133
2134 if (slf_frame.data)
2135 {
2136 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 }
2139 else
2140 {
2141 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop;
2143 }
2144 }
2145}
2146
2147static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{
2150 frame->prepare = 0;
2151 coro_unwind_stacks (aTHX);
2152
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154
2155 return 1;
2156}
2157
2158static int
2159safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2160{
2161 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught");
2163
2164 if (coro->flags & CF_NEW)
2165 {
2166 coro_set_status (aTHX_ coro->hv, arg, items);
2167 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 }
2170 else
2171 {
2172 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174
2175 slf_destroy (aTHX_ coro);
2176
2177 coro_set_status (aTHX_ coro->hv, arg, items);
2178 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel;
2180
2181 api_ready (aTHX_ coro->hv);
2182 }
2183
2184 return 1;
1941} 2185}
1942 2186
1943/*****************************************************************************/ 2187/*****************************************************************************/
1944/* async pool handler */ 2188/* async pool handler */
1945 2189
… …
1985 coro->saved_deffh = 0; 2229 coro->saved_deffh = 0;
1986 2230
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2231 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2232 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2233 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2234 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2235 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2236 }
1995 else 2237 else
1996 { 2238 {
1997 av_clear (GvAV (PL_defgv)); 2239 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2240 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2221static void 2463static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2464slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2465{
2224 frame->prepare = prepare_cede_notself; 2466 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2467 frame->check = slf_check_nop;
2468}
2469
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void
2472slf_destroy (pTHX_ struct coro *coro)
2473{
2474 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477
2478 /*
2479 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions.
2483 */
2484 coro->slf_frame.prepare = 0;
2226} 2485}
2227 2486
2228/* 2487/*
2229 * these not obviously related functions are all rolled into one 2488 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2489 * function to increase chances that they all will call transfer with the same
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2608 if (PL_op->op_flags & OPf_STACKED)
2350 { 2609 {
2351 if (items > slf_arga) 2610 if (items > slf_arga)
2352 { 2611 {
2353 slf_arga = items; 2612 slf_arga = items;
2354 free (slf_argv); 2613 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2614 New (0, slf_argv, slf_arga, SV *);
2356 } 2615 }
2357 2616
2358 slf_argc = items; 2617 slf_argc = items;
2359 2618
2360 for (i = 0; i < items; ++i) 2619 for (i = 0; i < items; ++i)
… …
2556 SvREFCNT_dec (cb); 2815 SvREFCNT_dec (cb);
2557 } 2816 }
2558} 2817}
2559 2818
2560static void 2819static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2820coro_semaphore_destroy (pTHX_ struct coro *coro)
2562{ 2821{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2822 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2565} 2824}
2566 2825
… …
2573 /* if we are about to throw, don't actually acquire the lock, just throw */ 2832 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW) 2833 if (CORO_THROW)
2575 return 0; 2834 return 0;
2576 else if (SvIVX (count_sv) > 0) 2835 else if (SvIVX (count_sv) > 0)
2577 { 2836 {
2578 SvSTATE_current->on_destroy = 0; 2837 frame->destroy = 0;
2579 2838
2580 if (acquire) 2839 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2840 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 2841 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 2842 coro_semaphore_adjust (aTHX_ av, 0);
… …
2626 { 2885 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2886 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 2887
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2888 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 2889 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 2890 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2891 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2892 frame->destroy = coro_semaphore_destroy;
2635 } 2893 }
2636} 2894}
2637 2895
2638static void 2896static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2897slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2721 { 2979 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]); 2980 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2981 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 2982
2725 if (SvIVX (AvARRAY (av)[0])) 2983 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2984 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 2985
2728 frame->prepare = prepare_nop; 2986 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 2987 frame->check = slf_check_nop;
2730 } 2988 }
2731 else if (SvIVX (AvARRAY (av)[0])) 2989 else if (SvIVX (AvARRAY (av)[0]))
… …
2893 /* now call the AIO function - we assume our request is uncancelable */ 3151 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3152 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3153 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3154 }
2897 3155
2898 /* now that the requets is going, we loop toll we have a result */ 3156 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3157 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3158 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3159 frame->check = slf_check_aio_req;
2902} 3160}
2903 3161
… …
2918#endif 3176#endif
2919 3177
2920/*****************************************************************************/ 3178/*****************************************************************************/
2921 3179
2922static SV * 3180static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro) 3181coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2924{ 3182{
2925 SV *coro_sv; 3183 SV *coro_sv;
2926 struct coro *coro; 3184 struct coro *coro;
2927 MAGIC *mg; 3185 MAGIC *mg;
2928 HV *hv; 3186 HV *hv;
… …
3034 coroapi.prepare_nop = prepare_nop; 3292 coroapi.prepare_nop = prepare_nop;
3035 coroapi.prepare_schedule = prepare_schedule; 3293 coroapi.prepare_schedule = prepare_schedule;
3036 coroapi.prepare_cede = prepare_cede; 3294 coroapi.prepare_cede = prepare_cede;
3037 coroapi.prepare_cede_notself = prepare_cede_notself; 3295 coroapi.prepare_cede_notself = prepare_cede_notself;
3038 3296
3039 { 3297 time_init (aTHX);
3040 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3041
3042 if (!svp) croak ("Time::HiRes is required");
3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3044
3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3049 }
3050 3298
3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3052} 3300}
3053 3301
3054SV * 3302SV *
3055new (SV *klass, ...) 3303new (SV *klass, ...)
3056 ALIAS: 3304 ALIAS:
3057 Coro::new = 1 3305 Coro::new = 1
3058 CODE: 3306 CODE:
3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix); 3307 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3060 OUTPUT: 3308 OUTPUT:
3061 RETVAL 3309 RETVAL
3062 3310
3063void 3311void
3064transfer (...) 3312transfer (...)
3065 PROTOTYPE: $$ 3313 PROTOTYPE: $$
3066 CODE: 3314 CODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3315 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3068
3069bool
3070_destroy (SV *coro_sv)
3071 CODE:
3072 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3073 OUTPUT:
3074 RETVAL
3075 3316
3076void 3317void
3077_exit (int code) 3318_exit (int code)
3078 PROTOTYPE: $ 3319 PROTOTYPE: $
3079 CODE: 3320 CODE:
… …
3155 CODE: 3396 CODE:
3156{ 3397{
3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3398 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3158 { 3399 {
3159 struct coro *current = SvSTATE_current; 3400 struct coro *current = SvSTATE_current;
3401 struct CoroSLF slf_save;
3160 3402
3161 if (current != coro) 3403 if (current != coro)
3162 { 3404 {
3163 PUTBACK; 3405 PUTBACK;
3164 save_perl (aTHX_ current); 3406 save_perl (aTHX_ current);
3165 load_perl (aTHX_ coro); 3407 load_perl (aTHX_ coro);
3408 /* the coro is most likely in an active SLF call.
3409 * while not strictly required (the code we execute is
3410 * not allowed to call any SLF functions), it's cleaner
3411 * to reinitialise the slf_frame and restore it later.
3412 * This might one day allow us to actually do SLF calls
3413 * from code executed here.
3414 */
3415 slf_save = slf_frame;
3416 slf_frame.prepare = 0;
3166 SPAGAIN; 3417 SPAGAIN;
3167 } 3418 }
3168 3419
3169 PUSHSTACK; 3420 PUSHSTACK;
3170 3421
… …
3180 SPAGAIN; 3431 SPAGAIN;
3181 3432
3182 if (current != coro) 3433 if (current != coro)
3183 { 3434 {
3184 PUTBACK; 3435 PUTBACK;
3436 slf_frame = slf_save;
3185 save_perl (aTHX_ coro); 3437 save_perl (aTHX_ coro);
3186 load_perl (aTHX_ current); 3438 load_perl (aTHX_ current);
3187 SPAGAIN; 3439 SPAGAIN;
3188 } 3440 }
3189 } 3441 }
… …
3202 RETVAL = boolSV (coro->flags & ix); 3454 RETVAL = boolSV (coro->flags & ix);
3203 OUTPUT: 3455 OUTPUT:
3204 RETVAL 3456 RETVAL
3205 3457
3206void 3458void
3207throw (Coro::State self, SV *throw = &PL_sv_undef) 3459throw (Coro::State self, SV *exception = &PL_sv_undef)
3208 PROTOTYPE: $;$ 3460 PROTOTYPE: $;$
3209 CODE: 3461 CODE:
3210{ 3462{
3211 struct coro *current = SvSTATE_current; 3463 struct coro *current = SvSTATE_current;
3212 SV **throwp = self == current ? &CORO_THROW : &self->except; 3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3213 SvREFCNT_dec (*throwp); 3465 SvREFCNT_dec (*exceptionp);
3214 SvGETMAGIC (throw); 3466 SvGETMAGIC (exception);
3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3216} 3468}
3217 3469
3218void 3470void
3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3220 PROTOTYPE: $;$ 3472 PROTOTYPE: $;$
… …
3275 3527
3276void 3528void
3277cancel (Coro::State self) 3529cancel (Coro::State self)
3278 CODE: 3530 CODE:
3279 coro_state_destroy (aTHX_ self); 3531 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282 3532
3283SV * 3533SV *
3284enable_times (int enabled = enable_times) 3534enable_times (int enabled = enable_times)
3285 CODE: 3535 CODE:
3286{ 3536{
… …
3315 3565
3316 if (expect_false (current == self)) 3566 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current)); 3567 coro_times_sub (SvSTATE (coro_current));
3318} 3568}
3319 3569
3570void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3572 CODE:
3573{
3574 struct coro *current = SvSTATE_current;
3575
3576 if (current == coro)
3577 SWAP_SVS (current);
3578
3579 if (!coro->swap_sv)
3580 coro->swap_sv = newAV ();
3581
3582 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3583 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3584
3585 if (current == coro)
3586 SWAP_SVS (current);
3587}
3588
3589
3320MODULE = Coro::State PACKAGE = Coro 3590MODULE = Coro::State PACKAGE = Coro
3321 3591
3322BOOT: 3592BOOT:
3323{ 3593{
3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3325 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3326 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3327 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3328 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3597 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3329 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3330 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3599 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3331 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3600 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3601 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3333 3602
3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3338 3607
3339 coro_stash = gv_stashpv ("Coro", TRUE); 3608 coro_stash = gv_stashpv ("Coro", TRUE);
3340 3609
3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3365 3634
3366SV * 3635SV *
3367async (...) 3636async (...)
3368 PROTOTYPE: &@ 3637 PROTOTYPE: &@
3369 CODE: 3638 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1); 3639 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL); 3640 api_ready (aTHX_ RETVAL);
3372 OUTPUT: 3641 OUTPUT:
3373 RETVAL 3642 RETVAL
3643
3644void
3645_destroy (Coro::State coro)
3646 CODE:
3647 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro);
3649 coro_call_on_destroy (aTHX_ coro);
3374 3650
3375void 3651void
3376terminate (...) 3652terminate (...)
3377 CODE: 3653 CODE:
3378 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3654 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3655
3656void
3657cancel (...)
3658 CODE:
3659 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3660
3661int
3662safe_cancel (Coro::State self, ...)
3663 C_ARGS: aTHX_ self, &ST (1), items - 1
3379 3664
3380void 3665void
3381schedule (...) 3666schedule (...)
3382 CODE: 3667 CODE:
3383 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3668 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3496 for (i = 1; i < items; ++i) 3781 for (i = 1; i < items; ++i)
3497 av_push (av, SvREFCNT_inc_NN (ST (i))); 3782 av_push (av, SvREFCNT_inc_NN (ST (i)));
3498 3783
3499 if ((SV *)hv == &PL_sv_undef) 3784 if ((SV *)hv == &PL_sv_undef)
3500 { 3785 {
3501 PUSHMARK (SP); 3786 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3502 EXTEND (SP, 2);
3503 PUSHs (sv_Coro);
3504 PUSHs ((SV *)cv_pool_handler);
3505 PUTBACK;
3506 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3507 SPAGAIN;
3508
3509 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv);
3510 } 3789 }
3511 3790
3512 { 3791 {
3513 struct coro *coro = SvSTATE_hv (hv); 3792 struct coro *coro = SvSTATE_hv (hv);
3514 3793
… …
3786 { 4065 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0; 4067 coro_old_pp_sselect = 0;
3789 } 4068 }
3790 4069
3791

Diff Legend

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