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.359 by root, Mon Jun 29 05:07:19 2009 UTC vs.
Revision 1.389 by root, Fri Mar 4 16:41:21 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
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;
209 160
210/* enable processtime/realtime profiling */ 161/* enable processtime/realtime profiling */
211static char profile_times; 162static char enable_times;
212typedef U32 coro_ts[2]; 163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
213 166
214static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
215static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
216 169
217enum { 170enum {
… …
288 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
289 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
290 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
291 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
292 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
293 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
294 247
295 /* statistics */ 248 /* statistics */
296 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
297 250
298 /* coro process data */ 251 /* coro process data */
… …
306 AV *invoke_av; 259 AV *invoke_av;
307 260
308 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
309 AV *on_enter; 262 AV *on_enter;
310 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;
311 270
312 /* linked list */ 271 /* linked list */
313 struct coro *next, *prev; 272 struct coro *next, *prev;
314}; 273};
315 274
… …
336static 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 */
337static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
338static struct coro *coro_first; 297static struct coro *coro_first;
339#define coro_nready coroapi.nready 298#define coro_nready coroapi.nready
340 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
341/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
342 373
343static SV * 374static SV *
344coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
345{ 376{
… …
368 get_hv (name, create); 399 get_hv (name, create);
369#endif 400#endif
370 return get_hv (name, create); 401 return get_hv (name, create);
371} 402}
372 403
373/* may croak */ 404INLINE void
374INLINE CV * 405coro_times_update ()
375coro_sv_2cv (pTHX_ SV *sv)
376{ 406{
377 HV *st; 407#ifdef coro_clock_gettime
378 GV *gvp; 408 struct timespec ts;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380 409
381 if (!cv) 410 ts.tv_sec = ts.tv_nsec = 0;
382 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;
383 413
384 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];
385} 449}
386 450
387/*****************************************************************************/ 451/*****************************************************************************/
388/* magic glue */ 452/* magic glue */
389 453
… …
492 AV *padlist; 556 AV *padlist;
493 AV *av = (AV *)mg->mg_obj; 557 AV *av = (AV *)mg->mg_obj;
494 558
495 /* perl manages to free our internal AV and _then_ call us */ 559 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 560 if (IN_DESTRUCT)
497 return; 561 return 0;
498 562
499 /* casting is fun. */ 563 /* casting is fun. */
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
502 566
… …
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 616}
553 617
554/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
555 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
556static void 671static void
557on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
558 673
559static void 674static void
560load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
… …
591 } 706 }
592 707
593 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 709 CORO_THROW = c->except;
595 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
596 if (expect_false (c->on_enter)) 719 if (expect_false (c->on_enter))
597 { 720 {
598 int i; 721 int i;
599 722
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
602 } 725 }
726
727 SWAP_SVS (c);
603} 728}
604 729
605static void 730static void
606save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
607{ 732{
733 SWAP_SVS (c);
734
608 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
609 { 736 {
610 int i; 737 int i;
611 738
612 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 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);
614 } 749 }
615 750
616 c->except = CORO_THROW; 751 c->except = CORO_THROW;
617 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
618 753
… …
667 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
668 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
669 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
670 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
671 { 806 {
672 int i; 807 unsigned int i;
673 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
674 CXINC; 809 CXINC;
675 } 810 }
676 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
677 812
… …
911slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
912{ 1047{
913 return 1; 1048 return 1;
914} 1049}
915 1050
916static UNOP coro_setup_op; 1051static UNOP init_perl_op;
917 1052
918static 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 */
919coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
920{ 1055{
921 /* 1056 /*
922 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
923 */ 1058 */
924 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
931 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
932 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
933 PL_curpm = 0; 1068 PL_curpm = 0;
934 PL_curpad = 0; 1069 PL_curpad = 0;
935 PL_localizing = 0; 1070 PL_localizing = 0;
936 PL_dirty = 0;
937 PL_restartop = 0; 1071 PL_restartop = 0;
938#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
939 PL_parser = 0; 1073 PL_parser = 0;
940#endif 1074#endif
941 PL_hints = 0; 1075 PL_hints = 0;
… …
973 */ 1107 */
974 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 */
975 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 */
976 1110
977 /* 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 */
978 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
979 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
980 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
981 /* 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 */
982 1116
983 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
984 1118
985 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
986 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 }
987} 1129}
988 1130
989static void 1131static void
990coro_unwind_stacks (pTHX) 1132coro_unwind_stacks (pTHX)
991{ 1133{
… …
1006 dounwind (-1); 1148 dounwind (-1);
1007 } 1149 }
1008} 1150}
1009 1151
1010static void 1152static void
1011coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
1012{ 1154{
1013 SV *svf [9]; 1155 SV *svf [9];
1014 1156
1015 { 1157 {
1016 struct coro *current = SvSTATE_current; 1158 struct coro *current = SvSTATE_current;
… …
1020 save_perl (aTHX_ current); 1162 save_perl (aTHX_ current);
1021 load_perl (aTHX_ coro); 1163 load_perl (aTHX_ coro);
1022 1164
1023 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1024 coro_destruct_stacks (aTHX); 1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1025 1170
1026 // now save some sv's to be free'd later 1171 // now save some sv's to be free'd later
1027 svf [0] = GvSV (PL_defgv); 1172 svf [0] = GvSV (PL_defgv);
1028 svf [1] = (SV *)GvAV (PL_defgv); 1173 svf [1] = (SV *)GvAV (PL_defgv);
1029 svf [2] = GvSV (PL_errgv); 1174 svf [2] = GvSV (PL_errgv);
… …
1037 1182
1038 load_perl (aTHX_ current); 1183 load_perl (aTHX_ current);
1039 } 1184 }
1040 1185
1041 { 1186 {
1042 int i; 1187 unsigned int i;
1043 1188
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]); 1190 SvREFCNT_dec (svf [i]);
1046 1191
1047 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
… …
1253 /* 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 */
1254 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1255 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1256 /* 1401 /*
1257 * 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
1258 * 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.
1259 */ 1405 */
1260 1406
1261 /* 1407 /*
1262 * 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
1263 * 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)
… …
1470 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1471 { 1617 {
1472 /* need to start coroutine */ 1618 /* need to start coroutine */
1473 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1474 /* setup coroutine call */ 1620 /* setup coroutine call */
1475 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1476 } 1622 }
1477 else 1623 else
1478 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1479 1625
1480 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
… …
1543 1689
1544 if (coro->mainstack 1690 if (coro->mainstack
1545 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1546 && coro->slot 1692 && coro->slot
1547 && !PL_dirty) 1693 && !PL_dirty)
1548 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;
1549 1699
1550 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1551 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1552 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1553 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1554
1555 if (coro->next) coro->next->prev = coro->prev;
1556 if (coro->prev) coro->prev->next = coro->next;
1557 if (coro == coro_first) coro_first = coro->next;
1558 1705
1559 return 1; 1706 return 1;
1560} 1707}
1561 1708
1562static int 1709static int
… …
1612 1759
1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1614 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1615} 1762}
1616 1763
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1640/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1641 1765
1642INLINE void 1766INLINE void
1643coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1644{ 1768{
… …
1669 } 1793 }
1670 1794
1671 return 0; 1795 return 0;
1672} 1796}
1673 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
1674static int 1815static int
1675api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1676{ 1817{
1677 struct coro *coro;
1678 SV *sv_hook;
1679 void (*xs_hook)(void);
1680
1681 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1682 1819
1683 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1684 return 0; 1821 return 0;
1685 1822
1686 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1687 1824
1688 sv_hook = coro_nready ? 0 : coro_readyhook;
1689 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1690
1691 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1692 ++coro_nready;
1693 1826
1694 if (sv_hook) 1827 if (!coro_nready++)
1695 { 1828 if (coroapi.readyhook)
1696 dSP; 1829 coroapi.readyhook ();
1697
1698 ENTER;
1699 SAVETMPS;
1700
1701 PUSHMARK (SP);
1702 PUTBACK;
1703 call_sv (sv_hook, G_VOID | G_DISCARD);
1704
1705 FREETMPS;
1706 LEAVE;
1707 }
1708
1709 if (xs_hook)
1710 xs_hook ();
1711 1830
1712 return 1; 1831 return 1;
1713} 1832}
1714 1833
1715static int 1834static int
… …
1760 { 1879 {
1761 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1762 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1763 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1764 { 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
1765 ++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 */
1766 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready; 1889 --coro_nready;
1768 } 1890 }
1769 else 1891 else
1770 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1771 dSP; 1894 dSP;
1772 1895
1773 ENTER; 1896 ENTER;
1774 SAVETMPS; 1897 SAVETMPS;
1775 1898
… …
1921{ 2044{
1922 int i; 2045 int i;
1923 HV *hv = (HV *)SvRV (coro_current); 2046 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV (); 2047 AV *av = newAV ();
1925 2048
2049 /* items are actually not so common, so optimise for this case */
2050 if (items)
2051 {
1926 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1927 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1929 2057
1930 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);
1931 2059
1932 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 */
1933 api_ready (aTHX_ sv_manager); 2061 api_ready (aTHX_ sv_manager);
… …
2023 2151
2024static void 2152static void
2025coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
2026{ 2154{
2027 dXSARGS; 2155 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
2029 2157
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 { 2159 {
2032 /* first call, set args */ 2160 /* first call, set args */
2033 SV *coro = SvRV (data); 2161 SV *coro = SvRV (data);
… …
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2230
2103 { 2231 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
2106 2234
2107 frame->data = (void *)data; 2235 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
2110 } 2238 }
… …
2114coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
2115{ 2243{
2116 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120 2248
2121 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);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
2123 2251
2124 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2350 { 2478 {
2351 if (items > slf_arga) 2479 if (items > slf_arga)
2352 { 2480 {
2353 slf_arga = items; 2481 slf_arga = items;
2354 free (slf_argv); 2482 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2356 } 2484 }
2357 2485
2358 slf_argc = items; 2486 slf_argc = items;
2359 2487
2360 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
… …
2647{ 2775{
2648 if (items >= 2) 2776 if (items >= 2)
2649 { 2777 {
2650 /* callback form */ 2778 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2653 2781
2654 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2655 2783
2656 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2657 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
… …
2717{ 2845{
2718 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2719 2847
2720 if (items >= 2) 2848 if (items >= 2)
2721 { 2849 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2850 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2851 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 2852
2725 if (SvIVX (AvARRAY (av)[0])) 2853 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2854 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 2855
2728 frame->prepare = prepare_nop; 2856 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 2857 frame->check = slf_check_nop;
2730 } 2858 }
2731 else if (SvIVX (AvARRAY (av)[0])) 2859 else if (SvIVX (AvARRAY (av)[0]))
… …
2762 2890
2763static void 2891static void
2764coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2765{ 2893{
2766 dXSARGS; 2894 dXSARGS;
2767 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2768 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2769 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2770 2898
2771 av_extend (state, items - 1); 2899 av_extend (state, items - 1);
2772 2900
… …
2886 3014
2887 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2888 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2889 3017
2890 /* now push the callback closure */ 3018 /* now push the callback closure */
2891 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))));
2892 3020
2893 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3022 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3024 }
2897 3025
2898 /* 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 */
2899 frame->data = (void *)state; 3027 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2902} 3030}
2903 3031
… …
2914/*****************************************************************************/ 3042/*****************************************************************************/
2915 3043
2916#if CORO_CLONE 3044#if CORO_CLONE
2917# include "clone.c" 3045# include "clone.c"
2918#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}
2919 3105
2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2921 3107
2922PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2923 3109
… …
2976 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
2977 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
2978 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
2979 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
2980 3166
2981 { 3167 time_init (aTHX);
2982 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2983
2984 if (!svp) croak ("Time::HiRes is required");
2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2986
2987 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2988 }
2989 3168
2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2991} 3170}
2992 3171
2993SV * 3172SV *
2994new (char *klass, ...) 3173new (SV *klass, ...)
2995 ALIAS: 3174 ALIAS:
2996 Coro::new = 1 3175 Coro::new = 1
2997 CODE: 3176 CODE:
2998{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2999 struct coro *coro; 3178 OUTPUT:
3000 MAGIC *mg;
3001 HV *hv;
3002 CV *cb;
3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3031
3032 if (items > 1)
3033 {
3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 2; i < items; i++)
3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
3047}
3048 OUTPUT:
3049 RETVAL 3179 RETVAL
3050 3180
3051void 3181void
3052transfer (...) 3182transfer (...)
3053 PROTOTYPE: $$ 3183 PROTOTYPE: $$
… …
3190 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
3191 OUTPUT: 3321 OUTPUT:
3192 RETVAL 3322 RETVAL
3193 3323
3194void 3324void
3195throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
3196 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
3197 CODE: 3327 CODE:
3198{ 3328{
3199 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
3200 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3201 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
3202 SvGETMAGIC (throw); 3332 SvGETMAGIC (exception);
3203 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3204} 3334}
3205 3335
3206void 3336void
3207api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3208 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
… …
3266 CODE: 3396 CODE:
3267 coro_state_destroy (aTHX_ self); 3397 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3269 3399
3270 3400
3401SV *
3402enable_times (int enabled = enable_times)
3403 CODE:
3404{
3405 RETVAL = boolSV (enable_times);
3406
3407 if (enabled != enable_times)
3408 {
3409 enable_times = enabled;
3410
3411 coro_times_update ();
3412 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3413 }
3414}
3415 OUTPUT:
3416 RETVAL
3417
3418void
3419times (Coro::State self)
3420 PPCODE:
3421{
3422 struct coro *current = SvSTATE (coro_current);
3423
3424 if (expect_false (current == self))
3425 {
3426 coro_times_update ();
3427 coro_times_add (SvSTATE (coro_current));
3428 }
3429
3430 EXTEND (SP, 2);
3431 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3432 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3433
3434 if (expect_false (current == self))
3435 coro_times_sub (SvSTATE (coro_current));
3436}
3437
3438void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3440 CODE:
3441{
3442 struct coro *current = SvSTATE_current;
3443
3444 if (current == coro)
3445 SWAP_SVS (current);
3446
3447 if (!coro->swap_sv)
3448 coro->swap_sv = newAV ();
3449
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3451 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3452
3453 if (current == coro)
3454 SWAP_SVS (current);
3455}
3456
3457
3271MODULE = Coro::State PACKAGE = Coro 3458MODULE = Coro::State PACKAGE = Coro
3272 3459
3273BOOT: 3460BOOT:
3274{ 3461{
3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284 3471
3285 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3472 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3473 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3474 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3475 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3289 3476
3290 coro_stash = gv_stashpv ("Coro", TRUE); 3477 coro_stash = gv_stashpv ("Coro", TRUE);
3291 3478
3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3479 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3480 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3294 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3481 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3312 sv_setiv (sv, (IV)&coroapi); 3499 sv_setiv (sv, (IV)&coroapi);
3313 SvREADONLY_on (sv); 3500 SvREADONLY_on (sv);
3314 } 3501 }
3315} 3502}
3316 3503
3504SV *
3505async (...)
3506 PROTOTYPE: &@
3507 CODE:
3508 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3509 api_ready (aTHX_ RETVAL);
3510 OUTPUT:
3511 RETVAL
3512
3317void 3513void
3318terminate (...) 3514terminate (...)
3319 CODE: 3515 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3516 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3321 3517
… …
3355_set_readyhook (SV *hook) 3551_set_readyhook (SV *hook)
3356 PROTOTYPE: $ 3552 PROTOTYPE: $
3357 CODE: 3553 CODE:
3358 SvREFCNT_dec (coro_readyhook); 3554 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook); 3555 SvGETMAGIC (hook);
3556 if (SvOK (hook))
3557 {
3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3558 coro_readyhook = newSVsv (hook);
3559 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3560 }
3561 else
3562 {
3563 coro_readyhook = 0;
3564 CORO_READYHOOK = 0;
3565 }
3361 3566
3362int 3567int
3363prio (Coro::State coro, int newprio = 0) 3568prio (Coro::State coro, int newprio = 0)
3364 PROTOTYPE: $;$ 3569 PROTOTYPE: $;$
3365 ALIAS: 3570 ALIAS:
… …
3429 for (i = 1; i < items; ++i) 3634 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i))); 3635 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431 3636
3432 if ((SV *)hv == &PL_sv_undef) 3637 if ((SV *)hv == &PL_sv_undef)
3433 { 3638 {
3434 PUSHMARK (SP); 3639 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3435 EXTEND (SP, 2);
3436 PUSHs (sv_Coro);
3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3640 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3641 SvREFCNT_dec (sv);
3443 } 3642 }
3444 3643
3445 { 3644 {
3446 struct coro *coro = SvSTATE_hv (hv); 3645 struct coro *coro = SvSTATE_hv (hv);
3447 3646
… …
3481 CODE: 3680 CODE:
3482{ 3681{
3483 struct coro *coro = SvSTATE_current; 3682 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3683 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3485 3684
3486 block = (SV *)coro_sv_2cv (aTHX_ block); 3685 block = s_get_cv_croak (block);
3487 3686
3488 if (!*avp) 3687 if (!*avp)
3489 *avp = newAV (); 3688 *avp = newAV ();
3490 3689
3491 av_push (*avp, SvREFCNT_inc (block)); 3690 av_push (*avp, SvREFCNT_inc (block));
… …
3691 3890
3692void 3891void
3693_register (char *target, char *proto, SV *req) 3892_register (char *target, char *proto, SV *req)
3694 CODE: 3893 CODE:
3695{ 3894{
3696 CV *req_cv = coro_sv_2cv (aTHX_ req); 3895 SV *req_cv = s_get_cv_croak (req);
3697 /* newXSproto doesn't return the CV on 5.8 */ 3896 /* newXSproto doesn't return the CV on 5.8 */
3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3897 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3699 sv_setpv ((SV *)slf_cv, proto); 3898 sv_setpv ((SV *)slf_cv, proto);
3700 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3899 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3701} 3900}
3702 3901
3902MODULE = Coro::State PACKAGE = Coro::Select
3903
3904void
3905patch_pp_sselect ()
3906 CODE:
3907 if (!coro_old_pp_sselect)
3908 {
3909 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3910 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3911 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3912 }
3913
3914void
3915unpatch_pp_sselect ()
3916 CODE:
3917 if (coro_old_pp_sselect)
3918 {
3919 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3920 coro_old_pp_sselect = 0;
3921 }
3922

Diff Legend

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