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.358 by root, Mon Jun 29 04:30:25 2009 UTC vs.
Revision 1.396 by root, Fri May 6 18:01:13 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 122# endif
172#endif 123#endif
173 124
174static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
175 127
176/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
179 131
200static SV *sv_pool_size; 152static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 156static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 157
207/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
208static SV *sv_activity; 159static SV *sv_activity;
160
161/* enable processtime/realtime profiling */
162static char enable_times;
163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
209 166
210static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
212 169
213enum { 170enum {
239 int valgrind_id; 196 int valgrind_id;
240#endif 197#endif
241 unsigned char flags; 198 unsigned char flags;
242} coro_cctx; 199} coro_cctx;
243 200
244coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
245 202
246/*****************************************************************************/ 203/*****************************************************************************/
247 204
248enum { 205enum {
249 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
254}; 212};
255 213
256/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
257typedef struct 215typedef struct
258{ 216{
284 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
290 248
291 /* statistics */ 249 /* statistics */
292 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
293 251
294 /* coro process data */ 252 /* coro process data */
303 261
304 /* on_enter/on_leave */ 262 /* on_enter/on_leave */
305 AV *on_enter; 263 AV *on_enter;
306 AV *on_leave; 264 AV *on_leave;
307 265
266 /* swap_sv */
267 AV *swap_sv;
268
269 /* times */
270 coro_ts t_cpu, t_real;
271
308 /* linked list */ 272 /* linked list */
309 struct coro *next, *prev; 273 struct coro *next, *prev;
310}; 274};
311 275
312typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
314 278
315/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
319 283
320/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
321 285
322#define CORO_PRIO_MAX 3 286#define CORO_PRIO_MAX 3
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run, *cv_coro_terminate;
334static struct coro *coro_first; 298static struct coro *coro_first;
335#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
336 300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
337/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
338 374
339static SV * 375static SV *
340coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
341{ 377{
364 get_hv (name, create); 400 get_hv (name, create);
365#endif 401#endif
366 return get_hv (name, create); 402 return get_hv (name, create);
367} 403}
368 404
369/* may croak */ 405INLINE void
370INLINE CV * 406coro_times_update ()
371coro_sv_2cv (pTHX_ SV *sv)
372{ 407{
373 HV *st; 408#ifdef coro_clock_gettime
374 GV *gvp; 409 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 410
377 if (!cv) 411 ts.tv_sec = ts.tv_nsec = 0;
378 croak ("code reference expected"); 412 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
413 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
379 414
380 return cv; 415 ts.tv_sec = ts.tv_nsec = 0;
416 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
417 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
418#else
419 dTHX;
420 UV tv[2];
421
422 u2time (aTHX_ tv);
423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000;
425#endif
426}
427
428INLINE void
429coro_times_add (struct coro *c)
430{
431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0];
434
435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0];
438}
439
440INLINE void
441coro_times_sub (struct coro *c)
442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0];
446
447 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
448 c->t_cpu [1] -= time_cpu [1];
449 c->t_cpu [0] -= time_cpu [0];
381} 450}
382 451
383/*****************************************************************************/ 452/*****************************************************************************/
384/* magic glue */ 453/* magic glue */
385 454
488 AV *padlist; 557 AV *padlist;
489 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
490 559
491 /* perl manages to free our internal AV and _then_ call us */ 560 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 561 if (IN_DESTRUCT)
493 return; 562 return 0;
494 563
495 /* casting is fun. */ 564 /* casting is fun. */
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
498 567
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 617}
549 618
550/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
551 620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
552static void 672static void
553on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
554 674
555static void 675static void
556load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
587 } 707 }
588 708
589 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 710 CORO_THROW = c->except;
591 711
712 if (expect_false (enable_times))
713 {
714 if (expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
592 if (expect_false (c->on_enter)) 720 if (expect_false (c->on_enter))
593 { 721 {
594 int i; 722 int i;
595 723
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 726 }
727
728 SWAP_SVS (c);
599} 729}
600 730
601static void 731static void
602save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
603{ 733{
734 SWAP_SVS (c);
735
604 if (expect_false (c->on_leave)) 736 if (expect_false (c->on_leave))
605 { 737 {
606 int i; 738 int i;
607 739
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
610 } 750 }
611 751
612 c->except = CORO_THROW; 752 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
614 754
663 /* we manually unroll here, as usually 2 slots is enough */ 803 /* we manually unroll here, as usually 2 slots is enough */
664 if (SLOT_COUNT >= 1) CXINC; 804 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC; 805 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC; 806 if (SLOT_COUNT >= 3) CXINC;
667 { 807 {
668 int i; 808 unsigned int i;
669 for (i = 3; i < SLOT_COUNT; ++i) 809 for (i = 3; i < SLOT_COUNT; ++i)
670 CXINC; 810 CXINC;
671 } 811 }
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 812 cxstack_ix -= SLOT_COUNT; /* undo allocation */
673 813
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1048{
909 return 1; 1049 return 1;
910} 1050}
911 1051
912static UNOP coro_setup_op; 1052static UNOP init_perl_op;
913 1053
914static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
915coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
916{ 1056{
917 /* 1057 /*
918 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
919 */ 1059 */
920 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
927 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1069 PL_curpm = 0;
930 PL_curpad = 0; 1070 PL_curpad = 0;
931 PL_localizing = 0; 1071 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1072 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1074 PL_parser = 0;
936#endif 1075#endif
937 PL_hints = 0; 1076 PL_hints = 0;
969 */ 1108 */
970 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
972 1111
973 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
974 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
977 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
978 1117
979 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
980 1119
981 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122
1123 SWAP_SVS (coro);
1124
1125 if (expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
983} 1130}
984 1131
985static void 1132static void
986coro_unwind_stacks (pTHX) 1133coro_unwind_stacks (pTHX)
987{ 1134{
1002 dounwind (-1); 1149 dounwind (-1);
1003 } 1150 }
1004} 1151}
1005 1152
1006static void 1153static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1008{ 1155{
1009 SV *svf [9]; 1156 SV *svf [9];
1010 1157
1011 { 1158 {
1012 struct coro *current = SvSTATE_current; 1159 struct coro *current = SvSTATE_current;
1013 1160
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015 1162
1016 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1164 SvRV_set (coro_current, (SV *)coro->hv); /* this will cause acroak in transfer_check */
1017 load_perl (aTHX_ coro); 1165 load_perl (aTHX_ coro);
1018 1166
1019 coro_unwind_stacks (aTHX); 1167 coro_unwind_stacks (aTHX);
1020 coro_destruct_stacks (aTHX); 1168 coro_destruct_stacks (aTHX);
1169
1170 /* restore swapped sv's */
1171 SWAP_SVS (coro);
1021 1172
1022 // now save some sv's to be free'd later 1173 // now save some sv's to be free'd later
1023 svf [0] = GvSV (PL_defgv); 1174 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1175 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1176 svf [2] = GvSV (PL_errgv);
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1180 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1181 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1182 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1183 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1184
1185 SvRV_set (coro_current, (SV *)current->hv);
1034 load_perl (aTHX_ current); 1186 load_perl (aTHX_ current);
1035 } 1187 }
1036 1188
1037 { 1189 {
1038 int i; 1190 unsigned int i;
1039 1191
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1192 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1193 SvREFCNT_dec (svf [i]);
1042 1194
1043 SvREFCNT_dec (coro->saved_deffh); 1195 SvREFCNT_dec (coro->saved_deffh);
1249 /* somebody or something will hit me for both perl_run and PL_restartop */ 1401 /* somebody or something will hit me for both perl_run and PL_restartop */
1250 PL_restartop = PL_op; 1402 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1403 perl_run (PL_curinterp);
1252 /* 1404 /*
1253 * Unfortunately, there is no way to get at the return values of the 1405 * Unfortunately, there is no way to get at the return values of the
1254 * coro body here, as perl_run destroys these 1406 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1407 * runtime errors here, as this is just a random interpreter, not a thread.
1255 */ 1408 */
1256 1409
1257 /* 1410 /*
1258 * If perl-run returns we assume exit() was being called or the coro 1411 * If perl-run returns we assume exit() was being called or the coro
1259 * fell off the end, which seems to be the only valid (non-bug) 1412 * fell off the end, which seems to be the only valid (non-bug)
1346cctx_destroy (coro_cctx *cctx) 1499cctx_destroy (coro_cctx *cctx)
1347{ 1500{
1348 if (!cctx) 1501 if (!cctx)
1349 return; 1502 return;
1350 1503
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1505
1353 --cctx_count; 1506 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1507 coro_destroy (&cctx->cctx);
1355 1508
1356 /* coro_transfer creates new, empty cctx's */ 1509 /* coro_transfer creates new, empty cctx's */
1466 if (expect_false (next->flags & CF_NEW)) 1619 if (expect_false (next->flags & CF_NEW))
1467 { 1620 {
1468 /* need to start coroutine */ 1621 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1623 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1472 } 1625 }
1473 else 1626 else
1474 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1475 1628
1476 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1515#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1670
1518/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1519 1672
1520static int 1673static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1674coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1675{
1523 if (coro->flags & CF_DESTROYED) 1676 if (coro->flags & CF_DESTROYED)
1524 return 0; 1677 return;
1525 1678
1679 /* this callback is reserved for slf functions needing to do cleanup */
1526 if (coro->on_destroy && !PL_dirty) 1680 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1681 coro->on_destroy (aTHX_ coro);
1682
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1528 1690
1529 coro->flags |= CF_DESTROYED; 1691 coro->flags |= CF_DESTROYED;
1530 1692
1531 if (coro->flags & CF_READY) 1693 if (coro->flags & CF_READY)
1532 { 1694 {
1539 1701
1540 if (coro->mainstack 1702 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1703 && coro->mainstack != main_mainstack
1542 && coro->slot 1704 && coro->slot
1543 && !PL_dirty) 1705 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1706 destroy_perl (aTHX_ coro);
1707
1708 if (coro->next) coro->next->prev = coro->prev;
1709 if (coro->prev) coro->prev->next = coro->next;
1710 if (coro == coro_first) coro_first = coro->next;
1545 1711
1546 cctx_destroy (coro->cctx); 1712 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1713 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1714 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1716 SvREFCNT_dec (CORO_THROW);
1550
1551 if (coro->next) coro->next->prev = coro->prev;
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554
1555 return 1;
1556} 1717}
1557 1718
1558static int 1719static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1720coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1721{
1608 1769
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1770 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1771 TRANSFER (ta, 1);
1611} 1772}
1612 1773
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1774/** Coro ********************************************************************/
1637 1775
1638INLINE void 1776INLINE void
1639coro_enq (pTHX_ struct coro *coro) 1777coro_enq (pTHX_ struct coro *coro)
1640{ 1778{
1665 } 1803 }
1666 1804
1667 return 0; 1805 return 0;
1668} 1806}
1669 1807
1808static void
1809invoke_sv_ready_hook_helper (void)
1810{
1811 dTHX;
1812 dSP;
1813
1814 ENTER;
1815 SAVETMPS;
1816
1817 PUSHMARK (SP);
1818 PUTBACK;
1819 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1820
1821 FREETMPS;
1822 LEAVE;
1823}
1824
1670static int 1825static int
1671api_ready (pTHX_ SV *coro_sv) 1826api_ready (pTHX_ SV *coro_sv)
1672{ 1827{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1828 struct coro *coro = SvSTATE (coro_sv);
1678 1829
1679 if (coro->flags & CF_READY) 1830 if (coro->flags & CF_READY)
1680 return 0; 1831 return 0;
1681 1832
1682 coro->flags |= CF_READY; 1833 coro->flags |= CF_READY;
1683 1834
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1835 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1836
1690 if (sv_hook) 1837 if (!coro_nready++)
1691 { 1838 if (coroapi.readyhook)
1692 dSP; 1839 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1840
1708 return 1; 1841 return 1;
1709} 1842}
1710 1843
1711static int 1844static int
1756 { 1889 {
1757 /* nothing to schedule: call the idle handler */ 1890 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1891 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1892 && SvOBJECT (SvRV (sv_idle)))
1760 { 1893 {
1894 if (SvRV (sv_idle) == SvRV (coro_current))
1895 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1896
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1897 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1898 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1899 --coro_nready;
1764 } 1900 }
1765 else 1901 else
1766 { 1902 {
1903 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1904 dSP;
1768 1905
1769 ENTER; 1906 ENTER;
1770 SAVETMPS; 1907 SAVETMPS;
1771 1908
1881 2018
1882static void 2019static void
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2020coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2021{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2023
1888 if (on_destroyp) 2024 if (on_destroyp)
1889 { 2025 {
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1891 2029
1892 while (AvFILLp (on_destroy) >= 0) 2030 while (AvFILLp (on_destroy) >= 0)
1893 { 2031 {
1894 dSP; /* don't disturb outer sp */ 2032 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy); 2033 SV *cb = av_pop (on_destroy);
1897 PUSHMARK (SP); 2035 PUSHMARK (SP);
1898 2036
1899 if (statusp) 2037 if (statusp)
1900 { 2038 {
1901 int i; 2039 int i;
1902 AV *status = (AV *)SvRV (*statusp);
1903 EXTEND (SP, AvFILLp (status) + 1); 2040 EXTEND (SP, AvFILLp (status) + 1);
1904 2041
1905 for (i = 0; i <= AvFILLp (status); ++i) 2042 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]); 2043 PUSHs (AvARRAY (status)[i]);
1907 } 2044 }
1911 } 2048 }
1912 } 2049 }
1913} 2050}
1914 2051
1915static void 2052static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2053coro_set_status (HV *coro_hv, SV **arg, int items)
1917{ 2054{
1918 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV (); 2055 AV *av = newAV ();
1921 2056
2057 /* items are actually not so common, so optimise for this case */
2058 if (items)
2059 {
2060 int i;
2061
1922 av_extend (av, items - 1); 2062 av_extend (av, items - 1);
2063
1923 for (i = 0; i < items; ++i) 2064 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2065 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 }
1925 2067
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069}
1927 2070
2071static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2074 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2075 api_ready (aTHX_ sv_manager);
1930 2076
1931 frame->prepare = prepare_schedule; 2077 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2078 frame->check = slf_check_repeat;
1933 2079
1934 /* as a minor optimisation, we could unwind all stacks here */ 2080 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2081 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2082 /*coro_unwind_stacks (aTHX);*/
2083}
2084
2085static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{
2088 HV *coro_hv = (HV *)SvRV (coro_current);
2089
2090 coro_set_status (coro_hv, arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv);
2092}
2093
2094static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 HV *coro_hv;
2098 struct coro *coro;
2099
2100 if (items <= 0)
2101 croak ("Coro::cancel called without coro object,");
2102
2103 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv;
2105
2106 coro_set_status (coro_hv, arg + 1, items - 1);
2107
2108 if (expect_false (coro->flags & CF_NOCANCEL))
2109 {
2110 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro;
2112
2113 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop;
2115 }
2116 else if (coro_hv == (HV *)SvRV (coro_current))
2117 {
2118 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv);
2120 }
2121 else
2122 {
2123 struct coro *self = SvSTATE_current;
2124
2125 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working...
2130 */
2131 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL;
2138
2139 if (slf_frame.data)
2140 {
2141 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv);
2143 }
2144 else
2145 {
2146 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop;
2148 }
2149 }
1937} 2150}
1938 2151
1939/*****************************************************************************/ 2152/*****************************************************************************/
1940/* async pool handler */ 2153/* async pool handler */
1941 2154
2019 2232
2020static void 2233static void
2021coro_rouse_callback (pTHX_ CV *cv) 2234coro_rouse_callback (pTHX_ CV *cv)
2022{ 2235{
2023 dXSARGS; 2236 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2237 SV *data = (SV *)S_GENSUB_ARG;
2025 2238
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2239 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2240 {
2028 /* first call, set args */ 2241 /* first call, set args */
2029 SV *coro = SvRV (data); 2242 SV *coro = SvRV (data);
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2308 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2310 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2311
2099 { 2312 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2314 SV *data = (SV *)S_GENSUB_ARG;
2102 2315
2103 frame->data = (void *)data; 2316 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2317 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2318 frame->check = slf_check_rouse_wait;
2106 } 2319 }
2110coro_new_rouse_cb (pTHX) 2323coro_new_rouse_cb (pTHX)
2111{ 2324{
2112 HV *hv = (HV *)SvRV (coro_current); 2325 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2326 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2327 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2328 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2329
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2330 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2331 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2332
2120 SvREFCNT_dec (coro->rouse_cb); 2333 SvREFCNT_dec (coro->rouse_cb);
2345 if (PL_op->op_flags & OPf_STACKED) 2558 if (PL_op->op_flags & OPf_STACKED)
2346 { 2559 {
2347 if (items > slf_arga) 2560 if (items > slf_arga)
2348 { 2561 {
2349 slf_arga = items; 2562 slf_arga = items;
2350 free (slf_argv); 2563 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2564 New (0, slf_argv, slf_arga, SV *);
2352 } 2565 }
2353 2566
2354 slf_argc = items; 2567 slf_argc = items;
2355 2568
2356 for (i = 0; i < items; ++i) 2569 for (i = 0; i < items; ++i)
2643{ 2856{
2644 if (items >= 2) 2857 if (items >= 2)
2645 { 2858 {
2646 /* callback form */ 2859 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 2860 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2861 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 2862
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2863 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 2864
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 2865 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 2866 coro_semaphore_adjust (aTHX_ av, 0);
2713{ 2926{
2714 AV *av = (AV *)SvRV (arg [0]); 2927 AV *av = (AV *)SvRV (arg [0]);
2715 2928
2716 if (items >= 2) 2929 if (items >= 2)
2717 { 2930 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2931 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2932 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 2933
2721 if (SvIVX (AvARRAY (av)[0])) 2934 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2935 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 2936
2724 frame->prepare = prepare_nop; 2937 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 2938 frame->check = slf_check_nop;
2726 } 2939 }
2727 else if (SvIVX (AvARRAY (av)[0])) 2940 else if (SvIVX (AvARRAY (av)[0]))
2758 2971
2759static void 2972static void
2760coro_aio_callback (pTHX_ CV *cv) 2973coro_aio_callback (pTHX_ CV *cv)
2761{ 2974{
2762 dXSARGS; 2975 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 2976 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 2977 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 2978 SV *data_sv = newSV (sizeof (struct io_state));
2766 2979
2767 av_extend (state, items - 1); 2980 av_extend (state, items - 1);
2768 2981
2882 3095
2883 for (i = 0; i < items; ++i) 3096 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3097 PUSHs (arg [i]);
2885 3098
2886 /* now push the callback closure */ 3099 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3100 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3101
2889 /* now call the AIO function - we assume our request is uncancelable */ 3102 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3103 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3104 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3105 }
2893 3106
2894 /* now that the requets is going, we loop toll we have a result */ 3107 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3108 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3109 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3110 frame->check = slf_check_aio_req;
2898} 3111}
2899 3112
2910/*****************************************************************************/ 3123/*****************************************************************************/
2911 3124
2912#if CORO_CLONE 3125#if CORO_CLONE
2913# include "clone.c" 3126# include "clone.c"
2914#endif 3127#endif
3128
3129/*****************************************************************************/
3130
3131static SV *
3132coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3133{
3134 SV *coro_sv;
3135 struct coro *coro;
3136 MAGIC *mg;
3137 HV *hv;
3138 SV *cb;
3139 int i;
3140
3141 if (argc > 0)
3142 {
3143 cb = s_get_cv_croak (argv [0]);
3144
3145 if (!is_coro)
3146 {
3147 if (CvISXSUB (cb))
3148 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3149
3150 if (!CvROOT (cb))
3151 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3152 }
3153 }
3154
3155 Newz (0, coro, 1, struct coro);
3156 coro->args = newAV ();
3157 coro->flags = CF_NEW;
3158
3159 if (coro_first) coro_first->prev = coro;
3160 coro->next = coro_first;
3161 coro_first = coro;
3162
3163 coro->hv = hv = newHV ();
3164 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3165 mg->mg_flags |= MGf_DUP;
3166 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3167
3168 if (argc > 0)
3169 {
3170 av_extend (coro->args, argc + is_coro - 1);
3171
3172 if (is_coro)
3173 {
3174 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3175 cb = (SV *)cv_coro_run;
3176 }
3177
3178 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3179
3180 for (i = 1; i < argc; i++)
3181 av_push (coro->args, newSVsv (argv [i]));
3182 }
3183
3184 return coro_sv;
3185}
2915 3186
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3188
2918PROTOTYPES: DISABLE 3189PROTOTYPES: DISABLE
2919 3190
2972 coroapi.prepare_nop = prepare_nop; 3243 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3244 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3245 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3246 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3247
2977 { 3248 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3249
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2987} 3251}
2988 3252
2989SV * 3253SV *
2990new (char *klass, ...) 3254new (SV *klass, ...)
2991 ALIAS: 3255 ALIAS:
2992 Coro::new = 1 3256 Coro::new = 1
2993 CODE: 3257 CODE:
2994{ 3258 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3259 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3260 RETVAL
3046 3261
3047void 3262void
3048transfer (...) 3263transfer (...)
3049 PROTOTYPE: $$ 3264 PROTOTYPE: $$
3050 CODE: 3265 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3266 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3052
3053bool
3054_destroy (SV *coro_sv)
3055 CODE:
3056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3057 OUTPUT:
3058 RETVAL
3059 3267
3060void 3268void
3061_exit (int code) 3269_exit (int code)
3062 PROTOTYPE: $ 3270 PROTOTYPE: $
3063 CODE: 3271 CODE:
3139 CODE: 3347 CODE:
3140{ 3348{
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3349 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3142 { 3350 {
3143 struct coro *current = SvSTATE_current; 3351 struct coro *current = SvSTATE_current;
3352 struct CoroSLF slf_save;
3144 3353
3145 if (current != coro) 3354 if (current != coro)
3146 { 3355 {
3147 PUTBACK; 3356 PUTBACK;
3148 save_perl (aTHX_ current); 3357 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3358 load_perl (aTHX_ coro);
3359 /* the coro is most likely in an active SLF call.
3360 * while not strictly required (the code we execute is
3361 * not allowed to call any SLF functions), it's cleaner
3362 * to reinitialise the slf_frame and restore it later.
3363 * This might one day allow us to actually do SLF calls
3364 * from code executed here.
3365 */
3366 slf_save = slf_frame;
3367 slf_frame.prepare = 0;
3150 SPAGAIN; 3368 SPAGAIN;
3151 } 3369 }
3152 3370
3153 PUSHSTACK; 3371 PUSHSTACK;
3154 3372
3164 SPAGAIN; 3382 SPAGAIN;
3165 3383
3166 if (current != coro) 3384 if (current != coro)
3167 { 3385 {
3168 PUTBACK; 3386 PUTBACK;
3387 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3388 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3389 load_perl (aTHX_ current);
3171 SPAGAIN; 3390 SPAGAIN;
3172 } 3391 }
3173 } 3392 }
3186 RETVAL = boolSV (coro->flags & ix); 3405 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3406 OUTPUT:
3188 RETVAL 3407 RETVAL
3189 3408
3190void 3409void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3410throw (Coro::State self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3411 PROTOTYPE: $;$
3193 CODE: 3412 CODE:
3194{ 3413{
3195 struct coro *current = SvSTATE_current; 3414 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3197 SvREFCNT_dec (*throwp); 3416 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3417 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3200} 3419}
3201 3420
3202void 3421void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3423 PROTOTYPE: $;$
3259 3478
3260void 3479void
3261cancel (Coro::State self) 3480cancel (Coro::State self)
3262 CODE: 3481 CODE:
3263 coro_state_destroy (aTHX_ self); 3482 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3483
3484SV *
3485enable_times (int enabled = enable_times)
3486 CODE:
3487{
3488 RETVAL = boolSV (enable_times);
3489
3490 if (enabled != enable_times)
3491 {
3492 enable_times = enabled;
3493
3494 coro_times_update ();
3495 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3496 }
3497}
3498 OUTPUT:
3499 RETVAL
3500
3501void
3502times (Coro::State self)
3503 PPCODE:
3504{
3505 struct coro *current = SvSTATE (coro_current);
3506
3507 if (expect_false (current == self))
3508 {
3509 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current));
3511 }
3512
3513 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516
3517 if (expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current));
3519}
3520
3521void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3523 CODE:
3524{
3525 struct coro *current = SvSTATE_current;
3526
3527 if (current == coro)
3528 SWAP_SVS (current);
3529
3530 if (!coro->swap_sv)
3531 coro->swap_sv = newAV ();
3532
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3534 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3535
3536 if (current == coro)
3537 SWAP_SVS (current);
3538}
3265 3539
3266 3540
3267MODULE = Coro::State PACKAGE = Coro 3541MODULE = Coro::State PACKAGE = Coro
3268 3542
3269BOOT: 3543BOOT:
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3554
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3559
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3560 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3561
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3308 sv_setiv (sv, (IV)&coroapi); 3582 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3583 SvREADONLY_on (sv);
3310 } 3584 }
3311} 3585}
3312 3586
3587SV *
3588async (...)
3589 PROTOTYPE: &@
3590 CODE:
3591 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3592 api_ready (aTHX_ RETVAL);
3593 OUTPUT:
3594 RETVAL
3595
3596void
3597_destroy (Coro::State coro)
3598 CODE:
3599 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro);
3601 coro_call_on_destroy (aTHX_ coro);
3602
3313void 3603void
3314terminate (...) 3604terminate (...)
3315 CODE: 3605 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3606 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607
3608void
3609cancel (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3317 3612
3318void 3613void
3319schedule (...) 3614schedule (...)
3320 CODE: 3615 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3616 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3351_set_readyhook (SV *hook) 3646_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3647 PROTOTYPE: $
3353 CODE: 3648 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3649 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3650 SvGETMAGIC (hook);
3651 if (SvOK (hook))
3652 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3653 coro_readyhook = newSVsv (hook);
3654 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3655 }
3656 else
3657 {
3658 coro_readyhook = 0;
3659 CORO_READYHOOK = 0;
3660 }
3357 3661
3358int 3662int
3359prio (Coro::State coro, int newprio = 0) 3663prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3664 PROTOTYPE: $;$
3361 ALIAS: 3665 ALIAS:
3367 if (items > 1) 3671 if (items > 1)
3368 { 3672 {
3369 if (ix) 3673 if (ix)
3370 newprio = coro->prio - newprio; 3674 newprio = coro->prio - newprio;
3371 3675
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3676 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3677 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3678
3375 coro->prio = newprio; 3679 coro->prio = newprio;
3376 } 3680 }
3377} 3681}
3378 OUTPUT: 3682 OUTPUT:
3425 for (i = 1; i < items; ++i) 3729 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 3730 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 3731
3428 if ((SV *)hv == &PL_sv_undef) 3732 if ((SV *)hv == &PL_sv_undef)
3429 { 3733 {
3430 PUSHMARK (SP); 3734 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3735 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3736 SvREFCNT_dec (sv);
3439 } 3737 }
3440 3738
3441 { 3739 {
3442 struct coro *coro = SvSTATE_hv (hv); 3740 struct coro *coro = SvSTATE_hv (hv);
3443 3741
3477 CODE: 3775 CODE:
3478{ 3776{
3479 struct coro *coro = SvSTATE_current; 3777 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 3779
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 3780 block = s_get_cv_croak (block);
3483 3781
3484 if (!*avp) 3782 if (!*avp)
3485 *avp = newAV (); 3783 *avp = newAV ();
3486 3784
3487 av_push (*avp, SvREFCNT_inc (block)); 3785 av_push (*avp, SvREFCNT_inc (block));
3687 3985
3688void 3986void
3689_register (char *target, char *proto, SV *req) 3987_register (char *target, char *proto, SV *req)
3690 CODE: 3988 CODE:
3691{ 3989{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 3990 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 3991 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3992 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 3993 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3994 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 3995}
3698 3996
3997MODULE = Coro::State PACKAGE = Coro::Select
3998
3999void
4000patch_pp_sselect ()
4001 CODE:
4002 if (!coro_old_pp_sselect)
4003 {
4004 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4005 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4006 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4007 }
4008
4009void
4010unpatch_pp_sselect ()
4011 CODE:
4012 if (coro_old_pp_sselect)
4013 {
4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4015 coro_old_pp_sselect = 0;
4016 }
4017

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines