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.382 by root, Thu Feb 10 08:06:27 2011 UTC vs.
Revision 1.403 by root, Sun May 22 20:13:33 2011 UTC

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

Diff Legend

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