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.346 by root, Tue Jun 9 18:56:45 2009 UTC vs.
Revision 1.383 by root, Sun Feb 13 04:39:16 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
117#endif 67#endif
118 68
119#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
137 87
138#define IN_DESTRUCT PL_dirty 88#define IN_DESTRUCT PL_dirty
139 89
140#if __GNUC__ >= 3 90#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 93# define INLINE static inline
144#else 94#else
145# define attribute(x) 95# define attribute(x)
146# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
147# define INLINE static 97# define INLINE static
… …
159# if CORO_PTHREAD 109# if CORO_PTHREAD
160static void *coro_thx; 110static void *coro_thx;
161# endif 111# endif
162#endif 112#endif
163 113
114#ifdef __linux
115# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime
118# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
119# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif
122#endif
123
164static double (*nvtime)(); /* so why doesn't it take void? */ 124static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]);
165 126
166/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
169 130
… …
190static SV *sv_pool_size; 151static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 155static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 156
197/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
198static SV *sv_activity; 158static SV *sv_activity;
159
160/* enable processtime/realtime profiling */
161static char enable_times;
162typedef U32 coro_ts[2];
163static coro_ts time_real, time_cpu;
164static char times_valid;
199 165
200static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
202 168
203enum { 169enum {
… …
261/* this is a structure representing a perl-level coroutine */ 227/* this is a structure representing a perl-level coroutine */
262struct coro { 228struct coro {
263 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 230 coro_cctx *cctx;
265 231
232 /* ready queue */
233 struct coro *next_ready;
234
266 /* state data */ 235 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 237 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
270 239
… …
290 259
291 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
292 AV *on_enter; 261 AV *on_enter;
293 AV *on_leave; 262 AV *on_leave;
294 263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
295 /* linked list */ 270 /* linked list */
296 struct coro *next, *prev; 271 struct coro *next, *prev;
297}; 272};
298 273
299typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
… …
304/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
306 281
307/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
308 283
309#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
315 290
316/* for Coro.pm */ 291/* for Coro.pm */
317static SV *coro_current; 292static SV *coro_current;
318static SV *coro_readyhook; 293static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
321static struct coro *coro_first; 296static struct coro *coro_first;
322#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
323 318
324/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
325 320
326static SV * 321static SV *
327coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
… …
351 get_hv (name, create); 346 get_hv (name, create);
352#endif 347#endif
353 return get_hv (name, create); 348 return get_hv (name, create);
354} 349}
355 350
356/* may croak */ 351INLINE void
357INLINE CV * 352coro_times_update ()
358coro_sv_2cv (pTHX_ SV *sv)
359{ 353{
360 HV *st; 354#ifdef coro_clock_gettime
361 GV *gvp; 355 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 356
364 if (!cv) 357 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 358 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
359 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 360
367 return cv; 361 ts.tv_sec = ts.tv_nsec = 0;
362 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
363 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
364#else
365 dTHX;
366 UV tv[2];
367
368 u2time (aTHX_ tv);
369 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000;
371#endif
372}
373
374INLINE void
375coro_times_add (struct coro *c)
376{
377 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0];
380
381 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0];
384}
385
386INLINE void
387coro_times_sub (struct coro *c)
388{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0];
392
393 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
394 c->t_cpu [1] -= time_cpu [1];
395 c->t_cpu [0] -= time_cpu [0];
368} 396}
369 397
370/*****************************************************************************/ 398/*****************************************************************************/
371/* magic glue */ 399/* magic glue */
372 400
… …
472static int 500static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 501coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 502{
475 AV *padlist; 503 AV *padlist;
476 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
505
506 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT)
508 return 0;
477 509
478 /* casting is fun. */ 510 /* casting is fun. */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
480 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
481 513
… …
530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
531} 563}
532 564
533/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
534 566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
535static void 618static void
536on_enterleave_call (pTHX_ SV *cb); 619on_enterleave_call (pTHX_ SV *cb);
537 620
538static void 621static void
539load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
… …
570 } 653 }
571 654
572 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 656 CORO_THROW = c->except;
574 657
658 if (expect_false (enable_times))
659 {
660 if (expect_false (!times_valid))
661 coro_times_update ();
662
663 coro_times_sub (c);
664 }
665
575 if (expect_false (c->on_enter)) 666 if (expect_false (c->on_enter))
576 { 667 {
577 int i; 668 int i;
578 669
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 } 672 }
673
674 SWAP_SVS (c);
582} 675}
583 676
584static void 677static void
585save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
586{ 679{
680 SWAP_SVS (c);
681
587 if (expect_false (c->on_leave)) 682 if (expect_false (c->on_leave))
588 { 683 {
589 int i; 684 int i;
590 685
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 }
689
690 times_valid = 0;
691
692 if (expect_false (enable_times))
693 {
694 coro_times_update (); times_valid = 1;
695 coro_times_add (c);
593 } 696 }
594 697
595 c->except = CORO_THROW; 698 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
597 700
… …
612 { 715 {
613 while (expect_true (cxix >= 0)) 716 while (expect_true (cxix >= 0))
614 { 717 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 718 PERL_CONTEXT *cx = &ccstk[cxix--];
616 719
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 721 {
619 CV *cv = cx->blk_sub.cv; 722 CV *cv = cx->blk_sub.cv;
620 723
621 if (expect_true (CvDEPTH (cv))) 724 if (expect_true (CvDEPTH (cv)))
622 { 725 {
… …
646 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
647 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
650 { 753 {
651 int i; 754 unsigned int i;
652 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
653 CXINC; 756 CXINC;
654 } 757 }
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
656 759
… …
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 994{
892 return 1; 995 return 1;
893} 996}
894 997
895static UNOP coro_setup_op; 998static UNOP init_perl_op;
896 999
897static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
898coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
899{ 1002{
900 /* 1003 /*
901 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
902 */ 1005 */
903 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
… …
910 PL_comppad_name_fill = 0; 1013 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0; 1014 PL_comppad_name_floor = 0;
912 PL_curpm = 0; 1015 PL_curpm = 0;
913 PL_curpad = 0; 1016 PL_curpad = 0;
914 PL_localizing = 0; 1017 PL_localizing = 0;
915 PL_dirty = 0;
916 PL_restartop = 0; 1018 PL_restartop = 0;
917#if PERL_VERSION_ATLEAST (5,10,0) 1019#if PERL_VERSION_ATLEAST (5,10,0)
918 PL_parser = 0; 1020 PL_parser = 0;
919#endif 1021#endif
920 PL_hints = 0; 1022 PL_hints = 0;
… …
952 */ 1054 */
953 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
954 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
955 1057
956 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
957 coro_setup_op.op_next = PL_op; 1059 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1060 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1061 init_perl_op.op_ppaddr = pp_slf;
960 /* no flags etc. required, as an init function won't be called */ 1062 /* no flags etc. required, as an init function won't be called */
961 1063
962 PL_op = (OP *)&coro_setup_op; 1064 PL_op = (OP *)&init_perl_op;
963 1065
964 /* copy throw, in case it was set before coro_setup */ 1066 /* copy throw, in case it was set before init_perl */
965 CORO_THROW = coro->except; 1067 CORO_THROW = coro->except;
1068
1069 SWAP_SVS (coro);
1070
1071 if (expect_false (enable_times))
1072 {
1073 coro_times_update ();
1074 coro_times_sub (coro);
1075 }
966} 1076}
967 1077
968static void 1078static void
969coro_unwind_stacks (pTHX) 1079coro_unwind_stacks (pTHX)
970{ 1080{
… …
985 dounwind (-1); 1095 dounwind (-1);
986 } 1096 }
987} 1097}
988 1098
989static void 1099static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1100destroy_perl (pTHX_ struct coro *coro)
991{ 1101{
1102 SV *svf [9];
1103
1104 {
1105 struct coro *current = SvSTATE_current;
1106
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108
1109 save_perl (aTHX_ current);
1110 load_perl (aTHX_ coro);
1111
992 coro_unwind_stacks (aTHX); 1112 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
993 1114
994 SvREFCNT_dec (GvSV (PL_defgv)); 1115 /* restore swapped sv's */
995 SvREFCNT_dec (GvAV (PL_defgv)); 1116 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 1117
1002 SvREFCNT_dec (PL_diehook); 1118 // now save some sv's to be free'd later
1003 SvREFCNT_dec (PL_warnhook); 1119 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs;
1124 svf [5] = GvSV (irsgv);
1125 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf));
1129
1130 load_perl (aTHX_ current);
1004 1131 }
1132
1133 {
1134 unsigned int i;
1135
1136 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1137 SvREFCNT_dec (svf [i]);
1138
1005 SvREFCNT_dec (coro->saved_deffh); 1139 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1140 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1141 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1142 SvREFCNT_dec (coro->invoke_av);
1009 1143 }
1010 coro_destruct_stacks (aTHX);
1011} 1144}
1012 1145
1013INLINE void 1146INLINE void
1014free_coro_mortal (pTHX) 1147free_coro_mortal (pTHX)
1015{ 1148{
… …
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1345 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1346 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1347 perl_run (PL_curinterp);
1215 /* 1348 /*
1216 * Unfortunately, there is no way to get at the return values of the 1349 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1350 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1351 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1352 */
1219 1353
1220 /* 1354 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1355 * If perl-run returns we assume exit() was being called or the coro
1222 * fell off the end, which seems to be the only valid (non-bug) 1356 * fell off the end, which seems to be the only valid (non-bug)
… …
1429 if (expect_false (next->flags & CF_NEW)) 1563 if (expect_false (next->flags & CF_NEW))
1430 { 1564 {
1431 /* need to start coroutine */ 1565 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1566 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1567 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1568 init_perl (aTHX_ next);
1435 } 1569 }
1436 else 1570 else
1437 load_perl (aTHX_ next); 1571 load_perl (aTHX_ next);
1438 1572
1439 /* possibly untie and reuse the cctx */ 1573 /* possibly untie and reuse the cctx */
… …
1502 1636
1503 if (coro->mainstack 1637 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1638 && coro->mainstack != main_mainstack
1505 && coro->slot 1639 && coro->slot
1506 && !PL_dirty) 1640 && !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); 1641 destroy_perl (aTHX_ coro);
1516 1642
1517 load_perl (aTHX_ current); 1643 if (coro->next) coro->next->prev = coro->prev;
1518 1644 if (coro->prev) coro->prev->next = coro->next;
1519 coro->slot = 0; 1645 if (coro == coro_first) coro_first = coro->next;
1520 }
1521 1646
1522 cctx_destroy (coro->cctx); 1647 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1648 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1649 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1651 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 1652
1531 return 1; 1653 return 1;
1532} 1654}
1533 1655
1534static int 1656static int
… …
1584 1706
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1707 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1708 TRANSFER (ta, 1);
1587} 1709}
1588 1710
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 ********************************************************************/ 1711/** Coro ********************************************************************/
1613 1712
1614INLINE void 1713INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1714coro_enq (pTHX_ struct coro *coro)
1616{ 1715{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1717
1620INLINE SV * 1718 SvREFCNT_inc_NN (coro->hv);
1719
1720 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro;
1723}
1724
1725INLINE struct coro *
1621coro_deq (pTHX) 1726coro_deq (pTHX)
1622{ 1727{
1623 int prio; 1728 int prio;
1624 1729
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1731 {
1627 return av_shift (coro_ready [prio]); 1732 struct coro **ready = coro_ready [prio];
1733
1734 if (ready [0])
1735 {
1736 struct coro *coro = ready [0];
1737 ready [0] = coro->next_ready;
1738 return coro;
1739 }
1740 }
1628 1741
1629 return 0; 1742 return 0;
1743}
1744
1745static void
1746invoke_sv_ready_hook_helper (void)
1747{
1748 dTHX;
1749 dSP;
1750
1751 ENTER;
1752 SAVETMPS;
1753
1754 PUSHMARK (SP);
1755 PUTBACK;
1756 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1757
1758 FREETMPS;
1759 LEAVE;
1630} 1760}
1631 1761
1632static int 1762static int
1633api_ready (pTHX_ SV *coro_sv) 1763api_ready (pTHX_ SV *coro_sv)
1634{ 1764{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1765 struct coro *coro = SvSTATE (coro_sv);
1640 1766
1641 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1642 return 0; 1768 return 0;
1643 1769
1644 coro->flags |= CF_READY; 1770 coro->flags |= CF_READY;
1645 1771
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1772 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1773
1652 if (sv_hook) 1774 if (!coro_nready++)
1653 { 1775 if (coroapi.readyhook)
1654 dSP; 1776 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 1777
1670 return 1; 1778 return 1;
1671} 1779}
1672 1780
1673static int 1781static int
… …
1696static void 1804static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1805prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1806{
1699 for (;;) 1807 for (;;)
1700 { 1808 {
1701 SV *next_sv = coro_deq (aTHX); 1809 struct coro *next = coro_deq (aTHX);
1702 1810
1703 if (expect_true (next_sv)) 1811 if (expect_true (next))
1704 { 1812 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1813 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1815 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1816 else
1711 { 1817 {
1712 next->flags &= ~CF_READY; 1818 next->flags &= ~CF_READY;
1713 --coro_nready; 1819 --coro_nready;
1714 1820
… …
1720 { 1826 {
1721 /* nothing to schedule: call the idle handler */ 1827 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 1828 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 1829 && SvOBJECT (SvRV (sv_idle)))
1724 { 1830 {
1831 if (SvRV (sv_idle) == SvRV (coro_current))
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1833
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle)); 1835 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 1836 --coro_nready;
1728 } 1837 }
1729 else 1838 else
1730 { 1839 {
1840 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 1841 dSP;
1732 1842
1733 ENTER; 1843 ENTER;
1734 SAVETMPS; 1844 SAVETMPS;
1735 1845
… …
1881{ 1991{
1882 int i; 1992 int i;
1883 HV *hv = (HV *)SvRV (coro_current); 1993 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV (); 1994 AV *av = newAV ();
1885 1995
1996 /* items are actually not so common, so optimise for this case */
1997 if (items)
1998 {
1886 av_extend (av, items - 1); 1999 av_extend (av, items - 1);
2000
1887 for (i = 0; i < items; ++i) 2001 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2002 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 }
1889 2004
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1891 2006
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 2008 api_ready (aTHX_ sv_manager);
… …
1983 2098
1984static void 2099static void
1985coro_rouse_callback (pTHX_ CV *cv) 2100coro_rouse_callback (pTHX_ CV *cv)
1986{ 2101{
1987 dXSARGS; 2102 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)S_GENSUB_ARG;
1989 2104
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2106 {
1992 /* first call, set args */ 2107 /* first call, set args */
1993 SV *coro = SvRV (data); 2108 SV *coro = SvRV (data);
… …
2059 || SvTYPE (SvRV (cb)) != SVt_PVCV 2174 || SvTYPE (SvRV (cb)) != SVt_PVCV
2060 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2061 croak ("Coro::rouse_wait called with illegal callback argument,"); 2176 croak ("Coro::rouse_wait called with illegal callback argument,");
2062 2177
2063 { 2178 {
2064 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2065 SV *data = (SV *)GENSUB_ARG; 2180 SV *data = (SV *)S_GENSUB_ARG;
2066 2181
2067 frame->data = (void *)data; 2182 frame->data = (void *)data;
2068 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2069 frame->check = slf_check_rouse_wait; 2184 frame->check = slf_check_rouse_wait;
2070 } 2185 }
… …
2074coro_new_rouse_cb (pTHX) 2189coro_new_rouse_cb (pTHX)
2075{ 2190{
2076 HV *hv = (HV *)SvRV (coro_current); 2191 HV *hv = (HV *)SvRV (coro_current);
2077 struct coro *coro = SvSTATE_hv (hv); 2192 struct coro *coro = SvSTATE_hv (hv);
2078 SV *data = newRV_inc ((SV *)hv); 2193 SV *data = newRV_inc ((SV *)hv);
2079 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2194 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2080 2195
2081 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2082 SvREFCNT_dec (data); /* magicext increases the refcount */ 2197 SvREFCNT_dec (data); /* magicext increases the refcount */
2083 2198
2084 SvREFCNT_dec (coro->rouse_cb); 2199 SvREFCNT_dec (coro->rouse_cb);
… …
2309 if (PL_op->op_flags & OPf_STACKED) 2424 if (PL_op->op_flags & OPf_STACKED)
2310 { 2425 {
2311 if (items > slf_arga) 2426 if (items > slf_arga)
2312 { 2427 {
2313 slf_arga = items; 2428 slf_arga = items;
2314 free (slf_argv); 2429 Safefree (slf_argv);
2315 slf_argv = malloc (slf_arga * sizeof (SV *)); 2430 New (0, slf_argv, slf_arga, SV *);
2316 } 2431 }
2317 2432
2318 slf_argc = items; 2433 slf_argc = items;
2319 2434
2320 for (i = 0; i < items; ++i) 2435 for (i = 0; i < items; ++i)
… …
2455/* Coro::Semaphore & Coro::Signal */ 2570/* Coro::Semaphore & Coro::Signal */
2456 2571
2457static SV * 2572static SV *
2458coro_waitarray_new (pTHX_ int count) 2573coro_waitarray_new (pTHX_ int count)
2459{ 2574{
2460 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2575 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2461 AV *av = newAV (); 2576 AV *av = newAV ();
2462 SV **ary; 2577 SV **ary;
2463 2578
2464 /* unfortunately, building manually saves memory */ 2579 /* unfortunately, building manually saves memory */
2465 Newx (ary, 2, SV *); 2580 Newx (ary, 2, SV *);
… …
2607{ 2722{
2608 if (items >= 2) 2723 if (items >= 2)
2609 { 2724 {
2610 /* callback form */ 2725 /* callback form */
2611 AV *av = (AV *)SvRV (arg [0]); 2726 AV *av = (AV *)SvRV (arg [0]);
2612 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2727 SV *cb_cv = s_get_cv_croak (arg [1]);
2613 2728
2614 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2615 2730
2616 if (SvIVX (AvARRAY (av)[0]) > 0) 2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2617 coro_semaphore_adjust (aTHX_ av, 0); 2732 coro_semaphore_adjust (aTHX_ av, 0);
2618 2733
2619 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
… …
2643 AvARRAY (av)[0] = AvARRAY (av)[1]; 2758 AvARRAY (av)[0] = AvARRAY (av)[1];
2644 AvARRAY (av)[1] = cb; 2759 AvARRAY (av)[1] = cb;
2645 2760
2646 cb = av_shift (av); 2761 cb = av_shift (av);
2647 2762
2763 if (SvTYPE (cb) == SVt_PVCV)
2764 {
2765 dSP;
2766 PUSHMARK (SP);
2767 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2768 PUTBACK;
2769 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2770 }
2771 else
2772 {
2648 api_ready (aTHX_ cb); 2773 api_ready (aTHX_ cb);
2649 sv_setiv (cb, 0); /* signal waiter */ 2774 sv_setiv (cb, 0); /* signal waiter */
2775 }
2776
2650 SvREFCNT_dec (cb); 2777 SvREFCNT_dec (cb);
2651 2778
2652 --count; 2779 --count;
2653 } 2780 }
2654} 2781}
… …
2663static void 2790static void
2664slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2791slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2665{ 2792{
2666 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2667 2794
2795 if (items >= 2)
2796 {
2797 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799
2668 if (SvIVX (AvARRAY (av)[0])) 2800 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802
2803 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop;
2805 }
2806 else if (SvIVX (AvARRAY (av)[0]))
2669 { 2807 {
2670 SvIVX (AvARRAY (av)[0]) = 0; 2808 SvIVX (AvARRAY (av)[0]) = 0;
2671 frame->prepare = prepare_nop; 2809 frame->prepare = prepare_nop;
2672 frame->check = slf_check_nop; 2810 frame->check = slf_check_nop;
2673 } 2811 }
2674 else 2812 else
2675 { 2813 {
2676 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2814 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2677 2815
2678 av_push (av, waiter); 2816 av_push (av, waiter);
2679 2817
2680 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2818 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2681 frame->prepare = prepare_schedule; 2819 frame->prepare = prepare_schedule;
… …
2699 2837
2700static void 2838static void
2701coro_aio_callback (pTHX_ CV *cv) 2839coro_aio_callback (pTHX_ CV *cv)
2702{ 2840{
2703 dXSARGS; 2841 dXSARGS;
2704 AV *state = (AV *)GENSUB_ARG; 2842 AV *state = (AV *)S_GENSUB_ARG;
2705 SV *coro = av_pop (state); 2843 SV *coro = av_pop (state);
2706 SV *data_sv = newSV (sizeof (struct io_state)); 2844 SV *data_sv = newSV (sizeof (struct io_state));
2707 2845
2708 av_extend (state, items - 1); 2846 av_extend (state, items - 1);
2709 2847
… …
2823 2961
2824 for (i = 0; i < items; ++i) 2962 for (i = 0; i < items; ++i)
2825 PUSHs (arg [i]); 2963 PUSHs (arg [i]);
2826 2964
2827 /* now push the callback closure */ 2965 /* now push the callback closure */
2828 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2966 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2829 2967
2830 /* now call the AIO function - we assume our request is uncancelable */ 2968 /* now call the AIO function - we assume our request is uncancelable */
2831 PUTBACK; 2969 PUTBACK;
2832 call_sv ((SV *)req, G_VOID | G_DISCARD); 2970 call_sv ((SV *)req, G_VOID | G_DISCARD);
2833 } 2971 }
2834 2972
2835 /* now that the requets is going, we loop toll we have a result */ 2973 /* now that the request is going, we loop till we have a result */
2836 frame->data = (void *)state; 2974 frame->data = (void *)state;
2837 frame->prepare = prepare_schedule; 2975 frame->prepare = prepare_schedule;
2838 frame->check = slf_check_aio_req; 2976 frame->check = slf_check_aio_req;
2839} 2977}
2840 2978
… …
2851/*****************************************************************************/ 2989/*****************************************************************************/
2852 2990
2853#if CORO_CLONE 2991#if CORO_CLONE
2854# include "clone.c" 2992# include "clone.c"
2855#endif 2993#endif
2994
2995/*****************************************************************************/
2996
2997static SV *
2998coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2999{
3000 SV *coro_sv;
3001 struct coro *coro;
3002 MAGIC *mg;
3003 HV *hv;
3004 SV *cb;
3005 int i;
3006
3007 if (argc > 0)
3008 {
3009 cb = s_get_cv_croak (argv [0]);
3010
3011 if (!is_coro)
3012 {
3013 if (CvISXSUB (cb))
3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3015
3016 if (!CvROOT (cb))
3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
3019 }
3020
3021 Newz (0, coro, 1, struct coro);
3022 coro->args = newAV ();
3023 coro->flags = CF_NEW;
3024
3025 if (coro_first) coro_first->prev = coro;
3026 coro->next = coro_first;
3027 coro_first = coro;
3028
3029 coro->hv = hv = newHV ();
3030 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3031 mg->mg_flags |= MGf_DUP;
3032 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3033
3034 if (argc > 0)
3035 {
3036 av_extend (coro->args, argc + is_coro - 1);
3037
3038 if (is_coro)
3039 {
3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
3046 for (i = 1; i < argc; i++)
3047 av_push (coro->args, newSVsv (argv [i]));
3048 }
3049
3050 return coro_sv;
3051}
2856 3052
2857MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2858 3054
2859PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2860 3056
… …
2920 3116
2921 if (!svp) croak ("Time::HiRes is required"); 3117 if (!svp) croak ("Time::HiRes is required");
2922 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2923 3119
2924 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2925 } 3124 }
2926 3125
2927 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2928} 3127}
2929 3128
2930SV * 3129SV *
2931new (char *klass, ...) 3130new (SV *klass, ...)
2932 ALIAS: 3131 ALIAS:
2933 Coro::new = 1 3132 Coro::new = 1
2934 CODE: 3133 CODE:
2935{ 3134 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2936 struct coro *coro; 3135 OUTPUT:
2937 MAGIC *mg;
2938 HV *hv;
2939 CV *cb;
2940 int i;
2941
2942 if (items > 1)
2943 {
2944 cb = coro_sv_2cv (aTHX_ ST (1));
2945
2946 if (!ix)
2947 {
2948 if (CvISXSUB (cb))
2949 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2950
2951 if (!CvROOT (cb))
2952 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2953 }
2954 }
2955
2956 Newz (0, coro, 1, struct coro);
2957 coro->args = newAV ();
2958 coro->flags = CF_NEW;
2959
2960 if (coro_first) coro_first->prev = coro;
2961 coro->next = coro_first;
2962 coro_first = coro;
2963
2964 coro->hv = hv = newHV ();
2965 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2966 mg->mg_flags |= MGf_DUP;
2967 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2968
2969 if (items > 1)
2970 {
2971 av_extend (coro->args, items - 1 + ix - 1);
2972
2973 if (ix)
2974 {
2975 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2976 cb = cv_coro_run;
2977 }
2978
2979 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2980
2981 for (i = 2; i < items; i++)
2982 av_push (coro->args, newSVsv (ST (i)));
2983 }
2984}
2985 OUTPUT:
2986 RETVAL 3136 RETVAL
2987 3137
2988void 3138void
2989transfer (...) 3139transfer (...)
2990 PROTOTYPE: $$ 3140 PROTOTYPE: $$
… …
3127 RETVAL = boolSV (coro->flags & ix); 3277 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3278 OUTPUT:
3129 RETVAL 3279 RETVAL
3130 3280
3131void 3281void
3132throw (Coro::State self, SV *throw = &PL_sv_undef) 3282throw (Coro::State self, SV *exception = &PL_sv_undef)
3133 PROTOTYPE: $;$ 3283 PROTOTYPE: $;$
3134 CODE: 3284 CODE:
3135{ 3285{
3136 struct coro *current = SvSTATE_current; 3286 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3288 SvREFCNT_dec (*exceptionp);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3289 SvGETMAGIC (exception);
3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3140} 3291}
3141 3292
3142void 3293void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3144 PROTOTYPE: $;$ 3295 PROTOTYPE: $;$
… …
3202 CODE: 3353 CODE:
3203 coro_state_destroy (aTHX_ self); 3354 coro_state_destroy (aTHX_ self);
3204 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3205 3356
3206 3357
3358SV *
3359enable_times (int enabled = enable_times)
3360 CODE:
3361{
3362 RETVAL = boolSV (enable_times);
3363
3364 if (enabled != enable_times)
3365 {
3366 enable_times = enabled;
3367
3368 coro_times_update ();
3369 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3370 }
3371}
3372 OUTPUT:
3373 RETVAL
3374
3375void
3376times (Coro::State self)
3377 PPCODE:
3378{
3379 struct coro *current = SvSTATE (coro_current);
3380
3381 if (expect_false (current == self))
3382 {
3383 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current));
3385 }
3386
3387 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3389 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390
3391 if (expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current));
3393}
3394
3395void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3397 CODE:
3398{
3399 struct coro *current = SvSTATE_current;
3400
3401 if (current == coro)
3402 SWAP_SVS (current);
3403
3404 if (!coro->swap_sv)
3405 coro->swap_sv = newAV ();
3406
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3409
3410 if (current == coro)
3411 SWAP_SVS (current);
3412}
3413
3414
3207MODULE = Coro::State PACKAGE = Coro 3415MODULE = Coro::State PACKAGE = Coro
3208 3416
3209BOOT: 3417BOOT:
3210{ 3418{
3211 int i;
3212
3213 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3214 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3215 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3216 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3217 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3423 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
… …
3221 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3222 3428
3223 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3429 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3224 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3430 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3225 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3431 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3226 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3227 3433
3228 coro_stash = gv_stashpv ("Coro", TRUE); 3434 coro_stash = gv_stashpv ("Coro", TRUE);
3229 3435
3230 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3231 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3232 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3233 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3439 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3234 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3440 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3235 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3441 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3236
3237 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3238 coro_ready[i] = newAV ();
3239 3442
3240 { 3443 {
3241 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3444 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3242 3445
3243 coroapi.schedule = api_schedule; 3446 coroapi.schedule = api_schedule;
… …
3253 sv_setiv (sv, (IV)&coroapi); 3456 sv_setiv (sv, (IV)&coroapi);
3254 SvREADONLY_on (sv); 3457 SvREADONLY_on (sv);
3255 } 3458 }
3256} 3459}
3257 3460
3461SV *
3462async (...)
3463 PROTOTYPE: &@
3464 CODE:
3465 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3466 api_ready (aTHX_ RETVAL);
3467 OUTPUT:
3468 RETVAL
3469
3258void 3470void
3259terminate (...) 3471terminate (...)
3260 CODE: 3472 CODE:
3261 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3473 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3262 3474
… …
3295void 3507void
3296_set_readyhook (SV *hook) 3508_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3509 PROTOTYPE: $
3298 CODE: 3510 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3511 SvREFCNT_dec (coro_readyhook);
3512 SvGETMAGIC (hook);
3513 if (SvOK (hook))
3514 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3515 coro_readyhook = newSVsv (hook);
3516 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3517 }
3518 else
3519 {
3520 coro_readyhook = 0;
3521 CORO_READYHOOK = 0;
3522 }
3301 3523
3302int 3524int
3303prio (Coro::State coro, int newprio = 0) 3525prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3526 PROTOTYPE: $;$
3305 ALIAS: 3527 ALIAS:
… …
3311 if (items > 1) 3533 if (items > 1)
3312 { 3534 {
3313 if (ix) 3535 if (ix)
3314 newprio = coro->prio - newprio; 3536 newprio = coro->prio - newprio;
3315 3537
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3538 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3539 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3540
3319 coro->prio = newprio; 3541 coro->prio = newprio;
3320 } 3542 }
3321} 3543}
3322 OUTPUT: 3544 OUTPUT:
… …
3369 for (i = 1; i < items; ++i) 3591 for (i = 1; i < items; ++i)
3370 av_push (av, SvREFCNT_inc_NN (ST (i))); 3592 av_push (av, SvREFCNT_inc_NN (ST (i)));
3371 3593
3372 if ((SV *)hv == &PL_sv_undef) 3594 if ((SV *)hv == &PL_sv_undef)
3373 { 3595 {
3374 PUSHMARK (SP); 3596 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3375 EXTEND (SP, 2);
3376 PUSHs (sv_Coro);
3377 PUSHs ((SV *)cv_pool_handler);
3378 PUTBACK;
3379 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3380 SPAGAIN;
3381
3382 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3598 SvREFCNT_dec (sv);
3383 } 3599 }
3384 3600
3385 { 3601 {
3386 struct coro *coro = SvSTATE_hv (hv); 3602 struct coro *coro = SvSTATE_hv (hv);
3387 3603
… …
3421 CODE: 3637 CODE:
3422{ 3638{
3423 struct coro *coro = SvSTATE_current; 3639 struct coro *coro = SvSTATE_current;
3424 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3425 3641
3426 block = (SV *)coro_sv_2cv (aTHX_ block); 3642 block = s_get_cv_croak (block);
3427 3643
3428 if (!*avp) 3644 if (!*avp)
3429 *avp = newAV (); 3645 *avp = newAV ();
3430 3646
3431 av_push (*avp, SvREFCNT_inc (block)); 3647 av_push (*avp, SvREFCNT_inc (block));
… …
3448MODULE = Coro::State PACKAGE = Coro::Semaphore 3664MODULE = Coro::State PACKAGE = Coro::Semaphore
3449 3665
3450SV * 3666SV *
3451new (SV *klass, SV *count = 0) 3667new (SV *klass, SV *count = 0)
3452 CODE: 3668 CODE:
3669{
3670 int semcnt = 1;
3671
3672 if (count)
3673 {
3674 SvGETMAGIC (count);
3675
3676 if (SvOK (count))
3677 semcnt = SvIV (count);
3678 }
3679
3453 RETVAL = sv_bless ( 3680 RETVAL = sv_bless (
3454 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3681 coro_waitarray_new (aTHX_ semcnt),
3455 GvSTASH (CvGV (cv)) 3682 GvSTASH (CvGV (cv))
3456 ); 3683 );
3684}
3457 OUTPUT: 3685 OUTPUT:
3458 RETVAL 3686 RETVAL
3459 3687
3460# helper for Coro::Channel and others 3688# helper for Coro::Channel and others
3461SV * 3689SV *
… …
3619 3847
3620void 3848void
3621_register (char *target, char *proto, SV *req) 3849_register (char *target, char *proto, SV *req)
3622 CODE: 3850 CODE:
3623{ 3851{
3624 CV *req_cv = coro_sv_2cv (aTHX_ req); 3852 SV *req_cv = s_get_cv_croak (req);
3625 /* newXSproto doesn't return the CV on 5.8 */ 3853 /* newXSproto doesn't return the CV on 5.8 */
3626 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3854 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3627 sv_setpv ((SV *)slf_cv, proto); 3855 sv_setpv ((SV *)slf_cv, proto);
3628 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3856 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3629} 3857}
3630 3858
3859MODULE = Coro::State PACKAGE = Coro::Select
3860
3861void
3862patch_pp_sselect ()
3863 CODE:
3864 if (!coro_old_pp_sselect)
3865 {
3866 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3867 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3868 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3869 }
3870
3871void
3872unpatch_pp_sselect ()
3873 CODE:
3874 if (coro_old_pp_sselect)
3875 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0;
3878 }
3879

Diff Legend

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