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.238 by root, Sat May 31 12:10:55 2008 UTC vs.
Revision 1.284 by root, Mon Nov 17 01:05:47 2008 UTC

… …
4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
… …
45# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
46#endif 47#endif
47 48
48#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
49# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
50# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
51#else
52# define REGISTER_STACK(cctx,start,end)
53#endif 51#endif
54 52
55/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
56#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
57 55
58#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
59 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
60 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
80# ifndef IS_PADCONST 78# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
82# endif 80# endif
83#endif 81#endif
84 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
85/* 5.8.8 */ 93/* 5.8.8 */
86#ifndef GV_NOTQUAL 94#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0 95# define GV_NOTQUAL 0
88#endif 96#endif
89#ifndef newSV 97#ifndef newSV
90# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
91#endif 99#endif
92 100
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
98/* 5.8.7 */ 101/* 5.8.7 */
99#ifndef SvRV_set 102#ifndef SvRV_set
100# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
101#endif 104#endif
102 105
… …
113# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
114#endif 117#endif
115 118
116/* The next macros try to return the current stack pointer, in an as 119/* The next macros try to return the current stack pointer, in an as
117 * portable way as possible. */ 120 * portable way as possible. */
118#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
119#define STACKLEVEL ((void *)&stacklevel) 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
120 126
121#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
122 128
123#if __GNUC__ >= 3 129#if __GNUC__ >= 3
124# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
125# define BARRIER __asm__ __volatile__ ("" : : : "memory")
126# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
127#else 133#else
128# define attribute(x) 134# define attribute(x)
129# define BARRIER
130# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
131#endif 137#endif
132 138
133#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
134#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
135 141
136#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
137 143
138#include "CoroAPI.h" 144#include "CoroAPI.h"
139 145
140#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
141static perl_mutex coro_mutex; 147# if CORO_PTHREAD
142# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 148static void *coro_thx;
143# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 149# endif
144#else
145# define LOCK (void)0
146# define UNLOCK (void)0
147#endif 150#endif
148 151
149/* helper storage struct for Coro::AIO */ 152/* helper storage struct for Coro::AIO */
150struct io_state 153struct io_state
151{ 154{
155 AV *res;
152 int errorno; 156 int errorno;
153 I32 laststype; 157 I32 laststype; /* U16 in 5.10.0 */
154 int laststatval; 158 int laststatval;
155 Stat_t statcache; 159 Stat_t statcache;
156}; 160};
157 161
162static double (*nvtime)(); /* so why doesn't it take void? */
163
164static U32 cctx_gen;
158static size_t coro_stacksize = CORO_STACKSIZE; 165static size_t cctx_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 166static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 167static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 168static JMPENV *main_top_env;
162static HV *coro_state_stash, *coro_stash; 169static HV *coro_state_stash, *coro_stash;
163static volatile SV *coro_mortal; /* will be freed after next transfer */ 170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
164 171
165static GV *irsgv; /* $/ */ 172static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */ 173static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook; 174static SV *rv_diehook;
168static SV *rv_warnhook; 175static SV *rv_warnhook;
… …
187 CC_TRACE_LINE = 0x10, /* trace each statement */ 194 CC_TRACE_LINE = 0x10, /* trace each statement */
188 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 195 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
189}; 196};
190 197
191/* this is a structure representing a c-level coroutine */ 198/* this is a structure representing a c-level coroutine */
192typedef struct coro_cctx { 199typedef struct coro_cctx
200{
193 struct coro_cctx *next; 201 struct coro_cctx *next;
194 202
195 /* the stack */ 203 /* the stack */
196 void *sptr; 204 void *sptr;
197 size_t ssize; 205 size_t ssize;
… …
200 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 208 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
201 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 209 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
202 JMPENV *top_env; 210 JMPENV *top_env;
203 coro_context cctx; 211 coro_context cctx;
204 212
213 U32 gen;
205#if CORO_USE_VALGRIND 214#if CORO_USE_VALGRIND
206 int valgrind_id; 215 int valgrind_id;
207#endif 216#endif
208 unsigned char flags; 217 unsigned char flags;
209} coro_cctx; 218} coro_cctx;
… …
214 CF_NEW = 0x0004, /* has never been switched to */ 223 CF_NEW = 0x0004, /* has never been switched to */
215 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
216}; 225};
217 226
218/* the structure where most of the perl state is stored, overlaid on the cxstack */ 227/* the structure where most of the perl state is stored, overlaid on the cxstack */
219typedef struct { 228typedef struct
229{
220 SV *defsv; 230 SV *defsv;
221 AV *defav; 231 AV *defav;
222 SV *errsv; 232 SV *errsv;
223 SV *irsgv; 233 SV *irsgv;
224#define VAR(name,type) type name; 234#define VAR(name,type) type name;
… …
228 238
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 239#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 240
231/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
232struct coro { 242struct coro {
233 /* the c coroutine allocated to this perl coroutine, if any */ 243 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 244 coro_cctx *cctx;
235 245
236 /* process data */ 246 /* process data */
247 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 248 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 249 perl_slots *slot; /* basically the saved sp */
239 250
240 AV *args; /* data associated with this coroutine (initial args) */ 251 AV *args; /* data associated with this coroutine (initial args) */
241 int refcnt; /* coroutines are refcounted, yes */ 252 int refcnt; /* coroutines are refcounted, yes */
242 int flags; /* CF_ flags */ 253 int flags; /* CF_ flags */
243 HV *hv; /* the perl hash associated with this coro, if any */ 254 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro);
244 256
245 /* statistics */ 257 /* statistics */
246 int usecount; /* number of transfers to this coro */ 258 int usecount; /* number of transfers to this coro */
247 259
248 /* coro process data */ 260 /* coro process data */
… …
256 struct coro *next, *prev; 268 struct coro *next, *prev;
257}; 269};
258 270
259typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
260typedef struct coro *Coro__State_or_hashref; 272typedef struct coro *Coro__State_or_hashref;
273
274static struct CoroSLF slf_frame; /* the current slf frame */
261 275
262/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
263 277
264#define PRIO_MAX 3 278#define PRIO_MAX 3
265#define PRIO_HIGH 1 279#define PRIO_HIGH 1
… …
269#define PRIO_MIN -4 283#define PRIO_MIN -4
270 284
271/* for Coro.pm */ 285/* for Coro.pm */
272static SV *coro_current; 286static SV *coro_current;
273static SV *coro_readyhook; 287static SV *coro_readyhook;
274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 288static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
275static int coro_nready;
276static struct coro *coro_first; 289static struct coro *coro_first;
290#define coro_nready coroapi.nready
277 291
278/** lowlevel stuff **********************************************************/ 292/** lowlevel stuff **********************************************************/
279 293
280static SV * 294static SV *
281coro_get_sv (pTHX_ const char *name, int create) 295coro_get_sv (pTHX_ const char *name, int create)
… …
321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 335 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
322#endif 336#endif
323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 337 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
324 --AvFILLp (padlist); 338 --AvFILLp (padlist);
325 339
326 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 340 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
327 av_store (newpadlist, 1, (SV *)newpad); 341 av_store (newpadlist, 1, (SV *)newpad);
328 342
329 return newpadlist; 343 return newpadlist;
330} 344}
331 345
… …
361 375
362 /* casting is fun. */ 376 /* casting is fun. */
363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 377 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
364 free_padlist (aTHX_ padlist); 378 free_padlist (aTHX_ padlist);
365 379
380 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
381
366 return 0; 382 return 0;
367} 383}
368 384
369#define CORO_MAGIC_type_cv PERL_MAGIC_ext 385#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext 386#define CORO_MAGIC_type_state PERL_MAGIC_ext
… …
372static MGVTBL coro_cv_vtbl = { 388static MGVTBL coro_cv_vtbl = {
373 0, 0, 0, 0, 389 0, 0, 0, 0,
374 coro_cv_free 390 coro_cv_free
375}; 391};
376 392
377#define CORO_MAGIC(sv,type) \ 393#define CORO_MAGIC(sv, type) \
378 SvMAGIC (sv) \ 394 expect_true (SvMAGIC (sv)) \
379 ? SvMAGIC (sv)->mg_type == type \ 395 ? expect_true (SvMAGIC (sv)->mg_type == type) \
380 ? SvMAGIC (sv) \ 396 ? SvMAGIC (sv) \
381 : mg_find (sv, type) \ 397 : mg_find (sv, type) \
382 : 0 398 : 0
383 399
384#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 400#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
385#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 401#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
386 402
387static struct coro * 403INLINE struct coro *
388SvSTATE_ (pTHX_ SV *coro) 404SvSTATE_ (pTHX_ SV *coro)
389{ 405{
390 HV *stash; 406 HV *stash;
391 MAGIC *mg; 407 MAGIC *mg;
392 408
… …
407 mg = CORO_MAGIC_state (coro); 423 mg = CORO_MAGIC_state (coro);
408 return (struct coro *)mg->mg_ptr; 424 return (struct coro *)mg->mg_ptr;
409} 425}
410 426
411#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 427#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
428
429/* fastert than SvSTATE, but expects a coroutine hv */
430INLINE struct coro *
431SvSTATE_hv (SV *sv)
432{
433 MAGIC *mg = expect_true (SvMAGIC (sv)->mg_type == CORO_MAGIC_type_state)
434 ? SvMAGIC (sv)
435 : mg_find (sv, CORO_MAGIC_type_state);
436
437 return (struct coro *)mg->mg_ptr;
438}
439
440#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
412 441
413/* the next two functions merely cache the padlists */ 442/* the next two functions merely cache the padlists */
414static void 443static void
415get_padlist (pTHX_ CV *cv) 444get_padlist (pTHX_ CV *cv)
416{ 445{
… …
420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 449 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 450 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
422 else 451 else
423 { 452 {
424#if CORO_PREFER_PERL_FUNCTIONS 453#if CORO_PREFER_PERL_FUNCTIONS
425 /* this is probably cleaner, but also slower? */ 454 /* this is probably cleaner? but also slower! */
455 /* in practise, it seems to be less stable */
426 CV *cp = Perl_cv_clone (cv); 456 CV *cp = Perl_cv_clone (cv);
427 CvPADLIST (cv) = CvPADLIST (cp); 457 CvPADLIST (cv) = CvPADLIST (cp);
428 CvPADLIST (cp) = 0; 458 CvPADLIST (cp) = 0;
429 SvREFCNT_dec (cp); 459 SvREFCNT_dec (cp);
430#else 460#else
… …
482 CvPADLIST (cv) = (AV *)POPs; 512 CvPADLIST (cv) = (AV *)POPs;
483 } 513 }
484 514
485 PUTBACK; 515 PUTBACK;
486 } 516 }
517
518 slf_frame = c->slf_frame;
487} 519}
488 520
489static void 521static void
490save_perl (pTHX_ Coro__State c) 522save_perl (pTHX_ Coro__State c)
491{ 523{
524 c->slf_frame = slf_frame;
525
492 { 526 {
493 dSP; 527 dSP;
494 I32 cxix = cxstack_ix; 528 I32 cxix = cxstack_ix;
495 PERL_CONTEXT *ccstk = cxstack; 529 PERL_CONTEXT *ccstk = cxstack;
496 PERL_SI *top_si = PL_curstackinfo; 530 PERL_SI *top_si = PL_curstackinfo;
… …
563 #undef VAR 597 #undef VAR
564 } 598 }
565} 599}
566 600
567/* 601/*
568 * allocate various perl stacks. This is an exact copy 602 * allocate various perl stacks. This is almost an exact copy
569 * of perl.c:init_stacks, except that it uses less memory 603 * of perl.c:init_stacks, except that it uses less memory
570 * on the (sometimes correct) assumption that coroutines do 604 * on the (sometimes correct) assumption that coroutines do
571 * not usually need a lot of stackspace. 605 * not usually need a lot of stackspace.
572 */ 606 */
573#if CORO_PREFER_PERL_FUNCTIONS 607#if CORO_PREFER_PERL_FUNCTIONS
… …
616 650
617/* 651/*
618 * destroy the stacks, the callchain etc... 652 * destroy the stacks, the callchain etc...
619 */ 653 */
620static void 654static void
621coro_destroy_stacks (pTHX) 655coro_destruct_stacks (pTHX)
622{ 656{
623 while (PL_curstackinfo->si_next) 657 while (PL_curstackinfo->si_next)
624 PL_curstackinfo = PL_curstackinfo->si_next; 658 PL_curstackinfo = PL_curstackinfo->si_next;
625 659
626 while (PL_curstackinfo) 660 while (PL_curstackinfo)
… …
663 #undef VAR 697 #undef VAR
664 } 698 }
665 else 699 else
666 slot = coro->slot; 700 slot = coro->slot;
667 701
702 if (slot)
703 {
668 rss += sizeof (slot->curstackinfo); 704 rss += sizeof (slot->curstackinfo);
669 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
670 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
671 rss += slot->tmps_max * sizeof (SV *); 707 rss += slot->tmps_max * sizeof (SV *);
672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
673 rss += slot->scopestack_max * sizeof (I32); 709 rss += slot->scopestack_max * sizeof (I32);
674 rss += slot->savestack_max * sizeof (ANY); 710 rss += slot->savestack_max * sizeof (ANY);
675 711
676#if !PERL_VERSION_ATLEAST (5,10,0) 712#if !PERL_VERSION_ATLEAST (5,10,0)
677 rss += slot->retstack_max * sizeof (OP *); 713 rss += slot->retstack_max * sizeof (OP *);
678#endif 714#endif
715 }
679 } 716 }
680 717
681 return rss; 718 return rss;
682} 719}
683 720
684/** coroutine stack handling ************************************************/ 721/** coroutine stack handling ************************************************/
685 722
686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 723static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 724static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
725static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
688 726
689/* apparently < 5.8.8 */ 727/* apparently < 5.8.8 */
690#undef MgPV_nolen_const
691#ifndef MgPV_nolen_const 728#ifndef MgPV_nolen_const
692#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 729#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
693 SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \ 730 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
694 (const char*)(mg)->mg_ptr) 731 (const char*)(mg)->mg_ptr)
695#endif 732#endif
696 733
697/* 734/*
698 * This overrides the default magic get method of %SIG elements. 735 * This overrides the default magic get method of %SIG elements.
… …
708{ 745{
709 const char *s = MgPV_nolen_const (mg); 746 const char *s = MgPV_nolen_const (mg);
710 747
711 if (*s == '_') 748 if (*s == '_')
712 { 749 {
713 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 750 SV **svp = 0;
714 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 751
752 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
753 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
754
755 if (svp)
756 {
757 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
758 return 0;
759 }
715 } 760 }
716 761
717 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 762 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
763}
764
765static int
766coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
767{
768 const char *s = MgPV_nolen_const (mg);
769
770 if (*s == '_')
771 {
772 SV **svp = 0;
773
774 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
775 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
776
777 if (svp)
778 {
779 SV *old = *svp;
780 *svp = 0;
781 SvREFCNT_dec (old);
782 return 0;
783 }
784 }
785
786 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
718} 787}
719 788
720static int 789static int
721coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 790coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
722{ 791{
… …
737 return 0; 806 return 0;
738 } 807 }
739 } 808 }
740 809
741 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 810 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
811}
812
813static void
814prepare_nop (pTHX_ struct coro_transfer_args *ta)
815{
816 /* kind of mega-hacky, but works */
817 ta->next = ta->prev = (struct coro *)ta;
818}
819
820static int
821slf_check_nop (pTHX_ struct CoroSLF *frame)
822{
823 return 0;
742} 824}
743 825
744static void 826static void
745coro_setup (pTHX_ struct coro *coro) 827coro_setup (pTHX_ struct coro *coro)
746{ 828{
… …
769 GvSV (PL_defgv) = newSV (0); 851 GvSV (PL_defgv) = newSV (0);
770 GvAV (PL_defgv) = coro->args; coro->args = 0; 852 GvAV (PL_defgv) = coro->args; coro->args = 0;
771 GvSV (PL_errgv) = newSV (0); 853 GvSV (PL_errgv) = newSV (0);
772 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 854 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
773 PL_rs = newSVsv (GvSV (irsgv)); 855 PL_rs = newSVsv (GvSV (irsgv));
774 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 856 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
775 857
776 { 858 {
777 dSP; 859 dSP;
778 LOGOP myop; 860 UNOP myop;
779 861
780 Zero (&myop, 1, LOGOP); 862 Zero (&myop, 1, UNOP);
781 myop.op_next = Nullop; 863 myop.op_next = Nullop;
782 myop.op_flags = OPf_WANT_VOID; 864 myop.op_flags = OPf_WANT_VOID;
783 865
784 PUSHMARK (SP); 866 PUSHMARK (SP);
785 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 867 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
788 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 870 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
789 SPAGAIN; 871 SPAGAIN;
790 } 872 }
791 873
792 /* this newly created coroutine might be run on an existing cctx which most 874 /* this newly created coroutine might be run on an existing cctx which most
793 * likely was suspended in set_stacklevel, called from entersub. 875 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
794 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
795 * so we ENTER here for symmetry
796 */ 876 */
797 ENTER; 877 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
878 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
798} 879}
799 880
800static void 881static void
801coro_destroy (pTHX_ struct coro *coro) 882coro_destruct (pTHX_ struct coro *coro)
802{ 883{
803 if (!IN_DESTRUCT) 884 if (!IN_DESTRUCT)
804 { 885 {
805 /* restore all saved variables and stuff */ 886 /* restore all saved variables and stuff */
806 LEAVE_SCOPE (0); 887 LEAVE_SCOPE (0);
… …
828 SvREFCNT_dec (PL_warnhook); 909 SvREFCNT_dec (PL_warnhook);
829 910
830 SvREFCNT_dec (coro->saved_deffh); 911 SvREFCNT_dec (coro->saved_deffh);
831 SvREFCNT_dec (coro->throw); 912 SvREFCNT_dec (coro->throw);
832 913
833 coro_destroy_stacks (aTHX); 914 coro_destruct_stacks (aTHX);
834} 915}
835 916
836static void 917INLINE void
837free_coro_mortal (pTHX) 918free_coro_mortal (pTHX)
838{ 919{
839 if (expect_true (coro_mortal)) 920 if (expect_true (coro_mortal))
840 { 921 {
841 SvREFCNT_dec (coro_mortal); 922 SvREFCNT_dec (coro_mortal);
… …
846static int 927static int
847runops_trace (pTHX) 928runops_trace (pTHX)
848{ 929{
849 COP *oldcop = 0; 930 COP *oldcop = 0;
850 int oldcxix = -2; 931 int oldcxix = -2;
851 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */ 932 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
852 coro_cctx *cctx = coro->cctx; 933 coro_cctx *cctx = coro->cctx;
853 934
854 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 935 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
855 { 936 {
856 PERL_ASYNC_CHECK (); 937 PERL_ASYNC_CHECK ();
… …
875 : cx->blk_gimme == G_SCALAR ? bot + 1 956 : cx->blk_gimme == G_SCALAR ? bot + 1
876 : bot; 957 : bot;
877 958
878 av_extend (av, top - bot); 959 av_extend (av, top - bot);
879 while (bot < top) 960 while (bot < top)
880 av_push (av, SvREFCNT_inc (*bot++)); 961 av_push (av, SvREFCNT_inc_NN (*bot++));
881 962
882 PL_runops = RUNOPS_DEFAULT; 963 PL_runops = RUNOPS_DEFAULT;
883 ENTER; 964 ENTER;
884 SAVETMPS; 965 SAVETMPS;
885 EXTEND (SP, 3); 966 EXTEND (SP, 3);
… …
965 1046
966 TAINT_NOT; 1047 TAINT_NOT;
967 return 0; 1048 return 0;
968} 1049}
969 1050
1051static void
1052prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1053{
1054 ta->prev = (struct coro *)cctx;
1055 ta->next = 0;
1056}
1057
970/* inject a fake call to Coro::State::_cctx_init into the execution */ 1058/* inject a fake call to Coro::State::_cctx_init into the execution */
971/* _cctx_init should be careful, as it could be called at almost any time */ 1059/* _cctx_init should be careful, as it could be called at almost any time */
972/* during execution of a perl program */ 1060/* during execution of a perl program */
1061/* also initialises PL_top_env */
973static void NOINLINE 1062static void NOINLINE
974cctx_prepare (pTHX_ coro_cctx *cctx) 1063cctx_prepare (pTHX_ coro_cctx *cctx)
975{ 1064{
976 dSP; 1065 dSP;
977 LOGOP myop; 1066 UNOP myop;
978 1067
979 PL_top_env = &PL_start_env; 1068 PL_top_env = &PL_start_env;
980 1069
981 if (cctx->flags & CC_TRACE) 1070 if (cctx->flags & CC_TRACE)
982 PL_runops = runops_trace; 1071 PL_runops = runops_trace;
983 1072
984 Zero (&myop, 1, LOGOP); 1073 Zero (&myop, 1, UNOP);
985 myop.op_next = PL_op; 1074 myop.op_next = PL_op;
986 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1075 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
987 1076
988 PUSHMARK (SP); 1077 PUSHMARK (SP);
989 EXTEND (SP, 2); 1078 EXTEND (SP, 2);
990 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1079 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
991 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1080 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
992 PUTBACK; 1081 PUTBACK;
993 PL_op = (OP *)&myop; 1082 PL_op = (OP *)&myop;
994 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1083 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
995 SPAGAIN; 1084 SPAGAIN;
996} 1085}
997 1086
1087/* the tail of transfer: execute stuff we can only do after a transfer */
1088INLINE void
1089transfer_tail (pTHX)
1090{
1091 free_coro_mortal (aTHX);
1092}
1093
998/* 1094/*
999 * this is a _very_ stripped down perl interpreter ;) 1095 * this is a _very_ stripped down perl interpreter ;)
1000 */ 1096 */
1001static void 1097static void
1002cctx_run (void *arg) 1098cctx_run (void *arg)
1003{ 1099{
1100#ifdef USE_ITHREADS
1101# if CORO_PTHREAD
1102 PERL_SET_CONTEXT (coro_thx);
1103# endif
1104#endif
1105 {
1004 dTHX; 1106 dTHX;
1005 1107
1006 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1108 /* normally we would need to skip the entersub here */
1007 UNLOCK; 1109 /* not doing so will re-execute it, which is exactly what we want */
1008
1009 /* we now skip the entersub that lead to transfer() */
1010 PL_op = PL_op->op_next; 1110 /* PL_nop = PL_nop->op_next */
1011 1111
1012 /* inject a fake subroutine call to cctx_init */ 1112 /* inject a fake subroutine call to cctx_init */
1013 cctx_prepare (aTHX_ (coro_cctx *)arg); 1113 cctx_prepare (aTHX_ (coro_cctx *)arg);
1014 1114
1115 /* cctx_run is the alternative tail of transfer() */
1116 transfer_tail (aTHX);
1117
1015 /* somebody or something will hit me for both perl_run and PL_restartop */ 1118 /* somebody or something will hit me for both perl_run and PL_restartop */
1016 PL_restartop = PL_op; 1119 PL_restartop = PL_op;
1017 perl_run (PL_curinterp); 1120 perl_run (PL_curinterp);
1018 1121
1019 /* 1122 /*
1020 * If perl-run returns we assume exit() was being called or the coro 1123 * If perl-run returns we assume exit() was being called or the coro
1021 * fell off the end, which seems to be the only valid (non-bug) 1124 * fell off the end, which seems to be the only valid (non-bug)
1022 * reason for perl_run to return. We try to exit by jumping to the 1125 * reason for perl_run to return. We try to exit by jumping to the
1023 * bootstrap-time "top" top_env, as we cannot restore the "main" 1126 * bootstrap-time "top" top_env, as we cannot restore the "main"
1024 * coroutine as Coro has no such concept 1127 * coroutine as Coro has no such concept
1025 */ 1128 */
1026 PL_top_env = main_top_env; 1129 PL_top_env = main_top_env;
1027 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1130 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1131 }
1028} 1132}
1029 1133
1030static coro_cctx * 1134static coro_cctx *
1031cctx_new () 1135cctx_new ()
1032{ 1136{
1033 coro_cctx *cctx; 1137 coro_cctx *cctx;
1138
1139 ++cctx_count;
1140 New (0, cctx, 1, coro_cctx);
1141
1142 cctx->gen = cctx_gen;
1143 cctx->flags = 0;
1144 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1145
1146 return cctx;
1147}
1148
1149/* create a new cctx only suitable as source */
1150static coro_cctx *
1151cctx_new_empty ()
1152{
1153 coro_cctx *cctx = cctx_new ();
1154
1155 cctx->sptr = 0;
1156 coro_create (&cctx->cctx, 0, 0, 0, 0);
1157
1158 return cctx;
1159}
1160
1161/* create a new cctx suitable as destination/running a perl interpreter */
1162static coro_cctx *
1163cctx_new_run ()
1164{
1165 coro_cctx *cctx = cctx_new ();
1034 void *stack_start; 1166 void *stack_start;
1035 size_t stack_size; 1167 size_t stack_size;
1036 1168
1037 ++cctx_count;
1038
1039 Newz (0, cctx, 1, coro_cctx);
1040
1041#if HAVE_MMAP 1169#if HAVE_MMAP
1042 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1170 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1043 /* mmap supposedly does allocate-on-write for us */ 1171 /* mmap supposedly does allocate-on-write for us */
1044 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1172 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1045 1173
1046 if (cctx->sptr != (void *)-1) 1174 if (cctx->sptr != (void *)-1)
1047 { 1175 {
1048# if CORO_STACKGUARD 1176 #if CORO_STACKGUARD
1049 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1177 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1050# endif 1178 #endif
1051 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1179 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1052 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1180 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1053 cctx->flags |= CC_MAPPED; 1181 cctx->flags |= CC_MAPPED;
1054 } 1182 }
1055 else 1183 else
1056#endif 1184#endif
1057 { 1185 {
1058 cctx->ssize = coro_stacksize * (long)sizeof (long); 1186 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1059 New (0, cctx->sptr, coro_stacksize, long); 1187 New (0, cctx->sptr, cctx_stacksize, long);
1060 1188
1061 if (!cctx->sptr) 1189 if (!cctx->sptr)
1062 { 1190 {
1063 perror ("FATAL: unable to allocate stack for coroutine"); 1191 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1064 _exit (EXIT_FAILURE); 1192 _exit (EXIT_FAILURE);
1065 } 1193 }
1066 1194
1067 stack_start = cctx->sptr; 1195 stack_start = cctx->sptr;
1068 stack_size = cctx->ssize; 1196 stack_size = cctx->ssize;
1069 } 1197 }
1070 1198
1071 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1199 #if CORO_USE_VALGRIND
1200 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1201 #endif
1202
1072 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1203 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1073 1204
1074 return cctx; 1205 return cctx;
1075} 1206}
1076 1207
… …
1079{ 1210{
1080 if (!cctx) 1211 if (!cctx)
1081 return; 1212 return;
1082 1213
1083 --cctx_count; 1214 --cctx_count;
1215 coro_destroy (&cctx->cctx);
1084 1216
1217 /* coro_transfer creates new, empty cctx's */
1218 if (cctx->sptr)
1219 {
1085#if CORO_USE_VALGRIND 1220 #if CORO_USE_VALGRIND
1086 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1221 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1087#endif 1222 #endif
1088 1223
1089#if HAVE_MMAP 1224#if HAVE_MMAP
1090 if (cctx->flags & CC_MAPPED) 1225 if (cctx->flags & CC_MAPPED)
1091 munmap (cctx->sptr, cctx->ssize); 1226 munmap (cctx->sptr, cctx->ssize);
1092 else 1227 else
1093#endif 1228#endif
1094 Safefree (cctx->sptr); 1229 Safefree (cctx->sptr);
1230 }
1095 1231
1096 Safefree (cctx); 1232 Safefree (cctx);
1097} 1233}
1098 1234
1099/* wether this cctx should be destructed */ 1235/* wether this cctx should be destructed */
1100#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1236#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1101 1237
1102static coro_cctx * 1238static coro_cctx *
1103cctx_get (pTHX) 1239cctx_get (pTHX)
1104{ 1240{
1105 while (expect_true (cctx_first)) 1241 while (expect_true (cctx_first))
… …
1112 return cctx; 1248 return cctx;
1113 1249
1114 cctx_destroy (cctx); 1250 cctx_destroy (cctx);
1115 } 1251 }
1116 1252
1117 return cctx_new (); 1253 return cctx_new_run ();
1118} 1254}
1119 1255
1120static void 1256static void
1121cctx_put (coro_cctx *cctx) 1257cctx_put (coro_cctx *cctx)
1122{ 1258{
1259 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1260
1123 /* free another cctx if overlimit */ 1261 /* free another cctx if overlimit */
1124 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1262 if (expect_false (cctx_idle >= cctx_max_idle))
1125 { 1263 {
1126 coro_cctx *first = cctx_first; 1264 coro_cctx *first = cctx_first;
1127 cctx_first = first->next; 1265 cctx_first = first->next;
1128 --cctx_idle; 1266 --cctx_idle;
1129 1267
… …
1141transfer_check (pTHX_ struct coro *prev, struct coro *next) 1279transfer_check (pTHX_ struct coro *prev, struct coro *next)
1142{ 1280{
1143 if (expect_true (prev != next)) 1281 if (expect_true (prev != next))
1144 { 1282 {
1145 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1283 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1146 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1284 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1147 1285
1148 if (expect_false (next->flags & CF_RUNNING)) 1286 if (expect_false (next->flags & CF_RUNNING))
1149 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1287 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1150 1288
1151 if (expect_false (next->flags & CF_DESTROYED)) 1289 if (expect_false (next->flags & CF_DESTROYED))
1152 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1290 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1153 1291
1154#if !PERL_VERSION_ATLEAST (5,10,0) 1292#if !PERL_VERSION_ATLEAST (5,10,0)
1155 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1293 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1156 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version"); 1294 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1157#endif 1295#endif
1158 } 1296 }
1159} 1297}
1160 1298
1161/* always use the TRANSFER macro */ 1299/* always use the TRANSFER macro */
1162static void NOINLINE 1300static void NOINLINE
1163transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1301transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1164{ 1302{
1165 dSTACKLEVEL; 1303 dSTACKLEVEL;
1166 static volatile int has_throw;
1167 1304
1168 /* sometimes transfer is only called to set idle_sp */ 1305 /* sometimes transfer is only called to set idle_sp */
1169 if (expect_false (!next)) 1306 if (expect_false (!next))
1170 { 1307 {
1171 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1308 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel;
1172 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1309 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1173 } 1310 }
1174 else if (expect_true (prev != next)) 1311 else if (expect_true (prev != next))
1175 { 1312 {
1176 coro_cctx *prev__cctx; 1313 coro_cctx *prev__cctx;
1177 1314
1178 if (expect_false (prev->flags & CF_NEW)) 1315 if (expect_false (prev->flags & CF_NEW))
1179 { 1316 {
1180 /* create a new empty context */ 1317 /* create a new empty/source context */
1181 Newz (0, prev->cctx, 1, coro_cctx); 1318 prev->cctx = cctx_new_empty ();
1182 prev->flags &= ~CF_NEW; 1319 prev->flags &= ~CF_NEW;
1183 prev->flags |= CF_RUNNING; 1320 prev->flags |= CF_RUNNING;
1184 } 1321 }
1185 1322
1186 prev->flags &= ~CF_RUNNING; 1323 prev->flags &= ~CF_RUNNING;
1187 next->flags |= CF_RUNNING; 1324 next->flags |= CF_RUNNING;
1188
1189 LOCK;
1190 1325
1191 /* first get rid of the old state */ 1326 /* first get rid of the old state */
1192 save_perl (aTHX_ prev); 1327 save_perl (aTHX_ prev);
1193 1328
1194 if (expect_false (next->flags & CF_NEW)) 1329 if (expect_false (next->flags & CF_NEW))
… …
1201 else 1336 else
1202 load_perl (aTHX_ next); 1337 load_perl (aTHX_ next);
1203 1338
1204 prev__cctx = prev->cctx; 1339 prev__cctx = prev->cctx;
1205 1340
1206 /* possibly "free" the cctx */ 1341 /* possibly untie and reuse the cctx */
1207 if (expect_true ( 1342 if (expect_true (
1208 prev__cctx->idle_sp == STACKLEVEL 1343 prev__cctx->idle_sp == (void *)stacklevel
1209 && !(prev__cctx->flags & CC_TRACE) 1344 && !(prev__cctx->flags & CC_TRACE)
1210 && !force_cctx 1345 && !force_cctx
1211 )) 1346 ))
1212 { 1347 {
1213 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1348 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1214 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1349 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1215 1350
1216 prev->cctx = 0; 1351 prev->cctx = 0;
1217 1352
1218 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1353 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1219 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1354 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1226 1361
1227 ++next->usecount; 1362 ++next->usecount;
1228 1363
1229 if (expect_true (!next->cctx)) 1364 if (expect_true (!next->cctx))
1230 next->cctx = cctx_get (aTHX); 1365 next->cctx = cctx_get (aTHX);
1231
1232 has_throw = !!next->throw;
1233 1366
1234 if (expect_false (prev__cctx != next->cctx)) 1367 if (expect_false (prev__cctx != next->cctx))
1235 { 1368 {
1236 prev__cctx->top_env = PL_top_env; 1369 prev__cctx->top_env = PL_top_env;
1237 PL_top_env = next->cctx->top_env; 1370 PL_top_env = next->cctx->top_env;
1238 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1371 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1239 } 1372 }
1240 1373
1241 free_coro_mortal (aTHX); 1374 transfer_tail (aTHX);
1242 UNLOCK;
1243
1244 if (expect_false (has_throw))
1245 {
1246 struct coro *coro = SvSTATE (coro_current);
1247
1248 if (coro->throw)
1249 {
1250 SV *exception = coro->throw;
1251 coro->throw = 0;
1252 sv_setsv (ERRSV, exception);
1253 croak (0);
1254 }
1255 }
1256 } 1375 }
1257} 1376}
1258
1259struct transfer_args
1260{
1261 struct coro *prev, *next;
1262};
1263 1377
1264#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1378#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1265#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1379#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1266 1380
1267/** high level stuff ********************************************************/ 1381/** high level stuff ********************************************************/
… …
1269static int 1383static int
1270coro_state_destroy (pTHX_ struct coro *coro) 1384coro_state_destroy (pTHX_ struct coro *coro)
1271{ 1385{
1272 if (coro->flags & CF_DESTROYED) 1386 if (coro->flags & CF_DESTROYED)
1273 return 0; 1387 return 0;
1388
1389 if (coro->on_destroy)
1390 coro->on_destroy (aTHX_ coro);
1274 1391
1275 coro->flags |= CF_DESTROYED; 1392 coro->flags |= CF_DESTROYED;
1276 1393
1277 if (coro->flags & CF_READY) 1394 if (coro->flags & CF_READY)
1278 { 1395 {
1279 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1396 /* reduce nready, as destroying a ready coro effectively unreadies it */
1280 /* alternative: look through all ready queues and remove the coro */ 1397 /* alternative: look through all ready queues and remove the coro */
1281 LOCK;
1282 --coro_nready; 1398 --coro_nready;
1283 UNLOCK;
1284 } 1399 }
1285 else 1400 else
1286 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1401 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1287 1402
1288 if (coro->mainstack && coro->mainstack != main_mainstack) 1403 if (coro->mainstack && coro->mainstack != main_mainstack)
1289 { 1404 {
1290 struct coro temp; 1405 struct coro temp;
1291 1406
1292 if (coro->flags & CF_RUNNING) 1407 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1293 croak ("FATAL: tried to destroy currently running coroutine");
1294 1408
1295 save_perl (aTHX_ &temp); 1409 save_perl (aTHX_ &temp);
1296 load_perl (aTHX_ coro); 1410 load_perl (aTHX_ coro);
1297 1411
1298 coro_destroy (aTHX_ coro); 1412 coro_destruct (aTHX_ coro);
1299 1413
1300 load_perl (aTHX_ &temp); 1414 load_perl (aTHX_ &temp);
1301 1415
1302 coro->slot = 0; 1416 coro->slot = 0;
1303 } 1417 }
… …
1349# define MGf_DUP 0 1463# define MGf_DUP 0
1350#endif 1464#endif
1351}; 1465};
1352 1466
1353static void 1467static void
1354prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1468prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1355{ 1469{
1356 ta->prev = SvSTATE (prev_sv); 1470 ta->prev = SvSTATE (prev_sv);
1357 ta->next = SvSTATE (next_sv); 1471 ta->next = SvSTATE (next_sv);
1358 TRANSFER_CHECK (*ta); 1472 TRANSFER_CHECK (*ta);
1359} 1473}
1360 1474
1361static void 1475static void
1362api_transfer (SV *prev_sv, SV *next_sv) 1476api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1363{ 1477{
1364 dTHX;
1365 struct transfer_args ta; 1478 struct coro_transfer_args ta;
1366 1479
1367 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1480 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1368 TRANSFER (ta, 1); 1481 TRANSFER (ta, 1);
1369} 1482}
1370 1483
1371/** Coro ********************************************************************/ 1484/** Coro ********************************************************************/
1372 1485
1373static void 1486INLINE void
1374coro_enq (pTHX_ SV *coro_sv) 1487coro_enq (pTHX_ struct coro *coro)
1375{ 1488{
1376 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1489 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv));
1377} 1490}
1378 1491
1379static SV * 1492INLINE SV *
1380coro_deq (pTHX) 1493coro_deq (pTHX)
1381{ 1494{
1382 int prio; 1495 int prio;
1383 1496
1384 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1497 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
… …
1387 1500
1388 return 0; 1501 return 0;
1389} 1502}
1390 1503
1391static int 1504static int
1392api_ready (SV *coro_sv) 1505api_ready (pTHX_ SV *coro_sv)
1393{ 1506{
1394 dTHX;
1395 struct coro *coro; 1507 struct coro *coro;
1396 SV *sv_hook; 1508 SV *sv_hook;
1397 void (*xs_hook)(void); 1509 void (*xs_hook)(void);
1398 1510
1399 if (SvROK (coro_sv)) 1511 if (SvROK (coro_sv))
… …
1404 if (coro->flags & CF_READY) 1516 if (coro->flags & CF_READY)
1405 return 0; 1517 return 0;
1406 1518
1407 coro->flags |= CF_READY; 1519 coro->flags |= CF_READY;
1408 1520
1409 LOCK;
1410
1411 sv_hook = coro_nready ? 0 : coro_readyhook; 1521 sv_hook = coro_nready ? 0 : coro_readyhook;
1412 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1522 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1413 1523
1414 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1524 coro_enq (aTHX_ coro);
1415 ++coro_nready; 1525 ++coro_nready;
1416 1526
1417 UNLOCK;
1418
1419 if (sv_hook) 1527 if (sv_hook)
1420 { 1528 {
1421 dSP; 1529 dSP;
1422 1530
1423 ENTER; 1531 ENTER;
… …
1437 1545
1438 return 1; 1546 return 1;
1439} 1547}
1440 1548
1441static int 1549static int
1442api_is_ready (SV *coro_sv) 1550api_is_ready (pTHX_ SV *coro_sv)
1443{ 1551{
1444 dTHX;
1445 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1552 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1446} 1553}
1447 1554
1448static void 1555INLINE void
1449prepare_schedule (pTHX_ struct transfer_args *ta) 1556prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1450{ 1557{
1451 SV *prev_sv, *next_sv; 1558 SV *prev_sv, *next_sv;
1452 1559
1453 for (;;) 1560 for (;;)
1454 { 1561 {
1455 LOCK;
1456 next_sv = coro_deq (aTHX); 1562 next_sv = coro_deq (aTHX);
1457 1563
1458 /* nothing to schedule: call the idle handler */ 1564 /* nothing to schedule: call the idle handler */
1459 if (expect_false (!next_sv)) 1565 if (expect_false (!next_sv))
1460 { 1566 {
1461 dSP; 1567 dSP;
1462 UNLOCK;
1463 1568
1464 ENTER; 1569 ENTER;
1465 SAVETMPS; 1570 SAVETMPS;
1466 1571
1467 PUSHMARK (SP); 1572 PUSHMARK (SP);
… …
1472 FREETMPS; 1577 FREETMPS;
1473 LEAVE; 1578 LEAVE;
1474 continue; 1579 continue;
1475 } 1580 }
1476 1581
1477 ta->next = SvSTATE (next_sv); 1582 ta->next = SvSTATE_hv (next_sv);
1478 1583
1479 /* cannot transfer to destroyed coros, skip and look for next */ 1584 /* cannot transfer to destroyed coros, skip and look for next */
1480 if (expect_false (ta->next->flags & CF_DESTROYED)) 1585 if (expect_false (ta->next->flags & CF_DESTROYED))
1481 { 1586 {
1482 UNLOCK;
1483 SvREFCNT_dec (next_sv); 1587 SvREFCNT_dec (next_sv);
1484 /* coro_nready is already taken care of by destroy */ 1588 /* coro_nready has already been taken care of by destroy */
1485 continue; 1589 continue;
1486 } 1590 }
1487 1591
1488 --coro_nready; 1592 --coro_nready;
1489 UNLOCK;
1490 break; 1593 break;
1491 } 1594 }
1492 1595
1493 /* free this only after the transfer */ 1596 /* free this only after the transfer */
1494 prev_sv = SvRV (coro_current); 1597 prev_sv = SvRV (coro_current);
1495 ta->prev = SvSTATE (prev_sv); 1598 ta->prev = SvSTATE_hv (prev_sv);
1496 TRANSFER_CHECK (*ta); 1599 TRANSFER_CHECK (*ta);
1497 assert (ta->next->flags & CF_READY); 1600 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1498 ta->next->flags &= ~CF_READY; 1601 ta->next->flags &= ~CF_READY;
1499 SvRV_set (coro_current, next_sv); 1602 SvRV_set (coro_current, next_sv);
1500 1603
1501 LOCK;
1502 free_coro_mortal (aTHX); 1604 free_coro_mortal (aTHX);
1503 coro_mortal = prev_sv; 1605 coro_mortal = prev_sv;
1504 UNLOCK;
1505} 1606}
1506 1607
1507static void 1608INLINE void
1508prepare_cede (pTHX_ struct transfer_args *ta) 1609prepare_cede (pTHX_ struct coro_transfer_args *ta)
1509{ 1610{
1510 api_ready (coro_current); 1611 api_ready (aTHX_ coro_current);
1511 prepare_schedule (aTHX_ ta); 1612 prepare_schedule (aTHX_ ta);
1512} 1613}
1513 1614
1615INLINE void
1616prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1617{
1618 SV *prev = SvRV (coro_current);
1619
1620 if (coro_nready)
1621 {
1622 prepare_schedule (aTHX_ ta);
1623 api_ready (aTHX_ prev);
1624 }
1625 else
1626 prepare_nop (aTHX_ ta);
1627}
1628
1629static void
1630api_schedule (pTHX)
1631{
1632 struct coro_transfer_args ta;
1633
1634 prepare_schedule (aTHX_ &ta);
1635 TRANSFER (ta, 1);
1636}
1637
1514static int 1638static int
1515prepare_cede_notself (pTHX_ struct transfer_args *ta) 1639api_cede (pTHX)
1516{ 1640{
1517 if (coro_nready) 1641 struct coro_transfer_args ta;
1518 { 1642
1519 SV *prev = SvRV (coro_current);
1520 prepare_schedule (aTHX_ ta); 1643 prepare_cede (aTHX_ &ta);
1521 api_ready (prev); 1644
1645 if (expect_true (ta.prev != ta.next))
1646 {
1647 TRANSFER (ta, 1);
1522 return 1; 1648 return 1;
1523 } 1649 }
1524 else 1650 else
1525 return 0; 1651 return 0;
1526} 1652}
1527 1653
1528static void
1529api_schedule (void)
1530{
1531 dTHX;
1532 struct transfer_args ta;
1533
1534 prepare_schedule (aTHX_ &ta);
1535 TRANSFER (ta, 1);
1536}
1537
1538static int 1654static int
1539api_cede (void) 1655api_cede_notself (pTHX)
1540{ 1656{
1541 dTHX; 1657 if (coro_nready)
1658 {
1542 struct transfer_args ta; 1659 struct coro_transfer_args ta;
1543 1660
1544 prepare_cede (aTHX_ &ta); 1661 prepare_cede_notself (aTHX_ &ta);
1545
1546 if (expect_true (ta.prev != ta.next))
1547 {
1548 TRANSFER (ta, 1); 1662 TRANSFER (ta, 1);
1549 return 1; 1663 return 1;
1550 } 1664 }
1551 else 1665 else
1552 return 0; 1666 return 0;
1553} 1667}
1554 1668
1555static int 1669static void
1556api_cede_notself (void)
1557{
1558 dTHX;
1559 struct transfer_args ta;
1560
1561 if (prepare_cede_notself (aTHX_ &ta))
1562 {
1563 TRANSFER (ta, 1);
1564 return 1;
1565 }
1566 else
1567 return 0;
1568}
1569
1570static void
1571api_trace (SV *coro_sv, int flags) 1670api_trace (pTHX_ SV *coro_sv, int flags)
1572{ 1671{
1573 dTHX;
1574 struct coro *coro = SvSTATE (coro_sv); 1672 struct coro *coro = SvSTATE (coro_sv);
1575 1673
1576 if (flags & CC_TRACE) 1674 if (flags & CC_TRACE)
1577 { 1675 {
1578 if (!coro->cctx) 1676 if (!coro->cctx)
1579 coro->cctx = cctx_new (); 1677 coro->cctx = cctx_new_run ();
1580 else if (!(coro->cctx->flags & CC_TRACE)) 1678 else if (!(coro->cctx->flags & CC_TRACE))
1581 croak ("cannot enable tracing on coroutine with custom stack"); 1679 croak ("cannot enable tracing on coroutine with custom stack,");
1582 1680
1583 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1681 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1584 } 1682 }
1585 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1683 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1586 { 1684 {
… …
1591 else 1689 else
1592 coro->slot->runops = RUNOPS_DEFAULT; 1690 coro->slot->runops = RUNOPS_DEFAULT;
1593 } 1691 }
1594} 1692}
1595 1693
1694/*****************************************************************************/
1695/* PerlIO::cede */
1696
1697typedef struct
1698{
1699 PerlIOBuf base;
1700 NV next, every;
1701} PerlIOCede;
1702
1703static IV
1704PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1705{
1706 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1707
1708 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1709 self->next = nvtime () + self->every;
1710
1711 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1712}
1713
1714static SV *
1715PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1716{
1717 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1718
1719 return newSVnv (self->every);
1720}
1721
1722static IV
1723PerlIOCede_flush (pTHX_ PerlIO *f)
1724{
1725 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1726 double now = nvtime ();
1727
1728 if (now >= self->next)
1729 {
1730 api_cede (aTHX);
1731 self->next = now + self->every;
1732 }
1733
1734 return PerlIOBuf_flush (aTHX_ f);
1735}
1736
1737static PerlIO_funcs PerlIO_cede =
1738{
1739 sizeof(PerlIO_funcs),
1740 "cede",
1741 sizeof(PerlIOCede),
1742 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1743 PerlIOCede_pushed,
1744 PerlIOBuf_popped,
1745 PerlIOBuf_open,
1746 PerlIOBase_binmode,
1747 PerlIOCede_getarg,
1748 PerlIOBase_fileno,
1749 PerlIOBuf_dup,
1750 PerlIOBuf_read,
1751 PerlIOBuf_unread,
1752 PerlIOBuf_write,
1753 PerlIOBuf_seek,
1754 PerlIOBuf_tell,
1755 PerlIOBuf_close,
1756 PerlIOCede_flush,
1757 PerlIOBuf_fill,
1758 PerlIOBase_eof,
1759 PerlIOBase_error,
1760 PerlIOBase_clearerr,
1761 PerlIOBase_setlinebuf,
1762 PerlIOBuf_get_base,
1763 PerlIOBuf_bufsiz,
1764 PerlIOBuf_get_ptr,
1765 PerlIOBuf_get_cnt,
1766 PerlIOBuf_set_ptrcnt,
1767};
1768
1769/*****************************************************************************/
1770
1771static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1772static const CV *slf_cv;
1773static SV *slf_arg0;
1774static SV *slf_arg1;
1775static SV *slf_arg2;
1776static I32 slf_ax; /* top of stack, for restore */
1777
1778/* this restores the stack in the case we patched the entersub, to */
1779/* recreate the stack frame as perl will on following calls */
1780/* since entersub cleared the stack */
1781static OP *
1782pp_restore (pTHX)
1783{
1784 SV **SP = PL_stack_base + slf_ax;
1785
1786 PUSHMARK (SP);
1787
1788 EXTEND (SP, 3);
1789 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1790 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1791 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1792 PUSHs ((SV *)CvGV (slf_cv));
1793
1794 RETURNOP (slf_restore.op_first);
1795}
1796
1797static void
1798slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1799{
1800 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1801}
1802
1803static void
1804slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1805{
1806 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1807
1808 frame->prepare = slf_prepare_set_stacklevel;
1809 frame->check = slf_check_nop;
1810 frame->data = (void *)SvIV (arg [0]);
1811}
1812
1813static void
1814slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1815{
1816 SV **arg = (SV **)slf_frame.data;
1817
1818 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
1819
1820 /* if the destination has ->throw set, then copy it */
1821 /* into the current coro's throw slot, so it will be raised */
1822 /* after the schedule */
1823 if (expect_false (ta->next->throw))
1824 {
1825 struct coro *coro = SvSTATE_current;
1826 SvREFCNT_dec (coro->throw);
1827 coro->throw = ta->next->throw;
1828 ta->next->throw = 0;
1829 }
1830}
1831
1832static void
1833slf_init_transfer (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1834{
1835 if (items != 2)
1836 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1837
1838 frame->prepare = slf_prepare_transfer;
1839 frame->check = slf_check_nop;
1840 frame->data = (void *)arg; /* let's hope it will stay valid */
1841}
1842
1843static void
1844slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1845{
1846 frame->prepare = prepare_schedule;
1847 frame->check = slf_check_nop;
1848}
1849
1850static void
1851slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1852{
1853 frame->prepare = prepare_cede;
1854 frame->check = slf_check_nop;
1855}
1856
1857static void
1858slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1859{
1860 frame->prepare = prepare_cede_notself;
1861 frame->check = slf_check_nop;
1862}
1863
1864/* we hijack an hopefully unused CV flag for our purposes */
1865#define CVf_SLF 0x4000
1866
1867/*
1868 * these not obviously related functions are all rolled into one
1869 * function to increase chances that they all will call transfer with the same
1870 * stack offset
1871 * SLF stands for "schedule-like-function".
1872 */
1873static OP *
1874pp_slf (pTHX)
1875{
1876 I32 checkmark; /* mark SP to see how many elements check has pushed */
1877
1878 /* set up the slf frame, unless it has already been set-up */
1879 /* the latter happens when a new coro has been started */
1880 /* or when a new cctx was attached to an existing coroutine */
1881 if (expect_true (!slf_frame.prepare))
1882 {
1883 /* first iteration */
1884 dSP;
1885 SV **arg = PL_stack_base + TOPMARK + 1;
1886 int items = SP - arg; /* args without function object */
1887 SV *gv = *sp;
1888
1889 /* do a quick consistency check on the "function" object, and if it isn't */
1890 /* for us, divert to the real entersub */
1891 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1892 return PL_ppaddr[OP_ENTERSUB](aTHX);
1893
1894 if (!(PL_op->op_flags & OPf_STACKED))
1895 {
1896 /* ampersand-form of call, use @_ instead of stack */
1897 AV *av = GvAV (PL_defgv);
1898 arg = AvARRAY (av);
1899 items = AvFILLp (av) + 1;
1900 }
1901
1902 /* now call the init function, which needs to set up slf_frame */
1903 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr)
1904 (aTHX_ &slf_frame, GvCV (gv), arg, items);
1905
1906 /* pop args */
1907 SP = PL_stack_base + POPMARK;
1908
1909 PUTBACK;
1910 }
1911
1912 /* now that we have a slf_frame, interpret it! */
1913 /* we use a callback system not to make the code needlessly */
1914 /* complicated, but so we can run multiple perl coros from one cctx */
1915
1916 do
1917 {
1918 struct coro_transfer_args ta;
1919
1920 slf_frame.prepare (aTHX_ &ta);
1921 TRANSFER (ta, 0);
1922
1923 checkmark = PL_stack_sp - PL_stack_base;
1924 }
1925 while (slf_frame.check (aTHX_ &slf_frame));
1926
1927 {
1928 dSP;
1929 SV **bot = PL_stack_base + checkmark;
1930 int gimme = GIMME_V;
1931
1932 slf_frame.prepare = 0; /* invalidate the frame, so it gets initialised again next time */
1933
1934 /* make sure we put something on the stack in scalar context */
1935 if (gimme == G_SCALAR)
1936 {
1937 if (sp == bot)
1938 XPUSHs (&PL_sv_undef);
1939
1940 SP = bot + 1;
1941 }
1942
1943 PUTBACK;
1944 }
1945
1946 {
1947 struct coro *coro = SvSTATE_current;
1948
1949 if (expect_false (coro->throw))
1950 {
1951 SV *exception = sv_2mortal (coro->throw);
1952
1953 coro->throw = 0;
1954 sv_setsv (ERRSV, exception);
1955 croak (0);
1956 }
1957 }
1958
1959 return NORMAL;
1960}
1961
1962static void
1963api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, I32 ax)
1964{
1965 SV **arg = PL_stack_base + ax;
1966 int items = PL_stack_sp - arg + 1;
1967
1968 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1969
1970 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1971 && PL_op->op_ppaddr != pp_slf)
1972 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1973
1974#if 0
1975 if (items > 3)
1976 croak ("Coro only supports up to three arguments to SLF functions currently (not %d), caught", items);
1977#endif
1978
1979 CvFLAGS (cv) |= CVf_SLF;
1980 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1981 slf_cv = cv;
1982
1983 /* we patch the op, and then re-run the whole call */
1984 /* we have to put the same argument on the stack for this to work */
1985 /* and this will be done by pp_restore */
1986 slf_restore.op_next = (OP *)&slf_restore;
1987 slf_restore.op_type = OP_CUSTOM;
1988 slf_restore.op_ppaddr = pp_restore;
1989 slf_restore.op_first = PL_op;
1990
1991 slf_ax = ax - 1; /* undo the ax++ inside dAXMARK */
1992 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
1993 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
1994 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
1995
1996 PL_op->op_ppaddr = pp_slf;
1997 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */
1998
1999 PL_op = (OP *)&slf_restore;
2000}
2001
2002/*****************************************************************************/
2003
2004static void
2005coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2006{
2007 SV *count_sv = AvARRAY (av)[0];
2008 IV count = SvIVX (count_sv);
2009
2010 count += adjust;
2011 SvIVX (count_sv) = count;
2012
2013 /* now wake up as many waiters as are expected to lock */
2014 while (count > 0 && AvFILLp (av) > 0)
2015 {
2016 SV *cb;
2017
2018 /* swap first two elements so we can shift a waiter */
2019 AvARRAY (av)[0] = AvARRAY (av)[1];
2020 AvARRAY (av)[1] = count_sv;
2021 cb = av_shift (av);
2022
2023 if (SvOBJECT (cb))
2024 api_ready (aTHX_ cb);
2025 else
2026 croak ("callbacks not yet supported");
2027
2028 SvREFCNT_dec (cb);
2029
2030 --count;
2031 }
2032}
2033
2034static void
2035coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2036{
2037 /* call $sem->adjust (0) to possibly wake up some other waiters */
2038 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2039}
2040
2041static int
2042slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2043{
2044 AV *av = (AV *)frame->data;
2045 SV *count_sv = AvARRAY (av)[0];
2046
2047 if (SvIVX (count_sv) > 0)
2048 {
2049 SvSTATE_current->on_destroy = 0;
2050 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2051 return 0;
2052 }
2053 else
2054 {
2055 int i;
2056 /* if we were woken up but can't down, we look through the whole */
2057 /* waiters list and only add us if we aren't in there already */
2058 /* this avoids some degenerate memory usage cases */
2059
2060 for (i = 1; i <= AvFILLp (av); ++i)
2061 if (AvARRAY (av)[i] == SvRV (coro_current))
2062 return 1;
2063
2064 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2065 return 1;
2066 }
2067}
2068
2069static void
2070slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2071{
2072 AV *av = (AV *)SvRV (arg [0]);
2073
2074 if (SvIVX (AvARRAY (av)[0]) > 0)
2075 {
2076 frame->data = (void *)av;
2077 frame->prepare = prepare_nop;
2078 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2079 }
2080 else
2081 {
2082 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2083
2084 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2085 frame->prepare = prepare_schedule;
2086
2087 /* to avoid race conditions when a woken-up coro gets terminated */
2088 /* we arrange for a temporary on_destroy that calls adjust (0) */
2089 assert (!SvSTATE_current->on_destroy);//D
2090 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2091 }
2092
2093 frame->check = slf_check_semaphore_down;
2094
2095}
2096
2097/*****************************************************************************/
2098
2099#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2100
2101/* create a closure from XS, returns a code reference */
2102/* the arg can be accessed via GENSUB_ARG from the callback */
2103/* the callback must use dXSARGS/XSRETURN */
2104static SV *
2105gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2106{
2107 CV *cv = (CV *)NEWSV (0, 0);
2108
2109 sv_upgrade ((SV *)cv, SVt_PVCV);
2110
2111 CvANON_on (cv);
2112 CvISXSUB_on (cv);
2113 CvXSUB (cv) = xsub;
2114 GENSUB_ARG = arg;
2115
2116 return newRV_noinc ((SV *)cv);
2117}
2118
2119/*****************************************************************************/
2120
1596MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2121MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1597 2122
1598PROTOTYPES: DISABLE 2123PROTOTYPES: DISABLE
1599 2124
1600BOOT: 2125BOOT:
1601{ 2126{
1602#ifdef USE_ITHREADS 2127#ifdef USE_ITHREADS
1603 MUTEX_INIT (&coro_mutex); 2128# if CORO_PTHREAD
2129 coro_thx = PERL_GET_CONTEXT;
2130# endif
1604#endif 2131#endif
1605 BOOT_PAGESIZE; 2132 BOOT_PAGESIZE;
1606 2133
1607 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2134 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1608 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2135 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1609 2136
1610 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 2137 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1611 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2138 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1612 orig_sigelem_set = PL_vtbl_sigelem.svt_set; 2139 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1613 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1614 2140
1615 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 2141 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1616 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 2142 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1617 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 2143 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1618 2144
… …
1627 main_top_env = PL_top_env; 2153 main_top_env = PL_top_env;
1628 2154
1629 while (main_top_env->je_prev) 2155 while (main_top_env->je_prev)
1630 main_top_env = main_top_env->je_prev; 2156 main_top_env = main_top_env->je_prev;
1631 2157
2158 {
2159 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2160
2161 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2162 hv_store_ent (PL_custom_op_names, slf,
2163 newSVpv ("coro_slf", 0), 0);
2164
2165 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2166 hv_store_ent (PL_custom_op_descs, slf,
2167 newSVpv ("coro schedule like function", 0), 0);
2168 }
2169
1632 coroapi.ver = CORO_API_VERSION; 2170 coroapi.ver = CORO_API_VERSION;
1633 coroapi.rev = CORO_API_REVISION; 2171 coroapi.rev = CORO_API_REVISION;
2172
1634 coroapi.transfer = api_transfer; 2173 coroapi.transfer = api_transfer;
2174
2175 coroapi.sv_state = SvSTATE_;
2176 coroapi.execute_slf = api_execute_slf;
2177 coroapi.prepare_nop = prepare_nop;
2178 coroapi.prepare_schedule = prepare_schedule;
2179 coroapi.prepare_cede = prepare_cede;
2180 coroapi.prepare_cede_notself = prepare_cede_notself;
2181
2182 {
2183 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2184
2185 if (!svp) croak ("Time::HiRes is required");
2186 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2187
2188 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2189 }
1635 2190
1636 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2191 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1637} 2192}
1638 2193
1639SV * 2194SV *
… …
1663 av_push (coro->args, newSVsv (ST (i))); 2218 av_push (coro->args, newSVsv (ST (i)));
1664} 2219}
1665 OUTPUT: 2220 OUTPUT:
1666 RETVAL 2221 RETVAL
1667 2222
1668# these not obviously related functions are all rolled into the same xs
1669# function to increase chances that they all will call transfer with the same
1670# stack offset
1671void 2223void
1672_set_stacklevel (...) 2224_set_stacklevel (...)
1673 ALIAS: 2225 CODE:
1674 Coro::State::transfer = 1 2226 CORO_EXECUTE_SLF_XS (slf_init_set_stacklevel);
1675 Coro::schedule = 2
1676 Coro::cede = 3
1677 Coro::cede_notself = 4
1678 CODE:
1679{
1680 struct transfer_args ta;
1681 2227
1682 PUTBACK; 2228void
1683 switch (ix) 2229transfer (...)
1684 { 2230 PROTOTYPE: $$
1685 case 0: 2231 CODE:
1686 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2232 CORO_EXECUTE_SLF_XS (slf_init_transfer);
1687 ta.next = 0;
1688 break;
1689
1690 case 1:
1691 if (items != 2)
1692 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1693
1694 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1695 break;
1696
1697 case 2:
1698 prepare_schedule (aTHX_ &ta);
1699 break;
1700
1701 case 3:
1702 prepare_cede (aTHX_ &ta);
1703 break;
1704
1705 case 4:
1706 if (!prepare_cede_notself (aTHX_ &ta))
1707 XSRETURN_EMPTY;
1708
1709 break;
1710 }
1711 SPAGAIN;
1712
1713 BARRIER;
1714 PUTBACK;
1715 TRANSFER (ta, 0);
1716 SPAGAIN; /* might be the sp of a different coroutine now */
1717 /* be extra careful not to ever do anything after TRANSFER */
1718}
1719 2233
1720bool 2234bool
1721_destroy (SV *coro_sv) 2235_destroy (SV *coro_sv)
1722 CODE: 2236 CODE:
1723 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2237 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
… …
1730 CODE: 2244 CODE:
1731 _exit (code); 2245 _exit (code);
1732 2246
1733int 2247int
1734cctx_stacksize (int new_stacksize = 0) 2248cctx_stacksize (int new_stacksize = 0)
2249 PROTOTYPE: ;$
1735 CODE: 2250 CODE:
1736 RETVAL = coro_stacksize; 2251 RETVAL = cctx_stacksize;
1737 if (new_stacksize) 2252 if (new_stacksize)
2253 {
1738 coro_stacksize = new_stacksize; 2254 cctx_stacksize = new_stacksize;
2255 ++cctx_gen;
2256 }
1739 OUTPUT: 2257 OUTPUT:
1740 RETVAL 2258 RETVAL
1741 2259
1742int 2260int
2261cctx_max_idle (int max_idle = 0)
2262 PROTOTYPE: ;$
2263 CODE:
2264 RETVAL = cctx_max_idle;
2265 if (max_idle > 1)
2266 cctx_max_idle = max_idle;
2267 OUTPUT:
2268 RETVAL
2269
2270int
1743cctx_count () 2271cctx_count ()
2272 PROTOTYPE:
1744 CODE: 2273 CODE:
1745 RETVAL = cctx_count; 2274 RETVAL = cctx_count;
1746 OUTPUT: 2275 OUTPUT:
1747 RETVAL 2276 RETVAL
1748 2277
1749int 2278int
1750cctx_idle () 2279cctx_idle ()
2280 PROTOTYPE:
1751 CODE: 2281 CODE:
1752 RETVAL = cctx_idle; 2282 RETVAL = cctx_idle;
1753 OUTPUT: 2283 OUTPUT:
1754 RETVAL 2284 RETVAL
1755 2285
1756void 2286void
1757list () 2287list ()
2288 PROTOTYPE:
1758 PPCODE: 2289 PPCODE:
1759{ 2290{
1760 struct coro *coro; 2291 struct coro *coro;
1761 for (coro = coro_first; coro; coro = coro->next) 2292 for (coro = coro_first; coro; coro = coro->next)
1762 if (coro->hv) 2293 if (coro->hv)
… …
1767call (Coro::State coro, SV *coderef) 2298call (Coro::State coro, SV *coderef)
1768 ALIAS: 2299 ALIAS:
1769 eval = 1 2300 eval = 1
1770 CODE: 2301 CODE:
1771{ 2302{
1772 if (coro->mainstack) 2303 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1773 { 2304 {
1774 struct coro temp; 2305 struct coro temp;
1775 2306
1776 if (!(coro->flags & CF_RUNNING)) 2307 if (!(coro->flags & CF_RUNNING))
1777 { 2308 {
… …
1821 RETVAL = boolSV (coro->flags & ix); 2352 RETVAL = boolSV (coro->flags & ix);
1822 OUTPUT: 2353 OUTPUT:
1823 RETVAL 2354 RETVAL
1824 2355
1825void 2356void
2357throw (Coro::State self, SV *throw = &PL_sv_undef)
2358 PROTOTYPE: $;$
2359 CODE:
2360 SvREFCNT_dec (self->throw);
2361 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2362
2363void
1826api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2364api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2365 PROTOTYPE: $;$
2366 C_ARGS: aTHX_ coro, flags
1827 2367
1828SV * 2368SV *
1829has_cctx (Coro::State coro) 2369has_cctx (Coro::State coro)
1830 PROTOTYPE: $ 2370 PROTOTYPE: $
1831 CODE: 2371 CODE:
… …
1839 CODE: 2379 CODE:
1840 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2380 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1841 OUTPUT: 2381 OUTPUT:
1842 RETVAL 2382 RETVAL
1843 2383
1844IV 2384UV
1845rss (Coro::State coro) 2385rss (Coro::State coro)
1846 PROTOTYPE: $ 2386 PROTOTYPE: $
1847 ALIAS: 2387 ALIAS:
1848 usecount = 1 2388 usecount = 1
1849 CODE: 2389 CODE:
… …
1855 OUTPUT: 2395 OUTPUT:
1856 RETVAL 2396 RETVAL
1857 2397
1858void 2398void
1859force_cctx () 2399force_cctx ()
2400 PROTOTYPE:
1860 CODE: 2401 CODE:
1861 struct coro *coro = SvSTATE (coro_current);
1862 coro->cctx->idle_sp = 0; 2402 SvSTATE_current->cctx->idle_sp = 0;
2403
2404void
2405swap_defsv (Coro::State self)
2406 PROTOTYPE: $
2407 ALIAS:
2408 swap_defav = 1
2409 CODE:
2410 if (!self->slot)
2411 croak ("cannot swap state with coroutine that has no saved state,");
2412 else
2413 {
2414 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2415 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2416
2417 SV *tmp = *src; *src = *dst; *dst = tmp;
2418 }
1863 2419
1864MODULE = Coro::State PACKAGE = Coro 2420MODULE = Coro::State PACKAGE = Coro
1865 2421
1866BOOT: 2422BOOT:
1867{ 2423{
… …
1885 2441
1886 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2442 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1887 coro_ready[i] = newAV (); 2443 coro_ready[i] = newAV ();
1888 2444
1889 { 2445 {
1890 SV *sv = perl_get_sv ("Coro::API", TRUE); 2446 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1891 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1892 2447
1893 coroapi.schedule = api_schedule; 2448 coroapi.schedule = api_schedule;
1894 coroapi.cede = api_cede; 2449 coroapi.cede = api_cede;
1895 coroapi.cede_notself = api_cede_notself; 2450 coroapi.cede_notself = api_cede_notself;
1896 coroapi.ready = api_ready; 2451 coroapi.ready = api_ready;
1897 coroapi.is_ready = api_is_ready; 2452 coroapi.is_ready = api_is_ready;
1898 coroapi.nready = &coro_nready; 2453 coroapi.nready = coro_nready;
1899 coroapi.current = coro_current; 2454 coroapi.current = coro_current;
1900 2455
1901 GCoroAPI = &coroapi; 2456 GCoroAPI = &coroapi;
1902 sv_setiv (sv, (IV)&coroapi); 2457 sv_setiv (sv, (IV)&coroapi);
1903 SvREADONLY_on (sv); 2458 SvREADONLY_on (sv);
1904 } 2459 }
1905} 2460}
2461
2462void
2463schedule (...)
2464 CODE:
2465 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2466
2467void
2468cede (...)
2469 CODE:
2470 CORO_EXECUTE_SLF_XS (slf_init_cede);
2471
2472void
2473cede_notself (...)
2474 CODE:
2475 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
1906 2476
1907void 2477void
1908_set_current (SV *current) 2478_set_current (SV *current)
1909 PROTOTYPE: $ 2479 PROTOTYPE: $
1910 CODE: 2480 CODE:
1911 SvREFCNT_dec (SvRV (coro_current)); 2481 SvREFCNT_dec (SvRV (coro_current));
1912 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2482 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
1913 2483
1914void 2484void
1915_set_readyhook (SV *hook) 2485_set_readyhook (SV *hook)
1916 PROTOTYPE: $ 2486 PROTOTYPE: $
1917 CODE: 2487 CODE:
1918 LOCK;
1919 SvREFCNT_dec (coro_readyhook); 2488 SvREFCNT_dec (coro_readyhook);
1920 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 2489 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1921 UNLOCK;
1922 2490
1923int 2491int
1924prio (Coro::State coro, int newprio = 0) 2492prio (Coro::State coro, int newprio = 0)
2493 PROTOTYPE: $;$
1925 ALIAS: 2494 ALIAS:
1926 nice = 1 2495 nice = 1
1927 CODE: 2496 CODE:
1928{ 2497{
1929 RETVAL = coro->prio; 2498 RETVAL = coro->prio;
… …
1944 2513
1945SV * 2514SV *
1946ready (SV *self) 2515ready (SV *self)
1947 PROTOTYPE: $ 2516 PROTOTYPE: $
1948 CODE: 2517 CODE:
1949 RETVAL = boolSV (api_ready (self)); 2518 RETVAL = boolSV (api_ready (aTHX_ self));
1950 OUTPUT: 2519 OUTPUT:
1951 RETVAL 2520 RETVAL
1952 2521
1953int 2522int
1954nready (...) 2523nready (...)
… …
1956 CODE: 2525 CODE:
1957 RETVAL = coro_nready; 2526 RETVAL = coro_nready;
1958 OUTPUT: 2527 OUTPUT:
1959 RETVAL 2528 RETVAL
1960 2529
1961void
1962throw (Coro::State self, SV *throw = &PL_sv_undef)
1963 PROTOTYPE: $;$
1964 CODE:
1965 SvREFCNT_dec (self->throw);
1966 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1967
1968void
1969swap_defsv (Coro::State self)
1970 PROTOTYPE: $
1971 ALIAS:
1972 swap_defav = 1
1973 CODE:
1974 if (!self->slot)
1975 croak ("cannot swap state with coroutine that has no saved state");
1976 else
1977 {
1978 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1979 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1980
1981 SV *tmp = *src; *src = *dst; *dst = tmp;
1982 }
1983
1984# for async_pool speedup 2530# for async_pool speedup
1985void 2531void
1986_pool_1 (SV *cb) 2532_pool_1 (SV *cb)
1987 CODE: 2533 CODE:
1988{ 2534{
1989 struct coro *coro = SvSTATE (coro_current);
1990 HV *hv = (HV *)SvRV (coro_current); 2535 HV *hv = (HV *)SvRV (coro_current);
2536 struct coro *coro = SvSTATE_hv ((SV *)hv);
1991 AV *defav = GvAV (PL_defgv); 2537 AV *defav = GvAV (PL_defgv);
1992 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2538 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1993 AV *invoke_av; 2539 AV *invoke_av;
1994 int i, len; 2540 int i, len;
1995 2541
1996 if (!invoke) 2542 if (!invoke)
1997 { 2543 {
1998 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2544 SV *old = PL_diehook;
2545 PL_diehook = 0;
2546 SvREFCNT_dec (old);
1999 croak ("\3async_pool terminate\2\n"); 2547 croak ("\3async_pool terminate\2\n");
2000 } 2548 }
2001 2549
2002 SvREFCNT_dec (coro->saved_deffh); 2550 SvREFCNT_dec (coro->saved_deffh);
2003 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2551 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2004 2552
2005 hv_store (hv, "desc", sizeof ("desc") - 1, 2553 hv_store (hv, "desc", sizeof ("desc") - 1,
2006 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2554 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2007 2555
2008 invoke_av = (AV *)SvRV (invoke); 2556 invoke_av = (AV *)SvRV (invoke);
… …
2012 2560
2013 if (len > 0) 2561 if (len > 0)
2014 { 2562 {
2015 av_fill (defav, len - 1); 2563 av_fill (defav, len - 1);
2016 for (i = 0; i < len; ++i) 2564 for (i = 0; i < len; ++i)
2017 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2565 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2018 } 2566 }
2019
2020 SvREFCNT_dec (invoke);
2021} 2567}
2022 2568
2023void 2569void
2024_pool_2 (SV *cb) 2570_pool_2 (SV *cb)
2025 CODE: 2571 CODE:
2026{ 2572{
2027 struct coro *coro = SvSTATE (coro_current); 2573 struct coro *coro = SvSTATE_current;
2028 2574
2029 sv_setsv (cb, &PL_sv_undef); 2575 sv_setsv (cb, &PL_sv_undef);
2030 2576
2031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2577 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2032 coro->saved_deffh = 0; 2578 coro->saved_deffh = 0;
2033 2579
2034 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2580 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2035 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2581 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2036 { 2582 {
2037 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2583 SV *old = PL_diehook;
2584 PL_diehook = 0;
2585 SvREFCNT_dec (old);
2038 croak ("\3async_pool terminate\2\n"); 2586 croak ("\3async_pool terminate\2\n");
2039 } 2587 }
2040 2588
2041 av_clear (GvAV (PL_defgv)); 2589 av_clear (GvAV (PL_defgv));
2042 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2590 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
2043 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2591 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2044 2592
2045 coro->prio = 0; 2593 coro->prio = 0;
2046 2594
2047 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2595 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2048 api_trace (coro_current, 0); 2596 api_trace (aTHX_ coro_current, 0);
2049 2597
2050 av_push (av_async_pool, newSVsv (coro_current)); 2598 av_push (av_async_pool, newSVsv (coro_current));
2051} 2599}
2052 2600
2053 2601
2054MODULE = Coro::State PACKAGE = Coro::AIO 2602MODULE = Coro::State PACKAGE = Coro::AIO
2055 2603
2056SV * 2604void
2057_get_state () 2605_get_state (SV *self)
2606 PROTOTYPE: $
2058 CODE: 2607 PPCODE:
2059{ 2608{
2060 struct io_state *data; 2609 AV *defav = GvAV (PL_defgv);
2061 2610 AV *av = newAV ();
2611 int i;
2062 RETVAL = newSV (sizeof (struct io_state)); 2612 SV *data_sv = newSV (sizeof (struct io_state));
2063 data = (struct io_state *)SvPVX (RETVAL); 2613 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2064 SvCUR_set (RETVAL, sizeof (struct io_state)); 2614 SvCUR_set (data_sv, sizeof (struct io_state));
2065 SvPOK_only (RETVAL); 2615 SvPOK_only (data_sv);
2066 2616
2067 data->errorno = errno; 2617 data->errorno = errno;
2068 data->laststype = PL_laststype; 2618 data->laststype = PL_laststype;
2069 data->laststatval = PL_laststatval; 2619 data->laststatval = PL_laststatval;
2070 data->statcache = PL_statcache; 2620 data->statcache = PL_statcache;
2621
2622 av_extend (av, AvFILLp (defav) + 1 + 1);
2623
2624 for (i = 0; i <= AvFILLp (defav); ++i)
2625 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2626
2627 av_push (av, data_sv);
2628
2629 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2630
2631 api_ready (aTHX_ self);
2071} 2632}
2072 OUTPUT:
2073 RETVAL
2074 2633
2075void 2634void
2076_set_state (char *data_) 2635_set_state (SV *state)
2077 PROTOTYPE: $ 2636 PROTOTYPE: $
2078 CODE: 2637 PPCODE:
2079{ 2638{
2080 struct io_state *data = (void *)data_; 2639 AV *av = (AV *)SvRV (state);
2640 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2641 int i;
2081 2642
2082 errno = data->errorno; 2643 errno = data->errorno;
2083 PL_laststype = data->laststype; 2644 PL_laststype = data->laststype;
2084 PL_laststatval = data->laststatval; 2645 PL_laststatval = data->laststatval;
2085 PL_statcache = data->statcache; 2646 PL_statcache = data->statcache;
2647
2648 EXTEND (SP, AvFILLp (av));
2649 for (i = 0; i < AvFILLp (av); ++i)
2650 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2086} 2651}
2087 2652
2088 2653
2089MODULE = Coro::State PACKAGE = Coro::AnyEvent 2654MODULE = Coro::State PACKAGE = Coro::AnyEvent
2090 2655
2091BOOT: 2656BOOT:
2092 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE); 2657 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2093 2658
2094SV * 2659void
2095_schedule (...) 2660_schedule (...)
2096 PROTOTYPE: @
2097 CODE: 2661 CODE:
2098{ 2662{
2099 static int incede; 2663 static int incede;
2100 2664
2101 api_cede_notself (); 2665 api_cede_notself (aTHX);
2102 2666
2103 ++incede; 2667 ++incede;
2104 while (coro_nready >= incede && api_cede ()) 2668 while (coro_nready >= incede && api_cede (aTHX))
2105 ; 2669 ;
2106 2670
2107 sv_setsv (sv_activity, &PL_sv_undef); 2671 sv_setsv (sv_activity, &PL_sv_undef);
2108 if (coro_nready >= incede) 2672 if (coro_nready >= incede)
2109 { 2673 {
… …
2114 } 2678 }
2115 2679
2116 --incede; 2680 --incede;
2117} 2681}
2118 2682
2683
2684MODULE = Coro::State PACKAGE = PerlIO::cede
2685
2686BOOT:
2687 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2688
2689MODULE = Coro::State PACKAGE = Coro::Semaphore
2690
2691SV *
2692new (SV *klass, SV *count_ = 0)
2693 CODE:
2694{
2695 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2696 AV *av = newAV ();
2697 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1));
2698 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2699}
2700 OUTPUT:
2701 RETVAL
2702
2703SV *
2704count (SV *self)
2705 CODE:
2706 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
2707 OUTPUT:
2708 RETVAL
2709
2710void
2711up (SV *self, int adjust = 1)
2712 ALIAS:
2713 adjust = 1
2714 CODE:
2715 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2716
2717void
2718down (SV *self)
2719 CODE:
2720 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2721
2722void
2723try (SV *self)
2724 PPCODE:
2725{
2726 AV *av = (AV *)SvRV (self);
2727 SV *count_sv = AvARRAY (av)[0];
2728 IV count = SvIVX (count_sv);
2729
2730 if (count > 0)
2731 {
2732 --count;
2733 SvIVX (count_sv) = count;
2734 XSRETURN_YES;
2735 }
2736 else
2737 XSRETURN_NO;
2738}
2739
2740void
2741waiters (SV *self)
2742 CODE:
2743{
2744 AV *av = (AV *)SvRV (self);
2745
2746 if (GIMME_V == G_SCALAR)
2747 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0])));
2748 else
2749 {
2750 int i;
2751 EXTEND (SP, AvFILLp (av) + 1 - 1);
2752 for (i = 1; i <= AvFILLp (av); ++i)
2753 PUSHs (newSVsv (AvARRAY (av)[i]));
2754 }
2755}
2756

Diff Legend

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