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

Diff Legend

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