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.384 by root, Thu Feb 17 01:32:18 2011 UTC vs.
Revision 1.402 by root, Sun May 22 13:07:23 2011 UTC

… …
21 21
22#ifndef SVs_PADSTALE 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 23# define SVs_PADSTALE 0
24#endif 24#endif
25 25
26#ifdef WIN32 26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
27# undef setjmp 28# undef setjmp
28# undef longjmp 29# undef longjmp
29# undef _exit 30# undef _exit
30# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
31#else 32#else
… …
125static void (*u2time)(pTHX_ UV ret[2]); 126static void (*u2time)(pTHX_ UV ret[2]);
126 127
127/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
130 132
131static U32 cctx_gen; 133static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 166static char times_valid;
165 167
166static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
168 170
169enum { 171enum
172{
170 CC_MAPPED = 0x01, 173 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 174 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 175 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 176 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 177 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
195 int valgrind_id; 198 int valgrind_id;
196#endif 199#endif
197 unsigned char flags; 200 unsigned char flags;
198} coro_cctx; 201} coro_cctx;
199 202
200coro_cctx *cctx_current; /* the currently running cctx */ 203static coro_cctx *cctx_current; /* the currently running cctx */
201 204
202/*****************************************************************************/ 205/*****************************************************************************/
203 206
207static MGVTBL coro_state_vtbl;
208
204enum { 209enum
210{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 211 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 212 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 213 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 214 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 215 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
216 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 217};
211 218
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 219/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 220typedef struct
214{ 221{
… …
220#define VAR(name,type) type name; 227#define VAR(name,type) type name;
221# include "state.h" 228# include "state.h"
222#undef VAR 229#undef VAR
223} perl_slots; 230} perl_slots;
224 231
232// how many context stack entries do we need for perl_slots
225#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 233#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 234
227/* this is a structure representing a perl-level coroutine */ 235/* this is a structure representing a perl-level coroutine */
228struct coro { 236struct coro
237{
229 /* the C coroutine allocated to this perl coroutine, if any */ 238 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 239 coro_cctx *cctx;
231 240
232 /* ready queue */ 241 /* ready queue */
233 struct coro *next_ready; 242 struct coro *next_ready;
… …
235 /* state data */ 244 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 245 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 246 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 247 perl_slots *slot; /* basically the saved sp */
239 248
240 CV *startcv; /* the CV to execute */ 249 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 250 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 251 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 252 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
246 253
247 /* statistics */ 254 /* statistics */
248 int usecount; /* number of transfers to this coro */ 255 int usecount; /* number of transfers to this coro */
249 256
250 /* coro process data */ 257 /* coro process data */
251 int prio; 258 int prio;
252 SV *except; /* exception to be thrown */ 259 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 260 SV *rouse_cb; /* last rouse callback */
261 AV *on_destroy; /* callbacks or coros to notify on destroy */
262 AV *status; /* the exit status list */
254 263
255 /* async_pool */ 264 /* async_pool */
256 SV *saved_deffh; 265 SV *saved_deffh;
257 SV *invoke_cb; 266 SV *invoke_cb;
258 AV *invoke_av; 267 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 283typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 284typedef struct coro *Coro__State_or_hashref;
276 285
277/* the following variables are effectively part of the perl context */ 286/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 287/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 288/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 289static struct CoroSLF slf_frame; /* the current slf frame */
281 290
282/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
283 292
284#define CORO_PRIO_MAX 3 293#define CORO_PRIO_MAX 3
… …
290 299
291/* for Coro.pm */ 300/* for Coro.pm */
292static SV *coro_current; 301static SV *coro_current;
293static SV *coro_readyhook; 302static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 303static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 304static CV *cv_coro_run;
296static struct coro *coro_first; 305static struct coro *coro_first;
297#define coro_nready coroapi.nready 306#define coro_nready coroapi.nready
298 307
299/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
300 309
… …
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 322 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED; 323 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 324 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 325 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 326}
327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332static void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342static double
343coro_nvtime ()
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351static void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360static void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
318 379
319/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
320 381
321static SV * 382static SV *
322coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
… …
412 : 0) 473 : 0)
413 474
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 477
478INLINE MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
417INLINE struct coro * 493INLINE struct coro *
418SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
419{ 495{
420 HV *stash;
421 MAGIC *mg; 496 MAGIC *mg;
422 497
423 if (SvROK (coro)) 498 if (SvROK (coro))
424 coro = SvRV (coro); 499 coro = SvRV (coro);
425 500
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
427 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
428 504
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
439} 506}
440 507
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 509
… …
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep); 653 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep); 654 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588 655
589#if PERL_VERSION_ATLEAST (5,10,0) 656#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is 657 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could 658 * much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this. 659 * sv_upgrade to avoid this.
593 */ 660 */
594 { 661 {
595 /* swap sv_u */ 662 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 663 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
… …
744 811
745 PUTBACK; 812 PUTBACK;
746 } 813 }
747 814
748 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 816 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 817 {
754 unsigned int i; 818 unsigned int i;
819
755 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 821 CXINC;
757 } 822
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
759 825
760 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
761 827
762 { 828 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
784# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
785#else 851#else
786static void 852static void
787coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
788{ 854{
789 PL_curstackinfo = new_stackinfo(32, 8); 855 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
790 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 859
794 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
… …
901#endif 967#endif
902 968
903/* 969/*
904 * This overrides the default magic get method of %SIG elements. 970 * This overrides the default magic get method of %SIG elements.
905 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 971 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
906 * and instead of trying to save and restore the hash elements, we just provide 972 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 973 * we just provide our own readback here.
908 */ 974 */
909static int 975static int
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 977{
912 const char *s = MgPV_nolen_const (mg); 978 const char *s = MgPV_nolen_const (mg);
… …
1020 PL_parser = 0; 1086 PL_parser = 0;
1021#endif 1087#endif
1022 PL_hints = 0; 1088 PL_hints = 0;
1023 1089
1024 /* recreate the die/warn hooks */ 1090 /* recreate the die/warn hooks */
1025 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1091 PL_diehook = SvREFCNT_inc (rv_diehook);
1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1092 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1027 1093
1028 GvSV (PL_defgv) = newSV (0); 1094 GvSV (PL_defgv) = newSV (0);
1029 GvAV (PL_defgv) = coro->args; coro->args = 0; 1095 GvAV (PL_defgv) = coro->args; coro->args = 0;
1030 GvSV (PL_errgv) = newSV (0); 1096 GvSV (PL_errgv) = newSV (0);
1031 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1052 /* this newly created coroutine might be run on an existing cctx which most 1118 /* this newly created coroutine might be run on an existing cctx which most
1053 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1119 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1054 */ 1120 */
1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1121 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1122 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1123 slf_frame.destroy = 0;
1057 1124
1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1125 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1059 init_perl_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
1060 init_perl_op.op_type = OP_ENTERSUB; 1127 init_perl_op.op_type = OP_ENTERSUB;
1061 init_perl_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
… …
1100destroy_perl (pTHX_ struct coro *coro) 1167destroy_perl (pTHX_ struct coro *coro)
1101{ 1168{
1102 SV *svf [9]; 1169 SV *svf [9];
1103 1170
1104 { 1171 {
1172 SV *old_current = SvRV (coro_current);
1105 struct coro *current = SvSTATE_current; 1173 struct coro *current = SvSTATE (old_current);
1106 1174
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1175 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108 1176
1109 save_perl (aTHX_ current); 1177 save_perl (aTHX_ current);
1178
1179 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv);
1181
1110 load_perl (aTHX_ coro); 1182 load_perl (aTHX_ coro);
1111 1183
1112 coro_unwind_stacks (aTHX); 1184 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
1114 1185
1115 /* restore swapped sv's */ 1186 /* restore swapped sv's */
1116 SWAP_SVS (coro); 1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX);
1117 1190
1118 // now save some sv's to be free'd later 1191 // now save some sv's to be free'd later
1119 svf [0] = GvSV (PL_defgv); 1192 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv); 1193 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv); 1194 svf [2] = GvSV (PL_errgv);
… …
1125 svf [6] = (SV *)GvHV (PL_hintgv); 1198 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook; 1199 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook; 1200 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf)); 1201 assert (9 == sizeof (svf) / sizeof (*svf));
1129 1202
1203 SvRV_set (coro_current, old_current);
1204
1130 load_perl (aTHX_ current); 1205 load_perl (aTHX_ current);
1131 } 1206 }
1132 1207
1133 { 1208 {
1134 unsigned int i; 1209 unsigned int i;
… …
1146INLINE void 1221INLINE void
1147free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
1148{ 1223{
1149 if (expect_true (coro_mortal)) 1224 if (expect_true (coro_mortal))
1150 { 1225 {
1151 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
1152 coro_mortal = 0; 1227 coro_mortal = 0;
1153 } 1228 }
1154} 1229}
1155 1230
1156static int 1231static int
… …
1443cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1444{ 1519{
1445 if (!cctx) 1520 if (!cctx)
1446 return; 1521 return;
1447 1522
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1524
1450 --cctx_count; 1525 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1452 1527
1453 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
… …
1519 if (expect_true (prev != next)) 1594 if (expect_true (prev != next))
1520 { 1595 {
1521 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1522 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1597 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1523 1598
1524 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1599 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1525 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1600 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1526 1601
1527#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1528 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1529 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1604 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
… …
1612#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1687#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1613#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1614 1689
1615/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1616 1691
1692/* this function is actually Coro, not Coro::State, but we call it from here */
1693/* because it is convenient - but it hasn't been declared yet for that reason */
1617static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1618coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1619{ 1699{
1620 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_ZOMBIE)
1621 return 0; 1701 return;
1622 1702
1623 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1625 1704
1626 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_ZOMBIE;
1627 1706
1628 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1629 { 1708 {
1630 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1709 /* reduce nready, as destroying a ready coro effectively unreadies it */
1631 /* alternative: look through all ready queues and remove the coro */ 1710 /* alternative: look through all ready queues and remove the coro */
1632 --coro_nready; 1711 --coro_nready;
1633 } 1712 }
1634 else 1713 else
1635 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1714 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1715
1716 if (coro->next) coro->next->prev = coro->prev;
1717 if (coro->prev) coro->prev->next = coro->next;
1718 if (coro == coro_first) coro_first = coro->next;
1636 1719
1637 if (coro->mainstack 1720 if (coro->mainstack
1638 && coro->mainstack != main_mainstack 1721 && coro->mainstack != main_mainstack
1639 && coro->slot 1722 && coro->slot
1640 && !PL_dirty) 1723 && !PL_dirty)
1641 destroy_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1642 1725
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1646
1647 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv); 1729 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1652 1731
1653 return 1; 1732 coro_call_on_destroy (aTHX_ coro);
1733
1734 /* more destruction mayhem in coro_state_free */
1654} 1735}
1655 1736
1656static int 1737static int
1657coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1658{ 1739{
1659 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1660 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1661 1742
1662 coro->hv = 0;
1663
1664 if (--coro->refcnt < 0)
1665 {
1666 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (aTHX_ coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1667 Safefree (coro); 1747 Safefree (coro);
1668 }
1669 1748
1670 return 0; 1749 return 0;
1671} 1750}
1672 1751
1673static int 1752static int
1674coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1675{ 1754{
1676 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1677 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1678 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1679 1759
1680 return 0; 1760 return 0;
1681} 1761}
1682 1762
1683static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
… …
1809 struct coro *next = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1810 1890
1811 if (expect_true (next)) 1891 if (expect_true (next))
1812 { 1892 {
1813 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1894 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1815 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1895 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1816 else 1896 else
1817 { 1897 {
1818 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1819 --coro_nready; 1899 --coro_nready;
… …
1952 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
1953 } 2033 }
1954} 2034}
1955 2035
1956static void 2036static void
2037coro_push_av (pTHX_ AV *av, I32 gimme_v)
2038{
2039 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2040 {
2041 dSP;
2042
2043 if (gimme_v == G_SCALAR)
2044 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2045 else
2046 {
2047 int i;
2048 EXTEND (SP, AvFILLp (av) + 1);
2049
2050 for (i = 0; i <= AvFILLp (av); ++i)
2051 PUSHs (AvARRAY (av)[i]);
2052 }
2053
2054 PUTBACK;
2055 }
2056}
2057
2058static void
2059coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2060{
2061 if (!coro->on_destroy)
2062 coro->on_destroy = newAV ();
2063
2064 av_push (coro->on_destroy, cb);
2065}
2066
2067static void
2068slf_destroy_join (pTHX_ struct CoroSLF *frame)
2069{
2070 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2071}
2072
2073static int
2074slf_check_join (pTHX_ struct CoroSLF *frame)
2075{
2076 struct coro *coro = (struct coro *)frame->data;
2077
2078 if (!coro->status)
2079 return 1;
2080
2081 frame->destroy = 0;
2082
2083 coro_push_av (aTHX_ coro->status, GIMME_V);
2084
2085 SvREFCNT_dec ((SV *)coro->hv);
2086
2087 return 0;
2088}
2089
2090static void
2091slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2092{
2093 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2094
2095 if (items > 1)
2096 croak ("join called with too many arguments");
2097
2098 if (coro->status)
2099 frame->prepare = prepare_nop;
2100 else
2101 {
2102 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2103 frame->prepare = prepare_schedule;
2104 }
2105
2106 frame->check = slf_check_join;
2107 frame->destroy = slf_destroy_join;
2108 frame->data = (void *)coro;
2109 SvREFCNT_inc (coro->hv);
2110}
2111
2112static void
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2113coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2114{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2115 AV *od = coro->on_destroy;
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2116
1962 if (on_destroyp) 2117 if (!od)
1963 { 2118 return;
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965 2119
1966 while (AvFILLp (on_destroy) >= 0) 2120 while (AvFILLp (od) >= 0)
2121 {
2122 SV *cb = sv_2mortal (av_pop (od));
2123
2124 /* coro hv's (and only hv's at the moment) are supported as well */
2125 if (SvSTATEhv_p (aTHX_ cb))
2126 api_ready (aTHX_ cb);
2127 else
1967 { 2128 {
1968 dSP; /* don't disturb outer sp */ 2129 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP); 2130 PUSHMARK (SP);
1972 2131
1973 if (statusp) 2132 if (coro->status)
1974 { 2133 {
1975 int i; 2134 PUTBACK;
1976 AV *status = (AV *)SvRV (*statusp); 2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
1977 EXTEND (SP, AvFILLp (status) + 1); 2136 SPAGAIN;
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 } 2137 }
1982 2138
1983 PUTBACK; 2139 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2140 call_sv (cb, G_VOID | G_DISCARD);
1985 } 2141 }
1986 } 2142 }
1987} 2143}
1988 2144
1989static void 2145static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1991{ 2147{
1992 int i; 2148 AV *av;
1993 HV *hv = (HV *)SvRV (coro_current); 2149
1994 AV *av = newAV (); 2150 if (coro->status)
2151 {
2152 av = coro->status;
2153 av_clear (av);
2154 }
2155 else
2156 av = coro->status = newAV ();
1995 2157
1996 /* items are actually not so common, so optimise for this case */ 2158 /* items are actually not so common, so optimise for this case */
1997 if (items) 2159 if (items)
1998 { 2160 {
2161 int i;
2162
1999 av_extend (av, items - 1); 2163 av_extend (av, items - 1);
2000 2164
2001 for (i = 0; i < items; ++i) 2165 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2167 }
2168}
2004 2169
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2170static void
2006 2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2173 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2174 api_ready (aTHX_ sv_manager);
2009 2175
2010 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2177 frame->check = slf_check_repeat;
2012 2178
2013 /* as a minor optimisation, we could unwind all stacks here */ 2179 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2180 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2181 /*coro_unwind_stacks (aTHX);*/
2182}
2183
2184static void
2185slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{
2187 HV *coro_hv = (HV *)SvRV (coro_current);
2188
2189 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2190 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2191}
2192
2193static void
2194slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2195{
2196 HV *coro_hv;
2197 struct coro *coro;
2198
2199 if (items <= 0)
2200 croak ("Coro::cancel called without coro object,");
2201
2202 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv;
2204
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206
2207 if (expect_false (coro->flags & CF_NOCANCEL))
2208 {
2209 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro;
2211
2212 frame->prepare = prepare_nop;
2213 frame->check = slf_check_nop;
2214 }
2215 else if (coro_hv == (HV *)SvRV (coro_current))
2216 {
2217 /* cancelling the current coro is allowed, and equals terminate */
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 }
2220 else
2221 {
2222 struct coro *self = SvSTATE_current;
2223
2224 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed.
2228 * besides, I can't get the slow-but-safe version working...
2229 */
2230 slf_frame.data = 0;
2231 self->flags |= CF_NOCANCEL;
2232 coro_state_destroy (aTHX_ coro);
2233 self->flags &= ~CF_NOCANCEL;
2234
2235 if (slf_frame.data)
2236 {
2237 /* while we were busy we have been cancelled, so terminate */
2238 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2239 }
2240 else
2241 {
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 }
2246}
2247
2248static int
2249slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2250{
2251 frame->prepare = 0;
2252 coro_unwind_stacks (aTHX);
2253
2254 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2255
2256 return 1;
2257}
2258
2259static int
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{
2262 if (coro->cctx)
2263 croak ("coro inside C callback, unable to cancel at this time, caught");
2264
2265 if (coro->flags & CF_NEW)
2266 {
2267 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro);
2269 }
2270 else
2271 {
2272 if (!coro->slf_frame.prepare)
2273 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2274
2275 slf_destroy (aTHX_ coro);
2276
2277 coro_set_status (aTHX_ coro, arg, items);
2278 coro->slf_frame.prepare = prepare_nop;
2279 coro->slf_frame.check = slf_check_safe_cancel;
2280
2281 api_ready (aTHX_ (SV *)coro->hv);
2282 }
2283
2284 return 1;
2016} 2285}
2017 2286
2018/*****************************************************************************/ 2287/*****************************************************************************/
2019/* async pool handler */ 2288/* async pool handler */
2020 2289
… …
2060 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
2061 2330
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2333 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2335 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2336 }
2070 else 2337 else
2071 { 2338 {
2072 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2296static void 2563static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2564slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2565{
2299 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2567 frame->check = slf_check_nop;
2568}
2569
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void
2572slf_destroy (pTHX_ struct coro *coro)
2573{
2574 /* this callback is reserved for slf functions needing to do cleanup */
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577
2578 /*
2579 * The on_destroy above most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions.
2583 */
2584 coro->slf_frame.prepare = 0;
2301} 2585}
2302 2586
2303/* 2587/*
2304 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2589 * function to increase chances that they all will call transfer with the same
… …
2374 croak (0); 2658 croak (0);
2375 } 2659 }
2376 2660
2377 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2665 {
2381 dSP; 2666 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2383 2668
2384 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2387 bot [1] = *sp; 2672 bot [1] = *sp;
2388 2673
2389 SP = bot + 1; 2674 SP = bot + 1;
2390 2675
2391 PUTBACK; 2676 PUTBACK;
… …
2631 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2632 } 2917 }
2633} 2918}
2634 2919
2635static void 2920static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2922{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2925}
2641 2926
2642static int 2927static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2929{
2645 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2647 2933
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2934 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2935 if (CORO_THROW)
2650 return 0; 2936 return 0;
2651 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2652 { 2938 {
2653 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2654 2940
2655 if (acquire) 2941 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2943 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 2949 {
2664 int i; 2950 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 2951 /* if we were woken up but can't down, we look through the whole */
2666 /* waiters list and only add us if we aren't in there already */ 2952 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2668 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 2956 return 1;
2672 2957
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 2959 return 1;
2675 } 2960 }
2676} 2961}
2677 2962
2678static int 2963static int
… …
2701 { 2986 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 2988
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2710 } 2994 }
2711} 2995}
2712 2996
2713static void 2997static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2998slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3109 coroapi.prepare_nop = prepare_nop; 3393 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3394 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3395 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3396 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3397
3114 { 3398 time_init (aTHX);
3115 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3116
3117 if (!svp) croak ("Time::HiRes is required");
3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3119
3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3124 }
3125 3399
3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3400 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3127} 3401}
3128 3402
3129SV * 3403SV *
… …
3138void 3412void
3139transfer (...) 3413transfer (...)
3140 PROTOTYPE: $$ 3414 PROTOTYPE: $$
3141 CODE: 3415 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3416 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3143
3144bool
3145_destroy (SV *coro_sv)
3146 CODE:
3147 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3148 OUTPUT:
3149 RETVAL
3150 3417
3151void 3418void
3152_exit (int code) 3419_exit (int code)
3153 PROTOTYPE: $ 3420 PROTOTYPE: $
3154 CODE: 3421 CODE:
… …
3230 CODE: 3497 CODE:
3231{ 3498{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3499 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3500 {
3234 struct coro *current = SvSTATE_current; 3501 struct coro *current = SvSTATE_current;
3502 struct CoroSLF slf_save;
3235 3503
3236 if (current != coro) 3504 if (current != coro)
3237 { 3505 {
3238 PUTBACK; 3506 PUTBACK;
3239 save_perl (aTHX_ current); 3507 save_perl (aTHX_ current);
3240 load_perl (aTHX_ coro); 3508 load_perl (aTHX_ coro);
3509 /* the coro is most likely in an active SLF call.
3510 * while not strictly required (the code we execute is
3511 * not allowed to call any SLF functions), it's cleaner
3512 * to reinitialise the slf_frame and restore it later.
3513 * This might one day allow us to actually do SLF calls
3514 * from code executed here.
3515 */
3516 slf_save = slf_frame;
3517 slf_frame.prepare = 0;
3241 SPAGAIN; 3518 SPAGAIN;
3242 } 3519 }
3243 3520
3244 PUSHSTACK; 3521 PUSHSTACK;
3245 3522
… …
3255 SPAGAIN; 3532 SPAGAIN;
3256 3533
3257 if (current != coro) 3534 if (current != coro)
3258 { 3535 {
3259 PUTBACK; 3536 PUTBACK;
3537 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3538 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3539 load_perl (aTHX_ current);
3262 SPAGAIN; 3540 SPAGAIN;
3263 } 3541 }
3264 } 3542 }
… …
3269 PROTOTYPE: $ 3547 PROTOTYPE: $
3270 ALIAS: 3548 ALIAS:
3271 is_ready = CF_READY 3549 is_ready = CF_READY
3272 is_running = CF_RUNNING 3550 is_running = CF_RUNNING
3273 is_new = CF_NEW 3551 is_new = CF_NEW
3274 is_destroyed = CF_DESTROYED 3552 is_destroyed = CF_ZOMBIE
3553 is_zombie = CF_ZOMBIE
3275 is_suspended = CF_SUSPENDED 3554 is_suspended = CF_SUSPENDED
3276 CODE: 3555 CODE:
3277 RETVAL = boolSV (coro->flags & ix); 3556 RETVAL = boolSV (coro->flags & ix);
3278 OUTPUT: 3557 OUTPUT:
3279 RETVAL 3558 RETVAL
… …
3350 3629
3351void 3630void
3352cancel (Coro::State self) 3631cancel (Coro::State self)
3353 CODE: 3632 CODE:
3354 coro_state_destroy (aTHX_ self); 3633 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3634
3358SV * 3635SV *
3359enable_times (int enabled = enable_times) 3636enable_times (int enabled = enable_times)
3360 CODE: 3637 CODE:
3361{ 3638{
… …
3417BOOT: 3694BOOT:
3418{ 3695{
3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3696 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3697 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3698 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3423 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3699 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3424 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3700 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3701 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3702 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3703 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3466 api_ready (aTHX_ RETVAL); 3742 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 3743 OUTPUT:
3468 RETVAL 3744 RETVAL
3469 3745
3470void 3746void
3747_destroy (Coro::State coro)
3748 CODE:
3749 /* used by the manager thread */
3750 coro_state_destroy (aTHX_ coro);
3751
3752void
3753on_destroy (Coro::State coro, SV *cb)
3754 CODE:
3755 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3756
3757void
3758join (...)
3759 CODE:
3760 CORO_EXECUTE_SLF_XS (slf_init_join);
3761
3762void
3471terminate (...) 3763terminate (...)
3472 CODE: 3764 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3765 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3766
3767void
3768cancel (...)
3769 CODE:
3770 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3771
3772int
3773safe_cancel (Coro::State self, ...)
3774 C_ARGS: aTHX_ self, &ST (1), items - 1
3474 3775
3475void 3776void
3476schedule (...) 3777schedule (...)
3477 CODE: 3778 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3779 CORO_EXECUTE_SLF_XS (slf_init_schedule);

Diff Legend

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