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.189 by root, Fri Oct 5 20:38:43 2007 UTC vs.
Revision 1.273 by root, Fri Nov 14 23:48:10 2008 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
8 10
9#include "patchlevel.h" 11#include "patchlevel.h"
10 12
11#include <stdio.h> 13#include <stdio.h>
12#include <errno.h> 14#include <errno.h>
13#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
23# include <inttypes.h> /* most portable stdint.h */
24#endif
14 25
15#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
16# include <unistd.h> 27# include <unistd.h>
17# include <sys/mman.h> 28# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
… …
35# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
36#endif 47#endif
37 48
38#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
39# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
40# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
41#else
42# define REGISTER_STACK(cctx,start,end)
43#endif 51#endif
44 52
45/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
46#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
47 55
48#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
49 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
50 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
51 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
70# ifndef IS_PADCONST 78# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
72# endif 80# endif
73#endif 81#endif
74 82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100
75/* 5.8.7 */ 101/* 5.8.7 */
76#ifndef SvRV_set 102#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 104#endif
79 105
… …
90# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
91#endif 117#endif
92 118
93/* 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
94 * portable way as possible. */ 120 * portable way as possible. */
95#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
96#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
97 126
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 128
100#if __GNUC__ >= 3 129#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
103#else 133#else
104# define attribute(x) 134# define attribute(x)
105# define BARRIER 135# define expect(expr,value) (expr)
136# define INLINE static
106#endif 137#endif
138
139#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1)
107 141
108#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
109 143
110#include "CoroAPI.h" 144#include "CoroAPI.h"
111 145
112#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
113static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
114# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
115# 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
116#else 155#else
156
117# define LOCK (void)0 157# define LOCK (void)0
118# define UNLOCK (void)0 158# define UNLOCK (void)0
159
119#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
120 166
121/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
122struct io_state 168struct io_state
123{ 169{
170 AV *res;
124 int errorno; 171 int errorno;
125 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
126 int laststatval; 173 int laststatval;
127 Stat_t statcache; 174 Stat_t statcache;
128}; 175};
129 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
130static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
131static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 183static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
135static 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;
136 187
137static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
138static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
190static SV *rv_diehook;
191static SV *rv_warnhook;
192static HV *hv_sig; /* %SIG */
139 193
140/* async_pool helper stuff */ 194/* async_pool helper stuff */
141static SV *sv_pool_rss; 195static SV *sv_pool_rss;
142static SV *sv_pool_size; 196static SV *sv_pool_size;
143static AV *av_async_pool; 197static AV *av_async_pool;
198
199/* Coro::AnyEvent */
200static SV *sv_activity;
144 201
145static struct coro_cctx *cctx_first; 202static struct coro_cctx *cctx_first;
146static int cctx_count, cctx_idle; 203static int cctx_count, cctx_idle;
147 204
148enum { 205enum {
… …
153 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
154 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
155}; 212};
156 213
157/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
158typedef struct coro_cctx { 215typedef struct coro_cctx
216{
159 struct coro_cctx *next; 217 struct coro_cctx *next;
160 218
161 /* the stack */ 219 /* the stack */
162 void *sptr; 220 void *sptr;
163 size_t ssize; 221 size_t ssize;
… …
166 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 224 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
167 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 */
168 JMPENV *top_env; 226 JMPENV *top_env;
169 coro_context cctx; 227 coro_context cctx;
170 228
229 U32 gen;
171#if CORO_USE_VALGRIND 230#if CORO_USE_VALGRIND
172 int valgrind_id; 231 int valgrind_id;
173#endif 232#endif
174 unsigned char flags; 233 unsigned char flags;
175} coro_cctx; 234} coro_cctx;
… …
179 CF_READY = 0x0002, /* coroutine is ready */ 238 CF_READY = 0x0002, /* coroutine is ready */
180 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
181 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
182}; 241};
183 242
184/* this is a structure representing a perl-level coroutine */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
185struct coro { 244typedef struct
186 /* the c coroutine allocated to this perl coroutine, if any */ 245{
187 coro_cctx *cctx; 246 SV *defsv;
188 247 AV *defav;
189 /* data associated with this coroutine (initial args) */ 248 SV *errsv;
190 AV *args; 249 SV *irsgv;
191 int refcnt;
192 int flags; /* CF_ flags */
193
194 /* optionally saved, might be zero */
195 AV *defav; /* @_ */
196 SV *defsv; /* $_ */
197 SV *errsv; /* $@ */
198 SV *deffh; /* default filehandle */
199 SV *irssv; /* $/ */
200 SV *irssv_sv; /* real $/ cache */
201
202#define VAR(name,type) type name; 250#define VAR(name,type) type name;
203# include "state.h" 251# include "state.h"
204#undef VAR 252#undef VAR
253} perl_slots;
254
255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
256
257/* this is a structure representing a perl-level coroutine */
258struct coro {
259 /* the C coroutine allocated to this perl coroutine, if any */
260 coro_cctx *cctx;
261
262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
264 AV *mainstack;
265 perl_slots *slot; /* basically the saved sp */
266
267 AV *args; /* data associated with this coroutine (initial args) */
268 int refcnt; /* coroutines are refcounted, yes */
269 int flags; /* CF_ flags */
270 HV *hv; /* the perl hash associated with this coro, if any */
205 271
206 /* statistics */ 272 /* statistics */
207 int usecount; /* number of transfers to this coro */ 273 int usecount; /* number of transfers to this coro */
208 274
209 /* coro process data */ 275 /* coro process data */
210 int prio; 276 int prio;
211 //SV *throw; 277 SV *throw; /* exception to be thrown */
212 278
213 /* async_pool */ 279 /* async_pool */
214 SV *saved_deffh; 280 SV *saved_deffh;
215 281
216 /* linked list */ 282 /* linked list */
217 struct coro *next, *prev; 283 struct coro *next, *prev;
218 HV *hv; /* the perl hash associated with this coro, if any */
219}; 284};
220 285
221typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
222typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
223 290
224/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
225 292
226#define PRIO_MAX 3 293#define PRIO_MAX 3
227#define PRIO_HIGH 1 294#define PRIO_HIGH 1
… …
230#define PRIO_IDLE -3 297#define PRIO_IDLE -3
231#define PRIO_MIN -4 298#define PRIO_MIN -4
232 299
233/* for Coro.pm */ 300/* for Coro.pm */
234static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook;
235static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
236static int coro_nready;
237static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
238 306
239/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
308
309static SV *
310coro_get_sv (pTHX_ const char *name, int create)
311{
312#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create);
315#endif
316 return get_sv (name, create);
317}
318
319static AV *
320coro_get_av (pTHX_ const char *name, int create)
321{
322#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create);
325#endif
326 return get_av (name, create);
327}
328
329static HV *
330coro_get_hv (pTHX_ const char *name, int create)
331{
332#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create);
335#endif
336 return get_hv (name, create);
337}
240 338
241static AV * 339static AV *
242coro_clone_padlist (pTHX_ CV *cv) 340coro_clone_padlist (pTHX_ CV *cv)
243{ 341{
244 AV *padlist = CvPADLIST (cv); 342 AV *padlist = CvPADLIST (cv);
245 AV *newpadlist, *newpad; 343 AV *newpadlist, *newpad;
246 344
247 newpadlist = newAV (); 345 newpadlist = newAV ();
248 AvREAL_off (newpadlist); 346 AvREAL_off (newpadlist);
249#if PERL_VERSION_ATLEAST (5,9,0) 347#if PERL_VERSION_ATLEAST (5,10,0)
250 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 348 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
251#else 349#else
252 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
253#endif 351#endif
254 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
255 --AvFILLp (padlist); 353 --AvFILLp (padlist);
256 354
257 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
258 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
259 357
260 return newpadlist; 358 return newpadlist;
261} 359}
262 360
… …
292 390
293 /* casting is fun. */ 391 /* casting is fun. */
294 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
295 free_padlist (aTHX_ padlist); 393 free_padlist (aTHX_ padlist);
296 394
297 SvREFCNT_dec (av); 395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
298 396
299 return 0; 397 return 0;
300} 398}
301 399
302#define PERL_MAGIC_coro PERL_MAGIC_ext 400#define CORO_MAGIC_type_cv PERL_MAGIC_ext
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
303 402
304static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 403static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0,
405 coro_cv_free
406};
305 407
306#define CORO_MAGIC(cv) \ 408#define CORO_MAGIC(sv, type) \
307 SvMAGIC (cv) \ 409 SvMAGIC (sv) \
308 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 410 ? SvMAGIC (sv)->mg_type == type \
309 ? SvMAGIC (cv) \ 411 ? SvMAGIC (sv) \
310 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 412 : mg_find (sv, type) \
311 : 0 413 : 0
312 414
313static struct coro * 415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
417
418INLINE struct coro *
314SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
315{ 420{
316 HV *stash; 421 HV *stash;
317 MAGIC *mg; 422 MAGIC *mg;
318 423
319 if (SvROK (coro)) 424 if (SvROK (coro))
320 coro = SvRV (coro); 425 coro = SvRV (coro);
321 426
322 if (SvTYPE (coro) != SVt_PVHV) 427 if (expect_false (SvTYPE (coro) != SVt_PVHV))
323 croak ("Coro::State object required"); 428 croak ("Coro::State object required");
324 429
325 stash = SvSTASH (coro); 430 stash = SvSTASH (coro);
326 if (stash != coro_stash && stash != coro_state_stash) 431 if (expect_false (stash != coro_stash && stash != coro_state_stash))
327 { 432 {
328 /* very slow, but rare, check */ 433 /* very slow, but rare, check */
329 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 434 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
330 croak ("Coro::State object required"); 435 croak ("Coro::State object required");
331 } 436 }
332 437
333 mg = CORO_MAGIC (coro); 438 mg = CORO_MAGIC_state (coro);
334 return (struct coro *)mg->mg_ptr; 439 return (struct coro *)mg->mg_ptr;
335} 440}
336 441
337#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 442#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
338 443
339/* the next two functions merely cache the padlists */ 444/* the next two functions merely cache the padlists */
340static void 445static void
341get_padlist (pTHX_ CV *cv) 446get_padlist (pTHX_ CV *cv)
342{ 447{
343 MAGIC *mg = CORO_MAGIC (cv); 448 MAGIC *mg = CORO_MAGIC_cv (cv);
344 AV *av; 449 AV *av;
345 450
346 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
347 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
348 else 453 else
349 { 454 {
350#if CORO_PREFER_PERL_FUNCTIONS 455#if CORO_PREFER_PERL_FUNCTIONS
351 /* this is probably cleaner, but also slower? */ 456 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */
352 CV *cp = Perl_cv_clone (cv); 458 CV *cp = Perl_cv_clone (cv);
353 CvPADLIST (cv) = CvPADLIST (cp); 459 CvPADLIST (cv) = CvPADLIST (cp);
354 CvPADLIST (cp) = 0; 460 CvPADLIST (cp) = 0;
355 SvREFCNT_dec (cp); 461 SvREFCNT_dec (cp);
356#else 462#else
… …
360} 466}
361 467
362static void 468static void
363put_padlist (pTHX_ CV *cv) 469put_padlist (pTHX_ CV *cv)
364{ 470{
365 MAGIC *mg = CORO_MAGIC (cv); 471 MAGIC *mg = CORO_MAGIC_cv (cv);
366 AV *av; 472 AV *av;
367 473
368 if (!mg) 474 if (expect_false (!mg))
369 { 475 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
370 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
371 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
372 mg->mg_virtual = &vtbl_coro;
373 mg->mg_obj = (SV *)newAV ();
374 }
375 476
376 av = (AV *)mg->mg_obj; 477 av = (AV *)mg->mg_obj;
377 478
378 if (AvFILLp (av) >= AvMAX (av)) 479 if (expect_false (AvFILLp (av) >= AvMAX (av)))
379 av_extend (av, AvMAX (av) + 1); 480 av_extend (av, AvMAX (av) + 1);
380 481
381 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 482 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
382} 483}
383 484
384/** load & save, init *******************************************************/ 485/** load & save, init *******************************************************/
385 486
386static void 487static void
387load_perl (pTHX_ Coro__State c) 488load_perl (pTHX_ Coro__State c)
388{ 489{
490 perl_slots *slot = c->slot;
491 c->slot = 0;
492
493 PL_mainstack = c->mainstack;
494
495 GvSV (PL_defgv) = slot->defsv;
496 GvAV (PL_defgv) = slot->defav;
497 GvSV (PL_errgv) = slot->errsv;
498 GvSV (irsgv) = slot->irsgv;
499
389#define VAR(name,type) PL_ ## name = c->name; 500 #define VAR(name,type) PL_ ## name = slot->name;
390# include "state.h" 501 # include "state.h"
391#undef VAR 502 #undef VAR
392
393 GvSV (PL_defgv) = c->defsv;
394 GvAV (PL_defgv) = c->defav;
395 GvSV (PL_errgv) = c->errsv;
396 GvSV (irsgv) = c->irssv_sv;
397 503
398 { 504 {
399 dSP; 505 dSP;
506
400 CV *cv; 507 CV *cv;
401 508
402 /* now do the ugly restore mess */ 509 /* now do the ugly restore mess */
403 while ((cv = (CV *)POPs)) 510 while (expect_true (cv = (CV *)POPs))
404 { 511 {
405 put_padlist (aTHX_ cv); /* mark this padlist as available */ 512 put_padlist (aTHX_ cv); /* mark this padlist as available */
406 CvDEPTH (cv) = PTR2IV (POPs); 513 CvDEPTH (cv) = PTR2IV (POPs);
407 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
408 } 515 }
409 516
410 PUTBACK; 517 PUTBACK;
411 } 518 }
519
520 slf_frame = c->slf_frame;
412} 521}
413 522
414static void 523static void
415save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
416{ 525{
526 c->slf_frame = slf_frame;
527
417 { 528 {
418 dSP; 529 dSP;
419 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
420 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
421 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
… …
427 538
428 XPUSHs (Nullsv); 539 XPUSHs (Nullsv);
429 /* this loop was inspired by pp_caller */ 540 /* this loop was inspired by pp_caller */
430 for (;;) 541 for (;;)
431 { 542 {
432 while (cxix >= 0) 543 while (expect_true (cxix >= 0))
433 { 544 {
434 PERL_CONTEXT *cx = &ccstk[cxix--]; 545 PERL_CONTEXT *cx = &ccstk[cxix--];
435 546
436 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 547 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
437 { 548 {
438 CV *cv = cx->blk_sub.cv; 549 CV *cv = cx->blk_sub.cv;
439 550
440 if (CvDEPTH (cv)) 551 if (expect_true (CvDEPTH (cv)))
441 { 552 {
442 EXTEND (SP, 3); 553 EXTEND (SP, 3);
443 PUSHs ((SV *)CvPADLIST (cv)); 554 PUSHs ((SV *)CvPADLIST (cv));
444 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 555 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
445 PUSHs ((SV *)cv); 556 PUSHs ((SV *)cv);
446 557
447 CvDEPTH (cv) = 0; 558 CvDEPTH (cv) = 0;
448 get_padlist (aTHX_ cv); 559 get_padlist (aTHX_ cv);
449 } 560 }
450 } 561 }
451 } 562 }
452 563
453 if (top_si->si_type == PERLSI_MAIN) 564 if (expect_true (top_si->si_type == PERLSI_MAIN))
454 break; 565 break;
455 566
456 top_si = top_si->si_prev; 567 top_si = top_si->si_prev;
457 ccstk = top_si->si_cxstack; 568 ccstk = top_si->si_cxstack;
458 cxix = top_si->si_cxix; 569 cxix = top_si->si_cxix;
459 } 570 }
460 571
461 PUTBACK; 572 PUTBACK;
462 } 573 }
463 574
575 /* allocate some space on the context stack for our purposes */
576 /* we manually unroll here, as usually 2 slots is enough */
577 if (SLOT_COUNT >= 1) CXINC;
578 if (SLOT_COUNT >= 2) CXINC;
579 if (SLOT_COUNT >= 3) CXINC;
580 {
581 int i;
582 for (i = 3; i < SLOT_COUNT; ++i)
583 CXINC;
584 }
585 cxstack_ix -= SLOT_COUNT; /* undo allocation */
586
587 c->mainstack = PL_mainstack;
588
589 {
590 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
591
464 c->defav = GvAV (PL_defgv); 592 slot->defav = GvAV (PL_defgv);
465 c->defsv = DEFSV; 593 slot->defsv = DEFSV;
466 c->errsv = ERRSV; 594 slot->errsv = ERRSV;
467 c->irssv_sv = GvSV (irsgv); 595 slot->irsgv = GvSV (irsgv);
468 596
469#define VAR(name,type)c->name = PL_ ## name; 597 #define VAR(name,type) slot->name = PL_ ## name;
470# include "state.h" 598 # include "state.h"
471#undef VAR 599 #undef VAR
600 }
472} 601}
473 602
474/* 603/*
475 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
476 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
477 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
478 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
479 */ 608 */
480#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
481# define coro_init_stacks init_stacks 610# define coro_init_stacks init_stacks
482#else 611#else
483static void 612static void
484coro_init_stacks (pTHX) 613coro_init_stacks (pTHX)
485{ 614{
486 PL_curstackinfo = new_stackinfo(64, 6); 615 PL_curstackinfo = new_stackinfo(32, 8);
487 PL_curstackinfo->si_type = PERLSI_MAIN; 616 PL_curstackinfo->si_type = PERLSI_MAIN;
488 PL_curstack = PL_curstackinfo->si_stack; 617 PL_curstack = PL_curstackinfo->si_stack;
489 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 618 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
490 619
491 PL_stack_base = AvARRAY(PL_curstack); 620 PL_stack_base = AvARRAY(PL_curstack);
492 PL_stack_sp = PL_stack_base; 621 PL_stack_sp = PL_stack_base;
493 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 622 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
494 623
495 New(50,PL_tmps_stack,64,SV*); 624 New(50,PL_tmps_stack,32,SV*);
496 PL_tmps_floor = -1; 625 PL_tmps_floor = -1;
497 PL_tmps_ix = -1; 626 PL_tmps_ix = -1;
498 PL_tmps_max = 64; 627 PL_tmps_max = 32;
499 628
500 New(54,PL_markstack,16,I32); 629 New(54,PL_markstack,16,I32);
501 PL_markstack_ptr = PL_markstack; 630 PL_markstack_ptr = PL_markstack;
502 PL_markstack_max = PL_markstack + 16; 631 PL_markstack_max = PL_markstack + 16;
503 632
504#ifdef SET_MARK_OFFSET 633#ifdef SET_MARK_OFFSET
505 SET_MARK_OFFSET; 634 SET_MARK_OFFSET;
506#endif 635#endif
507 636
508 New(54,PL_scopestack,16,I32); 637 New(54,PL_scopestack,8,I32);
509 PL_scopestack_ix = 0; 638 PL_scopestack_ix = 0;
510 PL_scopestack_max = 16; 639 PL_scopestack_max = 8;
511 640
512 New(54,PL_savestack,64,ANY); 641 New(54,PL_savestack,24,ANY);
513 PL_savestack_ix = 0; 642 PL_savestack_ix = 0;
514 PL_savestack_max = 64; 643 PL_savestack_max = 24;
515 644
516#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
517 New(54,PL_retstack,4,OP*); 646 New(54,PL_retstack,4,OP*);
518 PL_retstack_ix = 0; 647 PL_retstack_ix = 0;
519 PL_retstack_max = 4; 648 PL_retstack_max = 4;
520#endif 649#endif
521} 650}
… …
523 652
524/* 653/*
525 * destroy the stacks, the callchain etc... 654 * destroy the stacks, the callchain etc...
526 */ 655 */
527static void 656static void
528coro_destroy_stacks (pTHX) 657coro_destruct_stacks (pTHX)
529{ 658{
530 while (PL_curstackinfo->si_next) 659 while (PL_curstackinfo->si_next)
531 PL_curstackinfo = PL_curstackinfo->si_next; 660 PL_curstackinfo = PL_curstackinfo->si_next;
532 661
533 while (PL_curstackinfo) 662 while (PL_curstackinfo)
… …
544 673
545 Safefree (PL_tmps_stack); 674 Safefree (PL_tmps_stack);
546 Safefree (PL_markstack); 675 Safefree (PL_markstack);
547 Safefree (PL_scopestack); 676 Safefree (PL_scopestack);
548 Safefree (PL_savestack); 677 Safefree (PL_savestack);
549#if !PERL_VERSION_ATLEAST (5,9,0) 678#if !PERL_VERSION_ATLEAST (5,10,0)
550 Safefree (PL_retstack); 679 Safefree (PL_retstack);
551#endif 680#endif
552} 681}
553 682
554static size_t 683static size_t
… …
556{ 685{
557 size_t rss = sizeof (*coro); 686 size_t rss = sizeof (*coro);
558 687
559 if (coro->mainstack) 688 if (coro->mainstack)
560 { 689 {
690 perl_slots tmp_slot;
691 perl_slots *slot;
692
561 if (coro->flags & CF_RUNNING) 693 if (coro->flags & CF_RUNNING)
562 { 694 {
695 slot = &tmp_slot;
696
563 #define VAR(name,type)coro->name = PL_ ## name; 697 #define VAR(name,type) slot->name = PL_ ## name;
564 # include "state.h" 698 # include "state.h"
565 #undef VAR 699 #undef VAR
566 } 700 }
701 else
702 slot = coro->slot;
567 703
704 if (slot)
705 {
568 rss += sizeof (coro->curstackinfo); 706 rss += sizeof (slot->curstackinfo);
569 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
570 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 707 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
571 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 708 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
572 rss += coro->tmps_max * sizeof (SV *); 709 rss += slot->tmps_max * sizeof (SV *);
573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 710 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
574 rss += coro->scopestack_max * sizeof (I32); 711 rss += slot->scopestack_max * sizeof (I32);
575 rss += coro->savestack_max * sizeof (ANY); 712 rss += slot->savestack_max * sizeof (ANY);
576 713
577#if !PERL_VERSION_ATLEAST (5,9,0) 714#if !PERL_VERSION_ATLEAST (5,10,0)
578 rss += coro->retstack_max * sizeof (OP *); 715 rss += slot->retstack_max * sizeof (OP *);
579#endif 716#endif
717 }
580 } 718 }
581 719
582 return rss; 720 return rss;
583} 721}
584 722
585/** coroutine stack handling ************************************************/ 723/** coroutine stack handling ************************************************/
724
725static int (*orig_sigelem_get) (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);
728
729/* apparently < 5.8.8 */
730#ifndef MgPV_nolen_const
731#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
732 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
733 (const char*)(mg)->mg_ptr)
734#endif
735
736/*
737 * This overrides the default magic get method of %SIG elements.
738 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
739 * and instead of tryign to save and restore the hash elements, we just provide
740 * readback here.
741 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
742 * not expecting this to actually change the hook. This is a potential problem
743 * when a schedule happens then, but we ignore this.
744 */
745static int
746coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
747{
748 const char *s = MgPV_nolen_const (mg);
749
750 if (*s == '_')
751 {
752 SV **svp = 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 }
762 }
763
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;
789}
790
791static int
792coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
793{
794 const char *s = MgPV_nolen_const (mg);
795
796 if (*s == '_')
797 {
798 SV **svp = 0;
799
800 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
801 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
802
803 if (svp)
804 {
805 SV *old = *svp;
806 *svp = newSVsv (sv);
807 SvREFCNT_dec (old);
808 return 0;
809 }
810 }
811
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;
826}
586 827
587static void 828static void
588coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
589{ 830{
590 /* 831 /*
… …
595 PL_runops = RUNOPS_DEFAULT; 836 PL_runops = RUNOPS_DEFAULT;
596 PL_curcop = &PL_compiling; 837 PL_curcop = &PL_compiling;
597 PL_in_eval = EVAL_NULL; 838 PL_in_eval = EVAL_NULL;
598 PL_comppad = 0; 839 PL_comppad = 0;
599 PL_curpm = 0; 840 PL_curpm = 0;
841 PL_curpad = 0;
600 PL_localizing = 0; 842 PL_localizing = 0;
601 PL_dirty = 0; 843 PL_dirty = 0;
602 PL_restartop = 0; 844 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0;
847#endif
848
849 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
603 852
604 GvSV (PL_defgv) = NEWSV (0, 0); 853 GvSV (PL_defgv) = newSV (0);
605 GvAV (PL_defgv) = coro->args; coro->args = 0; 854 GvAV (PL_defgv) = coro->args; coro->args = 0;
606 GvSV (PL_errgv) = NEWSV (0, 0); 855 GvSV (PL_errgv) = newSV (0);
607 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);
608 PL_rs = newSVsv (GvSV (irsgv)); 857 PL_rs = newSVsv (GvSV (irsgv));
609 PL_defoutgv = SvREFCNT_inc (stdoutgv); 858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
610 859
611 { 860 {
612 dSP; 861 dSP;
613 LOGOP myop; 862 UNOP myop;
614 863
615 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
616 myop.op_next = Nullop; 865 myop.op_next = Nullop;
617 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
618 867
619 PUSHMARK (SP); 868 PUSHMARK (SP);
620 XPUSHs (av_shift (GvAV (PL_defgv))); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
621 PUTBACK; 870 PUTBACK;
622 PL_op = (OP *)&myop; 871 PL_op = (OP *)&myop;
623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
624 SPAGAIN; 873 SPAGAIN;
625 } 874 }
626 875
627 ENTER; /* necessary e.g. for dounwind */ 876 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */
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 */
628} 881}
629 882
630static void 883static void
631coro_destroy (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
632{ 885{
633 if (!IN_DESTRUCT) 886 if (!IN_DESTRUCT)
634 { 887 {
635 /* restore all saved variables and stuff */ 888 /* restore all saved variables and stuff */
636 LEAVE_SCOPE (0); 889 LEAVE_SCOPE (0);
… …
652 SvREFCNT_dec (GvSV (PL_errgv)); 905 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv); 906 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs); 907 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv)); 908 SvREFCNT_dec (GvSV (irsgv));
656 909
910 SvREFCNT_dec (PL_diehook);
911 SvREFCNT_dec (PL_warnhook);
912
657 SvREFCNT_dec (coro->saved_deffh); 913 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
659 915
660 coro_destroy_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
661} 917}
662 918
663static void 919INLINE void
664free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
665{ 921{
666 if (coro_mortal) 922 if (expect_true (coro_mortal))
667 { 923 {
668 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
669 coro_mortal = 0; 925 coro_mortal = 0;
670 } 926 }
671} 927}
… …
700 bot = PL_stack_base + cx->blk_oldsp + 1; 956 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1 957 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1 958 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot; 959 : bot;
704 960
961 av_extend (av, top - bot);
705 while (bot < top) 962 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++)); 963 av_push (av, SvREFCNT_inc_NN (*bot++));
707 964
708 PL_runops = RUNOPS_DEFAULT; 965 PL_runops = RUNOPS_DEFAULT;
709 ENTER; 966 ENTER;
710 SAVETMPS; 967 SAVETMPS;
711 EXTEND (SP, 3); 968 EXTEND (SP, 3);
… …
749 SAVETMPS; 1006 SAVETMPS;
750 EXTEND (SP, 3); 1007 EXTEND (SP, 3);
751 PUSHMARK (SP); 1008 PUSHMARK (SP);
752 PUSHs (&PL_sv_yes); 1009 PUSHs (&PL_sv_yes);
753 PUSHs (fullname); 1010 PUSHs (fullname);
754 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1011 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
755 PUTBACK; 1012 PUTBACK;
756 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1013 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
757 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1014 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
758 SPAGAIN; 1015 SPAGAIN;
759 FREETMPS; 1016 FREETMPS;
… …
791 1048
792 TAINT_NOT; 1049 TAINT_NOT;
793 return 0; 1050 return 0;
794} 1051}
795 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
796/* 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 */
797/* _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 */
798/* during execution of a perl program */ 1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
799static void NOINLINE 1064static void NOINLINE
800prepare_cctx (pTHX_ coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
801{ 1066{
802 dSP; 1067 dSP;
803 LOGOP myop; 1068 UNOP myop;
804 1069
805 PL_top_env = &PL_start_env; 1070 PL_top_env = &PL_start_env;
806 1071
807 if (cctx->flags & CC_TRACE) 1072 if (cctx->flags & CC_TRACE)
808 PL_runops = runops_trace; 1073 PL_runops = runops_trace;
809 1074
810 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
811 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
812 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
813 1078
814 PUSHMARK (SP); 1079 PUSHMARK (SP);
815 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
816 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
817 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
818 PUTBACK; 1083 PUTBACK;
819 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
820 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
821 SPAGAIN; 1086 SPAGAIN;
822} 1087}
823 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
824/* 1110/*
825 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
826 */ 1112 */
827static void 1113static void
828coro_run (void *arg) 1114cctx_run (void *arg)
829{ 1115{
1116#ifdef USE_ITHREADS
1117# if CORO_PTHREAD
1118 PERL_SET_CONTEXT (coro_thx);
1119# endif
1120#endif
1121 {
830 dTHX; 1122 dTHX;
831 1123
832 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1124 /* normally we would need to skip the entersub here */
833 UNLOCK; 1125 /* not doing so will re-execute it, which is exactly what we want */
834
835 /* we now skip the entersub that lead to transfer() */
836 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
837 1127
838 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
839 prepare_cctx (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
840 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
841 /* 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 */
842 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
843 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
844 1138
845 /* 1139 /*
846 * 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
847 * 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)
848 * 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
849 * bootstrap-time "top" top_env, as we cannot restore the "main" 1143 * bootstrap-time "top" top_env, as we cannot restore the "main"
850 * coroutine as Coro has no such concept 1144 * coroutine as Coro has no such concept
851 */ 1145 */
852 PL_top_env = main_top_env; 1146 PL_top_env = main_top_env;
853 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 }
854} 1149}
855 1150
856static coro_cctx * 1151static coro_cctx *
857cctx_new () 1152cctx_new ()
858{ 1153{
859 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 ();
860 void *stack_start; 1183 void *stack_start;
861 size_t stack_size; 1184 size_t stack_size;
862 1185
863 ++cctx_count;
864
865 Newz (0, cctx, 1, coro_cctx);
866
867#if HAVE_MMAP 1186#if HAVE_MMAP
868
869 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;
870 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
871 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);
872 1190
873 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
874 { 1192 {
875# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
876 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
877# endif 1195 #endif
878 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
879 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
880 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
881 } 1199 }
882 else 1200 else
883#endif 1201#endif
884 { 1202 {
885 cctx->ssize = coro_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
886 New (0, cctx->sptr, coro_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
887 1205
888 if (!cctx->sptr) 1206 if (!cctx->sptr)
889 { 1207 {
890 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
891 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
892 } 1210 }
893 1211
894 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
895 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
896 } 1214 }
897 1215
898 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
899 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1220 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
900 1221
901 return cctx; 1222 return cctx;
902} 1223}
903 1224
904static void 1225static void
… …
906{ 1227{
907 if (!cctx) 1228 if (!cctx)
908 return; 1229 return;
909 1230
910 --cctx_count; 1231 --cctx_count;
1232 coro_destroy (&cctx->cctx);
911 1233
1234 /* coro_transfer creates new, empty cctx's */
1235 if (cctx->sptr)
1236 {
912#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
913 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
914#endif 1239 #endif
915 1240
916#if HAVE_MMAP 1241#if HAVE_MMAP
917 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
918 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
919 else 1244 else
920#endif 1245#endif
921 Safefree (cctx->sptr); 1246 Safefree (cctx->sptr);
1247 }
922 1248
923 Safefree (cctx); 1249 Safefree (cctx);
924} 1250}
1251
1252/* wether this cctx should be destructed */
1253#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
925 1254
926static coro_cctx * 1255static coro_cctx *
927cctx_get (pTHX) 1256cctx_get (pTHX)
928{ 1257{
929 while (cctx_first) 1258 while (expect_true (cctx_first))
930 { 1259 {
931 coro_cctx *cctx = cctx_first; 1260 coro_cctx *cctx = cctx_first;
932 cctx_first = cctx->next; 1261 cctx_first = cctx->next;
933 --cctx_idle; 1262 --cctx_idle;
934 1263
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1264 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 1265 return cctx;
937 1266
938 cctx_destroy (cctx); 1267 cctx_destroy (cctx);
939 } 1268 }
940 1269
941 return cctx_new (); 1270 return cctx_new_run ();
942} 1271}
943 1272
944static void 1273static void
945cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
946{ 1275{
1276 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1277
947 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
949 { 1280 {
950 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
951 cctx_first = first->next; 1282 cctx_first = first->next;
952 --cctx_idle; 1283 --cctx_idle;
953 1284
… …
959 cctx_first = cctx; 1290 cctx_first = cctx;
960} 1291}
961 1292
962/** coroutine switching *****************************************************/ 1293/** coroutine switching *****************************************************/
963 1294
964static void NOINLINE 1295static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 1297{
967 if (prev != next) 1298 if (expect_true (prev != next))
968 { 1299 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
970 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,");
971 1302
972 if (next->flags & CF_RUNNING) 1303 if (expect_false (next->flags & CF_RUNNING))
973 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,");
974 1305
975 if (next->flags & CF_DESTROYED) 1306 if (expect_false (next->flags & CF_DESTROYED))
976 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,");
977 1308
1309#if !PERL_VERSION_ATLEAST (5,10,0)
978 if (PL_lex_state != LEX_NOTPARSING) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
979 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1311 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1312#endif
980 } 1313 }
981} 1314}
982 1315
983/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
984static void NOINLINE 1317static void NOINLINE
985transfer (pTHX_ struct coro *prev, struct coro *next) 1318transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
986{ 1319{
987 dSTACKLEVEL; 1320 dSTACKLEVEL;
988 1321
989 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1323 if (expect_false (!next))
991 { 1324 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = stacklevel;
993 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 */
994 } 1327 }
995 else if (prev != next) 1328 else if (expect_true (prev != next))
996 { 1329 {
997 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
998 1331
999 if (prev->flags & CF_NEW) 1332 if (expect_false (prev->flags & CF_NEW))
1000 { 1333 {
1001 /* create a new empty context */ 1334 /* create a new empty/source context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1335 prev->cctx = cctx_new_empty ();
1003 prev->flags &= ~CF_NEW; 1336 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1337 prev->flags |= CF_RUNNING;
1005 } 1338 }
1006 1339
1007 prev->flags &= ~CF_RUNNING; 1340 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1341 next->flags |= CF_RUNNING;
1009 1342
1010 LOCK; 1343 LOCK;
1011 1344
1345 /* first get rid of the old state */
1346 save_perl (aTHX_ prev);
1347
1012 if (next->flags & CF_NEW) 1348 if (expect_false (next->flags & CF_NEW))
1013 { 1349 {
1014 /* need to start coroutine */ 1350 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1351 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */
1017 save_perl (aTHX_ prev);
1018 /* setup coroutine call */ 1352 /* setup coroutine call */
1019 coro_setup (aTHX_ next); 1353 coro_setup (aTHX_ next);
1020 } 1354 }
1021 else 1355 else
1356 load_perl (aTHX_ next);
1357
1358 prev__cctx = prev->cctx;
1359
1360 /* possibly untie and reuse the cctx */
1361 if (expect_true (
1362 prev__cctx->idle_sp == stacklevel
1363 && !(prev__cctx->flags & CC_TRACE)
1364 && !force_cctx
1365 ))
1022 { 1366 {
1023 /* coroutine already started */
1024 save_perl (aTHX_ prev);
1025 load_perl (aTHX_ next);
1026 }
1027
1028 prev__cctx = prev->cctx;
1029
1030 /* possibly "free" the cctx */
1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
1032 {
1033 /* 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 */
1034 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));
1035 1369
1036 prev->cctx = 0; 1370 prev->cctx = 0;
1371
1372 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1373 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1374 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1375 if (!next->cctx)
1376 next->cctx = cctx_get (aTHX);
1037 1377
1038 cctx_put (prev__cctx); 1378 cctx_put (prev__cctx);
1039 } 1379 }
1040 1380
1041 ++next->usecount; 1381 ++next->usecount;
1042 1382
1043 if (!next->cctx) 1383 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1384 next->cctx = cctx_get (aTHX);
1045 1385
1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1388
1046 if (prev__cctx != next->cctx) 1389 if (expect_false (prev__cctx != next->cctx))
1047 { 1390 {
1048 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1394 }
1052 1395
1053 free_coro_mortal (aTHX); 1396 transfer_tail (aTHX);
1054 UNLOCK;
1055 } 1397 }
1056} 1398}
1057 1399
1058struct transfer_args
1059{
1060 struct coro *prev, *next;
1061};
1062
1063#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1400#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1064#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1065 1402
1066/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
1067 1404
1068static int 1405static int
… …
1086 1423
1087 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1088 { 1425 {
1089 struct coro temp; 1426 struct coro temp;
1090 1427
1091 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1092 croak ("FATAL: tried to destroy currently running coroutine");
1093 1429
1094 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1096 1432
1097 coro_destroy (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1098 1434
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1435 load_perl (aTHX_ &temp);
1100 1436
1101 coro->mainstack = 0; 1437 coro->slot = 0;
1102 } 1438 }
1103 1439
1104 cctx_destroy (coro->cctx); 1440 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1441 SvREFCNT_dec (coro->args);
1106 1442
… …
1148# define MGf_DUP 0 1484# define MGf_DUP 0
1149#endif 1485#endif
1150}; 1486};
1151 1487
1152static void 1488static void
1153prepare_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)
1154{ 1490{
1155 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1156 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1157 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1158} 1494}
1159 1495
1160static void 1496static void
1161api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1162{ 1498{
1163 dTHX;
1164 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1165 1500
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1168} 1503}
1169 1504
1170/** Coro ********************************************************************/ 1505/** Coro ********************************************************************/
1171 1506
1172static void 1507static void
… …
1174{ 1509{
1175 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1510 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1176} 1511}
1177 1512
1178static SV * 1513static SV *
1179coro_deq (pTHX_ int min_prio) 1514coro_deq (pTHX)
1180{ 1515{
1181 int prio = PRIO_MAX - PRIO_MIN; 1516 int prio;
1182 1517
1183 min_prio -= PRIO_MIN;
1184 if (min_prio < 0)
1185 min_prio = 0;
1186
1187 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1518 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1188 if (AvFILLp (coro_ready [prio]) >= 0) 1519 if (AvFILLp (coro_ready [prio]) >= 0)
1189 return av_shift (coro_ready [prio]); 1520 return av_shift (coro_ready [prio]);
1190 1521
1191 return 0; 1522 return 0;
1192} 1523}
1193 1524
1194static int 1525static int
1195api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1196{ 1527{
1197 dTHX;
1198 struct coro *coro; 1528 struct coro *coro;
1529 SV *sv_hook;
1530 void (*xs_hook)(void);
1199 1531
1200 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1201 coro_sv = SvRV (coro_sv); 1533 coro_sv = SvRV (coro_sv);
1202 1534
1203 coro = SvSTATE (coro_sv); 1535 coro = SvSTATE (coro_sv);
… …
1206 return 0; 1538 return 0;
1207 1539
1208 coro->flags |= CF_READY; 1540 coro->flags |= CF_READY;
1209 1541
1210 LOCK; 1542 LOCK;
1543
1544 sv_hook = coro_nready ? 0 : coro_readyhook;
1545 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1546
1211 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1547 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1212 ++coro_nready; 1548 ++coro_nready;
1549
1213 UNLOCK; 1550 UNLOCK;
1551
1552 if (sv_hook)
1553 {
1554 dSP;
1555
1556 ENTER;
1557 SAVETMPS;
1558
1559 PUSHMARK (SP);
1560 PUTBACK;
1561 call_sv (sv_hook, G_DISCARD);
1562 SPAGAIN;
1563
1564 FREETMPS;
1565 LEAVE;
1566 }
1567
1568 if (xs_hook)
1569 xs_hook ();
1214 1570
1215 return 1; 1571 return 1;
1216} 1572}
1217 1573
1218static int 1574static int
1219api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1220{ 1576{
1221 dTHX;
1222 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1223} 1578}
1224 1579
1225static void 1580INLINE void
1226prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1227{ 1582{
1228 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1229 1584
1230 for (;;) 1585 for (;;)
1231 { 1586 {
1232 LOCK; 1587 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1588 next_sv = coro_deq (aTHX);
1234 1589
1235 /* nothing to schedule: call the idle handler */ 1590 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1591 if (expect_false (!next_sv))
1237 { 1592 {
1238 dSP; 1593 dSP;
1239 UNLOCK; 1594 UNLOCK;
1240 1595
1241 ENTER; 1596 ENTER;
1242 SAVETMPS; 1597 SAVETMPS;
1243 1598
1244 PUSHMARK (SP); 1599 PUSHMARK (SP);
1245 PUTBACK; 1600 PUTBACK;
1246 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1601 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1602 SPAGAIN;
1247 1603
1248 FREETMPS; 1604 FREETMPS;
1249 LEAVE; 1605 LEAVE;
1250 continue; 1606 continue;
1251 } 1607 }
1252 1608
1253 ta->next = SvSTATE (next_sv); 1609 ta->next = SvSTATE (next_sv);
1254 1610
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1613 {
1258 UNLOCK; 1614 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1261 continue; 1617 continue;
1262 } 1618 }
1263 1619
1264 --coro_nready; 1620 --coro_nready;
1265 UNLOCK; 1621 UNLOCK;
… …
1268 1624
1269 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1270 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1271 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1272 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1273 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));
1274 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1275 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1276 1632
1277 LOCK; 1633 LOCK;
1278 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1279 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1280 UNLOCK; 1636 UNLOCK;
1281} 1637}
1282 1638
1283static void 1639INLINE void
1284prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1285{ 1641{
1286 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1287 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1288} 1644}
1289 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
1290static int 1669static int
1291prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1292{ 1671{
1293 if (coro_nready) 1672 struct coro_transfer_args ta;
1294 { 1673
1295 SV *prev = SvRV (coro_current);
1296 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1297 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1298 return 1; 1679 return 1;
1299 } 1680 }
1300 else 1681 else
1301 return 0; 1682 return 0;
1302} 1683}
1303 1684
1304static void
1305api_schedule (void)
1306{
1307 dTHX;
1308 struct transfer_args ta;
1309
1310 prepare_schedule (aTHX_ &ta);
1311 TRANSFER (ta);
1312}
1313
1314static int 1685static int
1315api_cede (void) 1686api_cede_notself (pTHX)
1316{ 1687{
1317 dTHX; 1688 if (coro_nready)
1689 {
1318 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1319 1691
1320 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1321
1322 if (ta.prev != ta.next)
1323 {
1324 TRANSFER (ta); 1693 TRANSFER (ta, 1);
1325 return 1; 1694 return 1;
1326 } 1695 }
1327 else 1696 else
1328 return 0; 1697 return 0;
1329} 1698}
1330 1699
1331static int 1700static void
1332api_cede_notself (void)
1333{
1334 dTHX;
1335 struct transfer_args ta;
1336
1337 if (prepare_cede_notself (aTHX_ &ta))
1338 {
1339 TRANSFER (ta);
1340 return 1;
1341 }
1342 else
1343 return 0;
1344}
1345
1346static void
1347api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1348{ 1702{
1349 dTHX;
1350 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1351 1704
1352 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1353 { 1706 {
1354 if (!coro->cctx) 1707 if (!coro->cctx)
1355 coro->cctx = cctx_new (); 1708 coro->cctx = cctx_new_run ();
1356 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1357 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1358 1711
1359 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1360 } 1713 }
1361 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1362 { 1715 {
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1716 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364 1717
1365 if (coro->flags & CF_RUNNING) 1718 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT; 1719 PL_runops = RUNOPS_DEFAULT;
1367 else 1720 else
1368 coro->runops = RUNOPS_DEFAULT; 1721 coro->slot->runops = RUNOPS_DEFAULT;
1722 }
1723}
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;
1369 } 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;
1370} 2016}
1371 2017
1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1373 2019
1374PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1375 2021
1376BOOT: 2022BOOT:
1377{ 2023{
1378#ifdef USE_ITHREADS 2024#ifdef USE_ITHREADS
1379 MUTEX_INIT (&coro_mutex); 2025 MUTEX_INIT (&coro_lock);
2026# if CORO_PTHREAD
2027 coro_thx = PERL_GET_CONTEXT;
2028# endif
1380#endif 2029#endif
1381 BOOT_PAGESIZE; 2030 BOOT_PAGESIZE;
1382 2031
1383 irsgv = gv_fetchpv ("/" , GV_ADD, SVt_PV); 2032 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1384 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD, SVt_PVIO); 2033 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2034
2035 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 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;
2037 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2038
2039 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2040 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2041 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1385 2042
1386 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 2043 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1387 2044
1388 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 2045 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1389 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 2046 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1394 main_top_env = PL_top_env; 2051 main_top_env = PL_top_env;
1395 2052
1396 while (main_top_env->je_prev) 2053 while (main_top_env->je_prev)
1397 main_top_env = main_top_env->je_prev; 2054 main_top_env = main_top_env->je_prev;
1398 2055
1399 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
2057 coroapi.rev = CORO_API_REVISION;
2058
1400 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 }
1401 2076
1402 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2077 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1403} 2078}
1404 2079
1405SV * 2080SV *
1406new (char *klass, ...) 2081new (char *klass, ...)
1407 CODE: 2082 CODE:
1408{ 2083{
1409 struct coro *coro; 2084 struct coro *coro;
2085 MAGIC *mg;
1410 HV *hv; 2086 HV *hv;
1411 int i; 2087 int i;
1412 2088
1413 Newz (0, coro, 1, struct coro); 2089 Newz (0, coro, 1, struct coro);
1414 coro->args = newAV (); 2090 coro->args = newAV ();
… …
1417 if (coro_first) coro_first->prev = coro; 2093 if (coro_first) coro_first->prev = coro;
1418 coro->next = coro_first; 2094 coro->next = coro_first;
1419 coro_first = coro; 2095 coro_first = coro;
1420 2096
1421 coro->hv = hv = newHV (); 2097 coro->hv = hv = newHV ();
1422 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 2098 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2099 mg->mg_flags |= MGf_DUP;
1423 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2100 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1424 2101
2102 av_extend (coro->args, items - 1);
1425 for (i = 1; i < items; i++) 2103 for (i = 1; i < items; i++)
1426 av_push (coro->args, newSVsv (ST (i))); 2104 av_push (coro->args, newSVsv (ST (i)));
1427} 2105}
1428 OUTPUT: 2106 OUTPUT:
1429 RETVAL 2107 RETVAL
1430 2108
1431# these not obviously related functions are all rolled into the same xs
1432# function to increase chances that they all will call transfer with the same
1433# stack offset
1434void 2109void
1435_set_stacklevel (...) 2110_set_stacklevel (...)
1436 ALIAS: 2111 CODE:
1437 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1438 Coro::schedule = 2
1439 Coro::cede = 3
1440 Coro::cede_notself = 4
1441 CODE:
1442{
1443 struct transfer_args ta;
1444 2113
1445 switch (ix) 2114void
1446 { 2115transfer (...)
1447 case 0: 2116 CODE:
1448 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1449 ta.next = 0;
1450 break;
1451
1452 case 1:
1453 if (items != 2)
1454 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1455
1456 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1457 break;
1458
1459 case 2:
1460 prepare_schedule (aTHX_ &ta);
1461 break;
1462
1463 case 3:
1464 prepare_cede (aTHX_ &ta);
1465 break;
1466
1467 case 4:
1468 if (!prepare_cede_notself (aTHX_ &ta))
1469 XSRETURN_EMPTY;
1470
1471 break;
1472 }
1473
1474 BARRIER;
1475 TRANSFER (ta);
1476
1477 if (GIMME_V != G_VOID && ta.next != ta.prev)
1478 XSRETURN_YES;
1479}
1480 2118
1481bool 2119bool
1482_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
1483 CODE: 2121 CODE:
1484 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1485 OUTPUT: 2123 OUTPUT:
1486 RETVAL 2124 RETVAL
1487 2125
1488void 2126void
1489_exit (code) 2127_exit (int code)
1490 int code
1491 PROTOTYPE: $ 2128 PROTOTYPE: $
1492 CODE: 2129 CODE:
1493 _exit (code); 2130 _exit (code);
1494 2131
1495int 2132int
1496cctx_stacksize (int new_stacksize = 0) 2133cctx_stacksize (int new_stacksize = 0)
1497 CODE: 2134 CODE:
1498 RETVAL = coro_stacksize; 2135 RETVAL = cctx_stacksize;
1499 if (new_stacksize) 2136 if (new_stacksize)
2137 {
1500 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;
1501 OUTPUT: 2150 OUTPUT:
1502 RETVAL 2151 RETVAL
1503 2152
1504int 2153int
1505cctx_count () 2154cctx_count ()
… …
1529call (Coro::State coro, SV *coderef) 2178call (Coro::State coro, SV *coderef)
1530 ALIAS: 2179 ALIAS:
1531 eval = 1 2180 eval = 1
1532 CODE: 2181 CODE:
1533{ 2182{
1534 if (coro->mainstack) 2183 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1535 { 2184 {
1536 struct coro temp; 2185 struct coro temp;
1537 Zero (&temp, 1, struct coro);
1538 2186
1539 if (!(coro->flags & CF_RUNNING)) 2187 if (!(coro->flags & CF_RUNNING))
1540 { 2188 {
2189 PUTBACK;
1541 save_perl (aTHX_ &temp); 2190 save_perl (aTHX_ &temp);
1542 load_perl (aTHX_ coro); 2191 load_perl (aTHX_ coro);
1543 } 2192 }
1544 2193
1545 { 2194 {
1546 dSP; 2195 dSP;
1547 ENTER; 2196 ENTER;
1548 SAVETMPS; 2197 SAVETMPS;
2198 PUTBACK;
2199 PUSHSTACK;
1549 PUSHMARK (SP); 2200 PUSHMARK (SP);
1550 PUTBACK; 2201
1551 if (ix) 2202 if (ix)
1552 eval_sv (coderef, 0); 2203 eval_sv (coderef, 0);
1553 else 2204 else
1554 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 2205 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2206
2207 POPSTACK;
1555 SPAGAIN; 2208 SPAGAIN;
1556 FREETMPS; 2209 FREETMPS;
1557 LEAVE; 2210 LEAVE;
1558 PUTBACK; 2211 PUTBACK;
1559 } 2212 }
1560 2213
1561 if (!(coro->flags & CF_RUNNING)) 2214 if (!(coro->flags & CF_RUNNING))
1562 { 2215 {
1563 save_perl (aTHX_ coro); 2216 save_perl (aTHX_ coro);
1564 load_perl (aTHX_ &temp); 2217 load_perl (aTHX_ &temp);
2218 SPAGAIN;
1565 } 2219 }
1566 } 2220 }
1567} 2221}
1568 2222
1569SV * 2223SV *
… …
1578 RETVAL = boolSV (coro->flags & ix); 2232 RETVAL = boolSV (coro->flags & ix);
1579 OUTPUT: 2233 OUTPUT:
1580 RETVAL 2234 RETVAL
1581 2235
1582void 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
1583api_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
1584 2246
1585SV * 2247SV *
1586has_stack (Coro::State coro) 2248has_cctx (Coro::State coro)
1587 PROTOTYPE: $ 2249 PROTOTYPE: $
1588 CODE: 2250 CODE:
1589 RETVAL = boolSV (!!coro->cctx); 2251 RETVAL = boolSV (!!coro->cctx);
1590 OUTPUT: 2252 OUTPUT:
1591 RETVAL 2253 RETVAL
… …
1596 CODE: 2258 CODE:
1597 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2259 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1598 OUTPUT: 2260 OUTPUT:
1599 RETVAL 2261 RETVAL
1600 2262
1601IV 2263UV
1602rss (Coro::State coro) 2264rss (Coro::State coro)
1603 PROTOTYPE: $ 2265 PROTOTYPE: $
1604 ALIAS: 2266 ALIAS:
1605 usecount = 1 2267 usecount = 1
1606 CODE: 2268 CODE:
… …
1610 case 1: RETVAL = coro->usecount; break; 2272 case 1: RETVAL = coro->usecount; break;
1611 } 2273 }
1612 OUTPUT: 2274 OUTPUT:
1613 RETVAL 2275 RETVAL
1614 2276
2277void
2278force_cctx ()
2279 CODE:
2280 struct coro *coro = SvSTATE (coro_current);
2281 coro->cctx->idle_sp = 0;
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 }
1615 2298
1616MODULE = Coro::State PACKAGE = Coro 2299MODULE = Coro::State PACKAGE = Coro
1617 2300
1618BOOT: 2301BOOT:
1619{ 2302{
1620 int i; 2303 int i;
1621 2304
1622 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1623 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1624 av_async_pool = get_av ("Coro::async_pool", TRUE); 2305 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2306 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2307 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1625 2308
1626 coro_current = get_sv ("Coro::current", FALSE); 2309 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1627 SvREADONLY_on (coro_current); 2310 SvREADONLY_on (coro_current);
1628 2311
1629 coro_stash = gv_stashpv ("Coro", TRUE); 2312 coro_stash = gv_stashpv ("Coro", TRUE);
1630 2313
1631 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2314 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1632 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2315 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1633 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 2316 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1634 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 2317 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1637 2320
1638 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2321 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1639 coro_ready[i] = newAV (); 2322 coro_ready[i] = newAV ();
1640 2323
1641 { 2324 {
1642 SV *sv = perl_get_sv("Coro::API", 1); 2325 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1643 2326
1644 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
1645 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
1646 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
1647 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
1648 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
1649 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
1650 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
1651 2334
1652 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
1653 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
1654 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
1655 } 2338 }
1656} 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);
1657 2355
1658void 2356void
1659_set_current (SV *current) 2357_set_current (SV *current)
1660 PROTOTYPE: $ 2358 PROTOTYPE: $
1661 CODE: 2359 CODE:
1662 SvREFCNT_dec (SvRV (coro_current)); 2360 SvREFCNT_dec (SvRV (coro_current));
1663 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2361 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2362
2363void
2364_set_readyhook (SV *hook)
2365 PROTOTYPE: $
2366 CODE:
2367 LOCK;
2368 SvREFCNT_dec (coro_readyhook);
2369 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2370 UNLOCK;
1664 2371
1665int 2372int
1666prio (Coro::State coro, int newprio = 0) 2373prio (Coro::State coro, int newprio = 0)
1667 ALIAS: 2374 ALIAS:
1668 nice = 1 2375 nice = 1
… …
1686 2393
1687SV * 2394SV *
1688ready (SV *self) 2395ready (SV *self)
1689 PROTOTYPE: $ 2396 PROTOTYPE: $
1690 CODE: 2397 CODE:
1691 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
1692 OUTPUT: 2399 OUTPUT:
1693 RETVAL 2400 RETVAL
1694 2401
1695int 2402int
1696nready (...) 2403nready (...)
… …
1711 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2418 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1712 AV *invoke_av; 2419 AV *invoke_av;
1713 int i, len; 2420 int i, len;
1714 2421
1715 if (!invoke) 2422 if (!invoke)
2423 {
2424 SV *old = PL_diehook;
2425 PL_diehook = 0;
2426 SvREFCNT_dec (old);
1716 croak ("\3terminate\2\n"); 2427 croak ("\3async_pool terminate\2\n");
2428 }
1717 2429
1718 SvREFCNT_dec (coro->saved_deffh); 2430 SvREFCNT_dec (coro->saved_deffh);
1719 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2431 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1720 2432
1721 hv_store (hv, "desc", sizeof ("desc") - 1, 2433 hv_store (hv, "desc", sizeof ("desc") - 1,
1722 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2434 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1723 2435
1724 invoke_av = (AV *)SvRV (invoke); 2436 invoke_av = (AV *)SvRV (invoke);
… …
1728 2440
1729 if (len > 0) 2441 if (len > 0)
1730 { 2442 {
1731 av_fill (defav, len - 1); 2443 av_fill (defav, len - 1);
1732 for (i = 0; i < len; ++i) 2444 for (i = 0; i < len; ++i)
1733 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2445 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1734 } 2446 }
1735 2447
1736 SvREFCNT_dec (invoke); 2448 SvREFCNT_dec (invoke);
1737} 2449}
1738 2450
… …
1745 sv_setsv (cb, &PL_sv_undef); 2457 sv_setsv (cb, &PL_sv_undef);
1746 2458
1747 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1748 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
1749 2461
1750 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1751 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2464 {
2465 SV *old = PL_diehook;
2466 PL_diehook = 0;
2467 SvREFCNT_dec (old);
1752 croak ("\3terminate\2\n"); 2468 croak ("\3async_pool terminate\2\n");
2469 }
1753 2470
1754 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
1755 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2472 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1757 2474
1758 coro->prio = 0; 2475 coro->prio = 0;
1759 2476
1760 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1761 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
1762 2479
1763 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
1764} 2481}
1765 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
1766 2531
1767MODULE = Coro::State PACKAGE = Coro::AIO 2532MODULE = Coro::State PACKAGE = Coro::AIO
1768 2533
1769SV * 2534void
1770_get_state () 2535_get_state (SV *self)
1771 CODE: 2536 PPCODE:
1772{ 2537{
1773 struct io_state *data; 2538 AV *defav = GvAV (PL_defgv);
1774 2539 AV *av = newAV ();
2540 int i;
1775 RETVAL = newSV (sizeof (struct io_state)); 2541 SV *data_sv = newSV (sizeof (struct io_state));
1776 data = (struct io_state *)SvPVX (RETVAL); 2542 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1777 SvCUR_set (RETVAL, sizeof (struct io_state)); 2543 SvCUR_set (data_sv, sizeof (struct io_state));
1778 SvPOK_only (RETVAL); 2544 SvPOK_only (data_sv);
1779 2545
1780 data->errorno = errno; 2546 data->errorno = errno;
1781 data->laststype = PL_laststype; 2547 data->laststype = PL_laststype;
1782 data->laststatval = PL_laststatval; 2548 data->laststatval = PL_laststatval;
1783 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);
1784} 2561}
1785 OUTPUT:
1786 RETVAL
1787 2562
1788void 2563void
1789_set_state (char *data_) 2564_set_state (SV *state)
1790 PROTOTYPE: $ 2565 PROTOTYPE: $
1791 CODE: 2566 PPCODE:
1792{ 2567{
1793 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;
1794 2571
1795 errno = data->errorno; 2572 errno = data->errorno;
1796 PL_laststype = data->laststype; 2573 PL_laststype = data->laststype;
1797 PL_laststatval = data->laststatval; 2574 PL_laststatval = data->laststatval;
1798 PL_statcache = data->statcache; 2575 PL_statcache = data->statcache;
1799}
1800 2576
2577 EXTEND (SP, AvFILLp (av));
2578 for (i = 0; i < AvFILLp (av); ++i)
2579 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2580}
2581
2582
2583MODULE = Coro::State PACKAGE = Coro::AnyEvent
2584
2585BOOT:
2586 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2587
2588SV *
2589_schedule (...)
2590 PROTOTYPE: @
2591 CODE:
2592{
2593 static int incede;
2594
2595 api_cede_notself (aTHX);
2596
2597 ++incede;
2598 while (coro_nready >= incede && api_cede (aTHX))
2599 ;
2600
2601 sv_setsv (sv_activity, &PL_sv_undef);
2602 if (coro_nready >= incede)
2603 {
2604 PUSHMARK (SP);
2605 PUTBACK;
2606 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2607 SPAGAIN;
2608 }
2609
2610 --incede;
2611}
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