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.389 by root, Fri Mar 4 16:41:21 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);
169 131
190static SV *sv_pool_size; 152static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 156static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 157
197/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
198static SV *sv_activity; 159static SV *sv_activity;
160
161/* enable processtime/realtime profiling */
162static char enable_times;
163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
199 166
200static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
202 169
203enum { 170enum {
238enum { 205enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 211};
244 212
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 214typedef struct
247{ 215{
260/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
261struct coro { 229struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 230 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 231 coro_cctx *cctx;
264 232
233 /* ready queue */
234 struct coro *next_ready;
235
265 /* state data */ 236 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 237 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 238 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 239 perl_slots *slot; /* basically the saved sp */
269 240
270 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
276 247
277 /* statistics */ 248 /* statistics */
278 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
279 250
280 /* coro process data */ 251 /* coro process data */
289 260
290 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
291 AV *on_enter; 262 AV *on_enter;
292 AV *on_leave; 263 AV *on_leave;
293 264
265 /* swap_sv */
266 AV *swap_sv;
267
268 /* times */
269 coro_ts t_cpu, t_real;
270
294 /* linked list */ 271 /* linked list */
295 struct coro *next, *prev; 272 struct coro *next, *prev;
296}; 273};
297 274
298typedef struct coro *Coro__State; 275typedef struct coro *Coro__State;
303/* the mainr easonw e don't support windows process emulation */ 280/* the mainr easonw e don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 281static struct CoroSLF slf_frame; /* the current slf frame */
305 282
306/** Coro ********************************************************************/ 283/** Coro ********************************************************************/
307 284
308#define PRIO_MAX 3 285#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 286#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 287#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 288#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 289#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 290#define CORO_PRIO_MIN -4
314 291
315/* for Coro.pm */ 292/* for Coro.pm */
316static SV *coro_current; 293static SV *coro_current;
317static SV *coro_readyhook; 294static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
320static struct coro *coro_first; 297static struct coro *coro_first;
321#define coro_nready coroapi.nready 298#define coro_nready coroapi.nready
299
300/** Coro::Select ************************************************************/
301
302static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select;
304
305/* horrible hack, but if it works... */
306static OP *
307coro_pp_sselect (pTHX)
308{
309 dSP;
310 PUSHMARK (SP - 4); /* fake argument list */
311 XPUSHs (coro_select_select);
312 PUTBACK;
313
314 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
315 PL_op->op_flags |= OPf_STACKED;
316 PL_op->op_private = 0;
317 return PL_ppaddr [OP_ENTERSUB](aTHX);
318}
319
320/** time stuff **************************************************************/
321
322#ifdef HAS_GETTIMEOFDAY
323
324static void
325coro_u2time (pTHX_ UV ret[2])
326{
327 struct timeval tv;
328 gettimeofday (&tv, 0);
329
330 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec;
332}
333
334static double
335coro_nvtime ()
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 return tv.tv_sec + tv.tv_usec * 1e-6;
341}
342
343static void
344time_init (pTHX)
345{
346 nvtime = coro_nvtime;
347 u2time = coro_u2time;
348}
349
350#else
351
352static void
353time_init (pTHX)
354{
355 SV **svp;
356
357 require_pv ("Time/HiRes.pm");
358
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360
361 if (!svp) croak ("Time::HiRes is required, but missing.");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
363
364 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
368}
369
370#endif
322 371
323/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
324 373
325static SV * 374static SV *
326coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
350 get_hv (name, create); 399 get_hv (name, create);
351#endif 400#endif
352 return get_hv (name, create); 401 return get_hv (name, create);
353} 402}
354 403
355/* may croak */ 404INLINE void
356INLINE CV * 405coro_times_update ()
357coro_sv_2cv (pTHX_ SV *sv)
358{ 406{
359 HV *st; 407#ifdef coro_clock_gettime
360 GV *gvp; 408 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 409
363 if (!cv) 410 ts.tv_sec = ts.tv_nsec = 0;
364 croak ("code reference expected"); 411 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
412 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
365 413
366 return cv; 414 ts.tv_sec = ts.tv_nsec = 0;
415 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
416 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
417#else
418 dTHX;
419 UV tv[2];
420
421 u2time (aTHX_ tv);
422 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000;
424#endif
425}
426
427INLINE void
428coro_times_add (struct coro *c)
429{
430 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0];
433
434 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0];
437}
438
439INLINE void
440coro_times_sub (struct coro *c)
441{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0];
445
446 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
447 c->t_cpu [1] -= time_cpu [1];
448 c->t_cpu [0] -= time_cpu [0];
367} 449}
368 450
369/*****************************************************************************/ 451/*****************************************************************************/
370/* magic glue */ 452/* magic glue */
371 453
471static int 553static int
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 554coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 555{
474 AV *padlist; 556 AV *padlist;
475 AV *av = (AV *)mg->mg_obj; 557 AV *av = (AV *)mg->mg_obj;
558
559 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT)
561 return 0;
476 562
477 /* casting is fun. */ 563 /* casting is fun. */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
479 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
480 566
529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
530} 616}
531 617
532/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
533 619
620/* swap sv heads, at least logically */
621static void
622swap_svs (pTHX_ Coro__State c)
623{
624 int i;
625
626 for (i = 0; i <= AvFILLp (c->swap_sv); )
627 {
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665}
666
667#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro))
670
534static void 671static void
535on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
536 673
537static void 674static void
538load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
569 } 706 }
570 707
571 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 709 CORO_THROW = c->except;
573 710
711 if (expect_false (enable_times))
712 {
713 if (expect_false (!times_valid))
714 coro_times_update ();
715
716 coro_times_sub (c);
717 }
718
574 if (expect_false (c->on_enter)) 719 if (expect_false (c->on_enter))
575 { 720 {
576 int i; 721 int i;
577 722
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 } 725 }
726
727 SWAP_SVS (c);
581} 728}
582 729
583static void 730static void
584save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
585{ 732{
733 SWAP_SVS (c);
734
586 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
587 { 736 {
588 int i; 737 int i;
589 738
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (AvARRAY (c->on_leave)[i]); 740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 }
742
743 times_valid = 0;
744
745 if (expect_false (enable_times))
746 {
747 coro_times_update (); times_valid = 1;
748 coro_times_add (c);
592 } 749 }
593 750
594 c->except = CORO_THROW; 751 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
596 753
611 { 768 {
612 while (expect_true (cxix >= 0)) 769 while (expect_true (cxix >= 0))
613 { 770 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 771 PERL_CONTEXT *cx = &ccstk[cxix--];
615 772
616 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
617 { 774 {
618 CV *cv = cx->blk_sub.cv; 775 CV *cv = cx->blk_sub.cv;
619 776
620 if (expect_true (CvDEPTH (cv))) 777 if (expect_true (CvDEPTH (cv)))
621 { 778 {
645 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
646 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
649 { 806 {
650 int i; 807 unsigned int i;
651 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
652 CXINC; 809 CXINC;
653 } 810 }
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
655 812
889slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{ 1047{
891 return 1; 1048 return 1;
892} 1049}
893 1050
894static UNOP coro_setup_op; 1051static UNOP init_perl_op;
895 1052
896static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053static void NOINLINE /* noinline to keep it out of the transfer fast path */
897coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
898{ 1055{
899 /* 1056 /*
900 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
901 */ 1058 */
902 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
909 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
911 PL_curpm = 0; 1068 PL_curpm = 0;
912 PL_curpad = 0; 1069 PL_curpad = 0;
913 PL_localizing = 0; 1070 PL_localizing = 0;
914 PL_dirty = 0;
915 PL_restartop = 0; 1071 PL_restartop = 0;
916#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
917 PL_parser = 0; 1073 PL_parser = 0;
918#endif 1074#endif
919 PL_hints = 0; 1075 PL_hints = 0;
951 */ 1107 */
952 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 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 */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
954 1110
955 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1111 /* 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; 1112 init_perl_op.op_next = PL_op;
957 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
958 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
959 /* no flags etc. required, as an init function won't be called */ 1115 /* no flags etc. required, as an init function won't be called */
960 1116
961 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
962 1118
963 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
964 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
1121
1122 SWAP_SVS (coro);
1123
1124 if (expect_false (enable_times))
1125 {
1126 coro_times_update ();
1127 coro_times_sub (coro);
1128 }
965} 1129}
966 1130
967static void 1131static void
968coro_unwind_stacks (pTHX) 1132coro_unwind_stacks (pTHX)
969{ 1133{
984 dounwind (-1); 1148 dounwind (-1);
985 } 1149 }
986} 1150}
987 1151
988static void 1152static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
990{ 1154{
1155 SV *svf [9];
1156
1157 {
1158 struct coro *current = SvSTATE_current;
1159
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161
1162 save_perl (aTHX_ current);
1163 load_perl (aTHX_ coro);
1164
991 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
992 1167
993 SvREFCNT_dec (GvSV (PL_defgv)); 1168 /* restore swapped sv's */
994 SvREFCNT_dec (GvAV (PL_defgv)); 1169 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 1170
1001 SvREFCNT_dec (PL_diehook); 1171 // now save some sv's to be free'd later
1002 SvREFCNT_dec (PL_warnhook); 1172 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs;
1177 svf [5] = GvSV (irsgv);
1178 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf));
1182
1183 load_perl (aTHX_ current);
1003 1184 }
1185
1186 {
1187 unsigned int i;
1188
1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1190 SvREFCNT_dec (svf [i]);
1191
1004 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1193 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1194 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1195 SvREFCNT_dec (coro->invoke_av);
1008 1196 }
1009 coro_destruct_stacks (aTHX);
1010} 1197}
1011 1198
1012INLINE void 1199INLINE void
1013free_coro_mortal (pTHX) 1200free_coro_mortal (pTHX)
1014{ 1201{
1211 /* somebody or something will hit me for both perl_run and PL_restartop */ 1398 /* somebody or something will hit me for both perl_run and PL_restartop */
1212 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1213 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1214 /* 1401 /*
1215 * Unfortunately, there is no way to get at the return values of the 1402 * Unfortunately, there is no way to get at the return values of the
1216 * coro body here, as perl_run destroys these 1403 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1404 * runtime errors here, as this is just a random interpreter, not a thread.
1217 */ 1405 */
1218 1406
1219 /* 1407 /*
1220 * If perl-run returns we assume exit() was being called or the coro 1408 * 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) 1409 * fell off the end, which seems to be the only valid (non-bug)
1382 /* TODO: throwing up here is considered harmful */ 1570 /* TODO: throwing up here is considered harmful */
1383 1571
1384 if (expect_true (prev != next)) 1572 if (expect_true (prev != next))
1385 { 1573 {
1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1574 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,"); 1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1388 1576
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)) 1577 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,"); 1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1394 1579
1395#if !PERL_VERSION_ATLEAST (5,10,0) 1580#if !PERL_VERSION_ATLEAST (5,10,0)
1396 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1581 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,"); 1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1398#endif 1583#endif
1431 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1432 { 1617 {
1433 /* need to start coroutine */ 1618 /* need to start coroutine */
1434 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1435 /* setup coroutine call */ 1620 /* setup coroutine call */
1436 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1437 } 1622 }
1438 else 1623 else
1439 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1440 1625
1441 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
1486coro_state_destroy (pTHX_ struct coro *coro) 1671coro_state_destroy (pTHX_ struct coro *coro)
1487{ 1672{
1488 if (coro->flags & CF_DESTROYED) 1673 if (coro->flags & CF_DESTROYED)
1489 return 0; 1674 return 0;
1490 1675
1491 if (coro->on_destroy) 1676 if (coro->on_destroy && !PL_dirty)
1492 coro->on_destroy (aTHX_ coro); 1677 coro->on_destroy (aTHX_ coro);
1493 1678
1494 coro->flags |= CF_DESTROYED; 1679 coro->flags |= CF_DESTROYED;
1495 1680
1496 if (coro->flags & CF_READY) 1681 if (coro->flags & CF_READY)
1504 1689
1505 if (coro->mainstack 1690 if (coro->mainstack
1506 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1507 && coro->slot 1692 && coro->slot
1508 && !PL_dirty) 1693 && !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); 1694 destroy_perl (aTHX_ coro);
1518 1695
1519 load_perl (aTHX_ current); 1696 if (coro->next) coro->next->prev = coro->prev;
1520 1697 if (coro->prev) coro->prev->next = coro->next;
1521 coro->slot = 0; 1698 if (coro == coro_first) coro_first = coro->next;
1522 }
1523 1699
1524 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1526 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1527 SvREFCNT_dec (CORO_THROW); 1704 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 1705
1533 return 1; 1706 return 1;
1534} 1707}
1535 1708
1536static int 1709static int
1586 1759
1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1588 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1589} 1762}
1590 1763
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 ********************************************************************/ 1764/** Coro ********************************************************************/
1615 1765
1616INLINE void 1766INLINE void
1617coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1618{ 1768{
1619 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1620}
1621 1770
1622INLINE SV * 1771 SvREFCNT_inc_NN (coro->hv);
1772
1773 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro;
1776}
1777
1778INLINE struct coro *
1623coro_deq (pTHX) 1779coro_deq (pTHX)
1624{ 1780{
1625 int prio; 1781 int prio;
1626 1782
1627 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1628 if (AvFILLp (coro_ready [prio]) >= 0) 1784 {
1629 return av_shift (coro_ready [prio]); 1785 struct coro **ready = coro_ready [prio];
1786
1787 if (ready [0])
1788 {
1789 struct coro *coro = ready [0];
1790 ready [0] = coro->next_ready;
1791 return coro;
1792 }
1793 }
1630 1794
1631 return 0; 1795 return 0;
1796}
1797
1798static void
1799invoke_sv_ready_hook_helper (void)
1800{
1801 dTHX;
1802 dSP;
1803
1804 ENTER;
1805 SAVETMPS;
1806
1807 PUSHMARK (SP);
1808 PUTBACK;
1809 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1810
1811 FREETMPS;
1812 LEAVE;
1632} 1813}
1633 1814
1634static int 1815static int
1635api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1636{ 1817{
1637 struct coro *coro;
1638 SV *sv_hook;
1639 void (*xs_hook)(void);
1640
1641 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1642 1819
1643 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1644 return 0; 1821 return 0;
1645 1822
1646 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1647 1824
1648 sv_hook = coro_nready ? 0 : coro_readyhook;
1649 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1650
1651 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1652 ++coro_nready;
1653 1826
1654 if (sv_hook) 1827 if (!coro_nready++)
1655 { 1828 if (coroapi.readyhook)
1656 dSP; 1829 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 1830
1672 return 1; 1831 return 1;
1673} 1832}
1674 1833
1675static int 1834static int
1698static void 1857static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1858prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{ 1859{
1701 for (;;) 1860 for (;;)
1702 { 1861 {
1703 SV *next_sv = coro_deq (aTHX); 1862 struct coro *next = coro_deq (aTHX);
1704 1863
1705 if (expect_true (next_sv)) 1864 if (expect_true (next))
1706 { 1865 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */ 1866 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED)) 1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1712 else 1869 else
1713 { 1870 {
1714 next->flags &= ~CF_READY; 1871 next->flags &= ~CF_READY;
1715 --coro_nready; 1872 --coro_nready;
1716 1873
1722 { 1879 {
1723 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1726 { 1883 {
1884 if (SvRV (sv_idle) == SvRV (coro_current))
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1886
1727 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1728 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready; 1889 --coro_nready;
1730 } 1890 }
1731 else 1891 else
1732 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1733 dSP; 1894 dSP;
1734 1895
1735 ENTER; 1896 ENTER;
1736 SAVETMPS; 1897 SAVETMPS;
1737 1898
1883{ 2044{
1884 int i; 2045 int i;
1885 HV *hv = (HV *)SvRV (coro_current); 2046 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV (); 2047 AV *av = newAV ();
1887 2048
2049 /* items are actually not so common, so optimise for this case */
2050 if (items)
2051 {
1888 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1889 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1891 2057
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1893 2059
1894 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1895 api_ready (aTHX_ sv_manager); 2061 api_ready (aTHX_ sv_manager);
1985 2151
1986static void 2152static void
1987coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
1988{ 2154{
1989 dXSARGS; 2155 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
1991 2157
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2159 {
1994 /* first call, set args */ 2160 /* first call, set args */
2161 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2162 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2163
1998 SvRV_set (data, (SV *)av); 2164 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2165
2002 /* better take a full copy of the arguments */ 2166 /* better take a full copy of the arguments */
2003 while (items--) 2167 while (items--)
2004 av_store (av, items, newSVsv (ST (items))); 2168 av_store (av, items, newSVsv (ST (items)));
2169
2170 api_ready (aTHX_ coro);
2171 SvREFCNT_dec (coro);
2005 } 2172 }
2006 2173
2007 XSRETURN_EMPTY; 2174 XSRETURN_EMPTY;
2008} 2175}
2009 2176
2026 2193
2027 EXTEND (SP, AvFILLp (av) + 1); 2194 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2195 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2196 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2197
2031 /* we have stolen the elements, so ste length to zero and free */ 2198 /* we have stolen the elements, so set length to zero and free */
2032 AvFILLp (av) = -1; 2199 AvFILLp (av) = -1;
2033 av_undef (av); 2200 av_undef (av);
2034 2201
2035 PUTBACK; 2202 PUTBACK;
2036 } 2203 }
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2230
2064 { 2231 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
2067 2234
2068 frame->data = (void *)data; 2235 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
2071 } 2238 }
2075coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
2076{ 2243{
2077 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2248
2082 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2249 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2251
2085 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
2310 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2311 { 2478 {
2312 if (items > slf_arga) 2479 if (items > slf_arga)
2313 { 2480 {
2314 slf_arga = items; 2481 slf_arga = items;
2315 free (slf_argv); 2482 Safefree (slf_argv);
2316 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2317 } 2484 }
2318 2485
2319 slf_argc = items; 2486 slf_argc = items;
2320 2487
2321 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
2347 2514
2348 POPSTACK; 2515 POPSTACK;
2349} 2516}
2350 2517
2351static SV * 2518static SV *
2352coro_avp_pop_and_free (AV **avp) 2519coro_avp_pop_and_free (pTHX_ AV **avp)
2353{ 2520{
2354 AV *av = *avp; 2521 AV *av = *avp;
2355 SV *res = av_pop (av); 2522 SV *res = av_pop (av);
2356 2523
2357 if (AvFILLp (av) < 0) 2524 if (AvFILLp (av) < 0)
2364} 2531}
2365 2532
2366static void 2533static void
2367coro_pop_on_enter (pTHX_ void *coro) 2534coro_pop_on_enter (pTHX_ void *coro)
2368{ 2535{
2369 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_enter); 2536 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2370 SvREFCNT_dec (cb); 2537 SvREFCNT_dec (cb);
2371} 2538}
2372 2539
2373static void 2540static void
2374coro_pop_on_leave (pTHX_ void *coro) 2541coro_pop_on_leave (pTHX_ void *coro)
2375{ 2542{
2376 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_leave); 2543 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2377 on_enterleave_call (sv_2mortal (cb)); 2544 on_enterleave_call (aTHX_ sv_2mortal (cb));
2378} 2545}
2379 2546
2380/*****************************************************************************/ 2547/*****************************************************************************/
2381/* PerlIO::cede */ 2548/* PerlIO::cede */
2382 2549
2456/* Coro::Semaphore & Coro::Signal */ 2623/* Coro::Semaphore & Coro::Signal */
2457 2624
2458static SV * 2625static SV *
2459coro_waitarray_new (pTHX_ int count) 2626coro_waitarray_new (pTHX_ int count)
2460{ 2627{
2461 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2628 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2462 AV *av = newAV (); 2629 AV *av = newAV ();
2463 SV **ary; 2630 SV **ary;
2464 2631
2465 /* unfortunately, building manually saves memory */ 2632 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 2633 Newx (ary, 2, SV *);
2608{ 2775{
2609 if (items >= 2) 2776 if (items >= 2)
2610 { 2777 {
2611 /* callback form */ 2778 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 2781
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 2783
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
2619 2786
2620 frame->prepare = prepare_nop; 2787 frame->prepare = prepare_nop;
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 2811 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 2812 AvARRAY (av)[1] = cb;
2646 2813
2647 cb = av_shift (av); 2814 cb = av_shift (av);
2648 2815
2816 if (SvTYPE (cb) == SVt_PVCV)
2817 {
2818 dSP;
2819 PUSHMARK (SP);
2820 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2821 PUTBACK;
2822 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2823 }
2824 else
2825 {
2649 api_ready (aTHX_ cb); 2826 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 2827 sv_setiv (cb, 0); /* signal waiter */
2828 }
2829
2651 SvREFCNT_dec (cb); 2830 SvREFCNT_dec (cb);
2652 2831
2653 --count; 2832 --count;
2654 } 2833 }
2655} 2834}
2664static void 2843static void
2665slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2844slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2666{ 2845{
2667 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2668 2847
2848 if (items >= 2)
2849 {
2850 SV *cb_cv = s_get_cv_croak (arg [1]);
2851 av_push (av, SvREFCNT_inc_NN (cb_cv));
2852
2669 if (SvIVX (AvARRAY (av)[0])) 2853 if (SvIVX (AvARRAY (av)[0]))
2854 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2855
2856 frame->prepare = prepare_nop;
2857 frame->check = slf_check_nop;
2858 }
2859 else if (SvIVX (AvARRAY (av)[0]))
2670 { 2860 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 2861 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 2862 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 2863 frame->check = slf_check_nop;
2674 } 2864 }
2675 else 2865 else
2676 { 2866 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2867 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 2868
2679 av_push (av, waiter); 2869 av_push (av, waiter);
2680 2870
2681 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2871 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2682 frame->prepare = prepare_schedule; 2872 frame->prepare = prepare_schedule;
2700 2890
2701static void 2891static void
2702coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2703{ 2893{
2704 dXSARGS; 2894 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2708 2898
2709 av_extend (state, items - 1); 2899 av_extend (state, items - 1);
2710 2900
2824 3014
2825 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2827 3017
2828 /* now push the callback closure */ 3018 /* now push the callback closure */
2829 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3019 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2830 3020
2831 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 3022 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 3024 }
2835 3025
2836 /* now that the requets is going, we loop toll we have a result */ 3026 /* now that the request is going, we loop till we have a result */
2837 frame->data = (void *)state; 3027 frame->data = (void *)state;
2838 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2839 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2840} 3030}
2841 3031
2852/*****************************************************************************/ 3042/*****************************************************************************/
2853 3043
2854#if CORO_CLONE 3044#if CORO_CLONE
2855# include "clone.c" 3045# include "clone.c"
2856#endif 3046#endif
3047
3048/*****************************************************************************/
3049
3050static SV *
3051coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3052{
3053 SV *coro_sv;
3054 struct coro *coro;
3055 MAGIC *mg;
3056 HV *hv;
3057 SV *cb;
3058 int i;
3059
3060 if (argc > 0)
3061 {
3062 cb = s_get_cv_croak (argv [0]);
3063
3064 if (!is_coro)
3065 {
3066 if (CvISXSUB (cb))
3067 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3068
3069 if (!CvROOT (cb))
3070 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3071 }
3072 }
3073
3074 Newz (0, coro, 1, struct coro);
3075 coro->args = newAV ();
3076 coro->flags = CF_NEW;
3077
3078 if (coro_first) coro_first->prev = coro;
3079 coro->next = coro_first;
3080 coro_first = coro;
3081
3082 coro->hv = hv = newHV ();
3083 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3084 mg->mg_flags |= MGf_DUP;
3085 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3086
3087 if (argc > 0)
3088 {
3089 av_extend (coro->args, argc + is_coro - 1);
3090
3091 if (is_coro)
3092 {
3093 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3094 cb = (SV *)cv_coro_run;
3095 }
3096
3097 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3098
3099 for (i = 1; i < argc; i++)
3100 av_push (coro->args, newSVsv (argv [i]));
3101 }
3102
3103 return coro_sv;
3104}
2857 3105
2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2859 3107
2860PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2861 3109
2914 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
2915 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
2916 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
2917 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
2918 3166
2919 { 3167 time_init (aTHX);
2920 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2921 3168
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)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2929} 3170}
2930 3171
2931SV * 3172SV *
2932new (char *klass, ...) 3173new (SV *klass, ...)
2933 ALIAS: 3174 ALIAS:
2934 Coro::new = 1 3175 Coro::new = 1
2935 CODE: 3176 CODE:
2936{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2937 struct coro *coro; 3178 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 3179 RETVAL
2988 3180
2989void 3181void
2990transfer (...) 3182transfer (...)
2991 PROTOTYPE: $$ 3183 PROTOTYPE: $$
3100 if (ix) 3292 if (ix)
3101 eval_sv (coderef, 0); 3293 eval_sv (coderef, 0);
3102 else 3294 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3295 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3296
3297 POPSTACK;
3105 SPAGAIN; 3298 SPAGAIN;
3106 POPSTACK;
3107 3299
3108 if (current != coro) 3300 if (current != coro)
3109 { 3301 {
3110 PUTBACK; 3302 PUTBACK;
3111 save_perl (aTHX_ coro); 3303 save_perl (aTHX_ coro);
3121 ALIAS: 3313 ALIAS:
3122 is_ready = CF_READY 3314 is_ready = CF_READY
3123 is_running = CF_RUNNING 3315 is_running = CF_RUNNING
3124 is_new = CF_NEW 3316 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3317 is_destroyed = CF_DESTROYED
3318 is_suspended = CF_SUSPENDED
3126 CODE: 3319 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3321 OUTPUT:
3129 RETVAL 3322 RETVAL
3130 3323
3131void 3324void
3132throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
3133 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
3134 CODE: 3327 CODE:
3135{ 3328{
3136 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3332 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3140} 3334}
3141 3335
3142void 3336void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3144 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3389 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3390
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3391 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3392 }
3199 3393
3394void
3395cancel (Coro::State self)
3396 CODE:
3397 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399
3400
3401SV *
3402enable_times (int enabled = enable_times)
3403 CODE:
3404{
3405 RETVAL = boolSV (enable_times);
3406
3407 if (enabled != enable_times)
3408 {
3409 enable_times = enabled;
3410
3411 coro_times_update ();
3412 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3413 }
3414}
3415 OUTPUT:
3416 RETVAL
3417
3418void
3419times (Coro::State self)
3420 PPCODE:
3421{
3422 struct coro *current = SvSTATE (coro_current);
3423
3424 if (expect_false (current == self))
3425 {
3426 coro_times_update ();
3427 coro_times_add (SvSTATE (coro_current));
3428 }
3429
3430 EXTEND (SP, 2);
3431 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3432 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3433
3434 if (expect_false (current == self))
3435 coro_times_sub (SvSTATE (coro_current));
3436}
3437
3438void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3440 CODE:
3441{
3442 struct coro *current = SvSTATE_current;
3443
3444 if (current == coro)
3445 SWAP_SVS (current);
3446
3447 if (!coro->swap_sv)
3448 coro->swap_sv = newAV ();
3449
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3451 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3452
3453 if (current == coro)
3454 SWAP_SVS (current);
3455}
3456
3200 3457
3201MODULE = Coro::State PACKAGE = Coro 3458MODULE = Coro::State PACKAGE = Coro
3202 3459
3203BOOT: 3460BOOT:
3204{ 3461{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3463 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3464 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3465 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3466 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216 3471
3217 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3472 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); 3473 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); 3474 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); 3475 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3221 3476
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3477 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3478
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3479 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3480 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3481 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3482 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3483 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3484 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 3485
3234 { 3486 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3487 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3488
3237 coroapi.schedule = api_schedule; 3489 coroapi.schedule = api_schedule;
3247 sv_setiv (sv, (IV)&coroapi); 3499 sv_setiv (sv, (IV)&coroapi);
3248 SvREADONLY_on (sv); 3500 SvREADONLY_on (sv);
3249 } 3501 }
3250} 3502}
3251 3503
3504SV *
3505async (...)
3506 PROTOTYPE: &@
3507 CODE:
3508 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3509 api_ready (aTHX_ RETVAL);
3510 OUTPUT:
3511 RETVAL
3512
3252void 3513void
3253terminate (...) 3514terminate (...)
3254 CODE: 3515 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3516 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256 3517
3276 3537
3277void 3538void
3278cede_notself (...) 3539cede_notself (...)
3279 CODE: 3540 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3541 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 3542
3288void 3543void
3289_set_current (SV *current) 3544_set_current (SV *current)
3290 PROTOTYPE: $ 3545 PROTOTYPE: $
3291 CODE: 3546 CODE:
3295void 3550void
3296_set_readyhook (SV *hook) 3551_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3552 PROTOTYPE: $
3298 CODE: 3553 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3554 SvREFCNT_dec (coro_readyhook);
3555 SvGETMAGIC (hook);
3556 if (SvOK (hook))
3557 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3558 coro_readyhook = newSVsv (hook);
3559 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3560 }
3561 else
3562 {
3563 coro_readyhook = 0;
3564 CORO_READYHOOK = 0;
3565 }
3301 3566
3302int 3567int
3303prio (Coro::State coro, int newprio = 0) 3568prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3569 PROTOTYPE: $;$
3305 ALIAS: 3570 ALIAS:
3311 if (items > 1) 3576 if (items > 1)
3312 { 3577 {
3313 if (ix) 3578 if (ix)
3314 newprio = coro->prio - newprio; 3579 newprio = coro->prio - newprio;
3315 3580
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3581 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3582 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3583
3319 coro->prio = newprio; 3584 coro->prio = newprio;
3320 } 3585 }
3321} 3586}
3322 OUTPUT: 3587 OUTPUT:
3337 RETVAL = coro_nready; 3602 RETVAL = coro_nready;
3338 OUTPUT: 3603 OUTPUT:
3339 RETVAL 3604 RETVAL
3340 3605
3341void 3606void
3607suspend (Coro::State self)
3608 PROTOTYPE: $
3609 CODE:
3610 self->flags |= CF_SUSPENDED;
3611
3612void
3613resume (Coro::State self)
3614 PROTOTYPE: $
3615 CODE:
3616 self->flags &= ~CF_SUSPENDED;
3617
3618void
3342_pool_handler (...) 3619_pool_handler (...)
3343 CODE: 3620 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3621 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3345 3622
3346void 3623void
3357 for (i = 1; i < items; ++i) 3634 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i))); 3635 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359 3636
3360 if ((SV *)hv == &PL_sv_undef) 3637 if ((SV *)hv == &PL_sv_undef)
3361 { 3638 {
3362 PUSHMARK (SP); 3639 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)); 3640 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3641 SvREFCNT_dec (sv);
3371 } 3642 }
3372 3643
3373 { 3644 {
3374 struct coro *coro = SvSTATE_hv (hv); 3645 struct coro *coro = SvSTATE_hv (hv);
3375 3646
3409 CODE: 3680 CODE:
3410{ 3681{
3411 struct coro *coro = SvSTATE_current; 3682 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3683 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 3684
3414 block = (SV *)coro_sv_2cv (block); 3685 block = s_get_cv_croak (block);
3415 3686
3416 if (!*avp) 3687 if (!*avp)
3417 *avp = newAV (); 3688 *avp = newAV ();
3418 3689
3419 av_push (*avp, SvREFCNT_inc (block)); 3690 av_push (*avp, SvREFCNT_inc (block));
3420 3691
3421 if (!ix) 3692 if (!ix)
3422 on_enterleave_call (aTHX_ block); 3693 on_enterleave_call (aTHX_ block);
3423 3694
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3695 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); 3696 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 */ 3697 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 3698}
3428 3699
3429 3700
3430MODULE = Coro::State PACKAGE = PerlIO::cede 3701MODULE = Coro::State PACKAGE = PerlIO::cede
3431 3702
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 3707MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 3708
3438SV * 3709SV *
3439new (SV *klass, SV *count = 0) 3710new (SV *klass, SV *count = 0)
3440 CODE: 3711 CODE:
3712{
3713 int semcnt = 1;
3714
3715 if (count)
3716 {
3717 SvGETMAGIC (count);
3718
3719 if (SvOK (count))
3720 semcnt = SvIV (count);
3721 }
3722
3441 RETVAL = sv_bless ( 3723 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3724 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 3725 GvSTASH (CvGV (cv))
3444 ); 3726 );
3727}
3445 OUTPUT: 3728 OUTPUT:
3446 RETVAL 3729 RETVAL
3447 3730
3448# helper for Coro::Channel 3731# helper for Coro::Channel and others
3449SV * 3732SV *
3450_alloc (int count) 3733_alloc (int count)
3451 CODE: 3734 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 3735 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 3736 OUTPUT:
3511 for (i = 1; i <= wcount; ++i) 3794 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3795 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 3796 }
3514} 3797}
3515 3798
3799MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3800
3801void
3802_may_delete (SV *sem, int count, int extra_refs)
3803 PPCODE:
3804{
3805 AV *av = (AV *)SvRV (sem);
3806
3807 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3808 && AvFILLp (av) == 0 /* no waiters, just count */
3809 && SvIV (AvARRAY (av)[0]) == count)
3810 XSRETURN_YES;
3811
3812 XSRETURN_NO;
3813}
3814
3516MODULE = Coro::State PACKAGE = Coro::Signal 3815MODULE = Coro::State PACKAGE = Coro::Signal
3517 3816
3518SV * 3817SV *
3519new (SV *klass) 3818new (SV *klass)
3520 CODE: 3819 CODE:
3591 3890
3592void 3891void
3593_register (char *target, char *proto, SV *req) 3892_register (char *target, char *proto, SV *req)
3594 CODE: 3893 CODE:
3595{ 3894{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 3895 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 3896 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3897 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 3898 sv_setpv ((SV *)slf_cv, proto);
3600 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3899 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3601} 3900}
3602 3901
3902MODULE = Coro::State PACKAGE = Coro::Select
3903
3904void
3905patch_pp_sselect ()
3906 CODE:
3907 if (!coro_old_pp_sselect)
3908 {
3909 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3910 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3911 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3912 }
3913
3914void
3915unpatch_pp_sselect ()
3916 CODE:
3917 if (coro_old_pp_sselect)
3918 {
3919 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3920 coro_old_pp_sselect = 0;
3921 }
3922

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines