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.376 by root, Fri Oct 2 20:48:04 2009 UTC vs.
Revision 1.415 by root, Tue Aug 30 07:48:53 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
1#define NDEBUG 1 4#define NDEBUG 1
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
… …
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
14 18
19#include <stddef.h>
15#include <stdio.h> 20#include <stdio.h>
16#include <errno.h> 21#include <errno.h>
17#include <assert.h> 22#include <assert.h>
18 23
19#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 25# define SVs_PADSTALE 0
21#endif 26#endif
22 27
23#ifdef WIN32 28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
24# undef setjmp 30# undef setjmp
25# undef longjmp 31# undef longjmp
26# undef _exit 32# undef _exit
27# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
28#else 34#else
29# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
30#endif 36#endif
31 37
32#ifdef HAVE_MMAP 38#if HAVE_MMAP
33# include <unistd.h> 39# include <unistd.h>
34# include <sys/mman.h> 40# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
36# ifdef MAP_ANON 42# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
57#endif 63#endif
58 64
59/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
61 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
63# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
64#endif 74#endif
65 75
66#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
82# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
83#endif 93#endif
84 94
85#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
86 96
87#if __GNUC__ >= 3
88# define attribute(x) __attribute__(x)
89# define expect(expr,value) __builtin_expect ((expr), (value))
90# define INLINE static inline
91#else
92# define attribute(x)
93# define expect(expr,value) (expr)
94# define INLINE static
95#endif
96
97#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1)
99
100#define NOINLINE attribute ((noinline))
101
102#include "CoroAPI.h" 97#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
104 99
105#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
106# if CORO_PTHREAD 101# if CORO_PTHREAD
107static void *coro_thx; 102static void *coro_thx;
108# endif 103# endif
109#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
110 108
111#ifdef __linux 109#ifdef __linux
112# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
122static void (*u2time)(pTHX_ UV ret[2]); 120static void (*u2time)(pTHX_ UV ret[2]);
123 121
124/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
127 126
128static U32 cctx_gen; 127static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 160static char times_valid;
162 161
163static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
165 164
166enum { 165enum
166{
167 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
192 int valgrind_id; 192 int valgrind_id;
193#endif 193#endif
194 unsigned char flags; 194 unsigned char flags;
195} coro_cctx; 195} coro_cctx;
196 196
197coro_cctx *cctx_current; /* the currently running cctx */ 197static coro_cctx *cctx_current; /* the currently running cctx */
198 198
199/*****************************************************************************/ 199/*****************************************************************************/
200 200
201static MGVTBL coro_state_vtbl;
202
201enum { 203enum
204{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
210 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 211};
208 212
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 214typedef struct
211{ 215{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 216#define VARx(name,expr,type) type name;
218# include "state.h" 217# include "state.h"
219#undef VAR 218#undef VARx
220} perl_slots; 219} perl_slots;
221 220
221/* how many context stack entries do we need for perl_slots */
222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 223
224/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
225struct coro { 225struct coro
226{
226 /* the C coroutine allocated to this perl coroutine, if any */ 227 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 228 coro_cctx *cctx;
228 229
229 /* ready queue */ 230 /* ready queue */
230 struct coro *next_ready; 231 struct coro *next_ready;
… …
232 /* state data */ 233 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 234 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 235 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 236 perl_slots *slot; /* basically the saved sp */
236 237
237 CV *startcv; /* the CV to execute */ 238 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 239 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 241 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 242
244 /* statistics */ 243 /* statistics */
245 int usecount; /* number of transfers to this coro */ 244 int usecount; /* number of transfers to this coro */
246 245
247 /* coro process data */ 246 /* coro process data */
248 int prio; 247 int prio;
249 SV *except; /* exception to be thrown */ 248 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 249 SV *rouse_cb; /* last rouse callback */
250 AV *on_destroy; /* callbacks or coros to notify on destroy */
251 AV *status; /* the exit status list */
251 252
252 /* async_pool */ 253 /* async_pool */
253 SV *saved_deffh; 254 SV *saved_deffh;
254 SV *invoke_cb; 255 SV *invoke_cb;
255 AV *invoke_av; 256 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 272typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 273typedef struct coro *Coro__State_or_hashref;
273 274
274/* the following variables are effectively part of the perl context */ 275/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 276/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 277/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 278static struct CoroSLF slf_frame; /* the current slf frame */
278 279
279/** Coro ********************************************************************/ 280/** Coro ********************************************************************/
280 281
281#define CORO_PRIO_MAX 3 282#define CORO_PRIO_MAX 3
… …
287 288
288/* for Coro.pm */ 289/* for Coro.pm */
289static SV *coro_current; 290static SV *coro_current;
290static SV *coro_readyhook; 291static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 292static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 293static CV *cv_coro_run;
293static struct coro *coro_first; 294static struct coro *coro_first;
294#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
296
297/** JIT *********************************************************************/
298
299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix"
307 #endif
308 #endif
309#endif
310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
318#endif
295 319
296/** Coro::Select ************************************************************/ 320/** Coro::Select ************************************************************/
297 321
298static OP *(*coro_old_pp_sselect) (pTHX); 322static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 323static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 335 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 336 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 337 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 338}
315 339
340/** time stuff **************************************************************/
341
342#ifdef HAS_GETTIMEOFDAY
343
344ecb_inline void
345coro_u2time (pTHX_ UV ret[2])
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 ret [0] = tv.tv_sec;
351 ret [1] = tv.tv_usec;
352}
353
354ecb_inline double
355coro_nvtime (void)
356{
357 struct timeval tv;
358 gettimeofday (&tv, 0);
359
360 return tv.tv_sec + tv.tv_usec * 1e-6;
361}
362
363ecb_inline void
364time_init (pTHX)
365{
366 nvtime = coro_nvtime;
367 u2time = coro_u2time;
368}
369
370#else
371
372ecb_inline void
373time_init (pTHX)
374{
375 SV **svp;
376
377 require_pv ("Time/HiRes.pm");
378
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383
384 nvtime = INT2PTR (double (*)(), SvIV (*svp));
385
386 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
387 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
388}
389
390#endif
391
316/** lowlevel stuff **********************************************************/ 392/** lowlevel stuff **********************************************************/
317 393
318static SV * 394static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 395coro_get_sv (pTHX_ const char *name, int create)
320{ 396{
321#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 399 get_sv (name, create);
324#endif 400#endif
325 return get_sv (name, create); 401 return get_sv (name, create);
326} 402}
327 403
328static AV * 404static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 405coro_get_av (pTHX_ const char *name, int create)
330{ 406{
331#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 409 get_av (name, create);
334#endif 410#endif
335 return get_av (name, create); 411 return get_av (name, create);
336} 412}
337 413
338static HV * 414static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 415coro_get_hv (pTHX_ const char *name, int create)
340{ 416{
341#if PERL_VERSION_ATLEAST (5,10,0) 417#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 418 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 419 get_hv (name, create);
344#endif 420#endif
345 return get_hv (name, create); 421 return get_hv (name, create);
346} 422}
347 423
348INLINE void 424ecb_inline void
349coro_times_update () 425coro_times_update (void)
350{ 426{
351#ifdef coro_clock_gettime 427#ifdef coro_clock_gettime
352 struct timespec ts; 428 struct timespec ts;
353 429
354 ts.tv_sec = ts.tv_nsec = 0; 430 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 442 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 443 time_real [1] = tv [1] * 1000;
368#endif 444#endif
369} 445}
370 446
371INLINE void 447ecb_inline void
372coro_times_add (struct coro *c) 448coro_times_add (struct coro *c)
373{ 449{
374 c->t_real [1] += time_real [1]; 450 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 452 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 454 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 456 c->t_cpu [0] += time_cpu [0];
381} 457}
382 458
383INLINE void 459ecb_inline void
384coro_times_sub (struct coro *c) 460coro_times_sub (struct coro *c)
385{ 461{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 462 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1]; 463 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 464 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 472/* magic glue */
397 473
398#define CORO_MAGIC_type_cv 26 474#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 475#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 476
401#define CORO_MAGIC_NN(sv, type) \ 477#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 478 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 479 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 480 : mg_find (sv, type))
405 481
406#define CORO_MAGIC(sv, type) \ 482#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 483 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 484 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 485 : 0)
410 486
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 487#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 489
414INLINE struct coro * 490ecb_inline MAGIC *
491SvSTATEhv_p (pTHX_ SV *coro)
492{
493 MAGIC *mg;
494
495 if (ecb_expect_true (
496 SvTYPE (coro) == SVt_PVHV
497 && (mg = CORO_MAGIC_state (coro))
498 && mg->mg_virtual == &coro_state_vtbl
499 ))
500 return mg;
501
502 return 0;
503}
504
505ecb_inline struct coro *
415SvSTATE_ (pTHX_ SV *coro) 506SvSTATE_ (pTHX_ SV *coro)
416{ 507{
417 HV *stash;
418 MAGIC *mg; 508 MAGIC *mg;
419 509
420 if (SvROK (coro)) 510 if (SvROK (coro))
421 coro = SvRV (coro); 511 coro = SvRV (coro);
422 512
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 513 mg = SvSTATEhv_p (aTHX_ coro);
514 if (!mg)
424 croak ("Coro::State object required"); 515 croak ("Coro::State object required");
425 516
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr; 517 return (struct coro *)mg->mg_ptr;
436} 518}
437 519
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 520#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 521
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 525
444/*****************************************************************************/ 526/*****************************************************************************/
445/* padlist management and caching */ 527/* padlist management and caching */
446 528
447static AV * 529ecb_inline AV *
448coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
449{ 531{
450 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
452 534
… …
464 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
465 547
466 return newpadlist; 548 return newpadlist;
467} 549}
468 550
469static void 551ecb_inline void
470free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
471{ 553{
472 /* may be during global destruction */ 554 /* may be during global destruction */
473 if (!IN_DESTRUCT) 555 if (!IN_DESTRUCT)
474 { 556 {
… …
517 0, 0, 0, 0, 599 0, 0, 0, 0,
518 coro_cv_free 600 coro_cv_free
519}; 601};
520 602
521/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
522static void 604ecb_inline void
523get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
524{ 606{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 608 AV *av;
527 609
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
530 else 612 else
531 { 613 {
532#if CORO_PREFER_PERL_FUNCTIONS 614#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 615 /* this is probably cleaner? but also slower! */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 623#endif
542 } 624 }
543} 625}
544 626
545static void 627ecb_inline void
546put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
547{ 629{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av; 631 AV *av;
550 632
551 if (expect_false (!mg)) 633 if (ecb_expect_false (!mg))
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
553 635
554 av = (AV *)mg->mg_obj; 636 av = (AV *)mg->mg_obj;
555 637
556 if (expect_false (AvFILLp (av) >= AvMAX (av))) 638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
557 av_extend (av, AvFILLp (av) + 1); 639 av_extend (av, AvFILLp (av) + 1);
558 640
559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
560} 642}
561 643
… …
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep); 665 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep); 666 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585 667
586#if PERL_VERSION_ATLEAST (5,10,0) 668#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is 669 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could 670 * much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this. 671 * sv_upgrade to avoid this.
590 */ 672 */
591 { 673 {
592 /* swap sv_u */ 674 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 675 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
… …
606 } 688 }
607#endif 689#endif
608 } 690 }
609} 691}
610 692
611#define SWAP_SVS(coro) \ 693#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 694 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 695 swap_svs (aTHX_ (coro))
614 696
615static void 697static void
616on_enterleave_call (pTHX_ SV *cb); 698on_enterleave_call (pTHX_ SV *cb);
617 699
… …
621 perl_slots *slot = c->slot; 703 perl_slots *slot = c->slot;
622 c->slot = 0; 704 c->slot = 0;
623 705
624 PL_mainstack = c->mainstack; 706 PL_mainstack = c->mainstack;
625 707
626 GvSV (PL_defgv) = slot->defsv; 708#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 709 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 710#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 711 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 712 # include "state.h"
634 #undef VAR 713 #undef VARx
714#endif
635 715
636 { 716 {
637 dSP; 717 dSP;
638 718
639 CV *cv; 719 CV *cv;
640 720
641 /* now do the ugly restore mess */ 721 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 722 while (ecb_expect_true (cv = (CV *)POPs))
643 { 723 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 724 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 725 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 726 CvPADLIST (cv) = (AV *)POPs;
647 } 727 }
… …
650 } 730 }
651 731
652 slf_frame = c->slf_frame; 732 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 733 CORO_THROW = c->except;
654 734
655 if (expect_false (enable_times)) 735 if (ecb_expect_false (enable_times))
656 { 736 {
657 if (expect_false (!times_valid)) 737 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 738 coro_times_update ();
659 739
660 coro_times_sub (c); 740 coro_times_sub (c);
661 } 741 }
662 742
663 if (expect_false (c->on_enter)) 743 if (ecb_expect_false (c->on_enter))
664 { 744 {
665 int i; 745 int i;
666 746
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 747 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 754static void
675save_perl (pTHX_ Coro__State c) 755save_perl (pTHX_ Coro__State c)
676{ 756{
677 SWAP_SVS (c); 757 SWAP_SVS (c);
678 758
679 if (expect_false (c->on_leave)) 759 if (ecb_expect_false (c->on_leave))
680 { 760 {
681 int i; 761 int i;
682 762
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 763 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 764 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 765 }
686 766
687 times_valid = 0; 767 times_valid = 0;
688 768
689 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
690 { 770 {
691 coro_times_update (); times_valid = 1; 771 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 772 coro_times_add (c);
693 } 773 }
694 774
… …
708 788
709 XPUSHs (Nullsv); 789 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 790 /* this loop was inspired by pp_caller */
711 for (;;) 791 for (;;)
712 { 792 {
713 while (expect_true (cxix >= 0)) 793 while (ecb_expect_true (cxix >= 0))
714 { 794 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 795 PERL_CONTEXT *cx = &ccstk[cxix--];
716 796
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 797 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 798 {
719 CV *cv = cx->blk_sub.cv; 799 CV *cv = cx->blk_sub.cv;
720 800
721 if (expect_true (CvDEPTH (cv))) 801 if (ecb_expect_true (CvDEPTH (cv)))
722 { 802 {
803 EXTEND (SP, 3);
723 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
725 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
726 807
727 CvDEPTH (cv) = 0; 808 CvDEPTH (cv) = 0;
728 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
729 } 810 }
730 } 811 }
731 } 812 }
732 813
733 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
734 break; 815 break;
735 816
736 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
737 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
738 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
740 821
741 PUTBACK; 822 PUTBACK;
742 } 823 }
743 824
744 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
745 /* we manually unroll here, as usually 2 slots is enough */ 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
746 if (SLOT_COUNT >= 1) CXINC;
747 if (SLOT_COUNT >= 2) CXINC;
748 if (SLOT_COUNT >= 3) CXINC;
749 { 827 {
750 unsigned int i; 828 unsigned int i;
829
751 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
752 CXINC; 831 CXINC;
753 } 832
754 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
755 835
756 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
757 837
758 { 838 {
759 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
760 840
761 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
762 slot->defsv = DEFSV; 842 save_perl_slots (slot);
763 slot->errsv = ERRSV; 843#else
764 slot->irsgv = GvSV (irsgv);
765 slot->hinthv = GvHV (PL_hintgv);
766
767 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
768 # include "state.h" 845 # include "state.h"
769 #undef VAR 846 #undef VARx
847#endif
770 } 848 }
771} 849}
772 850
773/* 851/*
774 * allocate various perl stacks. This is almost an exact copy 852 * allocate various perl stacks. This is almost an exact copy
… …
780# define coro_init_stacks(thx) init_stacks () 858# define coro_init_stacks(thx) init_stacks ()
781#else 859#else
782static void 860static void
783coro_init_stacks (pTHX) 861coro_init_stacks (pTHX)
784{ 862{
785 PL_curstackinfo = new_stackinfo(32, 8); 863 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
786 PL_curstackinfo->si_type = PERLSI_MAIN; 864 PL_curstackinfo->si_type = PERLSI_MAIN;
787 PL_curstack = PL_curstackinfo->si_stack; 865 PL_curstack = PL_curstackinfo->si_stack;
788 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 866 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
789 867
790 PL_stack_base = AvARRAY(PL_curstack); 868 PL_stack_base = AvARRAY(PL_curstack);
… …
805#endif 883#endif
806 884
807 New(54,PL_scopestack,8,I32); 885 New(54,PL_scopestack,8,I32);
808 PL_scopestack_ix = 0; 886 PL_scopestack_ix = 0;
809 PL_scopestack_max = 8; 887 PL_scopestack_max = 8;
888#if HAS_SCOPESTACK_NAME
889 New(54,PL_scopestack_name,8,const char*);
890#endif
810 891
811 New(54,PL_savestack,24,ANY); 892 New(54,PL_savestack,24,ANY);
812 PL_savestack_ix = 0; 893 PL_savestack_ix = 0;
813 PL_savestack_max = 24; 894 PL_savestack_max = 24;
814 895
… …
842 } 923 }
843 924
844 Safefree (PL_tmps_stack); 925 Safefree (PL_tmps_stack);
845 Safefree (PL_markstack); 926 Safefree (PL_markstack);
846 Safefree (PL_scopestack); 927 Safefree (PL_scopestack);
928#if HAS_SCOPESTACK_NAME
929 Safefree (PL_scopestack_name);
930#endif
847 Safefree (PL_savestack); 931 Safefree (PL_savestack);
848#if !PERL_VERSION_ATLEAST (5,10,0) 932#if !PERL_VERSION_ATLEAST (5,10,0)
849 Safefree (PL_retstack); 933 Safefree (PL_retstack);
850#endif 934#endif
851} 935}
… …
897#endif 981#endif
898 982
899/* 983/*
900 * This overrides the default magic get method of %SIG elements. 984 * This overrides the default magic get method of %SIG elements.
901 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 985 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
902 * and instead of trying to save and restore the hash elements, we just provide 986 * and instead of trying to save and restore the hash elements (extremely slow),
903 * readback here. 987 * we just provide our own readback here.
904 */ 988 */
905static int 989static int ecb_cold
906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 990coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
907{ 991{
908 const char *s = MgPV_nolen_const (mg); 992 const char *s = MgPV_nolen_const (mg);
909 993
910 if (*s == '_') 994 if (*s == '_')
… …
914 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 998 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
915 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 999 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
916 1000
917 if (svp) 1001 if (svp)
918 { 1002 {
919 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1003 SV *ssv;
1004
1005 if (!*svp)
1006 ssv = &PL_sv_undef;
1007 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1008 ssv = sv_2mortal (newRV_inc (*svp));
1009 else
1010 ssv = *svp;
1011
1012 sv_setsv (sv, ssv);
920 return 0; 1013 return 0;
921 } 1014 }
922 } 1015 }
923 1016
924 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1017 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
925} 1018}
926 1019
927static int 1020static int ecb_cold
928coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1021coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
929{ 1022{
930 const char *s = MgPV_nolen_const (mg); 1023 const char *s = MgPV_nolen_const (mg);
931 1024
932 if (*s == '_') 1025 if (*s == '_')
… …
946 } 1039 }
947 1040
948 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1041 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
949} 1042}
950 1043
951static int 1044static int ecb_cold
952coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1045coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
953{ 1046{
954 const char *s = MgPV_nolen_const (mg); 1047 const char *s = MgPV_nolen_const (mg);
955 1048
956 if (*s == '_') 1049 if (*s == '_')
… …
991 return 1; 1084 return 1;
992} 1085}
993 1086
994static UNOP init_perl_op; 1087static UNOP init_perl_op;
995 1088
996static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1089ecb_noinline static void /* noinline to keep it out of the transfer fast path */
997init_perl (pTHX_ struct coro *coro) 1090init_perl (pTHX_ struct coro *coro)
998{ 1091{
999 /* 1092 /*
1000 * emulate part of the perl startup here. 1093 * emulate part of the perl startup here.
1001 */ 1094 */
… …
1009 PL_comppad_name_fill = 0; 1102 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0; 1103 PL_comppad_name_floor = 0;
1011 PL_curpm = 0; 1104 PL_curpm = 0;
1012 PL_curpad = 0; 1105 PL_curpad = 0;
1013 PL_localizing = 0; 1106 PL_localizing = 0;
1014 PL_dirty = 0;
1015 PL_restartop = 0; 1107 PL_restartop = 0;
1016#if PERL_VERSION_ATLEAST (5,10,0) 1108#if PERL_VERSION_ATLEAST (5,10,0)
1017 PL_parser = 0; 1109 PL_parser = 0;
1018#endif 1110#endif
1019 PL_hints = 0; 1111 PL_hints = 0;
1020 1112
1021 /* recreate the die/warn hooks */ 1113 /* recreate the die/warn hooks */
1022 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1114 PL_diehook = SvREFCNT_inc (rv_diehook);
1023 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1115 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1024 1116
1025 GvSV (PL_defgv) = newSV (0); 1117 GvSV (PL_defgv) = newSV (0);
1026 GvAV (PL_defgv) = coro->args; coro->args = 0; 1118 GvAV (PL_defgv) = coro->args; coro->args = 0;
1027 GvSV (PL_errgv) = newSV (0); 1119 GvSV (PL_errgv) = newSV (0);
1028 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1120 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1049 /* this newly created coroutine might be run on an existing cctx which most 1141 /* this newly created coroutine might be run on an existing cctx which most
1050 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1142 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1051 */ 1143 */
1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1144 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1145 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1146 slf_frame.destroy = 0;
1054 1147
1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1148 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1056 init_perl_op.op_next = PL_op; 1149 init_perl_op.op_next = PL_op;
1057 init_perl_op.op_type = OP_ENTERSUB; 1150 init_perl_op.op_type = OP_ENTERSUB;
1058 init_perl_op.op_ppaddr = pp_slf; 1151 init_perl_op.op_ppaddr = pp_slf;
… …
1063 /* copy throw, in case it was set before init_perl */ 1156 /* copy throw, in case it was set before init_perl */
1064 CORO_THROW = coro->except; 1157 CORO_THROW = coro->except;
1065 1158
1066 SWAP_SVS (coro); 1159 SWAP_SVS (coro);
1067 1160
1068 if (expect_false (enable_times)) 1161 if (ecb_expect_false (enable_times))
1069 { 1162 {
1070 coro_times_update (); 1163 coro_times_update ();
1071 coro_times_sub (coro); 1164 coro_times_sub (coro);
1072 } 1165 }
1073} 1166}
… …
1097destroy_perl (pTHX_ struct coro *coro) 1190destroy_perl (pTHX_ struct coro *coro)
1098{ 1191{
1099 SV *svf [9]; 1192 SV *svf [9];
1100 1193
1101 { 1194 {
1195 SV *old_current = SvRV (coro_current);
1102 struct coro *current = SvSTATE_current; 1196 struct coro *current = SvSTATE (old_current);
1103 1197
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1198 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105 1199
1106 save_perl (aTHX_ current); 1200 save_perl (aTHX_ current);
1201
1202 /* this will cause transfer_check to croak on block*/
1203 SvRV_set (coro_current, (SV *)coro->hv);
1204
1107 load_perl (aTHX_ coro); 1205 load_perl (aTHX_ coro);
1108 1206
1109 coro_unwind_stacks (aTHX); 1207 coro_unwind_stacks (aTHX);
1110 coro_destruct_stacks (aTHX);
1111 1208
1112 /* restore swapped sv's */ 1209 /* restore swapped sv's */
1113 SWAP_SVS (coro); 1210 SWAP_SVS (coro);
1114 1211
1212 coro_destruct_stacks (aTHX);
1213
1115 // now save some sv's to be free'd later 1214 /* now save some sv's to be free'd later */
1116 svf [0] = GvSV (PL_defgv); 1215 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv); 1216 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv); 1217 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv; 1218 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs; 1219 svf [4] = PL_rs;
… …
1122 svf [6] = (SV *)GvHV (PL_hintgv); 1221 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook; 1222 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook; 1223 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf)); 1224 assert (9 == sizeof (svf) / sizeof (*svf));
1126 1225
1226 SvRV_set (coro_current, old_current);
1227
1127 load_perl (aTHX_ current); 1228 load_perl (aTHX_ current);
1128 } 1229 }
1129 1230
1130 { 1231 {
1131 unsigned int i; 1232 unsigned int i;
… …
1138 SvREFCNT_dec (coro->invoke_cb); 1239 SvREFCNT_dec (coro->invoke_cb);
1139 SvREFCNT_dec (coro->invoke_av); 1240 SvREFCNT_dec (coro->invoke_av);
1140 } 1241 }
1141} 1242}
1142 1243
1143INLINE void 1244ecb_inline void
1144free_coro_mortal (pTHX) 1245free_coro_mortal (pTHX)
1145{ 1246{
1146 if (expect_true (coro_mortal)) 1247 if (ecb_expect_true (coro_mortal))
1147 { 1248 {
1148 SvREFCNT_dec (coro_mortal); 1249 SvREFCNT_dec ((SV *)coro_mortal);
1149 coro_mortal = 0; 1250 coro_mortal = 0;
1150 } 1251 }
1151} 1252}
1152 1253
1153static int 1254static int
… …
1286 1387
1287 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1388 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1288} 1389}
1289 1390
1290/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1391/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1291static void NOINLINE 1392static void ecb_noinline
1292cctx_prepare (pTHX) 1393cctx_prepare (pTHX)
1293{ 1394{
1294 PL_top_env = &PL_start_env; 1395 PL_top_env = &PL_start_env;
1295 1396
1296 if (cctx_current->flags & CC_TRACE) 1397 if (cctx_current->flags & CC_TRACE)
… …
1307 slf_frame.prepare = slf_prepare_set_stacklevel; 1408 slf_frame.prepare = slf_prepare_set_stacklevel;
1308 slf_frame.check = slf_check_set_stacklevel; 1409 slf_frame.check = slf_check_set_stacklevel;
1309} 1410}
1310 1411
1311/* the tail of transfer: execute stuff we can only do after a transfer */ 1412/* the tail of transfer: execute stuff we can only do after a transfer */
1312INLINE void 1413ecb_inline void
1313transfer_tail (pTHX) 1414transfer_tail (pTHX)
1314{ 1415{
1315 free_coro_mortal (aTHX); 1416 free_coro_mortal (aTHX);
1316} 1417}
1317 1418
… …
1361 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1462 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1362 } 1463 }
1363} 1464}
1364 1465
1365static coro_cctx * 1466static coro_cctx *
1366cctx_new () 1467cctx_new (void)
1367{ 1468{
1368 coro_cctx *cctx; 1469 coro_cctx *cctx;
1369 1470
1370 ++cctx_count; 1471 ++cctx_count;
1371 New (0, cctx, 1, coro_cctx); 1472 New (0, cctx, 1, coro_cctx);
… …
1377 return cctx; 1478 return cctx;
1378} 1479}
1379 1480
1380/* create a new cctx only suitable as source */ 1481/* create a new cctx only suitable as source */
1381static coro_cctx * 1482static coro_cctx *
1382cctx_new_empty () 1483cctx_new_empty (void)
1383{ 1484{
1384 coro_cctx *cctx = cctx_new (); 1485 coro_cctx *cctx = cctx_new ();
1385 1486
1386 cctx->sptr = 0; 1487 cctx->sptr = 0;
1387 coro_create (&cctx->cctx, 0, 0, 0, 0); 1488 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1389 return cctx; 1490 return cctx;
1390} 1491}
1391 1492
1392/* create a new cctx suitable as destination/running a perl interpreter */ 1493/* create a new cctx suitable as destination/running a perl interpreter */
1393static coro_cctx * 1494static coro_cctx *
1394cctx_new_run () 1495cctx_new_run (void)
1395{ 1496{
1396 coro_cctx *cctx = cctx_new (); 1497 coro_cctx *cctx = cctx_new ();
1397 void *stack_start; 1498 void *stack_start;
1398 size_t stack_size; 1499 size_t stack_size;
1399 1500
1400#if HAVE_MMAP 1501#if HAVE_MMAP
1401 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1502 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1402 /* mmap supposedly does allocate-on-write for us */ 1503 /* mmap supposedly does allocate-on-write for us */
1403 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1504 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1404 1505
1405 if (cctx->sptr != (void *)-1) 1506 if (cctx->sptr != (void *)-1)
1406 { 1507 {
1407 #if CORO_STACKGUARD 1508 #if CORO_STACKGUARD
1408 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1509 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1440cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1441{ 1542{
1442 if (!cctx) 1543 if (!cctx)
1443 return; 1544 return;
1444 1545
1445 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1446 1547
1447 --cctx_count; 1548 --cctx_count;
1448 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1449 1550
1450 /* coro_transfer creates new, empty cctx's */ 1551 /* coro_transfer creates new, empty cctx's */
… …
1469#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1570#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1470 1571
1471static coro_cctx * 1572static coro_cctx *
1472cctx_get (pTHX) 1573cctx_get (pTHX)
1473{ 1574{
1474 while (expect_true (cctx_first)) 1575 while (ecb_expect_true (cctx_first))
1475 { 1576 {
1476 coro_cctx *cctx = cctx_first; 1577 coro_cctx *cctx = cctx_first;
1477 cctx_first = cctx->next; 1578 cctx_first = cctx->next;
1478 --cctx_idle; 1579 --cctx_idle;
1479 1580
1480 if (expect_true (!CCTX_EXPIRED (cctx))) 1581 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1481 return cctx; 1582 return cctx;
1482 1583
1483 cctx_destroy (cctx); 1584 cctx_destroy (cctx);
1484 } 1585 }
1485 1586
… …
1490cctx_put (coro_cctx *cctx) 1591cctx_put (coro_cctx *cctx)
1491{ 1592{
1492 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1593 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1493 1594
1494 /* free another cctx if overlimit */ 1595 /* free another cctx if overlimit */
1495 if (expect_false (cctx_idle >= cctx_max_idle)) 1596 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1496 { 1597 {
1497 coro_cctx *first = cctx_first; 1598 coro_cctx *first = cctx_first;
1498 cctx_first = first->next; 1599 cctx_first = first->next;
1499 --cctx_idle; 1600 --cctx_idle;
1500 1601
… …
1511static void 1612static void
1512transfer_check (pTHX_ struct coro *prev, struct coro *next) 1613transfer_check (pTHX_ struct coro *prev, struct coro *next)
1513{ 1614{
1514 /* TODO: throwing up here is considered harmful */ 1615 /* TODO: throwing up here is considered harmful */
1515 1616
1516 if (expect_true (prev != next)) 1617 if (ecb_expect_true (prev != next))
1517 { 1618 {
1518 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1619 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1519 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1620 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1520 1621
1521 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1622 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1522 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1623 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1523 1624
1524#if !PERL_VERSION_ATLEAST (5,10,0) 1625#if !PERL_VERSION_ATLEAST (5,10,0)
1525 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1626 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1526 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1627 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1527#endif 1628#endif
1528 } 1629 }
1529} 1630}
1530 1631
1531/* always use the TRANSFER macro */ 1632/* always use the TRANSFER macro */
1532static void NOINLINE /* noinline so we have a fixed stackframe */ 1633static void ecb_noinline /* noinline so we have a fixed stackframe */
1533transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1634transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1534{ 1635{
1535 dSTACKLEVEL; 1636 dSTACKLEVEL;
1536 1637
1537 /* sometimes transfer is only called to set idle_sp */ 1638 /* sometimes transfer is only called to set idle_sp */
1538 if (expect_false (!prev)) 1639 if (ecb_expect_false (!prev))
1539 { 1640 {
1540 cctx_current->idle_sp = STACKLEVEL; 1641 cctx_current->idle_sp = STACKLEVEL;
1541 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1642 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1542 } 1643 }
1543 else if (expect_true (prev != next)) 1644 else if (ecb_expect_true (prev != next))
1544 { 1645 {
1545 coro_cctx *cctx_prev; 1646 coro_cctx *cctx_prev;
1546 1647
1547 if (expect_false (prev->flags & CF_NEW)) 1648 if (ecb_expect_false (prev->flags & CF_NEW))
1548 { 1649 {
1549 /* create a new empty/source context */ 1650 /* create a new empty/source context */
1550 prev->flags &= ~CF_NEW; 1651 prev->flags &= ~CF_NEW;
1551 prev->flags |= CF_RUNNING; 1652 prev->flags |= CF_RUNNING;
1552 } 1653 }
… …
1555 next->flags |= CF_RUNNING; 1656 next->flags |= CF_RUNNING;
1556 1657
1557 /* first get rid of the old state */ 1658 /* first get rid of the old state */
1558 save_perl (aTHX_ prev); 1659 save_perl (aTHX_ prev);
1559 1660
1560 if (expect_false (next->flags & CF_NEW)) 1661 if (ecb_expect_false (next->flags & CF_NEW))
1561 { 1662 {
1562 /* need to start coroutine */ 1663 /* need to start coroutine */
1563 next->flags &= ~CF_NEW; 1664 next->flags &= ~CF_NEW;
1564 /* setup coroutine call */ 1665 /* setup coroutine call */
1565 init_perl (aTHX_ next); 1666 init_perl (aTHX_ next);
1566 } 1667 }
1567 else 1668 else
1568 load_perl (aTHX_ next); 1669 load_perl (aTHX_ next);
1569 1670
1570 /* possibly untie and reuse the cctx */ 1671 /* possibly untie and reuse the cctx */
1571 if (expect_true ( 1672 if (ecb_expect_true (
1572 cctx_current->idle_sp == STACKLEVEL 1673 cctx_current->idle_sp == STACKLEVEL
1573 && !(cctx_current->flags & CC_TRACE) 1674 && !(cctx_current->flags & CC_TRACE)
1574 && !force_cctx 1675 && !force_cctx
1575 )) 1676 ))
1576 { 1677 {
1577 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1678 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1578 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1679 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1579 1680
1580 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1681 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1581 /* without this the next cctx_get might destroy the running cctx while still in use */ 1682 /* without this the next cctx_get might destroy the running cctx while still in use */
1582 if (expect_false (CCTX_EXPIRED (cctx_current))) 1683 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1583 if (expect_true (!next->cctx)) 1684 if (ecb_expect_true (!next->cctx))
1584 next->cctx = cctx_get (aTHX); 1685 next->cctx = cctx_get (aTHX);
1585 1686
1586 cctx_put (cctx_current); 1687 cctx_put (cctx_current);
1587 } 1688 }
1588 else 1689 else
1589 prev->cctx = cctx_current; 1690 prev->cctx = cctx_current;
1590 1691
1591 ++next->usecount; 1692 ++next->usecount;
1592 1693
1593 cctx_prev = cctx_current; 1694 cctx_prev = cctx_current;
1594 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1695 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1595 1696
1596 next->cctx = 0; 1697 next->cctx = 0;
1597 1698
1598 if (expect_false (cctx_prev != cctx_current)) 1699 if (ecb_expect_false (cctx_prev != cctx_current))
1599 { 1700 {
1600 cctx_prev->top_env = PL_top_env; 1701 cctx_prev->top_env = PL_top_env;
1601 PL_top_env = cctx_current->top_env; 1702 PL_top_env = cctx_current->top_env;
1602 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1703 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1603 } 1704 }
… …
1609#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1710#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1610#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1711#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1611 1712
1612/** high level stuff ********************************************************/ 1713/** high level stuff ********************************************************/
1613 1714
1715/* this function is actually Coro, not Coro::State, but we call it from here */
1716/* because it is convenient - but it hasn't been declared yet for that reason */
1614static int 1717static void
1718coro_call_on_destroy (pTHX_ struct coro *coro);
1719
1720static void
1615coro_state_destroy (pTHX_ struct coro *coro) 1721coro_state_destroy (pTHX_ struct coro *coro)
1616{ 1722{
1617 if (coro->flags & CF_DESTROYED) 1723 if (coro->flags & CF_ZOMBIE)
1618 return 0; 1724 return;
1619 1725
1620 if (coro->on_destroy && !PL_dirty)
1621 coro->on_destroy (aTHX_ coro); 1726 slf_destroy (aTHX_ coro);
1622 1727
1623 coro->flags |= CF_DESTROYED; 1728 coro->flags |= CF_ZOMBIE;
1624 1729
1625 if (coro->flags & CF_READY) 1730 if (coro->flags & CF_READY)
1626 { 1731 {
1627 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1732 /* reduce nready, as destroying a ready coro effectively unreadies it */
1628 /* alternative: look through all ready queues and remove the coro */ 1733 /* alternative: look through all ready queues and remove the coro */
1629 --coro_nready; 1734 --coro_nready;
1630 } 1735 }
1631 else 1736 else
1632 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1737 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1738
1739 if (coro->next) coro->next->prev = coro->prev;
1740 if (coro->prev) coro->prev->next = coro->next;
1741 if (coro == coro_first) coro_first = coro->next;
1633 1742
1634 if (coro->mainstack 1743 if (coro->mainstack
1635 && coro->mainstack != main_mainstack 1744 && coro->mainstack != main_mainstack
1636 && coro->slot 1745 && coro->slot
1637 && !PL_dirty) 1746 && !PL_dirty)
1638 destroy_perl (aTHX_ coro); 1747 destroy_perl (aTHX_ coro);
1639 1748
1640 if (coro->next) coro->next->prev = coro->prev;
1641 if (coro->prev) coro->prev->next = coro->next;
1642 if (coro == coro_first) coro_first = coro->next;
1643
1644 cctx_destroy (coro->cctx); 1749 cctx_destroy (coro->cctx);
1645 SvREFCNT_dec (coro->startcv); 1750 SvREFCNT_dec (coro->startcv);
1646 SvREFCNT_dec (coro->args); 1751 SvREFCNT_dec (coro->args);
1647 SvREFCNT_dec (coro->swap_sv); 1752 SvREFCNT_dec (coro->swap_sv);
1648 SvREFCNT_dec (CORO_THROW); 1753 SvREFCNT_dec (CORO_THROW);
1649 1754
1650 return 1; 1755 coro_call_on_destroy (aTHX_ coro);
1756
1757 /* more destruction mayhem in coro_state_free */
1651} 1758}
1652 1759
1653static int 1760static int
1654coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1761coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1655{ 1762{
1656 struct coro *coro = (struct coro *)mg->mg_ptr; 1763 struct coro *coro = (struct coro *)mg->mg_ptr;
1657 mg->mg_ptr = 0; 1764 mg->mg_ptr = 0;
1658 1765
1659 coro->hv = 0;
1660
1661 if (--coro->refcnt < 0)
1662 {
1663 coro_state_destroy (aTHX_ coro); 1766 coro_state_destroy (aTHX_ coro);
1767 SvREFCNT_dec (coro->on_destroy);
1768 SvREFCNT_dec (coro->status);
1769
1664 Safefree (coro); 1770 Safefree (coro);
1665 }
1666 1771
1667 return 0; 1772 return 0;
1668} 1773}
1669 1774
1670static int 1775static int ecb_cold
1671coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1776coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1672{ 1777{
1673 struct coro *coro = (struct coro *)mg->mg_ptr; 1778 /* called when perl clones the current process the slow way (windows process emulation) */
1674 1779 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1675 ++coro->refcnt; 1780 mg->mg_ptr = 0;
1781 mg->mg_virtual = 0;
1676 1782
1677 return 0; 1783 return 0;
1678} 1784}
1679 1785
1680static MGVTBL coro_state_vtbl = { 1786static MGVTBL coro_state_vtbl = {
… …
1705 TRANSFER (ta, 1); 1811 TRANSFER (ta, 1);
1706} 1812}
1707 1813
1708/** Coro ********************************************************************/ 1814/** Coro ********************************************************************/
1709 1815
1710INLINE void 1816ecb_inline void
1711coro_enq (pTHX_ struct coro *coro) 1817coro_enq (pTHX_ struct coro *coro)
1712{ 1818{
1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1819 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1714 1820
1715 SvREFCNT_inc_NN (coro->hv); 1821 SvREFCNT_inc_NN (coro->hv);
… …
1717 coro->next_ready = 0; 1823 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1824 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro; 1825 ready [1] = coro;
1720} 1826}
1721 1827
1722INLINE struct coro * 1828ecb_inline struct coro *
1723coro_deq (pTHX) 1829coro_deq (pTHX)
1724{ 1830{
1725 int prio; 1831 int prio;
1726 1832
1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1833 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1780{ 1886{
1781 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1887 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1782} 1888}
1783 1889
1784/* expects to own a reference to next->hv */ 1890/* expects to own a reference to next->hv */
1785INLINE void 1891ecb_inline void
1786prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1892prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1787{ 1893{
1788 SV *prev_sv = SvRV (coro_current); 1894 SV *prev_sv = SvRV (coro_current);
1789 1895
1790 ta->prev = SvSTATE_hv (prev_sv); 1896 ta->prev = SvSTATE_hv (prev_sv);
… …
1803{ 1909{
1804 for (;;) 1910 for (;;)
1805 { 1911 {
1806 struct coro *next = coro_deq (aTHX); 1912 struct coro *next = coro_deq (aTHX);
1807 1913
1808 if (expect_true (next)) 1914 if (ecb_expect_true (next))
1809 { 1915 {
1810 /* cannot transfer to destroyed coros, skip and look for next */ 1916 /* cannot transfer to destroyed coros, skip and look for next */
1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1917 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1812 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1918 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1813 else 1919 else
1814 { 1920 {
1815 next->flags &= ~CF_READY; 1921 next->flags &= ~CF_READY;
1816 --coro_nready; 1922 --coro_nready;
… …
1823 { 1929 {
1824 /* nothing to schedule: call the idle handler */ 1930 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle) 1931 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle))) 1932 && SvOBJECT (SvRV (sv_idle)))
1827 { 1933 {
1934 if (SvRV (sv_idle) == SvRV (coro_current))
1935 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1936
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1937 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle)); 1938 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready; 1939 --coro_nready;
1831 } 1940 }
1832 else 1941 else
… …
1846 } 1955 }
1847 } 1956 }
1848 } 1957 }
1849} 1958}
1850 1959
1851INLINE void 1960ecb_inline void
1852prepare_cede (pTHX_ struct coro_transfer_args *ta) 1961prepare_cede (pTHX_ struct coro_transfer_args *ta)
1853{ 1962{
1854 api_ready (aTHX_ coro_current); 1963 api_ready (aTHX_ coro_current);
1855 prepare_schedule (aTHX_ ta); 1964 prepare_schedule (aTHX_ ta);
1856} 1965}
1857 1966
1858INLINE void 1967ecb_inline void
1859prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1860{ 1969{
1861 SV *prev = SvRV (coro_current); 1970 SV *prev = SvRV (coro_current);
1862 1971
1863 if (coro_nready) 1972 if (coro_nready)
… …
1893{ 2002{
1894 struct coro_transfer_args ta; 2003 struct coro_transfer_args ta;
1895 2004
1896 prepare_cede (aTHX_ &ta); 2005 prepare_cede (aTHX_ &ta);
1897 2006
1898 if (expect_true (ta.prev != ta.next)) 2007 if (ecb_expect_true (ta.prev != ta.next))
1899 { 2008 {
1900 TRANSFER (ta, 1); 2009 TRANSFER (ta, 1);
1901 return 1; 2010 return 1;
1902 } 2011 }
1903 else 2012 else
… …
1946 coro->slot->runops = RUNOPS_DEFAULT; 2055 coro->slot->runops = RUNOPS_DEFAULT;
1947 } 2056 }
1948} 2057}
1949 2058
1950static void 2059static void
2060coro_push_av (pTHX_ AV *av, I32 gimme_v)
2061{
2062 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2063 {
2064 dSP;
2065
2066 if (gimme_v == G_SCALAR)
2067 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2068 else
2069 {
2070 int i;
2071 EXTEND (SP, AvFILLp (av) + 1);
2072
2073 for (i = 0; i <= AvFILLp (av); ++i)
2074 PUSHs (AvARRAY (av)[i]);
2075 }
2076
2077 PUTBACK;
2078 }
2079}
2080
2081static void
2082coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2083{
2084 if (!coro->on_destroy)
2085 coro->on_destroy = newAV ();
2086
2087 av_push (coro->on_destroy, cb);
2088}
2089
2090static void
2091slf_destroy_join (pTHX_ struct CoroSLF *frame)
2092{
2093 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2094}
2095
2096static int
2097slf_check_join (pTHX_ struct CoroSLF *frame)
2098{
2099 struct coro *coro = (struct coro *)frame->data;
2100
2101 if (!coro->status)
2102 return 1;
2103
2104 frame->destroy = 0;
2105
2106 coro_push_av (aTHX_ coro->status, GIMME_V);
2107
2108 SvREFCNT_dec ((SV *)coro->hv);
2109
2110 return 0;
2111}
2112
2113static void
2114slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2115{
2116 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2117
2118 if (items > 1)
2119 croak ("join called with too many arguments");
2120
2121 if (coro->status)
2122 frame->prepare = prepare_nop;
2123 else
2124 {
2125 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2126 frame->prepare = prepare_schedule;
2127 }
2128
2129 frame->check = slf_check_join;
2130 frame->destroy = slf_destroy_join;
2131 frame->data = (void *)coro;
2132 SvREFCNT_inc (coro->hv);
2133}
2134
2135static void
1951coro_call_on_destroy (pTHX_ struct coro *coro) 2136coro_call_on_destroy (pTHX_ struct coro *coro)
1952{ 2137{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2138 AV *od = coro->on_destroy;
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955 2139
1956 if (on_destroyp) 2140 if (!od)
1957 { 2141 return;
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1959 2142
1960 while (AvFILLp (on_destroy) >= 0) 2143 while (AvFILLp (od) >= 0)
2144 {
2145 SV *cb = sv_2mortal (av_pop (od));
2146
2147 /* coro hv's (and only hv's at the moment) are supported as well */
2148 if (SvSTATEhv_p (aTHX_ cb))
2149 api_ready (aTHX_ cb);
2150 else
1961 { 2151 {
1962 dSP; /* don't disturb outer sp */ 2152 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy);
1964
1965 PUSHMARK (SP); 2153 PUSHMARK (SP);
1966 2154
1967 if (statusp) 2155 if (coro->status)
1968 { 2156 {
1969 int i; 2157 PUTBACK;
1970 AV *status = (AV *)SvRV (*statusp); 2158 coro_push_av (aTHX_ coro->status, G_ARRAY);
1971 EXTEND (SP, AvFILLp (status) + 1); 2159 SPAGAIN;
1972
1973 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]);
1975 } 2160 }
1976 2161
1977 PUTBACK; 2162 PUTBACK;
1978 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2163 call_sv (cb, G_VOID | G_DISCARD);
1979 } 2164 }
1980 } 2165 }
1981} 2166}
1982 2167
1983static void 2168static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2169coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1985{ 2170{
1986 int i; 2171 AV *av;
1987 HV *hv = (HV *)SvRV (coro_current); 2172
1988 AV *av = newAV (); 2173 if (coro->status)
2174 {
2175 av = coro->status;
2176 av_clear (av);
2177 }
2178 else
2179 av = coro->status = newAV ();
1989 2180
1990 /* items are actually not so common, so optimise for this case */ 2181 /* items are actually not so common, so optimise for this case */
1991 if (items) 2182 if (items)
1992 { 2183 {
2184 int i;
2185
1993 av_extend (av, items - 1); 2186 av_extend (av, items - 1);
1994 2187
1995 for (i = 0; i < items; ++i) 2188 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i])); 2189 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 } 2190 }
2191}
1998 2192
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2193static void
2000 2194slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2195{
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2196 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager); 2197 api_ready (aTHX_ sv_manager);
2003 2198
2004 frame->prepare = prepare_schedule; 2199 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat; 2200 frame->check = slf_check_repeat;
2006 2201
2007 /* as a minor optimisation, we could unwind all stacks here */ 2202 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */ 2203 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/ 2204 /*coro_unwind_stacks (aTHX);*/
2205}
2206
2207static void
2208slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2209{
2210 HV *coro_hv = (HV *)SvRV (coro_current);
2211
2212 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2213 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2214}
2215
2216static void
2217slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{
2219 HV *coro_hv;
2220 struct coro *coro;
2221
2222 if (items <= 0)
2223 croak ("Coro::cancel called without coro object,");
2224
2225 coro = SvSTATE (arg [0]);
2226 coro_hv = coro->hv;
2227
2228 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2229
2230 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2231 {
2232 /* coro currently busy cancelling something, so just notify it */
2233 coro->slf_frame.data = (void *)coro;
2234
2235 frame->prepare = prepare_nop;
2236 frame->check = slf_check_nop;
2237 }
2238 else if (coro_hv == (HV *)SvRV (coro_current))
2239 {
2240 /* cancelling the current coro is allowed, and equals terminate */
2241 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2242 }
2243 else
2244 {
2245 struct coro *self = SvSTATE_current;
2246
2247 /* otherwise we cancel directly, purely for speed reasons
2248 * unfortunately, this requires some magic trickery, as
2249 * somebody else could cancel us, so we have to fight the cancellation.
2250 * this is ugly, and hopefully fully worth the extra speed.
2251 * besides, I can't get the slow-but-safe version working...
2252 */
2253 slf_frame.data = 0;
2254 self->flags |= CF_NOCANCEL;
2255 coro_state_destroy (aTHX_ coro);
2256 self->flags &= ~CF_NOCANCEL;
2257
2258 if (slf_frame.data)
2259 {
2260 /* while we were busy we have been cancelled, so terminate */
2261 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2262 }
2263 else
2264 {
2265 frame->prepare = prepare_nop;
2266 frame->check = slf_check_nop;
2267 }
2268 }
2269}
2270
2271static int
2272slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2273{
2274 frame->prepare = 0;
2275 coro_unwind_stacks (aTHX);
2276
2277 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2278
2279 return 1;
2280}
2281
2282static int
2283safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2284{
2285 if (coro->cctx)
2286 croak ("coro inside C callback, unable to cancel at this time, caught");
2287
2288 if (coro->flags & CF_NEW)
2289 {
2290 coro_set_status (aTHX_ coro, arg, items);
2291 coro_state_destroy (aTHX_ coro);
2292 }
2293 else
2294 {
2295 if (!coro->slf_frame.prepare)
2296 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2297
2298 slf_destroy (aTHX_ coro);
2299
2300 coro_set_status (aTHX_ coro, arg, items);
2301 coro->slf_frame.prepare = prepare_nop;
2302 coro->slf_frame.check = slf_check_safe_cancel;
2303
2304 api_ready (aTHX_ (SV *)coro->hv);
2305 }
2306
2307 return 1;
2010} 2308}
2011 2309
2012/*****************************************************************************/ 2310/*****************************************************************************/
2013/* async pool handler */ 2311/* async pool handler */
2014 2312
… …
2045slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2343slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2046{ 2344{
2047 HV *hv = (HV *)SvRV (coro_current); 2345 HV *hv = (HV *)SvRV (coro_current);
2048 struct coro *coro = SvSTATE_hv ((SV *)hv); 2346 struct coro *coro = SvSTATE_hv ((SV *)hv);
2049 2347
2050 if (expect_true (coro->saved_deffh)) 2348 if (ecb_expect_true (coro->saved_deffh))
2051 { 2349 {
2052 /* subsequent iteration */ 2350 /* subsequent iteration */
2053 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2351 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2054 coro->saved_deffh = 0; 2352 coro->saved_deffh = 0;
2055 2353
2056 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2354 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2057 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2355 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2058 { 2356 {
2059 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2357 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2060 coro->invoke_av = newAV (); 2358 return;
2061
2062 frame->prepare = prepare_nop;
2063 } 2359 }
2064 else 2360 else
2065 { 2361 {
2066 av_clear (GvAV (PL_defgv)); 2362 av_clear (GvAV (PL_defgv));
2067 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2363 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2290static void 2586static void
2291slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2587slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2292{ 2588{
2293 frame->prepare = prepare_cede_notself; 2589 frame->prepare = prepare_cede_notself;
2294 frame->check = slf_check_nop; 2590 frame->check = slf_check_nop;
2591}
2592
2593/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2594static void
2595slf_destroy (pTHX_ struct coro *coro)
2596{
2597 /* this callback is reserved for slf functions needing to do cleanup */
2598 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2599 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2600
2601 /*
2602 * The on_destroy above most likely is from an SLF call.
2603 * Since by definition the SLF call will not finish when we destroy
2604 * the coro, we will have to force-finish it here, otherwise
2605 * cleanup functions cannot call SLF functions.
2606 */
2607 coro->slf_frame.prepare = 0;
2295} 2608}
2296 2609
2297/* 2610/*
2298 * these not obviously related functions are all rolled into one 2611 * these not obviously related functions are all rolled into one
2299 * function to increase chances that they all will call transfer with the same 2612 * function to increase chances that they all will call transfer with the same
… …
2306 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2619 I32 checkmark; /* mark SP to see how many elements check has pushed */
2307 2620
2308 /* set up the slf frame, unless it has already been set-up */ 2621 /* set up the slf frame, unless it has already been set-up */
2309 /* the latter happens when a new coro has been started */ 2622 /* the latter happens when a new coro has been started */
2310 /* or when a new cctx was attached to an existing coroutine */ 2623 /* or when a new cctx was attached to an existing coroutine */
2311 if (expect_true (!slf_frame.prepare)) 2624 if (ecb_expect_true (!slf_frame.prepare))
2312 { 2625 {
2313 /* first iteration */ 2626 /* first iteration */
2314 dSP; 2627 dSP;
2315 SV **arg = PL_stack_base + TOPMARK + 1; 2628 SV **arg = PL_stack_base + TOPMARK + 1;
2316 int items = SP - arg; /* args without function object */ 2629 int items = SP - arg; /* args without function object */
… …
2357 while (slf_frame.check (aTHX_ &slf_frame)); 2670 while (slf_frame.check (aTHX_ &slf_frame));
2358 2671
2359 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2672 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2360 2673
2361 /* exception handling */ 2674 /* exception handling */
2362 if (expect_false (CORO_THROW)) 2675 if (ecb_expect_false (CORO_THROW))
2363 { 2676 {
2364 SV *exception = sv_2mortal (CORO_THROW); 2677 SV *exception = sv_2mortal (CORO_THROW);
2365 2678
2366 CORO_THROW = 0; 2679 CORO_THROW = 0;
2367 sv_setsv (ERRSV, exception); 2680 sv_setsv (ERRSV, exception);
2368 croak (0); 2681 croak (0);
2369 } 2682 }
2370 2683
2371 /* return value handling - mostly like entersub */ 2684 /* return value handling - mostly like entersub */
2372 /* make sure we put something on the stack in scalar context */ 2685 /* make sure we put something on the stack in scalar context */
2373 if (GIMME_V == G_SCALAR) 2686 if (GIMME_V == G_SCALAR
2687 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2374 { 2688 {
2375 dSP; 2689 dSP;
2376 SV **bot = PL_stack_base + checkmark; 2690 SV **bot = PL_stack_base + checkmark;
2377 2691
2378 if (sp == bot) /* too few, push undef */ 2692 if (sp == bot) /* too few, push undef */
2379 bot [1] = &PL_sv_undef; 2693 bot [1] = &PL_sv_undef;
2380 else if (sp != bot + 1) /* too many, take last one */ 2694 else /* too many, take last one */
2381 bot [1] = *sp; 2695 bot [1] = *sp;
2382 2696
2383 SP = bot + 1; 2697 SP = bot + 1;
2384 2698
2385 PUTBACK; 2699 PUTBACK;
… …
2418 if (PL_op->op_flags & OPf_STACKED) 2732 if (PL_op->op_flags & OPf_STACKED)
2419 { 2733 {
2420 if (items > slf_arga) 2734 if (items > slf_arga)
2421 { 2735 {
2422 slf_arga = items; 2736 slf_arga = items;
2423 free (slf_argv); 2737 Safefree (slf_argv);
2424 slf_argv = malloc (slf_arga * sizeof (SV *)); 2738 New (0, slf_argv, slf_arga, SV *);
2425 } 2739 }
2426 2740
2427 slf_argc = items; 2741 slf_argc = items;
2428 2742
2429 for (i = 0; i < items; ++i) 2743 for (i = 0; i < items; ++i)
… …
2492{ 2806{
2493 PerlIOBuf base; 2807 PerlIOBuf base;
2494 NV next, every; 2808 NV next, every;
2495} PerlIOCede; 2809} PerlIOCede;
2496 2810
2497static IV 2811static IV ecb_cold
2498PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2812PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2499{ 2813{
2500 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2814 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2501 2815
2502 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2816 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2503 self->next = nvtime () + self->every; 2817 self->next = nvtime () + self->every;
2504 2818
2505 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2819 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2506} 2820}
2507 2821
2508static SV * 2822static SV * ecb_cold
2509PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2823PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2510{ 2824{
2511 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2825 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2512 2826
2513 return newSVnv (self->every); 2827 return newSVnv (self->every);
… …
2625 SvREFCNT_dec (cb); 2939 SvREFCNT_dec (cb);
2626 } 2940 }
2627} 2941}
2628 2942
2629static void 2943static void
2630coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2944coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2631{ 2945{
2632 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2946 /* call $sem->adjust (0) to possibly wake up some other waiters */
2633 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2947 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2634} 2948}
2635 2949
2636static int 2950static int
2637slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2951slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2638{ 2952{
2639 AV *av = (AV *)frame->data; 2953 AV *av = (AV *)frame->data;
2640 SV *count_sv = AvARRAY (av)[0]; 2954 SV *count_sv = AvARRAY (av)[0];
2955 SV *coro_hv = SvRV (coro_current);
2641 2956
2642 /* if we are about to throw, don't actually acquire the lock, just throw */ 2957 /* if we are about to throw, don't actually acquire the lock, just throw */
2643 if (CORO_THROW) 2958 if (CORO_THROW)
2644 return 0; 2959 return 0;
2645 else if (SvIVX (count_sv) > 0) 2960 else if (SvIVX (count_sv) > 0)
2646 { 2961 {
2647 SvSTATE_current->on_destroy = 0; 2962 frame->destroy = 0;
2648 2963
2649 if (acquire) 2964 if (acquire)
2650 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2965 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2651 else 2966 else
2652 coro_semaphore_adjust (aTHX_ av, 0); 2967 coro_semaphore_adjust (aTHX_ av, 0);
… …
2657 { 2972 {
2658 int i; 2973 int i;
2659 /* if we were woken up but can't down, we look through the whole */ 2974 /* if we were woken up but can't down, we look through the whole */
2660 /* waiters list and only add us if we aren't in there already */ 2975 /* waiters list and only add us if we aren't in there already */
2661 /* this avoids some degenerate memory usage cases */ 2976 /* this avoids some degenerate memory usage cases */
2662 2977 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2663 for (i = 1; i <= AvFILLp (av); ++i)
2664 if (AvARRAY (av)[i] == SvRV (coro_current)) 2978 if (AvARRAY (av)[i] == coro_hv)
2665 return 1; 2979 return 1;
2666 2980
2667 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2981 av_push (av, SvREFCNT_inc (coro_hv));
2668 return 1; 2982 return 1;
2669 } 2983 }
2670} 2984}
2671 2985
2672static int 2986static int
… …
2695 { 3009 {
2696 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3010 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2697 3011
2698 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3012 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2699 frame->prepare = prepare_schedule; 3013 frame->prepare = prepare_schedule;
2700
2701 /* to avoid race conditions when a woken-up coro gets terminated */ 3014 /* to avoid race conditions when a woken-up coro gets terminated */
2702 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3015 /* we arrange for a temporary on_destroy that calls adjust (0) */
2703 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3016 frame->destroy = coro_semaphore_destroy;
2704 } 3017 }
2705} 3018}
2706 3019
2707static void 3020static void
2708slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3021slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2790 { 3103 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]); 3104 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3105 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793 3106
2794 if (SvIVX (AvARRAY (av)[0])) 3107 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3108 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2796 3109
2797 frame->prepare = prepare_nop; 3110 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop; 3111 frame->check = slf_check_nop;
2799 } 3112 }
2800 else if (SvIVX (AvARRAY (av)[0])) 3113 else if (SvIVX (AvARRAY (av)[0]))
… …
2926 dSP; 3239 dSP;
2927 3240
2928 static SV *prio_cv; 3241 static SV *prio_cv;
2929 static SV *prio_sv; 3242 static SV *prio_sv;
2930 3243
2931 if (expect_false (!prio_cv)) 3244 if (ecb_expect_false (!prio_cv))
2932 { 3245 {
2933 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3246 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2934 prio_sv = newSViv (0); 3247 prio_sv = newSViv (0);
2935 } 3248 }
2936 3249
… …
2962 /* now call the AIO function - we assume our request is uncancelable */ 3275 /* now call the AIO function - we assume our request is uncancelable */
2963 PUTBACK; 3276 PUTBACK;
2964 call_sv ((SV *)req, G_VOID | G_DISCARD); 3277 call_sv ((SV *)req, G_VOID | G_DISCARD);
2965 } 3278 }
2966 3279
2967 /* now that the requets is going, we loop toll we have a result */ 3280 /* now that the request is going, we loop till we have a result */
2968 frame->data = (void *)state; 3281 frame->data = (void *)state;
2969 frame->prepare = prepare_schedule; 3282 frame->prepare = prepare_schedule;
2970 frame->check = slf_check_aio_req; 3283 frame->check = slf_check_aio_req;
2971} 3284}
2972 3285
… …
3042 } 3355 }
3043 3356
3044 return coro_sv; 3357 return coro_sv;
3045} 3358}
3046 3359
3360#ifndef __cplusplus
3361ecb_cold XS(boot_Coro__State);
3362#endif
3363
3364#if CORO_JIT
3365
3366static void ecb_noinline ecb_cold
3367pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3368{
3369 dSP;
3370 AV *av = newAV ();
3371
3372 av_store (av, 3, newSVuv (d));
3373 av_store (av, 2, newSVuv (c));
3374 av_store (av, 1, newSVuv (b));
3375 av_store (av, 0, newSVuv (a));
3376
3377 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3378
3379 PUTBACK;
3380}
3381
3382static void ecb_noinline ecb_cold
3383jit_init (pTHX)
3384{
3385 dSP;
3386 SV *load, *save;
3387 char *map_base;
3388 char *load_ptr, *save_ptr;
3389 STRLEN load_len, save_len, map_len;
3390 int count;
3391
3392 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3393
3394 PUSHMARK (SP);
3395#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3396# include "state.h"
3397#undef VARx
3398 count = call_pv ("Coro::State::_jit", G_ARRAY);
3399 SPAGAIN;
3400
3401 save = POPs; save_ptr = SvPVbyte (save, save_len);
3402 load = POPs; load_ptr = SvPVbyte (load, load_len);
3403
3404 map_len = load_len + save_len + 16;
3405
3406 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3407
3408 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3409
3410 load_perl_slots = (load_save_perl_slots_type)map_base;
3411 memcpy (map_base, load_ptr, load_len);
3412
3413 map_base += (load_len + 15) & ~15;
3414
3415 save_perl_slots = (load_save_perl_slots_type)map_base;
3416 memcpy (map_base, save_ptr, save_len);
3417
3418 /* we are good citizens and try to make the page read-only, so the evil evil */
3419 /* hackers might have it a bit more difficult */
3420 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3421
3422 PUTBACK;
3423 eval_pv ("undef &Coro::State::_jit", 1);
3424}
3425
3426#endif
3427
3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3428MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3048 3429
3049PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3050 3431
3051BOOT: 3432BOOT:
… …
3054# if CORO_PTHREAD 3435# if CORO_PTHREAD
3055 coro_thx = PERL_GET_CONTEXT; 3436 coro_thx = PERL_GET_CONTEXT;
3056# endif 3437# endif
3057#endif 3438#endif
3058 BOOT_PAGESIZE; 3439 BOOT_PAGESIZE;
3440
3441 /* perl defines these to check for existance first, but why it doesn't */
3442 /* just create them one at init time is not clear to me, except for */
3443 /* programs trying to delete them, but... */
3444 /* anyway, we declare this as invalid and make sure they are initialised here */
3445 DEFSV;
3446 ERRSV;
3059 3447
3060 cctx_current = cctx_new_empty (); 3448 cctx_current = cctx_new_empty ();
3061 3449
3062 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3450 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3063 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3451 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3103 coroapi.prepare_nop = prepare_nop; 3491 coroapi.prepare_nop = prepare_nop;
3104 coroapi.prepare_schedule = prepare_schedule; 3492 coroapi.prepare_schedule = prepare_schedule;
3105 coroapi.prepare_cede = prepare_cede; 3493 coroapi.prepare_cede = prepare_cede;
3106 coroapi.prepare_cede_notself = prepare_cede_notself; 3494 coroapi.prepare_cede_notself = prepare_cede_notself;
3107 3495
3108 { 3496 time_init (aTHX);
3109 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3110
3111 if (!svp) croak ("Time::HiRes is required");
3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3113
3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3118 }
3119 3497
3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3498 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3499#if CORO_JIT
3500 PUTBACK;
3501 jit_init (aTHX);
3502 SPAGAIN;
3503#endif
3121} 3504}
3122 3505
3123SV * 3506SV *
3124new (SV *klass, ...) 3507new (SV *klass, ...)
3125 ALIAS: 3508 ALIAS:
… …
3132void 3515void
3133transfer (...) 3516transfer (...)
3134 PROTOTYPE: $$ 3517 PROTOTYPE: $$
3135 CODE: 3518 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3519 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3137
3138bool
3139_destroy (SV *coro_sv)
3140 CODE:
3141 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3142 OUTPUT:
3143 RETVAL
3144 3520
3145void 3521void
3146_exit (int code) 3522_exit (int code)
3147 PROTOTYPE: $ 3523 PROTOTYPE: $
3148 CODE: 3524 CODE:
… …
3224 CODE: 3600 CODE:
3225{ 3601{
3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3602 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3227 { 3603 {
3228 struct coro *current = SvSTATE_current; 3604 struct coro *current = SvSTATE_current;
3605 struct CoroSLF slf_save;
3229 3606
3230 if (current != coro) 3607 if (current != coro)
3231 { 3608 {
3232 PUTBACK; 3609 PUTBACK;
3233 save_perl (aTHX_ current); 3610 save_perl (aTHX_ current);
3234 load_perl (aTHX_ coro); 3611 load_perl (aTHX_ coro);
3612 /* the coro is most likely in an active SLF call.
3613 * while not strictly required (the code we execute is
3614 * not allowed to call any SLF functions), it's cleaner
3615 * to reinitialise the slf_frame and restore it later.
3616 * This might one day allow us to actually do SLF calls
3617 * from code executed here.
3618 */
3619 slf_save = slf_frame;
3620 slf_frame.prepare = 0;
3235 SPAGAIN; 3621 SPAGAIN;
3236 } 3622 }
3237 3623
3238 PUSHSTACK; 3624 PUSHSTACK;
3239 3625
… …
3249 SPAGAIN; 3635 SPAGAIN;
3250 3636
3251 if (current != coro) 3637 if (current != coro)
3252 { 3638 {
3253 PUTBACK; 3639 PUTBACK;
3640 slf_frame = slf_save;
3254 save_perl (aTHX_ coro); 3641 save_perl (aTHX_ coro);
3255 load_perl (aTHX_ current); 3642 load_perl (aTHX_ current);
3256 SPAGAIN; 3643 SPAGAIN;
3257 } 3644 }
3258 } 3645 }
… …
3263 PROTOTYPE: $ 3650 PROTOTYPE: $
3264 ALIAS: 3651 ALIAS:
3265 is_ready = CF_READY 3652 is_ready = CF_READY
3266 is_running = CF_RUNNING 3653 is_running = CF_RUNNING
3267 is_new = CF_NEW 3654 is_new = CF_NEW
3268 is_destroyed = CF_DESTROYED 3655 is_destroyed = CF_ZOMBIE
3656 is_zombie = CF_ZOMBIE
3269 is_suspended = CF_SUSPENDED 3657 is_suspended = CF_SUSPENDED
3270 CODE: 3658 CODE:
3271 RETVAL = boolSV (coro->flags & ix); 3659 RETVAL = boolSV (coro->flags & ix);
3272 OUTPUT: 3660 OUTPUT:
3273 RETVAL 3661 RETVAL
3274 3662
3275void 3663void
3276throw (Coro::State self, SV *throw = &PL_sv_undef) 3664throw (Coro::State self, SV *exception = &PL_sv_undef)
3277 PROTOTYPE: $;$ 3665 PROTOTYPE: $;$
3278 CODE: 3666 CODE:
3279{ 3667{
3280 struct coro *current = SvSTATE_current; 3668 struct coro *current = SvSTATE_current;
3281 SV **throwp = self == current ? &CORO_THROW : &self->except; 3669 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3282 SvREFCNT_dec (*throwp); 3670 SvREFCNT_dec (*exceptionp);
3283 SvGETMAGIC (throw); 3671 SvGETMAGIC (exception);
3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3672 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3285} 3673}
3286 3674
3287void 3675void
3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3676api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3289 PROTOTYPE: $;$ 3677 PROTOTYPE: $;$
… …
3344 3732
3345void 3733void
3346cancel (Coro::State self) 3734cancel (Coro::State self)
3347 CODE: 3735 CODE:
3348 coro_state_destroy (aTHX_ self); 3736 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351 3737
3352SV * 3738SV *
3353enable_times (int enabled = enable_times) 3739enable_times (int enabled = enable_times)
3354 CODE: 3740 CODE:
3355{ 3741{
… …
3370times (Coro::State self) 3756times (Coro::State self)
3371 PPCODE: 3757 PPCODE:
3372{ 3758{
3373 struct coro *current = SvSTATE (coro_current); 3759 struct coro *current = SvSTATE (coro_current);
3374 3760
3375 if (expect_false (current == self)) 3761 if (ecb_expect_false (current == self))
3376 { 3762 {
3377 coro_times_update (); 3763 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current)); 3764 coro_times_add (SvSTATE (coro_current));
3379 } 3765 }
3380 3766
3381 EXTEND (SP, 2); 3767 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3768 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3769 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384 3770
3385 if (expect_false (current == self)) 3771 if (ecb_expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current)); 3772 coro_times_sub (SvSTATE (coro_current));
3387} 3773}
3388 3774
3389void 3775void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3776swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3411BOOT: 3797BOOT:
3412{ 3798{
3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3799 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3800 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3801 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3416 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3417 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3802 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3418 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3803 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3804 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3805 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3806 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3460 api_ready (aTHX_ RETVAL); 3845 api_ready (aTHX_ RETVAL);
3461 OUTPUT: 3846 OUTPUT:
3462 RETVAL 3847 RETVAL
3463 3848
3464void 3849void
3850_destroy (Coro::State coro)
3851 CODE:
3852 /* used by the manager thread */
3853 coro_state_destroy (aTHX_ coro);
3854
3855void
3856on_destroy (Coro::State coro, SV *cb)
3857 CODE:
3858 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3859
3860void
3861join (...)
3862 CODE:
3863 CORO_EXECUTE_SLF_XS (slf_init_join);
3864
3865void
3465terminate (...) 3866terminate (...)
3466 CODE: 3867 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3868 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3869
3870void
3871cancel (...)
3872 CODE:
3873 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3874
3875int
3876safe_cancel (Coro::State self, ...)
3877 C_ARGS: aTHX_ self, &ST (1), items - 1
3468 3878
3469void 3879void
3470schedule (...) 3880schedule (...)
3471 CODE: 3881 CODE:
3472 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3882 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3748} 4158}
3749 4159
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4160MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751 4161
3752void 4162void
3753_may_delete (SV *sem, int count, int extra_refs) 4163_may_delete (SV *sem, int count, unsigned int extra_refs)
3754 PPCODE: 4164 PPCODE:
3755{ 4165{
3756 AV *av = (AV *)SvRV (sem); 4166 AV *av = (AV *)SvRV (sem);
3757 4167
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4168 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3869 { 4279 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4280 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0; 4281 coro_old_pp_sselect = 0;
3872 } 4282 }
3873 4283
3874

Diff Legend

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