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.240 by root, Sun Jun 29 00:28:17 2008 UTC vs.
Revision 1.281 by root, Sun Nov 16 10:12:38 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
… …
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);
688static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg); 726static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
689 727
690/* apparently < 5.8.8 */ 728/* apparently < 5.8.8 */
691#undef MgPV_nolen_const
692#ifndef MgPV_nolen_const 729#ifndef MgPV_nolen_const
693#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 730#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
694 SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \ 731 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
695 (const char*)(mg)->mg_ptr) 732 (const char*)(mg)->mg_ptr)
696#endif 733#endif
697 734
698/* 735/*
699 * This overrides the default magic get method of %SIG elements. 736 * This overrides the default magic get method of %SIG elements.
… …
773 810
774 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 811 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
775} 812}
776 813
777static void 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;
825}
826
827static void
778coro_setup (pTHX_ struct coro *coro) 828coro_setup (pTHX_ struct coro *coro)
779{ 829{
780 /* 830 /*
781 * emulate part of the perl startup here. 831 * emulate part of the perl startup here.
782 */ 832 */
… …
802 GvSV (PL_defgv) = newSV (0); 852 GvSV (PL_defgv) = newSV (0);
803 GvAV (PL_defgv) = coro->args; coro->args = 0; 853 GvAV (PL_defgv) = coro->args; coro->args = 0;
804 GvSV (PL_errgv) = newSV (0); 854 GvSV (PL_errgv) = newSV (0);
805 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);
806 PL_rs = newSVsv (GvSV (irsgv)); 856 PL_rs = newSVsv (GvSV (irsgv));
807 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
808 858
809 { 859 {
810 dSP; 860 dSP;
811 LOGOP myop; 861 UNOP myop;
812 862
813 Zero (&myop, 1, LOGOP); 863 Zero (&myop, 1, UNOP);
814 myop.op_next = Nullop; 864 myop.op_next = Nullop;
815 myop.op_flags = OPf_WANT_VOID; 865 myop.op_flags = OPf_WANT_VOID;
816 866
817 PUSHMARK (SP); 867 PUSHMARK (SP);
818 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
821 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
822 SPAGAIN; 872 SPAGAIN;
823 } 873 }
824 874
825 /* 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
826 * 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.
827 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
828 * so we ENTER here for symmetry
829 */ 877 */
830 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 */
831} 880}
832 881
833static void 882static void
834coro_destroy (pTHX_ struct coro *coro) 883coro_destruct (pTHX_ struct coro *coro)
835{ 884{
836 if (!IN_DESTRUCT) 885 if (!IN_DESTRUCT)
837 { 886 {
838 /* restore all saved variables and stuff */ 887 /* restore all saved variables and stuff */
839 LEAVE_SCOPE (0); 888 LEAVE_SCOPE (0);
… …
861 SvREFCNT_dec (PL_warnhook); 910 SvREFCNT_dec (PL_warnhook);
862 911
863 SvREFCNT_dec (coro->saved_deffh); 912 SvREFCNT_dec (coro->saved_deffh);
864 SvREFCNT_dec (coro->throw); 913 SvREFCNT_dec (coro->throw);
865 914
866 coro_destroy_stacks (aTHX); 915 coro_destruct_stacks (aTHX);
867} 916}
868 917
869static void 918INLINE void
870free_coro_mortal (pTHX) 919free_coro_mortal (pTHX)
871{ 920{
872 if (expect_true (coro_mortal)) 921 if (expect_true (coro_mortal))
873 { 922 {
874 SvREFCNT_dec (coro_mortal); 923 SvREFCNT_dec (coro_mortal);
… …
879static int 928static int
880runops_trace (pTHX) 929runops_trace (pTHX)
881{ 930{
882 COP *oldcop = 0; 931 COP *oldcop = 0;
883 int oldcxix = -2; 932 int oldcxix = -2;
884 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 */
885 coro_cctx *cctx = coro->cctx; 934 coro_cctx *cctx = coro->cctx;
886 935
887 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 936 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
888 { 937 {
889 PERL_ASYNC_CHECK (); 938 PERL_ASYNC_CHECK ();
… …
908 : cx->blk_gimme == G_SCALAR ? bot + 1 957 : cx->blk_gimme == G_SCALAR ? bot + 1
909 : bot; 958 : bot;
910 959
911 av_extend (av, top - bot); 960 av_extend (av, top - bot);
912 while (bot < top) 961 while (bot < top)
913 av_push (av, SvREFCNT_inc (*bot++)); 962 av_push (av, SvREFCNT_inc_NN (*bot++));
914 963
915 PL_runops = RUNOPS_DEFAULT; 964 PL_runops = RUNOPS_DEFAULT;
916 ENTER; 965 ENTER;
917 SAVETMPS; 966 SAVETMPS;
918 EXTEND (SP, 3); 967 EXTEND (SP, 3);
… …
998 1047
999 TAINT_NOT; 1048 TAINT_NOT;
1000 return 0; 1049 return 0;
1001} 1050}
1002 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
1003/* 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 */
1004/* _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 */
1005/* during execution of a perl program */ 1061/* during execution of a perl program */
1062/* also initialises PL_top_env */
1006static void NOINLINE 1063static void NOINLINE
1007cctx_prepare (pTHX_ coro_cctx *cctx) 1064cctx_prepare (pTHX_ coro_cctx *cctx)
1008{ 1065{
1009 dSP; 1066 dSP;
1010 LOGOP myop; 1067 UNOP myop;
1011 1068
1012 PL_top_env = &PL_start_env; 1069 PL_top_env = &PL_start_env;
1013 1070
1014 if (cctx->flags & CC_TRACE) 1071 if (cctx->flags & CC_TRACE)
1015 PL_runops = runops_trace; 1072 PL_runops = runops_trace;
1016 1073
1017 Zero (&myop, 1, LOGOP); 1074 Zero (&myop, 1, UNOP);
1018 myop.op_next = PL_op; 1075 myop.op_next = PL_op;
1019 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1076 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1020 1077
1021 PUSHMARK (SP); 1078 PUSHMARK (SP);
1022 EXTEND (SP, 2); 1079 EXTEND (SP, 2);
1023 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1080 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1024 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1081 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1025 PUTBACK; 1082 PUTBACK;
1026 PL_op = (OP *)&myop; 1083 PL_op = (OP *)&myop;
1027 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1084 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1028 SPAGAIN; 1085 SPAGAIN;
1029} 1086}
1030 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
1031/* 1108/*
1032 * this is a _very_ stripped down perl interpreter ;) 1109 * this is a _very_ stripped down perl interpreter ;)
1033 */ 1110 */
1034static void 1111static void
1035cctx_run (void *arg) 1112cctx_run (void *arg)
1036{ 1113{
1114#ifdef USE_ITHREADS
1115# if CORO_PTHREAD
1116 PERL_SET_CONTEXT (coro_thx);
1117# endif
1118#endif
1119 {
1037 dTHX; 1120 dTHX;
1038 1121
1039 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1122 /* normally we would need to skip the entersub here */
1040 UNLOCK; 1123 /* not doing so will re-execute it, which is exactly what we want */
1041
1042 /* we now skip the entersub that lead to transfer() */
1043 PL_op = PL_op->op_next; 1124 /* PL_nop = PL_nop->op_next */
1044 1125
1045 /* inject a fake subroutine call to cctx_init */ 1126 /* inject a fake subroutine call to cctx_init */
1046 cctx_prepare (aTHX_ (coro_cctx *)arg); 1127 cctx_prepare (aTHX_ (coro_cctx *)arg);
1047 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
1048 /* 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 */
1049 PL_restartop = PL_op; 1134 PL_restartop = PL_op;
1050 perl_run (PL_curinterp); 1135 perl_run (PL_curinterp);
1051 1136
1052 /* 1137 /*
1053 * 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
1054 * 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)
1055 * 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
1056 * bootstrap-time "top" top_env, as we cannot restore the "main" 1141 * bootstrap-time "top" top_env, as we cannot restore the "main"
1057 * coroutine as Coro has no such concept 1142 * coroutine as Coro has no such concept
1058 */ 1143 */
1059 PL_top_env = main_top_env; 1144 PL_top_env = main_top_env;
1060 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 }
1061} 1147}
1062 1148
1063static coro_cctx * 1149static coro_cctx *
1064cctx_new () 1150cctx_new ()
1065{ 1151{
1066 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 ();
1067 void *stack_start; 1181 void *stack_start;
1068 size_t stack_size; 1182 size_t stack_size;
1069 1183
1070 ++cctx_count;
1071
1072 Newz (0, cctx, 1, coro_cctx);
1073
1074#if HAVE_MMAP 1184#if HAVE_MMAP
1075 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;
1076 /* mmap supposedly does allocate-on-write for us */ 1186 /* mmap supposedly does allocate-on-write for us */
1077 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);
1078 1188
1079 if (cctx->sptr != (void *)-1) 1189 if (cctx->sptr != (void *)-1)
1080 { 1190 {
1081# if CORO_STACKGUARD 1191 #if CORO_STACKGUARD
1082 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1192 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1083# endif 1193 #endif
1084 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1194 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1085 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1195 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1086 cctx->flags |= CC_MAPPED; 1196 cctx->flags |= CC_MAPPED;
1087 } 1197 }
1088 else 1198 else
1089#endif 1199#endif
1090 { 1200 {
1091 cctx->ssize = coro_stacksize * (long)sizeof (long); 1201 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1092 New (0, cctx->sptr, coro_stacksize, long); 1202 New (0, cctx->sptr, cctx_stacksize, long);
1093 1203
1094 if (!cctx->sptr) 1204 if (!cctx->sptr)
1095 { 1205 {
1096 perror ("FATAL: unable to allocate stack for coroutine"); 1206 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1097 _exit (EXIT_FAILURE); 1207 _exit (EXIT_FAILURE);
1098 } 1208 }
1099 1209
1100 stack_start = cctx->sptr; 1210 stack_start = cctx->sptr;
1101 stack_size = cctx->ssize; 1211 stack_size = cctx->ssize;
1102 } 1212 }
1103 1213
1104 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
1105 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);
1106 1219
1107 return cctx; 1220 return cctx;
1108} 1221}
1109 1222
… …
1112{ 1225{
1113 if (!cctx) 1226 if (!cctx)
1114 return; 1227 return;
1115 1228
1116 --cctx_count; 1229 --cctx_count;
1230 coro_destroy (&cctx->cctx);
1117 1231
1232 /* coro_transfer creates new, empty cctx's */
1233 if (cctx->sptr)
1234 {
1118#if CORO_USE_VALGRIND 1235 #if CORO_USE_VALGRIND
1119 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1236 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1120#endif 1237 #endif
1121 1238
1122#if HAVE_MMAP 1239#if HAVE_MMAP
1123 if (cctx->flags & CC_MAPPED) 1240 if (cctx->flags & CC_MAPPED)
1124 munmap (cctx->sptr, cctx->ssize); 1241 munmap (cctx->sptr, cctx->ssize);
1125 else 1242 else
1126#endif 1243#endif
1127 Safefree (cctx->sptr); 1244 Safefree (cctx->sptr);
1245 }
1128 1246
1129 Safefree (cctx); 1247 Safefree (cctx);
1130} 1248}
1131 1249
1132/* wether this cctx should be destructed */ 1250/* wether this cctx should be destructed */
1133#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))
1134 1252
1135static coro_cctx * 1253static coro_cctx *
1136cctx_get (pTHX) 1254cctx_get (pTHX)
1137{ 1255{
1138 while (expect_true (cctx_first)) 1256 while (expect_true (cctx_first))
… …
1145 return cctx; 1263 return cctx;
1146 1264
1147 cctx_destroy (cctx); 1265 cctx_destroy (cctx);
1148 } 1266 }
1149 1267
1150 return cctx_new (); 1268 return cctx_new_run ();
1151} 1269}
1152 1270
1153static void 1271static void
1154cctx_put (coro_cctx *cctx) 1272cctx_put (coro_cctx *cctx)
1155{ 1273{
1274 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1275
1156 /* free another cctx if overlimit */ 1276 /* free another cctx if overlimit */
1157 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1277 if (expect_false (cctx_idle >= cctx_max_idle))
1158 { 1278 {
1159 coro_cctx *first = cctx_first; 1279 coro_cctx *first = cctx_first;
1160 cctx_first = first->next; 1280 cctx_first = first->next;
1161 --cctx_idle; 1281 --cctx_idle;
1162 1282
… …
1174transfer_check (pTHX_ struct coro *prev, struct coro *next) 1294transfer_check (pTHX_ struct coro *prev, struct coro *next)
1175{ 1295{
1176 if (expect_true (prev != next)) 1296 if (expect_true (prev != next))
1177 { 1297 {
1178 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1298 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1179 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,");
1180 1300
1181 if (expect_false (next->flags & CF_RUNNING)) 1301 if (expect_false (next->flags & CF_RUNNING))
1182 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,");
1183 1303
1184 if (expect_false (next->flags & CF_DESTROYED)) 1304 if (expect_false (next->flags & CF_DESTROYED))
1185 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,");
1186 1306
1187#if !PERL_VERSION_ATLEAST (5,10,0) 1307#if !PERL_VERSION_ATLEAST (5,10,0)
1188 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1308 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1189 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,");
1190#endif 1310#endif
1191 } 1311 }
1192} 1312}
1193 1313
1194/* always use the TRANSFER macro */ 1314/* always use the TRANSFER macro */
1195static void NOINLINE 1315static void NOINLINE
1196transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1316transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1197{ 1317{
1198 dSTACKLEVEL; 1318 dSTACKLEVEL;
1199 static volatile int has_throw;
1200 1319
1201 /* sometimes transfer is only called to set idle_sp */ 1320 /* sometimes transfer is only called to set idle_sp */
1202 if (expect_false (!next)) 1321 if (expect_false (!next))
1203 { 1322 {
1204 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1323 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel;
1205 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 */
1206 } 1325 }
1207 else if (expect_true (prev != next)) 1326 else if (expect_true (prev != next))
1208 { 1327 {
1209 coro_cctx *prev__cctx; 1328 coro_cctx *prev__cctx;
1210 1329
1211 if (expect_false (prev->flags & CF_NEW)) 1330 if (expect_false (prev->flags & CF_NEW))
1212 { 1331 {
1213 /* create a new empty context */ 1332 /* create a new empty/source context */
1214 Newz (0, prev->cctx, 1, coro_cctx); 1333 prev->cctx = cctx_new_empty ();
1215 prev->flags &= ~CF_NEW; 1334 prev->flags &= ~CF_NEW;
1216 prev->flags |= CF_RUNNING; 1335 prev->flags |= CF_RUNNING;
1217 } 1336 }
1218 1337
1219 prev->flags &= ~CF_RUNNING; 1338 prev->flags &= ~CF_RUNNING;
1220 next->flags |= CF_RUNNING; 1339 next->flags |= CF_RUNNING;
1221
1222 LOCK;
1223 1340
1224 /* first get rid of the old state */ 1341 /* first get rid of the old state */
1225 save_perl (aTHX_ prev); 1342 save_perl (aTHX_ prev);
1226 1343
1227 if (expect_false (next->flags & CF_NEW)) 1344 if (expect_false (next->flags & CF_NEW))
… …
1234 else 1351 else
1235 load_perl (aTHX_ next); 1352 load_perl (aTHX_ next);
1236 1353
1237 prev__cctx = prev->cctx; 1354 prev__cctx = prev->cctx;
1238 1355
1239 /* possibly "free" the cctx */ 1356 /* possibly untie and reuse the cctx */
1240 if (expect_true ( 1357 if (expect_true (
1241 prev__cctx->idle_sp == STACKLEVEL 1358 prev__cctx->idle_sp == (void *)stacklevel
1242 && !(prev__cctx->flags & CC_TRACE) 1359 && !(prev__cctx->flags & CC_TRACE)
1243 && !force_cctx 1360 && !force_cctx
1244 )) 1361 ))
1245 { 1362 {
1246 /* 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 */
1247 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));
1248 1365
1249 prev->cctx = 0; 1366 prev->cctx = 0;
1250 1367
1251 /* 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 */
1252 /* 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 */
… …
1260 ++next->usecount; 1377 ++next->usecount;
1261 1378
1262 if (expect_true (!next->cctx)) 1379 if (expect_true (!next->cctx))
1263 next->cctx = cctx_get (aTHX); 1380 next->cctx = cctx_get (aTHX);
1264 1381
1265 has_throw = !!next->throw; 1382 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1383 transfer_next = next;
1266 1384
1267 if (expect_false (prev__cctx != next->cctx)) 1385 if (expect_false (prev__cctx != next->cctx))
1268 { 1386 {
1269 prev__cctx->top_env = PL_top_env; 1387 prev__cctx->top_env = PL_top_env;
1270 PL_top_env = next->cctx->top_env; 1388 PL_top_env = next->cctx->top_env;
1271 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1272 } 1390 }
1273 1391
1274 free_coro_mortal (aTHX); 1392 transfer_tail (aTHX);
1275 UNLOCK;
1276
1277 if (expect_false (has_throw))
1278 {
1279 struct coro *coro = SvSTATE (coro_current);
1280
1281 if (coro->throw)
1282 {
1283 SV *exception = coro->throw;
1284 coro->throw = 0;
1285 sv_setsv (ERRSV, exception);
1286 croak (0);
1287 }
1288 }
1289 } 1393 }
1290} 1394}
1291
1292struct transfer_args
1293{
1294 struct coro *prev, *next;
1295};
1296 1395
1297#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))
1298#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1397#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1299 1398
1300/** high level stuff ********************************************************/ 1399/** high level stuff ********************************************************/
… …
1302static int 1401static int
1303coro_state_destroy (pTHX_ struct coro *coro) 1402coro_state_destroy (pTHX_ struct coro *coro)
1304{ 1403{
1305 if (coro->flags & CF_DESTROYED) 1404 if (coro->flags & CF_DESTROYED)
1306 return 0; 1405 return 0;
1406
1407 if (coro->on_destroy)
1408 coro->on_destroy (aTHX_ coro);
1307 1409
1308 coro->flags |= CF_DESTROYED; 1410 coro->flags |= CF_DESTROYED;
1309 1411
1310 if (coro->flags & CF_READY) 1412 if (coro->flags & CF_READY)
1311 { 1413 {
1312 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1414 /* reduce nready, as destroying a ready coro effectively unreadies it */
1313 /* alternative: look through all ready queues and remove the coro */ 1415 /* alternative: look through all ready queues and remove the coro */
1314 LOCK;
1315 --coro_nready; 1416 --coro_nready;
1316 UNLOCK;
1317 } 1417 }
1318 else 1418 else
1319 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 */
1320 1420
1321 if (coro->mainstack && coro->mainstack != main_mainstack) 1421 if (coro->mainstack && coro->mainstack != main_mainstack)
1322 { 1422 {
1323 struct coro temp; 1423 struct coro temp;
1324 1424
1325 if (coro->flags & CF_RUNNING) 1425 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1326 croak ("FATAL: tried to destroy currently running coroutine");
1327 1426
1328 save_perl (aTHX_ &temp); 1427 save_perl (aTHX_ &temp);
1329 load_perl (aTHX_ coro); 1428 load_perl (aTHX_ coro);
1330 1429
1331 coro_destroy (aTHX_ coro); 1430 coro_destruct (aTHX_ coro);
1332 1431
1333 load_perl (aTHX_ &temp); 1432 load_perl (aTHX_ &temp);
1334 1433
1335 coro->slot = 0; 1434 coro->slot = 0;
1336 } 1435 }
… …
1382# define MGf_DUP 0 1481# define MGf_DUP 0
1383#endif 1482#endif
1384}; 1483};
1385 1484
1386static void 1485static void
1387prepare_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)
1388{ 1487{
1389 ta->prev = SvSTATE (prev_sv); 1488 ta->prev = SvSTATE (prev_sv);
1390 ta->next = SvSTATE (next_sv); 1489 ta->next = SvSTATE (next_sv);
1391 TRANSFER_CHECK (*ta); 1490 TRANSFER_CHECK (*ta);
1392} 1491}
1393 1492
1394static void 1493static void
1395api_transfer (SV *prev_sv, SV *next_sv) 1494api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1396{ 1495{
1397 dTHX;
1398 struct transfer_args ta; 1496 struct coro_transfer_args ta;
1399 1497
1400 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1498 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1401 TRANSFER (ta, 1); 1499 TRANSFER (ta, 1);
1402} 1500}
1403 1501
1404/** Coro ********************************************************************/ 1502/** Coro ********************************************************************/
1405 1503
1406static void 1504INLINE void
1407coro_enq (pTHX_ SV *coro_sv) 1505coro_enq (pTHX_ struct coro *coro)
1408{ 1506{
1409 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));
1410} 1508}
1411 1509
1412static SV * 1510INLINE SV *
1413coro_deq (pTHX) 1511coro_deq (pTHX)
1414{ 1512{
1415 int prio; 1513 int prio;
1416 1514
1417 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
… …
1420 1518
1421 return 0; 1519 return 0;
1422} 1520}
1423 1521
1424static int 1522static int
1425api_ready (SV *coro_sv) 1523api_ready (pTHX_ SV *coro_sv)
1426{ 1524{
1427 dTHX;
1428 struct coro *coro; 1525 struct coro *coro;
1429 SV *sv_hook; 1526 SV *sv_hook;
1430 void (*xs_hook)(void); 1527 void (*xs_hook)(void);
1431 1528
1432 if (SvROK (coro_sv)) 1529 if (SvROK (coro_sv))
… …
1437 if (coro->flags & CF_READY) 1534 if (coro->flags & CF_READY)
1438 return 0; 1535 return 0;
1439 1536
1440 coro->flags |= CF_READY; 1537 coro->flags |= CF_READY;
1441 1538
1442 LOCK;
1443
1444 sv_hook = coro_nready ? 0 : coro_readyhook; 1539 sv_hook = coro_nready ? 0 : coro_readyhook;
1445 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1540 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1446 1541
1447 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1542 coro_enq (aTHX_ coro);
1448 ++coro_nready; 1543 ++coro_nready;
1449 1544
1450 UNLOCK;
1451
1452 if (sv_hook) 1545 if (sv_hook)
1453 { 1546 {
1454 dSP; 1547 dSP;
1455 1548
1456 ENTER; 1549 ENTER;
… …
1470 1563
1471 return 1; 1564 return 1;
1472} 1565}
1473 1566
1474static int 1567static int
1475api_is_ready (SV *coro_sv) 1568api_is_ready (pTHX_ SV *coro_sv)
1476{ 1569{
1477 dTHX;
1478 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1570 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1479} 1571}
1480 1572
1481static void 1573INLINE void
1482prepare_schedule (pTHX_ struct transfer_args *ta) 1574prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1483{ 1575{
1484 SV *prev_sv, *next_sv; 1576 SV *prev_sv, *next_sv;
1485 1577
1486 for (;;) 1578 for (;;)
1487 { 1579 {
1488 LOCK;
1489 next_sv = coro_deq (aTHX); 1580 next_sv = coro_deq (aTHX);
1490 1581
1491 /* nothing to schedule: call the idle handler */ 1582 /* nothing to schedule: call the idle handler */
1492 if (expect_false (!next_sv)) 1583 if (expect_false (!next_sv))
1493 { 1584 {
1494 dSP; 1585 dSP;
1495 UNLOCK;
1496 1586
1497 ENTER; 1587 ENTER;
1498 SAVETMPS; 1588 SAVETMPS;
1499 1589
1500 PUSHMARK (SP); 1590 PUSHMARK (SP);
… …
1505 FREETMPS; 1595 FREETMPS;
1506 LEAVE; 1596 LEAVE;
1507 continue; 1597 continue;
1508 } 1598 }
1509 1599
1510 ta->next = SvSTATE (next_sv); 1600 ta->next = SvSTATE_hv (next_sv);
1511 1601
1512 /* cannot transfer to destroyed coros, skip and look for next */ 1602 /* cannot transfer to destroyed coros, skip and look for next */
1513 if (expect_false (ta->next->flags & CF_DESTROYED)) 1603 if (expect_false (ta->next->flags & CF_DESTROYED))
1514 { 1604 {
1515 UNLOCK;
1516 SvREFCNT_dec (next_sv); 1605 SvREFCNT_dec (next_sv);
1517 /* coro_nready is already taken care of by destroy */ 1606 /* coro_nready has already been taken care of by destroy */
1518 continue; 1607 continue;
1519 } 1608 }
1520 1609
1521 --coro_nready; 1610 --coro_nready;
1522 UNLOCK;
1523 break; 1611 break;
1524 } 1612 }
1525 1613
1526 /* free this only after the transfer */ 1614 /* free this only after the transfer */
1527 prev_sv = SvRV (coro_current); 1615 prev_sv = SvRV (coro_current);
1528 ta->prev = SvSTATE (prev_sv); 1616 ta->prev = SvSTATE_hv (prev_sv);
1529 TRANSFER_CHECK (*ta); 1617 TRANSFER_CHECK (*ta);
1530 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));
1531 ta->next->flags &= ~CF_READY; 1619 ta->next->flags &= ~CF_READY;
1532 SvRV_set (coro_current, next_sv); 1620 SvRV_set (coro_current, next_sv);
1533 1621
1534 LOCK;
1535 free_coro_mortal (aTHX); 1622 free_coro_mortal (aTHX);
1536 coro_mortal = prev_sv; 1623 coro_mortal = prev_sv;
1537 UNLOCK;
1538} 1624}
1539 1625
1540static void 1626INLINE void
1541prepare_cede (pTHX_ struct transfer_args *ta) 1627prepare_cede (pTHX_ struct coro_transfer_args *ta)
1542{ 1628{
1543 api_ready (coro_current); 1629 api_ready (aTHX_ coro_current);
1544 prepare_schedule (aTHX_ ta); 1630 prepare_schedule (aTHX_ ta);
1545} 1631}
1546 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
1547static int 1656static int
1548prepare_cede_notself (pTHX_ struct transfer_args *ta) 1657api_cede (pTHX)
1549{ 1658{
1550 if (coro_nready) 1659 struct coro_transfer_args ta;
1551 { 1660
1552 SV *prev = SvRV (coro_current);
1553 prepare_schedule (aTHX_ ta); 1661 prepare_cede (aTHX_ &ta);
1554 api_ready (prev); 1662
1663 if (expect_true (ta.prev != ta.next))
1664 {
1665 TRANSFER (ta, 1);
1555 return 1; 1666 return 1;
1556 } 1667 }
1557 else 1668 else
1558 return 0; 1669 return 0;
1559} 1670}
1560 1671
1561static void
1562api_schedule (void)
1563{
1564 dTHX;
1565 struct transfer_args ta;
1566
1567 prepare_schedule (aTHX_ &ta);
1568 TRANSFER (ta, 1);
1569}
1570
1571static int 1672static int
1572api_cede (void) 1673api_cede_notself (pTHX)
1573{ 1674{
1574 dTHX; 1675 if (coro_nready)
1676 {
1575 struct transfer_args ta; 1677 struct coro_transfer_args ta;
1576 1678
1577 prepare_cede (aTHX_ &ta); 1679 prepare_cede_notself (aTHX_ &ta);
1578
1579 if (expect_true (ta.prev != ta.next))
1580 {
1581 TRANSFER (ta, 1); 1680 TRANSFER (ta, 1);
1582 return 1; 1681 return 1;
1583 } 1682 }
1584 else 1683 else
1585 return 0; 1684 return 0;
1586} 1685}
1587 1686
1588static int 1687static void
1589api_cede_notself (void)
1590{
1591 dTHX;
1592 struct transfer_args ta;
1593
1594 if (prepare_cede_notself (aTHX_ &ta))
1595 {
1596 TRANSFER (ta, 1);
1597 return 1;
1598 }
1599 else
1600 return 0;
1601}
1602
1603static void
1604api_trace (SV *coro_sv, int flags) 1688api_trace (pTHX_ SV *coro_sv, int flags)
1605{ 1689{
1606 dTHX;
1607 struct coro *coro = SvSTATE (coro_sv); 1690 struct coro *coro = SvSTATE (coro_sv);
1608 1691
1609 if (flags & CC_TRACE) 1692 if (flags & CC_TRACE)
1610 { 1693 {
1611 if (!coro->cctx) 1694 if (!coro->cctx)
1612 coro->cctx = cctx_new (); 1695 coro->cctx = cctx_new_run ();
1613 else if (!(coro->cctx->flags & CC_TRACE)) 1696 else if (!(coro->cctx->flags & CC_TRACE))
1614 croak ("cannot enable tracing on coroutine with custom stack"); 1697 croak ("cannot enable tracing on coroutine with custom stack,");
1615 1698
1616 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1699 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1617 } 1700 }
1618 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1701 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1619 { 1702 {
… …
1624 else 1707 else
1625 coro->slot->runops = RUNOPS_DEFAULT; 1708 coro->slot->runops = RUNOPS_DEFAULT;
1626 } 1709 }
1627} 1710}
1628 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, int 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 possible */
2001 while (count > 0 && AvFILLp (av) >= count)
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 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 }
2066 else
2067 {
2068 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2069
2070 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2071 frame->prepare = prepare_schedule;
2072
2073 /* to avoid race conditions when a woken-up coro gets terminated */
2074 /* we arrange for a temporary on_destroy that calls adjust (0) */
2075 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2076 }
2077
2078 frame->check = slf_check_semaphore_down;
2079
2080}
2081
2082/*****************************************************************************/
2083
2084#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2085
2086/* create a closure from XS, returns a code reference */
2087/* the arg can be accessed via GENSUB_ARG from the callback */
2088/* the callback must use dXSARGS/XSRETURN */
2089static SV *
2090gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2091{
2092 CV *cv = (CV *)NEWSV (0, 0);
2093
2094 sv_upgrade ((SV *)cv, SVt_PVCV);
2095
2096 CvANON_on (cv);
2097 CvISXSUB_on (cv);
2098 CvXSUB (cv) = xsub;
2099 GENSUB_ARG = arg;
2100
2101 return newRV_noinc ((SV *)cv);
2102}
2103
2104/*****************************************************************************/
2105
1629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1630 2107
1631PROTOTYPES: DISABLE 2108PROTOTYPES: DISABLE
1632 2109
1633BOOT: 2110BOOT:
1634{ 2111{
1635#ifdef USE_ITHREADS 2112#ifdef USE_ITHREADS
1636 MUTEX_INIT (&coro_mutex); 2113# if CORO_PTHREAD
2114 coro_thx = PERL_GET_CONTEXT;
2115# endif
1637#endif 2116#endif
1638 BOOT_PAGESIZE; 2117 BOOT_PAGESIZE;
1639 2118
1640 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2119 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1641 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2120 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
1659 main_top_env = PL_top_env; 2138 main_top_env = PL_top_env;
1660 2139
1661 while (main_top_env->je_prev) 2140 while (main_top_env->je_prev)
1662 main_top_env = main_top_env->je_prev; 2141 main_top_env = main_top_env->je_prev;
1663 2142
2143 {
2144 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2145
2146 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2147 hv_store_ent (PL_custom_op_names, slf,
2148 newSVpv ("coro_slf", 0), 0);
2149
2150 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2151 hv_store_ent (PL_custom_op_descs, slf,
2152 newSVpv ("coro schedule like function", 0), 0);
2153 }
2154
1664 coroapi.ver = CORO_API_VERSION; 2155 coroapi.ver = CORO_API_VERSION;
1665 coroapi.rev = CORO_API_REVISION; 2156 coroapi.rev = CORO_API_REVISION;
2157
1666 coroapi.transfer = api_transfer; 2158 coroapi.transfer = api_transfer;
2159
2160 coroapi.sv_state = SvSTATE_;
2161 coroapi.execute_slf = api_execute_slf;
2162 coroapi.prepare_nop = prepare_nop;
2163 coroapi.prepare_schedule = prepare_schedule;
2164 coroapi.prepare_cede = prepare_cede;
2165 coroapi.prepare_cede_notself = prepare_cede_notself;
2166
2167 {
2168 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2169
2170 if (!svp) croak ("Time::HiRes is required");
2171 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2172
2173 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2174 }
1667 2175
1668 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2176 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1669} 2177}
1670 2178
1671SV * 2179SV *
… …
1695 av_push (coro->args, newSVsv (ST (i))); 2203 av_push (coro->args, newSVsv (ST (i)));
1696} 2204}
1697 OUTPUT: 2205 OUTPUT:
1698 RETVAL 2206 RETVAL
1699 2207
1700# these not obviously related functions are all rolled into the same xs
1701# function to increase chances that they all will call transfer with the same
1702# stack offset
1703void 2208void
1704_set_stacklevel (...) 2209_set_stacklevel (...)
1705 ALIAS: 2210 CODE:
1706 Coro::State::transfer = 1 2211 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1707 Coro::schedule = 2
1708 Coro::cede = 3
1709 Coro::cede_notself = 4
1710 CODE:
1711{
1712 struct transfer_args ta;
1713 2212
1714 PUTBACK; 2213void
1715 switch (ix) 2214transfer (...)
1716 { 2215 PROTOTYPE: $$
1717 case 0: 2216 CODE:
1718 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2217 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1719 ta.next = 0;
1720 break;
1721
1722 case 1:
1723 if (items != 2)
1724 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1725
1726 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1727 break;
1728
1729 case 2:
1730 prepare_schedule (aTHX_ &ta);
1731 break;
1732
1733 case 3:
1734 prepare_cede (aTHX_ &ta);
1735 break;
1736
1737 case 4:
1738 if (!prepare_cede_notself (aTHX_ &ta))
1739 XSRETURN_EMPTY;
1740
1741 break;
1742 }
1743 SPAGAIN;
1744
1745 BARRIER;
1746 PUTBACK;
1747 TRANSFER (ta, 0);
1748 SPAGAIN; /* might be the sp of a different coroutine now */
1749 /* be extra careful not to ever do anything after TRANSFER */
1750}
1751 2218
1752bool 2219bool
1753_destroy (SV *coro_sv) 2220_destroy (SV *coro_sv)
1754 CODE: 2221 CODE:
1755 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2222 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
… …
1762 CODE: 2229 CODE:
1763 _exit (code); 2230 _exit (code);
1764 2231
1765int 2232int
1766cctx_stacksize (int new_stacksize = 0) 2233cctx_stacksize (int new_stacksize = 0)
2234 PROTOTYPE: ;$
1767 CODE: 2235 CODE:
1768 RETVAL = coro_stacksize; 2236 RETVAL = cctx_stacksize;
1769 if (new_stacksize) 2237 if (new_stacksize)
2238 {
1770 coro_stacksize = new_stacksize; 2239 cctx_stacksize = new_stacksize;
2240 ++cctx_gen;
2241 }
1771 OUTPUT: 2242 OUTPUT:
1772 RETVAL 2243 RETVAL
1773 2244
1774int 2245int
2246cctx_max_idle (int max_idle = 0)
2247 PROTOTYPE: ;$
2248 CODE:
2249 RETVAL = cctx_max_idle;
2250 if (max_idle > 1)
2251 cctx_max_idle = max_idle;
2252 OUTPUT:
2253 RETVAL
2254
2255int
1775cctx_count () 2256cctx_count ()
2257 PROTOTYPE:
1776 CODE: 2258 CODE:
1777 RETVAL = cctx_count; 2259 RETVAL = cctx_count;
1778 OUTPUT: 2260 OUTPUT:
1779 RETVAL 2261 RETVAL
1780 2262
1781int 2263int
1782cctx_idle () 2264cctx_idle ()
2265 PROTOTYPE:
1783 CODE: 2266 CODE:
1784 RETVAL = cctx_idle; 2267 RETVAL = cctx_idle;
1785 OUTPUT: 2268 OUTPUT:
1786 RETVAL 2269 RETVAL
1787 2270
1788void 2271void
1789list () 2272list ()
2273 PROTOTYPE:
1790 PPCODE: 2274 PPCODE:
1791{ 2275{
1792 struct coro *coro; 2276 struct coro *coro;
1793 for (coro = coro_first; coro; coro = coro->next) 2277 for (coro = coro_first; coro; coro = coro->next)
1794 if (coro->hv) 2278 if (coro->hv)
… …
1799call (Coro::State coro, SV *coderef) 2283call (Coro::State coro, SV *coderef)
1800 ALIAS: 2284 ALIAS:
1801 eval = 1 2285 eval = 1
1802 CODE: 2286 CODE:
1803{ 2287{
1804 if (coro->mainstack) 2288 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1805 { 2289 {
1806 struct coro temp; 2290 struct coro temp;
1807 2291
1808 if (!(coro->flags & CF_RUNNING)) 2292 if (!(coro->flags & CF_RUNNING))
1809 { 2293 {
… …
1853 RETVAL = boolSV (coro->flags & ix); 2337 RETVAL = boolSV (coro->flags & ix);
1854 OUTPUT: 2338 OUTPUT:
1855 RETVAL 2339 RETVAL
1856 2340
1857void 2341void
2342throw (Coro::State self, SV *throw = &PL_sv_undef)
2343 PROTOTYPE: $;$
2344 CODE:
2345 SvREFCNT_dec (self->throw);
2346 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2347
2348void
1858api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2349api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2350 PROTOTYPE: $;$
2351 C_ARGS: aTHX_ coro, flags
1859 2352
1860SV * 2353SV *
1861has_cctx (Coro::State coro) 2354has_cctx (Coro::State coro)
1862 PROTOTYPE: $ 2355 PROTOTYPE: $
1863 CODE: 2356 CODE:
… …
1871 CODE: 2364 CODE:
1872 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2365 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1873 OUTPUT: 2366 OUTPUT:
1874 RETVAL 2367 RETVAL
1875 2368
1876IV 2369UV
1877rss (Coro::State coro) 2370rss (Coro::State coro)
1878 PROTOTYPE: $ 2371 PROTOTYPE: $
1879 ALIAS: 2372 ALIAS:
1880 usecount = 1 2373 usecount = 1
1881 CODE: 2374 CODE:
… …
1887 OUTPUT: 2380 OUTPUT:
1888 RETVAL 2381 RETVAL
1889 2382
1890void 2383void
1891force_cctx () 2384force_cctx ()
2385 PROTOTYPE:
1892 CODE: 2386 CODE:
1893 struct coro *coro = SvSTATE (coro_current);
1894 coro->cctx->idle_sp = 0; 2387 SvSTATE_current->cctx->idle_sp = 0;
2388
2389void
2390swap_defsv (Coro::State self)
2391 PROTOTYPE: $
2392 ALIAS:
2393 swap_defav = 1
2394 CODE:
2395 if (!self->slot)
2396 croak ("cannot swap state with coroutine that has no saved state,");
2397 else
2398 {
2399 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2400 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2401
2402 SV *tmp = *src; *src = *dst; *dst = tmp;
2403 }
1895 2404
1896MODULE = Coro::State PACKAGE = Coro 2405MODULE = Coro::State PACKAGE = Coro
1897 2406
1898BOOT: 2407BOOT:
1899{ 2408{
… …
1917 2426
1918 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2427 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1919 coro_ready[i] = newAV (); 2428 coro_ready[i] = newAV ();
1920 2429
1921 { 2430 {
1922 SV *sv = perl_get_sv ("Coro::API", TRUE); 2431 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1923 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1924 2432
1925 coroapi.schedule = api_schedule; 2433 coroapi.schedule = api_schedule;
1926 coroapi.cede = api_cede; 2434 coroapi.cede = api_cede;
1927 coroapi.cede_notself = api_cede_notself; 2435 coroapi.cede_notself = api_cede_notself;
1928 coroapi.ready = api_ready; 2436 coroapi.ready = api_ready;
1929 coroapi.is_ready = api_is_ready; 2437 coroapi.is_ready = api_is_ready;
1930 coroapi.nready = &coro_nready; 2438 coroapi.nready = coro_nready;
1931 coroapi.current = coro_current; 2439 coroapi.current = coro_current;
1932 2440
1933 GCoroAPI = &coroapi; 2441 GCoroAPI = &coroapi;
1934 sv_setiv (sv, (IV)&coroapi); 2442 sv_setiv (sv, (IV)&coroapi);
1935 SvREADONLY_on (sv); 2443 SvREADONLY_on (sv);
1936 } 2444 }
1937} 2445}
2446
2447void
2448schedule (...)
2449 CODE:
2450 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), 0);
2451
2452void
2453cede (...)
2454 CODE:
2455 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), 0);
2456
2457void
2458cede_notself (...)
2459 CODE:
2460 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), 0);
1938 2461
1939void 2462void
1940_set_current (SV *current) 2463_set_current (SV *current)
1941 PROTOTYPE: $ 2464 PROTOTYPE: $
1942 CODE: 2465 CODE:
1943 SvREFCNT_dec (SvRV (coro_current)); 2466 SvREFCNT_dec (SvRV (coro_current));
1944 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2467 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
1945 2468
1946void 2469void
1947_set_readyhook (SV *hook) 2470_set_readyhook (SV *hook)
1948 PROTOTYPE: $ 2471 PROTOTYPE: $
1949 CODE: 2472 CODE:
1950 LOCK;
1951 SvREFCNT_dec (coro_readyhook); 2473 SvREFCNT_dec (coro_readyhook);
1952 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 2474 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1953 UNLOCK;
1954 2475
1955int 2476int
1956prio (Coro::State coro, int newprio = 0) 2477prio (Coro::State coro, int newprio = 0)
2478 PROTOTYPE: $;$
1957 ALIAS: 2479 ALIAS:
1958 nice = 1 2480 nice = 1
1959 CODE: 2481 CODE:
1960{ 2482{
1961 RETVAL = coro->prio; 2483 RETVAL = coro->prio;
… …
1976 2498
1977SV * 2499SV *
1978ready (SV *self) 2500ready (SV *self)
1979 PROTOTYPE: $ 2501 PROTOTYPE: $
1980 CODE: 2502 CODE:
1981 RETVAL = boolSV (api_ready (self)); 2503 RETVAL = boolSV (api_ready (aTHX_ self));
1982 OUTPUT: 2504 OUTPUT:
1983 RETVAL 2505 RETVAL
1984 2506
1985int 2507int
1986nready (...) 2508nready (...)
… …
1988 CODE: 2510 CODE:
1989 RETVAL = coro_nready; 2511 RETVAL = coro_nready;
1990 OUTPUT: 2512 OUTPUT:
1991 RETVAL 2513 RETVAL
1992 2514
1993void
1994throw (Coro::State self, SV *throw = &PL_sv_undef)
1995 PROTOTYPE: $;$
1996 CODE:
1997 SvREFCNT_dec (self->throw);
1998 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1999
2000void
2001swap_defsv (Coro::State self)
2002 PROTOTYPE: $
2003 ALIAS:
2004 swap_defav = 1
2005 CODE:
2006 if (!self->slot)
2007 croak ("cannot swap state with coroutine that has no saved state");
2008 else
2009 {
2010 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2011 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2012
2013 SV *tmp = *src; *src = *dst; *dst = tmp;
2014 }
2015
2016# for async_pool speedup 2515# for async_pool speedup
2017void 2516void
2018_pool_1 (SV *cb) 2517_pool_1 (SV *cb)
2019 CODE: 2518 CODE:
2020{ 2519{
2021 struct coro *coro = SvSTATE (coro_current);
2022 HV *hv = (HV *)SvRV (coro_current); 2520 HV *hv = (HV *)SvRV (coro_current);
2521 struct coro *coro = SvSTATE_hv ((SV *)hv);
2023 AV *defav = GvAV (PL_defgv); 2522 AV *defav = GvAV (PL_defgv);
2024 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2523 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2025 AV *invoke_av; 2524 AV *invoke_av;
2026 int i, len; 2525 int i, len;
2027 2526
… …
2032 SvREFCNT_dec (old); 2531 SvREFCNT_dec (old);
2033 croak ("\3async_pool terminate\2\n"); 2532 croak ("\3async_pool terminate\2\n");
2034 } 2533 }
2035 2534
2036 SvREFCNT_dec (coro->saved_deffh); 2535 SvREFCNT_dec (coro->saved_deffh);
2037 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2536 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2038 2537
2039 hv_store (hv, "desc", sizeof ("desc") - 1, 2538 hv_store (hv, "desc", sizeof ("desc") - 1,
2040 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2539 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2041 2540
2042 invoke_av = (AV *)SvRV (invoke); 2541 invoke_av = (AV *)SvRV (invoke);
… …
2046 2545
2047 if (len > 0) 2546 if (len > 0)
2048 { 2547 {
2049 av_fill (defav, len - 1); 2548 av_fill (defav, len - 1);
2050 for (i = 0; i < len; ++i) 2549 for (i = 0; i < len; ++i)
2051 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2550 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2052 } 2551 }
2053
2054 SvREFCNT_dec (invoke);
2055} 2552}
2056 2553
2057void 2554void
2058_pool_2 (SV *cb) 2555_pool_2 (SV *cb)
2059 CODE: 2556 CODE:
2060{ 2557{
2061 struct coro *coro = SvSTATE (coro_current); 2558 struct coro *coro = SvSTATE_current;
2062 2559
2063 sv_setsv (cb, &PL_sv_undef); 2560 sv_setsv (cb, &PL_sv_undef);
2064 2561
2065 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2562 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2066 coro->saved_deffh = 0; 2563 coro->saved_deffh = 0;
2067 2564
2068 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2565 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2069 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2566 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2070 { 2567 {
2071 SV *old = PL_diehook; 2568 SV *old = PL_diehook;
2072 PL_diehook = 0; 2569 PL_diehook = 0;
2073 SvREFCNT_dec (old); 2570 SvREFCNT_dec (old);
… …
2079 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2576 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2080 2577
2081 coro->prio = 0; 2578 coro->prio = 0;
2082 2579
2083 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2580 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2084 api_trace (coro_current, 0); 2581 api_trace (aTHX_ coro_current, 0);
2085 2582
2086 av_push (av_async_pool, newSVsv (coro_current)); 2583 av_push (av_async_pool, newSVsv (coro_current));
2087} 2584}
2088 2585
2089 2586
2090MODULE = Coro::State PACKAGE = Coro::AIO 2587MODULE = Coro::State PACKAGE = Coro::AIO
2091 2588
2092SV * 2589void
2093_get_state () 2590_get_state (SV *self)
2591 PROTOTYPE: $
2094 CODE: 2592 PPCODE:
2095{ 2593{
2096 struct io_state *data; 2594 AV *defav = GvAV (PL_defgv);
2097 2595 AV *av = newAV ();
2596 int i;
2098 RETVAL = newSV (sizeof (struct io_state)); 2597 SV *data_sv = newSV (sizeof (struct io_state));
2099 data = (struct io_state *)SvPVX (RETVAL); 2598 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2100 SvCUR_set (RETVAL, sizeof (struct io_state)); 2599 SvCUR_set (data_sv, sizeof (struct io_state));
2101 SvPOK_only (RETVAL); 2600 SvPOK_only (data_sv);
2102 2601
2103 data->errorno = errno; 2602 data->errorno = errno;
2104 data->laststype = PL_laststype; 2603 data->laststype = PL_laststype;
2105 data->laststatval = PL_laststatval; 2604 data->laststatval = PL_laststatval;
2106 data->statcache = PL_statcache; 2605 data->statcache = PL_statcache;
2606
2607 av_extend (av, AvFILLp (defav) + 1 + 1);
2608
2609 for (i = 0; i <= AvFILLp (defav); ++i)
2610 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2611
2612 av_push (av, data_sv);
2613
2614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2615
2616 api_ready (aTHX_ self);
2107} 2617}
2108 OUTPUT:
2109 RETVAL
2110 2618
2111void 2619void
2112_set_state (char *data_) 2620_set_state (SV *state)
2113 PROTOTYPE: $ 2621 PROTOTYPE: $
2114 CODE: 2622 PPCODE:
2115{ 2623{
2116 struct io_state *data = (void *)data_; 2624 AV *av = (AV *)SvRV (state);
2625 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2626 int i;
2117 2627
2118 errno = data->errorno; 2628 errno = data->errorno;
2119 PL_laststype = data->laststype; 2629 PL_laststype = data->laststype;
2120 PL_laststatval = data->laststatval; 2630 PL_laststatval = data->laststatval;
2121 PL_statcache = data->statcache; 2631 PL_statcache = data->statcache;
2632
2633 EXTEND (SP, AvFILLp (av));
2634 for (i = 0; i < AvFILLp (av); ++i)
2635 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2122} 2636}
2123 2637
2124 2638
2125MODULE = Coro::State PACKAGE = Coro::AnyEvent 2639MODULE = Coro::State PACKAGE = Coro::AnyEvent
2126 2640
2127BOOT: 2641BOOT:
2128 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE); 2642 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2129 2643
2130SV * 2644void
2131_schedule (...) 2645_schedule (...)
2132 PROTOTYPE: @
2133 CODE: 2646 CODE:
2134{ 2647{
2135 static int incede; 2648 static int incede;
2136 2649
2137 api_cede_notself (); 2650 api_cede_notself (aTHX);
2138 2651
2139 ++incede; 2652 ++incede;
2140 while (coro_nready >= incede && api_cede ()) 2653 while (coro_nready >= incede && api_cede (aTHX))
2141 ; 2654 ;
2142 2655
2143 sv_setsv (sv_activity, &PL_sv_undef); 2656 sv_setsv (sv_activity, &PL_sv_undef);
2144 if (coro_nready >= incede) 2657 if (coro_nready >= incede)
2145 { 2658 {
… …
2150 } 2663 }
2151 2664
2152 --incede; 2665 --incede;
2153} 2666}
2154 2667
2668
2669MODULE = Coro::State PACKAGE = PerlIO::cede
2670
2671BOOT:
2672 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2673
2674MODULE = Coro::State PACKAGE = Coro::Semaphore
2675
2676SV *
2677new (SV *klass, SV *count_ = 0)
2678 CODE:
2679{
2680 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2681 AV *av = newAV ();
2682 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1));
2683 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2684}
2685 OUTPUT:
2686 RETVAL
2687
2688SV *
2689count (SV *self)
2690 CODE:
2691 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
2692 OUTPUT:
2693 RETVAL
2694
2695void
2696up (SV *self, int adjust = 1)
2697 ALIAS:
2698 adjust = 1
2699 CODE:
2700 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2701
2702void
2703down (SV *self)
2704 CODE:
2705 api_execute_slf (aTHX_ cv, slf_init_semaphore_down, &ST (0), 1);
2706
2707void
2708try (SV *self)
2709 PPCODE:
2710{
2711 AV *av = (AV *)SvRV (self);
2712 SV *count_sv = AvARRAY (av)[0];
2713 IV count = SvIVX (count_sv);
2714
2715 if (count > 0)
2716 {
2717 --count;
2718 SvIVX (count_sv) = count;
2719 XSRETURN_YES;
2720 }
2721 else
2722 XSRETURN_NO;
2723}
2724
2725void
2726waiters (SV *self)
2727 CODE:
2728{
2729 AV *av = (AV *)SvRV (self);
2730
2731 if (GIMME_V == G_SCALAR)
2732 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0])));
2733 else
2734 {
2735 int i;
2736 EXTEND (SP, AvFILLp (av) + 1 - 1);
2737 for (i = 1; i <= AvFILLp (av); ++i)
2738 PUSHs (newSVsv (AvARRAY (av)[i]));
2739 }
2740}
2741

Diff Legend

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