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.358 by root, Mon Jun 29 04:30:25 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
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 122# endif
172#endif 123#endif
173 124
174static 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]);
175 127
176/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
179 131
… …
200static SV *sv_pool_size; 152static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 156static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 157
207/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
208static 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;
209 166
210static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
212 169
213enum { 170enum {
… …
284 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
290 247
291 /* statistics */ 248 /* statistics */
292 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
293 250
294 /* coro process data */ 251 /* coro process data */
… …
302 AV *invoke_av; 259 AV *invoke_av;
303 260
304 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
305 AV *on_enter; 262 AV *on_enter;
306 AV *on_leave; 263 AV *on_leave;
264
265 /* swap_sv */
266 AV *swap_sv;
267
268 /* times */
269 coro_ts t_cpu, t_real;
307 270
308 /* linked list */ 271 /* linked list */
309 struct coro *next, *prev; 272 struct coro *next, *prev;
310}; 273};
311 274
… …
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
334static struct coro *coro_first; 297static struct coro *coro_first;
335#define coro_nready coroapi.nready 298#define coro_nready coroapi.nready
336 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
371
337/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
338 373
339static SV * 374static SV *
340coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
341{ 376{
… …
364 get_hv (name, create); 399 get_hv (name, create);
365#endif 400#endif
366 return get_hv (name, create); 401 return get_hv (name, create);
367} 402}
368 403
369/* may croak */ 404INLINE void
370INLINE CV * 405coro_times_update ()
371coro_sv_2cv (pTHX_ SV *sv)
372{ 406{
373 HV *st; 407#ifdef coro_clock_gettime
374 GV *gvp; 408 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 409
377 if (!cv) 410 ts.tv_sec = ts.tv_nsec = 0;
378 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;
379 413
380 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];
381} 449}
382 450
383/*****************************************************************************/ 451/*****************************************************************************/
384/* magic glue */ 452/* magic glue */
385 453
… …
488 AV *padlist; 556 AV *padlist;
489 AV *av = (AV *)mg->mg_obj; 557 AV *av = (AV *)mg->mg_obj;
490 558
491 /* perl manages to free our internal AV and _then_ call us */ 559 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 560 if (IN_DESTRUCT)
493 return; 561 return 0;
494 562
495 /* casting is fun. */ 563 /* casting is fun. */
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
498 566
… …
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 616}
549 617
550/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
551 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
552static void 671static void
553on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
554 673
555static void 674static void
556load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
… …
587 } 706 }
588 707
589 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 709 CORO_THROW = c->except;
591 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
592 if (expect_false (c->on_enter)) 719 if (expect_false (c->on_enter))
593 { 720 {
594 int i; 721 int i;
595 722
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 725 }
726
727 SWAP_SVS (c);
599} 728}
600 729
601static void 730static void
602save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
603{ 732{
733 SWAP_SVS (c);
734
604 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
605 { 736 {
606 int i; 737 int i;
607 738
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 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);
610 } 749 }
611 750
612 c->except = CORO_THROW; 751 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
614 753
… …
663 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
664 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
667 { 806 {
668 int i; 807 unsigned int i;
669 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
670 CXINC; 809 CXINC;
671 } 810 }
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
673 812
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1047{
909 return 1; 1048 return 1;
910} 1049}
911 1050
912static UNOP coro_setup_op; 1051static UNOP init_perl_op;
913 1052
914static 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 */
915coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
916{ 1055{
917 /* 1056 /*
918 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
919 */ 1058 */
920 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1068 PL_curpm = 0;
930 PL_curpad = 0; 1069 PL_curpad = 0;
931 PL_localizing = 0; 1070 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1071 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1073 PL_parser = 0;
936#endif 1074#endif
937 PL_hints = 0; 1075 PL_hints = 0;
… …
969 */ 1107 */
970 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 */
971 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 */
972 1110
973 /* 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 */
974 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
977 /* 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 */
978 1116
979 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
980 1118
981 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
982 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 }
983} 1129}
984 1130
985static void 1131static void
986coro_unwind_stacks (pTHX) 1132coro_unwind_stacks (pTHX)
987{ 1133{
… …
1002 dounwind (-1); 1148 dounwind (-1);
1003 } 1149 }
1004} 1150}
1005 1151
1006static void 1152static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
1008{ 1154{
1009 SV *svf [9]; 1155 SV *svf [9];
1010 1156
1011 { 1157 {
1012 struct coro *current = SvSTATE_current; 1158 struct coro *current = SvSTATE_current;
… …
1016 save_perl (aTHX_ current); 1162 save_perl (aTHX_ current);
1017 load_perl (aTHX_ coro); 1163 load_perl (aTHX_ coro);
1018 1164
1019 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1020 coro_destruct_stacks (aTHX); 1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1021 1170
1022 // now save some sv's to be free'd later 1171 // now save some sv's to be free'd later
1023 svf [0] = GvSV (PL_defgv); 1172 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1173 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1174 svf [2] = GvSV (PL_errgv);
… …
1033 1182
1034 load_perl (aTHX_ current); 1183 load_perl (aTHX_ current);
1035 } 1184 }
1036 1185
1037 { 1186 {
1038 int i; 1187 unsigned int i;
1039 1188
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1190 SvREFCNT_dec (svf [i]);
1042 1191
1043 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
… …
1249 /* 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 */
1250 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1252 /* 1401 /*
1253 * 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
1254 * 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.
1255 */ 1405 */
1256 1406
1257 /* 1407 /*
1258 * 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
1259 * 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)
… …
1466 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1467 { 1617 {
1468 /* need to start coroutine */ 1618 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1620 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1472 } 1622 }
1473 else 1623 else
1474 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1475 1625
1476 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
… …
1539 1689
1540 if (coro->mainstack 1690 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1542 && coro->slot 1692 && coro->slot
1543 && !PL_dirty) 1693 && !PL_dirty)
1544 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;
1545 1699
1546 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1550
1551 if (coro->next) coro->next->prev = coro->prev;
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554 1705
1555 return 1; 1706 return 1;
1556} 1707}
1557 1708
1558static int 1709static int
… …
1608 1759
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1611} 1762}
1612 1763
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1637 1765
1638INLINE void 1766INLINE void
1639coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1640{ 1768{
… …
1665 } 1793 }
1666 1794
1667 return 0; 1795 return 0;
1668} 1796}
1669 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
1670static int 1815static int
1671api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1672{ 1817{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1678 1819
1679 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1680 return 0; 1821 return 0;
1681 1822
1682 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1683 1824
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1826
1690 if (sv_hook) 1827 if (!coro_nready++)
1691 { 1828 if (coroapi.readyhook)
1692 dSP; 1829 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1830
1708 return 1; 1831 return 1;
1709} 1832}
1710 1833
1711static int 1834static int
… …
1756 { 1879 {
1757 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1760 { 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
1761 ++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 */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1889 --coro_nready;
1764 } 1890 }
1765 else 1891 else
1766 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1894 dSP;
1768 1895
1769 ENTER; 1896 ENTER;
1770 SAVETMPS; 1897 SAVETMPS;
1771 1898
… …
1881 2008
1882static void 2009static void
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2010coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2011{
1885 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);
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2013
1888 if (on_destroyp) 2014 if (on_destroyp)
1889 { 2015 {
1890 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;
1891 2019
1892 while (AvFILLp (on_destroy) >= 0) 2020 while (AvFILLp (on_destroy) >= 0)
1893 { 2021 {
1894 dSP; /* don't disturb outer sp */ 2022 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy); 2023 SV *cb = av_pop (on_destroy);
… …
1897 PUSHMARK (SP); 2025 PUSHMARK (SP);
1898 2026
1899 if (statusp) 2027 if (statusp)
1900 { 2028 {
1901 int i; 2029 int i;
1902 AV *status = (AV *)SvRV (*statusp);
1903 EXTEND (SP, AvFILLp (status) + 1); 2030 EXTEND (SP, AvFILLp (status) + 1);
1904 2031
1905 for (i = 0; i <= AvFILLp (status); ++i) 2032 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]); 2033 PUSHs (AvARRAY (status)[i]);
1907 } 2034 }
… …
1917{ 2044{
1918 int i; 2045 int i;
1919 HV *hv = (HV *)SvRV (coro_current); 2046 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV (); 2047 AV *av = newAV ();
1921 2048
2049 /* items are actually not so common, so optimise for this case */
2050 if (items)
2051 {
1922 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1923 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1925 2057
1926 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);
1927 2059
1928 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 */
1929 api_ready (aTHX_ sv_manager); 2061 api_ready (aTHX_ sv_manager);
… …
2019 2151
2020static void 2152static void
2021coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
2022{ 2154{
2023 dXSARGS; 2155 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
2025 2157
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2159 {
2028 /* first call, set args */ 2160 /* first call, set args */
2029 SV *coro = SvRV (data); 2161 SV *coro = SvRV (data);
… …
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2230
2099 { 2231 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
2102 2234
2103 frame->data = (void *)data; 2235 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
2106 } 2238 }
… …
2110coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
2111{ 2243{
2112 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2248
2117 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);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2251
2120 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2346 { 2478 {
2347 if (items > slf_arga) 2479 if (items > slf_arga)
2348 { 2480 {
2349 slf_arga = items; 2481 slf_arga = items;
2350 free (slf_argv); 2482 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2352 } 2484 }
2353 2485
2354 slf_argc = items; 2486 slf_argc = items;
2355 2487
2356 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
… …
2643{ 2775{
2644 if (items >= 2) 2776 if (items >= 2)
2645 { 2777 {
2646 /* callback form */ 2778 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 2781
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 2783
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
… …
2713{ 2845{
2714 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2715 2847
2716 if (items >= 2) 2848 if (items >= 2)
2717 { 2849 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2850 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2851 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 2852
2721 if (SvIVX (AvARRAY (av)[0])) 2853 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2854 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 2855
2724 frame->prepare = prepare_nop; 2856 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 2857 frame->check = slf_check_nop;
2726 } 2858 }
2727 else if (SvIVX (AvARRAY (av)[0])) 2859 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 2890
2759static void 2891static void
2760coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2761{ 2893{
2762 dXSARGS; 2894 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2766 2898
2767 av_extend (state, items - 1); 2899 av_extend (state, items - 1);
2768 2900
… …
2882 3014
2883 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2885 3017
2886 /* now push the callback closure */ 3018 /* now push the callback closure */
2887 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))));
2888 3020
2889 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3022 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3024 }
2893 3025
2894 /* 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 */
2895 frame->data = (void *)state; 3027 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2898} 3030}
2899 3031
… …
2910/*****************************************************************************/ 3042/*****************************************************************************/
2911 3043
2912#if CORO_CLONE 3044#if CORO_CLONE
2913# include "clone.c" 3045# include "clone.c"
2914#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}
2915 3105
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3107
2918PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2919 3109
… …
2972 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3166
2977 { 3167 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3168
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2987} 3170}
2988 3171
2989SV * 3172SV *
2990new (char *klass, ...) 3173new (SV *klass, ...)
2991 ALIAS: 3174 ALIAS:
2992 Coro::new = 1 3175 Coro::new = 1
2993 CODE: 3176 CODE:
2994{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3178 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3179 RETVAL
3046 3180
3047void 3181void
3048transfer (...) 3182transfer (...)
3049 PROTOTYPE: $$ 3183 PROTOTYPE: $$
… …
3186 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3321 OUTPUT:
3188 RETVAL 3322 RETVAL
3189 3323
3190void 3324void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
3193 CODE: 3327 CODE:
3194{ 3328{
3195 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3197 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3332 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3200} 3334}
3201 3335
3202void 3336void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
… …
3261cancel (Coro::State self) 3395cancel (Coro::State self)
3262 CODE: 3396 CODE:
3263 coro_state_destroy (aTHX_ self); 3397 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3265 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
3266 3456
3267MODULE = Coro::State PACKAGE = Coro 3457MODULE = Coro::State PACKAGE = Coro
3268 3458
3269BOOT: 3459BOOT:
3270{ 3460{
… …
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3470
3281 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);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 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);
3284 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 */
3285 3475
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3476 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3477
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3308 sv_setiv (sv, (IV)&coroapi); 3498 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3499 SvREADONLY_on (sv);
3310 } 3500 }
3311} 3501}
3312 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
3313void 3512void
3314terminate (...) 3513terminate (...)
3315 CODE: 3514 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3515 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3317 3516
… …
3351_set_readyhook (SV *hook) 3550_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3551 PROTOTYPE: $
3353 CODE: 3552 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3553 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3554 SvGETMAGIC (hook);
3555 if (SvOK (hook))
3556 {
3356 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 }
3357 3565
3358int 3566int
3359prio (Coro::State coro, int newprio = 0) 3567prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3568 PROTOTYPE: $;$
3361 ALIAS: 3569 ALIAS:
… …
3367 if (items > 1) 3575 if (items > 1)
3368 { 3576 {
3369 if (ix) 3577 if (ix)
3370 newprio = coro->prio - newprio; 3578 newprio = coro->prio - newprio;
3371 3579
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3580 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3581 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3582
3375 coro->prio = newprio; 3583 coro->prio = newprio;
3376 } 3584 }
3377} 3585}
3378 OUTPUT: 3586 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 3633 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 3634 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 3635
3428 if ((SV *)hv == &PL_sv_undef) 3636 if ((SV *)hv == &PL_sv_undef)
3429 { 3637 {
3430 PUSHMARK (SP); 3638 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3640 SvREFCNT_dec (sv);
3439 } 3641 }
3440 3642
3441 { 3643 {
3442 struct coro *coro = SvSTATE_hv (hv); 3644 struct coro *coro = SvSTATE_hv (hv);
3443 3645
… …
3477 CODE: 3679 CODE:
3478{ 3680{
3479 struct coro *coro = SvSTATE_current; 3681 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 3683
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 3684 block = s_get_cv_croak (block);
3483 3685
3484 if (!*avp) 3686 if (!*avp)
3485 *avp = newAV (); 3687 *avp = newAV ();
3486 3688
3487 av_push (*avp, SvREFCNT_inc (block)); 3689 av_push (*avp, SvREFCNT_inc (block));
… …
3687 3889
3688void 3890void
3689_register (char *target, char *proto, SV *req) 3891_register (char *target, char *proto, SV *req)
3690 CODE: 3892 CODE:
3691{ 3893{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 3894 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 3895 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3896 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 3897 sv_setpv ((SV *)slf_cv, proto);
3696 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);
3697} 3899}
3698 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