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.348 by root, Wed Jun 10 00:20:26 2009 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 {
… …
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 {
… …
649 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
653 { 750 {
654 int i; 751 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 753 CXINC;
657 } 754 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 756
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 990slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 991{
895 return 1; 992 return 1;
896} 993}
897 994
898static UNOP coro_setup_op; 995static UNOP init_perl_op;
899 996
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 997static void NOINLINE /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
902{ 999{
903 /* 1000 /*
904 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
905 */ 1002 */
906 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
… …
955 */ 1052 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
958 1055
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
960 coro_setup_op.op_next = PL_op; 1057 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1058 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1060 /* no flags etc. required, as an init function won't be called */
964 1061
965 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
966 1063
967 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1065 CORO_THROW = coro->except;
1066
1067 SWAP_SVS (coro);
1068
1069 if (expect_false (enable_times))
1070 {
1071 coro_times_update ();
1072 coro_times_sub (coro);
1073 }
969} 1074}
970 1075
971static void 1076static void
972coro_unwind_stacks (pTHX) 1077coro_unwind_stacks (pTHX)
973{ 1078{
… …
988 dounwind (-1); 1093 dounwind (-1);
989 } 1094 }
990} 1095}
991 1096
992static void 1097static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1098destroy_perl (pTHX_ struct coro *coro)
994{ 1099{
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
995 coro_unwind_stacks (aTHX); 1110 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
996 1112
997 SvREFCNT_dec (GvSV (PL_defgv)); 1113 /* restore swapped sv's */
998 SvREFCNT_dec (GvAV (PL_defgv)); 1114 SWAP_SVS (coro);
999 SvREFCNT_dec (GvSV (PL_errgv));
1000 SvREFCNT_dec (PL_defoutgv);
1001 SvREFCNT_dec (PL_rs);
1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
1004 1115
1005 SvREFCNT_dec (PL_diehook); 1116 // now save some sv's to be free'd later
1006 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);
1007 1129 }
1130
1131 {
1132 unsigned int i;
1133
1134 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1135 SvREFCNT_dec (svf [i]);
1136
1008 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
1009 SvREFCNT_dec (coro->rouse_cb); 1138 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb); 1139 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av); 1140 SvREFCNT_dec (coro->invoke_av);
1012 1141 }
1013 coro_destruct_stacks (aTHX);
1014} 1142}
1015 1143
1016INLINE void 1144INLINE void
1017free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
1018{ 1146{
… …
1215 /* 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 */
1216 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1217 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1218 /* 1346 /*
1219 * 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
1220 * 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.
1221 */ 1350 */
1222 1351
1223 /* 1352 /*
1224 * 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
1225 * 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)
… …
1432 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1433 { 1562 {
1434 /* need to start coroutine */ 1563 /* need to start coroutine */
1435 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1436 /* setup coroutine call */ 1565 /* setup coroutine call */
1437 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1438 } 1567 }
1439 else 1568 else
1440 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1441 1570
1442 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
… …
1505 1634
1506 if (coro->mainstack 1635 if (coro->mainstack
1507 && coro->mainstack != main_mainstack 1636 && coro->mainstack != main_mainstack
1508 && coro->slot 1637 && coro->slot
1509 && !PL_dirty) 1638 && !PL_dirty)
1510 {
1511 struct coro *current = SvSTATE_current;
1512
1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1514
1515 save_perl (aTHX_ current);
1516 load_perl (aTHX_ coro);
1517
1518 coro_destruct_perl (aTHX_ coro); 1639 destroy_perl (aTHX_ coro);
1519 1640
1520 load_perl (aTHX_ current); 1641 if (coro->next) coro->next->prev = coro->prev;
1521 1642 if (coro->prev) coro->prev->next = coro->next;
1522 coro->slot = 0; 1643 if (coro == coro_first) coro_first = coro->next;
1523 }
1524 1644
1525 cctx_destroy (coro->cctx); 1645 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv); 1646 SvREFCNT_dec (coro->startcv);
1527 SvREFCNT_dec (coro->args); 1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1528 SvREFCNT_dec (CORO_THROW); 1649 SvREFCNT_dec (CORO_THROW);
1529
1530 if (coro->next) coro->next->prev = coro->prev;
1531 if (coro->prev) coro->prev->next = coro->next;
1532 if (coro == coro_first) coro_first = coro->next;
1533 1650
1534 return 1; 1651 return 1;
1535} 1652}
1536 1653
1537static int 1654static int
… …
1587 1704
1588 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1705 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1589 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1590} 1707}
1591 1708
1592/*****************************************************************************/
1593/* gensub: simple closure generation utility */
1594
1595#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1596
1597/* create a closure from XS, returns a code reference */
1598/* the arg can be accessed via GENSUB_ARG from the callback */
1599/* the callback must use dXSARGS/XSRETURN */
1600static SV *
1601gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1602{
1603 CV *cv = (CV *)newSV (0);
1604
1605 sv_upgrade ((SV *)cv, SVt_PVCV);
1606
1607 CvANON_on (cv);
1608 CvISXSUB_on (cv);
1609 CvXSUB (cv) = xsub;
1610 GENSUB_ARG = arg;
1611
1612 return newRV_noinc ((SV *)cv);
1613}
1614
1615/** Coro ********************************************************************/ 1709/** Coro ********************************************************************/
1616 1710
1617INLINE void 1711INLINE void
1618coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1619{ 1713{
1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1621 1715
1622 SvREFCNT_inc_NN (coro->hv); 1716 SvREFCNT_inc_NN (coro->hv);
1623 1717
1624 coro->next_ready = 0; 1718 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1629INLINE struct coro * 1723INLINE struct coro *
1630coro_deq (pTHX) 1724coro_deq (pTHX)
1631{ 1725{
1632 int prio; 1726 int prio;
1633 1727
1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1635 { 1729 {
1636 struct coro **ready = coro_ready [prio]; 1730 struct coro **ready = coro_ready [prio];
1637 1731
1638 if (ready [0]) 1732 if (ready [0])
1639 { 1733 {
… …
1644 } 1738 }
1645 1739
1646 return 0; 1740 return 0;
1647} 1741}
1648 1742
1743static void
1744invoke_sv_ready_hook_helper (void)
1745{
1746 dTHX;
1747 dSP;
1748
1749 ENTER;
1750 SAVETMPS;
1751
1752 PUSHMARK (SP);
1753 PUTBACK;
1754 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1755
1756 FREETMPS;
1757 LEAVE;
1758}
1759
1649static int 1760static int
1650api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1651{ 1762{
1652 struct coro *coro;
1653 SV *sv_hook;
1654 void (*xs_hook)(void);
1655
1656 coro = SvSTATE (coro_sv); 1763 struct coro *coro = SvSTATE (coro_sv);
1657 1764
1658 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1659 return 0; 1766 return 0;
1660 1767
1661 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1662 1769
1663 sv_hook = coro_nready ? 0 : coro_readyhook;
1664 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1665
1666 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1667 ++coro_nready;
1668 1771
1669 if (sv_hook) 1772 if (!coro_nready++)
1670 { 1773 if (coroapi.readyhook)
1671 dSP; 1774 coroapi.readyhook ();
1672
1673 ENTER;
1674 SAVETMPS;
1675
1676 PUSHMARK (SP);
1677 PUTBACK;
1678 call_sv (sv_hook, G_VOID | G_DISCARD);
1679
1680 FREETMPS;
1681 LEAVE;
1682 }
1683
1684 if (xs_hook)
1685 xs_hook ();
1686 1775
1687 return 1; 1776 return 1;
1688} 1777}
1689 1778
1690static int 1779static int
… …
1735 { 1824 {
1736 /* nothing to schedule: call the idle handler */ 1825 /* nothing to schedule: call the idle handler */
1737 if (SvROK (sv_idle) 1826 if (SvROK (sv_idle)
1738 && SvOBJECT (SvRV (sv_idle))) 1827 && SvOBJECT (SvRV (sv_idle)))
1739 { 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
1740 ++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 */
1741 api_ready (aTHX_ SvRV (sv_idle)); 1833 api_ready (aTHX_ SvRV (sv_idle));
1742 --coro_nready; 1834 --coro_nready;
1743 } 1835 }
1744 else 1836 else
1745 { 1837 {
1838 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1746 dSP; 1839 dSP;
1747 1840
1748 ENTER; 1841 ENTER;
1749 SAVETMPS; 1842 SAVETMPS;
1750 1843
… …
1896{ 1989{
1897 int i; 1990 int i;
1898 HV *hv = (HV *)SvRV (coro_current); 1991 HV *hv = (HV *)SvRV (coro_current);
1899 AV *av = newAV (); 1992 AV *av = newAV ();
1900 1993
1994 /* items are actually not so common, so optimise for this case */
1995 if (items)
1996 {
1901 av_extend (av, items - 1); 1997 av_extend (av, items - 1);
1998
1902 for (i = 0; i < items; ++i) 1999 for (i = 0; i < items; ++i)
1903 av_push (av, SvREFCNT_inc_NN (arg [i])); 2000 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 }
1904 2002
1905 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);
1906 2004
1907 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 */
1908 api_ready (aTHX_ sv_manager); 2006 api_ready (aTHX_ sv_manager);
… …
1998 2096
1999static void 2097static void
2000coro_rouse_callback (pTHX_ CV *cv) 2098coro_rouse_callback (pTHX_ CV *cv)
2001{ 2099{
2002 dXSARGS; 2100 dXSARGS;
2003 SV *data = (SV *)GENSUB_ARG; 2101 SV *data = (SV *)S_GENSUB_ARG;
2004 2102
2005 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2103 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2006 { 2104 {
2007 /* first call, set args */ 2105 /* first call, set args */
2008 SV *coro = SvRV (data); 2106 SV *coro = SvRV (data);
… …
2074 || SvTYPE (SvRV (cb)) != SVt_PVCV 2172 || SvTYPE (SvRV (cb)) != SVt_PVCV
2075 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2076 croak ("Coro::rouse_wait called with illegal callback argument,"); 2174 croak ("Coro::rouse_wait called with illegal callback argument,");
2077 2175
2078 { 2176 {
2079 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2080 SV *data = (SV *)GENSUB_ARG; 2178 SV *data = (SV *)S_GENSUB_ARG;
2081 2179
2082 frame->data = (void *)data; 2180 frame->data = (void *)data;
2083 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2181 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2084 frame->check = slf_check_rouse_wait; 2182 frame->check = slf_check_rouse_wait;
2085 } 2183 }
… …
2089coro_new_rouse_cb (pTHX) 2187coro_new_rouse_cb (pTHX)
2090{ 2188{
2091 HV *hv = (HV *)SvRV (coro_current); 2189 HV *hv = (HV *)SvRV (coro_current);
2092 struct coro *coro = SvSTATE_hv (hv); 2190 struct coro *coro = SvSTATE_hv (hv);
2093 SV *data = newRV_inc ((SV *)hv); 2191 SV *data = newRV_inc ((SV *)hv);
2094 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2192 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2095 2193
2096 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);
2097 SvREFCNT_dec (data); /* magicext increases the refcount */ 2195 SvREFCNT_dec (data); /* magicext increases the refcount */
2098 2196
2099 SvREFCNT_dec (coro->rouse_cb); 2197 SvREFCNT_dec (coro->rouse_cb);
… …
2470/* Coro::Semaphore & Coro::Signal */ 2568/* Coro::Semaphore & Coro::Signal */
2471 2569
2472static SV * 2570static SV *
2473coro_waitarray_new (pTHX_ int count) 2571coro_waitarray_new (pTHX_ int count)
2474{ 2572{
2475 /* 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 */
2476 AV *av = newAV (); 2574 AV *av = newAV ();
2477 SV **ary; 2575 SV **ary;
2478 2576
2479 /* unfortunately, building manually saves memory */ 2577 /* unfortunately, building manually saves memory */
2480 Newx (ary, 2, SV *); 2578 Newx (ary, 2, SV *);
… …
2622{ 2720{
2623 if (items >= 2) 2721 if (items >= 2)
2624 { 2722 {
2625 /* callback form */ 2723 /* callback form */
2626 AV *av = (AV *)SvRV (arg [0]); 2724 AV *av = (AV *)SvRV (arg [0]);
2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2725 SV *cb_cv = s_get_cv_croak (arg [1]);
2628 2726
2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2727 av_push (av, SvREFCNT_inc_NN (cb_cv));
2630 2728
2631 if (SvIVX (AvARRAY (av)[0]) > 0) 2729 if (SvIVX (AvARRAY (av)[0]) > 0)
2632 coro_semaphore_adjust (aTHX_ av, 0); 2730 coro_semaphore_adjust (aTHX_ av, 0);
2633 2731
2634 frame->prepare = prepare_nop; 2732 frame->prepare = prepare_nop;
… …
2658 AvARRAY (av)[0] = AvARRAY (av)[1]; 2756 AvARRAY (av)[0] = AvARRAY (av)[1];
2659 AvARRAY (av)[1] = cb; 2757 AvARRAY (av)[1] = cb;
2660 2758
2661 cb = av_shift (av); 2759 cb = av_shift (av);
2662 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 {
2663 api_ready (aTHX_ cb); 2771 api_ready (aTHX_ cb);
2664 sv_setiv (cb, 0); /* signal waiter */ 2772 sv_setiv (cb, 0); /* signal waiter */
2773 }
2774
2665 SvREFCNT_dec (cb); 2775 SvREFCNT_dec (cb);
2666 2776
2667 --count; 2777 --count;
2668 } 2778 }
2669} 2779}
… …
2678static void 2788static void
2679slf_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)
2680{ 2790{
2681 AV *av = (AV *)SvRV (arg [0]); 2791 AV *av = (AV *)SvRV (arg [0]);
2682 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
2683 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]))
2684 { 2805 {
2685 SvIVX (AvARRAY (av)[0]) = 0; 2806 SvIVX (AvARRAY (av)[0]) = 0;
2686 frame->prepare = prepare_nop; 2807 frame->prepare = prepare_nop;
2687 frame->check = slf_check_nop; 2808 frame->check = slf_check_nop;
2688 } 2809 }
2689 else 2810 else
2690 { 2811 {
2691 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2812 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2692 2813
2693 av_push (av, waiter); 2814 av_push (av, waiter);
2694 2815
2695 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 */
2696 frame->prepare = prepare_schedule; 2817 frame->prepare = prepare_schedule;
… …
2714 2835
2715static void 2836static void
2716coro_aio_callback (pTHX_ CV *cv) 2837coro_aio_callback (pTHX_ CV *cv)
2717{ 2838{
2718 dXSARGS; 2839 dXSARGS;
2719 AV *state = (AV *)GENSUB_ARG; 2840 AV *state = (AV *)S_GENSUB_ARG;
2720 SV *coro = av_pop (state); 2841 SV *coro = av_pop (state);
2721 SV *data_sv = newSV (sizeof (struct io_state)); 2842 SV *data_sv = newSV (sizeof (struct io_state));
2722 2843
2723 av_extend (state, items - 1); 2844 av_extend (state, items - 1);
2724 2845
… …
2838 2959
2839 for (i = 0; i < items; ++i) 2960 for (i = 0; i < items; ++i)
2840 PUSHs (arg [i]); 2961 PUSHs (arg [i]);
2841 2962
2842 /* now push the callback closure */ 2963 /* now push the callback closure */
2843 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))));
2844 2965
2845 /* now call the AIO function - we assume our request is uncancelable */ 2966 /* now call the AIO function - we assume our request is uncancelable */
2846 PUTBACK; 2967 PUTBACK;
2847 call_sv ((SV *)req, G_VOID | G_DISCARD); 2968 call_sv ((SV *)req, G_VOID | G_DISCARD);
2848 } 2969 }
… …
2866/*****************************************************************************/ 2987/*****************************************************************************/
2867 2988
2868#if CORO_CLONE 2989#if CORO_CLONE
2869# include "clone.c" 2990# include "clone.c"
2870#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}
2871 3050
2872MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2873 3052
2874PROTOTYPES: DISABLE 3053PROTOTYPES: DISABLE
2875 3054
… …
2935 3114
2936 if (!svp) croak ("Time::HiRes is required"); 3115 if (!svp) croak ("Time::HiRes is required");
2937 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2938 3117
2939 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));
2940 } 3122 }
2941 3123
2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2943} 3125}
2944 3126
2945SV * 3127SV *
2946new (char *klass, ...) 3128new (SV *klass, ...)
2947 ALIAS: 3129 ALIAS:
2948 Coro::new = 1 3130 Coro::new = 1
2949 CODE: 3131 CODE:
2950{ 3132 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2951 struct coro *coro; 3133 OUTPUT:
2952 MAGIC *mg;
2953 HV *hv;
2954 CV *cb;
2955 int i;
2956
2957 if (items > 1)
2958 {
2959 cb = coro_sv_2cv (aTHX_ ST (1));
2960
2961 if (!ix)
2962 {
2963 if (CvISXSUB (cb))
2964 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2965
2966 if (!CvROOT (cb))
2967 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2968 }
2969 }
2970
2971 Newz (0, coro, 1, struct coro);
2972 coro->args = newAV ();
2973 coro->flags = CF_NEW;
2974
2975 if (coro_first) coro_first->prev = coro;
2976 coro->next = coro_first;
2977 coro_first = coro;
2978
2979 coro->hv = hv = newHV ();
2980 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2981 mg->mg_flags |= MGf_DUP;
2982 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2983
2984 if (items > 1)
2985 {
2986 av_extend (coro->args, items - 1 + ix - 1);
2987
2988 if (ix)
2989 {
2990 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991 cb = cv_coro_run;
2992 }
2993
2994 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2995
2996 for (i = 2; i < items; i++)
2997 av_push (coro->args, newSVsv (ST (i)));
2998 }
2999}
3000 OUTPUT:
3001 RETVAL 3134 RETVAL
3002 3135
3003void 3136void
3004transfer (...) 3137transfer (...)
3005 PROTOTYPE: $$ 3138 PROTOTYPE: $$
… …
3149 CODE: 3282 CODE:
3150{ 3283{
3151 struct coro *current = SvSTATE_current; 3284 struct coro *current = SvSTATE_current;
3152 SV **throwp = self == current ? &CORO_THROW : &self->except; 3285 SV **throwp = self == current ? &CORO_THROW : &self->except;
3153 SvREFCNT_dec (*throwp); 3286 SvREFCNT_dec (*throwp);
3287 SvGETMAGIC (throw);
3154 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3288 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3155} 3289}
3156 3290
3157void 3291void
3158api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3217 CODE: 3351 CODE:
3218 coro_state_destroy (aTHX_ self); 3352 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3220 3354
3221 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
3222MODULE = Coro::State PACKAGE = Coro 3413MODULE = Coro::State PACKAGE = Coro
3223 3414
3224BOOT: 3415BOOT:
3225{ 3416{
3226 int i;
3227
3228 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3229 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3230 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3231 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3232 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);
… …
3236 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3237 3426
3238 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);
3239 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3240 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);
3241 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 */
3242 3431
3243 coro_stash = gv_stashpv ("Coro", TRUE); 3432 coro_stash = gv_stashpv ("Coro", TRUE);
3244 3433
3245 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3246 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3247 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3248 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3437 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3249 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3438 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3250 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3439 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3251 3440
3252 { 3441 {
3253 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3442 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3254 3443
3255 coroapi.schedule = api_schedule; 3444 coroapi.schedule = api_schedule;
… …
3265 sv_setiv (sv, (IV)&coroapi); 3454 sv_setiv (sv, (IV)&coroapi);
3266 SvREADONLY_on (sv); 3455 SvREADONLY_on (sv);
3267 } 3456 }
3268} 3457}
3269 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
3270void 3468void
3271terminate (...) 3469terminate (...)
3272 CODE: 3470 CODE:
3273 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3471 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3274 3472
… …
3307void 3505void
3308_set_readyhook (SV *hook) 3506_set_readyhook (SV *hook)
3309 PROTOTYPE: $ 3507 PROTOTYPE: $
3310 CODE: 3508 CODE:
3311 SvREFCNT_dec (coro_readyhook); 3509 SvREFCNT_dec (coro_readyhook);
3510 SvGETMAGIC (hook);
3511 if (SvOK (hook))
3512 {
3312 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 }
3313 3521
3314int 3522int
3315prio (Coro::State coro, int newprio = 0) 3523prio (Coro::State coro, int newprio = 0)
3316 PROTOTYPE: $;$ 3524 PROTOTYPE: $;$
3317 ALIAS: 3525 ALIAS:
… …
3323 if (items > 1) 3531 if (items > 1)
3324 { 3532 {
3325 if (ix) 3533 if (ix)
3326 newprio = coro->prio - newprio; 3534 newprio = coro->prio - newprio;
3327 3535
3328 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3536 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3329 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3537 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3330 3538
3331 coro->prio = newprio; 3539 coro->prio = newprio;
3332 } 3540 }
3333} 3541}
3334 OUTPUT: 3542 OUTPUT:
… …
3381 for (i = 1; i < items; ++i) 3589 for (i = 1; i < items; ++i)
3382 av_push (av, SvREFCNT_inc_NN (ST (i))); 3590 av_push (av, SvREFCNT_inc_NN (ST (i)));
3383 3591
3384 if ((SV *)hv == &PL_sv_undef) 3592 if ((SV *)hv == &PL_sv_undef)
3385 { 3593 {
3386 PUSHMARK (SP); 3594 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3387 EXTEND (SP, 2);
3388 PUSHs (sv_Coro);
3389 PUSHs ((SV *)cv_pool_handler);
3390 PUTBACK;
3391 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3392 SPAGAIN;
3393
3394 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3595 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3596 SvREFCNT_dec (sv);
3395 } 3597 }
3396 3598
3397 { 3599 {
3398 struct coro *coro = SvSTATE_hv (hv); 3600 struct coro *coro = SvSTATE_hv (hv);
3399 3601
… …
3433 CODE: 3635 CODE:
3434{ 3636{
3435 struct coro *coro = SvSTATE_current; 3637 struct coro *coro = SvSTATE_current;
3436 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3638 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3437 3639
3438 block = (SV *)coro_sv_2cv (aTHX_ block); 3640 block = s_get_cv_croak (block);
3439 3641
3440 if (!*avp) 3642 if (!*avp)
3441 *avp = newAV (); 3643 *avp = newAV ();
3442 3644
3443 av_push (*avp, SvREFCNT_inc (block)); 3645 av_push (*avp, SvREFCNT_inc (block));
… …
3460MODULE = Coro::State PACKAGE = Coro::Semaphore 3662MODULE = Coro::State PACKAGE = Coro::Semaphore
3461 3663
3462SV * 3664SV *
3463new (SV *klass, SV *count = 0) 3665new (SV *klass, SV *count = 0)
3464 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
3465 RETVAL = sv_bless ( 3678 RETVAL = sv_bless (
3466 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3679 coro_waitarray_new (aTHX_ semcnt),
3467 GvSTASH (CvGV (cv)) 3680 GvSTASH (CvGV (cv))
3468 ); 3681 );
3682}
3469 OUTPUT: 3683 OUTPUT:
3470 RETVAL 3684 RETVAL
3471 3685
3472# helper for Coro::Channel and others 3686# helper for Coro::Channel and others
3473SV * 3687SV *
… …
3631 3845
3632void 3846void
3633_register (char *target, char *proto, SV *req) 3847_register (char *target, char *proto, SV *req)
3634 CODE: 3848 CODE:
3635{ 3849{
3636 CV *req_cv = coro_sv_2cv (aTHX_ req); 3850 SV *req_cv = s_get_cv_croak (req);
3637 /* newXSproto doesn't return the CV on 5.8 */ 3851 /* newXSproto doesn't return the CV on 5.8 */
3638 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3852 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3639 sv_setpv ((SV *)slf_cv, proto); 3853 sv_setpv ((SV *)slf_cv, proto);
3640 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);
3641} 3855}
3642 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