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.339 by root, Mon Dec 15 00:28:30 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 */
… …
289 262
290 /* on_enter/on_leave */ 263 /* on_enter/on_leave */
291 AV *on_enter; 264 AV *on_enter;
292 AV *on_leave; 265 AV *on_leave;
293 266
267 /* swap_sv */
268 AV *swap_sv;
269
270 /* times */
271 coro_ts t_cpu, t_real;
272
294 /* linked list */ 273 /* linked list */
295 struct coro *next, *prev; 274 struct coro *next, *prev;
296}; 275};
297 276
298typedef struct coro *Coro__State; 277typedef struct coro *Coro__State;
299typedef struct coro *Coro__State_or_hashref; 278typedef struct coro *Coro__State_or_hashref;
300 279
301/* the following variables are effectively part of the perl context */ 280/* the following variables are effectively part of the perl context */
302/* and get copied between struct coro and these variables */ 281/* and get copied between struct coro and these variables */
303/* the mainr easonw e don't support windows process emulation */ 282/* the main reason we don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 283static struct CoroSLF slf_frame; /* the current slf frame */
305 284
306/** Coro ********************************************************************/ 285/** Coro ********************************************************************/
307 286
308#define PRIO_MAX 3 287#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 288#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 289#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 290#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 291#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 292#define CORO_PRIO_MIN -4
314 293
315/* for Coro.pm */ 294/* for Coro.pm */
316static SV *coro_current; 295static SV *coro_current;
317static SV *coro_readyhook; 296static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 298static CV *cv_coro_run;
320static struct coro *coro_first; 299static struct coro *coro_first;
321#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
322 373
323/** lowlevel stuff **********************************************************/ 374/** lowlevel stuff **********************************************************/
324 375
325static SV * 376static SV *
326coro_get_sv (pTHX_ const char *name, int create) 377coro_get_sv (pTHX_ const char *name, int create)
… …
350 get_hv (name, create); 401 get_hv (name, create);
351#endif 402#endif
352 return get_hv (name, create); 403 return get_hv (name, create);
353} 404}
354 405
355/* may croak */ 406INLINE void
356INLINE CV * 407coro_times_update ()
357coro_sv_2cv (pTHX_ SV *sv)
358{ 408{
359 HV *st; 409#ifdef coro_clock_gettime
360 GV *gvp; 410 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 411
363 if (!cv) 412 ts.tv_sec = ts.tv_nsec = 0;
364 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;
365 415
366 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];
367} 451}
368 452
369/*****************************************************************************/ 453/*****************************************************************************/
370/* magic glue */ 454/* magic glue */
371 455
… …
471static int 555static int
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 556coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 557{
474 AV *padlist; 558 AV *padlist;
475 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;
476 564
477 /* casting is fun. */ 565 /* casting is fun. */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
479 free_padlist (aTHX_ padlist); 567 free_padlist (aTHX_ padlist);
480 568
… …
529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
530} 618}
531 619
532/** load & save, init *******************************************************/ 620/** load & save, init *******************************************************/
533 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
534static void 673static void
535on_enterleave_call (pTHX_ SV *cb); 674on_enterleave_call (pTHX_ SV *cb);
536 675
537static void 676static void
538load_perl (pTHX_ Coro__State c) 677load_perl (pTHX_ Coro__State c)
… …
569 } 708 }
570 709
571 slf_frame = c->slf_frame; 710 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 711 CORO_THROW = c->except;
573 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
574 if (expect_false (c->on_enter)) 721 if (expect_false (c->on_enter))
575 { 722 {
576 int i; 723 int i;
577 724
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 725 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (AvARRAY (c->on_enter)[i]); 726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 } 727 }
728
729 SWAP_SVS (c);
581} 730}
582 731
583static void 732static void
584save_perl (pTHX_ Coro__State c) 733save_perl (pTHX_ Coro__State c)
585{ 734{
735 SWAP_SVS (c);
736
586 if (expect_false (c->on_leave)) 737 if (expect_false (c->on_leave))
587 { 738 {
588 int i; 739 int i;
589 740
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 741 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (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);
592 } 751 }
593 752
594 c->except = CORO_THROW; 753 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 754 c->slf_frame = slf_frame;
596 755
… …
611 { 770 {
612 while (expect_true (cxix >= 0)) 771 while (expect_true (cxix >= 0))
613 { 772 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 773 PERL_CONTEXT *cx = &ccstk[cxix--];
615 774
616 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))
617 { 776 {
618 CV *cv = cx->blk_sub.cv; 777 CV *cv = cx->blk_sub.cv;
619 778
620 if (expect_true (CvDEPTH (cv))) 779 if (expect_true (CvDEPTH (cv)))
621 { 780 {
… …
640 799
641 PUTBACK; 800 PUTBACK;
642 } 801 }
643 802
644 /* allocate some space on the context stack for our purposes */ 803 /* allocate some space on the context stack for our purposes */
645 /* we manually unroll here, as usually 2 slots is enough */ 804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
646 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC;
649 { 805 {
650 int i; 806 unsigned int i;
807
651 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 0; i < SLOT_COUNT; ++i)
652 CXINC; 809 CXINC;
653 } 810
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
812 }
655 813
656 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
657 815
658 { 816 {
659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
680# define coro_init_stacks(thx) init_stacks () 838# define coro_init_stacks(thx) init_stacks ()
681#else 839#else
682static void 840static void
683coro_init_stacks (pTHX) 841coro_init_stacks (pTHX)
684{ 842{
685 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() */
686 PL_curstackinfo->si_type = PERLSI_MAIN; 844 PL_curstackinfo->si_type = PERLSI_MAIN;
687 PL_curstack = PL_curstackinfo->si_stack; 845 PL_curstack = PL_curstackinfo->si_stack;
688 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
689 847
690 PL_stack_base = AvARRAY(PL_curstack); 848 PL_stack_base = AvARRAY(PL_curstack);
… …
889slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{ 1048{
891 return 1; 1049 return 1;
892} 1050}
893 1051
894static UNOP coro_setup_op; 1052static UNOP init_perl_op;
895 1053
896static 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 */
897coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
898{ 1056{
899 /* 1057 /*
900 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
901 */ 1059 */
902 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
… …
909 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
911 PL_curpm = 0; 1069 PL_curpm = 0;
912 PL_curpad = 0; 1070 PL_curpad = 0;
913 PL_localizing = 0; 1071 PL_localizing = 0;
914 PL_dirty = 0;
915 PL_restartop = 0; 1072 PL_restartop = 0;
916#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
917 PL_parser = 0; 1074 PL_parser = 0;
918#endif 1075#endif
919 PL_hints = 0; 1076 PL_hints = 0;
… …
951 */ 1108 */
952 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 */
953 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 */
954 1111
955 /* 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 */
956 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
957 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
958 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
959 /* 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 */
960 1117
961 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
962 1119
963 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
964 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 }
965} 1130}
966 1131
967static void 1132static void
968coro_unwind_stacks (pTHX) 1133coro_unwind_stacks (pTHX)
969{ 1134{
… …
984 dounwind (-1); 1149 dounwind (-1);
985 } 1150 }
986} 1151}
987 1152
988static void 1153static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
990{ 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
991 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
992 1173
993 SvREFCNT_dec (GvSV (PL_defgv)); 1174 /* restore swapped sv's */
994 SvREFCNT_dec (GvAV (PL_defgv)); 1175 SWAP_SVS (coro);
995 SvREFCNT_dec (GvSV (PL_errgv));
996 SvREFCNT_dec (PL_defoutgv);
997 SvREFCNT_dec (PL_rs);
998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
1000 1176
1001 SvREFCNT_dec (PL_diehook); 1177 // now save some sv's to be free'd later
1002 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);
1003 1192 }
1193
1194 {
1195 unsigned int i;
1196
1197 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1198 SvREFCNT_dec (svf [i]);
1199
1004 SvREFCNT_dec (coro->saved_deffh); 1200 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1201 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1202 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1203 SvREFCNT_dec (coro->invoke_av);
1008 1204 }
1009 coro_destruct_stacks (aTHX);
1010} 1205}
1011 1206
1012INLINE void 1207INLINE void
1013free_coro_mortal (pTHX) 1208free_coro_mortal (pTHX)
1014{ 1209{
… …
1211 /* 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 */
1212 PL_restartop = PL_op; 1407 PL_restartop = PL_op;
1213 perl_run (PL_curinterp); 1408 perl_run (PL_curinterp);
1214 /* 1409 /*
1215 * 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
1216 * 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.
1217 */ 1413 */
1218 1414
1219 /* 1415 /*
1220 * 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
1221 * 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)
… …
1308cctx_destroy (coro_cctx *cctx) 1504cctx_destroy (coro_cctx *cctx)
1309{ 1505{
1310 if (!cctx) 1506 if (!cctx)
1311 return; 1507 return;
1312 1508
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1314 1510
1315 --cctx_count; 1511 --cctx_count;
1316 coro_destroy (&cctx->cctx); 1512 coro_destroy (&cctx->cctx);
1317 1513
1318 /* coro_transfer creates new, empty cctx's */ 1514 /* coro_transfer creates new, empty cctx's */
… …
1382 /* TODO: throwing up here is considered harmful */ 1578 /* TODO: throwing up here is considered harmful */
1383 1579
1384 if (expect_true (prev != next)) 1580 if (expect_true (prev != next))
1385 { 1581 {
1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1387 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,");
1388 1584
1389 if (expect_false (next->flags & CF_RUNNING))
1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1391
1392 if (expect_false (next->flags & CF_DESTROYED)) 1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1393 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,");
1394 1587
1395#if !PERL_VERSION_ATLEAST (5,10,0) 1588#if !PERL_VERSION_ATLEAST (5,10,0)
1396 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1589 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1397 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,");
1398#endif 1591#endif
… …
1431 if (expect_false (next->flags & CF_NEW)) 1624 if (expect_false (next->flags & CF_NEW))
1432 { 1625 {
1433 /* need to start coroutine */ 1626 /* need to start coroutine */
1434 next->flags &= ~CF_NEW; 1627 next->flags &= ~CF_NEW;
1435 /* setup coroutine call */ 1628 /* setup coroutine call */
1436 coro_setup (aTHX_ next); 1629 init_perl (aTHX_ next);
1437 } 1630 }
1438 else 1631 else
1439 load_perl (aTHX_ next); 1632 load_perl (aTHX_ next);
1440 1633
1441 /* possibly untie and reuse the cctx */ 1634 /* possibly untie and reuse the cctx */
… …
1480#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))
1481#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1482 1675
1483/** high level stuff ********************************************************/ 1676/** high level stuff ********************************************************/
1484 1677
1485static int 1678static void
1486coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1487{ 1680{
1488 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_DESTROYED)
1489 return 0; 1682 return;
1490 1683
1491 if (coro->on_destroy)
1492 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1493 1685
1494 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_DESTROYED;
1495 1687
1496 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1497 { 1689 {
… …
1504 1696
1505 if (coro->mainstack 1697 if (coro->mainstack
1506 && coro->mainstack != main_mainstack 1698 && coro->mainstack != main_mainstack
1507 && coro->slot 1699 && coro->slot
1508 && !PL_dirty) 1700 && !PL_dirty)
1509 {
1510 struct coro *current = SvSTATE_current;
1511
1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1513
1514 save_perl (aTHX_ current);
1515 load_perl (aTHX_ coro);
1516
1517 coro_destruct_perl (aTHX_ coro); 1701 destroy_perl (aTHX_ coro);
1518 1702
1519 load_perl (aTHX_ current); 1703 if (coro->next) coro->next->prev = coro->prev;
1520 1704 if (coro->prev) coro->prev->next = coro->next;
1521 coro->slot = 0; 1705 if (coro == coro_first) coro_first = coro->next;
1522 }
1523 1706
1524 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1526 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1527 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1528
1529 if (coro->next) coro->next->prev = coro->prev;
1530 if (coro->prev) coro->prev->next = coro->next;
1531 if (coro == coro_first) coro_first = coro->next;
1532
1533 return 1;
1534} 1712}
1535 1713
1536static int 1714static int
1537coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1715coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1538{ 1716{
… …
1586 1764
1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1765 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1588 TRANSFER (ta, 1); 1766 TRANSFER (ta, 1);
1589} 1767}
1590 1768
1591/*****************************************************************************/
1592/* gensub: simple closure generation utility */
1593
1594#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1595
1596/* create a closure from XS, returns a code reference */
1597/* the arg can be accessed via GENSUB_ARG from the callback */
1598/* the callback must use dXSARGS/XSRETURN */
1599static SV *
1600gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1601{
1602 CV *cv = (CV *)newSV (0);
1603
1604 sv_upgrade ((SV *)cv, SVt_PVCV);
1605
1606 CvANON_on (cv);
1607 CvISXSUB_on (cv);
1608 CvXSUB (cv) = xsub;
1609 GENSUB_ARG = arg;
1610
1611 return newRV_noinc ((SV *)cv);
1612}
1613
1614/** Coro ********************************************************************/ 1769/** Coro ********************************************************************/
1615 1770
1616INLINE void 1771INLINE void
1617coro_enq (pTHX_ struct coro *coro) 1772coro_enq (pTHX_ struct coro *coro)
1618{ 1773{
1619 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1620}
1621 1775
1622INLINE 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 *
1623coro_deq (pTHX) 1784coro_deq (pTHX)
1624{ 1785{
1625 int prio; 1786 int prio;
1626 1787
1627 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1628 if (AvFILLp (coro_ready [prio]) >= 0) 1789 {
1629 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 }
1630 1799
1631 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;
1632} 1818}
1633 1819
1634static int 1820static int
1635api_ready (pTHX_ SV *coro_sv) 1821api_ready (pTHX_ SV *coro_sv)
1636{ 1822{
1637 struct coro *coro;
1638 SV *sv_hook;
1639 void (*xs_hook)(void);
1640
1641 coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1642 1824
1643 if (coro->flags & CF_READY) 1825 if (coro->flags & CF_READY)
1644 return 0; 1826 return 0;
1645 1827
1646 coro->flags |= CF_READY; 1828 coro->flags |= CF_READY;
1647 1829
1648 sv_hook = coro_nready ? 0 : coro_readyhook;
1649 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1650
1651 coro_enq (aTHX_ coro); 1830 coro_enq (aTHX_ coro);
1652 ++coro_nready;
1653 1831
1654 if (sv_hook) 1832 if (!coro_nready++)
1655 { 1833 if (coroapi.readyhook)
1656 dSP; 1834 coroapi.readyhook ();
1657
1658 ENTER;
1659 SAVETMPS;
1660
1661 PUSHMARK (SP);
1662 PUTBACK;
1663 call_sv (sv_hook, G_VOID | G_DISCARD);
1664
1665 FREETMPS;
1666 LEAVE;
1667 }
1668
1669 if (xs_hook)
1670 xs_hook ();
1671 1835
1672 return 1; 1836 return 1;
1673} 1837}
1674 1838
1675static int 1839static int
… …
1698static void 1862static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1863prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{ 1864{
1701 for (;;) 1865 for (;;)
1702 { 1866 {
1703 SV *next_sv = coro_deq (aTHX); 1867 struct coro *next = coro_deq (aTHX);
1704 1868
1705 if (expect_true (next_sv)) 1869 if (expect_true (next))
1706 { 1870 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */ 1871 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED)) 1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1711 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 */
1712 else 1874 else
1713 { 1875 {
1714 next->flags &= ~CF_READY; 1876 next->flags &= ~CF_READY;
1715 --coro_nready; 1877 --coro_nready;
1716 1878
… …
1722 { 1884 {
1723 /* nothing to schedule: call the idle handler */ 1885 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle) 1886 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle))) 1887 && SvOBJECT (SvRV (sv_idle)))
1726 { 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
1727 ++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 */
1728 api_ready (aTHX_ SvRV (sv_idle)); 1893 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready; 1894 --coro_nready;
1730 } 1895 }
1731 else 1896 else
1732 { 1897 {
1898 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1733 dSP; 1899 dSP;
1734 1900
1735 ENTER; 1901 ENTER;
1736 SAVETMPS; 1902 SAVETMPS;
1737 1903
… …
1847 2013
1848static void 2014static void
1849coro_call_on_destroy (pTHX_ struct coro *coro) 2015coro_call_on_destroy (pTHX_ struct coro *coro)
1850{ 2016{
1851 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);
1852 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1853 2018
1854 if (on_destroyp) 2019 if (on_destroyp)
1855 { 2020 {
1856 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;
1857 2024
1858 while (AvFILLp (on_destroy) >= 0) 2025 while (AvFILLp (on_destroy) >= 0)
1859 { 2026 {
1860 dSP; /* don't disturb outer sp */ 2027 dSP; /* don't disturb outer sp */
1861 SV *cb = av_pop (on_destroy); 2028 SV *cb = av_pop (on_destroy);
… …
1863 PUSHMARK (SP); 2030 PUSHMARK (SP);
1864 2031
1865 if (statusp) 2032 if (statusp)
1866 { 2033 {
1867 int i; 2034 int i;
1868 AV *status = (AV *)SvRV (*statusp);
1869 EXTEND (SP, AvFILLp (status) + 1); 2035 EXTEND (SP, AvFILLp (status) + 1);
1870 2036
1871 for (i = 0; i <= AvFILLp (status); ++i) 2037 for (i = 0; i <= AvFILLp (status); ++i)
1872 PUSHs (AvARRAY (status)[i]); 2038 PUSHs (AvARRAY (status)[i]);
1873 } 2039 }
… …
1877 } 2043 }
1878 } 2044 }
1879} 2045}
1880 2046
1881static void 2047static void
1882slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items)
1883{ 2049{
1884 int i;
1885 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV (); 2050 AV *av = newAV ();
1887 2051
2052 /* items are actually not so common, so optimise for this case */
2053 if (items)
2054 {
2055 int i;
2056
1888 av_extend (av, items - 1); 2057 av_extend (av, items - 1);
2058
1889 for (i = 0; i < items; ++i) 2059 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i])); 2060 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 }
1891 2062
1892 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}
1893 2065
2066static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{
1894 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 */
1895 api_ready (aTHX_ sv_manager); 2070 api_ready (aTHX_ sv_manager);
1896 2071
1897 frame->prepare = prepare_schedule; 2072 frame->prepare = prepare_schedule;
1898 frame->check = slf_check_repeat; 2073 frame->check = slf_check_repeat;
1899 2074
1900 /* as a minor optimisation, we could unwind all stacks here */ 2075 /* as a minor optimisation, we could unwind all stacks here */
1901 /* 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 */
1902 /*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;
1903} 2185}
1904 2186
1905/*****************************************************************************/ 2187/*****************************************************************************/
1906/* async pool handler */ 2188/* async pool handler */
1907 2189
… …
1947 coro->saved_deffh = 0; 2229 coro->saved_deffh = 0;
1948 2230
1949 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2231 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1950 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2232 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1951 { 2233 {
1952 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2234 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1953 coro->invoke_av = newAV (); 2235 return;
1954
1955 frame->prepare = prepare_nop;
1956 } 2236 }
1957 else 2237 else
1958 { 2238 {
1959 av_clear (GvAV (PL_defgv)); 2239 av_clear (GvAV (PL_defgv));
1960 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);
… …
1985 2265
1986static void 2266static void
1987coro_rouse_callback (pTHX_ CV *cv) 2267coro_rouse_callback (pTHX_ CV *cv)
1988{ 2268{
1989 dXSARGS; 2269 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2270 SV *data = (SV *)S_GENSUB_ARG;
1991 2271
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2272 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2273 {
1994 /* first call, set args */ 2274 /* first call, set args */
2275 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2276 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2277
1998 SvRV_set (data, (SV *)av); 2278 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2279
2002 /* better take a full copy of the arguments */ 2280 /* better take a full copy of the arguments */
2003 while (items--) 2281 while (items--)
2004 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);
2005 } 2286 }
2006 2287
2007 XSRETURN_EMPTY; 2288 XSRETURN_EMPTY;
2008} 2289}
2009 2290
… …
2026 2307
2027 EXTEND (SP, AvFILLp (av) + 1); 2308 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2309 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2310 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2311
2031 /* 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 */
2032 AvFILLp (av) = -1; 2313 AvFILLp (av) = -1;
2033 av_undef (av); 2314 av_undef (av);
2034 2315
2035 PUTBACK; 2316 PUTBACK;
2036 } 2317 }
… …
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2341 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2343 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2344
2064 { 2345 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2347 SV *data = (SV *)S_GENSUB_ARG;
2067 2348
2068 frame->data = (void *)data; 2349 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2350 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2351 frame->check = slf_check_rouse_wait;
2071 } 2352 }
… …
2075coro_new_rouse_cb (pTHX) 2356coro_new_rouse_cb (pTHX)
2076{ 2357{
2077 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2359 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2360 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2361 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2362
2082 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);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2364 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2365
2085 SvREFCNT_dec (coro->rouse_cb); 2366 SvREFCNT_dec (coro->rouse_cb);
… …
2182static void 2463static void
2183slf_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)
2184{ 2465{
2185 frame->prepare = prepare_cede_notself; 2466 frame->prepare = prepare_cede_notself;
2186 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;
2187} 2485}
2188 2486
2189/* 2487/*
2190 * these not obviously related functions are all rolled into one 2488 * these not obviously related functions are all rolled into one
2191 * 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
… …
2310 if (PL_op->op_flags & OPf_STACKED) 2608 if (PL_op->op_flags & OPf_STACKED)
2311 { 2609 {
2312 if (items > slf_arga) 2610 if (items > slf_arga)
2313 { 2611 {
2314 slf_arga = items; 2612 slf_arga = items;
2315 free (slf_argv); 2613 Safefree (slf_argv);
2316 slf_argv = malloc (slf_arga * sizeof (SV *)); 2614 New (0, slf_argv, slf_arga, SV *);
2317 } 2615 }
2318 2616
2319 slf_argc = items; 2617 slf_argc = items;
2320 2618
2321 for (i = 0; i < items; ++i) 2619 for (i = 0; i < items; ++i)
… …
2347 2645
2348 POPSTACK; 2646 POPSTACK;
2349} 2647}
2350 2648
2351static SV * 2649static SV *
2352coro_avp_pop_and_free (AV **avp) 2650coro_avp_pop_and_free (pTHX_ AV **avp)
2353{ 2651{
2354 AV *av = *avp; 2652 AV *av = *avp;
2355 SV *res = av_pop (av); 2653 SV *res = av_pop (av);
2356 2654
2357 if (AvFILLp (av) < 0) 2655 if (AvFILLp (av) < 0)
… …
2364} 2662}
2365 2663
2366static void 2664static void
2367coro_pop_on_enter (pTHX_ void *coro) 2665coro_pop_on_enter (pTHX_ void *coro)
2368{ 2666{
2369 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_enter); 2667 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2370 SvREFCNT_dec (cb); 2668 SvREFCNT_dec (cb);
2371} 2669}
2372 2670
2373static void 2671static void
2374coro_pop_on_leave (pTHX_ void *coro) 2672coro_pop_on_leave (pTHX_ void *coro)
2375{ 2673{
2376 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_leave); 2674 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2377 on_enterleave_call (sv_2mortal (cb)); 2675 on_enterleave_call (aTHX_ sv_2mortal (cb));
2378} 2676}
2379 2677
2380/*****************************************************************************/ 2678/*****************************************************************************/
2381/* PerlIO::cede */ 2679/* PerlIO::cede */
2382 2680
… …
2456/* Coro::Semaphore & Coro::Signal */ 2754/* Coro::Semaphore & Coro::Signal */
2457 2755
2458static SV * 2756static SV *
2459coro_waitarray_new (pTHX_ int count) 2757coro_waitarray_new (pTHX_ int count)
2460{ 2758{
2461 /* 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 */
2462 AV *av = newAV (); 2760 AV *av = newAV ();
2463 SV **ary; 2761 SV **ary;
2464 2762
2465 /* unfortunately, building manually saves memory */ 2763 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 2764 Newx (ary, 2, SV *);
… …
2517 SvREFCNT_dec (cb); 2815 SvREFCNT_dec (cb);
2518 } 2816 }
2519} 2817}
2520 2818
2521static void 2819static void
2522coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2820coro_semaphore_destroy (pTHX_ struct coro *coro)
2523{ 2821{
2524 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2822 /* call $sem->adjust (0) to possibly wake up some other waiters */
2525 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2526} 2824}
2527 2825
… …
2534 /* 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 */
2535 if (CORO_THROW) 2833 if (CORO_THROW)
2536 return 0; 2834 return 0;
2537 else if (SvIVX (count_sv) > 0) 2835 else if (SvIVX (count_sv) > 0)
2538 { 2836 {
2539 SvSTATE_current->on_destroy = 0; 2837 frame->destroy = 0;
2540 2838
2541 if (acquire) 2839 if (acquire)
2542 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2840 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2543 else 2841 else
2544 coro_semaphore_adjust (aTHX_ av, 0); 2842 coro_semaphore_adjust (aTHX_ av, 0);
… …
2587 { 2885 {
2588 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2886 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2589 2887
2590 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2888 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2591 frame->prepare = prepare_schedule; 2889 frame->prepare = prepare_schedule;
2592
2593 /* to avoid race conditions when a woken-up coro gets terminated */ 2890 /* to avoid race conditions when a woken-up coro gets terminated */
2594 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2891 /* we arrange for a temporary on_destroy that calls adjust (0) */
2595 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2892 frame->destroy = coro_semaphore_destroy;
2596 } 2893 }
2597} 2894}
2598 2895
2599static void 2896static void
2600slf_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)
… …
2608{ 2905{
2609 if (items >= 2) 2906 if (items >= 2)
2610 { 2907 {
2611 /* callback form */ 2908 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 2909 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2910 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 2911
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2912 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 2913
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 2914 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 2915 coro_semaphore_adjust (aTHX_ av, 0);
2619 2916
2620 frame->prepare = prepare_nop; 2917 frame->prepare = prepare_nop;
… …
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 2941 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 2942 AvARRAY (av)[1] = cb;
2646 2943
2647 cb = av_shift (av); 2944 cb = av_shift (av);
2648 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 {
2649 api_ready (aTHX_ cb); 2956 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 2957 sv_setiv (cb, 0); /* signal waiter */
2958 }
2959
2651 SvREFCNT_dec (cb); 2960 SvREFCNT_dec (cb);
2652 2961
2653 --count; 2962 --count;
2654 } 2963 }
2655} 2964}
… …
2664static void 2973static void
2665slf_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)
2666{ 2975{
2667 AV *av = (AV *)SvRV (arg [0]); 2976 AV *av = (AV *)SvRV (arg [0]);
2668 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
2669 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]))
2670 { 2990 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 2991 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 2992 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 2993 frame->check = slf_check_nop;
2674 } 2994 }
2675 else 2995 else
2676 { 2996 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2997 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 2998
2679 av_push (av, waiter); 2999 av_push (av, waiter);
2680 3000
2681 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 */
2682 frame->prepare = prepare_schedule; 3002 frame->prepare = prepare_schedule;
… …
2700 3020
2701static void 3021static void
2702coro_aio_callback (pTHX_ CV *cv) 3022coro_aio_callback (pTHX_ CV *cv)
2703{ 3023{
2704 dXSARGS; 3024 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 3025 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 3026 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 3027 SV *data_sv = newSV (sizeof (struct io_state));
2708 3028
2709 av_extend (state, items - 1); 3029 av_extend (state, items - 1);
2710 3030
… …
2824 3144
2825 for (i = 0; i < items; ++i) 3145 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 3146 PUSHs (arg [i]);
2827 3147
2828 /* now push the callback closure */ 3148 /* now push the callback closure */
2829 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))));
2830 3150
2831 /* now call the AIO function - we assume our request is uncancelable */ 3151 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 3152 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 3153 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 3154 }
2835 3155
2836 /* 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 */
2837 frame->data = (void *)state; 3157 frame->data = (void *)state;
2838 frame->prepare = prepare_schedule; 3158 frame->prepare = prepare_schedule;
2839 frame->check = slf_check_aio_req; 3159 frame->check = slf_check_aio_req;
2840} 3160}
2841 3161
… …
2852/*****************************************************************************/ 3172/*****************************************************************************/
2853 3173
2854#if CORO_CLONE 3174#if CORO_CLONE
2855# include "clone.c" 3175# include "clone.c"
2856#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}
2857 3235
2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2859 3237
2860PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2861 3239
… …
2914 coroapi.prepare_nop = prepare_nop; 3292 coroapi.prepare_nop = prepare_nop;
2915 coroapi.prepare_schedule = prepare_schedule; 3293 coroapi.prepare_schedule = prepare_schedule;
2916 coroapi.prepare_cede = prepare_cede; 3294 coroapi.prepare_cede = prepare_cede;
2917 coroapi.prepare_cede_notself = prepare_cede_notself; 3295 coroapi.prepare_cede_notself = prepare_cede_notself;
2918 3296
2919 { 3297 time_init (aTHX);
2920 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2921 3298
2922 if (!svp) croak ("Time::HiRes is required");
2923 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2924
2925 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2926 }
2927
2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2929} 3300}
2930 3301
2931SV * 3302SV *
2932new (char *klass, ...) 3303new (SV *klass, ...)
2933 ALIAS: 3304 ALIAS:
2934 Coro::new = 1 3305 Coro::new = 1
2935 CODE: 3306 CODE:
2936{ 3307 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2937 struct coro *coro; 3308 OUTPUT:
2938 MAGIC *mg;
2939 HV *hv;
2940 CV *cb;
2941 int i;
2942
2943 if (items > 1)
2944 {
2945 cb = coro_sv_2cv (aTHX_ ST (1));
2946
2947 if (!ix)
2948 {
2949 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2951
2952 if (!CvROOT (cb))
2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2955 }
2956
2957 Newz (0, coro, 1, struct coro);
2958 coro->args = newAV ();
2959 coro->flags = CF_NEW;
2960
2961 if (coro_first) coro_first->prev = coro;
2962 coro->next = coro_first;
2963 coro_first = coro;
2964
2965 coro->hv = hv = newHV ();
2966 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2967 mg->mg_flags |= MGf_DUP;
2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2969
2970 if (items > 1)
2971 {
2972 av_extend (coro->args, items - 1 + ix - 1);
2973
2974 if (ix)
2975 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run;
2978 }
2979
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981
2982 for (i = 2; i < items; i++)
2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2985}
2986 OUTPUT:
2987 RETVAL 3309 RETVAL
2988 3310
2989void 3311void
2990transfer (...) 3312transfer (...)
2991 PROTOTYPE: $$ 3313 PROTOTYPE: $$
2992 CODE: 3314 CODE:
2993 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3315 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2994
2995bool
2996_destroy (SV *coro_sv)
2997 CODE:
2998 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2999 OUTPUT:
3000 RETVAL
3001 3316
3002void 3317void
3003_exit (int code) 3318_exit (int code)
3004 PROTOTYPE: $ 3319 PROTOTYPE: $
3005 CODE: 3320 CODE:
… …
3081 CODE: 3396 CODE:
3082{ 3397{
3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3398 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3084 { 3399 {
3085 struct coro *current = SvSTATE_current; 3400 struct coro *current = SvSTATE_current;
3401 struct CoroSLF slf_save;
3086 3402
3087 if (current != coro) 3403 if (current != coro)
3088 { 3404 {
3089 PUTBACK; 3405 PUTBACK;
3090 save_perl (aTHX_ current); 3406 save_perl (aTHX_ current);
3091 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;
3092 SPAGAIN; 3417 SPAGAIN;
3093 } 3418 }
3094 3419
3095 PUSHSTACK; 3420 PUSHSTACK;
3096 3421
… …
3100 if (ix) 3425 if (ix)
3101 eval_sv (coderef, 0); 3426 eval_sv (coderef, 0);
3102 else 3427 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3428 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3429
3430 POPSTACK;
3105 SPAGAIN; 3431 SPAGAIN;
3106 POPSTACK;
3107 3432
3108 if (current != coro) 3433 if (current != coro)
3109 { 3434 {
3110 PUTBACK; 3435 PUTBACK;
3436 slf_frame = slf_save;
3111 save_perl (aTHX_ coro); 3437 save_perl (aTHX_ coro);
3112 load_perl (aTHX_ current); 3438 load_perl (aTHX_ current);
3113 SPAGAIN; 3439 SPAGAIN;
3114 } 3440 }
3115 } 3441 }
… …
3121 ALIAS: 3447 ALIAS:
3122 is_ready = CF_READY 3448 is_ready = CF_READY
3123 is_running = CF_RUNNING 3449 is_running = CF_RUNNING
3124 is_new = CF_NEW 3450 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3451 is_destroyed = CF_DESTROYED
3452 is_suspended = CF_SUSPENDED
3126 CODE: 3453 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3454 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3455 OUTPUT:
3129 RETVAL 3456 RETVAL
3130 3457
3131void 3458void
3132throw (Coro::State self, SV *throw = &PL_sv_undef) 3459throw (Coro::State self, SV *exception = &PL_sv_undef)
3133 PROTOTYPE: $;$ 3460 PROTOTYPE: $;$
3134 CODE: 3461 CODE:
3135{ 3462{
3136 struct coro *current = SvSTATE_current; 3463 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3465 SvREFCNT_dec (*exceptionp);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3466 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3140} 3468}
3141 3469
3142void 3470void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3144 PROTOTYPE: $;$ 3472 PROTOTYPE: $;$
… …
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3523 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3524
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3525 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3526 }
3199 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
3200 3589
3201MODULE = Coro::State PACKAGE = Coro 3590MODULE = Coro::State PACKAGE = Coro
3202 3591
3203BOOT: 3592BOOT:
3204{ 3593{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 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);
3212 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3213 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3599 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3214 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3600 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3601 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216 3602
3217 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);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 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);
3220 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 */
3221 3607
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3608 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3609
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3613 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3614 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3615 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3230
3231 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3232 coro_ready[i] = newAV ();
3233 3616
3234 { 3617 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3618 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3619
3237 coroapi.schedule = api_schedule; 3620 coroapi.schedule = api_schedule;
… …
3247 sv_setiv (sv, (IV)&coroapi); 3630 sv_setiv (sv, (IV)&coroapi);
3248 SvREADONLY_on (sv); 3631 SvREADONLY_on (sv);
3249 } 3632 }
3250} 3633}
3251 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
3252void 3651void
3253terminate (...) 3652terminate (...)
3254 CODE: 3653 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3654 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256 3655
3257void 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
3258schedule (...) 3666schedule (...)
3259 CODE: 3667 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3668 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3261 3669
3262void 3670void
… …
3276 3684
3277void 3685void
3278cede_notself (...) 3686cede_notself (...)
3279 CODE: 3687 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3688 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281
3282void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
3287 3689
3288void 3690void
3289_set_current (SV *current) 3691_set_current (SV *current)
3290 PROTOTYPE: $ 3692 PROTOTYPE: $
3291 CODE: 3693 CODE:
… …
3295void 3697void
3296_set_readyhook (SV *hook) 3698_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3699 PROTOTYPE: $
3298 CODE: 3700 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3701 SvREFCNT_dec (coro_readyhook);
3702 SvGETMAGIC (hook);
3703 if (SvOK (hook))
3704 {
3300 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 }
3301 3713
3302int 3714int
3303prio (Coro::State coro, int newprio = 0) 3715prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
3305 ALIAS: 3717 ALIAS:
… …
3311 if (items > 1) 3723 if (items > 1)
3312 { 3724 {
3313 if (ix) 3725 if (ix)
3314 newprio = coro->prio - newprio; 3726 newprio = coro->prio - newprio;
3315 3727
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3728 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3729 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3730
3319 coro->prio = newprio; 3731 coro->prio = newprio;
3320 } 3732 }
3321} 3733}
3322 OUTPUT: 3734 OUTPUT:
… …
3337 RETVAL = coro_nready; 3749 RETVAL = coro_nready;
3338 OUTPUT: 3750 OUTPUT:
3339 RETVAL 3751 RETVAL
3340 3752
3341void 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
3342_pool_handler (...) 3766_pool_handler (...)
3343 CODE: 3767 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3768 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3345 3769
3346void 3770void
… …
3357 for (i = 1; i < items; ++i) 3781 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i))); 3782 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359 3783
3360 if ((SV *)hv == &PL_sv_undef) 3784 if ((SV *)hv == &PL_sv_undef)
3361 { 3785 {
3362 PUSHMARK (SP); 3786 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3363 EXTEND (SP, 2);
3364 PUSHs (sv_Coro);
3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv);
3371 } 3789 }
3372 3790
3373 { 3791 {
3374 struct coro *coro = SvSTATE_hv (hv); 3792 struct coro *coro = SvSTATE_hv (hv);
3375 3793
… …
3409 CODE: 3827 CODE:
3410{ 3828{
3411 struct coro *coro = SvSTATE_current; 3829 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 3831
3414 block = (SV *)coro_sv_2cv (block); 3832 block = s_get_cv_croak (block);
3415 3833
3416 if (!*avp) 3834 if (!*avp)
3417 *avp = newAV (); 3835 *avp = newAV ();
3418 3836
3419 av_push (*avp, SvREFCNT_inc (block)); 3837 av_push (*avp, SvREFCNT_inc (block));
3420 3838
3421 if (!ix) 3839 if (!ix)
3422 on_enterleave_call (aTHX_ block); 3840 on_enterleave_call (aTHX_ block);
3423 3841
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3842 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 3843 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3844 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 3845}
3428 3846
3429 3847
3430MODULE = Coro::State PACKAGE = PerlIO::cede 3848MODULE = Coro::State PACKAGE = PerlIO::cede
3431 3849
… …
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 3854MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 3855
3438SV * 3856SV *
3439new (SV *klass, SV *count = 0) 3857new (SV *klass, SV *count = 0)
3440 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
3441 RETVAL = sv_bless ( 3870 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3871 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 3872 GvSTASH (CvGV (cv))
3444 ); 3873 );
3874}
3445 OUTPUT: 3875 OUTPUT:
3446 RETVAL 3876 RETVAL
3447 3877
3448# helper for Coro::Channel 3878# helper for Coro::Channel and others
3449SV * 3879SV *
3450_alloc (int count) 3880_alloc (int count)
3451 CODE: 3881 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 3882 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 3883 OUTPUT:
… …
3511 for (i = 1; i <= wcount; ++i) 3941 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3942 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 3943 }
3514} 3944}
3515 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
3516MODULE = Coro::State PACKAGE = Coro::Signal 3962MODULE = Coro::State PACKAGE = Coro::Signal
3517 3963
3518SV * 3964SV *
3519new (SV *klass) 3965new (SV *klass)
3520 CODE: 3966 CODE:
… …
3591 4037
3592void 4038void
3593_register (char *target, char *proto, SV *req) 4039_register (char *target, char *proto, SV *req)
3594 CODE: 4040 CODE:
3595{ 4041{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 4042 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 4043 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4044 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 4045 sv_setpv ((SV *)slf_cv, proto);
3600 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);
3601} 4047}
3602 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