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.350 by root, Sat Jun 20 08:58:00 2009 UTC vs.
Revision 1.391 by root, Thu Mar 31 04:24:19 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 {
… …
274 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
280 247
281 /* statistics */ 248 /* statistics */
282 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
283 250
284 /* coro process data */ 251 /* coro process data */
… …
293 260
294 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
295 AV *on_enter; 262 AV *on_enter;
296 AV *on_leave; 263 AV *on_leave;
297 264
265 /* swap_sv */
266 AV *swap_sv;
267
268 /* times */
269 coro_ts t_cpu, t_real;
270
298 /* linked list */ 271 /* linked list */
299 struct coro *next, *prev; 272 struct coro *next, *prev;
300}; 273};
301 274
302typedef struct coro *Coro__State; 275typedef struct coro *Coro__State;
… …
307/* the mainr easonw e don't support windows process emulation */ 280/* the mainr easonw e don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 281static struct CoroSLF slf_frame; /* the current slf frame */
309 282
310/** Coro ********************************************************************/ 283/** Coro ********************************************************************/
311 284
312#define PRIO_MAX 3 285#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 286#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 287#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 288#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 289#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 290#define CORO_PRIO_MIN -4
318 291
319/* for Coro.pm */ 292/* for Coro.pm */
320static SV *coro_current; 293static SV *coro_current;
321static SV *coro_readyhook; 294static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 297static struct coro *coro_first;
325#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
326 371
327/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
328 373
329static SV * 374static SV *
330coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
… …
354 get_hv (name, create); 399 get_hv (name, create);
355#endif 400#endif
356 return get_hv (name, create); 401 return get_hv (name, create);
357} 402}
358 403
359/* may croak */ 404INLINE void
360INLINE CV * 405coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 406{
363 HV *st; 407#ifdef coro_clock_gettime
364 GV *gvp; 408 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 409
367 if (!cv) 410 ts.tv_sec = ts.tv_nsec = 0;
368 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;
369 413
370 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];
371} 449}
372 450
373/*****************************************************************************/ 451/*****************************************************************************/
374/* magic glue */ 452/* magic glue */
375 453
… …
475static int 553static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 554coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 555{
478 AV *padlist; 556 AV *padlist;
479 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;
480 562
481 /* casting is fun. */ 563 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
484 566
… …
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 616}
535 617
536/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
537 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
538static void 671static void
539on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
540 673
541static void 674static void
542load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
… …
573 } 706 }
574 707
575 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 709 CORO_THROW = c->except;
577 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
578 if (expect_false (c->on_enter)) 719 if (expect_false (c->on_enter))
579 { 720 {
580 int i; 721 int i;
581 722
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 725 }
726
727 SWAP_SVS (c);
585} 728}
586 729
587static void 730static void
588save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
589{ 732{
733 SWAP_SVS (c);
734
590 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
591 { 736 {
592 int i; 737 int i;
593 738
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ 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);
596 } 749 }
597 750
598 c->except = CORO_THROW; 751 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
600 753
… …
615 { 768 {
616 while (expect_true (cxix >= 0)) 769 while (expect_true (cxix >= 0))
617 { 770 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 771 PERL_CONTEXT *cx = &ccstk[cxix--];
619 772
620 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))
621 { 774 {
622 CV *cv = cx->blk_sub.cv; 775 CV *cv = cx->blk_sub.cv;
623 776
624 if (expect_true (CvDEPTH (cv))) 777 if (expect_true (CvDEPTH (cv)))
625 { 778 {
… …
649 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
653 { 806 {
654 int i; 807 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 809 CXINC;
657 } 810 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 812
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1047{
895 return 1; 1048 return 1;
896} 1049}
897 1050
898static UNOP coro_setup_op; 1051static UNOP init_perl_op;
899 1052
900static 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 */
901coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
902{ 1055{
903 /* 1056 /*
904 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
905 */ 1058 */
906 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1068 PL_curpm = 0;
916 PL_curpad = 0; 1069 PL_curpad = 0;
917 PL_localizing = 0; 1070 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1071 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1073 PL_parser = 0;
922#endif 1074#endif
923 PL_hints = 0; 1075 PL_hints = 0;
… …
955 */ 1107 */
956 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 */
957 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 */
958 1110
959 /* 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 */
960 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
963 /* 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 */
964 1116
965 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
966 1118
967 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
968 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 }
969} 1129}
970 1130
971static void 1131static void
972coro_unwind_stacks (pTHX) 1132coro_unwind_stacks (pTHX)
973{ 1133{
… …
988 dounwind (-1); 1148 dounwind (-1);
989 } 1149 }
990} 1150}
991 1151
992static void 1152static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
994{ 1154{
995 SV *svf [9]; 1155 SV *svf [9];
996 1156
997 { 1157 {
998 struct coro *current = SvSTATE_current; 1158 struct coro *current = SvSTATE_current;
999 1159
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001 1161
1002 save_perl (aTHX_ current); 1162 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro); 1163 load_perl (aTHX_ coro);
1164
1004 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1005 coro_destruct_stacks (aTHX); 1166 coro_destruct_stacks (aTHX);
1006 1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1170
1007 // now save some sv's to be free'd later 1171 // now save some sv's to be free'd later
1008 svf [0] = GvSV (PL_defgv); 1172 svf [0] = GvSV (PL_defgv);
1009 svf [1] = (SV *)GvAV (PL_defgv); 1173 svf [1] = (SV *)GvAV (PL_defgv);
1010 svf [2] = GvSV (PL_errgv); 1174 svf [2] = GvSV (PL_errgv);
1011 svf [3] = (SV *)PL_defoutgv; 1175 svf [3] = (SV *)PL_defoutgv;
1012 svf [4] = PL_rs; 1176 svf [4] = PL_rs;
1013 svf [5] = GvSV (irsgv); 1177 svf [5] = GvSV (irsgv);
1014 svf [6] = (SV *)GvHV (PL_hintgv); 1178 svf [6] = (SV *)GvHV (PL_hintgv);
1015 svf [7] = PL_diehook; 1179 svf [7] = PL_diehook;
1016 svf [8] = PL_warnhook; 1180 svf [8] = PL_warnhook;
1017
1018 assert (9 == sizeof (svf) / sizeof (*svf)); 1181 assert (9 == sizeof (svf) / sizeof (*svf));
1019 1182
1020 load_perl (aTHX_ current); 1183 load_perl (aTHX_ current);
1021 } 1184 }
1022 1185
1023 { 1186 {
1024 int i; 1187 unsigned int i;
1025 1188
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1190 SvREFCNT_dec (svf [i]);
1028 1191
1029 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
… …
1235 /* 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 */
1236 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1238 /* 1401 /*
1239 * 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
1240 * 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.
1241 */ 1405 */
1242 1406
1243 /* 1407 /*
1244 * 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
1245 * 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)
… …
1452 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1453 { 1617 {
1454 /* need to start coroutine */ 1618 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1620 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1458 } 1622 }
1459 else 1623 else
1460 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1461 1625
1462 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
… …
1525 1689
1526 if (coro->mainstack 1690 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1528 && coro->slot 1692 && coro->slot
1529 && !PL_dirty) 1693 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1695
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1531 1699
1532 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1704 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 1705
1541 return 1; 1706 return 1;
1542} 1707}
1543 1708
1544static int 1709static int
… …
1594 1759
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1597} 1762}
1598 1763
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 ********************************************************************/ 1764/** Coro ********************************************************************/
1623 1765
1624INLINE void 1766INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1626{ 1768{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1770
1629 SvREFCNT_inc_NN (coro->hv); 1771 SvREFCNT_inc_NN (coro->hv);
1630 1772
1631 coro->next_ready = 0; 1773 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1636INLINE struct coro * 1778INLINE struct coro *
1637coro_deq (pTHX) 1779coro_deq (pTHX)
1638{ 1780{
1639 int prio; 1781 int prio;
1640 1782
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1784 {
1643 struct coro **ready = coro_ready [prio]; 1785 struct coro **ready = coro_ready [prio];
1644 1786
1645 if (ready [0]) 1787 if (ready [0])
1646 { 1788 {
… …
1651 } 1793 }
1652 1794
1653 return 0; 1795 return 0;
1654} 1796}
1655 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;
1813}
1814
1656static int 1815static int
1657api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1658{ 1817{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1664 1819
1665 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1666 return 0; 1821 return 0;
1667 1822
1668 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1669 1824
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1826
1676 if (sv_hook) 1827 if (!coro_nready++)
1677 { 1828 if (coroapi.readyhook)
1678 dSP; 1829 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 1830
1694 return 1; 1831 return 1;
1695} 1832}
1696 1833
1697static int 1834static int
… …
1742 { 1879 {
1743 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1746 { 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
1747 ++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 */
1748 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1889 --coro_nready;
1750 } 1890 }
1751 else 1891 else
1752 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1894 dSP;
1754 1895
1755 ENTER; 1896 ENTER;
1756 SAVETMPS; 1897 SAVETMPS;
1757 1898
… …
1867 2008
1868static void 2009static void
1869coro_call_on_destroy (pTHX_ struct coro *coro) 2010coro_call_on_destroy (pTHX_ struct coro *coro)
1870{ 2011{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2012 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 2013
1874 if (on_destroyp) 2014 if (on_destroyp)
1875 { 2015 {
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1877 2019
1878 while (AvFILLp (on_destroy) >= 0) 2020 while (AvFILLp (on_destroy) >= 0)
1879 { 2021 {
1880 dSP; /* don't disturb outer sp */ 2022 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy); 2023 SV *cb = av_pop (on_destroy);
… …
1883 PUSHMARK (SP); 2025 PUSHMARK (SP);
1884 2026
1885 if (statusp) 2027 if (statusp)
1886 { 2028 {
1887 int i; 2029 int i;
1888 AV *status = (AV *)SvRV (*statusp);
1889 EXTEND (SP, AvFILLp (status) + 1); 2030 EXTEND (SP, AvFILLp (status) + 1);
1890 2031
1891 for (i = 0; i <= AvFILLp (status); ++i) 2032 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]); 2033 PUSHs (AvARRAY (status)[i]);
1893 } 2034 }
… …
1903{ 2044{
1904 int i; 2045 int i;
1905 HV *hv = (HV *)SvRV (coro_current); 2046 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV (); 2047 AV *av = newAV ();
1907 2048
2049 /* items are actually not so common, so optimise for this case */
2050 if (items)
2051 {
1908 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1909 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1911 2057
1912 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);
1913 2059
1914 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 */
1915 api_ready (aTHX_ sv_manager); 2061 api_ready (aTHX_ sv_manager);
… …
2005 2151
2006static void 2152static void
2007coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
2008{ 2154{
2009 dXSARGS; 2155 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
2011 2157
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2159 {
2014 /* first call, set args */ 2160 /* first call, set args */
2015 SV *coro = SvRV (data); 2161 SV *coro = SvRV (data);
… …
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2230
2085 { 2231 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
2088 2234
2089 frame->data = (void *)data; 2235 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
2092 } 2238 }
… …
2096coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
2097{ 2243{
2098 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2248
2103 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);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2251
2106 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
… …
2331 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2332 { 2478 {
2333 if (items > slf_arga) 2479 if (items > slf_arga)
2334 { 2480 {
2335 slf_arga = items; 2481 slf_arga = items;
2336 free (slf_argv); 2482 Safefree (slf_argv);
2337 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2338 } 2484 }
2339 2485
2340 slf_argc = items; 2486 slf_argc = items;
2341 2487
2342 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
… …
2477/* Coro::Semaphore & Coro::Signal */ 2623/* Coro::Semaphore & Coro::Signal */
2478 2624
2479static SV * 2625static SV *
2480coro_waitarray_new (pTHX_ int count) 2626coro_waitarray_new (pTHX_ int count)
2481{ 2627{
2482 /* 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 */
2483 AV *av = newAV (); 2629 AV *av = newAV ();
2484 SV **ary; 2630 SV **ary;
2485 2631
2486 /* unfortunately, building manually saves memory */ 2632 /* unfortunately, building manually saves memory */
2487 Newx (ary, 2, SV *); 2633 Newx (ary, 2, SV *);
… …
2629{ 2775{
2630 if (items >= 2) 2776 if (items >= 2)
2631 { 2777 {
2632 /* callback form */ 2778 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 2781
2636 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 2783
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
2640 2786
2641 frame->prepare = prepare_nop; 2787 frame->prepare = prepare_nop;
… …
2665 AvARRAY (av)[0] = AvARRAY (av)[1]; 2811 AvARRAY (av)[0] = AvARRAY (av)[1];
2666 AvARRAY (av)[1] = cb; 2812 AvARRAY (av)[1] = cb;
2667 2813
2668 cb = av_shift (av); 2814 cb = av_shift (av);
2669 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 {
2670 api_ready (aTHX_ cb); 2826 api_ready (aTHX_ cb);
2671 sv_setiv (cb, 0); /* signal waiter */ 2827 sv_setiv (cb, 0); /* signal waiter */
2828 }
2829
2672 SvREFCNT_dec (cb); 2830 SvREFCNT_dec (cb);
2673 2831
2674 --count; 2832 --count;
2675 } 2833 }
2676} 2834}
… …
2685static void 2843static void
2686slf_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)
2687{ 2845{
2688 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2689 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
2690 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]))
2691 { 2860 {
2692 SvIVX (AvARRAY (av)[0]) = 0; 2861 SvIVX (AvARRAY (av)[0]) = 0;
2693 frame->prepare = prepare_nop; 2862 frame->prepare = prepare_nop;
2694 frame->check = slf_check_nop; 2863 frame->check = slf_check_nop;
2695 } 2864 }
2696 else 2865 else
2697 { 2866 {
2698 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2867 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2699 2868
2700 av_push (av, waiter); 2869 av_push (av, waiter);
2701 2870
2702 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 */
2703 frame->prepare = prepare_schedule; 2872 frame->prepare = prepare_schedule;
… …
2721 2890
2722static void 2891static void
2723coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2724{ 2893{
2725 dXSARGS; 2894 dXSARGS;
2726 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2727 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2728 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2729 2898
2730 av_extend (state, items - 1); 2899 av_extend (state, items - 1);
2731 2900
… …
2845 3014
2846 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2847 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2848 3017
2849 /* now push the callback closure */ 3018 /* now push the callback closure */
2850 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))));
2851 3020
2852 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2853 PUTBACK; 3022 PUTBACK;
2854 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2855 } 3024 }
2856 3025
2857 /* 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 */
2858 frame->data = (void *)state; 3027 frame->data = (void *)state;
2859 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2860 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2861} 3030}
2862 3031
… …
2873/*****************************************************************************/ 3042/*****************************************************************************/
2874 3043
2875#if CORO_CLONE 3044#if CORO_CLONE
2876# include "clone.c" 3045# include "clone.c"
2877#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}
2878 3105
2879MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2880 3107
2881PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2882 3109
… …
2935 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
2936 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
2937 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
2938 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
2939 3166
2940 { 3167 time_init (aTHX);
2941 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2942 3168
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)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2950} 3170}
2951 3171
2952SV * 3172SV *
2953new (char *klass, ...) 3173new (SV *klass, ...)
2954 ALIAS: 3174 ALIAS:
2955 Coro::new = 1 3175 Coro::new = 1
2956 CODE: 3176 CODE:
2957{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2958 struct coro *coro; 3178 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 3179 RETVAL
3009 3180
3010void 3181void
3011transfer (...) 3182transfer (...)
3012 PROTOTYPE: $$ 3183 PROTOTYPE: $$
… …
3149 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
3150 OUTPUT: 3321 OUTPUT:
3151 RETVAL 3322 RETVAL
3152 3323
3153void 3324void
3154throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
3155 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
3156 CODE: 3327 CODE:
3157{ 3328{
3158 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
3159 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3160 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
3161 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3332 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3162} 3334}
3163 3335
3164void 3336void
3165api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3166 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
… …
3223cancel (Coro::State self) 3395cancel (Coro::State self)
3224 CODE: 3396 CODE:
3225 coro_state_destroy (aTHX_ self); 3397 coro_state_destroy (aTHX_ self);
3226 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3227 3399
3400SV *
3401enable_times (int enabled = enable_times)
3402 CODE:
3403{
3404 RETVAL = boolSV (enable_times);
3405
3406 if (enabled != enable_times)
3407 {
3408 enable_times = enabled;
3409
3410 coro_times_update ();
3411 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3412 }
3413}
3414 OUTPUT:
3415 RETVAL
3416
3417void
3418times (Coro::State self)
3419 PPCODE:
3420{
3421 struct coro *current = SvSTATE (coro_current);
3422
3423 if (expect_false (current == self))
3424 {
3425 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current));
3427 }
3428
3429 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432
3433 if (expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current));
3435}
3436
3437void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3439 CODE:
3440{
3441 struct coro *current = SvSTATE_current;
3442
3443 if (current == coro)
3444 SWAP_SVS (current);
3445
3446 if (!coro->swap_sv)
3447 coro->swap_sv = newAV ();
3448
3449 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3451
3452 if (current == coro)
3453 SWAP_SVS (current);
3454}
3455
3228 3456
3229MODULE = Coro::State PACKAGE = Coro 3457MODULE = Coro::State PACKAGE = Coro
3230 3458
3231BOOT: 3459BOOT:
3232{ 3460{
… …
3241 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3242 3470
3243 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3471 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); 3472 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); 3473 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); 3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3247 3475
3248 coro_stash = gv_stashpv ("Coro", TRUE); 3476 coro_stash = gv_stashpv ("Coro", TRUE);
3249 3477
3250 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3251 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3252 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3253 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3481 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3254 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3482 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3255 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3483 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3256 3484
3257 { 3485 {
3258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3486 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3259 3487
3260 coroapi.schedule = api_schedule; 3488 coroapi.schedule = api_schedule;
… …
3270 sv_setiv (sv, (IV)&coroapi); 3498 sv_setiv (sv, (IV)&coroapi);
3271 SvREADONLY_on (sv); 3499 SvREADONLY_on (sv);
3272 } 3500 }
3273} 3501}
3274 3502
3503SV *
3504async (...)
3505 PROTOTYPE: &@
3506 CODE:
3507 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3508 api_ready (aTHX_ RETVAL);
3509 OUTPUT:
3510 RETVAL
3511
3275void 3512void
3276terminate (...) 3513terminate (...)
3277 CODE: 3514 CODE:
3278 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3515 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3279 3516
… …
3312void 3549void
3313_set_readyhook (SV *hook) 3550_set_readyhook (SV *hook)
3314 PROTOTYPE: $ 3551 PROTOTYPE: $
3315 CODE: 3552 CODE:
3316 SvREFCNT_dec (coro_readyhook); 3553 SvREFCNT_dec (coro_readyhook);
3554 SvGETMAGIC (hook);
3555 if (SvOK (hook))
3556 {
3317 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3557 coro_readyhook = newSVsv (hook);
3558 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3559 }
3560 else
3561 {
3562 coro_readyhook = 0;
3563 CORO_READYHOOK = 0;
3564 }
3318 3565
3319int 3566int
3320prio (Coro::State coro, int newprio = 0) 3567prio (Coro::State coro, int newprio = 0)
3321 PROTOTYPE: $;$ 3568 PROTOTYPE: $;$
3322 ALIAS: 3569 ALIAS:
… …
3328 if (items > 1) 3575 if (items > 1)
3329 { 3576 {
3330 if (ix) 3577 if (ix)
3331 newprio = coro->prio - newprio; 3578 newprio = coro->prio - newprio;
3332 3579
3333 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3580 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3334 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3581 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3335 3582
3336 coro->prio = newprio; 3583 coro->prio = newprio;
3337 } 3584 }
3338} 3585}
3339 OUTPUT: 3586 OUTPUT:
… …
3386 for (i = 1; i < items; ++i) 3633 for (i = 1; i < items; ++i)
3387 av_push (av, SvREFCNT_inc_NN (ST (i))); 3634 av_push (av, SvREFCNT_inc_NN (ST (i)));
3388 3635
3389 if ((SV *)hv == &PL_sv_undef) 3636 if ((SV *)hv == &PL_sv_undef)
3390 { 3637 {
3391 PUSHMARK (SP); 3638 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)); 3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3640 SvREFCNT_dec (sv);
3400 } 3641 }
3401 3642
3402 { 3643 {
3403 struct coro *coro = SvSTATE_hv (hv); 3644 struct coro *coro = SvSTATE_hv (hv);
3404 3645
… …
3438 CODE: 3679 CODE:
3439{ 3680{
3440 struct coro *coro = SvSTATE_current; 3681 struct coro *coro = SvSTATE_current;
3441 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3442 3683
3443 block = (SV *)coro_sv_2cv (aTHX_ block); 3684 block = s_get_cv_croak (block);
3444 3685
3445 if (!*avp) 3686 if (!*avp)
3446 *avp = newAV (); 3687 *avp = newAV ();
3447 3688
3448 av_push (*avp, SvREFCNT_inc (block)); 3689 av_push (*avp, SvREFCNT_inc (block));
… …
3465MODULE = Coro::State PACKAGE = Coro::Semaphore 3706MODULE = Coro::State PACKAGE = Coro::Semaphore
3466 3707
3467SV * 3708SV *
3468new (SV *klass, SV *count = 0) 3709new (SV *klass, SV *count = 0)
3469 CODE: 3710 CODE:
3711{
3712 int semcnt = 1;
3713
3714 if (count)
3715 {
3716 SvGETMAGIC (count);
3717
3718 if (SvOK (count))
3719 semcnt = SvIV (count);
3720 }
3721
3470 RETVAL = sv_bless ( 3722 RETVAL = sv_bless (
3471 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3723 coro_waitarray_new (aTHX_ semcnt),
3472 GvSTASH (CvGV (cv)) 3724 GvSTASH (CvGV (cv))
3473 ); 3725 );
3726}
3474 OUTPUT: 3727 OUTPUT:
3475 RETVAL 3728 RETVAL
3476 3729
3477# helper for Coro::Channel and others 3730# helper for Coro::Channel and others
3478SV * 3731SV *
… …
3636 3889
3637void 3890void
3638_register (char *target, char *proto, SV *req) 3891_register (char *target, char *proto, SV *req)
3639 CODE: 3892 CODE:
3640{ 3893{
3641 CV *req_cv = coro_sv_2cv (aTHX_ req); 3894 SV *req_cv = s_get_cv_croak (req);
3642 /* newXSproto doesn't return the CV on 5.8 */ 3895 /* newXSproto doesn't return the CV on 5.8 */
3643 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3896 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3644 sv_setpv ((SV *)slf_cv, proto); 3897 sv_setpv ((SV *)slf_cv, proto);
3645 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3898 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3646} 3899}
3647 3900
3901MODULE = Coro::State PACKAGE = Coro::Select
3902
3903void
3904patch_pp_sselect ()
3905 CODE:
3906 if (!coro_old_pp_sselect)
3907 {
3908 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3909 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3910 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3911 }
3912
3913void
3914unpatch_pp_sselect ()
3915 CODE:
3916 if (coro_old_pp_sselect)
3917 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0;
3920 }
3921

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines