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.369 by root, Thu Aug 13 02:48:32 2009 UTC vs.
Revision 1.402 by root, Sun May 22 13:07:23 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
116static void (*u2time)(pTHX_ UV ret[2]); 126static void (*u2time)(pTHX_ UV ret[2]);
117 127
118/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
121 132
122static U32 cctx_gen; 133static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
… …
155static char times_valid; 166static char times_valid;
156 167
157static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
159 170
160enum { 171enum
172{
161 CC_MAPPED = 0x01, 173 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 174 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 175 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 176 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 177 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
186 int valgrind_id; 198 int valgrind_id;
187#endif 199#endif
188 unsigned char flags; 200 unsigned char flags;
189} coro_cctx; 201} coro_cctx;
190 202
191coro_cctx *cctx_current; /* the currently running cctx */ 203static coro_cctx *cctx_current; /* the currently running cctx */
192 204
193/*****************************************************************************/ 205/*****************************************************************************/
194 206
207static MGVTBL coro_state_vtbl;
208
195enum { 209enum
210{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 211 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 212 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 213 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 214 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 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) */
201}; 217};
202 218
203/* 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 */
204typedef struct 220typedef struct
205{ 221{
… …
211#define VAR(name,type) type name; 227#define VAR(name,type) type name;
212# include "state.h" 228# include "state.h"
213#undef VAR 229#undef VAR
214} perl_slots; 230} perl_slots;
215 231
232// how many context stack entries do we need for perl_slots
216#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))
217 234
218/* this is a structure representing a perl-level coroutine */ 235/* this is a structure representing a perl-level coroutine */
219struct coro { 236struct coro
237{
220 /* the C coroutine allocated to this perl coroutine, if any */ 238 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 239 coro_cctx *cctx;
222 240
223 /* ready queue */ 241 /* ready queue */
224 struct coro *next_ready; 242 struct coro *next_ready;
… …
226 /* state data */ 244 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 245 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 246 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 247 perl_slots *slot; /* basically the saved sp */
230 248
231 CV *startcv; /* the CV to execute */ 249 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 250 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 251 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 252 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 253
238 /* statistics */ 254 /* statistics */
239 int usecount; /* number of transfers to this coro */ 255 int usecount; /* number of transfers to this coro */
240 256
241 /* coro process data */ 257 /* coro process data */
242 int prio; 258 int prio;
243 SV *except; /* exception to be thrown */ 259 SV *except; /* exception to be thrown */
244 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 */
245 263
246 /* async_pool */ 264 /* async_pool */
247 SV *saved_deffh; 265 SV *saved_deffh;
248 SV *invoke_cb; 266 SV *invoke_cb;
249 AV *invoke_av; 267 AV *invoke_av;
250 268
251 /* on_enter/on_leave */ 269 /* on_enter/on_leave */
252 AV *on_enter; 270 AV *on_enter;
253 AV *on_leave; 271 AV *on_leave;
254 272
273 /* swap_sv */
274 AV *swap_sv;
275
255 /* times */ 276 /* times */
256 coro_ts t_cpu, t_real; 277 coro_ts t_cpu, t_real;
257 278
258 /* linked list */ 279 /* linked list */
259 struct coro *next, *prev; 280 struct coro *next, *prev;
… …
262typedef struct coro *Coro__State; 283typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 284typedef struct coro *Coro__State_or_hashref;
264 285
265/* the following variables are effectively part of the perl context */ 286/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 287/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 288/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 289static struct CoroSLF slf_frame; /* the current slf frame */
269 290
270/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
271 292
272#define CORO_PRIO_MAX 3 293#define CORO_PRIO_MAX 3
… …
278 299
279/* for Coro.pm */ 300/* for Coro.pm */
280static SV *coro_current; 301static SV *coro_current;
281static SV *coro_readyhook; 302static SV *coro_readyhook;
282static 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 */
283static CV *cv_coro_run, *cv_coro_terminate; 304static CV *cv_coro_run;
284static struct coro *coro_first; 305static struct coro *coro_first;
285#define coro_nready coroapi.nready 306#define coro_nready coroapi.nready
286 307
287/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
288 309
289static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 311static SV *coro_select_select;
291 312
292/* horrible hack, but if it works... */ 313/* horrible hack, but if it works... */
293static OP * 314static OP *
294coro_pp_sselect (aTHX) 315coro_pp_sselect (pTHX)
295{ 316{
296 dSP; 317 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */ 318 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select); 319 XPUSHs (coro_select_select);
299 PUTBACK; 320 PUTBACK;
… …
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 322 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED; 323 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 324 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 325 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 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
306 379
307/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
308 381
309static SV * 382static SV *
310coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
… …
400 : 0) 473 : 0)
401 474
402#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)
403#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)
404 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
405INLINE struct coro * 493INLINE struct coro *
406SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
407{ 495{
408 HV *stash;
409 MAGIC *mg; 496 MAGIC *mg;
410 497
411 if (SvROK (coro)) 498 if (SvROK (coro))
412 coro = SvRV (coro); 499 coro = SvRV (coro);
413 500
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
415 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
416 504
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
427} 506}
428 507
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 509
… …
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 629 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 630}
552 631
553/** load & save, init *******************************************************/ 632/** load & save, init *******************************************************/
554 633
634/* swap sv heads, at least logically */
635static void
636swap_svs (pTHX_ Coro__State c)
637{
638 int i;
639
640 for (i = 0; i <= AvFILLp (c->swap_sv); )
641 {
642 SV *a = AvARRAY (c->swap_sv)[i++];
643 SV *b = AvARRAY (c->swap_sv)[i++];
644
645 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
646 SV tmp;
647
648 /* swap sv_any */
649 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
650
651 /* swap sv_flags */
652 SvFLAGS (&tmp) = SvFLAGS (a);
653 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
654 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
655
656#if PERL_VERSION_ATLEAST (5,10,0)
657 /* perl 5.10 complicates this _quite_ a bit, but it also is
658 * much faster, so no quarrels here. alternatively, we could
659 * sv_upgrade to avoid this.
660 */
661 {
662 /* swap sv_u */
663 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
664
665 /* if SvANY points to the head, we need to adjust the pointers,
666 * as the pointer for a still points to b, and maybe vice versa.
667 */
668 #define svany_in_head(type) \
669 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
670
671 if (svany_in_head (SvTYPE (a)))
672 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
673
674 if (svany_in_head (SvTYPE (b)))
675 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
676 }
677#endif
678 }
679}
680
681#define SWAP_SVS(coro) \
682 if (expect_false ((coro)->swap_sv)) \
683 swap_svs (aTHX_ (coro))
684
555static void 685static void
556on_enterleave_call (pTHX_ SV *cb); 686on_enterleave_call (pTHX_ SV *cb);
557 687
558static void 688static void
559load_perl (pTHX_ Coro__State c) 689load_perl (pTHX_ Coro__State c)
… …
605 int i; 735 int i;
606 736
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 739 }
740
741 SWAP_SVS (c);
610} 742}
611 743
612static void 744static void
613save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
614{ 746{
747 SWAP_SVS (c);
748
615 if (expect_false (c->on_leave)) 749 if (expect_false (c->on_leave))
616 { 750 {
617 int i; 751 int i;
618 752
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
677 811
678 PUTBACK; 812 PUTBACK;
679 } 813 }
680 814
681 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 816 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
683 if (SLOT_COUNT >= 1) CXINC;
684 if (SLOT_COUNT >= 2) CXINC;
685 if (SLOT_COUNT >= 3) CXINC;
686 { 817 {
687 unsigned int i; 818 unsigned int i;
819
688 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 821 CXINC;
690 } 822
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
692 825
693 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
694 827
695 { 828 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
717# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
718#else 851#else
719static void 852static void
720coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
721{ 854{
722 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() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 859
727 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
… …
834#endif 967#endif
835 968
836/* 969/*
837 * This overrides the default magic get method of %SIG elements. 970 * This overrides the default magic get method of %SIG elements.
838 * 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
839 * 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),
840 * readback here. 973 * we just provide our own readback here.
841 */ 974 */
842static int 975static int
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 977{
845 const char *s = MgPV_nolen_const (mg); 978 const char *s = MgPV_nolen_const (mg);
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1059slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1060{
928 return 1; 1061 return 1;
929} 1062}
930 1063
931static UNOP coro_setup_op; 1064static UNOP init_perl_op;
932 1065
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1066static void NOINLINE /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1067init_perl (pTHX_ struct coro *coro)
935{ 1068{
936 /* 1069 /*
937 * emulate part of the perl startup here. 1070 * emulate part of the perl startup here.
938 */ 1071 */
939 coro_init_stacks (aTHX); 1072 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1079 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1080 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1081 PL_curpm = 0;
949 PL_curpad = 0; 1082 PL_curpad = 0;
950 PL_localizing = 0; 1083 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1084 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1085#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1086 PL_parser = 0;
955#endif 1087#endif
956 PL_hints = 0; 1088 PL_hints = 0;
957 1089
958 /* recreate the die/warn hooks */ 1090 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1091 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1092 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1093
962 GvSV (PL_defgv) = newSV (0); 1094 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1095 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1096 GvSV (PL_errgv) = newSV (0);
965 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);
… …
986 /* 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
987 * 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.
988 */ 1120 */
989 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 */
990 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;
991 1124
992 /* 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 */
993 coro_setup_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1127 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1129 /* no flags etc. required, as an init function won't be called */
997 1130
998 PL_op = (OP *)&coro_setup_op; 1131 PL_op = (OP *)&init_perl_op;
999 1132
1000 /* copy throw, in case it was set before coro_setup */ 1133 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1134 CORO_THROW = coro->except;
1135
1136 SWAP_SVS (coro);
1002 1137
1003 if (expect_false (enable_times)) 1138 if (expect_false (enable_times))
1004 { 1139 {
1005 coro_times_update (); 1140 coro_times_update ();
1006 coro_times_sub (coro); 1141 coro_times_sub (coro);
… …
1027 dounwind (-1); 1162 dounwind (-1);
1028 } 1163 }
1029} 1164}
1030 1165
1031static void 1166static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1167destroy_perl (pTHX_ struct coro *coro)
1033{ 1168{
1034 SV *svf [9]; 1169 SV *svf [9];
1035 1170
1036 { 1171 {
1172 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1173 struct coro *current = SvSTATE (old_current);
1038 1174
1039 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));
1040 1176
1041 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
1042 load_perl (aTHX_ coro); 1182 load_perl (aTHX_ coro);
1043 1183
1044 coro_unwind_stacks (aTHX); 1184 coro_unwind_stacks (aTHX);
1185
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1045 coro_destruct_stacks (aTHX); 1189 coro_destruct_stacks (aTHX);
1046 1190
1047 // now save some sv's to be free'd later 1191 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv); 1192 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1193 svf [1] = (SV *)GvAV (PL_defgv);
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1198 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1199 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1200 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1201 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1202
1203 SvRV_set (coro_current, old_current);
1204
1059 load_perl (aTHX_ current); 1205 load_perl (aTHX_ current);
1060 } 1206 }
1061 1207
1062 { 1208 {
1063 unsigned int i; 1209 unsigned int i;
… …
1075INLINE void 1221INLINE void
1076free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
1077{ 1223{
1078 if (expect_true (coro_mortal)) 1224 if (expect_true (coro_mortal))
1079 { 1225 {
1080 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1227 coro_mortal = 0;
1082 } 1228 }
1083} 1229}
1084 1230
1085static int 1231static int
… …
1372cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1373{ 1519{
1374 if (!cctx) 1520 if (!cctx)
1375 return; 1521 return;
1376 1522
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1524
1379 --cctx_count; 1525 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1381 1527
1382 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
… …
1448 if (expect_true (prev != next)) 1594 if (expect_true (prev != next))
1449 { 1595 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 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,");
1452 1598
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1599 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 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,");
1455 1601
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1458 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,");
… …
1492 if (expect_false (next->flags & CF_NEW)) 1638 if (expect_false (next->flags & CF_NEW))
1493 { 1639 {
1494 /* need to start coroutine */ 1640 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1641 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1642 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1643 init_perl (aTHX_ next);
1498 } 1644 }
1499 else 1645 else
1500 load_perl (aTHX_ next); 1646 load_perl (aTHX_ next);
1501 1647
1502 /* possibly untie and reuse the cctx */ 1648 /* possibly untie and reuse the cctx */
… …
1541#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))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1689
1544/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1545 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 */
1546static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1699{
1549 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1701 return;
1551 1702
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1554 1704
1555 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_ZOMBIE;
1556 1706
1557 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1558 { 1708 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1709 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1710 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1711 --coro_nready;
1562 } 1712 }
1563 else 1713 else
1564 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;
1565 1719
1566 if (coro->mainstack 1720 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1721 && coro->mainstack != main_mainstack
1568 && coro->slot 1722 && coro->slot
1569 && !PL_dirty) 1723 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1571 1725
1572 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1729 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1576 1731
1577 if (coro->next) coro->next->prev = coro->prev; 1732 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1733
1581 return 1; 1734 /* more destruction mayhem in coro_state_free */
1582} 1735}
1583 1736
1584static int 1737static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1739{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1589 1742
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (aTHX_ coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1595 Safefree (coro); 1747 Safefree (coro);
1596 }
1597 1748
1598 return 0; 1749 return 0;
1599} 1750}
1600 1751
1601static int 1752static int
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1754{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1607 1759
1608 return 0; 1760 return 0;
1609} 1761}
1610 1762
1611static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
… …
1737 struct coro *next = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1738 1890
1739 if (expect_true (next)) 1891 if (expect_true (next))
1740 { 1892 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1894 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 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 */
1744 else 1896 else
1745 { 1897 {
1746 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1747 --coro_nready; 1899 --coro_nready;
… …
1754 { 1906 {
1755 /* nothing to schedule: call the idle handler */ 1907 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1908 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1909 && SvOBJECT (SvRV (sv_idle)))
1758 { 1910 {
1911 if (SvRV (sv_idle) == SvRV (coro_current))
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1913
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1915 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1916 --coro_nready;
1762 } 1917 }
1763 else 1918 else
1764 { 1919 {
1920 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 1921 dSP;
1766 1922
1767 ENTER; 1923 ENTER;
1768 SAVETMPS; 1924 SAVETMPS;
1769 1925
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2033 }
1878} 2034}
1879 2035
1880static 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
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2113coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2114{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2115 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2116
1886 if (on_destroyp) 2117 if (!od)
1887 { 2118 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2119
1890 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
1891 { 2128 {
1892 dSP; /* don't disturb outer sp */ 2129 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2130 PUSHMARK (SP);
1896 2131
1897 if (statusp) 2132 if (coro->status)
1898 { 2133 {
1899 int i; 2134 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2136 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2137 }
1906 2138
1907 PUTBACK; 2139 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2140 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2141 }
1910 } 2142 }
1911} 2143}
1912 2144
1913static void 2145static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2147{
1916 int i; 2148 AV *av;
1917 HV *hv = (HV *)SvRV (coro_current); 2149
1918 AV *av = newAV (); 2150 if (coro->status)
2151 {
2152 av = coro->status;
2153 av_clear (av);
2154 }
2155 else
2156 av = coro->status = newAV ();
1919 2157
1920 /* items are actually not so common, so optimise for this case */ 2158 /* items are actually not so common, so optimise for this case */
1921 if (items) 2159 if (items)
1922 { 2160 {
2161 int i;
2162
1923 av_extend (av, items - 1); 2163 av_extend (av, items - 1);
1924 2164
1925 for (i = 0; i < items; ++i) 2165 for (i = 0; i < items; ++i)
1926 av_push (av, SvREFCNT_inc_NN (arg [i])); 2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 } 2167 }
2168}
1928 2169
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2170static void
1930 2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
1931 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 */
1932 api_ready (aTHX_ sv_manager); 2174 api_ready (aTHX_ sv_manager);
1933 2175
1934 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat; 2177 frame->check = slf_check_repeat;
1936 2178
1937 /* as a minor optimisation, we could unwind all stacks here */ 2179 /* as a minor optimisation, we could unwind all stacks here */
1938 /* 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 */
1939 /*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;
1940} 2285}
1941 2286
1942/*****************************************************************************/ 2287/*****************************************************************************/
1943/* async pool handler */ 2288/* async pool handler */
1944 2289
… …
1984 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
1985 2330
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 { 2333 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1990 coro->invoke_av = newAV (); 2335 return;
1991
1992 frame->prepare = prepare_nop;
1993 } 2336 }
1994 else 2337 else
1995 { 2338 {
1996 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
1997 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);
… …
2220static void 2563static void
2221slf_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)
2222{ 2565{
2223 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2224 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;
2225} 2585}
2226 2586
2227/* 2587/*
2228 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2229 * 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
… …
2298 croak (0); 2658 croak (0);
2299 } 2659 }
2300 2660
2301 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2302 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2303 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2304 { 2665 {
2305 dSP; 2666 dSP;
2306 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2307 2668
2308 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2309 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2310 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2311 bot [1] = *sp; 2672 bot [1] = *sp;
2312 2673
2313 SP = bot + 1; 2674 SP = bot + 1;
2314 2675
2315 PUTBACK; 2676 PUTBACK;
… …
2348 if (PL_op->op_flags & OPf_STACKED) 2709 if (PL_op->op_flags & OPf_STACKED)
2349 { 2710 {
2350 if (items > slf_arga) 2711 if (items > slf_arga)
2351 { 2712 {
2352 slf_arga = items; 2713 slf_arga = items;
2353 free (slf_argv); 2714 Safefree (slf_argv);
2354 slf_argv = malloc (slf_arga * sizeof (SV *)); 2715 New (0, slf_argv, slf_arga, SV *);
2355 } 2716 }
2356 2717
2357 slf_argc = items; 2718 slf_argc = items;
2358 2719
2359 for (i = 0; i < items; ++i) 2720 for (i = 0; i < items; ++i)
… …
2555 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2556 } 2917 }
2557} 2918}
2558 2919
2559static void 2920static void
2560coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2561{ 2922{
2562 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2563 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2564} 2925}
2565 2926
2566static int 2927static int
2567slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2568{ 2929{
2569 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2570 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2571 2933
2572 /* 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 */
2573 if (CORO_THROW) 2935 if (CORO_THROW)
2574 return 0; 2936 return 0;
2575 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2576 { 2938 {
2577 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2578 2940
2579 if (acquire) 2941 if (acquire)
2580 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2581 else 2943 else
2582 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
… …
2587 { 2949 {
2588 int i; 2950 int i;
2589 /* 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 */
2590 /* 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 */
2591 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2592 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2593 for (i = 1; i <= AvFILLp (av); ++i)
2594 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2595 return 1; 2956 return 1;
2596 2957
2597 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2598 return 1; 2959 return 1;
2599 } 2960 }
2600} 2961}
2601 2962
2602static int 2963static int
… …
2625 { 2986 {
2626 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2627 2988
2628 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2629 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2630
2631 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2632 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2633 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2634 } 2994 }
2635} 2995}
2636 2996
2637static void 2997static void
2638slf_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)
… …
2720 { 3080 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]); 3081 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3082 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723 3083
2724 if (SvIVX (AvARRAY (av)[0])) 3084 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3085 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2726 3086
2727 frame->prepare = prepare_nop; 3087 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop; 3088 frame->check = slf_check_nop;
2729 } 3089 }
2730 else if (SvIVX (AvARRAY (av)[0])) 3090 else if (SvIVX (AvARRAY (av)[0]))
… …
2892 /* now call the AIO function - we assume our request is uncancelable */ 3252 /* now call the AIO function - we assume our request is uncancelable */
2893 PUTBACK; 3253 PUTBACK;
2894 call_sv ((SV *)req, G_VOID | G_DISCARD); 3254 call_sv ((SV *)req, G_VOID | G_DISCARD);
2895 } 3255 }
2896 3256
2897 /* now that the requets is going, we loop toll we have a result */ 3257 /* now that the request is going, we loop till we have a result */
2898 frame->data = (void *)state; 3258 frame->data = (void *)state;
2899 frame->prepare = prepare_schedule; 3259 frame->prepare = prepare_schedule;
2900 frame->check = slf_check_aio_req; 3260 frame->check = slf_check_aio_req;
2901} 3261}
2902 3262
… …
3033 coroapi.prepare_nop = prepare_nop; 3393 coroapi.prepare_nop = prepare_nop;
3034 coroapi.prepare_schedule = prepare_schedule; 3394 coroapi.prepare_schedule = prepare_schedule;
3035 coroapi.prepare_cede = prepare_cede; 3395 coroapi.prepare_cede = prepare_cede;
3036 coroapi.prepare_cede_notself = prepare_cede_notself; 3396 coroapi.prepare_cede_notself = prepare_cede_notself;
3037 3397
3038 { 3398 time_init (aTHX);
3039 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3040
3041 if (!svp) croak ("Time::HiRes is required");
3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3043
3044 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3045
3046 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3047 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3048 }
3049 3399
3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3400 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3051} 3401}
3052 3402
3053SV * 3403SV *
… …
3062void 3412void
3063transfer (...) 3413transfer (...)
3064 PROTOTYPE: $$ 3414 PROTOTYPE: $$
3065 CODE: 3415 CODE:
3066 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3416 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3067
3068bool
3069_destroy (SV *coro_sv)
3070 CODE:
3071 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3072 OUTPUT:
3073 RETVAL
3074 3417
3075void 3418void
3076_exit (int code) 3419_exit (int code)
3077 PROTOTYPE: $ 3420 PROTOTYPE: $
3078 CODE: 3421 CODE:
… …
3154 CODE: 3497 CODE:
3155{ 3498{
3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3499 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3157 { 3500 {
3158 struct coro *current = SvSTATE_current; 3501 struct coro *current = SvSTATE_current;
3502 struct CoroSLF slf_save;
3159 3503
3160 if (current != coro) 3504 if (current != coro)
3161 { 3505 {
3162 PUTBACK; 3506 PUTBACK;
3163 save_perl (aTHX_ current); 3507 save_perl (aTHX_ current);
3164 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;
3165 SPAGAIN; 3518 SPAGAIN;
3166 } 3519 }
3167 3520
3168 PUSHSTACK; 3521 PUSHSTACK;
3169 3522
… …
3179 SPAGAIN; 3532 SPAGAIN;
3180 3533
3181 if (current != coro) 3534 if (current != coro)
3182 { 3535 {
3183 PUTBACK; 3536 PUTBACK;
3537 slf_frame = slf_save;
3184 save_perl (aTHX_ coro); 3538 save_perl (aTHX_ coro);
3185 load_perl (aTHX_ current); 3539 load_perl (aTHX_ current);
3186 SPAGAIN; 3540 SPAGAIN;
3187 } 3541 }
3188 } 3542 }
… …
3193 PROTOTYPE: $ 3547 PROTOTYPE: $
3194 ALIAS: 3548 ALIAS:
3195 is_ready = CF_READY 3549 is_ready = CF_READY
3196 is_running = CF_RUNNING 3550 is_running = CF_RUNNING
3197 is_new = CF_NEW 3551 is_new = CF_NEW
3198 is_destroyed = CF_DESTROYED 3552 is_destroyed = CF_ZOMBIE
3553 is_zombie = CF_ZOMBIE
3199 is_suspended = CF_SUSPENDED 3554 is_suspended = CF_SUSPENDED
3200 CODE: 3555 CODE:
3201 RETVAL = boolSV (coro->flags & ix); 3556 RETVAL = boolSV (coro->flags & ix);
3202 OUTPUT: 3557 OUTPUT:
3203 RETVAL 3558 RETVAL
3204 3559
3205void 3560void
3206throw (Coro::State self, SV *throw = &PL_sv_undef) 3561throw (Coro::State self, SV *exception = &PL_sv_undef)
3207 PROTOTYPE: $;$ 3562 PROTOTYPE: $;$
3208 CODE: 3563 CODE:
3209{ 3564{
3210 struct coro *current = SvSTATE_current; 3565 struct coro *current = SvSTATE_current;
3211 SV **throwp = self == current ? &CORO_THROW : &self->except; 3566 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3212 SvREFCNT_dec (*throwp); 3567 SvREFCNT_dec (*exceptionp);
3213 SvGETMAGIC (throw); 3568 SvGETMAGIC (exception);
3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3569 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3215} 3570}
3216 3571
3217void 3572void
3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3573api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3219 PROTOTYPE: $;$ 3574 PROTOTYPE: $;$
… …
3274 3629
3275void 3630void
3276cancel (Coro::State self) 3631cancel (Coro::State self)
3277 CODE: 3632 CODE:
3278 coro_state_destroy (aTHX_ self); 3633 coro_state_destroy (aTHX_ self);
3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3280
3281 3634
3282SV * 3635SV *
3283enable_times (int enabled = enable_times) 3636enable_times (int enabled = enable_times)
3284 CODE: 3637 CODE:
3285{ 3638{
… …
3314 3667
3315 if (expect_false (current == self)) 3668 if (expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current)); 3669 coro_times_sub (SvSTATE (coro_current));
3317} 3670}
3318 3671
3672void
3673swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3674 CODE:
3675{
3676 struct coro *current = SvSTATE_current;
3677
3678 if (current == coro)
3679 SWAP_SVS (current);
3680
3681 if (!coro->swap_sv)
3682 coro->swap_sv = newAV ();
3683
3684 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3686
3687 if (current == coro)
3688 SWAP_SVS (current);
3689}
3690
3691
3319MODULE = Coro::State PACKAGE = Coro 3692MODULE = Coro::State PACKAGE = Coro
3320 3693
3321BOOT: 3694BOOT:
3322{ 3695{
3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3696 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3697 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3698 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3326 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3327 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);
3328 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3700 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3329 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3701 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3330 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3702 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3703 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3332 3704
3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3705 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3706 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3335 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3707 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3336 3708 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3709
3337 coro_stash = gv_stashpv ("Coro", TRUE); 3710 coro_stash = gv_stashpv ("Coro", TRUE);
3338 3711
3339 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3712 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3340 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3713 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3341 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3714 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3364SV * 3737SV *
3365async (...) 3738async (...)
3366 PROTOTYPE: &@ 3739 PROTOTYPE: &@
3367 CODE: 3740 CODE:
3368 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1); 3741 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3369 api_ready (RETVAL); 3742 api_ready (aTHX_ RETVAL);
3370 OUTPUT: 3743 OUTPUT:
3371 RETVAL 3744 RETVAL
3745
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);
3372 3761
3373void 3762void
3374terminate (...) 3763terminate (...)
3375 CODE: 3764 CODE:
3376 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
3377 3775
3378void 3776void
3379schedule (...) 3777schedule (...)
3380 CODE: 3778 CODE:
3381 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3779 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3778 { 4176 {
3779 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4177 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3780 coro_old_pp_sselect = 0; 4178 coro_old_pp_sselect = 0;
3781 } 4179 }
3782 4180
3783

Diff Legend

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