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.337 by root, Fri Dec 5 18:26:10 2008 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
… …
137 88
138#define IN_DESTRUCT PL_dirty 89#define IN_DESTRUCT PL_dirty
139 90
140#if __GNUC__ >= 3 91#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 94# define INLINE static inline
144#else 95#else
145# define attribute(x) 96# define attribute(x)
146# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
147# define INLINE static 98# define INLINE static
… …
159# if CORO_PTHREAD 110# if CORO_PTHREAD
160static void *coro_thx; 111static void *coro_thx;
161# endif 112# endif
162#endif 113#endif
163 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
164static 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]);
165 127
166/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
169 132
170static U32 cctx_gen; 133static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 153static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 154static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 155static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 156static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 157static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 158
197/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
198static 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;
199 167
200static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
202 170
203enum { 171enum {
… …
229 int valgrind_id; 197 int valgrind_id;
230#endif 198#endif
231 unsigned char flags; 199 unsigned char flags;
232} coro_cctx; 200} coro_cctx;
233 201
234coro_cctx *cctx_current; /* the currently running cctx */ 202static coro_cctx *cctx_current; /* the currently running cctx */
235 203
236/*****************************************************************************/ 204/*****************************************************************************/
237 205
238enum { 206enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 213};
244 214
245/* 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 */
246typedef struct 216typedef struct
247{ 217{
… …
253#define VAR(name,type) type name; 223#define VAR(name,type) type name;
254# include "state.h" 224# include "state.h"
255#undef VAR 225#undef VAR
256} perl_slots; 226} perl_slots;
257 227
228// how many context stack entries do we need for perl_slots
258#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))
259 230
260/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
261struct coro { 232struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 233 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 234 coro_cctx *cctx;
235
236 /* ready queue */
237 struct coro *next_ready;
264 238
265 /* state data */ 239 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 240 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 241 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 242 perl_slots *slot; /* basically the saved sp */
… …
270 CV *startcv; /* the CV to execute */ 244 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 245 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */ 246 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 249
277 /* statistics */ 250 /* statistics */
278 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
279 252
280 /* coro process data */ 253 /* coro process data */
… …
285 /* async_pool */ 258 /* async_pool */
286 SV *saved_deffh; 259 SV *saved_deffh;
287 SV *invoke_cb; 260 SV *invoke_cb;
288 AV *invoke_av; 261 AV *invoke_av;
289 262
263 /* on_enter/on_leave */
264 AV *on_enter;
265 AV *on_leave;
266
267 /* swap_sv */
268 AV *swap_sv;
269
270 /* times */
271 coro_ts t_cpu, t_real;
272
290 /* linked list */ 273 /* linked list */
291 struct coro *next, *prev; 274 struct coro *next, *prev;
292}; 275};
293 276
294typedef struct coro *Coro__State; 277typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 278typedef struct coro *Coro__State_or_hashref;
296 279
297/* the following variables are effectively part of the perl context */ 280/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 281/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 282/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 283static struct CoroSLF slf_frame; /* the current slf frame */
301 284
302/** Coro ********************************************************************/ 285/** Coro ********************************************************************/
303 286
304#define PRIO_MAX 3 287#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 288#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 289#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 290#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 291#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 292#define CORO_PRIO_MIN -4
310 293
311/* for Coro.pm */ 294/* for Coro.pm */
312static SV *coro_current; 295static SV *coro_current;
313static SV *coro_readyhook; 296static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 298static CV *cv_coro_run;
316static struct coro *coro_first; 299static struct coro *coro_first;
317#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
318 373
319/** lowlevel stuff **********************************************************/ 374/** lowlevel stuff **********************************************************/
320 375
321static SV * 376static SV *
322coro_get_sv (pTHX_ const char *name, int create) 377coro_get_sv (pTHX_ const char *name, int create)
… …
346 get_hv (name, create); 401 get_hv (name, create);
347#endif 402#endif
348 return get_hv (name, create); 403 return get_hv (name, create);
349} 404}
350 405
351/* may croak */ 406INLINE void
352INLINE CV * 407coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 408{
355 HV *st; 409#ifdef coro_clock_gettime
356 GV *gvp; 410 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 411
412 ts.tv_sec = ts.tv_nsec = 0;
413 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
414 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
415
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];
358} 451}
359 452
360/*****************************************************************************/ 453/*****************************************************************************/
361/* magic glue */ 454/* magic glue */
362 455
… …
462static int 555static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 556coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 557{
465 AV *padlist; 558 AV *padlist;
466 AV *av = (AV *)mg->mg_obj; 559 AV *av = (AV *)mg->mg_obj;
560
561 /* perl manages to free our internal AV and _then_ call us */
562 if (IN_DESTRUCT)
563 return 0;
467 564
468 /* casting is fun. */ 565 /* casting is fun. */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
470 free_padlist (aTHX_ padlist); 567 free_padlist (aTHX_ padlist);
471 568
… …
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 618}
522 619
523/** load & save, init *******************************************************/ 620/** load & save, init *******************************************************/
524 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
673static void
674on_enterleave_call (pTHX_ SV *cb);
675
525static void 676static void
526load_perl (pTHX_ Coro__State c) 677load_perl (pTHX_ Coro__State c)
527{ 678{
528 perl_slots *slot = c->slot; 679 perl_slots *slot = c->slot;
529 c->slot = 0; 680 c->slot = 0;
… …
556 PUTBACK; 707 PUTBACK;
557 } 708 }
558 709
559 slf_frame = c->slf_frame; 710 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 711 CORO_THROW = c->except;
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
721 if (expect_false (c->on_enter))
722 {
723 int i;
724
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
727 }
728
729 SWAP_SVS (c);
561} 730}
562 731
563static void 732static void
564save_perl (pTHX_ Coro__State c) 733save_perl (pTHX_ Coro__State c)
565{ 734{
735 SWAP_SVS (c);
736
737 if (expect_false (c->on_leave))
738 {
739 int i;
740
741 for (i = AvFILLp (c->on_leave); i >= 0; --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);
751 }
752
566 c->except = CORO_THROW; 753 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 754 c->slf_frame = slf_frame;
568 755
569 { 756 {
570 dSP; 757 dSP;
… …
583 { 770 {
584 while (expect_true (cxix >= 0)) 771 while (expect_true (cxix >= 0))
585 { 772 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 773 PERL_CONTEXT *cx = &ccstk[cxix--];
587 774
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 776 {
590 CV *cv = cx->blk_sub.cv; 777 CV *cv = cx->blk_sub.cv;
591 778
592 if (expect_true (CvDEPTH (cv))) 779 if (expect_true (CvDEPTH (cv)))
593 { 780 {
… …
612 799
613 PUTBACK; 800 PUTBACK;
614 } 801 }
615 802
616 /* allocate some space on the context stack for our purposes */ 803 /* allocate some space on the context stack for our purposes */
617 /* we manually unroll here, as usually 2 slots is enough */ 804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
618 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC;
621 { 805 {
622 int i; 806 unsigned int i;
807
623 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 0; i < SLOT_COUNT; ++i)
624 CXINC; 809 CXINC;
625 } 810
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
812 }
627 813
628 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
629 815
630 { 816 {
631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
652# define coro_init_stacks(thx) init_stacks () 838# define coro_init_stacks(thx) init_stacks ()
653#else 839#else
654static void 840static void
655coro_init_stacks (pTHX) 841coro_init_stacks (pTHX)
656{ 842{
657 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() */
658 PL_curstackinfo->si_type = PERLSI_MAIN; 844 PL_curstackinfo->si_type = PERLSI_MAIN;
659 PL_curstack = PL_curstackinfo->si_stack; 845 PL_curstack = PL_curstackinfo->si_stack;
660 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
661 847
662 PL_stack_base = AvARRAY(PL_curstack); 848 PL_stack_base = AvARRAY(PL_curstack);
… …
769#endif 955#endif
770 956
771/* 957/*
772 * This overrides the default magic get method of %SIG elements. 958 * This overrides the default magic get method of %SIG elements.
773 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
774 * and instead of tryign to save and restore the hash elements, we just provide 960 * and instead of trying to save and restore the hash elements, we just provide
775 * readback here. 961 * readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 962 */
780static int 963static int
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 965{
783 const char *s = MgPV_nolen_const (mg); 966 const char *s = MgPV_nolen_const (mg);
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 1020
838 if (svp) 1021 if (svp)
839 { 1022 {
840 SV *old = *svp; 1023 SV *old = *svp;
841 *svp = newSVsv (sv); 1024 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 1025 SvREFCNT_dec (old);
843 return 0; 1026 return 0;
844 } 1027 }
845 } 1028 }
846 1029
… …
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 1048{
866 return 1; 1049 return 1;
867} 1050}
868 1051
869static UNOP coro_setup_op; 1052static UNOP init_perl_op;
870 1053
871static 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 */
872coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
873{ 1056{
874 /* 1057 /*
875 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
876 */ 1059 */
877 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
… …
884 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
886 PL_curpm = 0; 1069 PL_curpm = 0;
887 PL_curpad = 0; 1070 PL_curpad = 0;
888 PL_localizing = 0; 1071 PL_localizing = 0;
889 PL_dirty = 0;
890 PL_restartop = 0; 1072 PL_restartop = 0;
891#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
892 PL_parser = 0; 1074 PL_parser = 0;
893#endif 1075#endif
894 PL_hints = 0; 1076 PL_hints = 0;
… …
926 */ 1108 */
927 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 */
928 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 */
929 1111
930 /* 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 */
931 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
934 /* 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 */
935 1117
936 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
937 1119
938 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
939 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 }
940} 1130}
941 1131
942static void 1132static void
943coro_unwind_stacks (pTHX) 1133coro_unwind_stacks (pTHX)
944{ 1134{
… …
959 dounwind (-1); 1149 dounwind (-1);
960 } 1150 }
961} 1151}
962 1152
963static void 1153static void
964coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
965{ 1155{
1156 SV *svf [9];
1157
1158 {
1159 SV *old_current = SvRV (coro_current);
1160 struct coro *current = SvSTATE (old_current);
1161
1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1163
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
1169 load_perl (aTHX_ coro);
1170
966 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
967 1173
968 SvREFCNT_dec (GvSV (PL_defgv)); 1174 /* restore swapped sv's */
969 SvREFCNT_dec (GvAV (PL_defgv)); 1175 SWAP_SVS (coro);
970 SvREFCNT_dec (GvSV (PL_errgv));
971 SvREFCNT_dec (PL_defoutgv);
972 SvREFCNT_dec (PL_rs);
973 SvREFCNT_dec (GvSV (irsgv));
974 SvREFCNT_dec (GvHV (PL_hintgv));
975 1176
976 SvREFCNT_dec (PL_diehook); 1177 // now save some sv's to be free'd later
977 SvREFCNT_dec (PL_warnhook); 1178 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs;
1183 svf [5] = GvSV (irsgv);
1184 svf [6] = (SV *)GvHV (PL_hintgv);
1185 svf [7] = PL_diehook;
1186 svf [8] = PL_warnhook;
1187 assert (9 == sizeof (svf) / sizeof (*svf));
1188
1189 SvRV_set (coro_current, old_current);
1190
1191 load_perl (aTHX_ current);
978 1192 }
1193
1194 {
1195 unsigned int i;
1196
1197 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1198 SvREFCNT_dec (svf [i]);
1199
979 SvREFCNT_dec (coro->saved_deffh); 1200 SvREFCNT_dec (coro->saved_deffh);
980 SvREFCNT_dec (coro->rouse_cb); 1201 SvREFCNT_dec (coro->rouse_cb);
981 SvREFCNT_dec (coro->invoke_cb); 1202 SvREFCNT_dec (coro->invoke_cb);
982 SvREFCNT_dec (coro->invoke_av); 1203 SvREFCNT_dec (coro->invoke_av);
983 1204 }
984 coro_destruct_stacks (aTHX);
985} 1205}
986 1206
987INLINE void 1207INLINE void
988free_coro_mortal (pTHX) 1208free_coro_mortal (pTHX)
989{ 1209{
… …
1186 /* 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 */
1187 PL_restartop = PL_op; 1407 PL_restartop = PL_op;
1188 perl_run (PL_curinterp); 1408 perl_run (PL_curinterp);
1189 /* 1409 /*
1190 * 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
1191 * 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.
1192 */ 1413 */
1193 1414
1194 /* 1415 /*
1195 * 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
1196 * 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)
… …
1283cctx_destroy (coro_cctx *cctx) 1504cctx_destroy (coro_cctx *cctx)
1284{ 1505{
1285 if (!cctx) 1506 if (!cctx)
1286 return; 1507 return;
1287 1508
1288 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1289 1510
1290 --cctx_count; 1511 --cctx_count;
1291 coro_destroy (&cctx->cctx); 1512 coro_destroy (&cctx->cctx);
1292 1513
1293 /* coro_transfer creates new, empty cctx's */ 1514 /* coro_transfer creates new, empty cctx's */
… …
1357 /* TODO: throwing up here is considered harmful */ 1578 /* TODO: throwing up here is considered harmful */
1358 1579
1359 if (expect_true (prev != next)) 1580 if (expect_true (prev != next))
1360 { 1581 {
1361 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1362 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1363 1584
1364 if (expect_false (next->flags & CF_RUNNING))
1365 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1366
1367 if (expect_false (next->flags & CF_DESTROYED)) 1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1368 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1369 1587
1370#if !PERL_VERSION_ATLEAST (5,10,0) 1588#if !PERL_VERSION_ATLEAST (5,10,0)
1371 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1589 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1372 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1373#endif 1591#endif
… …
1406 if (expect_false (next->flags & CF_NEW)) 1624 if (expect_false (next->flags & CF_NEW))
1407 { 1625 {
1408 /* need to start coroutine */ 1626 /* need to start coroutine */
1409 next->flags &= ~CF_NEW; 1627 next->flags &= ~CF_NEW;
1410 /* setup coroutine call */ 1628 /* setup coroutine call */
1411 coro_setup (aTHX_ next); 1629 init_perl (aTHX_ next);
1412 } 1630 }
1413 else 1631 else
1414 load_perl (aTHX_ next); 1632 load_perl (aTHX_ next);
1415 1633
1416 /* possibly untie and reuse the cctx */ 1634 /* possibly untie and reuse the cctx */
… …
1455#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))
1456#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1457 1675
1458/** high level stuff ********************************************************/ 1676/** high level stuff ********************************************************/
1459 1677
1460static int 1678static void
1461coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1462{ 1680{
1463 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_DESTROYED)
1464 return 0; 1682 return;
1465 1683
1466 if (coro->on_destroy)
1467 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1468 1685
1469 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_DESTROYED;
1470 1687
1471 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1472 { 1689 {
… …
1479 1696
1480 if (coro->mainstack 1697 if (coro->mainstack
1481 && coro->mainstack != main_mainstack 1698 && coro->mainstack != main_mainstack
1482 && coro->slot 1699 && coro->slot
1483 && !PL_dirty) 1700 && !PL_dirty)
1484 {
1485 struct coro temp;
1486
1487 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1488
1489 save_perl (aTHX_ &temp);
1490 load_perl (aTHX_ coro);
1491
1492 coro_destruct_perl (aTHX_ coro); 1701 destroy_perl (aTHX_ coro);
1493 1702
1494 load_perl (aTHX_ &temp); 1703 if (coro->next) coro->next->prev = coro->prev;
1495 1704 if (coro->prev) coro->prev->next = coro->next;
1496 coro->slot = 0; 1705 if (coro == coro_first) coro_first = coro->next;
1497 }
1498 1706
1499 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1500 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1501 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1502 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1503
1504 if (coro->next) coro->next->prev = coro->prev;
1505 if (coro->prev) coro->prev->next = coro->next;
1506 if (coro == coro_first) coro_first = coro->next;
1507
1508 return 1;
1509} 1712}
1510 1713
1511static int 1714static int
1512coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1715coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1513{ 1716{
… …
1561 1764
1562 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1765 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1563 TRANSFER (ta, 1); 1766 TRANSFER (ta, 1);
1564} 1767}
1565 1768
1566/*****************************************************************************/
1567/* gensub: simple closure generation utility */
1568
1569#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1570
1571/* create a closure from XS, returns a code reference */
1572/* the arg can be accessed via GENSUB_ARG from the callback */
1573/* the callback must use dXSARGS/XSRETURN */
1574static SV *
1575gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1576{
1577 CV *cv = (CV *)newSV (0);
1578
1579 sv_upgrade ((SV *)cv, SVt_PVCV);
1580
1581 CvANON_on (cv);
1582 CvISXSUB_on (cv);
1583 CvXSUB (cv) = xsub;
1584 GENSUB_ARG = arg;
1585
1586 return newRV_noinc ((SV *)cv);
1587}
1588
1589/** Coro ********************************************************************/ 1769/** Coro ********************************************************************/
1590 1770
1591INLINE void 1771INLINE void
1592coro_enq (pTHX_ struct coro *coro) 1772coro_enq (pTHX_ struct coro *coro)
1593{ 1773{
1594 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1595}
1596 1775
1597INLINE SV * 1776 SvREFCNT_inc_NN (coro->hv);
1777
1778 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro;
1781}
1782
1783INLINE struct coro *
1598coro_deq (pTHX) 1784coro_deq (pTHX)
1599{ 1785{
1600 int prio; 1786 int prio;
1601 1787
1602 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1603 if (AvFILLp (coro_ready [prio]) >= 0) 1789 {
1604 return av_shift (coro_ready [prio]); 1790 struct coro **ready = coro_ready [prio];
1791
1792 if (ready [0])
1793 {
1794 struct coro *coro = ready [0];
1795 ready [0] = coro->next_ready;
1796 return coro;
1797 }
1798 }
1605 1799
1606 return 0; 1800 return 0;
1801}
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;
1607} 1818}
1608 1819
1609static int 1820static int
1610api_ready (pTHX_ SV *coro_sv) 1821api_ready (pTHX_ SV *coro_sv)
1611{ 1822{
1612 struct coro *coro;
1613 SV *sv_hook;
1614 void (*xs_hook)(void);
1615
1616 coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1617 1824
1618 if (coro->flags & CF_READY) 1825 if (coro->flags & CF_READY)
1619 return 0; 1826 return 0;
1620 1827
1621 coro->flags |= CF_READY; 1828 coro->flags |= CF_READY;
1622 1829
1623 sv_hook = coro_nready ? 0 : coro_readyhook;
1624 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1625
1626 coro_enq (aTHX_ coro); 1830 coro_enq (aTHX_ coro);
1627 ++coro_nready;
1628 1831
1629 if (sv_hook) 1832 if (!coro_nready++)
1630 { 1833 if (coroapi.readyhook)
1631 dSP; 1834 coroapi.readyhook ();
1632
1633 ENTER;
1634 SAVETMPS;
1635
1636 PUSHMARK (SP);
1637 PUTBACK;
1638 call_sv (sv_hook, G_VOID | G_DISCARD);
1639
1640 FREETMPS;
1641 LEAVE;
1642 }
1643
1644 if (xs_hook)
1645 xs_hook ();
1646 1835
1647 return 1; 1836 return 1;
1648} 1837}
1649 1838
1650static int 1839static int
… …
1673static void 1862static void
1674prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1863prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1675{ 1864{
1676 for (;;) 1865 for (;;)
1677 { 1866 {
1678 SV *next_sv = coro_deq (aTHX); 1867 struct coro *next = coro_deq (aTHX);
1679 1868
1680 if (expect_true (next_sv)) 1869 if (expect_true (next))
1681 { 1870 {
1682 struct coro *next = SvSTATE_hv (next_sv);
1683
1684 /* cannot transfer to destroyed coros, skip and look for next */ 1871 /* cannot transfer to destroyed coros, skip and look for next */
1685 if (expect_false (next->flags & CF_DESTROYED)) 1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1686 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1687 else 1874 else
1688 { 1875 {
1689 next->flags &= ~CF_READY; 1876 next->flags &= ~CF_READY;
1690 --coro_nready; 1877 --coro_nready;
1691 1878
… …
1697 { 1884 {
1698 /* nothing to schedule: call the idle handler */ 1885 /* nothing to schedule: call the idle handler */
1699 if (SvROK (sv_idle) 1886 if (SvROK (sv_idle)
1700 && SvOBJECT (SvRV (sv_idle))) 1887 && SvOBJECT (SvRV (sv_idle)))
1701 { 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
1702 ++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 */
1703 api_ready (aTHX_ SvRV (sv_idle)); 1893 api_ready (aTHX_ SvRV (sv_idle));
1704 --coro_nready; 1894 --coro_nready;
1705 } 1895 }
1706 else 1896 else
1707 { 1897 {
1898 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1708 dSP; 1899 dSP;
1709 1900
1710 ENTER; 1901 ENTER;
1711 SAVETMPS; 1902 SAVETMPS;
1712 1903
… …
1822 2013
1823static void 2014static void
1824coro_call_on_destroy (pTHX_ struct coro *coro) 2015coro_call_on_destroy (pTHX_ struct coro *coro)
1825{ 2016{
1826 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);
1827 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1828 2018
1829 if (on_destroyp) 2019 if (on_destroyp)
1830 { 2020 {
1831 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;
1832 2024
1833 while (AvFILLp (on_destroy) >= 0) 2025 while (AvFILLp (on_destroy) >= 0)
1834 { 2026 {
1835 dSP; /* don't disturb outer sp */ 2027 dSP; /* don't disturb outer sp */
1836 SV *cb = av_pop (on_destroy); 2028 SV *cb = av_pop (on_destroy);
… …
1838 PUSHMARK (SP); 2030 PUSHMARK (SP);
1839 2031
1840 if (statusp) 2032 if (statusp)
1841 { 2033 {
1842 int i; 2034 int i;
1843 AV *status = (AV *)SvRV (*statusp);
1844 EXTEND (SP, AvFILLp (status) + 1); 2035 EXTEND (SP, AvFILLp (status) + 1);
1845 2036
1846 for (i = 0; i <= AvFILLp (status); ++i) 2037 for (i = 0; i <= AvFILLp (status); ++i)
1847 PUSHs (AvARRAY (status)[i]); 2038 PUSHs (AvARRAY (status)[i]);
1848 } 2039 }
… …
1852 } 2043 }
1853 } 2044 }
1854} 2045}
1855 2046
1856static void 2047static void
1857slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items)
1858{ 2049{
1859 int i;
1860 HV *hv = (HV *)SvRV (coro_current);
1861 AV *av = newAV (); 2050 AV *av = newAV ();
1862 2051
2052 /* items are actually not so common, so optimise for this case */
2053 if (items)
2054 {
2055 int i;
2056
1863 av_extend (av, items - 1); 2057 av_extend (av, items - 1);
2058
1864 for (i = 0; i < items; ++i) 2059 for (i = 0; i < items; ++i)
1865 av_push (av, SvREFCNT_inc_NN (arg [i])); 2060 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 }
1866 2062
1867 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}
1868 2065
2066static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{
1869 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 */
1870 api_ready (aTHX_ sv_manager); 2070 api_ready (aTHX_ sv_manager);
1871 2071
1872 frame->prepare = prepare_schedule; 2072 frame->prepare = prepare_schedule;
1873 frame->check = slf_check_repeat; 2073 frame->check = slf_check_repeat;
1874 2074
1875 /* as a minor optimisation, we could unwind all stacks here */ 2075 /* as a minor optimisation, we could unwind all stacks here */
1876 /* 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 */
1877 /*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;
1878} 2185}
1879 2186
1880/*****************************************************************************/ 2187/*****************************************************************************/
1881/* async pool handler */ 2188/* async pool handler */
1882 2189
… …
1922 coro->saved_deffh = 0; 2229 coro->saved_deffh = 0;
1923 2230
1924 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2231 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1925 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2232 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1926 { 2233 {
1927 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2234 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1928 coro->invoke_av = newAV (); 2235 return;
1929
1930 frame->prepare = prepare_nop;
1931 } 2236 }
1932 else 2237 else
1933 { 2238 {
1934 av_clear (GvAV (PL_defgv)); 2239 av_clear (GvAV (PL_defgv));
1935 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);
… …
1960 2265
1961static void 2266static void
1962coro_rouse_callback (pTHX_ CV *cv) 2267coro_rouse_callback (pTHX_ CV *cv)
1963{ 2268{
1964 dXSARGS; 2269 dXSARGS;
1965 SV *data = (SV *)GENSUB_ARG; 2270 SV *data = (SV *)S_GENSUB_ARG;
1966 2271
1967 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2272 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1968 { 2273 {
1969 /* first call, set args */ 2274 /* first call, set args */
2275 SV *coro = SvRV (data);
1970 AV *av = newAV (); 2276 AV *av = newAV ();
1971 SV *coro = SvRV (data);
1972 2277
1973 SvRV_set (data, (SV *)av); 2278 SvRV_set (data, (SV *)av);
1974 api_ready (aTHX_ coro);
1975 SvREFCNT_dec (coro);
1976 2279
1977 /* better take a full copy of the arguments */ 2280 /* better take a full copy of the arguments */
1978 while (items--) 2281 while (items--)
1979 av_store (av, items, newSVsv (ST (items))); 2282 av_store (av, items, newSVsv (ST (items)));
2283
2284 api_ready (aTHX_ coro);
2285 SvREFCNT_dec (coro);
1980 } 2286 }
1981 2287
1982 XSRETURN_EMPTY; 2288 XSRETURN_EMPTY;
1983} 2289}
1984 2290
… …
2001 2307
2002 EXTEND (SP, AvFILLp (av) + 1); 2308 EXTEND (SP, AvFILLp (av) + 1);
2003 for (i = 0; i <= AvFILLp (av); ++i) 2309 for (i = 0; i <= AvFILLp (av); ++i)
2004 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2310 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2005 2311
2006 /* we have stolen the elements, so ste length to zero and free */ 2312 /* we have stolen the elements, so set length to zero and free */
2007 AvFILLp (av) = -1; 2313 AvFILLp (av) = -1;
2008 av_undef (av); 2314 av_undef (av);
2009 2315
2010 PUTBACK; 2316 PUTBACK;
2011 } 2317 }
… …
2035 || SvTYPE (SvRV (cb)) != SVt_PVCV 2341 || SvTYPE (SvRV (cb)) != SVt_PVCV
2036 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2037 croak ("Coro::rouse_wait called with illegal callback argument,"); 2343 croak ("Coro::rouse_wait called with illegal callback argument,");
2038 2344
2039 { 2345 {
2040 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2041 SV *data = (SV *)GENSUB_ARG; 2347 SV *data = (SV *)S_GENSUB_ARG;
2042 2348
2043 frame->data = (void *)data; 2349 frame->data = (void *)data;
2044 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2350 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2045 frame->check = slf_check_rouse_wait; 2351 frame->check = slf_check_rouse_wait;
2046 } 2352 }
… …
2050coro_new_rouse_cb (pTHX) 2356coro_new_rouse_cb (pTHX)
2051{ 2357{
2052 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv (hv); 2359 struct coro *coro = SvSTATE_hv (hv);
2054 SV *data = newRV_inc ((SV *)hv); 2360 SV *data = newRV_inc ((SV *)hv);
2055 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2361 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2056 2362
2057 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);
2058 SvREFCNT_dec (data); /* magicext increases the refcount */ 2364 SvREFCNT_dec (data); /* magicext increases the refcount */
2059 2365
2060 SvREFCNT_dec (coro->rouse_cb); 2366 SvREFCNT_dec (coro->rouse_cb);
… …
2157static void 2463static void
2158slf_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)
2159{ 2465{
2160 frame->prepare = prepare_cede_notself; 2466 frame->prepare = prepare_cede_notself;
2161 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;
2162} 2485}
2163 2486
2164/* 2487/*
2165 * these not obviously related functions are all rolled into one 2488 * these not obviously related functions are all rolled into one
2166 * 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
… …
2285 if (PL_op->op_flags & OPf_STACKED) 2608 if (PL_op->op_flags & OPf_STACKED)
2286 { 2609 {
2287 if (items > slf_arga) 2610 if (items > slf_arga)
2288 { 2611 {
2289 slf_arga = items; 2612 slf_arga = items;
2290 free (slf_argv); 2613 Safefree (slf_argv);
2291 slf_argv = malloc (slf_arga * sizeof (SV *)); 2614 New (0, slf_argv, slf_arga, SV *);
2292 } 2615 }
2293 2616
2294 slf_argc = items; 2617 slf_argc = items;
2295 2618
2296 for (i = 0; i < items; ++i) 2619 for (i = 0; i < items; ++i)
… …
2301 2624
2302 PL_op->op_ppaddr = pp_slf; 2625 PL_op->op_ppaddr = pp_slf;
2303 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2626 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2304 2627
2305 PL_op = (OP *)&slf_restore; 2628 PL_op = (OP *)&slf_restore;
2629}
2630
2631/*****************************************************************************/
2632/* dynamic wind */
2633
2634static void
2635on_enterleave_call (pTHX_ SV *cb)
2636{
2637 dSP;
2638
2639 PUSHSTACK;
2640
2641 PUSHMARK (SP);
2642 PUTBACK;
2643 call_sv (cb, G_VOID | G_DISCARD);
2644 SPAGAIN;
2645
2646 POPSTACK;
2647}
2648
2649static SV *
2650coro_avp_pop_and_free (pTHX_ AV **avp)
2651{
2652 AV *av = *avp;
2653 SV *res = av_pop (av);
2654
2655 if (AvFILLp (av) < 0)
2656 {
2657 *avp = 0;
2658 SvREFCNT_dec (av);
2659 }
2660
2661 return res;
2662}
2663
2664static void
2665coro_pop_on_enter (pTHX_ void *coro)
2666{
2667 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2668 SvREFCNT_dec (cb);
2669}
2670
2671static void
2672coro_pop_on_leave (pTHX_ void *coro)
2673{
2674 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2675 on_enterleave_call (aTHX_ sv_2mortal (cb));
2306} 2676}
2307 2677
2308/*****************************************************************************/ 2678/*****************************************************************************/
2309/* PerlIO::cede */ 2679/* PerlIO::cede */
2310 2680
… …
2384/* Coro::Semaphore & Coro::Signal */ 2754/* Coro::Semaphore & Coro::Signal */
2385 2755
2386static SV * 2756static SV *
2387coro_waitarray_new (pTHX_ int count) 2757coro_waitarray_new (pTHX_ int count)
2388{ 2758{
2389 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2759 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2390 AV *av = newAV (); 2760 AV *av = newAV ();
2391 SV **ary; 2761 SV **ary;
2392 2762
2393 /* unfortunately, building manually saves memory */ 2763 /* unfortunately, building manually saves memory */
2394 Newx (ary, 2, SV *); 2764 Newx (ary, 2, SV *);
… …
2445 SvREFCNT_dec (cb); 2815 SvREFCNT_dec (cb);
2446 } 2816 }
2447} 2817}
2448 2818
2449static void 2819static void
2450coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2820coro_semaphore_destroy (pTHX_ struct coro *coro)
2451{ 2821{
2452 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2822 /* call $sem->adjust (0) to possibly wake up some other waiters */
2453 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2454} 2824}
2455 2825
… …
2462 /* 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 */
2463 if (CORO_THROW) 2833 if (CORO_THROW)
2464 return 0; 2834 return 0;
2465 else if (SvIVX (count_sv) > 0) 2835 else if (SvIVX (count_sv) > 0)
2466 { 2836 {
2467 SvSTATE_current->on_destroy = 0; 2837 frame->destroy = 0;
2468 2838
2469 if (acquire) 2839 if (acquire)
2470 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2840 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2471 else 2841 else
2472 coro_semaphore_adjust (aTHX_ av, 0); 2842 coro_semaphore_adjust (aTHX_ av, 0);
… …
2515 { 2885 {
2516 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2886 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2517 2887
2518 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2888 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2519 frame->prepare = prepare_schedule; 2889 frame->prepare = prepare_schedule;
2520
2521 /* to avoid race conditions when a woken-up coro gets terminated */ 2890 /* to avoid race conditions when a woken-up coro gets terminated */
2522 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2891 /* we arrange for a temporary on_destroy that calls adjust (0) */
2523 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2892 frame->destroy = coro_semaphore_destroy;
2524 } 2893 }
2525} 2894}
2526 2895
2527static void 2896static void
2528slf_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)
… …
2536{ 2905{
2537 if (items >= 2) 2906 if (items >= 2)
2538 { 2907 {
2539 /* callback form */ 2908 /* callback form */
2540 AV *av = (AV *)SvRV (arg [0]); 2909 AV *av = (AV *)SvRV (arg [0]);
2541 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2910 SV *cb_cv = s_get_cv_croak (arg [1]);
2542 2911
2543 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2912 av_push (av, SvREFCNT_inc_NN (cb_cv));
2544 2913
2545 if (SvIVX (AvARRAY (av)[0]) > 0) 2914 if (SvIVX (AvARRAY (av)[0]) > 0)
2546 coro_semaphore_adjust (aTHX_ av, 0); 2915 coro_semaphore_adjust (aTHX_ av, 0);
2547 2916
2548 frame->prepare = prepare_nop; 2917 frame->prepare = prepare_nop;
… …
2572 AvARRAY (av)[0] = AvARRAY (av)[1]; 2941 AvARRAY (av)[0] = AvARRAY (av)[1];
2573 AvARRAY (av)[1] = cb; 2942 AvARRAY (av)[1] = cb;
2574 2943
2575 cb = av_shift (av); 2944 cb = av_shift (av);
2576 2945
2946 if (SvTYPE (cb) == SVt_PVCV)
2947 {
2948 dSP;
2949 PUSHMARK (SP);
2950 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2951 PUTBACK;
2952 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2953 }
2954 else
2955 {
2577 api_ready (aTHX_ cb); 2956 api_ready (aTHX_ cb);
2578 sv_setiv (cb, 0); /* signal waiter */ 2957 sv_setiv (cb, 0); /* signal waiter */
2958 }
2959
2579 SvREFCNT_dec (cb); 2960 SvREFCNT_dec (cb);
2580 2961
2581 --count; 2962 --count;
2582 } 2963 }
2583} 2964}
… …
2592static void 2973static void
2593slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2974slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2594{ 2975{
2595 AV *av = (AV *)SvRV (arg [0]); 2976 AV *av = (AV *)SvRV (arg [0]);
2596 2977
2978 if (items >= 2)
2979 {
2980 SV *cb_cv = s_get_cv_croak (arg [1]);
2981 av_push (av, SvREFCNT_inc_NN (cb_cv));
2982
2597 if (SvIVX (AvARRAY (av)[0])) 2983 if (SvIVX (AvARRAY (av)[0]))
2984 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2985
2986 frame->prepare = prepare_nop;
2987 frame->check = slf_check_nop;
2988 }
2989 else if (SvIVX (AvARRAY (av)[0]))
2598 { 2990 {
2599 SvIVX (AvARRAY (av)[0]) = 0; 2991 SvIVX (AvARRAY (av)[0]) = 0;
2600 frame->prepare = prepare_nop; 2992 frame->prepare = prepare_nop;
2601 frame->check = slf_check_nop; 2993 frame->check = slf_check_nop;
2602 } 2994 }
2603 else 2995 else
2604 { 2996 {
2605 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2997 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2606 2998
2607 av_push (av, waiter); 2999 av_push (av, waiter);
2608 3000
2609 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3001 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2610 frame->prepare = prepare_schedule; 3002 frame->prepare = prepare_schedule;
… …
2628 3020
2629static void 3021static void
2630coro_aio_callback (pTHX_ CV *cv) 3022coro_aio_callback (pTHX_ CV *cv)
2631{ 3023{
2632 dXSARGS; 3024 dXSARGS;
2633 AV *state = (AV *)GENSUB_ARG; 3025 AV *state = (AV *)S_GENSUB_ARG;
2634 SV *coro = av_pop (state); 3026 SV *coro = av_pop (state);
2635 SV *data_sv = newSV (sizeof (struct io_state)); 3027 SV *data_sv = newSV (sizeof (struct io_state));
2636 3028
2637 av_extend (state, items - 1); 3029 av_extend (state, items - 1);
2638 3030
… …
2752 3144
2753 for (i = 0; i < items; ++i) 3145 for (i = 0; i < items; ++i)
2754 PUSHs (arg [i]); 3146 PUSHs (arg [i]);
2755 3147
2756 /* now push the callback closure */ 3148 /* now push the callback closure */
2757 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))));
2758 3150
2759 /* now call the AIO function - we assume our request is uncancelable */ 3151 /* now call the AIO function - we assume our request is uncancelable */
2760 PUTBACK; 3152 PUTBACK;
2761 call_sv ((SV *)req, G_VOID | G_DISCARD); 3153 call_sv ((SV *)req, G_VOID | G_DISCARD);
2762 } 3154 }
2763 3155
2764 /* 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 */
2765 frame->data = (void *)state; 3157 frame->data = (void *)state;
2766 frame->prepare = prepare_schedule; 3158 frame->prepare = prepare_schedule;
2767 frame->check = slf_check_aio_req; 3159 frame->check = slf_check_aio_req;
2768} 3160}
2769 3161
… …
2780/*****************************************************************************/ 3172/*****************************************************************************/
2781 3173
2782#if CORO_CLONE 3174#if CORO_CLONE
2783# include "clone.c" 3175# include "clone.c"
2784#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}
2785 3235
2786MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2787 3237
2788PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2789 3239
… …
2842 coroapi.prepare_nop = prepare_nop; 3292 coroapi.prepare_nop = prepare_nop;
2843 coroapi.prepare_schedule = prepare_schedule; 3293 coroapi.prepare_schedule = prepare_schedule;
2844 coroapi.prepare_cede = prepare_cede; 3294 coroapi.prepare_cede = prepare_cede;
2845 coroapi.prepare_cede_notself = prepare_cede_notself; 3295 coroapi.prepare_cede_notself = prepare_cede_notself;
2846 3296
2847 { 3297 time_init (aTHX);
2848 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2849 3298
2850 if (!svp) croak ("Time::HiRes is required");
2851 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2852
2853 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2854 }
2855
2856 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2857} 3300}
2858 3301
2859SV * 3302SV *
2860new (char *klass, ...) 3303new (SV *klass, ...)
2861 ALIAS: 3304 ALIAS:
2862 Coro::new = 1 3305 Coro::new = 1
2863 CODE: 3306 CODE:
2864{ 3307 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2865 struct coro *coro; 3308 OUTPUT:
2866 MAGIC *mg;
2867 HV *hv;
2868 CV *cb;
2869 int i;
2870
2871 if (items > 1)
2872 {
2873 cb = coro_sv_2cv (aTHX_ ST (1));
2874
2875 if (!ix)
2876 {
2877 if (CvISXSUB (cb))
2878 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2879
2880 if (!CvROOT (cb))
2881 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2882 }
2883 }
2884
2885 Newz (0, coro, 1, struct coro);
2886 coro->args = newAV ();
2887 coro->flags = CF_NEW;
2888
2889 if (coro_first) coro_first->prev = coro;
2890 coro->next = coro_first;
2891 coro_first = coro;
2892
2893 coro->hv = hv = newHV ();
2894 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2895 mg->mg_flags |= MGf_DUP;
2896 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2897
2898 if (items > 1)
2899 {
2900 av_extend (coro->args, items - 1 + ix - 1);
2901
2902 if (ix)
2903 {
2904 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2905 cb = cv_coro_run;
2906 }
2907
2908 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2909
2910 for (i = 2; i < items; i++)
2911 av_push (coro->args, newSVsv (ST (i)));
2912 }
2913}
2914 OUTPUT:
2915 RETVAL 3309 RETVAL
2916 3310
2917void 3311void
2918transfer (...) 3312transfer (...)
2919 PROTOTYPE: $$ 3313 PROTOTYPE: $$
2920 CODE: 3314 CODE:
2921 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3315 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2922
2923bool
2924_destroy (SV *coro_sv)
2925 CODE:
2926 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2927 OUTPUT:
2928 RETVAL
2929 3316
2930void 3317void
2931_exit (int code) 3318_exit (int code)
2932 PROTOTYPE: $ 3319 PROTOTYPE: $
2933 CODE: 3320 CODE:
… …
3008 eval = 1 3395 eval = 1
3009 CODE: 3396 CODE:
3010{ 3397{
3011 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3398 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3012 { 3399 {
3013 struct coro temp; 3400 struct coro *current = SvSTATE_current;
3401 struct CoroSLF slf_save;
3014 3402
3015 if (!(coro->flags & CF_RUNNING)) 3403 if (current != coro)
3016 { 3404 {
3017 PUTBACK; 3405 PUTBACK;
3018 save_perl (aTHX_ &temp); 3406 save_perl (aTHX_ current);
3019 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;
3417 SPAGAIN;
3020 } 3418 }
3021 3419
3022 {
3023 dSP;
3024 ENTER;
3025 SAVETMPS;
3026 PUTBACK;
3027 PUSHSTACK; 3420 PUSHSTACK;
3421
3028 PUSHMARK (SP); 3422 PUSHMARK (SP);
3423 PUTBACK;
3029 3424
3030 if (ix) 3425 if (ix)
3031 eval_sv (coderef, 0); 3426 eval_sv (coderef, 0);
3032 else 3427 else
3033 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3428 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3034 3429
3035 POPSTACK; 3430 POPSTACK;
3036 SPAGAIN; 3431 SPAGAIN;
3037 FREETMPS;
3038 LEAVE;
3039 PUTBACK;
3040 }
3041 3432
3042 if (!(coro->flags & CF_RUNNING)) 3433 if (current != coro)
3043 { 3434 {
3435 PUTBACK;
3436 slf_frame = slf_save;
3044 save_perl (aTHX_ coro); 3437 save_perl (aTHX_ coro);
3045 load_perl (aTHX_ &temp); 3438 load_perl (aTHX_ current);
3046 SPAGAIN; 3439 SPAGAIN;
3047 } 3440 }
3048 } 3441 }
3049} 3442}
3050 3443
… …
3054 ALIAS: 3447 ALIAS:
3055 is_ready = CF_READY 3448 is_ready = CF_READY
3056 is_running = CF_RUNNING 3449 is_running = CF_RUNNING
3057 is_new = CF_NEW 3450 is_new = CF_NEW
3058 is_destroyed = CF_DESTROYED 3451 is_destroyed = CF_DESTROYED
3452 is_suspended = CF_SUSPENDED
3059 CODE: 3453 CODE:
3060 RETVAL = boolSV (coro->flags & ix); 3454 RETVAL = boolSV (coro->flags & ix);
3061 OUTPUT: 3455 OUTPUT:
3062 RETVAL 3456 RETVAL
3063 3457
3064void 3458void
3065throw (Coro::State self, SV *throw = &PL_sv_undef) 3459throw (Coro::State self, SV *exception = &PL_sv_undef)
3066 PROTOTYPE: $;$ 3460 PROTOTYPE: $;$
3067 CODE: 3461 CODE:
3068{ 3462{
3069 struct coro *current = SvSTATE_current; 3463 struct coro *current = SvSTATE_current;
3070 SV **throwp = self == current ? &CORO_THROW : &self->except; 3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3071 SvREFCNT_dec (*throwp); 3465 SvREFCNT_dec (*exceptionp);
3072 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3466 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3073} 3468}
3074 3469
3075void 3470void
3076api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3077 PROTOTYPE: $;$ 3472 PROTOTYPE: $;$
… …
3128 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3523 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3129 3524
3130 SV *tmp = *src; *src = *dst; *dst = tmp; 3525 SV *tmp = *src; *src = *dst; *dst = tmp;
3131 } 3526 }
3132 3527
3528void
3529cancel (Coro::State self)
3530 CODE:
3531 coro_state_destroy (aTHX_ self);
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}
3588
3133 3589
3134MODULE = Coro::State PACKAGE = Coro 3590MODULE = Coro::State PACKAGE = Coro
3135 3591
3136BOOT: 3592BOOT:
3137{ 3593{
3138 int i;
3139
3140 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3141 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3142 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3143 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3144 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);
3145 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3146 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3599 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3147 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3600 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3148 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3601 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3149 3602
3150 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);
3151 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3152 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);
3153 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 */
3154 3607
3155 coro_stash = gv_stashpv ("Coro", TRUE); 3608 coro_stash = gv_stashpv ("Coro", TRUE);
3156 3609
3157 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3158 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3159 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3160 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3613 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3161 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3614 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3162 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3615 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3163
3164 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3165 coro_ready[i] = newAV ();
3166 3616
3167 { 3617 {
3168 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3618 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3169 3619
3170 coroapi.schedule = api_schedule; 3620 coroapi.schedule = api_schedule;
… …
3180 sv_setiv (sv, (IV)&coroapi); 3630 sv_setiv (sv, (IV)&coroapi);
3181 SvREADONLY_on (sv); 3631 SvREADONLY_on (sv);
3182 } 3632 }
3183} 3633}
3184 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
3185void 3651void
3186terminate (...) 3652terminate (...)
3187 CODE: 3653 CODE:
3188 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3654 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3189 3655
3190void 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
3664
3665void
3191schedule (...) 3666schedule (...)
3192 CODE: 3667 CODE:
3193 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3668 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3194 3669
3195void 3670void
… …
3209 3684
3210void 3685void
3211cede_notself (...) 3686cede_notself (...)
3212 CODE: 3687 CODE:
3213 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3688 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3214
3215void
3216_cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self);
3220 3689
3221void 3690void
3222_set_current (SV *current) 3691_set_current (SV *current)
3223 PROTOTYPE: $ 3692 PROTOTYPE: $
3224 CODE: 3693 CODE:
… …
3228void 3697void
3229_set_readyhook (SV *hook) 3698_set_readyhook (SV *hook)
3230 PROTOTYPE: $ 3699 PROTOTYPE: $
3231 CODE: 3700 CODE:
3232 SvREFCNT_dec (coro_readyhook); 3701 SvREFCNT_dec (coro_readyhook);
3702 SvGETMAGIC (hook);
3703 if (SvOK (hook))
3704 {
3233 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 }
3234 3713
3235int 3714int
3236prio (Coro::State coro, int newprio = 0) 3715prio (Coro::State coro, int newprio = 0)
3237 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
3238 ALIAS: 3717 ALIAS:
… …
3244 if (items > 1) 3723 if (items > 1)
3245 { 3724 {
3246 if (ix) 3725 if (ix)
3247 newprio = coro->prio - newprio; 3726 newprio = coro->prio - newprio;
3248 3727
3249 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3728 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3250 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3729 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3251 3730
3252 coro->prio = newprio; 3731 coro->prio = newprio;
3253 } 3732 }
3254} 3733}
3255 OUTPUT: 3734 OUTPUT:
… …
3270 RETVAL = coro_nready; 3749 RETVAL = coro_nready;
3271 OUTPUT: 3750 OUTPUT:
3272 RETVAL 3751 RETVAL
3273 3752
3274void 3753void
3754suspend (Coro::State self)
3755 PROTOTYPE: $
3756 CODE:
3757 self->flags |= CF_SUSPENDED;
3758
3759void
3760resume (Coro::State self)
3761 PROTOTYPE: $
3762 CODE:
3763 self->flags &= ~CF_SUSPENDED;
3764
3765void
3275_pool_handler (...) 3766_pool_handler (...)
3276 CODE: 3767 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3768 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3278 3769
3279void 3770void
… …
3290 for (i = 1; i < items; ++i) 3781 for (i = 1; i < items; ++i)
3291 av_push (av, SvREFCNT_inc_NN (ST (i))); 3782 av_push (av, SvREFCNT_inc_NN (ST (i)));
3292 3783
3293 if ((SV *)hv == &PL_sv_undef) 3784 if ((SV *)hv == &PL_sv_undef)
3294 { 3785 {
3295 PUSHMARK (SP); 3786 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3296 EXTEND (SP, 2);
3297 PUSHs (sv_Coro);
3298 PUSHs ((SV *)cv_pool_handler);
3299 PUTBACK;
3300 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3301 SPAGAIN;
3302
3303 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv);
3304 } 3789 }
3305 3790
3306 { 3791 {
3307 struct coro *coro = SvSTATE_hv (hv); 3792 struct coro *coro = SvSTATE_hv (hv);
3308 3793
… …
3332rouse_wait (...) 3817rouse_wait (...)
3333 PROTOTYPE: ;$ 3818 PROTOTYPE: ;$
3334 PPCODE: 3819 PPCODE:
3335 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3820 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3336 3821
3822void
3823on_enter (SV *block)
3824 ALIAS:
3825 on_leave = 1
3826 PROTOTYPE: &
3827 CODE:
3828{
3829 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831
3832 block = s_get_cv_croak (block);
3833
3834 if (!*avp)
3835 *avp = newAV ();
3836
3837 av_push (*avp, SvREFCNT_inc (block));
3838
3839 if (!ix)
3840 on_enterleave_call (aTHX_ block);
3841
3842 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3843 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3844 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3845}
3846
3337 3847
3338MODULE = Coro::State PACKAGE = PerlIO::cede 3848MODULE = Coro::State PACKAGE = PerlIO::cede
3339 3849
3340BOOT: 3850BOOT:
3341 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3851 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3344MODULE = Coro::State PACKAGE = Coro::Semaphore 3854MODULE = Coro::State PACKAGE = Coro::Semaphore
3345 3855
3346SV * 3856SV *
3347new (SV *klass, SV *count = 0) 3857new (SV *klass, SV *count = 0)
3348 CODE: 3858 CODE:
3859{
3860 int semcnt = 1;
3861
3862 if (count)
3863 {
3864 SvGETMAGIC (count);
3865
3866 if (SvOK (count))
3867 semcnt = SvIV (count);
3868 }
3869
3349 RETVAL = sv_bless ( 3870 RETVAL = sv_bless (
3350 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3871 coro_waitarray_new (aTHX_ semcnt),
3351 GvSTASH (CvGV (cv)) 3872 GvSTASH (CvGV (cv))
3352 ); 3873 );
3874}
3353 OUTPUT: 3875 OUTPUT:
3354 RETVAL 3876 RETVAL
3355 3877
3356# helper for Coro::Channel 3878# helper for Coro::Channel and others
3357SV * 3879SV *
3358_alloc (int count) 3880_alloc (int count)
3359 CODE: 3881 CODE:
3360 RETVAL = coro_waitarray_new (aTHX_ count); 3882 RETVAL = coro_waitarray_new (aTHX_ count);
3361 OUTPUT: 3883 OUTPUT:
… …
3419 for (i = 1; i <= wcount; ++i) 3941 for (i = 1; i <= wcount; ++i)
3420 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3942 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3421 } 3943 }
3422} 3944}
3423 3945
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947
3948void
3949_may_delete (SV *sem, int count, int extra_refs)
3950 PPCODE:
3951{
3952 AV *av = (AV *)SvRV (sem);
3953
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES;
3958
3959 XSRETURN_NO;
3960}
3961
3424MODULE = Coro::State PACKAGE = Coro::Signal 3962MODULE = Coro::State PACKAGE = Coro::Signal
3425 3963
3426SV * 3964SV *
3427new (SV *klass) 3965new (SV *klass)
3428 CODE: 3966 CODE:
… …
3499 4037
3500void 4038void
3501_register (char *target, char *proto, SV *req) 4039_register (char *target, char *proto, SV *req)
3502 CODE: 4040 CODE:
3503{ 4041{
3504 CV *req_cv = coro_sv_2cv (aTHX_ req); 4042 SV *req_cv = s_get_cv_croak (req);
3505 /* newXSproto doesn't return the CV on 5.8 */ 4043 /* newXSproto doesn't return the CV on 5.8 */
3506 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4044 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3507 sv_setpv ((SV *)slf_cv, proto); 4045 sv_setpv ((SV *)slf_cv, proto);
3508 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);
3509} 4047}
3510 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