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.352 by root, Sat Jun 20 08:58:50 2009 UTC vs.
Revision 1.376 by root, Fri Oct 2 20:48: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
… …
137 84
138#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
139 86
140#if __GNUC__ >= 3 87#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 88# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 89# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 90# define INLINE static inline
144#else 91#else
145# define attribute(x) 92# define attribute(x)
146# define expect(expr,value) (expr) 93# define expect(expr,value) (expr)
147# define INLINE static 94# define INLINE static
… …
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
… …
615 { 712 {
616 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
617 { 714 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
619 716
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 718 {
622 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
623 720
624 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
625 { 722 {
626 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 723 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 725 PUSHs ((SV *)cv);
630 726
631 CvDEPTH (cv) = 0; 727 CvDEPTH (cv) = 0;
… …
649 /* we manually unroll here, as usually 2 slots is enough */ 745 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 746 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 747 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 748 if (SLOT_COUNT >= 3) CXINC;
653 { 749 {
654 int i; 750 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 751 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 752 CXINC;
657 } 753 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 754 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 755
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 989slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 990{
895 return 1; 991 return 1;
896} 992}
897 993
898static UNOP coro_setup_op; 994static UNOP init_perl_op;
899 995
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 996static void NOINLINE /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 997init_perl (pTHX_ struct coro *coro)
902{ 998{
903 /* 999 /*
904 * emulate part of the perl startup here. 1000 * emulate part of the perl startup here.
905 */ 1001 */
906 coro_init_stacks (aTHX); 1002 coro_init_stacks (aTHX);
… …
955 */ 1051 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1052 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 */ 1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
958 1054
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1055 /* 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; 1056 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1057 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1058 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1059 /* no flags etc. required, as an init function won't be called */
964 1060
965 PL_op = (OP *)&coro_setup_op; 1061 PL_op = (OP *)&init_perl_op;
966 1062
967 /* copy throw, in case it was set before coro_setup */ 1063 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1064 CORO_THROW = coro->except;
1065
1066 SWAP_SVS (coro);
1067
1068 if (expect_false (enable_times))
1069 {
1070 coro_times_update ();
1071 coro_times_sub (coro);
1072 }
969} 1073}
970 1074
971static void 1075static void
972coro_unwind_stacks (pTHX) 1076coro_unwind_stacks (pTHX)
973{ 1077{
… …
988 dounwind (-1); 1092 dounwind (-1);
989 } 1093 }
990} 1094}
991 1095
992static void 1096static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1097destroy_perl (pTHX_ struct coro *coro)
994{ 1098{
995 SV *svf [9]; 1099 SV *svf [9];
996 1100
997 { 1101 {
998 struct coro *current = SvSTATE_current; 1102 struct coro *current = SvSTATE_current;
… …
1002 save_perl (aTHX_ current); 1106 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro); 1107 load_perl (aTHX_ coro);
1004 1108
1005 coro_unwind_stacks (aTHX); 1109 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX); 1110 coro_destruct_stacks (aTHX);
1111
1112 /* restore swapped sv's */
1113 SWAP_SVS (coro);
1007 1114
1008 // now save some sv's to be free'd later 1115 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv); 1116 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1117 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv); 1118 svf [2] = GvSV (PL_errgv);
… …
1019 1126
1020 load_perl (aTHX_ current); 1127 load_perl (aTHX_ current);
1021 } 1128 }
1022 1129
1023 { 1130 {
1024 int i; 1131 unsigned int i;
1025 1132
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1133 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1134 SvREFCNT_dec (svf [i]);
1028 1135
1029 SvREFCNT_dec (coro->saved_deffh); 1136 SvREFCNT_dec (coro->saved_deffh);
… …
1235 /* somebody or something will hit me for both perl_run and PL_restartop */ 1342 /* somebody or something will hit me for both perl_run and PL_restartop */
1236 PL_restartop = PL_op; 1343 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1344 perl_run (PL_curinterp);
1238 /* 1345 /*
1239 * Unfortunately, there is no way to get at the return values of the 1346 * Unfortunately, there is no way to get at the return values of the
1240 * coro body here, as perl_run destroys these 1347 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1348 * runtime errors here, as this is just a random interpreter, not a thread.
1241 */ 1349 */
1242 1350
1243 /* 1351 /*
1244 * If perl-run returns we assume exit() was being called or the coro 1352 * 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) 1353 * fell off the end, which seems to be the only valid (non-bug)
… …
1452 if (expect_false (next->flags & CF_NEW)) 1560 if (expect_false (next->flags & CF_NEW))
1453 { 1561 {
1454 /* need to start coroutine */ 1562 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1563 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1564 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1565 init_perl (aTHX_ next);
1458 } 1566 }
1459 else 1567 else
1460 load_perl (aTHX_ next); 1568 load_perl (aTHX_ next);
1461 1569
1462 /* possibly untie and reuse the cctx */ 1570 /* possibly untie and reuse the cctx */
… …
1525 1633
1526 if (coro->mainstack 1634 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1635 && coro->mainstack != main_mainstack
1528 && coro->slot 1636 && coro->slot
1529 && !PL_dirty) 1637 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1638 destroy_perl (aTHX_ coro);
1639
1640 if (coro->next) coro->next->prev = coro->prev;
1641 if (coro->prev) coro->prev->next = coro->next;
1642 if (coro == coro_first) coro_first = coro->next;
1531 1643
1532 cctx_destroy (coro->cctx); 1644 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1645 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1646 SvREFCNT_dec (coro->args);
1647 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1648 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 1649
1541 return 1; 1650 return 1;
1542} 1651}
1543 1652
1544static int 1653static int
… …
1594 1703
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1704 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1705 TRANSFER (ta, 1);
1597} 1706}
1598 1707
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 ********************************************************************/ 1708/** Coro ********************************************************************/
1623 1709
1624INLINE void 1710INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1711coro_enq (pTHX_ struct coro *coro)
1626{ 1712{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1714
1629 SvREFCNT_inc_NN (coro->hv); 1715 SvREFCNT_inc_NN (coro->hv);
1630 1716
1631 coro->next_ready = 0; 1717 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1636INLINE struct coro * 1722INLINE struct coro *
1637coro_deq (pTHX) 1723coro_deq (pTHX)
1638{ 1724{
1639 int prio; 1725 int prio;
1640 1726
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1728 {
1643 struct coro **ready = coro_ready [prio]; 1729 struct coro **ready = coro_ready [prio];
1644 1730
1645 if (ready [0]) 1731 if (ready [0])
1646 { 1732 {
… …
1651 } 1737 }
1652 1738
1653 return 0; 1739 return 0;
1654} 1740}
1655 1741
1742static void
1743invoke_sv_ready_hook_helper (void)
1744{
1745 dTHX;
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1757}
1758
1656static int 1759static int
1657api_ready (pTHX_ SV *coro_sv) 1760api_ready (pTHX_ SV *coro_sv)
1658{ 1761{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1762 struct coro *coro = SvSTATE (coro_sv);
1664 1763
1665 if (coro->flags & CF_READY) 1764 if (coro->flags & CF_READY)
1666 return 0; 1765 return 0;
1667 1766
1668 coro->flags |= CF_READY; 1767 coro->flags |= CF_READY;
1669 1768
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1769 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1770
1676 if (sv_hook) 1771 if (!coro_nready++)
1677 { 1772 if (coroapi.readyhook)
1678 dSP; 1773 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 1774
1694 return 1; 1775 return 1;
1695} 1776}
1696 1777
1697static int 1778static int
… …
1748 api_ready (aTHX_ SvRV (sv_idle)); 1829 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1830 --coro_nready;
1750 } 1831 }
1751 else 1832 else
1752 { 1833 {
1834 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1835 dSP;
1754 1836
1755 ENTER; 1837 ENTER;
1756 SAVETMPS; 1838 SAVETMPS;
1757 1839
… …
1903{ 1985{
1904 int i; 1986 int i;
1905 HV *hv = (HV *)SvRV (coro_current); 1987 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV (); 1988 AV *av = newAV ();
1907 1989
1990 /* items are actually not so common, so optimise for this case */
1991 if (items)
1992 {
1908 av_extend (av, items - 1); 1993 av_extend (av, items - 1);
1994
1909 for (i = 0; i < items; ++i) 1995 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 1996 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 }
1911 1998
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1913 2000
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager); 2002 api_ready (aTHX_ sv_manager);
… …
2005 2092
2006static void 2093static void
2007coro_rouse_callback (pTHX_ CV *cv) 2094coro_rouse_callback (pTHX_ CV *cv)
2008{ 2095{
2009 dXSARGS; 2096 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2097 SV *data = (SV *)S_GENSUB_ARG;
2011 2098
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2099 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2100 {
2014 /* first call, set args */ 2101 /* first call, set args */
2015 SV *coro = SvRV (data); 2102 SV *coro = SvRV (data);
… …
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2168 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2170 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2171
2085 { 2172 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2174 SV *data = (SV *)S_GENSUB_ARG;
2088 2175
2089 frame->data = (void *)data; 2176 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2177 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2178 frame->check = slf_check_rouse_wait;
2092 } 2179 }
… …
2096coro_new_rouse_cb (pTHX) 2183coro_new_rouse_cb (pTHX)
2097{ 2184{
2098 HV *hv = (HV *)SvRV (coro_current); 2185 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2186 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2187 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2188 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2189
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2190 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2191 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2192
2106 SvREFCNT_dec (coro->rouse_cb); 2193 SvREFCNT_dec (coro->rouse_cb);
… …
2477/* Coro::Semaphore & Coro::Signal */ 2564/* Coro::Semaphore & Coro::Signal */
2478 2565
2479static SV * 2566static SV *
2480coro_waitarray_new (pTHX_ int count) 2567coro_waitarray_new (pTHX_ int count)
2481{ 2568{
2482 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2569 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2483 AV *av = newAV (); 2570 AV *av = newAV ();
2484 SV **ary; 2571 SV **ary;
2485 2572
2486 /* unfortunately, building manually saves memory */ 2573 /* unfortunately, building manually saves memory */
2487 Newx (ary, 2, SV *); 2574 Newx (ary, 2, SV *);
… …
2629{ 2716{
2630 if (items >= 2) 2717 if (items >= 2)
2631 { 2718 {
2632 /* callback form */ 2719 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 2720 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 2722
2636 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 2724
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 2725 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 2726 coro_semaphore_adjust (aTHX_ av, 0);
2640 2727
2641 frame->prepare = prepare_nop; 2728 frame->prepare = prepare_nop;
… …
2665 AvARRAY (av)[0] = AvARRAY (av)[1]; 2752 AvARRAY (av)[0] = AvARRAY (av)[1];
2666 AvARRAY (av)[1] = cb; 2753 AvARRAY (av)[1] = cb;
2667 2754
2668 cb = av_shift (av); 2755 cb = av_shift (av);
2669 2756
2757 if (SvTYPE (cb) == SVt_PVCV)
2758 {
2759 dSP;
2760 PUSHMARK (SP);
2761 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2762 PUTBACK;
2763 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2764 }
2765 else
2766 {
2670 api_ready (aTHX_ cb); 2767 api_ready (aTHX_ cb);
2671 sv_setiv (cb, 0); /* signal waiter */ 2768 sv_setiv (cb, 0); /* signal waiter */
2769 }
2770
2672 SvREFCNT_dec (cb); 2771 SvREFCNT_dec (cb);
2673 2772
2674 --count; 2773 --count;
2675 } 2774 }
2676} 2775}
… …
2685static void 2784static void
2686slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2785slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2687{ 2786{
2688 AV *av = (AV *)SvRV (arg [0]); 2787 AV *av = (AV *)SvRV (arg [0]);
2689 2788
2789 if (items >= 2)
2790 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793
2690 if (SvIVX (AvARRAY (av)[0])) 2794 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2796
2797 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop;
2799 }
2800 else if (SvIVX (AvARRAY (av)[0]))
2691 { 2801 {
2692 SvIVX (AvARRAY (av)[0]) = 0; 2802 SvIVX (AvARRAY (av)[0]) = 0;
2693 frame->prepare = prepare_nop; 2803 frame->prepare = prepare_nop;
2694 frame->check = slf_check_nop; 2804 frame->check = slf_check_nop;
2695 } 2805 }
2696 else 2806 else
2697 { 2807 {
2698 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2808 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2699 2809
2700 av_push (av, waiter); 2810 av_push (av, waiter);
2701 2811
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2812 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2703 frame->prepare = prepare_schedule; 2813 frame->prepare = prepare_schedule;
… …
2721 2831
2722static void 2832static void
2723coro_aio_callback (pTHX_ CV *cv) 2833coro_aio_callback (pTHX_ CV *cv)
2724{ 2834{
2725 dXSARGS; 2835 dXSARGS;
2726 AV *state = (AV *)GENSUB_ARG; 2836 AV *state = (AV *)S_GENSUB_ARG;
2727 SV *coro = av_pop (state); 2837 SV *coro = av_pop (state);
2728 SV *data_sv = newSV (sizeof (struct io_state)); 2838 SV *data_sv = newSV (sizeof (struct io_state));
2729 2839
2730 av_extend (state, items - 1); 2840 av_extend (state, items - 1);
2731 2841
… …
2845 2955
2846 for (i = 0; i < items; ++i) 2956 for (i = 0; i < items; ++i)
2847 PUSHs (arg [i]); 2957 PUSHs (arg [i]);
2848 2958
2849 /* now push the callback closure */ 2959 /* now push the callback closure */
2850 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2960 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2851 2961
2852 /* now call the AIO function - we assume our request is uncancelable */ 2962 /* now call the AIO function - we assume our request is uncancelable */
2853 PUTBACK; 2963 PUTBACK;
2854 call_sv ((SV *)req, G_VOID | G_DISCARD); 2964 call_sv ((SV *)req, G_VOID | G_DISCARD);
2855 } 2965 }
… …
2873/*****************************************************************************/ 2983/*****************************************************************************/
2874 2984
2875#if CORO_CLONE 2985#if CORO_CLONE
2876# include "clone.c" 2986# include "clone.c"
2877#endif 2987#endif
2988
2989/*****************************************************************************/
2990
2991static SV *
2992coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2993{
2994 SV *coro_sv;
2995 struct coro *coro;
2996 MAGIC *mg;
2997 HV *hv;
2998 SV *cb;
2999 int i;
3000
3001 if (argc > 0)
3002 {
3003 cb = s_get_cv_croak (argv [0]);
3004
3005 if (!is_coro)
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 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3027
3028 if (argc > 0)
3029 {
3030 av_extend (coro->args, argc + is_coro - 1);
3031
3032 if (is_coro)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = (SV *)cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 1; i < argc; i++)
3041 av_push (coro->args, newSVsv (argv [i]));
3042 }
3043
3044 return coro_sv;
3045}
2878 3046
2879MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2880 3048
2881PROTOTYPES: DISABLE 3049PROTOTYPES: DISABLE
2882 3050
… …
2942 3110
2943 if (!svp) croak ("Time::HiRes is required"); 3111 if (!svp) croak ("Time::HiRes is required");
2944 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2945 3113
2946 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2947 } 3118 }
2948 3119
2949 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2950} 3121}
2951 3122
2952SV * 3123SV *
2953new (char *klass, ...) 3124new (SV *klass, ...)
2954 ALIAS: 3125 ALIAS:
2955 Coro::new = 1 3126 Coro::new = 1
2956 CODE: 3127 CODE:
2957{ 3128 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2958 struct coro *coro; 3129 OUTPUT:
2959 MAGIC *mg;
2960 HV *hv;
2961 CV *cb;
2962 int i;
2963
2964 if (items > 1)
2965 {
2966 cb = coro_sv_2cv (aTHX_ ST (1));
2967
2968 if (!ix)
2969 {
2970 if (CvISXSUB (cb))
2971 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2972
2973 if (!CvROOT (cb))
2974 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2975 }
2976 }
2977
2978 Newz (0, coro, 1, struct coro);
2979 coro->args = newAV ();
2980 coro->flags = CF_NEW;
2981
2982 if (coro_first) coro_first->prev = coro;
2983 coro->next = coro_first;
2984 coro_first = coro;
2985
2986 coro->hv = hv = newHV ();
2987 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2988 mg->mg_flags |= MGf_DUP;
2989 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2990
2991 if (items > 1)
2992 {
2993 av_extend (coro->args, items - 1 + ix - 1);
2994
2995 if (ix)
2996 {
2997 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2998 cb = cv_coro_run;
2999 }
3000
3001 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3002
3003 for (i = 2; i < items; i++)
3004 av_push (coro->args, newSVsv (ST (i)));
3005 }
3006}
3007 OUTPUT:
3008 RETVAL 3130 RETVAL
3009 3131
3010void 3132void
3011transfer (...) 3133transfer (...)
3012 PROTOTYPE: $$ 3134 PROTOTYPE: $$
… …
3156 CODE: 3278 CODE:
3157{ 3279{
3158 struct coro *current = SvSTATE_current; 3280 struct coro *current = SvSTATE_current;
3159 SV **throwp = self == current ? &CORO_THROW : &self->except; 3281 SV **throwp = self == current ? &CORO_THROW : &self->except;
3160 SvREFCNT_dec (*throwp); 3282 SvREFCNT_dec (*throwp);
3283 SvGETMAGIC (throw);
3161 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3162} 3285}
3163 3286
3164void 3287void
3165api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3224 CODE: 3347 CODE:
3225 coro_state_destroy (aTHX_ self); 3348 coro_state_destroy (aTHX_ self);
3226 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3227 3350
3228 3351
3352SV *
3353enable_times (int enabled = enable_times)
3354 CODE:
3355{
3356 RETVAL = boolSV (enable_times);
3357
3358 if (enabled != enable_times)
3359 {
3360 enable_times = enabled;
3361
3362 coro_times_update ();
3363 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3364 }
3365}
3366 OUTPUT:
3367 RETVAL
3368
3369void
3370times (Coro::State self)
3371 PPCODE:
3372{
3373 struct coro *current = SvSTATE (coro_current);
3374
3375 if (expect_false (current == self))
3376 {
3377 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current));
3379 }
3380
3381 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384
3385 if (expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current));
3387}
3388
3389void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3391 CODE:
3392{
3393 struct coro *current = SvSTATE_current;
3394
3395 if (current == coro)
3396 SWAP_SVS (current);
3397
3398 if (!coro->swap_sv)
3399 coro->swap_sv = newAV ();
3400
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3403
3404 if (current == coro)
3405 SWAP_SVS (current);
3406}
3407
3408
3229MODULE = Coro::State PACKAGE = Coro 3409MODULE = Coro::State PACKAGE = Coro
3230 3410
3231BOOT: 3411BOOT:
3232{ 3412{
3233 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3241 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3242 3422
3243 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3244 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3245 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3246 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3247 3427
3248 coro_stash = gv_stashpv ("Coro", TRUE); 3428 coro_stash = gv_stashpv ("Coro", TRUE);
3249 3429
3250 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3251 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3252 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3253 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3433 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3254 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3434 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3255 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3435 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3256 3436
3257 { 3437 {
3258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3438 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3259 3439
3260 coroapi.schedule = api_schedule; 3440 coroapi.schedule = api_schedule;
… …
3270 sv_setiv (sv, (IV)&coroapi); 3450 sv_setiv (sv, (IV)&coroapi);
3271 SvREADONLY_on (sv); 3451 SvREADONLY_on (sv);
3272 } 3452 }
3273} 3453}
3274 3454
3455SV *
3456async (...)
3457 PROTOTYPE: &@
3458 CODE:
3459 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3460 api_ready (aTHX_ RETVAL);
3461 OUTPUT:
3462 RETVAL
3463
3275void 3464void
3276terminate (...) 3465terminate (...)
3277 CODE: 3466 CODE:
3278 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3467 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3279 3468
… …
3312void 3501void
3313_set_readyhook (SV *hook) 3502_set_readyhook (SV *hook)
3314 PROTOTYPE: $ 3503 PROTOTYPE: $
3315 CODE: 3504 CODE:
3316 SvREFCNT_dec (coro_readyhook); 3505 SvREFCNT_dec (coro_readyhook);
3506 SvGETMAGIC (hook);
3507 if (SvOK (hook))
3508 {
3317 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3509 coro_readyhook = newSVsv (hook);
3510 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3511 }
3512 else
3513 {
3514 coro_readyhook = 0;
3515 CORO_READYHOOK = 0;
3516 }
3318 3517
3319int 3518int
3320prio (Coro::State coro, int newprio = 0) 3519prio (Coro::State coro, int newprio = 0)
3321 PROTOTYPE: $;$ 3520 PROTOTYPE: $;$
3322 ALIAS: 3521 ALIAS:
… …
3328 if (items > 1) 3527 if (items > 1)
3329 { 3528 {
3330 if (ix) 3529 if (ix)
3331 newprio = coro->prio - newprio; 3530 newprio = coro->prio - newprio;
3332 3531
3333 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3532 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3334 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3533 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3335 3534
3336 coro->prio = newprio; 3535 coro->prio = newprio;
3337 } 3536 }
3338} 3537}
3339 OUTPUT: 3538 OUTPUT:
… …
3386 for (i = 1; i < items; ++i) 3585 for (i = 1; i < items; ++i)
3387 av_push (av, SvREFCNT_inc_NN (ST (i))); 3586 av_push (av, SvREFCNT_inc_NN (ST (i)));
3388 3587
3389 if ((SV *)hv == &PL_sv_undef) 3588 if ((SV *)hv == &PL_sv_undef)
3390 { 3589 {
3391 PUSHMARK (SP); 3590 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3392 EXTEND (SP, 2);
3393 PUSHs (sv_Coro);
3394 PUSHs ((SV *)cv_pool_handler);
3395 PUTBACK;
3396 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3397 SPAGAIN;
3398
3399 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3591 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3592 SvREFCNT_dec (sv);
3400 } 3593 }
3401 3594
3402 { 3595 {
3403 struct coro *coro = SvSTATE_hv (hv); 3596 struct coro *coro = SvSTATE_hv (hv);
3404 3597
… …
3438 CODE: 3631 CODE:
3439{ 3632{
3440 struct coro *coro = SvSTATE_current; 3633 struct coro *coro = SvSTATE_current;
3441 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3442 3635
3443 block = (SV *)coro_sv_2cv (aTHX_ block); 3636 block = s_get_cv_croak (block);
3444 3637
3445 if (!*avp) 3638 if (!*avp)
3446 *avp = newAV (); 3639 *avp = newAV ();
3447 3640
3448 av_push (*avp, SvREFCNT_inc (block)); 3641 av_push (*avp, SvREFCNT_inc (block));
… …
3465MODULE = Coro::State PACKAGE = Coro::Semaphore 3658MODULE = Coro::State PACKAGE = Coro::Semaphore
3466 3659
3467SV * 3660SV *
3468new (SV *klass, SV *count = 0) 3661new (SV *klass, SV *count = 0)
3469 CODE: 3662 CODE:
3663{
3664 int semcnt = 1;
3665
3666 if (count)
3667 {
3668 SvGETMAGIC (count);
3669
3670 if (SvOK (count))
3671 semcnt = SvIV (count);
3672 }
3673
3470 RETVAL = sv_bless ( 3674 RETVAL = sv_bless (
3471 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3675 coro_waitarray_new (aTHX_ semcnt),
3472 GvSTASH (CvGV (cv)) 3676 GvSTASH (CvGV (cv))
3473 ); 3677 );
3678}
3474 OUTPUT: 3679 OUTPUT:
3475 RETVAL 3680 RETVAL
3476 3681
3477# helper for Coro::Channel and others 3682# helper for Coro::Channel and others
3478SV * 3683SV *
… …
3636 3841
3637void 3842void
3638_register (char *target, char *proto, SV *req) 3843_register (char *target, char *proto, SV *req)
3639 CODE: 3844 CODE:
3640{ 3845{
3641 CV *req_cv = coro_sv_2cv (aTHX_ req); 3846 SV *req_cv = s_get_cv_croak (req);
3642 /* newXSproto doesn't return the CV on 5.8 */ 3847 /* newXSproto doesn't return the CV on 5.8 */
3643 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3848 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3644 sv_setpv ((SV *)slf_cv, proto); 3849 sv_setpv ((SV *)slf_cv, proto);
3645 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3850 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3646} 3851}
3647 3852
3853MODULE = Coro::State PACKAGE = Coro::Select
3854
3855void
3856patch_pp_sselect ()
3857 CODE:
3858 if (!coro_old_pp_sselect)
3859 {
3860 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3861 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3862 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3863 }
3864
3865void
3866unpatch_pp_sselect ()
3867 CODE:
3868 if (coro_old_pp_sselect)
3869 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0;
3872 }
3873
3874

Diff Legend

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