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.341 by root, Mon Dec 15 15:03:31 2008 UTC vs.
Revision 1.378 by root, Sat Dec 12 01:30:26 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 {
261/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
262struct coro { 225struct coro {
263 /* the C coroutine allocated to this perl coroutine, if any */ 226 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 227 coro_cctx *cctx;
265 228
229 /* ready queue */
230 struct coro *next_ready;
231
266 /* state data */ 232 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 233 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 234 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
270 236
290 256
291 /* on_enter/on_leave */ 257 /* on_enter/on_leave */
292 AV *on_enter; 258 AV *on_enter;
293 AV *on_leave; 259 AV *on_leave;
294 260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
266
295 /* linked list */ 267 /* linked list */
296 struct coro *next, *prev; 268 struct coro *next, *prev;
297}; 269};
298 270
299typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
304/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
306 278
307/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
308 280
309#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
315 287
316/* for Coro.pm */ 288/* for Coro.pm */
317static SV *coro_current; 289static SV *coro_current;
318static SV *coro_readyhook; 290static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
321static struct coro *coro_first; 293static struct coro *coro_first;
322#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}
323 315
324/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
325 317
326static SV * 318static SV *
327coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
351 get_hv (name, create); 343 get_hv (name, create);
352#endif 344#endif
353 return get_hv (name, create); 345 return get_hv (name, create);
354} 346}
355 347
356/* may croak */ 348INLINE void
357INLINE CV * 349coro_times_update ()
358coro_sv_2cv (pTHX_ SV *sv)
359{ 350{
360 HV *st; 351#ifdef coro_clock_gettime
361 GV *gvp; 352 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 353
364 if (!cv) 354 ts.tv_sec = ts.tv_nsec = 0;
365 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;
366 357
367 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];
368} 393}
369 394
370/*****************************************************************************/ 395/*****************************************************************************/
371/* magic glue */ 396/* magic glue */
372 397
472static int 497static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 499{
475 AV *padlist; 500 AV *padlist;
476 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;
477 506
478 /* casting is fun. */ 507 /* casting is fun. */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
480 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
481 510
530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
531} 560}
532 561
533/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
534 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
535static void 615static void
536on_enterleave_call (pTHX_ SV *cb); 616on_enterleave_call (pTHX_ SV *cb);
537 617
538static void 618static void
539load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
570 } 650 }
571 651
572 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 653 CORO_THROW = c->except;
574 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
575 if (expect_false (c->on_enter)) 663 if (expect_false (c->on_enter))
576 { 664 {
577 int i; 665 int i;
578 666
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 } 669 }
670
671 SWAP_SVS (c);
582} 672}
583 673
584static void 674static void
585save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
586{ 676{
677 SWAP_SVS (c);
678
587 if (expect_false (c->on_leave)) 679 if (expect_false (c->on_leave))
588 { 680 {
589 int i; 681 int i;
590 682
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 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);
593 } 693 }
594 694
595 c->except = CORO_THROW; 695 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
597 697
612 { 712 {
613 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
614 { 714 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
616 716
617 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))
618 { 718 {
619 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
620 720
621 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
622 { 722 {
646 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
647 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
650 { 750 {
651 int i; 751 unsigned int i;
652 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
653 CXINC; 753 CXINC;
654 } 754 }
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
656 756
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 990slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 991{
892 return 1; 992 return 1;
893} 993}
894 994
895static UNOP coro_setup_op; 995static UNOP init_perl_op;
896 996
897static 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 */
898coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
899{ 999{
900 /* 1000 /*
901 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
902 */ 1002 */
903 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
952 */ 1052 */
953 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 */
954 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 */
955 1055
956 /* 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 */
957 coro_setup_op.op_next = PL_op; 1057 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1058 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
960 /* 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 */
961 1061
962 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
963 1063
964 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
965 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 }
966} 1074}
967 1075
968static void 1076static void
969coro_unwind_stacks (pTHX) 1077coro_unwind_stacks (pTHX)
970{ 1078{
985 dounwind (-1); 1093 dounwind (-1);
986 } 1094 }
987} 1095}
988 1096
989static void 1097static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1098destroy_perl (pTHX_ struct coro *coro)
991{ 1099{
1100 SV *svf [9];
1101
1102 {
1103 struct coro *current = SvSTATE_current;
1104
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106
1107 save_perl (aTHX_ current);
1108 load_perl (aTHX_ coro);
1109
992 coro_unwind_stacks (aTHX); 1110 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
993 1112
994 SvREFCNT_dec (GvSV (PL_defgv)); 1113 /* restore swapped sv's */
995 SvREFCNT_dec (GvAV (PL_defgv)); 1114 SWAP_SVS (coro);
996 SvREFCNT_dec (GvSV (PL_errgv));
997 SvREFCNT_dec (PL_defoutgv);
998 SvREFCNT_dec (PL_rs);
999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
1001 1115
1002 SvREFCNT_dec (PL_diehook); 1116 // now save some sv's to be free'd later
1003 SvREFCNT_dec (PL_warnhook); 1117 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs;
1122 svf [5] = GvSV (irsgv);
1123 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf));
1127
1128 load_perl (aTHX_ current);
1004 1129 }
1130
1131 {
1132 unsigned int i;
1133
1134 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1135 SvREFCNT_dec (svf [i]);
1136
1005 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1138 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1139 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1140 SvREFCNT_dec (coro->invoke_av);
1009 1141 }
1010 coro_destruct_stacks (aTHX);
1011} 1142}
1012 1143
1013INLINE void 1144INLINE void
1014free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
1015{ 1146{
1212 /* 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 */
1213 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1215 /* 1346 /*
1216 * 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
1217 * 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.
1218 */ 1350 */
1219 1351
1220 /* 1352 /*
1221 * 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
1222 * 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)
1429 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1430 { 1562 {
1431 /* need to start coroutine */ 1563 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1565 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1435 } 1567 }
1436 else 1568 else
1437 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1438 1570
1439 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
1484coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1485{ 1617{
1486 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1487 return 0; 1619 return 0;
1488 1620
1489 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1490 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1491 1623
1492 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1493 1625
1494 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
1502 1634
1503 if (coro->mainstack 1635 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1636 && coro->mainstack != main_mainstack
1505 && coro->slot 1637 && coro->slot
1506 && !PL_dirty) 1638 && !PL_dirty)
1507 {
1508 struct coro *current = SvSTATE_current;
1509
1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1511
1512 save_perl (aTHX_ current);
1513 load_perl (aTHX_ coro);
1514
1515 coro_destruct_perl (aTHX_ coro); 1639 destroy_perl (aTHX_ coro);
1516 1640
1517 load_perl (aTHX_ current); 1641 if (coro->next) coro->next->prev = coro->prev;
1518 1642 if (coro->prev) coro->prev->next = coro->next;
1519 coro->slot = 0; 1643 if (coro == coro_first) coro_first = coro->next;
1520 }
1521 1644
1522 cctx_destroy (coro->cctx); 1645 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1646 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1649 SvREFCNT_dec (CORO_THROW);
1526
1527 if (coro->next) coro->next->prev = coro->prev;
1528 if (coro->prev) coro->prev->next = coro->next;
1529 if (coro == coro_first) coro_first = coro->next;
1530 1650
1531 return 1; 1651 return 1;
1532} 1652}
1533 1653
1534static int 1654static int
1584 1704
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1705 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1587} 1707}
1588 1708
1589/*****************************************************************************/
1590/* gensub: simple closure generation utility */
1591
1592#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1593
1594/* create a closure from XS, returns a code reference */
1595/* the arg can be accessed via GENSUB_ARG from the callback */
1596/* the callback must use dXSARGS/XSRETURN */
1597static SV *
1598gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1599{
1600 CV *cv = (CV *)newSV (0);
1601
1602 sv_upgrade ((SV *)cv, SVt_PVCV);
1603
1604 CvANON_on (cv);
1605 CvISXSUB_on (cv);
1606 CvXSUB (cv) = xsub;
1607 GENSUB_ARG = arg;
1608
1609 return newRV_noinc ((SV *)cv);
1610}
1611
1612/** Coro ********************************************************************/ 1709/** Coro ********************************************************************/
1613 1710
1614INLINE void 1711INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1616{ 1713{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1715
1620INLINE SV * 1716 SvREFCNT_inc_NN (coro->hv);
1717
1718 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro;
1721}
1722
1723INLINE struct coro *
1621coro_deq (pTHX) 1724coro_deq (pTHX)
1622{ 1725{
1623 int prio; 1726 int prio;
1624 1727
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1729 {
1627 return av_shift (coro_ready [prio]); 1730 struct coro **ready = coro_ready [prio];
1731
1732 if (ready [0])
1733 {
1734 struct coro *coro = ready [0];
1735 ready [0] = coro->next_ready;
1736 return coro;
1737 }
1738 }
1628 1739
1629 return 0; 1740 return 0;
1741}
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;
1630} 1758}
1631 1759
1632static int 1760static int
1633api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1634{ 1762{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1763 struct coro *coro = SvSTATE (coro_sv);
1640 1764
1641 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1642 return 0; 1766 return 0;
1643 1767
1644 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1645 1769
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1771
1652 if (sv_hook) 1772 if (!coro_nready++)
1653 { 1773 if (coroapi.readyhook)
1654 dSP; 1774 coroapi.readyhook ();
1655
1656 ENTER;
1657 SAVETMPS;
1658
1659 PUSHMARK (SP);
1660 PUTBACK;
1661 call_sv (sv_hook, G_VOID | G_DISCARD);
1662
1663 FREETMPS;
1664 LEAVE;
1665 }
1666
1667 if (xs_hook)
1668 xs_hook ();
1669 1775
1670 return 1; 1776 return 1;
1671} 1777}
1672 1778
1673static int 1779static int
1696static void 1802static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1803prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1804{
1699 for (;;) 1805 for (;;)
1700 { 1806 {
1701 SV *next_sv = coro_deq (aTHX); 1807 struct coro *next = coro_deq (aTHX);
1702 1808
1703 if (expect_true (next_sv)) 1809 if (expect_true (next))
1704 { 1810 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1811 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1814 else
1711 { 1815 {
1712 next->flags &= ~CF_READY; 1816 next->flags &= ~CF_READY;
1713 --coro_nready; 1817 --coro_nready;
1714 1818
1720 { 1824 {
1721 /* nothing to schedule: call the idle handler */ 1825 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 1826 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 1827 && SvOBJECT (SvRV (sv_idle)))
1724 { 1828 {
1829 if (SvRV (sv_idle) == SvRV (coro_current))
1830 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1831
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1832 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle)); 1833 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 1834 --coro_nready;
1728 } 1835 }
1729 else 1836 else
1730 { 1837 {
1838 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 1839 dSP;
1732 1840
1733 ENTER; 1841 ENTER;
1734 SAVETMPS; 1842 SAVETMPS;
1735 1843
1881{ 1989{
1882 int i; 1990 int i;
1883 HV *hv = (HV *)SvRV (coro_current); 1991 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV (); 1992 AV *av = newAV ();
1885 1993
1994 /* items are actually not so common, so optimise for this case */
1995 if (items)
1996 {
1886 av_extend (av, items - 1); 1997 av_extend (av, items - 1);
1998
1887 for (i = 0; i < items; ++i) 1999 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2000 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 }
1889 2002
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1891 2004
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 2006 api_ready (aTHX_ sv_manager);
1983 2096
1984static void 2097static void
1985coro_rouse_callback (pTHX_ CV *cv) 2098coro_rouse_callback (pTHX_ CV *cv)
1986{ 2099{
1987 dXSARGS; 2100 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2101 SV *data = (SV *)S_GENSUB_ARG;
1989 2102
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2103 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2104 {
1992 /* first call, set args */ 2105 /* first call, set args */
2106 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2107 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2108
1996 SvRV_set (data, (SV *)av); 2109 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2110
2000 /* better take a full copy of the arguments */ 2111 /* better take a full copy of the arguments */
2001 while (items--) 2112 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2113 av_store (av, items, newSVsv (ST (items)));
2114
2115 api_ready (aTHX_ coro);
2116 SvREFCNT_dec (coro);
2003 } 2117 }
2004 2118
2005 XSRETURN_EMPTY; 2119 XSRETURN_EMPTY;
2006} 2120}
2007 2121
2024 2138
2025 EXTEND (SP, AvFILLp (av) + 1); 2139 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2140 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2141 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2142
2029 /* we have stolen the elements, so ste length to zero and free */ 2143 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2144 AvFILLp (av) = -1;
2031 av_undef (av); 2145 av_undef (av);
2032 2146
2033 PUTBACK; 2147 PUTBACK;
2034 } 2148 }
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2172 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2174 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2175
2062 { 2176 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2178 SV *data = (SV *)S_GENSUB_ARG;
2065 2179
2066 frame->data = (void *)data; 2180 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2181 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2182 frame->check = slf_check_rouse_wait;
2069 } 2183 }
2073coro_new_rouse_cb (pTHX) 2187coro_new_rouse_cb (pTHX)
2074{ 2188{
2075 HV *hv = (HV *)SvRV (coro_current); 2189 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2190 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2191 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2192 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2193
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2194 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2195 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2196
2083 SvREFCNT_dec (coro->rouse_cb); 2197 SvREFCNT_dec (coro->rouse_cb);
2454/* Coro::Semaphore & Coro::Signal */ 2568/* Coro::Semaphore & Coro::Signal */
2455 2569
2456static SV * 2570static SV *
2457coro_waitarray_new (pTHX_ int count) 2571coro_waitarray_new (pTHX_ int count)
2458{ 2572{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2573 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 2574 AV *av = newAV ();
2461 SV **ary; 2575 SV **ary;
2462 2576
2463 /* unfortunately, building manually saves memory */ 2577 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 2578 Newx (ary, 2, SV *);
2606{ 2720{
2607 if (items >= 2) 2721 if (items >= 2)
2608 { 2722 {
2609 /* callback form */ 2723 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 2724 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2725 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 2726
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2727 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 2728
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 2729 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 2730 coro_semaphore_adjust (aTHX_ av, 0);
2617 2731
2618 frame->prepare = prepare_nop; 2732 frame->prepare = prepare_nop;
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 2756 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 2757 AvARRAY (av)[1] = cb;
2644 2758
2645 cb = av_shift (av); 2759 cb = av_shift (av);
2646 2760
2761 if (SvTYPE (cb) == SVt_PVCV)
2762 {
2763 dSP;
2764 PUSHMARK (SP);
2765 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2766 PUTBACK;
2767 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2768 }
2769 else
2770 {
2647 api_ready (aTHX_ cb); 2771 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 2772 sv_setiv (cb, 0); /* signal waiter */
2773 }
2774
2649 SvREFCNT_dec (cb); 2775 SvREFCNT_dec (cb);
2650 2776
2651 --count; 2777 --count;
2652 } 2778 }
2653} 2779}
2662static void 2788static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2789slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 2790{
2665 AV *av = (AV *)SvRV (arg [0]); 2791 AV *av = (AV *)SvRV (arg [0]);
2666 2792
2793 if (items >= 2)
2794 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797
2667 if (SvIVX (AvARRAY (av)[0])) 2798 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2800
2801 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop;
2803 }
2804 else if (SvIVX (AvARRAY (av)[0]))
2668 { 2805 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 2806 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 2807 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 2808 frame->check = slf_check_nop;
2672 } 2809 }
2673 else 2810 else
2674 { 2811 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2812 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 2813
2677 av_push (av, waiter); 2814 av_push (av, waiter);
2678 2815
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2816 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 2817 frame->prepare = prepare_schedule;
2698 2835
2699static void 2836static void
2700coro_aio_callback (pTHX_ CV *cv) 2837coro_aio_callback (pTHX_ CV *cv)
2701{ 2838{
2702 dXSARGS; 2839 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 2840 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 2841 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 2842 SV *data_sv = newSV (sizeof (struct io_state));
2706 2843
2707 av_extend (state, items - 1); 2844 av_extend (state, items - 1);
2708 2845
2822 2959
2823 for (i = 0; i < items; ++i) 2960 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 2961 PUSHs (arg [i]);
2825 2962
2826 /* now push the callback closure */ 2963 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2964 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 2965
2829 /* now call the AIO function - we assume our request is uncancelable */ 2966 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 2967 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 2968 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 2969 }
2850/*****************************************************************************/ 2987/*****************************************************************************/
2851 2988
2852#if CORO_CLONE 2989#if CORO_CLONE
2853# include "clone.c" 2990# include "clone.c"
2854#endif 2991#endif
2992
2993/*****************************************************************************/
2994
2995static SV *
2996coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2997{
2998 SV *coro_sv;
2999 struct coro *coro;
3000 MAGIC *mg;
3001 HV *hv;
3002 SV *cb;
3003 int i;
3004
3005 if (argc > 0)
3006 {
3007 cb = s_get_cv_croak (argv [0]);
3008
3009 if (!is_coro)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3031
3032 if (argc > 0)
3033 {
3034 av_extend (coro->args, argc + is_coro - 1);
3035
3036 if (is_coro)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = (SV *)cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 1; i < argc; i++)
3045 av_push (coro->args, newSVsv (argv [i]));
3046 }
3047
3048 return coro_sv;
3049}
2855 3050
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 3052
2858PROTOTYPES: DISABLE 3053PROTOTYPES: DISABLE
2859 3054
2919 3114
2920 if (!svp) croak ("Time::HiRes is required"); 3115 if (!svp) croak ("Time::HiRes is required");
2921 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2922 3117
2923 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2924 } 3122 }
2925 3123
2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2927} 3125}
2928 3126
2929SV * 3127SV *
2930new (char *klass, ...) 3128new (SV *klass, ...)
2931 ALIAS: 3129 ALIAS:
2932 Coro::new = 1 3130 Coro::new = 1
2933 CODE: 3131 CODE:
2934{ 3132 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3133 OUTPUT:
2936 MAGIC *mg;
2937 HV *hv;
2938 CV *cb;
2939 int i;
2940
2941 if (items > 1)
2942 {
2943 cb = coro_sv_2cv (aTHX_ ST (1));
2944
2945 if (!ix)
2946 {
2947 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2949
2950 if (!CvROOT (cb))
2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2953 }
2954
2955 Newz (0, coro, 1, struct coro);
2956 coro->args = newAV ();
2957 coro->flags = CF_NEW;
2958
2959 if (coro_first) coro_first->prev = coro;
2960 coro->next = coro_first;
2961 coro_first = coro;
2962
2963 coro->hv = hv = newHV ();
2964 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2965 mg->mg_flags |= MGf_DUP;
2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2967
2968 if (items > 1)
2969 {
2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2980 for (i = 2; i < items; i++)
2981 av_push (coro->args, newSVsv (ST (i)));
2982 }
2983}
2984 OUTPUT:
2985 RETVAL 3134 RETVAL
2986 3135
2987void 3136void
2988transfer (...) 3137transfer (...)
2989 PROTOTYPE: $$ 3138 PROTOTYPE: $$
3098 if (ix) 3247 if (ix)
3099 eval_sv (coderef, 0); 3248 eval_sv (coderef, 0);
3100 else 3249 else
3101 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3250 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3102 3251
3252 POPSTACK;
3103 SPAGAIN; 3253 SPAGAIN;
3104 POPSTACK;
3105 3254
3106 if (current != coro) 3255 if (current != coro)
3107 { 3256 {
3108 PUTBACK; 3257 PUTBACK;
3109 save_perl (aTHX_ coro); 3258 save_perl (aTHX_ coro);
3133 CODE: 3282 CODE:
3134{ 3283{
3135 struct coro *current = SvSTATE_current; 3284 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3285 SV **throwp = self == current ? &CORO_THROW : &self->except;
3137 SvREFCNT_dec (*throwp); 3286 SvREFCNT_dec (*throwp);
3287 SvGETMAGIC (throw);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3288 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3139} 3289}
3140 3290
3141void 3291void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3201 CODE: 3351 CODE:
3202 coro_state_destroy (aTHX_ self); 3352 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3204 3354
3205 3355
3356SV *
3357enable_times (int enabled = enable_times)
3358 CODE:
3359{
3360 RETVAL = boolSV (enable_times);
3361
3362 if (enabled != enable_times)
3363 {
3364 enable_times = enabled;
3365
3366 coro_times_update ();
3367 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3368 }
3369}
3370 OUTPUT:
3371 RETVAL
3372
3373void
3374times (Coro::State self)
3375 PPCODE:
3376{
3377 struct coro *current = SvSTATE (coro_current);
3378
3379 if (expect_false (current == self))
3380 {
3381 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current));
3383 }
3384
3385 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388
3389 if (expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current));
3391}
3392
3393void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3395 CODE:
3396{
3397 struct coro *current = SvSTATE_current;
3398
3399 if (current == coro)
3400 SWAP_SVS (current);
3401
3402 if (!coro->swap_sv)
3403 coro->swap_sv = newAV ();
3404
3405 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3406 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3407
3408 if (current == coro)
3409 SWAP_SVS (current);
3410}
3411
3412
3206MODULE = Coro::State PACKAGE = Coro 3413MODULE = Coro::State PACKAGE = Coro
3207 3414
3208BOOT: 3415BOOT:
3209{ 3416{
3210 int i;
3211
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221 3426
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3427 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3429 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3430 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3226 3431
3227 coro_stash = gv_stashpv ("Coro", TRUE); 3432 coro_stash = gv_stashpv ("Coro", TRUE);
3228 3433
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3437 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3438 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3439 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3235
3236 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3237 coro_ready[i] = newAV ();
3238 3440
3239 { 3441 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3442 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 3443
3242 coroapi.schedule = api_schedule; 3444 coroapi.schedule = api_schedule;
3252 sv_setiv (sv, (IV)&coroapi); 3454 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 3455 SvREADONLY_on (sv);
3254 } 3456 }
3255} 3457}
3256 3458
3459SV *
3460async (...)
3461 PROTOTYPE: &@
3462 CODE:
3463 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3464 api_ready (aTHX_ RETVAL);
3465 OUTPUT:
3466 RETVAL
3467
3257void 3468void
3258terminate (...) 3469terminate (...)
3259 CODE: 3470 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3471 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3261 3472
3294void 3505void
3295_set_readyhook (SV *hook) 3506_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 3507 PROTOTYPE: $
3297 CODE: 3508 CODE:
3298 SvREFCNT_dec (coro_readyhook); 3509 SvREFCNT_dec (coro_readyhook);
3510 SvGETMAGIC (hook);
3511 if (SvOK (hook))
3512 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3513 coro_readyhook = newSVsv (hook);
3514 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3515 }
3516 else
3517 {
3518 coro_readyhook = 0;
3519 CORO_READYHOOK = 0;
3520 }
3300 3521
3301int 3522int
3302prio (Coro::State coro, int newprio = 0) 3523prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 3524 PROTOTYPE: $;$
3304 ALIAS: 3525 ALIAS:
3310 if (items > 1) 3531 if (items > 1)
3311 { 3532 {
3312 if (ix) 3533 if (ix)
3313 newprio = coro->prio - newprio; 3534 newprio = coro->prio - newprio;
3314 3535
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3536 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3537 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 3538
3318 coro->prio = newprio; 3539 coro->prio = newprio;
3319 } 3540 }
3320} 3541}
3321 OUTPUT: 3542 OUTPUT:
3336 RETVAL = coro_nready; 3557 RETVAL = coro_nready;
3337 OUTPUT: 3558 OUTPUT:
3338 RETVAL 3559 RETVAL
3339 3560
3340void 3561void
3562suspend (Coro::State self)
3563 PROTOTYPE: $
3564 CODE:
3565 self->flags |= CF_SUSPENDED;
3566
3567void
3568resume (Coro::State self)
3569 PROTOTYPE: $
3570 CODE:
3571 self->flags &= ~CF_SUSPENDED;
3572
3573void
3341_pool_handler (...) 3574_pool_handler (...)
3342 CODE: 3575 CODE:
3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3576 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3344 3577
3345void 3578void
3356 for (i = 1; i < items; ++i) 3589 for (i = 1; i < items; ++i)
3357 av_push (av, SvREFCNT_inc_NN (ST (i))); 3590 av_push (av, SvREFCNT_inc_NN (ST (i)));
3358 3591
3359 if ((SV *)hv == &PL_sv_undef) 3592 if ((SV *)hv == &PL_sv_undef)
3360 { 3593 {
3361 PUSHMARK (SP); 3594 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3362 EXTEND (SP, 2);
3363 PUSHs (sv_Coro);
3364 PUSHs ((SV *)cv_pool_handler);
3365 PUTBACK;
3366 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3367 SPAGAIN;
3368
3369 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3595 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3596 SvREFCNT_dec (sv);
3370 } 3597 }
3371 3598
3372 { 3599 {
3373 struct coro *coro = SvSTATE_hv (hv); 3600 struct coro *coro = SvSTATE_hv (hv);
3374 3601
3408 CODE: 3635 CODE:
3409{ 3636{
3410 struct coro *coro = SvSTATE_current; 3637 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3638 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412 3639
3413 block = (SV *)coro_sv_2cv (aTHX_ block); 3640 block = s_get_cv_croak (block);
3414 3641
3415 if (!*avp) 3642 if (!*avp)
3416 *avp = newAV (); 3643 *avp = newAV ();
3417 3644
3418 av_push (*avp, SvREFCNT_inc (block)); 3645 av_push (*avp, SvREFCNT_inc (block));
3419 3646
3420 if (!ix) 3647 if (!ix)
3421 on_enterleave_call (aTHX_ block); 3648 on_enterleave_call (aTHX_ block);
3422 3649
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3650 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3424 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 3651 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3425 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3652 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3426} 3653}
3427 3654
3428 3655
3429MODULE = Coro::State PACKAGE = PerlIO::cede 3656MODULE = Coro::State PACKAGE = PerlIO::cede
3430 3657
3435MODULE = Coro::State PACKAGE = Coro::Semaphore 3662MODULE = Coro::State PACKAGE = Coro::Semaphore
3436 3663
3437SV * 3664SV *
3438new (SV *klass, SV *count = 0) 3665new (SV *klass, SV *count = 0)
3439 CODE: 3666 CODE:
3667{
3668 int semcnt = 1;
3669
3670 if (count)
3671 {
3672 SvGETMAGIC (count);
3673
3674 if (SvOK (count))
3675 semcnt = SvIV (count);
3676 }
3677
3440 RETVAL = sv_bless ( 3678 RETVAL = sv_bless (
3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3679 coro_waitarray_new (aTHX_ semcnt),
3442 GvSTASH (CvGV (cv)) 3680 GvSTASH (CvGV (cv))
3443 ); 3681 );
3682}
3444 OUTPUT: 3683 OUTPUT:
3445 RETVAL 3684 RETVAL
3446 3685
3447# helper for Coro::Channel 3686# helper for Coro::Channel and others
3448SV * 3687SV *
3449_alloc (int count) 3688_alloc (int count)
3450 CODE: 3689 CODE:
3451 RETVAL = coro_waitarray_new (aTHX_ count); 3690 RETVAL = coro_waitarray_new (aTHX_ count);
3452 OUTPUT: 3691 OUTPUT:
3510 for (i = 1; i <= wcount; ++i) 3749 for (i = 1; i <= wcount; ++i)
3511 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3750 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3512 } 3751 }
3513} 3752}
3514 3753
3754MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3755
3756void
3757_may_delete (SV *sem, int count, int extra_refs)
3758 PPCODE:
3759{
3760 AV *av = (AV *)SvRV (sem);
3761
3762 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3763 && AvFILLp (av) == 0 /* no waiters, just count */
3764 && SvIV (AvARRAY (av)[0]) == count)
3765 XSRETURN_YES;
3766
3767 XSRETURN_NO;
3768}
3769
3515MODULE = Coro::State PACKAGE = Coro::Signal 3770MODULE = Coro::State PACKAGE = Coro::Signal
3516 3771
3517SV * 3772SV *
3518new (SV *klass) 3773new (SV *klass)
3519 CODE: 3774 CODE:
3590 3845
3591void 3846void
3592_register (char *target, char *proto, SV *req) 3847_register (char *target, char *proto, SV *req)
3593 CODE: 3848 CODE:
3594{ 3849{
3595 CV *req_cv = coro_sv_2cv (aTHX_ req); 3850 SV *req_cv = s_get_cv_croak (req);
3596 /* newXSproto doesn't return the CV on 5.8 */ 3851 /* newXSproto doesn't return the CV on 5.8 */
3597 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3852 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3598 sv_setpv ((SV *)slf_cv, proto); 3853 sv_setpv ((SV *)slf_cv, proto);
3599 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3854 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3600} 3855}
3601 3856
3857MODULE = Coro::State PACKAGE = Coro::Select
3858
3859void
3860patch_pp_sselect ()
3861 CODE:
3862 if (!coro_old_pp_sselect)
3863 {
3864 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3865 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3866 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3867 }
3868
3869void
3870unpatch_pp_sselect ()
3871 CODE:
3872 if (coro_old_pp_sselect)
3873 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0;
3876 }
3877
3878

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines