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.352 by root, Sat Jun 20 08:58:50 2009 UTC vs.
Revision 1.393 by root, Fri Apr 29 17:38:56 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 {
229 int valgrind_id; 196 int valgrind_id;
230#endif 197#endif
231 unsigned char flags; 198 unsigned char flags;
232} coro_cctx; 199} coro_cctx;
233 200
234coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
235 202
236/*****************************************************************************/ 203/*****************************************************************************/
237 204
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 */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 212};
245 213
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 215typedef struct
248{ 216{
274 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
280 248
281 /* statistics */ 249 /* statistics */
282 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
283 251
284 /* coro process data */ 252 /* coro process data */
293 261
294 /* on_enter/on_leave */ 262 /* on_enter/on_leave */
295 AV *on_enter; 263 AV *on_enter;
296 AV *on_leave; 264 AV *on_leave;
297 265
266 /* swap_sv */
267 AV *swap_sv;
268
269 /* times */
270 coro_ts t_cpu, t_real;
271
298 /* linked list */ 272 /* linked list */
299 struct coro *next, *prev; 273 struct coro *next, *prev;
300}; 274};
301 275
302typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
304 278
305/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
309 283
310/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
311 285
312#define PRIO_MAX 3 286#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 287#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 288#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 289#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 290#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 291#define CORO_PRIO_MIN -4
318 292
319/* for Coro.pm */ 293/* for Coro.pm */
320static SV *coro_current; 294static SV *coro_current;
321static SV *coro_readyhook; 295static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 298static struct coro *coro_first;
325#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
326 372
327/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
328 374
329static SV * 375static SV *
330coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
354 get_hv (name, create); 400 get_hv (name, create);
355#endif 401#endif
356 return get_hv (name, create); 402 return get_hv (name, create);
357} 403}
358 404
359/* may croak */ 405INLINE void
360INLINE CV * 406coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 407{
363 HV *st; 408#ifdef coro_clock_gettime
364 GV *gvp; 409 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 410
367 if (!cv) 411 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 412 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
413 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 414
370 return cv; 415 ts.tv_sec = ts.tv_nsec = 0;
416 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
417 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
418#else
419 dTHX;
420 UV tv[2];
421
422 u2time (aTHX_ tv);
423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000;
425#endif
426}
427
428INLINE void
429coro_times_add (struct coro *c)
430{
431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0];
434
435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0];
438}
439
440INLINE void
441coro_times_sub (struct coro *c)
442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0];
446
447 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
448 c->t_cpu [1] -= time_cpu [1];
449 c->t_cpu [0] -= time_cpu [0];
371} 450}
372 451
373/*****************************************************************************/ 452/*****************************************************************************/
374/* magic glue */ 453/* magic glue */
375 454
475static int 554static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 556{
478 AV *padlist; 557 AV *padlist;
479 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
480 563
481 /* casting is fun. */ 564 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
484 567
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 617}
535 618
536/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
537 620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
538static void 672static void
539on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
540 674
541static void 675static void
542load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
573 } 707 }
574 708
575 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 710 CORO_THROW = c->except;
577 711
712 if (expect_false (enable_times))
713 {
714 if (expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
578 if (expect_false (c->on_enter)) 720 if (expect_false (c->on_enter))
579 { 721 {
580 int i; 722 int i;
581 723
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 726 }
727
728 SWAP_SVS (c);
585} 729}
586 730
587static void 731static void
588save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
589{ 733{
734 SWAP_SVS (c);
735
590 if (expect_false (c->on_leave)) 736 if (expect_false (c->on_leave))
591 { 737 {
592 int i; 738 int i;
593 739
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
596 } 750 }
597 751
598 c->except = CORO_THROW; 752 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
600 754
615 { 769 {
616 while (expect_true (cxix >= 0)) 770 while (expect_true (cxix >= 0))
617 { 771 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
619 773
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 775 {
622 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
623 777
624 if (expect_true (CvDEPTH (cv))) 778 if (expect_true (CvDEPTH (cv)))
625 { 779 {
649 /* we manually unroll here, as usually 2 slots is enough */ 803 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 804 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 805 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 806 if (SLOT_COUNT >= 3) CXINC;
653 { 807 {
654 int i; 808 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 809 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 810 CXINC;
657 } 811 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 812 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 813
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1048{
895 return 1; 1049 return 1;
896} 1050}
897 1051
898static UNOP coro_setup_op; 1052static UNOP init_perl_op;
899 1053
900static 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 */
901coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
902{ 1056{
903 /* 1057 /*
904 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
905 */ 1059 */
906 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
913 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1069 PL_curpm = 0;
916 PL_curpad = 0; 1070 PL_curpad = 0;
917 PL_localizing = 0; 1071 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1072 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1074 PL_parser = 0;
922#endif 1075#endif
923 PL_hints = 0; 1076 PL_hints = 0;
955 */ 1108 */
956 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 */
957 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 */
958 1111
959 /* 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 */
960 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
963 /* 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 */
964 1117
965 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
966 1119
967 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
968 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 }
969} 1130}
970 1131
971static void 1132static void
972coro_unwind_stacks (pTHX) 1133coro_unwind_stacks (pTHX)
973{ 1134{
988 dounwind (-1); 1149 dounwind (-1);
989 } 1150 }
990} 1151}
991 1152
992static void 1153static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
994{ 1155{
995 SV *svf [9]; 1156 SV *svf [9];
996 1157
997 { 1158 {
998 struct coro *current = SvSTATE_current; 1159 struct coro *current = SvSTATE_current;
1002 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro); 1164 load_perl (aTHX_ coro);
1004 1165
1005 coro_unwind_stacks (aTHX); 1166 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX); 1167 coro_destruct_stacks (aTHX);
1168
1169 /* restore swapped sv's */
1170 SWAP_SVS (coro);
1007 1171
1008 // now save some sv's to be free'd later 1172 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv); 1173 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1174 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv); 1175 svf [2] = GvSV (PL_errgv);
1019 1183
1020 load_perl (aTHX_ current); 1184 load_perl (aTHX_ current);
1021 } 1185 }
1022 1186
1023 { 1187 {
1024 int i; 1188 unsigned int i;
1025 1189
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1190 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1191 SvREFCNT_dec (svf [i]);
1028 1192
1029 SvREFCNT_dec (coro->saved_deffh); 1193 SvREFCNT_dec (coro->saved_deffh);
1235 /* somebody or something will hit me for both perl_run and PL_restartop */ 1399 /* somebody or something will hit me for both perl_run and PL_restartop */
1236 PL_restartop = PL_op; 1400 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1401 perl_run (PL_curinterp);
1238 /* 1402 /*
1239 * Unfortunately, there is no way to get at the return values of the 1403 * Unfortunately, there is no way to get at the return values of the
1240 * coro body here, as perl_run destroys these 1404 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1405 * runtime errors here, as this is just a random interpreter, not a thread.
1241 */ 1406 */
1242 1407
1243 /* 1408 /*
1244 * If perl-run returns we assume exit() was being called or the coro 1409 * If perl-run returns we assume exit() was being called or the coro
1245 * fell off the end, which seems to be the only valid (non-bug) 1410 * fell off the end, which seems to be the only valid (non-bug)
1332cctx_destroy (coro_cctx *cctx) 1497cctx_destroy (coro_cctx *cctx)
1333{ 1498{
1334 if (!cctx) 1499 if (!cctx)
1335 return; 1500 return;
1336 1501
1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1338 1503
1339 --cctx_count; 1504 --cctx_count;
1340 coro_destroy (&cctx->cctx); 1505 coro_destroy (&cctx->cctx);
1341 1506
1342 /* coro_transfer creates new, empty cctx's */ 1507 /* coro_transfer creates new, empty cctx's */
1452 if (expect_false (next->flags & CF_NEW)) 1617 if (expect_false (next->flags & CF_NEW))
1453 { 1618 {
1454 /* need to start coroutine */ 1619 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1620 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1621 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1622 init_perl (aTHX_ next);
1458 } 1623 }
1459 else 1624 else
1460 load_perl (aTHX_ next); 1625 load_perl (aTHX_ next);
1461 1626
1462 /* possibly untie and reuse the cctx */ 1627 /* possibly untie and reuse the cctx */
1510 return 0; 1675 return 0;
1511 1676
1512 if (coro->on_destroy && !PL_dirty) 1677 if (coro->on_destroy && !PL_dirty)
1513 coro->on_destroy (aTHX_ coro); 1678 coro->on_destroy (aTHX_ coro);
1514 1679
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1515 coro->flags |= CF_DESTROYED; 1688 coro->flags |= CF_DESTROYED;
1516 1689
1517 if (coro->flags & CF_READY) 1690 if (coro->flags & CF_READY)
1518 { 1691 {
1519 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1692 /* reduce nready, as destroying a ready coro effectively unreadies it */
1525 1698
1526 if (coro->mainstack 1699 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1700 && coro->mainstack != main_mainstack
1528 && coro->slot 1701 && coro->slot
1529 && !PL_dirty) 1702 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1703 destroy_perl (aTHX_ coro);
1704
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1531 1708
1532 cctx_destroy (coro->cctx); 1709 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1710 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1711 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1713 SvREFCNT_dec (CORO_THROW);
1536
1537 if (coro->next) coro->next->prev = coro->prev;
1538 if (coro->prev) coro->prev->next = coro->next;
1539 if (coro == coro_first) coro_first = coro->next;
1540 1714
1541 return 1; 1715 return 1;
1542} 1716}
1543 1717
1544static int 1718static int
1594 1768
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1769 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1770 TRANSFER (ta, 1);
1597} 1771}
1598 1772
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1773/** Coro ********************************************************************/
1623 1774
1624INLINE void 1775INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1776coro_enq (pTHX_ struct coro *coro)
1626{ 1777{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1779
1629 SvREFCNT_inc_NN (coro->hv); 1780 SvREFCNT_inc_NN (coro->hv);
1630 1781
1631 coro->next_ready = 0; 1782 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1636INLINE struct coro * 1787INLINE struct coro *
1637coro_deq (pTHX) 1788coro_deq (pTHX)
1638{ 1789{
1639 int prio; 1790 int prio;
1640 1791
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1793 {
1643 struct coro **ready = coro_ready [prio]; 1794 struct coro **ready = coro_ready [prio];
1644 1795
1645 if (ready [0]) 1796 if (ready [0])
1646 { 1797 {
1651 } 1802 }
1652 1803
1653 return 0; 1804 return 0;
1654} 1805}
1655 1806
1807static void
1808invoke_sv_ready_hook_helper (void)
1809{
1810 dTHX;
1811 dSP;
1812
1813 ENTER;
1814 SAVETMPS;
1815
1816 PUSHMARK (SP);
1817 PUTBACK;
1818 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1819
1820 FREETMPS;
1821 LEAVE;
1822}
1823
1656static int 1824static int
1657api_ready (pTHX_ SV *coro_sv) 1825api_ready (pTHX_ SV *coro_sv)
1658{ 1826{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1827 struct coro *coro = SvSTATE (coro_sv);
1664 1828
1665 if (coro->flags & CF_READY) 1829 if (coro->flags & CF_READY)
1666 return 0; 1830 return 0;
1667 1831
1668 coro->flags |= CF_READY; 1832 coro->flags |= CF_READY;
1669 1833
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1834 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1835
1676 if (sv_hook) 1836 if (!coro_nready++)
1677 { 1837 if (coroapi.readyhook)
1678 dSP; 1838 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1839
1694 return 1; 1840 return 1;
1695} 1841}
1696 1842
1697static int 1843static int
1742 { 1888 {
1743 /* nothing to schedule: call the idle handler */ 1889 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle) 1890 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle))) 1891 && SvOBJECT (SvRV (sv_idle)))
1746 { 1892 {
1893 if (SvRV (sv_idle) == SvRV (coro_current))
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1895
1747 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1748 api_ready (aTHX_ SvRV (sv_idle)); 1897 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1898 --coro_nready;
1750 } 1899 }
1751 else 1900 else
1752 { 1901 {
1902 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1903 dSP;
1754 1904
1755 ENTER; 1905 ENTER;
1756 SAVETMPS; 1906 SAVETMPS;
1757 1907
1867 2017
1868static void 2018static void
1869coro_call_on_destroy (pTHX_ struct coro *coro) 2019coro_call_on_destroy (pTHX_ struct coro *coro)
1870{ 2020{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873 2022
1874 if (on_destroyp) 2023 if (on_destroyp)
1875 { 2024 {
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1877 2028
1878 while (AvFILLp (on_destroy) >= 0) 2029 while (AvFILLp (on_destroy) >= 0)
1879 { 2030 {
1880 dSP; /* don't disturb outer sp */ 2031 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy); 2032 SV *cb = av_pop (on_destroy);
1883 PUSHMARK (SP); 2034 PUSHMARK (SP);
1884 2035
1885 if (statusp) 2036 if (statusp)
1886 { 2037 {
1887 int i; 2038 int i;
1888 AV *status = (AV *)SvRV (*statusp);
1889 EXTEND (SP, AvFILLp (status) + 1); 2039 EXTEND (SP, AvFILLp (status) + 1);
1890 2040
1891 for (i = 0; i <= AvFILLp (status); ++i) 2041 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]); 2042 PUSHs (AvARRAY (status)[i]);
1893 } 2043 }
1897 } 2047 }
1898 } 2048 }
1899} 2049}
1900 2050
1901static void 2051static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2052coro_set_status (HV *coro_hv, SV **arg, int items)
1903{ 2053{
1904 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV (); 2054 AV *av = newAV ();
1907 2055
2056 /* items are actually not so common, so optimise for this case */
2057 if (items)
2058 {
2059 int i;
2060
1908 av_extend (av, items - 1); 2061 av_extend (av, items - 1);
2062
1909 for (i = 0; i < items; ++i) 2063 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 2064 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 }
1911 2066
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068}
1913 2069
2070static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2073 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager); 2074 api_ready (aTHX_ sv_manager);
1916 2075
1917 frame->prepare = prepare_schedule; 2076 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat; 2077 frame->check = slf_check_repeat;
1919 2078
1920 /* as a minor optimisation, we could unwind all stacks here */ 2079 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */ 2080 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/ 2081 /*coro_unwind_stacks (aTHX);*/
2082}
2083
2084static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{
2087 HV *coro_hv = (HV *)SvRV (coro_current);
2088
2089 coro_set_status (coro_hv, arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv);
2091}
2092
2093static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{
2096 HV *coro_hv;
2097 struct coro *coro;
2098
2099 if (items <= 0)
2100 croak ("Coro::cancel called without coro object,");
2101
2102 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv;
2104
2105 coro_set_status (coro_hv, arg + 1, items - 1);
2106
2107 if (expect_false (coro->flags & CF_NOCANCEL))
2108 {
2109 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro;
2111
2112 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop;
2114 }
2115 else if (coro_hv == (HV *)SvRV (coro_current))
2116 {
2117 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv);
2119 }
2120 else
2121 {
2122 struct coro *self = SvSTATE_current;
2123
2124 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working...
2129 */
2130 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL;
2137
2138 if (slf_frame.data)
2139 {
2140 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv);
2142 }
2143 else
2144 {
2145 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop;
2147 }
2148 }
1923} 2149}
1924 2150
1925/*****************************************************************************/ 2151/*****************************************************************************/
1926/* async pool handler */ 2152/* async pool handler */
1927 2153
2005 2231
2006static void 2232static void
2007coro_rouse_callback (pTHX_ CV *cv) 2233coro_rouse_callback (pTHX_ CV *cv)
2008{ 2234{
2009 dXSARGS; 2235 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2236 SV *data = (SV *)S_GENSUB_ARG;
2011 2237
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2238 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2239 {
2014 /* first call, set args */ 2240 /* first call, set args */
2015 SV *coro = SvRV (data); 2241 SV *coro = SvRV (data);
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2307 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2308 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2309 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2310
2085 { 2311 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2312 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2313 SV *data = (SV *)S_GENSUB_ARG;
2088 2314
2089 frame->data = (void *)data; 2315 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2316 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2317 frame->check = slf_check_rouse_wait;
2092 } 2318 }
2096coro_new_rouse_cb (pTHX) 2322coro_new_rouse_cb (pTHX)
2097{ 2323{
2098 HV *hv = (HV *)SvRV (coro_current); 2324 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2325 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2326 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2327 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2328
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2329 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2330 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2331
2106 SvREFCNT_dec (coro->rouse_cb); 2332 SvREFCNT_dec (coro->rouse_cb);
2331 if (PL_op->op_flags & OPf_STACKED) 2557 if (PL_op->op_flags & OPf_STACKED)
2332 { 2558 {
2333 if (items > slf_arga) 2559 if (items > slf_arga)
2334 { 2560 {
2335 slf_arga = items; 2561 slf_arga = items;
2336 free (slf_argv); 2562 Safefree (slf_argv);
2337 slf_argv = malloc (slf_arga * sizeof (SV *)); 2563 New (0, slf_argv, slf_arga, SV *);
2338 } 2564 }
2339 2565
2340 slf_argc = items; 2566 slf_argc = items;
2341 2567
2342 for (i = 0; i < items; ++i) 2568 for (i = 0; i < items; ++i)
2477/* Coro::Semaphore & Coro::Signal */ 2703/* Coro::Semaphore & Coro::Signal */
2478 2704
2479static SV * 2705static SV *
2480coro_waitarray_new (pTHX_ int count) 2706coro_waitarray_new (pTHX_ int count)
2481{ 2707{
2482 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2708 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2483 AV *av = newAV (); 2709 AV *av = newAV ();
2484 SV **ary; 2710 SV **ary;
2485 2711
2486 /* unfortunately, building manually saves memory */ 2712 /* unfortunately, building manually saves memory */
2487 Newx (ary, 2, SV *); 2713 Newx (ary, 2, SV *);
2629{ 2855{
2630 if (items >= 2) 2856 if (items >= 2)
2631 { 2857 {
2632 /* callback form */ 2858 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 2859 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2860 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 2861
2636 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2862 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 2863
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 2864 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 2865 coro_semaphore_adjust (aTHX_ av, 0);
2640 2866
2641 frame->prepare = prepare_nop; 2867 frame->prepare = prepare_nop;
2665 AvARRAY (av)[0] = AvARRAY (av)[1]; 2891 AvARRAY (av)[0] = AvARRAY (av)[1];
2666 AvARRAY (av)[1] = cb; 2892 AvARRAY (av)[1] = cb;
2667 2893
2668 cb = av_shift (av); 2894 cb = av_shift (av);
2669 2895
2896 if (SvTYPE (cb) == SVt_PVCV)
2897 {
2898 dSP;
2899 PUSHMARK (SP);
2900 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2901 PUTBACK;
2902 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2903 }
2904 else
2905 {
2670 api_ready (aTHX_ cb); 2906 api_ready (aTHX_ cb);
2671 sv_setiv (cb, 0); /* signal waiter */ 2907 sv_setiv (cb, 0); /* signal waiter */
2908 }
2909
2672 SvREFCNT_dec (cb); 2910 SvREFCNT_dec (cb);
2673 2911
2674 --count; 2912 --count;
2675 } 2913 }
2676} 2914}
2685static void 2923static void
2686slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2924slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2687{ 2925{
2688 AV *av = (AV *)SvRV (arg [0]); 2926 AV *av = (AV *)SvRV (arg [0]);
2689 2927
2928 if (items >= 2)
2929 {
2930 SV *cb_cv = s_get_cv_croak (arg [1]);
2931 av_push (av, SvREFCNT_inc_NN (cb_cv));
2932
2690 if (SvIVX (AvARRAY (av)[0])) 2933 if (SvIVX (AvARRAY (av)[0]))
2934 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2935
2936 frame->prepare = prepare_nop;
2937 frame->check = slf_check_nop;
2938 }
2939 else if (SvIVX (AvARRAY (av)[0]))
2691 { 2940 {
2692 SvIVX (AvARRAY (av)[0]) = 0; 2941 SvIVX (AvARRAY (av)[0]) = 0;
2693 frame->prepare = prepare_nop; 2942 frame->prepare = prepare_nop;
2694 frame->check = slf_check_nop; 2943 frame->check = slf_check_nop;
2695 } 2944 }
2696 else 2945 else
2697 { 2946 {
2698 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2947 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2699 2948
2700 av_push (av, waiter); 2949 av_push (av, waiter);
2701 2950
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2951 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2703 frame->prepare = prepare_schedule; 2952 frame->prepare = prepare_schedule;
2721 2970
2722static void 2971static void
2723coro_aio_callback (pTHX_ CV *cv) 2972coro_aio_callback (pTHX_ CV *cv)
2724{ 2973{
2725 dXSARGS; 2974 dXSARGS;
2726 AV *state = (AV *)GENSUB_ARG; 2975 AV *state = (AV *)S_GENSUB_ARG;
2727 SV *coro = av_pop (state); 2976 SV *coro = av_pop (state);
2728 SV *data_sv = newSV (sizeof (struct io_state)); 2977 SV *data_sv = newSV (sizeof (struct io_state));
2729 2978
2730 av_extend (state, items - 1); 2979 av_extend (state, items - 1);
2731 2980
2845 3094
2846 for (i = 0; i < items; ++i) 3095 for (i = 0; i < items; ++i)
2847 PUSHs (arg [i]); 3096 PUSHs (arg [i]);
2848 3097
2849 /* now push the callback closure */ 3098 /* now push the callback closure */
2850 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3099 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2851 3100
2852 /* now call the AIO function - we assume our request is uncancelable */ 3101 /* now call the AIO function - we assume our request is uncancelable */
2853 PUTBACK; 3102 PUTBACK;
2854 call_sv ((SV *)req, G_VOID | G_DISCARD); 3103 call_sv ((SV *)req, G_VOID | G_DISCARD);
2855 } 3104 }
2856 3105
2857 /* now that the requets is going, we loop toll we have a result */ 3106 /* now that the request is going, we loop till we have a result */
2858 frame->data = (void *)state; 3107 frame->data = (void *)state;
2859 frame->prepare = prepare_schedule; 3108 frame->prepare = prepare_schedule;
2860 frame->check = slf_check_aio_req; 3109 frame->check = slf_check_aio_req;
2861} 3110}
2862 3111
2873/*****************************************************************************/ 3122/*****************************************************************************/
2874 3123
2875#if CORO_CLONE 3124#if CORO_CLONE
2876# include "clone.c" 3125# include "clone.c"
2877#endif 3126#endif
3127
3128/*****************************************************************************/
3129
3130static SV *
3131coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3132{
3133 SV *coro_sv;
3134 struct coro *coro;
3135 MAGIC *mg;
3136 HV *hv;
3137 SV *cb;
3138 int i;
3139
3140 if (argc > 0)
3141 {
3142 cb = s_get_cv_croak (argv [0]);
3143
3144 if (!is_coro)
3145 {
3146 if (CvISXSUB (cb))
3147 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3148
3149 if (!CvROOT (cb))
3150 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3151 }
3152 }
3153
3154 Newz (0, coro, 1, struct coro);
3155 coro->args = newAV ();
3156 coro->flags = CF_NEW;
3157
3158 if (coro_first) coro_first->prev = coro;
3159 coro->next = coro_first;
3160 coro_first = coro;
3161
3162 coro->hv = hv = newHV ();
3163 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3164 mg->mg_flags |= MGf_DUP;
3165 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3166
3167 if (argc > 0)
3168 {
3169 av_extend (coro->args, argc + is_coro - 1);
3170
3171 if (is_coro)
3172 {
3173 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3174 cb = (SV *)cv_coro_run;
3175 }
3176
3177 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3178
3179 for (i = 1; i < argc; i++)
3180 av_push (coro->args, newSVsv (argv [i]));
3181 }
3182
3183 return coro_sv;
3184}
2878 3185
2879MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2880 3187
2881PROTOTYPES: DISABLE 3188PROTOTYPES: DISABLE
2882 3189
2935 coroapi.prepare_nop = prepare_nop; 3242 coroapi.prepare_nop = prepare_nop;
2936 coroapi.prepare_schedule = prepare_schedule; 3243 coroapi.prepare_schedule = prepare_schedule;
2937 coroapi.prepare_cede = prepare_cede; 3244 coroapi.prepare_cede = prepare_cede;
2938 coroapi.prepare_cede_notself = prepare_cede_notself; 3245 coroapi.prepare_cede_notself = prepare_cede_notself;
2939 3246
2940 { 3247 time_init (aTHX);
2941 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2942 3248
2943 if (!svp) croak ("Time::HiRes is required");
2944 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2945
2946 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2947 }
2948
2949 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2950} 3250}
2951 3251
2952SV * 3252SV *
2953new (char *klass, ...) 3253new (SV *klass, ...)
2954 ALIAS: 3254 ALIAS:
2955 Coro::new = 1 3255 Coro::new = 1
2956 CODE: 3256 CODE:
2957{ 3257 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2958 struct coro *coro; 3258 OUTPUT:
2959 MAGIC *mg;
2960 HV *hv;
2961 CV *cb;
2962 int i;
2963
2964 if (items > 1)
2965 {
2966 cb = coro_sv_2cv (aTHX_ ST (1));
2967
2968 if (!ix)
2969 {
2970 if (CvISXSUB (cb))
2971 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2972
2973 if (!CvROOT (cb))
2974 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2975 }
2976 }
2977
2978 Newz (0, coro, 1, struct coro);
2979 coro->args = newAV ();
2980 coro->flags = CF_NEW;
2981
2982 if (coro_first) coro_first->prev = coro;
2983 coro->next = coro_first;
2984 coro_first = coro;
2985
2986 coro->hv = hv = newHV ();
2987 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2988 mg->mg_flags |= MGf_DUP;
2989 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2990
2991 if (items > 1)
2992 {
2993 av_extend (coro->args, items - 1 + ix - 1);
2994
2995 if (ix)
2996 {
2997 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2998 cb = cv_coro_run;
2999 }
3000
3001 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3002
3003 for (i = 2; i < items; i++)
3004 av_push (coro->args, newSVsv (ST (i)));
3005 }
3006}
3007 OUTPUT:
3008 RETVAL 3259 RETVAL
3009 3260
3010void 3261void
3011transfer (...) 3262transfer (...)
3012 PROTOTYPE: $$ 3263 PROTOTYPE: $$
3013 CODE: 3264 CODE:
3014 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3265 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3015
3016bool
3017_destroy (SV *coro_sv)
3018 CODE:
3019 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3020 OUTPUT:
3021 RETVAL
3022 3266
3023void 3267void
3024_exit (int code) 3268_exit (int code)
3025 PROTOTYPE: $ 3269 PROTOTYPE: $
3026 CODE: 3270 CODE:
3102 CODE: 3346 CODE:
3103{ 3347{
3104 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3348 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3105 { 3349 {
3106 struct coro *current = SvSTATE_current; 3350 struct coro *current = SvSTATE_current;
3351 struct CoroSLF slf_save;
3107 3352
3108 if (current != coro) 3353 if (current != coro)
3109 { 3354 {
3110 PUTBACK; 3355 PUTBACK;
3111 save_perl (aTHX_ current); 3356 save_perl (aTHX_ current);
3112 load_perl (aTHX_ coro); 3357 load_perl (aTHX_ coro);
3358 /* the coro is most likely in an active SLF call.
3359 * while not strictly required (the code we execute is
3360 * not allowed to call any SLF functions), it's cleaner
3361 * to reinitialise the slf_frame and restore it later.
3362 * This might one day allow us to actually do SLF calls
3363 * from code executed here.
3364 */
3365 slf_save = slf_frame;
3366 slf_frame.prepare = 0;
3113 SPAGAIN; 3367 SPAGAIN;
3114 } 3368 }
3115 3369
3116 PUSHSTACK; 3370 PUSHSTACK;
3117 3371
3127 SPAGAIN; 3381 SPAGAIN;
3128 3382
3129 if (current != coro) 3383 if (current != coro)
3130 { 3384 {
3131 PUTBACK; 3385 PUTBACK;
3386 slf_frame = slf_save;
3132 save_perl (aTHX_ coro); 3387 save_perl (aTHX_ coro);
3133 load_perl (aTHX_ current); 3388 load_perl (aTHX_ current);
3134 SPAGAIN; 3389 SPAGAIN;
3135 } 3390 }
3136 } 3391 }
3149 RETVAL = boolSV (coro->flags & ix); 3404 RETVAL = boolSV (coro->flags & ix);
3150 OUTPUT: 3405 OUTPUT:
3151 RETVAL 3406 RETVAL
3152 3407
3153void 3408void
3154throw (Coro::State self, SV *throw = &PL_sv_undef) 3409throw (Coro::State self, SV *exception = &PL_sv_undef)
3155 PROTOTYPE: $;$ 3410 PROTOTYPE: $;$
3156 CODE: 3411 CODE:
3157{ 3412{
3158 struct coro *current = SvSTATE_current; 3413 struct coro *current = SvSTATE_current;
3159 SV **throwp = self == current ? &CORO_THROW : &self->except; 3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3160 SvREFCNT_dec (*throwp); 3415 SvREFCNT_dec (*exceptionp);
3161 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3416 SvGETMAGIC (exception);
3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3162} 3418}
3163 3419
3164void 3420void
3165api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3166 PROTOTYPE: $;$ 3422 PROTOTYPE: $;$
3221 3477
3222void 3478void
3223cancel (Coro::State self) 3479cancel (Coro::State self)
3224 CODE: 3480 CODE:
3225 coro_state_destroy (aTHX_ self); 3481 coro_state_destroy (aTHX_ self);
3226 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3482
3483SV *
3484enable_times (int enabled = enable_times)
3485 CODE:
3486{
3487 RETVAL = boolSV (enable_times);
3488
3489 if (enabled != enable_times)
3490 {
3491 enable_times = enabled;
3492
3493 coro_times_update ();
3494 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3495 }
3496}
3497 OUTPUT:
3498 RETVAL
3499
3500void
3501times (Coro::State self)
3502 PPCODE:
3503{
3504 struct coro *current = SvSTATE (coro_current);
3505
3506 if (expect_false (current == self))
3507 {
3508 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current));
3510 }
3511
3512 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515
3516 if (expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current));
3518}
3519
3520void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3522 CODE:
3523{
3524 struct coro *current = SvSTATE_current;
3525
3526 if (current == coro)
3527 SWAP_SVS (current);
3528
3529 if (!coro->swap_sv)
3530 coro->swap_sv = newAV ();
3531
3532 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3534
3535 if (current == coro)
3536 SWAP_SVS (current);
3537}
3227 3538
3228 3539
3229MODULE = Coro::State PACKAGE = Coro 3540MODULE = Coro::State PACKAGE = Coro
3230 3541
3231BOOT: 3542BOOT:
3241 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3242 3553
3243 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3554 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3244 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3555 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3245 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3556 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3246 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3557 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3247 3558
3248 coro_stash = gv_stashpv ("Coro", TRUE); 3559 coro_stash = gv_stashpv ("Coro", TRUE);
3249 3560
3250 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3561 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3251 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3562 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3252 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3563 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3253 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3564 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3254 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3565 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3255 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3566 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3256 3567
3257 { 3568 {
3258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3569 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3259 3570
3260 coroapi.schedule = api_schedule; 3571 coroapi.schedule = api_schedule;
3270 sv_setiv (sv, (IV)&coroapi); 3581 sv_setiv (sv, (IV)&coroapi);
3271 SvREADONLY_on (sv); 3582 SvREADONLY_on (sv);
3272 } 3583 }
3273} 3584}
3274 3585
3586SV *
3587async (...)
3588 PROTOTYPE: &@
3589 CODE:
3590 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3591 api_ready (aTHX_ RETVAL);
3592 OUTPUT:
3593 RETVAL
3594
3595void
3596_destroy (Coro::State coro)
3597 CODE:
3598 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro);
3600 coro_call_on_destroy (aTHX_ coro);
3601
3275void 3602void
3276terminate (...) 3603terminate (...)
3277 CODE: 3604 CODE:
3278 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3605 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606
3607void
3608cancel (...)
3609 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3279 3611
3280void 3612void
3281schedule (...) 3613schedule (...)
3282 CODE: 3614 CODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3615 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3312void 3644void
3313_set_readyhook (SV *hook) 3645_set_readyhook (SV *hook)
3314 PROTOTYPE: $ 3646 PROTOTYPE: $
3315 CODE: 3647 CODE:
3316 SvREFCNT_dec (coro_readyhook); 3648 SvREFCNT_dec (coro_readyhook);
3649 SvGETMAGIC (hook);
3650 if (SvOK (hook))
3651 {
3317 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3652 coro_readyhook = newSVsv (hook);
3653 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3654 }
3655 else
3656 {
3657 coro_readyhook = 0;
3658 CORO_READYHOOK = 0;
3659 }
3318 3660
3319int 3661int
3320prio (Coro::State coro, int newprio = 0) 3662prio (Coro::State coro, int newprio = 0)
3321 PROTOTYPE: $;$ 3663 PROTOTYPE: $;$
3322 ALIAS: 3664 ALIAS:
3328 if (items > 1) 3670 if (items > 1)
3329 { 3671 {
3330 if (ix) 3672 if (ix)
3331 newprio = coro->prio - newprio; 3673 newprio = coro->prio - newprio;
3332 3674
3333 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3675 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3334 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3676 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3335 3677
3336 coro->prio = newprio; 3678 coro->prio = newprio;
3337 } 3679 }
3338} 3680}
3339 OUTPUT: 3681 OUTPUT:
3386 for (i = 1; i < items; ++i) 3728 for (i = 1; i < items; ++i)
3387 av_push (av, SvREFCNT_inc_NN (ST (i))); 3729 av_push (av, SvREFCNT_inc_NN (ST (i)));
3388 3730
3389 if ((SV *)hv == &PL_sv_undef) 3731 if ((SV *)hv == &PL_sv_undef)
3390 { 3732 {
3391 PUSHMARK (SP); 3733 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3392 EXTEND (SP, 2);
3393 PUSHs (sv_Coro);
3394 PUSHs ((SV *)cv_pool_handler);
3395 PUTBACK;
3396 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3397 SPAGAIN;
3398
3399 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3734 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3735 SvREFCNT_dec (sv);
3400 } 3736 }
3401 3737
3402 { 3738 {
3403 struct coro *coro = SvSTATE_hv (hv); 3739 struct coro *coro = SvSTATE_hv (hv);
3404 3740
3438 CODE: 3774 CODE:
3439{ 3775{
3440 struct coro *coro = SvSTATE_current; 3776 struct coro *coro = SvSTATE_current;
3441 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3777 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3442 3778
3443 block = (SV *)coro_sv_2cv (aTHX_ block); 3779 block = s_get_cv_croak (block);
3444 3780
3445 if (!*avp) 3781 if (!*avp)
3446 *avp = newAV (); 3782 *avp = newAV ();
3447 3783
3448 av_push (*avp, SvREFCNT_inc (block)); 3784 av_push (*avp, SvREFCNT_inc (block));
3465MODULE = Coro::State PACKAGE = Coro::Semaphore 3801MODULE = Coro::State PACKAGE = Coro::Semaphore
3466 3802
3467SV * 3803SV *
3468new (SV *klass, SV *count = 0) 3804new (SV *klass, SV *count = 0)
3469 CODE: 3805 CODE:
3806{
3807 int semcnt = 1;
3808
3809 if (count)
3810 {
3811 SvGETMAGIC (count);
3812
3813 if (SvOK (count))
3814 semcnt = SvIV (count);
3815 }
3816
3470 RETVAL = sv_bless ( 3817 RETVAL = sv_bless (
3471 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3818 coro_waitarray_new (aTHX_ semcnt),
3472 GvSTASH (CvGV (cv)) 3819 GvSTASH (CvGV (cv))
3473 ); 3820 );
3821}
3474 OUTPUT: 3822 OUTPUT:
3475 RETVAL 3823 RETVAL
3476 3824
3477# helper for Coro::Channel and others 3825# helper for Coro::Channel and others
3478SV * 3826SV *
3636 3984
3637void 3985void
3638_register (char *target, char *proto, SV *req) 3986_register (char *target, char *proto, SV *req)
3639 CODE: 3987 CODE:
3640{ 3988{
3641 CV *req_cv = coro_sv_2cv (aTHX_ req); 3989 SV *req_cv = s_get_cv_croak (req);
3642 /* newXSproto doesn't return the CV on 5.8 */ 3990 /* newXSproto doesn't return the CV on 5.8 */
3643 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3991 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3644 sv_setpv ((SV *)slf_cv, proto); 3992 sv_setpv ((SV *)slf_cv, proto);
3645 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3993 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3646} 3994}
3647 3995
3996MODULE = Coro::State PACKAGE = Coro::Select
3997
3998void
3999patch_pp_sselect ()
4000 CODE:
4001 if (!coro_old_pp_sselect)
4002 {
4003 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4004 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4005 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4006 }
4007
4008void
4009unpatch_pp_sselect ()
4010 CODE:
4011 if (coro_old_pp_sselect)
4012 {
4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4014 coro_old_pp_sselect = 0;
4015 }
4016

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines