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.380 by root, Sun Sep 12 03:06:38 2010 UTC vs.
Revision 1.414 by root, Wed Jun 29 16:08:31 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 {
723 EXTEND (SP, 3); 803 EXTEND (SP, 3);
724 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
725 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
726 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
… …
729 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
730 } 810 }
731 } 811 }
732 } 812 }
733 813
734 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
735 break; 815 break;
736 816
737 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
738 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
739 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
741 821
742 PUTBACK; 822 PUTBACK;
743 } 823 }
744 824
745 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
746 /* we manually unroll here, as usually 2 slots is enough */ 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
747 if (SLOT_COUNT >= 1) CXINC;
748 if (SLOT_COUNT >= 2) CXINC;
749 if (SLOT_COUNT >= 3) CXINC;
750 { 827 {
751 unsigned int i; 828 unsigned int i;
829
752 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
753 CXINC; 831 CXINC;
754 } 832
755 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
756 835
757 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
758 837
759 { 838 {
760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
761 840
762 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
763 slot->defsv = DEFSV; 842 save_perl_slots (slot);
764 slot->errsv = ERRSV; 843#else
765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
767
768 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
769 # include "state.h" 845 # include "state.h"
770 #undef VAR 846 #undef VARx
847#endif
771 } 848 }
772} 849}
773 850
774/* 851/*
775 * allocate various perl stacks. This is almost an exact copy 852 * allocate various perl stacks. This is almost an exact copy
… …
781# define coro_init_stacks(thx) init_stacks () 858# define coro_init_stacks(thx) init_stacks ()
782#else 859#else
783static void 860static void
784coro_init_stacks (pTHX) 861coro_init_stacks (pTHX)
785{ 862{
786 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() */
787 PL_curstackinfo->si_type = PERLSI_MAIN; 864 PL_curstackinfo->si_type = PERLSI_MAIN;
788 PL_curstack = PL_curstackinfo->si_stack; 865 PL_curstack = PL_curstackinfo->si_stack;
789 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 866 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
790 867
791 PL_stack_base = AvARRAY(PL_curstack); 868 PL_stack_base = AvARRAY(PL_curstack);
… …
806#endif 883#endif
807 884
808 New(54,PL_scopestack,8,I32); 885 New(54,PL_scopestack,8,I32);
809 PL_scopestack_ix = 0; 886 PL_scopestack_ix = 0;
810 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
811 891
812 New(54,PL_savestack,24,ANY); 892 New(54,PL_savestack,24,ANY);
813 PL_savestack_ix = 0; 893 PL_savestack_ix = 0;
814 PL_savestack_max = 24; 894 PL_savestack_max = 24;
815 895
… …
843 } 923 }
844 924
845 Safefree (PL_tmps_stack); 925 Safefree (PL_tmps_stack);
846 Safefree (PL_markstack); 926 Safefree (PL_markstack);
847 Safefree (PL_scopestack); 927 Safefree (PL_scopestack);
928#if HAS_SCOPESTACK_NAME
929 Safefree (PL_scopestack_name);
930#endif
848 Safefree (PL_savestack); 931 Safefree (PL_savestack);
849#if !PERL_VERSION_ATLEAST (5,10,0) 932#if !PERL_VERSION_ATLEAST (5,10,0)
850 Safefree (PL_retstack); 933 Safefree (PL_retstack);
851#endif 934#endif
852} 935}
… …
898#endif 981#endif
899 982
900/* 983/*
901 * This overrides the default magic get method of %SIG elements. 984 * This overrides the default magic get method of %SIG elements.
902 * 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
903 * 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),
904 * readback here. 987 * we just provide our own readback here.
905 */ 988 */
906static int 989static int ecb_cold
907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 990coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
908{ 991{
909 const char *s = MgPV_nolen_const (mg); 992 const char *s = MgPV_nolen_const (mg);
910 993
911 if (*s == '_') 994 if (*s == '_')
… …
923 } 1006 }
924 1007
925 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1008 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
926} 1009}
927 1010
928static int 1011static int ecb_cold
929coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
930{ 1013{
931 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
932 1015
933 if (*s == '_') 1016 if (*s == '_')
… …
947 } 1030 }
948 1031
949 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1032 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
950} 1033}
951 1034
952static int 1035static int ecb_cold
953coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1036coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
954{ 1037{
955 const char *s = MgPV_nolen_const (mg); 1038 const char *s = MgPV_nolen_const (mg);
956 1039
957 if (*s == '_') 1040 if (*s == '_')
… …
992 return 1; 1075 return 1;
993} 1076}
994 1077
995static UNOP init_perl_op; 1078static UNOP init_perl_op;
996 1079
997static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1080ecb_noinline static void /* noinline to keep it out of the transfer fast path */
998init_perl (pTHX_ struct coro *coro) 1081init_perl (pTHX_ struct coro *coro)
999{ 1082{
1000 /* 1083 /*
1001 * emulate part of the perl startup here. 1084 * emulate part of the perl startup here.
1002 */ 1085 */
… …
1010 PL_comppad_name_fill = 0; 1093 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1094 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1095 PL_curpm = 0;
1013 PL_curpad = 0; 1096 PL_curpad = 0;
1014 PL_localizing = 0; 1097 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1098 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1099#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1100 PL_parser = 0;
1019#endif 1101#endif
1020 PL_hints = 0; 1102 PL_hints = 0;
1021 1103
1022 /* recreate the die/warn hooks */ 1104 /* recreate the die/warn hooks */
1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1105 PL_diehook = SvREFCNT_inc (rv_diehook);
1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1106 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1025 1107
1026 GvSV (PL_defgv) = newSV (0); 1108 GvSV (PL_defgv) = newSV (0);
1027 GvAV (PL_defgv) = coro->args; coro->args = 0; 1109 GvAV (PL_defgv) = coro->args; coro->args = 0;
1028 GvSV (PL_errgv) = newSV (0); 1110 GvSV (PL_errgv) = newSV (0);
1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1111 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1050 /* this newly created coroutine might be run on an existing cctx which most 1132 /* this newly created coroutine might be run on an existing cctx which most
1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1133 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1052 */ 1134 */
1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1135 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1136 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1137 slf_frame.destroy = 0;
1055 1138
1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1139 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1057 init_perl_op.op_next = PL_op; 1140 init_perl_op.op_next = PL_op;
1058 init_perl_op.op_type = OP_ENTERSUB; 1141 init_perl_op.op_type = OP_ENTERSUB;
1059 init_perl_op.op_ppaddr = pp_slf; 1142 init_perl_op.op_ppaddr = pp_slf;
… …
1064 /* copy throw, in case it was set before init_perl */ 1147 /* copy throw, in case it was set before init_perl */
1065 CORO_THROW = coro->except; 1148 CORO_THROW = coro->except;
1066 1149
1067 SWAP_SVS (coro); 1150 SWAP_SVS (coro);
1068 1151
1069 if (expect_false (enable_times)) 1152 if (ecb_expect_false (enable_times))
1070 { 1153 {
1071 coro_times_update (); 1154 coro_times_update ();
1072 coro_times_sub (coro); 1155 coro_times_sub (coro);
1073 } 1156 }
1074} 1157}
… …
1098destroy_perl (pTHX_ struct coro *coro) 1181destroy_perl (pTHX_ struct coro *coro)
1099{ 1182{
1100 SV *svf [9]; 1183 SV *svf [9];
1101 1184
1102 { 1185 {
1186 SV *old_current = SvRV (coro_current);
1103 struct coro *current = SvSTATE_current; 1187 struct coro *current = SvSTATE (old_current);
1104 1188
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1189 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1190
1107 save_perl (aTHX_ current); 1191 save_perl (aTHX_ current);
1192
1193 /* this will cause transfer_check to croak on block*/
1194 SvRV_set (coro_current, (SV *)coro->hv);
1195
1108 load_perl (aTHX_ coro); 1196 load_perl (aTHX_ coro);
1109 1197
1110 coro_unwind_stacks (aTHX); 1198 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112 1199
1113 /* restore swapped sv's */ 1200 /* restore swapped sv's */
1114 SWAP_SVS (coro); 1201 SWAP_SVS (coro);
1115 1202
1203 coro_destruct_stacks (aTHX);
1204
1116 // now save some sv's to be free'd later 1205 /* now save some sv's to be free'd later */
1117 svf [0] = GvSV (PL_defgv); 1206 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv); 1207 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv); 1208 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv; 1209 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs; 1210 svf [4] = PL_rs;
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1212 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1213 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1214 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1215 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1216
1217 SvRV_set (coro_current, old_current);
1218
1128 load_perl (aTHX_ current); 1219 load_perl (aTHX_ current);
1129 } 1220 }
1130 1221
1131 { 1222 {
1132 unsigned int i; 1223 unsigned int i;
… …
1139 SvREFCNT_dec (coro->invoke_cb); 1230 SvREFCNT_dec (coro->invoke_cb);
1140 SvREFCNT_dec (coro->invoke_av); 1231 SvREFCNT_dec (coro->invoke_av);
1141 } 1232 }
1142} 1233}
1143 1234
1144INLINE void 1235ecb_inline void
1145free_coro_mortal (pTHX) 1236free_coro_mortal (pTHX)
1146{ 1237{
1147 if (expect_true (coro_mortal)) 1238 if (ecb_expect_true (coro_mortal))
1148 { 1239 {
1149 SvREFCNT_dec (coro_mortal); 1240 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1241 coro_mortal = 0;
1151 } 1242 }
1152} 1243}
1153 1244
1154static int 1245static int
… …
1287 1378
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1379 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1380}
1290 1381
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1382/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1383static void ecb_noinline
1293cctx_prepare (pTHX) 1384cctx_prepare (pTHX)
1294{ 1385{
1295 PL_top_env = &PL_start_env; 1386 PL_top_env = &PL_start_env;
1296 1387
1297 if (cctx_current->flags & CC_TRACE) 1388 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1399 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1400 slf_frame.check = slf_check_set_stacklevel;
1310} 1401}
1311 1402
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1403/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1404ecb_inline void
1314transfer_tail (pTHX) 1405transfer_tail (pTHX)
1315{ 1406{
1316 free_coro_mortal (aTHX); 1407 free_coro_mortal (aTHX);
1317} 1408}
1318 1409
… …
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1453 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1454 }
1364} 1455}
1365 1456
1366static coro_cctx * 1457static coro_cctx *
1367cctx_new () 1458cctx_new (void)
1368{ 1459{
1369 coro_cctx *cctx; 1460 coro_cctx *cctx;
1370 1461
1371 ++cctx_count; 1462 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1463 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1469 return cctx;
1379} 1470}
1380 1471
1381/* create a new cctx only suitable as source */ 1472/* create a new cctx only suitable as source */
1382static coro_cctx * 1473static coro_cctx *
1383cctx_new_empty () 1474cctx_new_empty (void)
1384{ 1475{
1385 coro_cctx *cctx = cctx_new (); 1476 coro_cctx *cctx = cctx_new ();
1386 1477
1387 cctx->sptr = 0; 1478 cctx->sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1479 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1390 return cctx; 1481 return cctx;
1391} 1482}
1392 1483
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1484/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1485static coro_cctx *
1395cctx_new_run () 1486cctx_new_run (void)
1396{ 1487{
1397 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1398 void *stack_start; 1489 void *stack_start;
1399 size_t stack_size; 1490 size_t stack_size;
1400 1491
1401#if HAVE_MMAP 1492#if HAVE_MMAP
1402 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1493 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1403 /* mmap supposedly does allocate-on-write for us */ 1494 /* mmap supposedly does allocate-on-write for us */
1404 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1495 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1405 1496
1406 if (cctx->sptr != (void *)-1) 1497 if (cctx->sptr != (void *)-1)
1407 { 1498 {
1408 #if CORO_STACKGUARD 1499 #if CORO_STACKGUARD
1409 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1500 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1441cctx_destroy (coro_cctx *cctx) 1532cctx_destroy (coro_cctx *cctx)
1442{ 1533{
1443 if (!cctx) 1534 if (!cctx)
1444 return; 1535 return;
1445 1536
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1537 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1538
1448 --cctx_count; 1539 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1540 coro_destroy (&cctx->cctx);
1450 1541
1451 /* coro_transfer creates new, empty cctx's */ 1542 /* coro_transfer creates new, empty cctx's */
… …
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1561#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1562
1472static coro_cctx * 1563static coro_cctx *
1473cctx_get (pTHX) 1564cctx_get (pTHX)
1474{ 1565{
1475 while (expect_true (cctx_first)) 1566 while (ecb_expect_true (cctx_first))
1476 { 1567 {
1477 coro_cctx *cctx = cctx_first; 1568 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1569 cctx_first = cctx->next;
1479 --cctx_idle; 1570 --cctx_idle;
1480 1571
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1572 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1573 return cctx;
1483 1574
1484 cctx_destroy (cctx); 1575 cctx_destroy (cctx);
1485 } 1576 }
1486 1577
… …
1491cctx_put (coro_cctx *cctx) 1582cctx_put (coro_cctx *cctx)
1492{ 1583{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1584 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1494 1585
1495 /* free another cctx if overlimit */ 1586 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1587 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1588 {
1498 coro_cctx *first = cctx_first; 1589 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1590 cctx_first = first->next;
1500 --cctx_idle; 1591 --cctx_idle;
1501 1592
… …
1512static void 1603static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1604transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1605{
1515 /* TODO: throwing up here is considered harmful */ 1606 /* TODO: throwing up here is considered harmful */
1516 1607
1517 if (expect_true (prev != next)) 1608 if (ecb_expect_true (prev != next))
1518 { 1609 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1610 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1611 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1612
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1613 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1614 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1615
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1616#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1617 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1618 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1619#endif
1529 } 1620 }
1530} 1621}
1531 1622
1532/* always use the TRANSFER macro */ 1623/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1624static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1625transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1626{
1536 dSTACKLEVEL; 1627 dSTACKLEVEL;
1537 1628
1538 /* sometimes transfer is only called to set idle_sp */ 1629 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1630 if (ecb_expect_false (!prev))
1540 { 1631 {
1541 cctx_current->idle_sp = STACKLEVEL; 1632 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1633 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1634 }
1544 else if (expect_true (prev != next)) 1635 else if (ecb_expect_true (prev != next))
1545 { 1636 {
1546 coro_cctx *cctx_prev; 1637 coro_cctx *cctx_prev;
1547 1638
1548 if (expect_false (prev->flags & CF_NEW)) 1639 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1640 {
1550 /* create a new empty/source context */ 1641 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1642 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1643 prev->flags |= CF_RUNNING;
1553 } 1644 }
… …
1556 next->flags |= CF_RUNNING; 1647 next->flags |= CF_RUNNING;
1557 1648
1558 /* first get rid of the old state */ 1649 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1650 save_perl (aTHX_ prev);
1560 1651
1561 if (expect_false (next->flags & CF_NEW)) 1652 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1653 {
1563 /* need to start coroutine */ 1654 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1655 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1656 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1657 init_perl (aTHX_ next);
1567 } 1658 }
1568 else 1659 else
1569 load_perl (aTHX_ next); 1660 load_perl (aTHX_ next);
1570 1661
1571 /* possibly untie and reuse the cctx */ 1662 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1663 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1664 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1665 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1666 && !force_cctx
1576 )) 1667 ))
1577 { 1668 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1669 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1670 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1671
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1672 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1582 /* without this the next cctx_get might destroy the running cctx while still in use */ 1673 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1674 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1675 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1676 next->cctx = cctx_get (aTHX);
1586 1677
1587 cctx_put (cctx_current); 1678 cctx_put (cctx_current);
1588 } 1679 }
1589 else 1680 else
1590 prev->cctx = cctx_current; 1681 prev->cctx = cctx_current;
1591 1682
1592 ++next->usecount; 1683 ++next->usecount;
1593 1684
1594 cctx_prev = cctx_current; 1685 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1686 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1687
1597 next->cctx = 0; 1688 next->cctx = 0;
1598 1689
1599 if (expect_false (cctx_prev != cctx_current)) 1690 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1691 {
1601 cctx_prev->top_env = PL_top_env; 1692 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1693 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1694 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1695 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1701#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1611#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1702#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1703
1613/** high level stuff ********************************************************/ 1704/** high level stuff ********************************************************/
1614 1705
1706/* this function is actually Coro, not Coro::State, but we call it from here */
1707/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1708static void
1709coro_call_on_destroy (pTHX_ struct coro *coro);
1710
1711static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1712coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1713{
1618 if (coro->flags & CF_DESTROYED) 1714 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1715 return;
1620 1716
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1717 slf_destroy (aTHX_ coro);
1623 1718
1624 coro->flags |= CF_DESTROYED; 1719 coro->flags |= CF_ZOMBIE;
1625 1720
1626 if (coro->flags & CF_READY) 1721 if (coro->flags & CF_READY)
1627 { 1722 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1723 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1724 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1725 --coro_nready;
1631 } 1726 }
1632 else 1727 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1728 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1729
1730 if (coro->next) coro->next->prev = coro->prev;
1731 if (coro->prev) coro->prev->next = coro->next;
1732 if (coro == coro_first) coro_first = coro->next;
1634 1733
1635 if (coro->mainstack 1734 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1735 && coro->mainstack != main_mainstack
1637 && coro->slot 1736 && coro->slot
1638 && !PL_dirty) 1737 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1738 destroy_perl (aTHX_ coro);
1640 1739
1641 if (coro->next) coro->next->prev = coro->prev;
1642 if (coro->prev) coro->prev->next = coro->next;
1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx); 1740 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1741 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1742 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1743 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1744 SvREFCNT_dec (CORO_THROW);
1650 1745
1651 return 1; 1746 coro_call_on_destroy (aTHX_ coro);
1747
1748 /* more destruction mayhem in coro_state_free */
1652} 1749}
1653 1750
1654static int 1751static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1752coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1753{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1754 struct coro *coro = (struct coro *)mg->mg_ptr;
1658 mg->mg_ptr = 0; 1755 mg->mg_ptr = 0;
1659 1756
1660 coro->hv = 0;
1661
1662 if (--coro->refcnt < 0)
1663 {
1664 coro_state_destroy (aTHX_ coro); 1757 coro_state_destroy (aTHX_ coro);
1758 SvREFCNT_dec (coro->on_destroy);
1759 SvREFCNT_dec (coro->status);
1760
1665 Safefree (coro); 1761 Safefree (coro);
1666 }
1667 1762
1668 return 0; 1763 return 0;
1669} 1764}
1670 1765
1671static int 1766static int ecb_cold
1672coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1767coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1673{ 1768{
1674 struct coro *coro = (struct coro *)mg->mg_ptr; 1769 /* called when perl clones the current process the slow way (windows process emulation) */
1675 1770 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1676 ++coro->refcnt; 1771 mg->mg_ptr = 0;
1772 mg->mg_virtual = 0;
1677 1773
1678 return 0; 1774 return 0;
1679} 1775}
1680 1776
1681static MGVTBL coro_state_vtbl = { 1777static MGVTBL coro_state_vtbl = {
… …
1706 TRANSFER (ta, 1); 1802 TRANSFER (ta, 1);
1707} 1803}
1708 1804
1709/** Coro ********************************************************************/ 1805/** Coro ********************************************************************/
1710 1806
1711INLINE void 1807ecb_inline void
1712coro_enq (pTHX_ struct coro *coro) 1808coro_enq (pTHX_ struct coro *coro)
1713{ 1809{
1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1810 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1715 1811
1716 SvREFCNT_inc_NN (coro->hv); 1812 SvREFCNT_inc_NN (coro->hv);
… …
1718 coro->next_ready = 0; 1814 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1815 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro; 1816 ready [1] = coro;
1721} 1817}
1722 1818
1723INLINE struct coro * 1819ecb_inline struct coro *
1724coro_deq (pTHX) 1820coro_deq (pTHX)
1725{ 1821{
1726 int prio; 1822 int prio;
1727 1823
1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1824 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1781{ 1877{
1782 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1878 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1783} 1879}
1784 1880
1785/* expects to own a reference to next->hv */ 1881/* expects to own a reference to next->hv */
1786INLINE void 1882ecb_inline void
1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1883prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1788{ 1884{
1789 SV *prev_sv = SvRV (coro_current); 1885 SV *prev_sv = SvRV (coro_current);
1790 1886
1791 ta->prev = SvSTATE_hv (prev_sv); 1887 ta->prev = SvSTATE_hv (prev_sv);
… …
1804{ 1900{
1805 for (;;) 1901 for (;;)
1806 { 1902 {
1807 struct coro *next = coro_deq (aTHX); 1903 struct coro *next = coro_deq (aTHX);
1808 1904
1809 if (expect_true (next)) 1905 if (ecb_expect_true (next))
1810 { 1906 {
1811 /* cannot transfer to destroyed coros, skip and look for next */ 1907 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1908 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1909 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else 1910 else
1815 { 1911 {
1816 next->flags &= ~CF_READY; 1912 next->flags &= ~CF_READY;
1817 --coro_nready; 1913 --coro_nready;
… …
1850 } 1946 }
1851 } 1947 }
1852 } 1948 }
1853} 1949}
1854 1950
1855INLINE void 1951ecb_inline void
1856prepare_cede (pTHX_ struct coro_transfer_args *ta) 1952prepare_cede (pTHX_ struct coro_transfer_args *ta)
1857{ 1953{
1858 api_ready (aTHX_ coro_current); 1954 api_ready (aTHX_ coro_current);
1859 prepare_schedule (aTHX_ ta); 1955 prepare_schedule (aTHX_ ta);
1860} 1956}
1861 1957
1862INLINE void 1958ecb_inline void
1863prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1959prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1864{ 1960{
1865 SV *prev = SvRV (coro_current); 1961 SV *prev = SvRV (coro_current);
1866 1962
1867 if (coro_nready) 1963 if (coro_nready)
… …
1897{ 1993{
1898 struct coro_transfer_args ta; 1994 struct coro_transfer_args ta;
1899 1995
1900 prepare_cede (aTHX_ &ta); 1996 prepare_cede (aTHX_ &ta);
1901 1997
1902 if (expect_true (ta.prev != ta.next)) 1998 if (ecb_expect_true (ta.prev != ta.next))
1903 { 1999 {
1904 TRANSFER (ta, 1); 2000 TRANSFER (ta, 1);
1905 return 1; 2001 return 1;
1906 } 2002 }
1907 else 2003 else
… …
1950 coro->slot->runops = RUNOPS_DEFAULT; 2046 coro->slot->runops = RUNOPS_DEFAULT;
1951 } 2047 }
1952} 2048}
1953 2049
1954static void 2050static void
2051coro_push_av (pTHX_ AV *av, I32 gimme_v)
2052{
2053 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2054 {
2055 dSP;
2056
2057 if (gimme_v == G_SCALAR)
2058 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2059 else
2060 {
2061 int i;
2062 EXTEND (SP, AvFILLp (av) + 1);
2063
2064 for (i = 0; i <= AvFILLp (av); ++i)
2065 PUSHs (AvARRAY (av)[i]);
2066 }
2067
2068 PUTBACK;
2069 }
2070}
2071
2072static void
2073coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2074{
2075 if (!coro->on_destroy)
2076 coro->on_destroy = newAV ();
2077
2078 av_push (coro->on_destroy, cb);
2079}
2080
2081static void
2082slf_destroy_join (pTHX_ struct CoroSLF *frame)
2083{
2084 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2085}
2086
2087static int
2088slf_check_join (pTHX_ struct CoroSLF *frame)
2089{
2090 struct coro *coro = (struct coro *)frame->data;
2091
2092 if (!coro->status)
2093 return 1;
2094
2095 frame->destroy = 0;
2096
2097 coro_push_av (aTHX_ coro->status, GIMME_V);
2098
2099 SvREFCNT_dec ((SV *)coro->hv);
2100
2101 return 0;
2102}
2103
2104static void
2105slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2106{
2107 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2108
2109 if (items > 1)
2110 croak ("join called with too many arguments");
2111
2112 if (coro->status)
2113 frame->prepare = prepare_nop;
2114 else
2115 {
2116 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2117 frame->prepare = prepare_schedule;
2118 }
2119
2120 frame->check = slf_check_join;
2121 frame->destroy = slf_destroy_join;
2122 frame->data = (void *)coro;
2123 SvREFCNT_inc (coro->hv);
2124}
2125
2126static void
1955coro_call_on_destroy (pTHX_ struct coro *coro) 2127coro_call_on_destroy (pTHX_ struct coro *coro)
1956{ 2128{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2129 AV *od = coro->on_destroy;
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959 2130
1960 if (on_destroyp) 2131 if (!od)
1961 { 2132 return;
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1963 2133
1964 while (AvFILLp (on_destroy) >= 0) 2134 while (AvFILLp (od) >= 0)
2135 {
2136 SV *cb = sv_2mortal (av_pop (od));
2137
2138 /* coro hv's (and only hv's at the moment) are supported as well */
2139 if (SvSTATEhv_p (aTHX_ cb))
2140 api_ready (aTHX_ cb);
2141 else
1965 { 2142 {
1966 dSP; /* don't disturb outer sp */ 2143 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy);
1968
1969 PUSHMARK (SP); 2144 PUSHMARK (SP);
1970 2145
1971 if (statusp) 2146 if (coro->status)
1972 { 2147 {
1973 int i; 2148 PUTBACK;
1974 AV *status = (AV *)SvRV (*statusp); 2149 coro_push_av (aTHX_ coro->status, G_ARRAY);
1975 EXTEND (SP, AvFILLp (status) + 1); 2150 SPAGAIN;
1976
1977 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]);
1979 } 2151 }
1980 2152
1981 PUTBACK; 2153 PUTBACK;
1982 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2154 call_sv (cb, G_VOID | G_DISCARD);
1983 } 2155 }
1984 } 2156 }
1985} 2157}
1986 2158
1987static void 2159static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2160coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1989{ 2161{
1990 int i; 2162 AV *av;
1991 HV *hv = (HV *)SvRV (coro_current); 2163
1992 AV *av = newAV (); 2164 if (coro->status)
2165 {
2166 av = coro->status;
2167 av_clear (av);
2168 }
2169 else
2170 av = coro->status = newAV ();
1993 2171
1994 /* items are actually not so common, so optimise for this case */ 2172 /* items are actually not so common, so optimise for this case */
1995 if (items) 2173 if (items)
1996 { 2174 {
2175 int i;
2176
1997 av_extend (av, items - 1); 2177 av_extend (av, items - 1);
1998 2178
1999 for (i = 0; i < items; ++i) 2179 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i])); 2180 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 } 2181 }
2182}
2002 2183
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2184static void
2004 2185slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2186{
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2187 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager); 2188 api_ready (aTHX_ sv_manager);
2007 2189
2008 frame->prepare = prepare_schedule; 2190 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat; 2191 frame->check = slf_check_repeat;
2010 2192
2011 /* as a minor optimisation, we could unwind all stacks here */ 2193 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */ 2194 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/ 2195 /*coro_unwind_stacks (aTHX);*/
2196}
2197
2198static void
2199slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2200{
2201 HV *coro_hv = (HV *)SvRV (coro_current);
2202
2203 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2204 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2205}
2206
2207static void
2208slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2209{
2210 HV *coro_hv;
2211 struct coro *coro;
2212
2213 if (items <= 0)
2214 croak ("Coro::cancel called without coro object,");
2215
2216 coro = SvSTATE (arg [0]);
2217 coro_hv = coro->hv;
2218
2219 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2220
2221 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2222 {
2223 /* coro currently busy cancelling something, so just notify it */
2224 coro->slf_frame.data = (void *)coro;
2225
2226 frame->prepare = prepare_nop;
2227 frame->check = slf_check_nop;
2228 }
2229 else if (coro_hv == (HV *)SvRV (coro_current))
2230 {
2231 /* cancelling the current coro is allowed, and equals terminate */
2232 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2233 }
2234 else
2235 {
2236 struct coro *self = SvSTATE_current;
2237
2238 /* otherwise we cancel directly, purely for speed reasons
2239 * unfortunately, this requires some magic trickery, as
2240 * somebody else could cancel us, so we have to fight the cancellation.
2241 * this is ugly, and hopefully fully worth the extra speed.
2242 * besides, I can't get the slow-but-safe version working...
2243 */
2244 slf_frame.data = 0;
2245 self->flags |= CF_NOCANCEL;
2246 coro_state_destroy (aTHX_ coro);
2247 self->flags &= ~CF_NOCANCEL;
2248
2249 if (slf_frame.data)
2250 {
2251 /* while we were busy we have been cancelled, so terminate */
2252 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2253 }
2254 else
2255 {
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 }
2260}
2261
2262static int
2263slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2264{
2265 frame->prepare = 0;
2266 coro_unwind_stacks (aTHX);
2267
2268 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2269
2270 return 1;
2271}
2272
2273static int
2274safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2275{
2276 if (coro->cctx)
2277 croak ("coro inside C callback, unable to cancel at this time, caught");
2278
2279 if (coro->flags & CF_NEW)
2280 {
2281 coro_set_status (aTHX_ coro, arg, items);
2282 coro_state_destroy (aTHX_ coro);
2283 }
2284 else
2285 {
2286 if (!coro->slf_frame.prepare)
2287 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2288
2289 slf_destroy (aTHX_ coro);
2290
2291 coro_set_status (aTHX_ coro, arg, items);
2292 coro->slf_frame.prepare = prepare_nop;
2293 coro->slf_frame.check = slf_check_safe_cancel;
2294
2295 api_ready (aTHX_ (SV *)coro->hv);
2296 }
2297
2298 return 1;
2014} 2299}
2015 2300
2016/*****************************************************************************/ 2301/*****************************************************************************/
2017/* async pool handler */ 2302/* async pool handler */
2018 2303
… …
2049slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2334slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2050{ 2335{
2051 HV *hv = (HV *)SvRV (coro_current); 2336 HV *hv = (HV *)SvRV (coro_current);
2052 struct coro *coro = SvSTATE_hv ((SV *)hv); 2337 struct coro *coro = SvSTATE_hv ((SV *)hv);
2053 2338
2054 if (expect_true (coro->saved_deffh)) 2339 if (ecb_expect_true (coro->saved_deffh))
2055 { 2340 {
2056 /* subsequent iteration */ 2341 /* subsequent iteration */
2057 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2342 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2058 coro->saved_deffh = 0; 2343 coro->saved_deffh = 0;
2059 2344
2060 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2345 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2061 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2346 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2062 { 2347 {
2063 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2348 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2064 coro->invoke_av = newAV (); 2349 return;
2065
2066 frame->prepare = prepare_nop;
2067 } 2350 }
2068 else 2351 else
2069 { 2352 {
2070 av_clear (GvAV (PL_defgv)); 2353 av_clear (GvAV (PL_defgv));
2071 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2354 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2294static void 2577static void
2295slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2578slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2296{ 2579{
2297 frame->prepare = prepare_cede_notself; 2580 frame->prepare = prepare_cede_notself;
2298 frame->check = slf_check_nop; 2581 frame->check = slf_check_nop;
2582}
2583
2584/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2585static void
2586slf_destroy (pTHX_ struct coro *coro)
2587{
2588 /* this callback is reserved for slf functions needing to do cleanup */
2589 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2590 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2591
2592 /*
2593 * The on_destroy above most likely is from an SLF call.
2594 * Since by definition the SLF call will not finish when we destroy
2595 * the coro, we will have to force-finish it here, otherwise
2596 * cleanup functions cannot call SLF functions.
2597 */
2598 coro->slf_frame.prepare = 0;
2299} 2599}
2300 2600
2301/* 2601/*
2302 * these not obviously related functions are all rolled into one 2602 * these not obviously related functions are all rolled into one
2303 * function to increase chances that they all will call transfer with the same 2603 * function to increase chances that they all will call transfer with the same
… …
2310 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2610 I32 checkmark; /* mark SP to see how many elements check has pushed */
2311 2611
2312 /* set up the slf frame, unless it has already been set-up */ 2612 /* set up the slf frame, unless it has already been set-up */
2313 /* the latter happens when a new coro has been started */ 2613 /* the latter happens when a new coro has been started */
2314 /* or when a new cctx was attached to an existing coroutine */ 2614 /* or when a new cctx was attached to an existing coroutine */
2315 if (expect_true (!slf_frame.prepare)) 2615 if (ecb_expect_true (!slf_frame.prepare))
2316 { 2616 {
2317 /* first iteration */ 2617 /* first iteration */
2318 dSP; 2618 dSP;
2319 SV **arg = PL_stack_base + TOPMARK + 1; 2619 SV **arg = PL_stack_base + TOPMARK + 1;
2320 int items = SP - arg; /* args without function object */ 2620 int items = SP - arg; /* args without function object */
… …
2361 while (slf_frame.check (aTHX_ &slf_frame)); 2661 while (slf_frame.check (aTHX_ &slf_frame));
2362 2662
2363 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2663 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2364 2664
2365 /* exception handling */ 2665 /* exception handling */
2366 if (expect_false (CORO_THROW)) 2666 if (ecb_expect_false (CORO_THROW))
2367 { 2667 {
2368 SV *exception = sv_2mortal (CORO_THROW); 2668 SV *exception = sv_2mortal (CORO_THROW);
2369 2669
2370 CORO_THROW = 0; 2670 CORO_THROW = 0;
2371 sv_setsv (ERRSV, exception); 2671 sv_setsv (ERRSV, exception);
2372 croak (0); 2672 croak (0);
2373 } 2673 }
2374 2674
2375 /* return value handling - mostly like entersub */ 2675 /* return value handling - mostly like entersub */
2376 /* make sure we put something on the stack in scalar context */ 2676 /* make sure we put something on the stack in scalar context */
2377 if (GIMME_V == G_SCALAR) 2677 if (GIMME_V == G_SCALAR
2678 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2378 { 2679 {
2379 dSP; 2680 dSP;
2380 SV **bot = PL_stack_base + checkmark; 2681 SV **bot = PL_stack_base + checkmark;
2381 2682
2382 if (sp == bot) /* too few, push undef */ 2683 if (sp == bot) /* too few, push undef */
2383 bot [1] = &PL_sv_undef; 2684 bot [1] = &PL_sv_undef;
2384 else if (sp != bot + 1) /* too many, take last one */ 2685 else /* too many, take last one */
2385 bot [1] = *sp; 2686 bot [1] = *sp;
2386 2687
2387 SP = bot + 1; 2688 SP = bot + 1;
2388 2689
2389 PUTBACK; 2690 PUTBACK;
… …
2496{ 2797{
2497 PerlIOBuf base; 2798 PerlIOBuf base;
2498 NV next, every; 2799 NV next, every;
2499} PerlIOCede; 2800} PerlIOCede;
2500 2801
2501static IV 2802static IV ecb_cold
2502PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2803PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2503{ 2804{
2504 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2805 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2505 2806
2506 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2807 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2507 self->next = nvtime () + self->every; 2808 self->next = nvtime () + self->every;
2508 2809
2509 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2810 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2510} 2811}
2511 2812
2512static SV * 2813static SV * ecb_cold
2513PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2814PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2514{ 2815{
2515 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2816 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2516 2817
2517 return newSVnv (self->every); 2818 return newSVnv (self->every);
… …
2629 SvREFCNT_dec (cb); 2930 SvREFCNT_dec (cb);
2630 } 2931 }
2631} 2932}
2632 2933
2633static void 2934static void
2634coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2935coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2635{ 2936{
2636 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2937 /* call $sem->adjust (0) to possibly wake up some other waiters */
2637 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2938 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2638} 2939}
2639 2940
2640static int 2941static int
2641slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2942slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2642{ 2943{
2643 AV *av = (AV *)frame->data; 2944 AV *av = (AV *)frame->data;
2644 SV *count_sv = AvARRAY (av)[0]; 2945 SV *count_sv = AvARRAY (av)[0];
2946 SV *coro_hv = SvRV (coro_current);
2645 2947
2646 /* if we are about to throw, don't actually acquire the lock, just throw */ 2948 /* if we are about to throw, don't actually acquire the lock, just throw */
2647 if (CORO_THROW) 2949 if (CORO_THROW)
2648 return 0; 2950 return 0;
2649 else if (SvIVX (count_sv) > 0) 2951 else if (SvIVX (count_sv) > 0)
2650 { 2952 {
2651 SvSTATE_current->on_destroy = 0; 2953 frame->destroy = 0;
2652 2954
2653 if (acquire) 2955 if (acquire)
2654 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2956 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2655 else 2957 else
2656 coro_semaphore_adjust (aTHX_ av, 0); 2958 coro_semaphore_adjust (aTHX_ av, 0);
… …
2661 { 2963 {
2662 int i; 2964 int i;
2663 /* if we were woken up but can't down, we look through the whole */ 2965 /* if we were woken up but can't down, we look through the whole */
2664 /* waiters list and only add us if we aren't in there already */ 2966 /* waiters list and only add us if we aren't in there already */
2665 /* this avoids some degenerate memory usage cases */ 2967 /* this avoids some degenerate memory usage cases */
2666 2968 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2667 for (i = 1; i <= AvFILLp (av); ++i)
2668 if (AvARRAY (av)[i] == SvRV (coro_current)) 2969 if (AvARRAY (av)[i] == coro_hv)
2669 return 1; 2970 return 1;
2670 2971
2671 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2972 av_push (av, SvREFCNT_inc (coro_hv));
2672 return 1; 2973 return 1;
2673 } 2974 }
2674} 2975}
2675 2976
2676static int 2977static int
… …
2699 { 3000 {
2700 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2701 3002
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3003 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2703 frame->prepare = prepare_schedule; 3004 frame->prepare = prepare_schedule;
2704
2705 /* to avoid race conditions when a woken-up coro gets terminated */ 3005 /* to avoid race conditions when a woken-up coro gets terminated */
2706 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3006 /* we arrange for a temporary on_destroy that calls adjust (0) */
2707 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3007 frame->destroy = coro_semaphore_destroy;
2708 } 3008 }
2709} 3009}
2710 3010
2711static void 3011static void
2712slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3012slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2794 { 3094 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]); 3095 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3096 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797 3097
2798 if (SvIVX (AvARRAY (av)[0])) 3098 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3099 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2800 3100
2801 frame->prepare = prepare_nop; 3101 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop; 3102 frame->check = slf_check_nop;
2803 } 3103 }
2804 else if (SvIVX (AvARRAY (av)[0])) 3104 else if (SvIVX (AvARRAY (av)[0]))
… …
2930 dSP; 3230 dSP;
2931 3231
2932 static SV *prio_cv; 3232 static SV *prio_cv;
2933 static SV *prio_sv; 3233 static SV *prio_sv;
2934 3234
2935 if (expect_false (!prio_cv)) 3235 if (ecb_expect_false (!prio_cv))
2936 { 3236 {
2937 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3237 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2938 prio_sv = newSViv (0); 3238 prio_sv = newSViv (0);
2939 } 3239 }
2940 3240
… …
3046 } 3346 }
3047 3347
3048 return coro_sv; 3348 return coro_sv;
3049} 3349}
3050 3350
3351#ifndef __cplusplus
3352ecb_cold XS(boot_Coro__State);
3353#endif
3354
3355#if CORO_JIT
3356
3357static void ecb_noinline ecb_cold
3358pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3359{
3360 dSP;
3361 AV *av = newAV ();
3362
3363 av_store (av, 3, newSVuv (d));
3364 av_store (av, 2, newSVuv (c));
3365 av_store (av, 1, newSVuv (b));
3366 av_store (av, 0, newSVuv (a));
3367
3368 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3369
3370 PUTBACK;
3371}
3372
3373static void ecb_noinline ecb_cold
3374jit_init (pTHX)
3375{
3376 dSP;
3377 SV *load, *save;
3378 char *map_base;
3379 char *load_ptr, *save_ptr;
3380 STRLEN load_len, save_len, map_len;
3381 int count;
3382
3383 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3384
3385 PUSHMARK (SP);
3386#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3387# include "state.h"
3388#undef VARx
3389 count = call_pv ("Coro::State::_jit", G_ARRAY);
3390 SPAGAIN;
3391
3392 save = POPs; save_ptr = SvPVbyte (save, save_len);
3393 load = POPs; load_ptr = SvPVbyte (load, load_len);
3394
3395 map_len = load_len + save_len + 16;
3396
3397 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3398
3399 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3400
3401 load_perl_slots = (load_save_perl_slots_type)map_base;
3402 memcpy (map_base, load_ptr, load_len);
3403
3404 map_base += (load_len + 15) & ~15;
3405
3406 save_perl_slots = (load_save_perl_slots_type)map_base;
3407 memcpy (map_base, save_ptr, save_len);
3408
3409 /* we are good citizens and try to make the page read-only, so the evil evil */
3410 /* hackers might have it a bit more difficult */
3411 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3412
3413 PUTBACK;
3414 eval_pv ("undef &Coro::State::_jit", 1);
3415}
3416
3417#endif
3418
3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3419MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3052 3420
3053PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
3054 3422
3055BOOT: 3423BOOT:
… …
3058# if CORO_PTHREAD 3426# if CORO_PTHREAD
3059 coro_thx = PERL_GET_CONTEXT; 3427 coro_thx = PERL_GET_CONTEXT;
3060# endif 3428# endif
3061#endif 3429#endif
3062 BOOT_PAGESIZE; 3430 BOOT_PAGESIZE;
3431
3432 /* perl defines these to check for existance first, but why it doesn't */
3433 /* just create them one at init time is not clear to me, except for */
3434 /* programs trying to delete them, but... */
3435 /* anyway, we declare this as invalid and make sure they are initialised here */
3436 DEFSV;
3437 ERRSV;
3063 3438
3064 cctx_current = cctx_new_empty (); 3439 cctx_current = cctx_new_empty ();
3065 3440
3066 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3441 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3067 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3442 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3107 coroapi.prepare_nop = prepare_nop; 3482 coroapi.prepare_nop = prepare_nop;
3108 coroapi.prepare_schedule = prepare_schedule; 3483 coroapi.prepare_schedule = prepare_schedule;
3109 coroapi.prepare_cede = prepare_cede; 3484 coroapi.prepare_cede = prepare_cede;
3110 coroapi.prepare_cede_notself = prepare_cede_notself; 3485 coroapi.prepare_cede_notself = prepare_cede_notself;
3111 3486
3112 { 3487 time_init (aTHX);
3113 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3114
3115 if (!svp) croak ("Time::HiRes is required");
3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3117
3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3122 }
3123 3488
3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3489 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3490#if CORO_JIT
3491 PUTBACK;
3492 jit_init (aTHX);
3493 SPAGAIN;
3494#endif
3125} 3495}
3126 3496
3127SV * 3497SV *
3128new (SV *klass, ...) 3498new (SV *klass, ...)
3129 ALIAS: 3499 ALIAS:
… …
3136void 3506void
3137transfer (...) 3507transfer (...)
3138 PROTOTYPE: $$ 3508 PROTOTYPE: $$
3139 CODE: 3509 CODE:
3140 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3510 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3141
3142bool
3143_destroy (SV *coro_sv)
3144 CODE:
3145 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3146 OUTPUT:
3147 RETVAL
3148 3511
3149void 3512void
3150_exit (int code) 3513_exit (int code)
3151 PROTOTYPE: $ 3514 PROTOTYPE: $
3152 CODE: 3515 CODE:
… …
3228 CODE: 3591 CODE:
3229{ 3592{
3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3593 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3231 { 3594 {
3232 struct coro *current = SvSTATE_current; 3595 struct coro *current = SvSTATE_current;
3596 struct CoroSLF slf_save;
3233 3597
3234 if (current != coro) 3598 if (current != coro)
3235 { 3599 {
3236 PUTBACK; 3600 PUTBACK;
3237 save_perl (aTHX_ current); 3601 save_perl (aTHX_ current);
3238 load_perl (aTHX_ coro); 3602 load_perl (aTHX_ coro);
3603 /* the coro is most likely in an active SLF call.
3604 * while not strictly required (the code we execute is
3605 * not allowed to call any SLF functions), it's cleaner
3606 * to reinitialise the slf_frame and restore it later.
3607 * This might one day allow us to actually do SLF calls
3608 * from code executed here.
3609 */
3610 slf_save = slf_frame;
3611 slf_frame.prepare = 0;
3239 SPAGAIN; 3612 SPAGAIN;
3240 } 3613 }
3241 3614
3242 PUSHSTACK; 3615 PUSHSTACK;
3243 3616
… …
3253 SPAGAIN; 3626 SPAGAIN;
3254 3627
3255 if (current != coro) 3628 if (current != coro)
3256 { 3629 {
3257 PUTBACK; 3630 PUTBACK;
3631 slf_frame = slf_save;
3258 save_perl (aTHX_ coro); 3632 save_perl (aTHX_ coro);
3259 load_perl (aTHX_ current); 3633 load_perl (aTHX_ current);
3260 SPAGAIN; 3634 SPAGAIN;
3261 } 3635 }
3262 } 3636 }
… …
3267 PROTOTYPE: $ 3641 PROTOTYPE: $
3268 ALIAS: 3642 ALIAS:
3269 is_ready = CF_READY 3643 is_ready = CF_READY
3270 is_running = CF_RUNNING 3644 is_running = CF_RUNNING
3271 is_new = CF_NEW 3645 is_new = CF_NEW
3272 is_destroyed = CF_DESTROYED 3646 is_destroyed = CF_ZOMBIE
3647 is_zombie = CF_ZOMBIE
3273 is_suspended = CF_SUSPENDED 3648 is_suspended = CF_SUSPENDED
3274 CODE: 3649 CODE:
3275 RETVAL = boolSV (coro->flags & ix); 3650 RETVAL = boolSV (coro->flags & ix);
3276 OUTPUT: 3651 OUTPUT:
3277 RETVAL 3652 RETVAL
… …
3348 3723
3349void 3724void
3350cancel (Coro::State self) 3725cancel (Coro::State self)
3351 CODE: 3726 CODE:
3352 coro_state_destroy (aTHX_ self); 3727 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355 3728
3356SV * 3729SV *
3357enable_times (int enabled = enable_times) 3730enable_times (int enabled = enable_times)
3358 CODE: 3731 CODE:
3359{ 3732{
… …
3374times (Coro::State self) 3747times (Coro::State self)
3375 PPCODE: 3748 PPCODE:
3376{ 3749{
3377 struct coro *current = SvSTATE (coro_current); 3750 struct coro *current = SvSTATE (coro_current);
3378 3751
3379 if (expect_false (current == self)) 3752 if (ecb_expect_false (current == self))
3380 { 3753 {
3381 coro_times_update (); 3754 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current)); 3755 coro_times_add (SvSTATE (coro_current));
3383 } 3756 }
3384 3757
3385 EXTEND (SP, 2); 3758 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3759 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3760 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388 3761
3389 if (expect_false (current == self)) 3762 if (ecb_expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current)); 3763 coro_times_sub (SvSTATE (coro_current));
3391} 3764}
3392 3765
3393void 3766void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3767swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3415BOOT: 3788BOOT:
3416{ 3789{
3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3790 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3791 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3792 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3793 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3795 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3796 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3797 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3464 api_ready (aTHX_ RETVAL); 3836 api_ready (aTHX_ RETVAL);
3465 OUTPUT: 3837 OUTPUT:
3466 RETVAL 3838 RETVAL
3467 3839
3468void 3840void
3841_destroy (Coro::State coro)
3842 CODE:
3843 /* used by the manager thread */
3844 coro_state_destroy (aTHX_ coro);
3845
3846void
3847on_destroy (Coro::State coro, SV *cb)
3848 CODE:
3849 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3850
3851void
3852join (...)
3853 CODE:
3854 CORO_EXECUTE_SLF_XS (slf_init_join);
3855
3856void
3469terminate (...) 3857terminate (...)
3470 CODE: 3858 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3859 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3860
3861void
3862cancel (...)
3863 CODE:
3864 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3865
3866int
3867safe_cancel (Coro::State self, ...)
3868 C_ARGS: aTHX_ self, &ST (1), items - 1
3472 3869
3473void 3870void
3474schedule (...) 3871schedule (...)
3475 CODE: 3872 CODE:
3476 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3873 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3752} 4149}
3753 4150
3754MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4151MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3755 4152
3756void 4153void
3757_may_delete (SV *sem, int count, int extra_refs) 4154_may_delete (SV *sem, int count, unsigned int extra_refs)
3758 PPCODE: 4155 PPCODE:
3759{ 4156{
3760 AV *av = (AV *)SvRV (sem); 4157 AV *av = (AV *)SvRV (sem);
3761 4158
3762 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4159 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3873 { 4270 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4271 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0; 4272 coro_old_pp_sselect = 0;
3876 } 4273 }
3877 4274
3878

Diff Legend

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