ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines