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.349 by root, Wed Jun 10 00:47:24 2009 UTC vs.
Revision 1.382 by root, Thu Feb 10 08:06:27 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>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
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 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
117#endif 67#endif
118 68
119#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
137 87
138#define IN_DESTRUCT PL_dirty 88#define IN_DESTRUCT PL_dirty
139 89
140#if __GNUC__ >= 3 90#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 93# define INLINE static inline
144#else 94#else
145# define attribute(x) 95# define attribute(x)
146# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
147# define INLINE static 97# define INLINE static
… …
159# if CORO_PTHREAD 109# if CORO_PTHREAD
160static void *coro_thx; 110static void *coro_thx;
161# endif 111# endif
162#endif 112#endif
163 113
114#ifdef __linux
115# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime
118# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
119# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif
122#endif
123
164static double (*nvtime)(); /* so why doesn't it take void? */ 124static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]);
165 126
166/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
169 130
… …
190static SV *sv_pool_size; 151static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 155static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 156
197/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
198static SV *sv_activity; 158static SV *sv_activity;
159
160/* enable processtime/realtime profiling */
161static char enable_times;
162typedef U32 coro_ts[2];
163static coro_ts time_real, time_cpu;
164static char times_valid;
199 165
200static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
202 168
203enum { 169enum {
… …
293 259
294 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
295 AV *on_enter; 261 AV *on_enter;
296 AV *on_leave; 262 AV *on_leave;
297 263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
298 /* linked list */ 270 /* linked list */
299 struct coro *next, *prev; 271 struct coro *next, *prev;
300}; 272};
301 273
302typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
… …
307/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
309 281
310/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
311 283
312#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
318 290
319/* for Coro.pm */ 291/* for Coro.pm */
320static SV *coro_current; 292static SV *coro_current;
321static SV *coro_readyhook; 293static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 296static struct coro *coro_first;
325#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
326 318
327/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
328 320
329static SV * 321static SV *
330coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
… …
354 get_hv (name, create); 346 get_hv (name, create);
355#endif 347#endif
356 return get_hv (name, create); 348 return get_hv (name, create);
357} 349}
358 350
359/* may croak */ 351INLINE void
360INLINE CV * 352coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 353{
363 HV *st; 354#ifdef coro_clock_gettime
364 GV *gvp; 355 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 356
367 if (!cv) 357 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 358 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
359 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 360
370 return cv; 361 ts.tv_sec = ts.tv_nsec = 0;
362 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
363 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
364#else
365 dTHX;
366 UV tv[2];
367
368 u2time (aTHX_ tv);
369 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000;
371#endif
372}
373
374INLINE void
375coro_times_add (struct coro *c)
376{
377 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0];
380
381 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0];
384}
385
386INLINE void
387coro_times_sub (struct coro *c)
388{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0];
392
393 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
394 c->t_cpu [1] -= time_cpu [1];
395 c->t_cpu [0] -= time_cpu [0];
371} 396}
372 397
373/*****************************************************************************/ 398/*****************************************************************************/
374/* magic glue */ 399/* magic glue */
375 400
… …
475static int 500static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 501coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 502{
478 AV *padlist; 503 AV *padlist;
479 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
505
506 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT)
508 return 0;
480 509
481 /* casting is fun. */ 510 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
484 513
… …
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 563}
535 564
536/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
537 566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
538static void 618static void
539on_enterleave_call (pTHX_ SV *cb); 619on_enterleave_call (pTHX_ SV *cb);
540 620
541static void 621static void
542load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
… …
573 } 653 }
574 654
575 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 656 CORO_THROW = c->except;
577 657
658 if (expect_false (enable_times))
659 {
660 if (expect_false (!times_valid))
661 coro_times_update ();
662
663 coro_times_sub (c);
664 }
665
578 if (expect_false (c->on_enter)) 666 if (expect_false (c->on_enter))
579 { 667 {
580 int i; 668 int i;
581 669
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 672 }
673
674 SWAP_SVS (c);
585} 675}
586 676
587static void 677static void
588save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
589{ 679{
680 SWAP_SVS (c);
681
590 if (expect_false (c->on_leave)) 682 if (expect_false (c->on_leave))
591 { 683 {
592 int i; 684 int i;
593 685
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 }
689
690 times_valid = 0;
691
692 if (expect_false (enable_times))
693 {
694 coro_times_update (); times_valid = 1;
695 coro_times_add (c);
596 } 696 }
597 697
598 c->except = CORO_THROW; 698 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
600 700
… …
615 { 715 {
616 while (expect_true (cxix >= 0)) 716 while (expect_true (cxix >= 0))
617 { 717 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 718 PERL_CONTEXT *cx = &ccstk[cxix--];
619 719
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 721 {
622 CV *cv = cx->blk_sub.cv; 722 CV *cv = cx->blk_sub.cv;
623 723
624 if (expect_true (CvDEPTH (cv))) 724 if (expect_true (CvDEPTH (cv)))
625 { 725 {
… …
649 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
653 { 753 {
654 int i; 754 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 756 CXINC;
657 } 757 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 759
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 994{
895 return 1; 995 return 1;
896} 996}
897 997
898static UNOP coro_setup_op; 998static UNOP init_perl_op;
899 999
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
902{ 1002{
903 /* 1003 /*
904 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
905 */ 1005 */
906 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
… …
955 */ 1055 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1056 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 */ 1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
958 1058
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1059 /* 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; 1060 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1061 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1062 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1063 /* no flags etc. required, as an init function won't be called */
964 1064
965 PL_op = (OP *)&coro_setup_op; 1065 PL_op = (OP *)&init_perl_op;
966 1066
967 /* copy throw, in case it was set before coro_setup */ 1067 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1068 CORO_THROW = coro->except;
1069
1070 SWAP_SVS (coro);
1071
1072 if (expect_false (enable_times))
1073 {
1074 coro_times_update ();
1075 coro_times_sub (coro);
1076 }
969} 1077}
970 1078
971static void 1079static void
972coro_unwind_stacks (pTHX) 1080coro_unwind_stacks (pTHX)
973{ 1081{
… …
988 dounwind (-1); 1096 dounwind (-1);
989 } 1097 }
990} 1098}
991 1099
992static void 1100static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1101destroy_perl (pTHX_ struct coro *coro)
994{ 1102{
1103 SV *svf [9];
1104
1105 {
1106 struct coro *current = SvSTATE_current;
1107
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109
1110 save_perl (aTHX_ current);
1111 load_perl (aTHX_ coro);
1112
995 coro_unwind_stacks (aTHX); 1113 coro_unwind_stacks (aTHX);
1114 coro_destruct_stacks (aTHX);
996 1115
997 SvREFCNT_dec (GvSV (PL_defgv)); 1116 /* restore swapped sv's */
998 SvREFCNT_dec (GvAV (PL_defgv)); 1117 SWAP_SVS (coro);
999 SvREFCNT_dec (GvSV (PL_errgv));
1000 SvREFCNT_dec (PL_defoutgv);
1001 SvREFCNT_dec (PL_rs);
1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
1004 1118
1005 SvREFCNT_dec (PL_diehook); 1119 // now save some sv's to be free'd later
1006 SvREFCNT_dec (PL_warnhook); 1120 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs;
1125 svf [5] = GvSV (irsgv);
1126 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf));
1130
1131 load_perl (aTHX_ current);
1007 1132 }
1133
1134 {
1135 unsigned int i;
1136
1137 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1138 SvREFCNT_dec (svf [i]);
1139
1008 SvREFCNT_dec (coro->saved_deffh); 1140 SvREFCNT_dec (coro->saved_deffh);
1009 SvREFCNT_dec (coro->rouse_cb); 1141 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb); 1142 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av); 1143 SvREFCNT_dec (coro->invoke_av);
1012 1144 }
1013 coro_destruct_stacks (aTHX);
1014} 1145}
1015 1146
1016INLINE void 1147INLINE void
1017free_coro_mortal (pTHX) 1148free_coro_mortal (pTHX)
1018{ 1149{
… …
1215 /* somebody or something will hit me for both perl_run and PL_restartop */ 1346 /* somebody or something will hit me for both perl_run and PL_restartop */
1216 PL_restartop = PL_op; 1347 PL_restartop = PL_op;
1217 perl_run (PL_curinterp); 1348 perl_run (PL_curinterp);
1218 /* 1349 /*
1219 * Unfortunately, there is no way to get at the return values of the 1350 * Unfortunately, there is no way to get at the return values of the
1220 * coro body here, as perl_run destroys these 1351 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1352 * runtime errors here, as this is just a random interpreter, not a thread.
1221 */ 1353 */
1222 1354
1223 /* 1355 /*
1224 * If perl-run returns we assume exit() was being called or the coro 1356 * If perl-run returns we assume exit() was being called or the coro
1225 * fell off the end, which seems to be the only valid (non-bug) 1357 * fell off the end, which seems to be the only valid (non-bug)
… …
1432 if (expect_false (next->flags & CF_NEW)) 1564 if (expect_false (next->flags & CF_NEW))
1433 { 1565 {
1434 /* need to start coroutine */ 1566 /* need to start coroutine */
1435 next->flags &= ~CF_NEW; 1567 next->flags &= ~CF_NEW;
1436 /* setup coroutine call */ 1568 /* setup coroutine call */
1437 coro_setup (aTHX_ next); 1569 init_perl (aTHX_ next);
1438 } 1570 }
1439 else 1571 else
1440 load_perl (aTHX_ next); 1572 load_perl (aTHX_ next);
1441 1573
1442 /* possibly untie and reuse the cctx */ 1574 /* possibly untie and reuse the cctx */
… …
1505 1637
1506 if (coro->mainstack 1638 if (coro->mainstack
1507 && coro->mainstack != main_mainstack 1639 && coro->mainstack != main_mainstack
1508 && coro->slot 1640 && coro->slot
1509 && !PL_dirty) 1641 && !PL_dirty)
1510 {
1511 struct coro *current = SvSTATE_current;
1512
1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1514
1515 save_perl (aTHX_ current);
1516 load_perl (aTHX_ coro);
1517
1518 coro_destruct_perl (aTHX_ coro); 1642 destroy_perl (aTHX_ coro);
1519 1643
1520 load_perl (aTHX_ current); 1644 if (coro->next) coro->next->prev = coro->prev;
1521 1645 if (coro->prev) coro->prev->next = coro->next;
1522 coro->slot = 0; 1646 if (coro == coro_first) coro_first = coro->next;
1523 }
1524 1647
1525 cctx_destroy (coro->cctx); 1648 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv); 1649 SvREFCNT_dec (coro->startcv);
1527 SvREFCNT_dec (coro->args); 1650 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv);
1528 SvREFCNT_dec (CORO_THROW); 1652 SvREFCNT_dec (CORO_THROW);
1529
1530 if (coro->next) coro->next->prev = coro->prev;
1531 if (coro->prev) coro->prev->next = coro->next;
1532 if (coro == coro_first) coro_first = coro->next;
1533 1653
1534 return 1; 1654 return 1;
1535} 1655}
1536 1656
1537static int 1657static int
… …
1587 1707
1588 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1708 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1589 TRANSFER (ta, 1); 1709 TRANSFER (ta, 1);
1590} 1710}
1591 1711
1592/*****************************************************************************/
1593/* gensub: simple closure generation utility */
1594
1595#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1596
1597/* create a closure from XS, returns a code reference */
1598/* the arg can be accessed via GENSUB_ARG from the callback */
1599/* the callback must use dXSARGS/XSRETURN */
1600static SV *
1601gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1602{
1603 CV *cv = (CV *)newSV (0);
1604
1605 sv_upgrade ((SV *)cv, SVt_PVCV);
1606
1607 CvANON_on (cv);
1608 CvISXSUB_on (cv);
1609 CvXSUB (cv) = xsub;
1610 GENSUB_ARG = arg;
1611
1612 return newRV_noinc ((SV *)cv);
1613}
1614
1615/** Coro ********************************************************************/ 1712/** Coro ********************************************************************/
1616 1713
1617INLINE void 1714INLINE void
1618coro_enq (pTHX_ struct coro *coro) 1715coro_enq (pTHX_ struct coro *coro)
1619{ 1716{
1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1621 1718
1622 SvREFCNT_inc_NN (coro->hv); 1719 SvREFCNT_inc_NN (coro->hv);
1623 1720
1624 coro->next_ready = 0; 1721 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1629INLINE struct coro * 1726INLINE struct coro *
1630coro_deq (pTHX) 1727coro_deq (pTHX)
1631{ 1728{
1632 int prio; 1729 int prio;
1633 1730
1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1635 { 1732 {
1636 struct coro **ready = coro_ready [prio]; 1733 struct coro **ready = coro_ready [prio];
1637 1734
1638 if (ready [0]) 1735 if (ready [0])
1639 { 1736 {
… …
1644 } 1741 }
1645 1742
1646 return 0; 1743 return 0;
1647} 1744}
1648 1745
1746static void
1747invoke_sv_ready_hook_helper (void)
1748{
1749 dTHX;
1750 dSP;
1751
1752 ENTER;
1753 SAVETMPS;
1754
1755 PUSHMARK (SP);
1756 PUTBACK;
1757 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1758
1759 FREETMPS;
1760 LEAVE;
1761}
1762
1649static int 1763static int
1650api_ready (pTHX_ SV *coro_sv) 1764api_ready (pTHX_ SV *coro_sv)
1651{ 1765{
1652 struct coro *coro;
1653 SV *sv_hook;
1654 void (*xs_hook)(void);
1655
1656 coro = SvSTATE (coro_sv); 1766 struct coro *coro = SvSTATE (coro_sv);
1657 1767
1658 if (coro->flags & CF_READY) 1768 if (coro->flags & CF_READY)
1659 return 0; 1769 return 0;
1660 1770
1661 coro->flags |= CF_READY; 1771 coro->flags |= CF_READY;
1662 1772
1663 sv_hook = coro_nready ? 0 : coro_readyhook;
1664 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1665
1666 coro_enq (aTHX_ coro); 1773 coro_enq (aTHX_ coro);
1667 ++coro_nready;
1668 1774
1669 if (sv_hook) 1775 if (!coro_nready++)
1670 { 1776 if (coroapi.readyhook)
1671 dSP; 1777 coroapi.readyhook ();
1672
1673 ENTER;
1674 SAVETMPS;
1675
1676 PUSHMARK (SP);
1677 PUTBACK;
1678 call_sv (sv_hook, G_VOID | G_DISCARD);
1679
1680 FREETMPS;
1681 LEAVE;
1682 }
1683
1684 if (xs_hook)
1685 xs_hook ();
1686 1778
1687 return 1; 1779 return 1;
1688} 1780}
1689 1781
1690static int 1782static int
… …
1735 { 1827 {
1736 /* nothing to schedule: call the idle handler */ 1828 /* nothing to schedule: call the idle handler */
1737 if (SvROK (sv_idle) 1829 if (SvROK (sv_idle)
1738 && SvOBJECT (SvRV (sv_idle))) 1830 && SvOBJECT (SvRV (sv_idle)))
1739 { 1831 {
1832 if (SvRV (sv_idle) == SvRV (coro_current))
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1834
1740 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1741 api_ready (aTHX_ SvRV (sv_idle)); 1836 api_ready (aTHX_ SvRV (sv_idle));
1742 --coro_nready; 1837 --coro_nready;
1743 } 1838 }
1744 else 1839 else
1745 { 1840 {
1841 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1746 dSP; 1842 dSP;
1747 1843
1748 ENTER; 1844 ENTER;
1749 SAVETMPS; 1845 SAVETMPS;
1750 1846
… …
1896{ 1992{
1897 int i; 1993 int i;
1898 HV *hv = (HV *)SvRV (coro_current); 1994 HV *hv = (HV *)SvRV (coro_current);
1899 AV *av = newAV (); 1995 AV *av = newAV ();
1900 1996
1997 /* items are actually not so common, so optimise for this case */
1998 if (items)
1999 {
1901 av_extend (av, items - 1); 2000 av_extend (av, items - 1);
2001
1902 for (i = 0; i < items; ++i) 2002 for (i = 0; i < items; ++i)
1903 av_push (av, SvREFCNT_inc_NN (arg [i])); 2003 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 }
1904 2005
1905 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1906 2007
1907 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1908 api_ready (aTHX_ sv_manager); 2009 api_ready (aTHX_ sv_manager);
… …
1998 2099
1999static void 2100static void
2000coro_rouse_callback (pTHX_ CV *cv) 2101coro_rouse_callback (pTHX_ CV *cv)
2001{ 2102{
2002 dXSARGS; 2103 dXSARGS;
2003 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
2004 2105
2005 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2106 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2006 { 2107 {
2007 /* first call, set args */ 2108 /* first call, set args */
2008 SV *coro = SvRV (data); 2109 SV *coro = SvRV (data);
… …
2074 || SvTYPE (SvRV (cb)) != SVt_PVCV 2175 || SvTYPE (SvRV (cb)) != SVt_PVCV
2075 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2076 croak ("Coro::rouse_wait called with illegal callback argument,"); 2177 croak ("Coro::rouse_wait called with illegal callback argument,");
2077 2178
2078 { 2179 {
2079 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2080 SV *data = (SV *)GENSUB_ARG; 2181 SV *data = (SV *)S_GENSUB_ARG;
2081 2182
2082 frame->data = (void *)data; 2183 frame->data = (void *)data;
2083 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2184 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2084 frame->check = slf_check_rouse_wait; 2185 frame->check = slf_check_rouse_wait;
2085 } 2186 }
… …
2089coro_new_rouse_cb (pTHX) 2190coro_new_rouse_cb (pTHX)
2090{ 2191{
2091 HV *hv = (HV *)SvRV (coro_current); 2192 HV *hv = (HV *)SvRV (coro_current);
2092 struct coro *coro = SvSTATE_hv (hv); 2193 struct coro *coro = SvSTATE_hv (hv);
2093 SV *data = newRV_inc ((SV *)hv); 2194 SV *data = newRV_inc ((SV *)hv);
2094 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2195 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2095 2196
2096 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2197 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2097 SvREFCNT_dec (data); /* magicext increases the refcount */ 2198 SvREFCNT_dec (data); /* magicext increases the refcount */
2098 2199
2099 SvREFCNT_dec (coro->rouse_cb); 2200 SvREFCNT_dec (coro->rouse_cb);
… …
2324 if (PL_op->op_flags & OPf_STACKED) 2425 if (PL_op->op_flags & OPf_STACKED)
2325 { 2426 {
2326 if (items > slf_arga) 2427 if (items > slf_arga)
2327 { 2428 {
2328 slf_arga = items; 2429 slf_arga = items;
2329 free (slf_argv); 2430 Safefree (slf_argv);
2330 slf_argv = malloc (slf_arga * sizeof (SV *)); 2431 New (0, slf_argv, slf_arga, SV *);
2331 } 2432 }
2332 2433
2333 slf_argc = items; 2434 slf_argc = items;
2334 2435
2335 for (i = 0; i < items; ++i) 2436 for (i = 0; i < items; ++i)
… …
2470/* Coro::Semaphore & Coro::Signal */ 2571/* Coro::Semaphore & Coro::Signal */
2471 2572
2472static SV * 2573static SV *
2473coro_waitarray_new (pTHX_ int count) 2574coro_waitarray_new (pTHX_ int count)
2474{ 2575{
2475 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2576 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2476 AV *av = newAV (); 2577 AV *av = newAV ();
2477 SV **ary; 2578 SV **ary;
2478 2579
2479 /* unfortunately, building manually saves memory */ 2580 /* unfortunately, building manually saves memory */
2480 Newx (ary, 2, SV *); 2581 Newx (ary, 2, SV *);
… …
2622{ 2723{
2623 if (items >= 2) 2724 if (items >= 2)
2624 { 2725 {
2625 /* callback form */ 2726 /* callback form */
2626 AV *av = (AV *)SvRV (arg [0]); 2727 AV *av = (AV *)SvRV (arg [0]);
2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2728 SV *cb_cv = s_get_cv_croak (arg [1]);
2628 2729
2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2730 av_push (av, SvREFCNT_inc_NN (cb_cv));
2630 2731
2631 if (SvIVX (AvARRAY (av)[0]) > 0) 2732 if (SvIVX (AvARRAY (av)[0]) > 0)
2632 coro_semaphore_adjust (aTHX_ av, 0); 2733 coro_semaphore_adjust (aTHX_ av, 0);
2633 2734
2634 frame->prepare = prepare_nop; 2735 frame->prepare = prepare_nop;
… …
2658 AvARRAY (av)[0] = AvARRAY (av)[1]; 2759 AvARRAY (av)[0] = AvARRAY (av)[1];
2659 AvARRAY (av)[1] = cb; 2760 AvARRAY (av)[1] = cb;
2660 2761
2661 cb = av_shift (av); 2762 cb = av_shift (av);
2662 2763
2764 if (SvTYPE (cb) == SVt_PVCV)
2765 {
2766 dSP;
2767 PUSHMARK (SP);
2768 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2769 PUTBACK;
2770 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2771 }
2772 else
2773 {
2663 api_ready (aTHX_ cb); 2774 api_ready (aTHX_ cb);
2664 sv_setiv (cb, 0); /* signal waiter */ 2775 sv_setiv (cb, 0); /* signal waiter */
2776 }
2777
2665 SvREFCNT_dec (cb); 2778 SvREFCNT_dec (cb);
2666 2779
2667 --count; 2780 --count;
2668 } 2781 }
2669} 2782}
… …
2678static void 2791static void
2679slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2792slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2680{ 2793{
2681 AV *av = (AV *)SvRV (arg [0]); 2794 AV *av = (AV *)SvRV (arg [0]);
2682 2795
2796 if (items >= 2)
2797 {
2798 SV *cb_cv = s_get_cv_croak (arg [1]);
2799 av_push (av, SvREFCNT_inc_NN (cb_cv));
2800
2683 if (SvIVX (AvARRAY (av)[0])) 2801 if (SvIVX (AvARRAY (av)[0]))
2802 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2803
2804 frame->prepare = prepare_nop;
2805 frame->check = slf_check_nop;
2806 }
2807 else if (SvIVX (AvARRAY (av)[0]))
2684 { 2808 {
2685 SvIVX (AvARRAY (av)[0]) = 0; 2809 SvIVX (AvARRAY (av)[0]) = 0;
2686 frame->prepare = prepare_nop; 2810 frame->prepare = prepare_nop;
2687 frame->check = slf_check_nop; 2811 frame->check = slf_check_nop;
2688 } 2812 }
2689 else 2813 else
2690 { 2814 {
2691 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2815 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2692 2816
2693 av_push (av, waiter); 2817 av_push (av, waiter);
2694 2818
2695 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2819 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2696 frame->prepare = prepare_schedule; 2820 frame->prepare = prepare_schedule;
… …
2714 2838
2715static void 2839static void
2716coro_aio_callback (pTHX_ CV *cv) 2840coro_aio_callback (pTHX_ CV *cv)
2717{ 2841{
2718 dXSARGS; 2842 dXSARGS;
2719 AV *state = (AV *)GENSUB_ARG; 2843 AV *state = (AV *)S_GENSUB_ARG;
2720 SV *coro = av_pop (state); 2844 SV *coro = av_pop (state);
2721 SV *data_sv = newSV (sizeof (struct io_state)); 2845 SV *data_sv = newSV (sizeof (struct io_state));
2722 2846
2723 av_extend (state, items - 1); 2847 av_extend (state, items - 1);
2724 2848
… …
2838 2962
2839 for (i = 0; i < items; ++i) 2963 for (i = 0; i < items; ++i)
2840 PUSHs (arg [i]); 2964 PUSHs (arg [i]);
2841 2965
2842 /* now push the callback closure */ 2966 /* now push the callback closure */
2843 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2967 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2844 2968
2845 /* now call the AIO function - we assume our request is uncancelable */ 2969 /* now call the AIO function - we assume our request is uncancelable */
2846 PUTBACK; 2970 PUTBACK;
2847 call_sv ((SV *)req, G_VOID | G_DISCARD); 2971 call_sv ((SV *)req, G_VOID | G_DISCARD);
2848 } 2972 }
2849 2973
2850 /* now that the requets is going, we loop toll we have a result */ 2974 /* now that the request is going, we loop till we have a result */
2851 frame->data = (void *)state; 2975 frame->data = (void *)state;
2852 frame->prepare = prepare_schedule; 2976 frame->prepare = prepare_schedule;
2853 frame->check = slf_check_aio_req; 2977 frame->check = slf_check_aio_req;
2854} 2978}
2855 2979
… …
2866/*****************************************************************************/ 2990/*****************************************************************************/
2867 2991
2868#if CORO_CLONE 2992#if CORO_CLONE
2869# include "clone.c" 2993# include "clone.c"
2870#endif 2994#endif
2995
2996/*****************************************************************************/
2997
2998static SV *
2999coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3000{
3001 SV *coro_sv;
3002 struct coro *coro;
3003 MAGIC *mg;
3004 HV *hv;
3005 SV *cb;
3006 int i;
3007
3008 if (argc > 0)
3009 {
3010 cb = s_get_cv_croak (argv [0]);
3011
3012 if (!is_coro)
3013 {
3014 if (CvISXSUB (cb))
3015 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3016
3017 if (!CvROOT (cb))
3018 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3019 }
3020 }
3021
3022 Newz (0, coro, 1, struct coro);
3023 coro->args = newAV ();
3024 coro->flags = CF_NEW;
3025
3026 if (coro_first) coro_first->prev = coro;
3027 coro->next = coro_first;
3028 coro_first = coro;
3029
3030 coro->hv = hv = newHV ();
3031 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3032 mg->mg_flags |= MGf_DUP;
3033 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3034
3035 if (argc > 0)
3036 {
3037 av_extend (coro->args, argc + is_coro - 1);
3038
3039 if (is_coro)
3040 {
3041 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3042 cb = (SV *)cv_coro_run;
3043 }
3044
3045 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3046
3047 for (i = 1; i < argc; i++)
3048 av_push (coro->args, newSVsv (argv [i]));
3049 }
3050
3051 return coro_sv;
3052}
2871 3053
2872MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2873 3055
2874PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2875 3057
… …
2935 3117
2936 if (!svp) croak ("Time::HiRes is required"); 3118 if (!svp) croak ("Time::HiRes is required");
2937 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2938 3120
2939 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2940 } 3125 }
2941 3126
2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2943} 3128}
2944 3129
2945SV * 3130SV *
2946new (char *klass, ...) 3131new (SV *klass, ...)
2947 ALIAS: 3132 ALIAS:
2948 Coro::new = 1 3133 Coro::new = 1
2949 CODE: 3134 CODE:
2950{ 3135 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2951 struct coro *coro; 3136 OUTPUT:
2952 MAGIC *mg;
2953 HV *hv;
2954 CV *cb;
2955 int i;
2956
2957 if (items > 1)
2958 {
2959 cb = coro_sv_2cv (aTHX_ ST (1));
2960
2961 if (!ix)
2962 {
2963 if (CvISXSUB (cb))
2964 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2965
2966 if (!CvROOT (cb))
2967 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2968 }
2969 }
2970
2971 Newz (0, coro, 1, struct coro);
2972 coro->args = newAV ();
2973 coro->flags = CF_NEW;
2974
2975 if (coro_first) coro_first->prev = coro;
2976 coro->next = coro_first;
2977 coro_first = coro;
2978
2979 coro->hv = hv = newHV ();
2980 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2981 mg->mg_flags |= MGf_DUP;
2982 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2983
2984 if (items > 1)
2985 {
2986 av_extend (coro->args, items - 1 + ix - 1);
2987
2988 if (ix)
2989 {
2990 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991 cb = cv_coro_run;
2992 }
2993
2994 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2995
2996 for (i = 2; i < items; i++)
2997 av_push (coro->args, newSVsv (ST (i)));
2998 }
2999}
3000 OUTPUT:
3001 RETVAL 3137 RETVAL
3002 3138
3003void 3139void
3004transfer (...) 3140transfer (...)
3005 PROTOTYPE: $$ 3141 PROTOTYPE: $$
… …
3142 RETVAL = boolSV (coro->flags & ix); 3278 RETVAL = boolSV (coro->flags & ix);
3143 OUTPUT: 3279 OUTPUT:
3144 RETVAL 3280 RETVAL
3145 3281
3146void 3282void
3147throw (Coro::State self, SV *throw = &PL_sv_undef) 3283throw (Coro::State self, SV *exception = &PL_sv_undef)
3148 PROTOTYPE: $;$ 3284 PROTOTYPE: $;$
3149 CODE: 3285 CODE:
3150{ 3286{
3151 struct coro *current = SvSTATE_current; 3287 struct coro *current = SvSTATE_current;
3152 SV **throwp = self == current ? &CORO_THROW : &self->except; 3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3153 SvREFCNT_dec (*throwp); 3289 SvREFCNT_dec (*exceptionp);
3154 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3290 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3155} 3292}
3156 3293
3157void 3294void
3158api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3159 PROTOTYPE: $;$ 3296 PROTOTYPE: $;$
… …
3217 CODE: 3354 CODE:
3218 coro_state_destroy (aTHX_ self); 3355 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3220 3357
3221 3358
3359SV *
3360enable_times (int enabled = enable_times)
3361 CODE:
3362{
3363 RETVAL = boolSV (enable_times);
3364
3365 if (enabled != enable_times)
3366 {
3367 enable_times = enabled;
3368
3369 coro_times_update ();
3370 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3371 }
3372}
3373 OUTPUT:
3374 RETVAL
3375
3376void
3377times (Coro::State self)
3378 PPCODE:
3379{
3380 struct coro *current = SvSTATE (coro_current);
3381
3382 if (expect_false (current == self))
3383 {
3384 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current));
3386 }
3387
3388 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391
3392 if (expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current));
3394}
3395
3396void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3398 CODE:
3399{
3400 struct coro *current = SvSTATE_current;
3401
3402 if (current == coro)
3403 SWAP_SVS (current);
3404
3405 if (!coro->swap_sv)
3406 coro->swap_sv = newAV ();
3407
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3409 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3410
3411 if (current == coro)
3412 SWAP_SVS (current);
3413}
3414
3415
3222MODULE = Coro::State PACKAGE = Coro 3416MODULE = Coro::State PACKAGE = Coro
3223 3417
3224BOOT: 3418BOOT:
3225{ 3419{
3226 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3234 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3235 3429
3236 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3237 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3238 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3240 3434
3241 coro_stash = gv_stashpv ("Coro", TRUE); 3435 coro_stash = gv_stashpv ("Coro", TRUE);
3242 3436
3243 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3244 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3245 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3246 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3440 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3247 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3441 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3248 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3442 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3249 3443
3250 { 3444 {
3251 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3445 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3252 3446
3253 coroapi.schedule = api_schedule; 3447 coroapi.schedule = api_schedule;
… …
3263 sv_setiv (sv, (IV)&coroapi); 3457 sv_setiv (sv, (IV)&coroapi);
3264 SvREADONLY_on (sv); 3458 SvREADONLY_on (sv);
3265 } 3459 }
3266} 3460}
3267 3461
3462SV *
3463async (...)
3464 PROTOTYPE: &@
3465 CODE:
3466 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3467 api_ready (aTHX_ RETVAL);
3468 OUTPUT:
3469 RETVAL
3470
3268void 3471void
3269terminate (...) 3472terminate (...)
3270 CODE: 3473 CODE:
3271 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3474 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3272 3475
… …
3305void 3508void
3306_set_readyhook (SV *hook) 3509_set_readyhook (SV *hook)
3307 PROTOTYPE: $ 3510 PROTOTYPE: $
3308 CODE: 3511 CODE:
3309 SvREFCNT_dec (coro_readyhook); 3512 SvREFCNT_dec (coro_readyhook);
3513 SvGETMAGIC (hook);
3514 if (SvOK (hook))
3515 {
3310 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3516 coro_readyhook = newSVsv (hook);
3517 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3518 }
3519 else
3520 {
3521 coro_readyhook = 0;
3522 CORO_READYHOOK = 0;
3523 }
3311 3524
3312int 3525int
3313prio (Coro::State coro, int newprio = 0) 3526prio (Coro::State coro, int newprio = 0)
3314 PROTOTYPE: $;$ 3527 PROTOTYPE: $;$
3315 ALIAS: 3528 ALIAS:
… …
3321 if (items > 1) 3534 if (items > 1)
3322 { 3535 {
3323 if (ix) 3536 if (ix)
3324 newprio = coro->prio - newprio; 3537 newprio = coro->prio - newprio;
3325 3538
3326 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3539 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3327 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3540 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3328 3541
3329 coro->prio = newprio; 3542 coro->prio = newprio;
3330 } 3543 }
3331} 3544}
3332 OUTPUT: 3545 OUTPUT:
… …
3379 for (i = 1; i < items; ++i) 3592 for (i = 1; i < items; ++i)
3380 av_push (av, SvREFCNT_inc_NN (ST (i))); 3593 av_push (av, SvREFCNT_inc_NN (ST (i)));
3381 3594
3382 if ((SV *)hv == &PL_sv_undef) 3595 if ((SV *)hv == &PL_sv_undef)
3383 { 3596 {
3384 PUSHMARK (SP); 3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3385 EXTEND (SP, 2);
3386 PUSHs (sv_Coro);
3387 PUSHs ((SV *)cv_pool_handler);
3388 PUTBACK;
3389 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3390 SPAGAIN;
3391
3392 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3599 SvREFCNT_dec (sv);
3393 } 3600 }
3394 3601
3395 { 3602 {
3396 struct coro *coro = SvSTATE_hv (hv); 3603 struct coro *coro = SvSTATE_hv (hv);
3397 3604
… …
3431 CODE: 3638 CODE:
3432{ 3639{
3433 struct coro *coro = SvSTATE_current; 3640 struct coro *coro = SvSTATE_current;
3434 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3435 3642
3436 block = (SV *)coro_sv_2cv (aTHX_ block); 3643 block = s_get_cv_croak (block);
3437 3644
3438 if (!*avp) 3645 if (!*avp)
3439 *avp = newAV (); 3646 *avp = newAV ();
3440 3647
3441 av_push (*avp, SvREFCNT_inc (block)); 3648 av_push (*avp, SvREFCNT_inc (block));
… …
3458MODULE = Coro::State PACKAGE = Coro::Semaphore 3665MODULE = Coro::State PACKAGE = Coro::Semaphore
3459 3666
3460SV * 3667SV *
3461new (SV *klass, SV *count = 0) 3668new (SV *klass, SV *count = 0)
3462 CODE: 3669 CODE:
3670{
3671 int semcnt = 1;
3672
3673 if (count)
3674 {
3675 SvGETMAGIC (count);
3676
3677 if (SvOK (count))
3678 semcnt = SvIV (count);
3679 }
3680
3463 RETVAL = sv_bless ( 3681 RETVAL = sv_bless (
3464 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3682 coro_waitarray_new (aTHX_ semcnt),
3465 GvSTASH (CvGV (cv)) 3683 GvSTASH (CvGV (cv))
3466 ); 3684 );
3685}
3467 OUTPUT: 3686 OUTPUT:
3468 RETVAL 3687 RETVAL
3469 3688
3470# helper for Coro::Channel and others 3689# helper for Coro::Channel and others
3471SV * 3690SV *
… …
3629 3848
3630void 3849void
3631_register (char *target, char *proto, SV *req) 3850_register (char *target, char *proto, SV *req)
3632 CODE: 3851 CODE:
3633{ 3852{
3634 CV *req_cv = coro_sv_2cv (aTHX_ req); 3853 SV *req_cv = s_get_cv_croak (req);
3635 /* newXSproto doesn't return the CV on 5.8 */ 3854 /* newXSproto doesn't return the CV on 5.8 */
3636 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3855 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3637 sv_setpv ((SV *)slf_cv, proto); 3856 sv_setpv ((SV *)slf_cv, proto);
3638 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3857 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3639} 3858}
3640 3859
3860MODULE = Coro::State PACKAGE = Coro::Select
3861
3862void
3863patch_pp_sselect ()
3864 CODE:
3865 if (!coro_old_pp_sselect)
3866 {
3867 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3868 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3869 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3870 }
3871
3872void
3873unpatch_pp_sselect ()
3874 CODE:
3875 if (coro_old_pp_sselect)
3876 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0;
3879 }
3880

Diff Legend

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