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.398 by root, Sat May 7 14:11:10 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
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);
131static void slf_destroy (pTHX_ struct coro *coro);
179 132
180static U32 cctx_gen; 133static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
200static SV *sv_pool_size; 153static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 154static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 155static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 156static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 157static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 158
207/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
208static SV *sv_activity; 160static SV *sv_activity;
161
162/* enable processtime/realtime profiling */
163static char enable_times;
164typedef U32 coro_ts[2];
165static coro_ts time_real, time_cpu;
166static char times_valid;
209 167
210static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
212 170
213enum { 171enum {
239 int valgrind_id; 197 int valgrind_id;
240#endif 198#endif
241 unsigned char flags; 199 unsigned char flags;
242} coro_cctx; 200} coro_cctx;
243 201
244coro_cctx *cctx_current; /* the currently running cctx */ 202static coro_cctx *cctx_current; /* the currently running cctx */
245 203
246/*****************************************************************************/ 204/*****************************************************************************/
247 205
248enum { 206enum {
249 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
254}; 213};
255 214
256/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
257typedef struct 216typedef struct
258{ 217{
264#define VAR(name,type) type name; 223#define VAR(name,type) type name;
265# include "state.h" 224# include "state.h"
266#undef VAR 225#undef VAR
267} perl_slots; 226} perl_slots;
268 227
228// how many context stack entries do we need for perl_slots
269#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
270 230
271/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
272struct coro { 232struct coro {
273 /* the C coroutine allocated to this perl coroutine, if any */ 233 /* the C coroutine allocated to this perl coroutine, if any */
284 CV *startcv; /* the CV to execute */ 244 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 245 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */ 246 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro);
290 249
291 /* statistics */ 250 /* statistics */
292 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
293 252
294 /* coro process data */ 253 /* coro process data */
303 262
304 /* on_enter/on_leave */ 263 /* on_enter/on_leave */
305 AV *on_enter; 264 AV *on_enter;
306 AV *on_leave; 265 AV *on_leave;
307 266
267 /* swap_sv */
268 AV *swap_sv;
269
270 /* times */
271 coro_ts t_cpu, t_real;
272
308 /* linked list */ 273 /* linked list */
309 struct coro *next, *prev; 274 struct coro *next, *prev;
310}; 275};
311 276
312typedef struct coro *Coro__State; 277typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 278typedef struct coro *Coro__State_or_hashref;
314 279
315/* the following variables are effectively part of the perl context */ 280/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 281/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 282/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 283static struct CoroSLF slf_frame; /* the current slf frame */
319 284
320/** Coro ********************************************************************/ 285/** Coro ********************************************************************/
321 286
322#define CORO_PRIO_MAX 3 287#define CORO_PRIO_MAX 3
328 293
329/* for Coro.pm */ 294/* for Coro.pm */
330static SV *coro_current; 295static SV *coro_current;
331static SV *coro_readyhook; 296static SV *coro_readyhook;
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 298static CV *cv_coro_run;
334static struct coro *coro_first; 299static struct coro *coro_first;
335#define coro_nready coroapi.nready 300#define coro_nready coroapi.nready
301
302/** Coro::Select ************************************************************/
303
304static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select;
306
307/* horrible hack, but if it works... */
308static OP *
309coro_pp_sselect (pTHX)
310{
311 dSP;
312 PUSHMARK (SP - 4); /* fake argument list */
313 XPUSHs (coro_select_select);
314 PUTBACK;
315
316 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
317 PL_op->op_flags |= OPf_STACKED;
318 PL_op->op_private = 0;
319 return PL_ppaddr [OP_ENTERSUB](aTHX);
320}
321
322/** time stuff **************************************************************/
323
324#ifdef HAS_GETTIMEOFDAY
325
326static void
327coro_u2time (pTHX_ UV ret[2])
328{
329 struct timeval tv;
330 gettimeofday (&tv, 0);
331
332 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec;
334}
335
336static double
337coro_nvtime ()
338{
339 struct timeval tv;
340 gettimeofday (&tv, 0);
341
342 return tv.tv_sec + tv.tv_usec * 1e-6;
343}
344
345static void
346time_init (pTHX)
347{
348 nvtime = coro_nvtime;
349 u2time = coro_u2time;
350}
351
352#else
353
354static void
355time_init (pTHX)
356{
357 SV **svp;
358
359 require_pv ("Time/HiRes.pm");
360
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365
366 nvtime = INT2PTR (double (*)(), SvIV (*svp));
367
368 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
369 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
370}
371
372#endif
336 373
337/** lowlevel stuff **********************************************************/ 374/** lowlevel stuff **********************************************************/
338 375
339static SV * 376static SV *
340coro_get_sv (pTHX_ const char *name, int create) 377coro_get_sv (pTHX_ const char *name, int create)
364 get_hv (name, create); 401 get_hv (name, create);
365#endif 402#endif
366 return get_hv (name, create); 403 return get_hv (name, create);
367} 404}
368 405
369/* may croak */ 406INLINE void
370INLINE CV * 407coro_times_update ()
371coro_sv_2cv (pTHX_ SV *sv)
372{ 408{
373 HV *st; 409#ifdef coro_clock_gettime
374 GV *gvp; 410 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 411
377 if (!cv) 412 ts.tv_sec = ts.tv_nsec = 0;
378 croak ("code reference expected"); 413 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
414 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
379 415
380 return cv; 416 ts.tv_sec = ts.tv_nsec = 0;
417 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
418 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
419#else
420 dTHX;
421 UV tv[2];
422
423 u2time (aTHX_ tv);
424 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000;
426#endif
427}
428
429INLINE void
430coro_times_add (struct coro *c)
431{
432 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0];
435
436 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0];
439}
440
441INLINE void
442coro_times_sub (struct coro *c)
443{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
445 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0];
447
448 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
449 c->t_cpu [1] -= time_cpu [1];
450 c->t_cpu [0] -= time_cpu [0];
381} 451}
382 452
383/*****************************************************************************/ 453/*****************************************************************************/
384/* magic glue */ 454/* magic glue */
385 455
488 AV *padlist; 558 AV *padlist;
489 AV *av = (AV *)mg->mg_obj; 559 AV *av = (AV *)mg->mg_obj;
490 560
491 /* perl manages to free our internal AV and _then_ call us */ 561 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 562 if (IN_DESTRUCT)
493 return; 563 return 0;
494 564
495 /* casting is fun. */ 565 /* casting is fun. */
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 567 free_padlist (aTHX_ padlist);
498 568
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 618}
549 619
550/** load & save, init *******************************************************/ 620/** load & save, init *******************************************************/
551 621
622/* swap sv heads, at least logically */
623static void
624swap_svs (pTHX_ Coro__State c)
625{
626 int i;
627
628 for (i = 0; i <= AvFILLp (c->swap_sv); )
629 {
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667}
668
669#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro))
672
552static void 673static void
553on_enterleave_call (pTHX_ SV *cb); 674on_enterleave_call (pTHX_ SV *cb);
554 675
555static void 676static void
556load_perl (pTHX_ Coro__State c) 677load_perl (pTHX_ Coro__State c)
587 } 708 }
588 709
589 slf_frame = c->slf_frame; 710 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 711 CORO_THROW = c->except;
591 712
713 if (expect_false (enable_times))
714 {
715 if (expect_false (!times_valid))
716 coro_times_update ();
717
718 coro_times_sub (c);
719 }
720
592 if (expect_false (c->on_enter)) 721 if (expect_false (c->on_enter))
593 { 722 {
594 int i; 723 int i;
595 724
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 725 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 727 }
728
729 SWAP_SVS (c);
599} 730}
600 731
601static void 732static void
602save_perl (pTHX_ Coro__State c) 733save_perl (pTHX_ Coro__State c)
603{ 734{
735 SWAP_SVS (c);
736
604 if (expect_false (c->on_leave)) 737 if (expect_false (c->on_leave))
605 { 738 {
606 int i; 739 int i;
607 740
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 741 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 }
744
745 times_valid = 0;
746
747 if (expect_false (enable_times))
748 {
749 coro_times_update (); times_valid = 1;
750 coro_times_add (c);
610 } 751 }
611 752
612 c->except = CORO_THROW; 753 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 754 c->slf_frame = slf_frame;
614 755
658 799
659 PUTBACK; 800 PUTBACK;
660 } 801 }
661 802
662 /* allocate some space on the context stack for our purposes */ 803 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 805 {
668 int i; 806 unsigned int i;
807
669 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 809 CXINC;
671 } 810
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
812 }
673 813
674 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
675 815
676 { 816 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698# define coro_init_stacks(thx) init_stacks () 838# define coro_init_stacks(thx) init_stacks ()
699#else 839#else
700static void 840static void
701coro_init_stacks (pTHX) 841coro_init_stacks (pTHX)
702{ 842{
703 PL_curstackinfo = new_stackinfo(32, 8); 843 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 844 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 845 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 847
708 PL_stack_base = AvARRAY(PL_curstack); 848 PL_stack_base = AvARRAY(PL_curstack);
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 {
1159 SV *old_current = SvRV (coro_current);
1012 struct coro *current = SvSTATE_current; 1160 struct coro *current = SvSTATE (old_current);
1013 1161
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015 1163
1016 save_perl (aTHX_ current); 1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1017 load_perl (aTHX_ coro); 1169 load_perl (aTHX_ coro);
1018 1170
1019 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1020 coro_destruct_stacks (aTHX); 1172 coro_destruct_stacks (aTHX);
1173
1174 /* restore swapped sv's */
1175 SWAP_SVS (coro);
1021 1176
1022 // now save some sv's to be free'd later 1177 // now save some sv's to be free'd later
1023 svf [0] = GvSV (PL_defgv); 1178 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1179 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1180 svf [2] = GvSV (PL_errgv);
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1184 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1185 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1186 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1187 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1188
1189 SvRV_set (coro_current, old_current);
1190
1034 load_perl (aTHX_ current); 1191 load_perl (aTHX_ current);
1035 } 1192 }
1036 1193
1037 { 1194 {
1038 int i; 1195 unsigned int i;
1039 1196
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1197 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1198 SvREFCNT_dec (svf [i]);
1042 1199
1043 SvREFCNT_dec (coro->saved_deffh); 1200 SvREFCNT_dec (coro->saved_deffh);
1249 /* somebody or something will hit me for both perl_run and PL_restartop */ 1406 /* somebody or something will hit me for both perl_run and PL_restartop */
1250 PL_restartop = PL_op; 1407 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1408 perl_run (PL_curinterp);
1252 /* 1409 /*
1253 * Unfortunately, there is no way to get at the return values of the 1410 * Unfortunately, there is no way to get at the return values of the
1254 * coro body here, as perl_run destroys these 1411 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1412 * runtime errors here, as this is just a random interpreter, not a thread.
1255 */ 1413 */
1256 1414
1257 /* 1415 /*
1258 * If perl-run returns we assume exit() was being called or the coro 1416 * 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) 1417 * fell off the end, which seems to be the only valid (non-bug)
1346cctx_destroy (coro_cctx *cctx) 1504cctx_destroy (coro_cctx *cctx)
1347{ 1505{
1348 if (!cctx) 1506 if (!cctx)
1349 return; 1507 return;
1350 1508
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1510
1353 --cctx_count; 1511 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1512 coro_destroy (&cctx->cctx);
1355 1513
1356 /* coro_transfer creates new, empty cctx's */ 1514 /* coro_transfer creates new, empty cctx's */
1466 if (expect_false (next->flags & CF_NEW)) 1624 if (expect_false (next->flags & CF_NEW))
1467 { 1625 {
1468 /* need to start coroutine */ 1626 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1627 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1628 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1629 init_perl (aTHX_ next);
1472 } 1630 }
1473 else 1631 else
1474 load_perl (aTHX_ next); 1632 load_perl (aTHX_ next);
1475 1633
1476 /* possibly untie and reuse the cctx */ 1634 /* possibly untie and reuse the cctx */
1515#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1675
1518/** high level stuff ********************************************************/ 1676/** high level stuff ********************************************************/
1519 1677
1520static int 1678static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1680{
1523 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_DESTROYED)
1524 return 0; 1682 return;
1525 1683
1526 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1528 1685
1529 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_DESTROYED;
1530 1687
1531 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1532 { 1689 {
1539 1696
1540 if (coro->mainstack 1697 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1698 && coro->mainstack != main_mainstack
1542 && coro->slot 1699 && coro->slot
1543 && !PL_dirty) 1700 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1701 destroy_perl (aTHX_ coro);
1702
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1545 1706
1546 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1711 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} 1712}
1557 1713
1558static int 1714static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1715coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1716{
1608 1764
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1765 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1766 TRANSFER (ta, 1);
1611} 1767}
1612 1768
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 ********************************************************************/ 1769/** Coro ********************************************************************/
1637 1770
1638INLINE void 1771INLINE void
1639coro_enq (pTHX_ struct coro *coro) 1772coro_enq (pTHX_ struct coro *coro)
1640{ 1773{
1665 } 1798 }
1666 1799
1667 return 0; 1800 return 0;
1668} 1801}
1669 1802
1803static void
1804invoke_sv_ready_hook_helper (void)
1805{
1806 dTHX;
1807 dSP;
1808
1809 ENTER;
1810 SAVETMPS;
1811
1812 PUSHMARK (SP);
1813 PUTBACK;
1814 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1815
1816 FREETMPS;
1817 LEAVE;
1818}
1819
1670static int 1820static int
1671api_ready (pTHX_ SV *coro_sv) 1821api_ready (pTHX_ SV *coro_sv)
1672{ 1822{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1678 1824
1679 if (coro->flags & CF_READY) 1825 if (coro->flags & CF_READY)
1680 return 0; 1826 return 0;
1681 1827
1682 coro->flags |= CF_READY; 1828 coro->flags |= CF_READY;
1683 1829
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1830 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1831
1690 if (sv_hook) 1832 if (!coro_nready++)
1691 { 1833 if (coroapi.readyhook)
1692 dSP; 1834 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 1835
1708 return 1; 1836 return 1;
1709} 1837}
1710 1838
1711static int 1839static int
1756 { 1884 {
1757 /* nothing to schedule: call the idle handler */ 1885 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1886 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1887 && SvOBJECT (SvRV (sv_idle)))
1760 { 1888 {
1889 if (SvRV (sv_idle) == SvRV (coro_current))
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1891
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1893 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1894 --coro_nready;
1764 } 1895 }
1765 else 1896 else
1766 { 1897 {
1898 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1899 dSP;
1768 1900
1769 ENTER; 1901 ENTER;
1770 SAVETMPS; 1902 SAVETMPS;
1771 1903
1881 2013
1882static void 2014static void
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2015coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2016{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2018
1888 if (on_destroyp) 2019 if (on_destroyp)
1889 { 2020 {
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1891 2024
1892 while (AvFILLp (on_destroy) >= 0) 2025 while (AvFILLp (on_destroy) >= 0)
1893 { 2026 {
1894 dSP; /* don't disturb outer sp */ 2027 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy); 2028 SV *cb = av_pop (on_destroy);
1897 PUSHMARK (SP); 2030 PUSHMARK (SP);
1898 2031
1899 if (statusp) 2032 if (statusp)
1900 { 2033 {
1901 int i; 2034 int i;
1902 AV *status = (AV *)SvRV (*statusp);
1903 EXTEND (SP, AvFILLp (status) + 1); 2035 EXTEND (SP, AvFILLp (status) + 1);
1904 2036
1905 for (i = 0; i <= AvFILLp (status); ++i) 2037 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]); 2038 PUSHs (AvARRAY (status)[i]);
1907 } 2039 }
1911 } 2043 }
1912 } 2044 }
1913} 2045}
1914 2046
1915static void 2047static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items)
1917{ 2049{
1918 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV (); 2050 AV *av = newAV ();
1921 2051
2052 /* items are actually not so common, so optimise for this case */
2053 if (items)
2054 {
2055 int i;
2056
1922 av_extend (av, items - 1); 2057 av_extend (av, items - 1);
2058
1923 for (i = 0; i < items; ++i) 2059 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2060 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 }
1925 2062
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064}
1927 2065
2066static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2069 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2070 api_ready (aTHX_ sv_manager);
1930 2071
1931 frame->prepare = prepare_schedule; 2072 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2073 frame->check = slf_check_repeat;
1933 2074
1934 /* as a minor optimisation, we could unwind all stacks here */ 2075 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2076 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2077 /*coro_unwind_stacks (aTHX);*/
2078}
2079
2080static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{
2083 HV *coro_hv = (HV *)SvRV (coro_current);
2084
2085 coro_set_status (aTHX_ coro_hv, arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087}
2088
2089static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{
2092 HV *coro_hv;
2093 struct coro *coro;
2094
2095 if (items <= 0)
2096 croak ("Coro::cancel called without coro object,");
2097
2098 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv;
2100
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1);
2102
2103 if (expect_false (coro->flags & CF_NOCANCEL))
2104 {
2105 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro;
2107
2108 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop;
2110 }
2111 else if (coro_hv == (HV *)SvRV (coro_current))
2112 {
2113 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 }
2116 else
2117 {
2118 struct coro *self = SvSTATE_current;
2119
2120 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working...
2125 */
2126 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL;
2133
2134 if (slf_frame.data)
2135 {
2136 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 }
2139 else
2140 {
2141 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop;
2143 }
2144 }
2145}
2146
2147static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{
2150 frame->prepare = 0;
2151 coro_unwind_stacks (aTHX);
2152
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154
2155 return 1;
2156}
2157
2158static int
2159safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2160{
2161 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught");
2163
2164 if (coro->flags & CF_NEW)
2165 {
2166 coro_set_status (aTHX_ coro->hv, arg, items);
2167 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 }
2170 else
2171 {
2172 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174
2175 slf_destroy (aTHX_ coro);
2176
2177 coro_set_status (aTHX_ coro->hv, arg, items);
2178 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel;
2180
2181 api_ready (aTHX_ coro->hv);
2182 }
2183
2184 return 1;
1937} 2185}
1938 2186
1939/*****************************************************************************/ 2187/*****************************************************************************/
1940/* async pool handler */ 2188/* async pool handler */
1941 2189
1981 coro->saved_deffh = 0; 2229 coro->saved_deffh = 0;
1982 2230
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2231 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2232 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 { 2233 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2234 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1987 coro->invoke_av = newAV (); 2235 return;
1988
1989 frame->prepare = prepare_nop;
1990 } 2236 }
1991 else 2237 else
1992 { 2238 {
1993 av_clear (GvAV (PL_defgv)); 2239 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2240 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2019 2265
2020static void 2266static void
2021coro_rouse_callback (pTHX_ CV *cv) 2267coro_rouse_callback (pTHX_ CV *cv)
2022{ 2268{
2023 dXSARGS; 2269 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2270 SV *data = (SV *)S_GENSUB_ARG;
2025 2271
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2272 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2273 {
2028 /* first call, set args */ 2274 /* first call, set args */
2029 SV *coro = SvRV (data); 2275 SV *coro = SvRV (data);
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2341 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2343 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2344
2099 { 2345 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2347 SV *data = (SV *)S_GENSUB_ARG;
2102 2348
2103 frame->data = (void *)data; 2349 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2350 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2351 frame->check = slf_check_rouse_wait;
2106 } 2352 }
2110coro_new_rouse_cb (pTHX) 2356coro_new_rouse_cb (pTHX)
2111{ 2357{
2112 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2359 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2360 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2361 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2362
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2363 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2364 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2365
2120 SvREFCNT_dec (coro->rouse_cb); 2366 SvREFCNT_dec (coro->rouse_cb);
2217static void 2463static void
2218slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2464slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{ 2465{
2220 frame->prepare = prepare_cede_notself; 2466 frame->prepare = prepare_cede_notself;
2221 frame->check = slf_check_nop; 2467 frame->check = slf_check_nop;
2468}
2469
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void
2472slf_destroy (pTHX_ struct coro *coro)
2473{
2474 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477
2478 /*
2479 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions.
2483 */
2484 coro->slf_frame.prepare = 0;
2222} 2485}
2223 2486
2224/* 2487/*
2225 * these not obviously related functions are all rolled into one 2488 * these not obviously related functions are all rolled into one
2226 * function to increase chances that they all will call transfer with the same 2489 * function to increase chances that they all will call transfer with the same
2345 if (PL_op->op_flags & OPf_STACKED) 2608 if (PL_op->op_flags & OPf_STACKED)
2346 { 2609 {
2347 if (items > slf_arga) 2610 if (items > slf_arga)
2348 { 2611 {
2349 slf_arga = items; 2612 slf_arga = items;
2350 free (slf_argv); 2613 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2614 New (0, slf_argv, slf_arga, SV *);
2352 } 2615 }
2353 2616
2354 slf_argc = items; 2617 slf_argc = items;
2355 2618
2356 for (i = 0; i < items; ++i) 2619 for (i = 0; i < items; ++i)
2552 SvREFCNT_dec (cb); 2815 SvREFCNT_dec (cb);
2553 } 2816 }
2554} 2817}
2555 2818
2556static void 2819static void
2557coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2820coro_semaphore_destroy (pTHX_ struct coro *coro)
2558{ 2821{
2559 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2822 /* call $sem->adjust (0) to possibly wake up some other waiters */
2560 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2561} 2824}
2562 2825
2569 /* if we are about to throw, don't actually acquire the lock, just throw */ 2832 /* if we are about to throw, don't actually acquire the lock, just throw */
2570 if (CORO_THROW) 2833 if (CORO_THROW)
2571 return 0; 2834 return 0;
2572 else if (SvIVX (count_sv) > 0) 2835 else if (SvIVX (count_sv) > 0)
2573 { 2836 {
2574 SvSTATE_current->on_destroy = 0; 2837 frame->destroy = 0;
2575 2838
2576 if (acquire) 2839 if (acquire)
2577 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2840 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2578 else 2841 else
2579 coro_semaphore_adjust (aTHX_ av, 0); 2842 coro_semaphore_adjust (aTHX_ av, 0);
2622 { 2885 {
2623 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2886 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2624 2887
2625 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2888 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2626 frame->prepare = prepare_schedule; 2889 frame->prepare = prepare_schedule;
2627
2628 /* to avoid race conditions when a woken-up coro gets terminated */ 2890 /* to avoid race conditions when a woken-up coro gets terminated */
2629 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2891 /* we arrange for a temporary on_destroy that calls adjust (0) */
2630 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2892 frame->destroy = coro_semaphore_destroy;
2631 } 2893 }
2632} 2894}
2633 2895
2634static void 2896static void
2635slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2897slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2643{ 2905{
2644 if (items >= 2) 2906 if (items >= 2)
2645 { 2907 {
2646 /* callback form */ 2908 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 2909 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2910 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 2911
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2912 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 2913
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 2914 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 2915 coro_semaphore_adjust (aTHX_ av, 0);
2713{ 2975{
2714 AV *av = (AV *)SvRV (arg [0]); 2976 AV *av = (AV *)SvRV (arg [0]);
2715 2977
2716 if (items >= 2) 2978 if (items >= 2)
2717 { 2979 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2980 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2981 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 2982
2721 if (SvIVX (AvARRAY (av)[0])) 2983 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2984 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 2985
2724 frame->prepare = prepare_nop; 2986 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 2987 frame->check = slf_check_nop;
2726 } 2988 }
2727 else if (SvIVX (AvARRAY (av)[0])) 2989 else if (SvIVX (AvARRAY (av)[0]))
2758 3020
2759static void 3021static void
2760coro_aio_callback (pTHX_ CV *cv) 3022coro_aio_callback (pTHX_ CV *cv)
2761{ 3023{
2762 dXSARGS; 3024 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 3025 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 3026 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 3027 SV *data_sv = newSV (sizeof (struct io_state));
2766 3028
2767 av_extend (state, items - 1); 3029 av_extend (state, items - 1);
2768 3030
2882 3144
2883 for (i = 0; i < items; ++i) 3145 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3146 PUSHs (arg [i]);
2885 3147
2886 /* now push the callback closure */ 3148 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3149 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3150
2889 /* now call the AIO function - we assume our request is uncancelable */ 3151 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3152 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3153 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3154 }
2893 3155
2894 /* now that the requets is going, we loop toll we have a result */ 3156 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3157 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3158 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3159 frame->check = slf_check_aio_req;
2898} 3160}
2899 3161
2910/*****************************************************************************/ 3172/*****************************************************************************/
2911 3173
2912#if CORO_CLONE 3174#if CORO_CLONE
2913# include "clone.c" 3175# include "clone.c"
2914#endif 3176#endif
3177
3178/*****************************************************************************/
3179
3180static SV *
3181coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3182{
3183 SV *coro_sv;
3184 struct coro *coro;
3185 MAGIC *mg;
3186 HV *hv;
3187 SV *cb;
3188 int i;
3189
3190 if (argc > 0)
3191 {
3192 cb = s_get_cv_croak (argv [0]);
3193
3194 if (!is_coro)
3195 {
3196 if (CvISXSUB (cb))
3197 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3198
3199 if (!CvROOT (cb))
3200 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3201 }
3202 }
3203
3204 Newz (0, coro, 1, struct coro);
3205 coro->args = newAV ();
3206 coro->flags = CF_NEW;
3207
3208 if (coro_first) coro_first->prev = coro;
3209 coro->next = coro_first;
3210 coro_first = coro;
3211
3212 coro->hv = hv = newHV ();
3213 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3214 mg->mg_flags |= MGf_DUP;
3215 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3216
3217 if (argc > 0)
3218 {
3219 av_extend (coro->args, argc + is_coro - 1);
3220
3221 if (is_coro)
3222 {
3223 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3224 cb = (SV *)cv_coro_run;
3225 }
3226
3227 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3228
3229 for (i = 1; i < argc; i++)
3230 av_push (coro->args, newSVsv (argv [i]));
3231 }
3232
3233 return coro_sv;
3234}
2915 3235
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3237
2918PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2919 3239
2972 coroapi.prepare_nop = prepare_nop; 3292 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3293 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3294 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3295 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3296
2977 { 3297 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 3298
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2987} 3300}
2988 3301
2989SV * 3302SV *
2990new (char *klass, ...) 3303new (SV *klass, ...)
2991 ALIAS: 3304 ALIAS:
2992 Coro::new = 1 3305 Coro::new = 1
2993 CODE: 3306 CODE:
2994{ 3307 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3308 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 3309 RETVAL
3046 3310
3047void 3311void
3048transfer (...) 3312transfer (...)
3049 PROTOTYPE: $$ 3313 PROTOTYPE: $$
3050 CODE: 3314 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3315 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 3316
3060void 3317void
3061_exit (int code) 3318_exit (int code)
3062 PROTOTYPE: $ 3319 PROTOTYPE: $
3063 CODE: 3320 CODE:
3139 CODE: 3396 CODE:
3140{ 3397{
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3398 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3142 { 3399 {
3143 struct coro *current = SvSTATE_current; 3400 struct coro *current = SvSTATE_current;
3401 struct CoroSLF slf_save;
3144 3402
3145 if (current != coro) 3403 if (current != coro)
3146 { 3404 {
3147 PUTBACK; 3405 PUTBACK;
3148 save_perl (aTHX_ current); 3406 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3407 load_perl (aTHX_ coro);
3408 /* the coro is most likely in an active SLF call.
3409 * while not strictly required (the code we execute is
3410 * not allowed to call any SLF functions), it's cleaner
3411 * to reinitialise the slf_frame and restore it later.
3412 * This might one day allow us to actually do SLF calls
3413 * from code executed here.
3414 */
3415 slf_save = slf_frame;
3416 slf_frame.prepare = 0;
3150 SPAGAIN; 3417 SPAGAIN;
3151 } 3418 }
3152 3419
3153 PUSHSTACK; 3420 PUSHSTACK;
3154 3421
3164 SPAGAIN; 3431 SPAGAIN;
3165 3432
3166 if (current != coro) 3433 if (current != coro)
3167 { 3434 {
3168 PUTBACK; 3435 PUTBACK;
3436 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3437 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3438 load_perl (aTHX_ current);
3171 SPAGAIN; 3439 SPAGAIN;
3172 } 3440 }
3173 } 3441 }
3186 RETVAL = boolSV (coro->flags & ix); 3454 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3455 OUTPUT:
3188 RETVAL 3456 RETVAL
3189 3457
3190void 3458void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3459throw (Coro::State self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3460 PROTOTYPE: $;$
3193 CODE: 3461 CODE:
3194{ 3462{
3195 struct coro *current = SvSTATE_current; 3463 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3197 SvREFCNT_dec (*throwp); 3465 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3466 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3200} 3468}
3201 3469
3202void 3470void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3472 PROTOTYPE: $;$
3259 3527
3260void 3528void
3261cancel (Coro::State self) 3529cancel (Coro::State self)
3262 CODE: 3530 CODE:
3263 coro_state_destroy (aTHX_ self); 3531 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3532
3533SV *
3534enable_times (int enabled = enable_times)
3535 CODE:
3536{
3537 RETVAL = boolSV (enable_times);
3538
3539 if (enabled != enable_times)
3540 {
3541 enable_times = enabled;
3542
3543 coro_times_update ();
3544 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3545 }
3546}
3547 OUTPUT:
3548 RETVAL
3549
3550void
3551times (Coro::State self)
3552 PPCODE:
3553{
3554 struct coro *current = SvSTATE (coro_current);
3555
3556 if (expect_false (current == self))
3557 {
3558 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current));
3560 }
3561
3562 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565
3566 if (expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current));
3568}
3569
3570void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3572 CODE:
3573{
3574 struct coro *current = SvSTATE_current;
3575
3576 if (current == coro)
3577 SWAP_SVS (current);
3578
3579 if (!coro->swap_sv)
3580 coro->swap_sv = newAV ();
3581
3582 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3583 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3584
3585 if (current == coro)
3586 SWAP_SVS (current);
3587}
3265 3588
3266 3589
3267MODULE = Coro::State PACKAGE = Coro 3590MODULE = Coro::State PACKAGE = Coro
3268 3591
3269BOOT: 3592BOOT:
3270{ 3593{
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3597 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3599 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3600 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3601 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3602
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3604 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); 3605 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); 3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3607
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3608 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3609
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3308 sv_setiv (sv, (IV)&coroapi); 3630 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3631 SvREADONLY_on (sv);
3310 } 3632 }
3311} 3633}
3312 3634
3635SV *
3636async (...)
3637 PROTOTYPE: &@
3638 CODE:
3639 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3640 api_ready (aTHX_ RETVAL);
3641 OUTPUT:
3642 RETVAL
3643
3644void
3645_destroy (Coro::State coro)
3646 CODE:
3647 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro);
3649 coro_call_on_destroy (aTHX_ coro);
3650
3313void 3651void
3314terminate (...) 3652terminate (...)
3315 CODE: 3653 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3654 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3655
3656void
3657cancel (...)
3658 CODE:
3659 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3660
3661int
3662safe_cancel (Coro::State self, ...)
3663 C_ARGS: aTHX_ self, &ST (1), items - 1
3317 3664
3318void 3665void
3319schedule (...) 3666schedule (...)
3320 CODE: 3667 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3668 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3351_set_readyhook (SV *hook) 3698_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3699 PROTOTYPE: $
3353 CODE: 3700 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3701 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3702 SvGETMAGIC (hook);
3703 if (SvOK (hook))
3704 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3705 coro_readyhook = newSVsv (hook);
3706 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3707 }
3708 else
3709 {
3710 coro_readyhook = 0;
3711 CORO_READYHOOK = 0;
3712 }
3357 3713
3358int 3714int
3359prio (Coro::State coro, int newprio = 0) 3715prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
3361 ALIAS: 3717 ALIAS:
3367 if (items > 1) 3723 if (items > 1)
3368 { 3724 {
3369 if (ix) 3725 if (ix)
3370 newprio = coro->prio - newprio; 3726 newprio = coro->prio - newprio;
3371 3727
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3728 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3729 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3730
3375 coro->prio = newprio; 3731 coro->prio = newprio;
3376 } 3732 }
3377} 3733}
3378 OUTPUT: 3734 OUTPUT:
3425 for (i = 1; i < items; ++i) 3781 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 3782 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 3783
3428 if ((SV *)hv == &PL_sv_undef) 3784 if ((SV *)hv == &PL_sv_undef)
3429 { 3785 {
3430 PUSHMARK (SP); 3786 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)); 3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv);
3439 } 3789 }
3440 3790
3441 { 3791 {
3442 struct coro *coro = SvSTATE_hv (hv); 3792 struct coro *coro = SvSTATE_hv (hv);
3443 3793
3477 CODE: 3827 CODE:
3478{ 3828{
3479 struct coro *coro = SvSTATE_current; 3829 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 3831
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 3832 block = s_get_cv_croak (block);
3483 3833
3484 if (!*avp) 3834 if (!*avp)
3485 *avp = newAV (); 3835 *avp = newAV ();
3486 3836
3487 av_push (*avp, SvREFCNT_inc (block)); 3837 av_push (*avp, SvREFCNT_inc (block));
3687 4037
3688void 4038void
3689_register (char *target, char *proto, SV *req) 4039_register (char *target, char *proto, SV *req)
3690 CODE: 4040 CODE:
3691{ 4041{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 4042 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 4043 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4044 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 4045 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4046 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 4047}
3698 4048
4049MODULE = Coro::State PACKAGE = Coro::Select
4050
4051void
4052patch_pp_sselect ()
4053 CODE:
4054 if (!coro_old_pp_sselect)
4055 {
4056 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4057 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4058 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4059 }
4060
4061void
4062unpatch_pp_sselect ()
4063 CODE:
4064 if (coro_old_pp_sselect)
4065 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0;
4068 }
4069

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines