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

Diff Legend

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