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.357 by root, Sat Jun 27 14:09:28 2009 UTC vs.
Revision 1.377 by root, Sat Oct 3 17:55:04 2009 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
… …
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
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 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
117#endif 64#endif
118 65
119#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
… …
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
164static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
165 123
166/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
169 127
… …
190static SV *sv_pool_size; 148static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 152static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 153
197/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
198static SV *sv_activity; 155static SV *sv_activity;
156
157/* enable processtime/realtime profiling */
158static char enable_times;
159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
199 162
200static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
202 165
203enum { 166enum {
… …
293 256
294 /* on_enter/on_leave */ 257 /* on_enter/on_leave */
295 AV *on_enter; 258 AV *on_enter;
296 AV *on_leave; 259 AV *on_leave;
297 260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
266
298 /* linked list */ 267 /* linked list */
299 struct coro *next, *prev; 268 struct coro *next, *prev;
300}; 269};
301 270
302typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
… …
307/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
309 278
310/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
311 280
312#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
318 287
319/* for Coro.pm */ 288/* for Coro.pm */
320static SV *coro_current; 289static SV *coro_current;
321static SV *coro_readyhook; 290static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 293static struct coro *coro_first;
325#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
326 315
327/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
328 317
329static SV * 318static SV *
330coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
… …
354 get_hv (name, create); 343 get_hv (name, create);
355#endif 344#endif
356 return get_hv (name, create); 345 return get_hv (name, create);
357} 346}
358 347
359/* may croak */ 348INLINE void
360INLINE CV * 349coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 350{
363 HV *st; 351#ifdef coro_clock_gettime
364 GV *gvp; 352 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 353
367 if (!cv) 354 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 355 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
356 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 357
370 return cv; 358 ts.tv_sec = ts.tv_nsec = 0;
359 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
360 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
361#else
362 dTHX;
363 UV tv[2];
364
365 u2time (aTHX_ tv);
366 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000;
368#endif
369}
370
371INLINE void
372coro_times_add (struct coro *c)
373{
374 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0];
377
378 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0];
381}
382
383INLINE void
384coro_times_sub (struct coro *c)
385{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0];
389
390 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
391 c->t_cpu [1] -= time_cpu [1];
392 c->t_cpu [0] -= time_cpu [0];
371} 393}
372 394
373/*****************************************************************************/ 395/*****************************************************************************/
374/* magic glue */ 396/* magic glue */
375 397
… …
475static int 497static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 499{
478 AV *padlist; 500 AV *padlist;
479 AV *av = (AV *)mg->mg_obj; 501 AV *av = (AV *)mg->mg_obj;
502
503 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT)
505 return 0;
480 506
481 /* casting is fun. */ 507 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
484 510
… …
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 560}
535 561
536/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
537 563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
538static void 615static void
539on_enterleave_call (pTHX_ SV *cb); 616on_enterleave_call (pTHX_ SV *cb);
540 617
541static void 618static void
542load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
… …
573 } 650 }
574 651
575 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 653 CORO_THROW = c->except;
577 654
655 if (expect_false (enable_times))
656 {
657 if (expect_false (!times_valid))
658 coro_times_update ();
659
660 coro_times_sub (c);
661 }
662
578 if (expect_false (c->on_enter)) 663 if (expect_false (c->on_enter))
579 { 664 {
580 int i; 665 int i;
581 666
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 669 }
670
671 SWAP_SVS (c);
585} 672}
586 673
587static void 674static void
588save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
589{ 676{
677 SWAP_SVS (c);
678
590 if (expect_false (c->on_leave)) 679 if (expect_false (c->on_leave))
591 { 680 {
592 int i; 681 int i;
593 682
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 }
686
687 times_valid = 0;
688
689 if (expect_false (enable_times))
690 {
691 coro_times_update (); times_valid = 1;
692 coro_times_add (c);
596 } 693 }
597 694
598 c->except = CORO_THROW; 695 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
600 697
… …
649 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
653 { 750 {
654 int i; 751 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 753 CXINC;
657 } 754 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 756
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 990slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 991{
895 return 1; 992 return 1;
896} 993}
897 994
898static UNOP coro_setup_op; 995static UNOP init_perl_op;
899 996
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 997static void NOINLINE /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
902{ 999{
903 /* 1000 /*
904 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
905 */ 1002 */
906 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
… …
955 */ 1052 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
958 1055
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
960 coro_setup_op.op_next = PL_op; 1057 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1058 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1060 /* no flags etc. required, as an init function won't be called */
964 1061
965 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
966 1063
967 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1065 CORO_THROW = coro->except;
1066
1067 SWAP_SVS (coro);
1068
1069 if (expect_false (enable_times))
1070 {
1071 coro_times_update ();
1072 coro_times_sub (coro);
1073 }
969} 1074}
970 1075
971static void 1076static void
972coro_unwind_stacks (pTHX) 1077coro_unwind_stacks (pTHX)
973{ 1078{
… …
988 dounwind (-1); 1093 dounwind (-1);
989 } 1094 }
990} 1095}
991 1096
992static void 1097static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1098destroy_perl (pTHX_ struct coro *coro)
994{ 1099{
995 SV *svf [9]; 1100 SV *svf [9];
996 1101
997 { 1102 {
998 struct coro *current = SvSTATE_current; 1103 struct coro *current = SvSTATE_current;
… …
1002 save_perl (aTHX_ current); 1107 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro); 1108 load_perl (aTHX_ coro);
1004 1109
1005 coro_unwind_stacks (aTHX); 1110 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX); 1111 coro_destruct_stacks (aTHX);
1112
1113 /* restore swapped sv's */
1114 SWAP_SVS (coro);
1007 1115
1008 // now save some sv's to be free'd later 1116 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv); 1117 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1118 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv); 1119 svf [2] = GvSV (PL_errgv);
… …
1019 1127
1020 load_perl (aTHX_ current); 1128 load_perl (aTHX_ current);
1021 } 1129 }
1022 1130
1023 { 1131 {
1024 int i; 1132 unsigned int i;
1025 1133
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1134 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1135 SvREFCNT_dec (svf [i]);
1028 1136
1029 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
… …
1235 /* somebody or something will hit me for both perl_run and PL_restartop */ 1343 /* somebody or something will hit me for both perl_run and PL_restartop */
1236 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1238 /* 1346 /*
1239 * Unfortunately, there is no way to get at the return values of the 1347 * Unfortunately, there is no way to get at the return values of the
1240 * coro body here, as perl_run destroys these 1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread.
1241 */ 1350 */
1242 1351
1243 /* 1352 /*
1244 * If perl-run returns we assume exit() was being called or the coro 1353 * If perl-run returns we assume exit() was being called or the coro
1245 * fell off the end, which seems to be the only valid (non-bug) 1354 * fell off the end, which seems to be the only valid (non-bug)
… …
1452 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1453 { 1562 {
1454 /* need to start coroutine */ 1563 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1565 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1458 } 1567 }
1459 else 1568 else
1460 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1461 1570
1462 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
… …
1525 1634
1526 if (coro->mainstack 1635 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1636 && coro->mainstack != main_mainstack
1528 && coro->slot 1637 && coro->slot
1529 && !PL_dirty) 1638 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1639 destroy_perl (aTHX_ coro);
1640
1641 if (coro->next) coro->next->prev = coro->prev;
1642 if (coro->prev) coro->prev->next = coro->next;
1643 if (coro == coro_first) coro_first = coro->next;
1531 1644
1532 cctx_destroy (coro->cctx); 1645 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1646 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1649 SvREFCNT_dec (CORO_THROW);
1536
1537 if (coro->next) coro->next->prev = coro->prev;
1538 if (coro->prev) coro->prev->next = coro->next;
1539 if (coro == coro_first) coro_first = coro->next;
1540 1650
1541 return 1; 1651 return 1;
1542} 1652}
1543 1653
1544static int 1654static int
… …
1594 1704
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1705 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1597} 1707}
1598 1708
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1709/** Coro ********************************************************************/
1623 1710
1624INLINE void 1711INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1626{ 1713{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1715
1629 SvREFCNT_inc_NN (coro->hv); 1716 SvREFCNT_inc_NN (coro->hv);
1630 1717
1631 coro->next_ready = 0; 1718 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1636INLINE struct coro * 1723INLINE struct coro *
1637coro_deq (pTHX) 1724coro_deq (pTHX)
1638{ 1725{
1639 int prio; 1726 int prio;
1640 1727
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1729 {
1643 struct coro **ready = coro_ready [prio]; 1730 struct coro **ready = coro_ready [prio];
1644 1731
1645 if (ready [0]) 1732 if (ready [0])
1646 { 1733 {
… …
1651 } 1738 }
1652 1739
1653 return 0; 1740 return 0;
1654} 1741}
1655 1742
1743static void
1744invoke_sv_ready_hook_helper (void)
1745{
1746 dTHX;
1747 dSP;
1748
1749 ENTER;
1750 SAVETMPS;
1751
1752 PUSHMARK (SP);
1753 PUTBACK;
1754 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1755
1756 FREETMPS;
1757 LEAVE;
1758}
1759
1656static int 1760static int
1657api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1658{ 1762{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1763 struct coro *coro = SvSTATE (coro_sv);
1664 1764
1665 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1666 return 0; 1766 return 0;
1667 1767
1668 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1669 1769
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1771
1676 if (sv_hook) 1772 if (!coro_nready++)
1677 { 1773 if (coroapi.readyhook)
1678 dSP; 1774 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1775
1694 return 1; 1776 return 1;
1695} 1777}
1696 1778
1697static int 1779static int
… …
1748 api_ready (aTHX_ SvRV (sv_idle)); 1830 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1831 --coro_nready;
1750 } 1832 }
1751 else 1833 else
1752 { 1834 {
1835 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1836 dSP;
1754 1837
1755 ENTER; 1838 ENTER;
1756 SAVETMPS; 1839 SAVETMPS;
1757 1840
… …
1903{ 1986{
1904 int i; 1987 int i;
1905 HV *hv = (HV *)SvRV (coro_current); 1988 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV (); 1989 AV *av = newAV ();
1907 1990
1991 /* items are actually not so common, so optimise for this case */
1992 if (items)
1993 {
1908 av_extend (av, items - 1); 1994 av_extend (av, items - 1);
1995
1909 for (i = 0; i < items; ++i) 1996 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 1997 av_push (av, SvREFCNT_inc_NN (arg [i]));
1998 }
1911 1999
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2000 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1913 2001
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2002 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager); 2003 api_ready (aTHX_ sv_manager);
… …
2005 2093
2006static void 2094static void
2007coro_rouse_callback (pTHX_ CV *cv) 2095coro_rouse_callback (pTHX_ CV *cv)
2008{ 2096{
2009 dXSARGS; 2097 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2098 SV *data = (SV *)S_GENSUB_ARG;
2011 2099
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2100 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2101 {
2014 /* first call, set args */ 2102 /* first call, set args */
2015 SV *coro = SvRV (data); 2103 SV *coro = SvRV (data);
… …
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2169 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2170 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2171 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2172
2085 { 2173 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2174 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2175 SV *data = (SV *)S_GENSUB_ARG;
2088 2176
2089 frame->data = (void *)data; 2177 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2178 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2179 frame->check = slf_check_rouse_wait;
2092 } 2180 }
… …
2096coro_new_rouse_cb (pTHX) 2184coro_new_rouse_cb (pTHX)
2097{ 2185{
2098 HV *hv = (HV *)SvRV (coro_current); 2186 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2187 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2188 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2189 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2190
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2191 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2192 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2193
2106 SvREFCNT_dec (coro->rouse_cb); 2194 SvREFCNT_dec (coro->rouse_cb);
… …
2629{ 2717{
2630 if (items >= 2) 2718 if (items >= 2)
2631 { 2719 {
2632 /* callback form */ 2720 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 2721 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2722 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 2723
2636 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 2725
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 2726 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 2727 coro_semaphore_adjust (aTHX_ av, 0);
… …
2699{ 2787{
2700 AV *av = (AV *)SvRV (arg [0]); 2788 AV *av = (AV *)SvRV (arg [0]);
2701 2789
2702 if (items >= 2) 2790 if (items >= 2)
2703 { 2791 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2792 SV *cb_cv = s_get_cv_croak (arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2793 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706 2794
2707 if (SvIVX (AvARRAY (av)[0])) 2795 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2796 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2709 2797
… …
2744 2832
2745static void 2833static void
2746coro_aio_callback (pTHX_ CV *cv) 2834coro_aio_callback (pTHX_ CV *cv)
2747{ 2835{
2748 dXSARGS; 2836 dXSARGS;
2749 AV *state = (AV *)GENSUB_ARG; 2837 AV *state = (AV *)S_GENSUB_ARG;
2750 SV *coro = av_pop (state); 2838 SV *coro = av_pop (state);
2751 SV *data_sv = newSV (sizeof (struct io_state)); 2839 SV *data_sv = newSV (sizeof (struct io_state));
2752 2840
2753 av_extend (state, items - 1); 2841 av_extend (state, items - 1);
2754 2842
… …
2868 2956
2869 for (i = 0; i < items; ++i) 2957 for (i = 0; i < items; ++i)
2870 PUSHs (arg [i]); 2958 PUSHs (arg [i]);
2871 2959
2872 /* now push the callback closure */ 2960 /* now push the callback closure */
2873 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2961 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2874 2962
2875 /* now call the AIO function - we assume our request is uncancelable */ 2963 /* now call the AIO function - we assume our request is uncancelable */
2876 PUTBACK; 2964 PUTBACK;
2877 call_sv ((SV *)req, G_VOID | G_DISCARD); 2965 call_sv ((SV *)req, G_VOID | G_DISCARD);
2878 } 2966 }
… …
2896/*****************************************************************************/ 2984/*****************************************************************************/
2897 2985
2898#if CORO_CLONE 2986#if CORO_CLONE
2899# include "clone.c" 2987# include "clone.c"
2900#endif 2988#endif
2989
2990/*****************************************************************************/
2991
2992static SV *
2993coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2994{
2995 SV *coro_sv;
2996 struct coro *coro;
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (argc > 0)
3003 {
3004 cb = s_get_cv_croak (argv [0]);
3005
3006 if (!is_coro)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3028
3029 if (argc > 0)
3030 {
3031 av_extend (coro->args, argc + is_coro - 1);
3032
3033 if (is_coro)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 1; i < argc; i++)
3042 av_push (coro->args, newSVsv (argv [i]));
3043 }
3044
3045 return coro_sv;
3046}
2901 3047
2902MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3048MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2903 3049
2904PROTOTYPES: DISABLE 3050PROTOTYPES: DISABLE
2905 3051
… …
2965 3111
2966 if (!svp) croak ("Time::HiRes is required"); 3112 if (!svp) croak ("Time::HiRes is required");
2967 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3113 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2968 3114
2969 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3115 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3116
3117 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3118 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2970 } 3119 }
2971 3120
2972 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3121 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2973} 3122}
2974 3123
2975SV * 3124SV *
2976new (char *klass, ...) 3125new (SV *klass, ...)
2977 ALIAS: 3126 ALIAS:
2978 Coro::new = 1 3127 Coro::new = 1
2979 CODE: 3128 CODE:
2980{ 3129 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2981 struct coro *coro; 3130 OUTPUT:
2982 MAGIC *mg;
2983 HV *hv;
2984 CV *cb;
2985 int i;
2986
2987 if (items > 1)
2988 {
2989 cb = coro_sv_2cv (aTHX_ ST (1));
2990
2991 if (!ix)
2992 {
2993 if (CvISXSUB (cb))
2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2995
2996 if (!CvROOT (cb))
2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2999 }
3000
3001 Newz (0, coro, 1, struct coro);
3002 coro->args = newAV ();
3003 coro->flags = CF_NEW;
3004
3005 if (coro_first) coro_first->prev = coro;
3006 coro->next = coro_first;
3007 coro_first = coro;
3008
3009 coro->hv = hv = newHV ();
3010 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3011 mg->mg_flags |= MGf_DUP;
3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3013
3014 if (items > 1)
3015 {
3016 av_extend (coro->args, items - 1 + ix - 1);
3017
3018 if (ix)
3019 {
3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3021 cb = cv_coro_run;
3022 }
3023
3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3025
3026 for (i = 2; i < items; i++)
3027 av_push (coro->args, newSVsv (ST (i)));
3028 }
3029}
3030 OUTPUT:
3031 RETVAL 3131 RETVAL
3032 3132
3033void 3133void
3034transfer (...) 3134transfer (...)
3035 PROTOTYPE: $$ 3135 PROTOTYPE: $$
… …
3248 CODE: 3348 CODE:
3249 coro_state_destroy (aTHX_ self); 3349 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3350 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3251 3351
3252 3352
3353SV *
3354enable_times (int enabled = enable_times)
3355 CODE:
3356{
3357 RETVAL = boolSV (enable_times);
3358
3359 if (enabled != enable_times)
3360 {
3361 enable_times = enabled;
3362
3363 coro_times_update ();
3364 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3365 }
3366}
3367 OUTPUT:
3368 RETVAL
3369
3370void
3371times (Coro::State self)
3372 PPCODE:
3373{
3374 struct coro *current = SvSTATE (coro_current);
3375
3376 if (expect_false (current == self))
3377 {
3378 coro_times_update ();
3379 coro_times_add (SvSTATE (coro_current));
3380 }
3381
3382 EXTEND (SP, 2);
3383 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3384 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3385
3386 if (expect_false (current == self))
3387 coro_times_sub (SvSTATE (coro_current));
3388}
3389
3390void
3391swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3392 CODE:
3393{
3394 struct coro *current = SvSTATE_current;
3395
3396 if (current == coro)
3397 SWAP_SVS (current);
3398
3399 if (!coro->swap_sv)
3400 coro->swap_sv = newAV ();
3401
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3403 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3404
3405 if (current == coro)
3406 SWAP_SVS (current);
3407}
3408
3409
3253MODULE = Coro::State PACKAGE = Coro 3410MODULE = Coro::State PACKAGE = Coro
3254 3411
3255BOOT: 3412BOOT:
3256{ 3413{
3257 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3414 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3265 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3422 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3266 3423
3267 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3424 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3268 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3425 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3269 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3426 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3270 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3427 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3271 3428
3272 coro_stash = gv_stashpv ("Coro", TRUE); 3429 coro_stash = gv_stashpv ("Coro", TRUE);
3273 3430
3274 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3431 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3275 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3432 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3276 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3433 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3277 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3434 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3278 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3435 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3279 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3436 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3280 3437
3281 { 3438 {
3282 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3439 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3283 3440
3284 coroapi.schedule = api_schedule; 3441 coroapi.schedule = api_schedule;
… …
3294 sv_setiv (sv, (IV)&coroapi); 3451 sv_setiv (sv, (IV)&coroapi);
3295 SvREADONLY_on (sv); 3452 SvREADONLY_on (sv);
3296 } 3453 }
3297} 3454}
3298 3455
3456SV *
3457async (...)
3458 PROTOTYPE: &@
3459 CODE:
3460 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3461 api_ready (aTHX_ RETVAL);
3462 OUTPUT:
3463 RETVAL
3464
3299void 3465void
3300terminate (...) 3466terminate (...)
3301 CODE: 3467 CODE:
3302 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3468 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3303 3469
… …
3337_set_readyhook (SV *hook) 3503_set_readyhook (SV *hook)
3338 PROTOTYPE: $ 3504 PROTOTYPE: $
3339 CODE: 3505 CODE:
3340 SvREFCNT_dec (coro_readyhook); 3506 SvREFCNT_dec (coro_readyhook);
3341 SvGETMAGIC (hook); 3507 SvGETMAGIC (hook);
3508 if (SvOK (hook))
3509 {
3342 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3510 coro_readyhook = newSVsv (hook);
3511 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3512 }
3513 else
3514 {
3515 coro_readyhook = 0;
3516 CORO_READYHOOK = 0;
3517 }
3343 3518
3344int 3519int
3345prio (Coro::State coro, int newprio = 0) 3520prio (Coro::State coro, int newprio = 0)
3346 PROTOTYPE: $;$ 3521 PROTOTYPE: $;$
3347 ALIAS: 3522 ALIAS:
… …
3353 if (items > 1) 3528 if (items > 1)
3354 { 3529 {
3355 if (ix) 3530 if (ix)
3356 newprio = coro->prio - newprio; 3531 newprio = coro->prio - newprio;
3357 3532
3358 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3533 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3359 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3534 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3360 3535
3361 coro->prio = newprio; 3536 coro->prio = newprio;
3362 } 3537 }
3363} 3538}
3364 OUTPUT: 3539 OUTPUT:
… …
3411 for (i = 1; i < items; ++i) 3586 for (i = 1; i < items; ++i)
3412 av_push (av, SvREFCNT_inc_NN (ST (i))); 3587 av_push (av, SvREFCNT_inc_NN (ST (i)));
3413 3588
3414 if ((SV *)hv == &PL_sv_undef) 3589 if ((SV *)hv == &PL_sv_undef)
3415 { 3590 {
3416 PUSHMARK (SP); 3591 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3417 EXTEND (SP, 2);
3418 PUSHs (sv_Coro);
3419 PUSHs ((SV *)cv_pool_handler);
3420 PUTBACK;
3421 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3422 SPAGAIN;
3423
3424 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3592 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3593 SvREFCNT_dec (sv);
3425 } 3594 }
3426 3595
3427 { 3596 {
3428 struct coro *coro = SvSTATE_hv (hv); 3597 struct coro *coro = SvSTATE_hv (hv);
3429 3598
… …
3463 CODE: 3632 CODE:
3464{ 3633{
3465 struct coro *coro = SvSTATE_current; 3634 struct coro *coro = SvSTATE_current;
3466 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3635 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3467 3636
3468 block = (SV *)coro_sv_2cv (aTHX_ block); 3637 block = s_get_cv_croak (block);
3469 3638
3470 if (!*avp) 3639 if (!*avp)
3471 *avp = newAV (); 3640 *avp = newAV ();
3472 3641
3473 av_push (*avp, SvREFCNT_inc (block)); 3642 av_push (*avp, SvREFCNT_inc (block));
… …
3673 3842
3674void 3843void
3675_register (char *target, char *proto, SV *req) 3844_register (char *target, char *proto, SV *req)
3676 CODE: 3845 CODE:
3677{ 3846{
3678 CV *req_cv = coro_sv_2cv (aTHX_ req); 3847 SV *req_cv = s_get_cv_croak (req);
3679 /* newXSproto doesn't return the CV on 5.8 */ 3848 /* newXSproto doesn't return the CV on 5.8 */
3680 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3849 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3681 sv_setpv ((SV *)slf_cv, proto); 3850 sv_setpv ((SV *)slf_cv, proto);
3682 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3851 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3683} 3852}
3684 3853
3854MODULE = Coro::State PACKAGE = Coro::Select
3855
3856void
3857patch_pp_sselect ()
3858 CODE:
3859 if (!coro_old_pp_sselect)
3860 {
3861 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3862 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3863 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3864 }
3865
3866void
3867unpatch_pp_sselect ()
3868 CODE:
3869 if (coro_old_pp_sselect)
3870 {
3871 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3872 coro_old_pp_sselect = 0;
3873 }
3874
3875

Diff Legend

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