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.384 by root, Thu Feb 17 01:32:18 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
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 121# endif
172#endif 122#endif
173 123
174static 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]);
175 126
176/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
179 130
… …
200static SV *sv_pool_size; 151static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 155static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 156
207/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
208static 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;
209 165
210static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
212 168
213enum { 169enum {
… …
284 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */ 242 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 243 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 244 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro); 245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
290 246
291 /* statistics */ 247 /* statistics */
292 int usecount; /* number of transfers to this coro */ 248 int usecount; /* number of transfers to this coro */
293 249
294 /* coro process data */ 250 /* coro process data */
… …
302 AV *invoke_av; 258 AV *invoke_av;
303 259
304 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
305 AV *on_enter; 261 AV *on_enter;
306 AV *on_leave; 262 AV *on_leave;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
307 269
308 /* linked list */ 270 /* linked list */
309 struct coro *next, *prev; 271 struct coro *next, *prev;
310}; 272};
311 273
… …
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
334static struct coro *coro_first; 296static struct coro *coro_first;
335#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
336 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}
318
337/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
338 320
339static SV * 321static SV *
340coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
341{ 323{
… …
364 get_hv (name, create); 346 get_hv (name, create);
365#endif 347#endif
366 return get_hv (name, create); 348 return get_hv (name, create);
367} 349}
368 350
369/* may croak */ 351INLINE void
370INLINE CV * 352coro_times_update ()
371coro_sv_2cv (pTHX_ SV *sv)
372{ 353{
373 HV *st; 354#ifdef coro_clock_gettime
374 GV *gvp; 355 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 356
377 if (!cv) 357 ts.tv_sec = ts.tv_nsec = 0;
378 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;
379 360
380 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];
381} 396}
382 397
383/*****************************************************************************/ 398/*****************************************************************************/
384/* magic glue */ 399/* magic glue */
385 400
… …
488 AV *padlist; 503 AV *padlist;
489 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
490 505
491 /* perl manages to free our internal AV and _then_ call us */ 506 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 507 if (IN_DESTRUCT)
493 return; 508 return 0;
494 509
495 /* casting is fun. */ 510 /* casting is fun. */
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
498 513
… …
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 563}
549 564
550/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
551 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
552static void 618static void
553on_enterleave_call (pTHX_ SV *cb); 619on_enterleave_call (pTHX_ SV *cb);
554 620
555static void 621static void
556load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
… …
587 } 653 }
588 654
589 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 656 CORO_THROW = c->except;
591 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
592 if (expect_false (c->on_enter)) 666 if (expect_false (c->on_enter))
593 { 667 {
594 int i; 668 int i;
595 669
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 672 }
673
674 SWAP_SVS (c);
599} 675}
600 676
601static void 677static void
602save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
603{ 679{
680 SWAP_SVS (c);
681
604 if (expect_false (c->on_leave)) 682 if (expect_false (c->on_leave))
605 { 683 {
606 int i; 684 int i;
607 685
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 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);
610 } 696 }
611 697
612 c->except = CORO_THROW; 698 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
614 700
… …
663 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
664 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
667 { 753 {
668 int i; 754 unsigned int i;
669 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
670 CXINC; 756 CXINC;
671 } 757 }
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
673 759
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 994{
909 return 1; 995 return 1;
910} 996}
911 997
912static UNOP coro_setup_op; 998static UNOP init_perl_op;
913 999
914static 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 */
915coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
916{ 1002{
917 /* 1003 /*
918 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
919 */ 1005 */
920 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1013 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1014 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1015 PL_curpm = 0;
930 PL_curpad = 0; 1016 PL_curpad = 0;
931 PL_localizing = 0; 1017 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1018 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1019#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1020 PL_parser = 0;
936#endif 1021#endif
937 PL_hints = 0; 1022 PL_hints = 0;
… …
969 */ 1054 */
970 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1055 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 */ 1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
972 1057
973 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1058 /* 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; 1059 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1060 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1061 init_perl_op.op_ppaddr = pp_slf;
977 /* no flags etc. required, as an init function won't be called */ 1062 /* no flags etc. required, as an init function won't be called */
978 1063
979 PL_op = (OP *)&coro_setup_op; 1064 PL_op = (OP *)&init_perl_op;
980 1065
981 /* copy throw, in case it was set before coro_setup */ 1066 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1067 CORO_THROW = coro->except;
1068
1069 SWAP_SVS (coro);
1070
1071 if (expect_false (enable_times))
1072 {
1073 coro_times_update ();
1074 coro_times_sub (coro);
1075 }
983} 1076}
984 1077
985static void 1078static void
986coro_unwind_stacks (pTHX) 1079coro_unwind_stacks (pTHX)
987{ 1080{
… …
1002 dounwind (-1); 1095 dounwind (-1);
1003 } 1096 }
1004} 1097}
1005 1098
1006static void 1099static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1100destroy_perl (pTHX_ struct coro *coro)
1008{ 1101{
1009 SV *svf [9]; 1102 SV *svf [9];
1010 1103
1011 { 1104 {
1012 struct coro *current = SvSTATE_current; 1105 struct coro *current = SvSTATE_current;
… …
1016 save_perl (aTHX_ current); 1109 save_perl (aTHX_ current);
1017 load_perl (aTHX_ coro); 1110 load_perl (aTHX_ coro);
1018 1111
1019 coro_unwind_stacks (aTHX); 1112 coro_unwind_stacks (aTHX);
1020 coro_destruct_stacks (aTHX); 1113 coro_destruct_stacks (aTHX);
1114
1115 /* restore swapped sv's */
1116 SWAP_SVS (coro);
1021 1117
1022 // now save some sv's to be free'd later 1118 // now save some sv's to be free'd later
1023 svf [0] = GvSV (PL_defgv); 1119 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1120 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1121 svf [2] = GvSV (PL_errgv);
… …
1033 1129
1034 load_perl (aTHX_ current); 1130 load_perl (aTHX_ current);
1035 } 1131 }
1036 1132
1037 { 1133 {
1038 int i; 1134 unsigned int i;
1039 1135
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1136 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1137 SvREFCNT_dec (svf [i]);
1042 1138
1043 SvREFCNT_dec (coro->saved_deffh); 1139 SvREFCNT_dec (coro->saved_deffh);
… …
1249 /* somebody or something will hit me for both perl_run and PL_restartop */ 1345 /* somebody or something will hit me for both perl_run and PL_restartop */
1250 PL_restartop = PL_op; 1346 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1347 perl_run (PL_curinterp);
1252 /* 1348 /*
1253 * Unfortunately, there is no way to get at the return values of the 1349 * Unfortunately, there is no way to get at the return values of the
1254 * coro body here, as perl_run destroys these 1350 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1351 * runtime errors here, as this is just a random interpreter, not a thread.
1255 */ 1352 */
1256 1353
1257 /* 1354 /*
1258 * If perl-run returns we assume exit() was being called or the coro 1355 * 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) 1356 * fell off the end, which seems to be the only valid (non-bug)
… …
1466 if (expect_false (next->flags & CF_NEW)) 1563 if (expect_false (next->flags & CF_NEW))
1467 { 1564 {
1468 /* need to start coroutine */ 1565 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1566 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1567 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1568 init_perl (aTHX_ next);
1472 } 1569 }
1473 else 1570 else
1474 load_perl (aTHX_ next); 1571 load_perl (aTHX_ next);
1475 1572
1476 /* possibly untie and reuse the cctx */ 1573 /* possibly untie and reuse the cctx */
… …
1539 1636
1540 if (coro->mainstack 1637 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1638 && coro->mainstack != main_mainstack
1542 && coro->slot 1639 && coro->slot
1543 && !PL_dirty) 1640 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1641 destroy_perl (aTHX_ coro);
1642
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1545 1646
1546 cctx_destroy (coro->cctx); 1647 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1648 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1649 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1651 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 1652
1555 return 1; 1653 return 1;
1556} 1654}
1557 1655
1558static int 1656static int
… …
1608 1706
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1707 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1708 TRANSFER (ta, 1);
1611} 1709}
1612 1710
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 ********************************************************************/ 1711/** Coro ********************************************************************/
1637 1712
1638INLINE void 1713INLINE void
1639coro_enq (pTHX_ struct coro *coro) 1714coro_enq (pTHX_ struct coro *coro)
1640{ 1715{
… …
1665 } 1740 }
1666 1741
1667 return 0; 1742 return 0;
1668} 1743}
1669 1744
1745static void
1746invoke_sv_ready_hook_helper (void)
1747{
1748 dTHX;
1749 dSP;
1750
1751 ENTER;
1752 SAVETMPS;
1753
1754 PUSHMARK (SP);
1755 PUTBACK;
1756 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1757
1758 FREETMPS;
1759 LEAVE;
1760}
1761
1670static int 1762static int
1671api_ready (pTHX_ SV *coro_sv) 1763api_ready (pTHX_ SV *coro_sv)
1672{ 1764{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1765 struct coro *coro = SvSTATE (coro_sv);
1678 1766
1679 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1680 return 0; 1768 return 0;
1681 1769
1682 coro->flags |= CF_READY; 1770 coro->flags |= CF_READY;
1683 1771
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1772 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1773
1690 if (sv_hook) 1774 if (!coro_nready++)
1691 { 1775 if (coroapi.readyhook)
1692 dSP; 1776 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 1777
1708 return 1; 1778 return 1;
1709} 1779}
1710 1780
1711static int 1781static int
… …
1756 { 1826 {
1757 /* nothing to schedule: call the idle handler */ 1827 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1828 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1829 && SvOBJECT (SvRV (sv_idle)))
1760 { 1830 {
1831 if (SvRV (sv_idle) == SvRV (coro_current))
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1833
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1835 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1836 --coro_nready;
1764 } 1837 }
1765 else 1838 else
1766 { 1839 {
1840 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1841 dSP;
1768 1842
1769 ENTER; 1843 ENTER;
1770 SAVETMPS; 1844 SAVETMPS;
1771 1845
… …
1917{ 1991{
1918 int i; 1992 int i;
1919 HV *hv = (HV *)SvRV (coro_current); 1993 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV (); 1994 AV *av = newAV ();
1921 1995
1996 /* items are actually not so common, so optimise for this case */
1997 if (items)
1998 {
1922 av_extend (av, items - 1); 1999 av_extend (av, items - 1);
2000
1923 for (i = 0; i < items; ++i) 2001 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2002 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 }
1925 2004
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1927 2006
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2008 api_ready (aTHX_ sv_manager);
… …
2019 2098
2020static void 2099static void
2021coro_rouse_callback (pTHX_ CV *cv) 2100coro_rouse_callback (pTHX_ CV *cv)
2022{ 2101{
2023 dXSARGS; 2102 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)S_GENSUB_ARG;
2025 2104
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2106 {
2028 /* first call, set args */ 2107 /* first call, set args */
2029 SV *coro = SvRV (data); 2108 SV *coro = SvRV (data);
… …
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2174 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2176 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2177
2099 { 2178 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2180 SV *data = (SV *)S_GENSUB_ARG;
2102 2181
2103 frame->data = (void *)data; 2182 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2184 frame->check = slf_check_rouse_wait;
2106 } 2185 }
… …
2110coro_new_rouse_cb (pTHX) 2189coro_new_rouse_cb (pTHX)
2111{ 2190{
2112 HV *hv = (HV *)SvRV (coro_current); 2191 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2192 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2193 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2194 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2195
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2197 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2198
2120 SvREFCNT_dec (coro->rouse_cb); 2199 SvREFCNT_dec (coro->rouse_cb);
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2424 if (PL_op->op_flags & OPf_STACKED)
2346 { 2425 {
2347 if (items > slf_arga) 2426 if (items > slf_arga)
2348 { 2427 {
2349 slf_arga = items; 2428 slf_arga = items;
2350 free (slf_argv); 2429 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2430 New (0, slf_argv, slf_arga, SV *);
2352 } 2431 }
2353 2432
2354 slf_argc = items; 2433 slf_argc = items;
2355 2434
2356 for (i = 0; i < items; ++i) 2435 for (i = 0; i < items; ++i)
… …
2643{ 2722{
2644 if (items >= 2) 2723 if (items >= 2)
2645 { 2724 {
2646 /* callback form */ 2725 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 2726 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2727 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 2728
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 2730
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 2732 coro_semaphore_adjust (aTHX_ av, 0);
… …
2713{ 2792{
2714 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2715 2794
2716 if (items >= 2) 2795 if (items >= 2)
2717 { 2796 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2797 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2798 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 2799
2721 if (SvIVX (AvARRAY (av)[0])) 2800 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2801 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 2802
2724 frame->prepare = prepare_nop; 2803 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 2804 frame->check = slf_check_nop;
2726 } 2805 }
2727 else if (SvIVX (AvARRAY (av)[0])) 2806 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 2837
2759static void 2838static void
2760coro_aio_callback (pTHX_ CV *cv) 2839coro_aio_callback (pTHX_ CV *cv)
2761{ 2840{
2762 dXSARGS; 2841 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 2842 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 2843 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 2844 SV *data_sv = newSV (sizeof (struct io_state));
2766 2845
2767 av_extend (state, items - 1); 2846 av_extend (state, items - 1);
2768 2847
… …
2882 2961
2883 for (i = 0; i < items; ++i) 2962 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 2963 PUSHs (arg [i]);
2885 2964
2886 /* now push the callback closure */ 2965 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2966 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 2967
2889 /* now call the AIO function - we assume our request is uncancelable */ 2968 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 2969 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 2970 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 2971 }
2893 2972
2894 /* now that the requets is going, we loop toll we have a result */ 2973 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 2974 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 2975 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 2976 frame->check = slf_check_aio_req;
2898} 2977}
2899 2978
… …
2910/*****************************************************************************/ 2989/*****************************************************************************/
2911 2990
2912#if CORO_CLONE 2991#if CORO_CLONE
2913# include "clone.c" 2992# include "clone.c"
2914#endif 2993#endif
2994
2995/*****************************************************************************/
2996
2997static SV *
2998coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2999{
3000 SV *coro_sv;
3001 struct coro *coro;
3002 MAGIC *mg;
3003 HV *hv;
3004 SV *cb;
3005 int i;
3006
3007 if (argc > 0)
3008 {
3009 cb = s_get_cv_croak (argv [0]);
3010
3011 if (!is_coro)
3012 {
3013 if (CvISXSUB (cb))
3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3015
3016 if (!CvROOT (cb))
3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
3019 }
3020
3021 Newz (0, coro, 1, struct coro);
3022 coro->args = newAV ();
3023 coro->flags = CF_NEW;
3024
3025 if (coro_first) coro_first->prev = coro;
3026 coro->next = coro_first;
3027 coro_first = coro;
3028
3029 coro->hv = hv = newHV ();
3030 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3031 mg->mg_flags |= MGf_DUP;
3032 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3033
3034 if (argc > 0)
3035 {
3036 av_extend (coro->args, argc + is_coro - 1);
3037
3038 if (is_coro)
3039 {
3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
3046 for (i = 1; i < argc; i++)
3047 av_push (coro->args, newSVsv (argv [i]));
3048 }
3049
3050 return coro_sv;
3051}
2915 3052
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3054
2918PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2919 3056
… …
2979 3116
2980 if (!svp) croak ("Time::HiRes is required"); 3117 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982 3119
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2984 } 3124 }
2985 3125
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2987} 3127}
2988 3128
2989SV * 3129SV *
2990new (char *klass, ...) 3130new (SV *klass, ...)
2991 ALIAS: 3131 ALIAS:
2992 Coro::new = 1 3132 Coro::new = 1
2993 CODE: 3133 CODE:
2994{ 3134 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3135 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 3136 RETVAL
3046 3137
3047void 3138void
3048transfer (...) 3139transfer (...)
3049 PROTOTYPE: $$ 3140 PROTOTYPE: $$
… …
3186 RETVAL = boolSV (coro->flags & ix); 3277 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3278 OUTPUT:
3188 RETVAL 3279 RETVAL
3189 3280
3190void 3281void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3282throw (Coro::State self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3283 PROTOTYPE: $;$
3193 CODE: 3284 CODE:
3194{ 3285{
3195 struct coro *current = SvSTATE_current; 3286 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3197 SvREFCNT_dec (*throwp); 3288 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3289 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3200} 3291}
3201 3292
3202void 3293void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3295 PROTOTYPE: $;$
… …
3262 CODE: 3353 CODE:
3263 coro_state_destroy (aTHX_ self); 3354 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3265 3356
3266 3357
3358SV *
3359enable_times (int enabled = enable_times)
3360 CODE:
3361{
3362 RETVAL = boolSV (enable_times);
3363
3364 if (enabled != enable_times)
3365 {
3366 enable_times = enabled;
3367
3368 coro_times_update ();
3369 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3370 }
3371}
3372 OUTPUT:
3373 RETVAL
3374
3375void
3376times (Coro::State self)
3377 PPCODE:
3378{
3379 struct coro *current = SvSTATE (coro_current);
3380
3381 if (expect_false (current == self))
3382 {
3383 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current));
3385 }
3386
3387 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3389 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390
3391 if (expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current));
3393}
3394
3395void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3397 CODE:
3398{
3399 struct coro *current = SvSTATE_current;
3400
3401 if (current == coro)
3402 SWAP_SVS (current);
3403
3404 if (!coro->swap_sv)
3405 coro->swap_sv = newAV ();
3406
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3409
3410 if (current == coro)
3411 SWAP_SVS (current);
3412}
3413
3414
3267MODULE = Coro::State PACKAGE = Coro 3415MODULE = Coro::State PACKAGE = Coro
3268 3416
3269BOOT: 3417BOOT:
3270{ 3418{
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3428
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3429 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); 3430 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); 3431 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); 3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3433
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3434 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3435
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3308 sv_setiv (sv, (IV)&coroapi); 3456 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3457 SvREADONLY_on (sv);
3310 } 3458 }
3311} 3459}
3312 3460
3461SV *
3462async (...)
3463 PROTOTYPE: &@
3464 CODE:
3465 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3466 api_ready (aTHX_ RETVAL);
3467 OUTPUT:
3468 RETVAL
3469
3313void 3470void
3314terminate (...) 3471terminate (...)
3315 CODE: 3472 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3473 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3317 3474
… …
3351_set_readyhook (SV *hook) 3508_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3509 PROTOTYPE: $
3353 CODE: 3510 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3511 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3512 SvGETMAGIC (hook);
3513 if (SvOK (hook))
3514 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3515 coro_readyhook = newSVsv (hook);
3516 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3517 }
3518 else
3519 {
3520 coro_readyhook = 0;
3521 CORO_READYHOOK = 0;
3522 }
3357 3523
3358int 3524int
3359prio (Coro::State coro, int newprio = 0) 3525prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3526 PROTOTYPE: $;$
3361 ALIAS: 3527 ALIAS:
… …
3367 if (items > 1) 3533 if (items > 1)
3368 { 3534 {
3369 if (ix) 3535 if (ix)
3370 newprio = coro->prio - newprio; 3536 newprio = coro->prio - newprio;
3371 3537
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3538 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3539 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3540
3375 coro->prio = newprio; 3541 coro->prio = newprio;
3376 } 3542 }
3377} 3543}
3378 OUTPUT: 3544 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 3591 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 3592 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 3593
3428 if ((SV *)hv == &PL_sv_undef) 3594 if ((SV *)hv == &PL_sv_undef)
3429 { 3595 {
3430 PUSHMARK (SP); 3596 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)); 3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3598 SvREFCNT_dec (sv);
3439 } 3599 }
3440 3600
3441 { 3601 {
3442 struct coro *coro = SvSTATE_hv (hv); 3602 struct coro *coro = SvSTATE_hv (hv);
3443 3603
… …
3477 CODE: 3637 CODE:
3478{ 3638{
3479 struct coro *coro = SvSTATE_current; 3639 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 3641
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 3642 block = s_get_cv_croak (block);
3483 3643
3484 if (!*avp) 3644 if (!*avp)
3485 *avp = newAV (); 3645 *avp = newAV ();
3486 3646
3487 av_push (*avp, SvREFCNT_inc (block)); 3647 av_push (*avp, SvREFCNT_inc (block));
… …
3687 3847
3688void 3848void
3689_register (char *target, char *proto, SV *req) 3849_register (char *target, char *proto, SV *req)
3690 CODE: 3850 CODE:
3691{ 3851{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 3852 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 3853 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3854 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 3855 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3856 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 3857}
3698 3858
3859MODULE = Coro::State PACKAGE = Coro::Select
3860
3861void
3862patch_pp_sselect ()
3863 CODE:
3864 if (!coro_old_pp_sselect)
3865 {
3866 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3867 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3868 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3869 }
3870
3871void
3872unpatch_pp_sselect ()
3873 CODE:
3874 if (coro_old_pp_sselect)
3875 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0;
3878 }
3879

Diff Legend

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