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.428 by root, Wed Dec 5 16:34:12 2012 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
… …
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"
14 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
15#include <stdio.h> 22#include <stdio.h>
16#include <errno.h> 23#include <errno.h>
17#include <assert.h> 24#include <assert.h>
18 25
19#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
21#endif 28#endif
22 29
23#ifdef WIN32 30#ifdef PadARRAY
31# define NEWPADAPI
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
24# undef setjmp 49# undef setjmp
25# undef longjmp 50# undef longjmp
26# undef _exit 51# undef _exit
27# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
28#else 53#else
29# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
30#endif 55#endif
31 56
32#ifdef HAVE_MMAP 57#if HAVE_MMAP
33# include <unistd.h> 58# include <unistd.h>
34# include <sys/mman.h> 59# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS 60# ifndef MAP_ANONYMOUS
36# ifdef MAP_ANON 61# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON 62# define MAP_ANONYMOUS MAP_ANON
… …
57#endif 82#endif
58 83
59/* the maximum number of idle cctx that will be pooled */ 84/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 85static int cctx_max_idle = 4;
61 86
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1
89#endif
90
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
63# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
64#endif 93#endif
65 94
66#ifndef CORO_STACKGUARD 95#ifndef CORO_STACKGUARD
… …
82# define STACKLEVEL ((void *)&stacklevel) 111# define STACKLEVEL ((void *)&stacklevel)
83#endif 112#endif
84 113
85#define IN_DESTRUCT PL_dirty 114#define IN_DESTRUCT PL_dirty
86 115
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" 116#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 117#define GCoroAPI (&coroapi) /* very sneaky */
104 118
105#ifdef USE_ITHREADS 119#ifdef USE_ITHREADS
106# if CORO_PTHREAD 120# if CORO_PTHREAD
… …
122static void (*u2time)(pTHX_ UV ret[2]); 136static void (*u2time)(pTHX_ UV ret[2]);
123 137
124/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
127 142
128static U32 cctx_gen; 143static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 176static char times_valid;
162 177
163static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
165 180
166enum { 181enum
182{
167 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181 void *sptr; 197 void *sptr;
182 size_t ssize; 198 size_t ssize;
183 199
184 /* cpu state */ 200 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 203 JMPENV *idle_te; /* same as idle_sp, but for top_env */
204#endif
187 JMPENV *top_env; 205 JMPENV *top_env;
188 coro_context cctx; 206 coro_context cctx;
189 207
190 U32 gen; 208 U32 gen;
191#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
192 int valgrind_id; 210 int valgrind_id;
193#endif 211#endif
194 unsigned char flags; 212 unsigned char flags;
195} coro_cctx; 213} coro_cctx;
196 214
197coro_cctx *cctx_current; /* the currently running cctx */ 215static coro_cctx *cctx_current; /* the currently running cctx */
198 216
199/*****************************************************************************/ 217/*****************************************************************************/
200 218
219static MGVTBL coro_state_vtbl;
220
201enum { 221enum
222{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 227 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
228 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 229};
208 230
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 231/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 232typedef struct
211{ 233{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
218# include "state.h" 235 #include "state.h"
219#undef VAR
220} perl_slots; 236} perl_slots;
221 237
238/* 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)) 239#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 240
224/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
225struct coro { 242struct coro
243{
226 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 245 coro_cctx *cctx;
228 246
229 /* ready queue */ 247 /* ready queue */
230 struct coro *next_ready; 248 struct coro *next_ready;
… …
232 /* state data */ 250 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 252 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
236 254
237 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 259
244 /* statistics */ 260 /* statistics */
245 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
246 262
247 /* coro process data */ 263 /* coro process data */
248 int prio; 264 int prio;
249 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 266 SV *rouse_cb; /* last rouse callback */
267 AV *on_destroy; /* callbacks or coros to notify on destroy */
268 AV *status; /* the exit status list */
251 269
252 /* async_pool */ 270 /* async_pool */
253 SV *saved_deffh; 271 SV *saved_deffh;
254 SV *invoke_cb; 272 SV *invoke_cb;
255 AV *invoke_av; 273 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 289typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 290typedef struct coro *Coro__State_or_hashref;
273 291
274/* the following variables are effectively part of the perl context */ 292/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 293/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 294/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 295static struct CoroSLF slf_frame; /* the current slf frame */
278 296
279/** Coro ********************************************************************/ 297/** Coro ********************************************************************/
280 298
281#define CORO_PRIO_MAX 3 299#define CORO_PRIO_MAX 3
… …
287 305
288/* for Coro.pm */ 306/* for Coro.pm */
289static SV *coro_current; 307static SV *coro_current;
290static SV *coro_readyhook; 308static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 310static CV *cv_coro_run;
293static struct coro *coro_first; 311static struct coro *coro_first;
294#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
313
314/** JIT *********************************************************************/
315
316#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix"
324 #endif
325 #endif
326#endif
327
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
329 #undef CORO_JIT
330#endif
331
332#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *);
334 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
335#endif
295 336
296/** Coro::Select ************************************************************/ 337/** Coro::Select ************************************************************/
297 338
298static OP *(*coro_old_pp_sselect) (pTHX); 339static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 340static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 352 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 353 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 354 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 355}
315 356
357/** time stuff **************************************************************/
358
359#ifdef HAS_GETTIMEOFDAY
360
361ecb_inline void
362coro_u2time (pTHX_ UV ret[2])
363{
364 struct timeval tv;
365 gettimeofday (&tv, 0);
366
367 ret [0] = tv.tv_sec;
368 ret [1] = tv.tv_usec;
369}
370
371ecb_inline double
372coro_nvtime (void)
373{
374 struct timeval tv;
375 gettimeofday (&tv, 0);
376
377 return tv.tv_sec + tv.tv_usec * 1e-6;
378}
379
380ecb_inline void
381time_init (pTHX)
382{
383 nvtime = coro_nvtime;
384 u2time = coro_u2time;
385}
386
387#else
388
389ecb_inline void
390time_init (pTHX)
391{
392 SV **svp;
393
394 require_pv ("Time/HiRes.pm");
395
396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
397
398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
399 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
400
401 nvtime = INT2PTR (double (*)(), SvIV (*svp));
402
403 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
404 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
405}
406
407#endif
408
316/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
317 410
318static SV * 411static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
320{ 413{
321#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 416 get_sv (name, create);
324#endif 417#endif
325 return get_sv (name, create); 418 return get_sv (name, create);
326} 419}
327 420
328static AV * 421static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
330{ 423{
331#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 426 get_av (name, create);
334#endif 427#endif
335 return get_av (name, create); 428 return get_av (name, create);
336} 429}
337 430
338static HV * 431static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
340{ 433{
341#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 435 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 436 get_hv (name, create);
344#endif 437#endif
345 return get_hv (name, create); 438 return get_hv (name, create);
346} 439}
347 440
348INLINE void 441ecb_inline void
349coro_times_update () 442coro_times_update (void)
350{ 443{
351#ifdef coro_clock_gettime 444#ifdef coro_clock_gettime
352 struct timespec ts; 445 struct timespec ts;
353 446
354 ts.tv_sec = ts.tv_nsec = 0; 447 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 459 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 460 time_real [1] = tv [1] * 1000;
368#endif 461#endif
369} 462}
370 463
371INLINE void 464ecb_inline void
372coro_times_add (struct coro *c) 465coro_times_add (struct coro *c)
373{ 466{
374 c->t_real [1] += time_real [1]; 467 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 468 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 469 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 471 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 472 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 473 c->t_cpu [0] += time_cpu [0];
381} 474}
382 475
383INLINE void 476ecb_inline void
384coro_times_sub (struct coro *c) 477coro_times_sub (struct coro *c)
385{ 478{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 479 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]; 480 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 481 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 489/* magic glue */
397 490
398#define CORO_MAGIC_type_cv 26 491#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 492#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 493
401#define CORO_MAGIC_NN(sv, type) \ 494#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 496 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 497 : mg_find (sv, type))
405 498
406#define CORO_MAGIC(sv, type) \ 499#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 500 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 501 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 502 : 0)
410 503
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 504#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) 505#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 506
414INLINE struct coro * 507ecb_inline MAGIC *
508SvSTATEhv_p (pTHX_ SV *coro)
509{
510 MAGIC *mg;
511
512 if (ecb_expect_true (
513 SvTYPE (coro) == SVt_PVHV
514 && (mg = CORO_MAGIC_state (coro))
515 && mg->mg_virtual == &coro_state_vtbl
516 ))
517 return mg;
518
519 return 0;
520}
521
522ecb_inline struct coro *
415SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
416{ 524{
417 HV *stash;
418 MAGIC *mg; 525 MAGIC *mg;
419 526
420 if (SvROK (coro)) 527 if (SvROK (coro))
421 coro = SvRV (coro); 528 coro = SvRV (coro);
422 529
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
424 croak ("Coro::State object required"); 532 croak ("Coro::State object required");
425 533
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; 534 return (struct coro *)mg->mg_ptr;
436} 535}
437 536
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 538
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 542
444/*****************************************************************************/ 543/*****************************************************************************/
445/* padlist management and caching */ 544/* padlist management and caching */
446 545
447static AV * 546ecb_inline PADLIST *
448coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
449{ 548{
450 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
452 553
453 newpadlist = newAV (); 554 newPADLIST(newpadlist);
555#if !PERL_VERSION_ATLEAST(5,15,3)
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
454 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
455#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
456 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
457#else 561#else
458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
459#endif 563#endif
460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
461 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
462 566
463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
464 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
465 571
466 return newpadlist; 572 return newpadlist;
467} 573}
468 574
469static void 575ecb_inline void
470free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
471{ 577{
472 /* may be during global destruction */ 578 /* may be during global destruction */
473 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
474 { 580 {
475 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
476 582
477 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
478 { 584 {
479 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
480 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
481 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
482 588
483 while (j >= 0) 589 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 591
486 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
488 } 594 }
489 595
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
491 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
492 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
494 } 606 }
495} 607}
496 608
497static int 609static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 611{
500 AV *padlist; 612 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 613 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
614 size_t len = *(size_t *)mg->mg_ptr;
502 615
503 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
505 return 0; 618 return 0;
506 619
507 /* casting is fun. */ 620 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 622
513 return 0; 623 return 0;
514} 624}
515 625
516static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 627 0, 0, 0, 0,
518 coro_cv_free 628 coro_cv_free
519}; 629};
520 630
521/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
522static void 632ecb_inline void
523get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
524{ 634{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 636 size_t *lenp;
527 637
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 640 else
531 { 641 {
532#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 651#endif
542 } 652 }
543} 653}
544 654
545static void 655ecb_inline void
546put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
547{ 657{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 659
551 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 662 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
663 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
664 mg->mg_len = 1; /* so mg_free frees mg_ptr */
665 }
666 else
667 Renew (mg->mg_ptr,
668 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
669 char);
553 670
554 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
555
556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
557 av_extend (av, AvFILLp (av) + 1);
558
559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
560} 672}
561 673
562/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
563 675
676ecb_inline void
677swap_sv (SV *a, SV *b)
678{
679 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
680 SV tmp;
681
682 /* swap sv_any */
683 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
684
685 /* swap sv_flags */
686 SvFLAGS (&tmp) = SvFLAGS (a);
687 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
688 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
689
690#if PERL_VERSION_ATLEAST (5,10,0)
691 /* perl 5.10 and later complicates this _quite_ a bit, but it also
692 * is much faster, so no quarrels here. alternatively, we could
693 * sv_upgrade to avoid this.
694 */
695 {
696 /* swap sv_u */
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698
699 /* if SvANY points to the head, we need to adjust the pointers,
700 * as the pointer for a still points to b, and maybe vice versa.
701 */
702 #define svany_in_head(type) \
703 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
704
705 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707
708 if (svany_in_head (SvTYPE (b)))
709 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
710 }
711#endif
712}
713
564/* swap sv heads, at least logically */ 714/* swap sv heads, at least logically */
565static void 715static void
566swap_svs (pTHX_ Coro__State c) 716swap_svs (pTHX_ Coro__State c)
567{ 717{
568 int i; 718 int i;
569 719
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 721 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} 722}
610 723
611#define SWAP_SVS(coro) \ 724#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 725 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 726 swap_svs (aTHX_ (coro))
614 727
615static void 728static void
616on_enterleave_call (pTHX_ SV *cb); 729on_enterleave_call (pTHX_ SV *cb);
617 730
… …
621 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
622 c->slot = 0; 735 c->slot = 0;
623 736
624 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
625 738
626 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 741#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 743 #include "state.h"
634 #undef VAR 744#endif
635 745
636 { 746 {
637 dSP; 747 dSP;
638 748
639 CV *cv; 749 CV *cv;
640 750
641 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
643 { 753 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 757 }
648 758
649 PUTBACK; 759 PUTBACK;
650 } 760 }
651 761
652 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 763 CORO_THROW = c->except;
654 764
655 if (expect_false (enable_times)) 765 if (ecb_expect_false (enable_times))
656 { 766 {
657 if (expect_false (!times_valid)) 767 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 768 coro_times_update ();
659 769
660 coro_times_sub (c); 770 coro_times_sub (c);
661 } 771 }
662 772
663 if (expect_false (c->on_enter)) 773 if (ecb_expect_false (c->on_enter))
664 { 774 {
665 int i; 775 int i;
666 776
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 777 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 784static void
675save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
676{ 786{
677 SWAP_SVS (c); 787 SWAP_SVS (c);
678 788
679 if (expect_false (c->on_leave)) 789 if (ecb_expect_false (c->on_leave))
680 { 790 {
681 int i; 791 int i;
682 792
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 793 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 795 }
686 796
687 times_valid = 0; 797 times_valid = 0;
688 798
689 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
690 { 800 {
691 coro_times_update (); times_valid = 1; 801 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 802 coro_times_add (c);
693 } 803 }
694 804
… …
708 818
709 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
711 for (;;) 821 for (;;)
712 { 822 {
713 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
714 { 824 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
716 826
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 827 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 828 {
719 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
720 830
721 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
722 { 832 {
723 EXTEND (SP, 3); 833 EXTEND (SP, 3);
724 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
725 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
726 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
729 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
730 } 840 }
731 } 841 }
732 } 842 }
733 843
734 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
735 break; 845 break;
736 846
737 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
738 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
739 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
741 851
742 PUTBACK; 852 PUTBACK;
743 } 853 }
744 854
745 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
746 /* we manually unroll here, as usually 2 slots is enough */ 856 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 { 857 {
751 unsigned int i; 858 unsigned int i;
859
752 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
753 CXINC; 861 CXINC;
754 } 862
755 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
756 865
757 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
758 867
759 { 868 {
760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
761 870
762 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
763 slot->defsv = DEFSV; 872 save_perl_slots (slot);
764 slot->errsv = ERRSV; 873#else
765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
767
768 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
769 # include "state.h" 875 #include "state.h"
770 #undef VAR 876#endif
771 } 877 }
772} 878}
773 879
774/* 880/*
775 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
781# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
782#else 888#else
783static void 889static void
784coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
785{ 891{
786 PL_curstackinfo = new_stackinfo(32, 8); 892 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; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
788 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
789 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
790 896
791 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
806#endif 912#endif
807 913
808 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
809 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
810 PL_scopestack_max = 8; 916 PL_scopestack_max = 8;
917#if HAS_SCOPESTACK_NAME
918 New(54,PL_scopestack_name,8,const char*);
919#endif
811 920
812 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
813 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
814 PL_savestack_max = 24; 923 PL_savestack_max = 24;
815 924
… …
843 } 952 }
844 953
845 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
846 Safefree (PL_markstack); 955 Safefree (PL_markstack);
847 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
848 Safefree (PL_savestack); 960 Safefree (PL_savestack);
849#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
850 Safefree (PL_retstack); 962 Safefree (PL_retstack);
851#endif 963#endif
852} 964}
… …
898#endif 1010#endif
899 1011
900/* 1012/*
901 * This overrides the default magic get method of %SIG elements. 1013 * 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 1014 * 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 1015 * and instead of trying to save and restore the hash elements (extremely slow),
904 * readback here. 1016 * we just provide our own readback here.
905 */ 1017 */
906static int 1018static int ecb_cold
907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
908{ 1020{
909 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
910 1022
911 if (*s == '_') 1023 if (*s == '_')
912 { 1024 {
913 SV **svp = 0; 1025 SV **svp = 0;
914 1026
915 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
916 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
917 1029
918 if (svp) 1030 if (svp)
919 { 1031 {
920 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1032 SV *ssv;
1033
1034 if (!*svp)
1035 ssv = &PL_sv_undef;
1036 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1037 ssv = sv_2mortal (newRV_inc (*svp));
1038 else
1039 ssv = *svp;
1040
1041 sv_setsv (sv, ssv);
921 return 0; 1042 return 0;
922 } 1043 }
923 } 1044 }
924 1045
925 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
926} 1047}
927 1048
928static int 1049static int ecb_cold
929coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
930{ 1051{
931 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
932 1053
933 if (*s == '_') 1054 if (*s == '_')
… …
947 } 1068 }
948 1069
949 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
950} 1071}
951 1072
952static int 1073static int ecb_cold
953coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
954{ 1075{
955 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
956 1077
957 if (*s == '_') 1078 if (*s == '_')
… …
992 return 1; 1113 return 1;
993} 1114}
994 1115
995static UNOP init_perl_op; 1116static UNOP init_perl_op;
996 1117
997static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */
998init_perl (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
999{ 1120{
1000 /* 1121 /*
1001 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
1002 */ 1123 */
… …
1010 PL_comppad_name_fill = 0; 1131 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1132 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1133 PL_curpm = 0;
1013 PL_curpad = 0; 1134 PL_curpad = 0;
1014 PL_localizing = 0; 1135 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1136 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1137#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1138 PL_parser = 0;
1019#endif 1139#endif
1020 PL_hints = 0; 1140 PL_hints = 0;
1021 1141
1022 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1025 1145
1026 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
1027 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
1028 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
1050 /* this newly created coroutine might be run on an existing cctx which most 1170 /* 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. 1171 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1052 */ 1172 */
1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1173 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 */ 1174 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1175 slf_frame.destroy = 0;
1055 1176
1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1177 /* 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; 1178 init_perl_op.op_next = PL_op;
1058 init_perl_op.op_type = OP_ENTERSUB; 1179 init_perl_op.op_type = OP_ENTERSUB;
1059 init_perl_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
… …
1064 /* copy throw, in case it was set before init_perl */ 1185 /* copy throw, in case it was set before init_perl */
1065 CORO_THROW = coro->except; 1186 CORO_THROW = coro->except;
1066 1187
1067 SWAP_SVS (coro); 1188 SWAP_SVS (coro);
1068 1189
1069 if (expect_false (enable_times)) 1190 if (ecb_expect_false (enable_times))
1070 { 1191 {
1071 coro_times_update (); 1192 coro_times_update ();
1072 coro_times_sub (coro); 1193 coro_times_sub (coro);
1073 } 1194 }
1074} 1195}
… …
1098destroy_perl (pTHX_ struct coro *coro) 1219destroy_perl (pTHX_ struct coro *coro)
1099{ 1220{
1100 SV *svf [9]; 1221 SV *svf [9];
1101 1222
1102 { 1223 {
1224 SV *old_current = SvRV (coro_current);
1103 struct coro *current = SvSTATE_current; 1225 struct coro *current = SvSTATE (old_current);
1104 1226
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1227 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1228
1107 save_perl (aTHX_ current); 1229 save_perl (aTHX_ current);
1230
1231 /* this will cause transfer_check to croak on block*/
1232 SvRV_set (coro_current, (SV *)coro->hv);
1233
1108 load_perl (aTHX_ coro); 1234 load_perl (aTHX_ coro);
1109 1235
1110 coro_unwind_stacks (aTHX); 1236 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112 1237
1113 /* restore swapped sv's */ 1238 /* restore swapped sv's */
1114 SWAP_SVS (coro); 1239 SWAP_SVS (coro);
1115 1240
1241 coro_destruct_stacks (aTHX);
1242
1116 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1117 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1250 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1251 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1252 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1253 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1254
1255 SvRV_set (coro_current, old_current);
1256
1128 load_perl (aTHX_ current); 1257 load_perl (aTHX_ current);
1129 } 1258 }
1130 1259
1131 { 1260 {
1132 unsigned int i; 1261 unsigned int i;
… …
1139 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1140 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1141 } 1270 }
1142} 1271}
1143 1272
1144INLINE void 1273ecb_inline void
1145free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1146{ 1275{
1147 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1148 { 1277 {
1149 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1279 coro_mortal = 0;
1151 } 1280 }
1152} 1281}
1153 1282
1154static int 1283static int
… …
1287 1416
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1417 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1418}
1290 1419
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1420/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1421static void ecb_noinline
1293cctx_prepare (pTHX) 1422cctx_prepare (pTHX)
1294{ 1423{
1295 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1296 1425
1297 if (cctx_current->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1310} 1439}
1311 1440
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1441/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1442ecb_inline void
1314transfer_tail (pTHX) 1443transfer_tail (pTHX)
1315{ 1444{
1316 free_coro_mortal (aTHX); 1445 free_coro_mortal (aTHX);
1446}
1447
1448/* try to exit the same way perl's main function would do */
1449/* we do not bother resetting the environment or other things *7
1450/* that are not, uhm, essential */
1451/* this obviously also doesn't work when perl is embedded */
1452static void ecb_noinline ecb_cold
1453perlish_exit (pTHX)
1454{
1455 int exitstatus = perl_destruct (PL_curinterp);
1456 perl_free (PL_curinterp);
1457 exit (exitstatus);
1317} 1458}
1318 1459
1319/* 1460/*
1320 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1321 */ 1462 */
… …
1350 */ 1491 */
1351 1492
1352 /* 1493 /*
1353 * If perl-run returns we assume exit() was being called or the coro 1494 * If perl-run returns we assume exit() was being called or the coro
1354 * fell off the end, which seems to be the only valid (non-bug) 1495 * fell off the end, which seems to be the only valid (non-bug)
1355 * reason for perl_run to return. We try to exit by jumping to the 1496 * reason for perl_run to return. We try to mimic whatever perl is normally
1356 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1357 * coroutine as Coro has no such concept.
1358 * This actually isn't valid with the pthread backend, but OSes requiring
1359 * that backend are too broken to do it in a standards-compliant way.
1360 */ 1498 */
1361 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1500 }
1364} 1501}
1365 1502
1366static coro_cctx * 1503static coro_cctx *
1367cctx_new () 1504cctx_new (void)
1368{ 1505{
1369 coro_cctx *cctx; 1506 coro_cctx *cctx;
1370 1507
1371 ++cctx_count; 1508 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1515 return cctx;
1379} 1516}
1380 1517
1381/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1382static coro_cctx * 1519static coro_cctx *
1383cctx_new_empty () 1520cctx_new_empty (void)
1384{ 1521{
1385 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1386 1523
1387 cctx->sptr = 0; 1524 cctx->sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1390 return cctx; 1527 return cctx;
1391} 1528}
1392 1529
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1531static coro_cctx *
1395cctx_new_run () 1532cctx_new_run (void)
1396{ 1533{
1397 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1398 void *stack_start; 1535 void *stack_start;
1399 size_t stack_size; 1536 size_t stack_size;
1400 1537
1538#if CORO_FIBER
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1401#if HAVE_MMAP 1545 #if HAVE_MMAP
1402 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1403 /* mmap supposedly does allocate-on-write for us */ 1547 /* 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); 1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1405 1549
1406 if (cctx->sptr != (void *)-1) 1550 if (cctx->sptr != (void *)-1)
1407 { 1551 {
1408 #if CORO_STACKGUARD 1552 #if CORO_STACKGUARD
1409 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1410 #endif 1554 #endif
1411 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE; 1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1412 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1413 cctx->flags |= CC_MAPPED; 1557 cctx->flags |= CC_MAPPED;
1414 } 1558 }
1415 else 1559 else
1416#endif 1560 #endif
1417 { 1561 {
1418 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1419 New (0, cctx->sptr, cctx_stacksize, long); 1563 New (0, cctx->sptr, cctx_stacksize, long);
1420 1564
1421 if (!cctx->sptr) 1565 if (!cctx->sptr)
1422 { 1566 {
1423 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1567 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1424 _exit (EXIT_FAILURE); 1568 _exit (EXIT_FAILURE);
1425 } 1569 }
1426 1570
1427 stack_start = cctx->sptr; 1571 stack_start = cctx->sptr;
1428 stack_size = cctx->ssize; 1572 stack_size = cctx->ssize;
1429 } 1573 }
1574 #endif
1430 1575
1431 #if CORO_USE_VALGRIND 1576 #if CORO_USE_VALGRIND
1432 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size); 1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1433 #endif 1578 #endif
1434 1579
… …
1441cctx_destroy (coro_cctx *cctx) 1586cctx_destroy (coro_cctx *cctx)
1442{ 1587{
1443 if (!cctx) 1588 if (!cctx)
1444 return; 1589 return;
1445 1590
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1591 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1592
1448 --cctx_count; 1593 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1594 coro_destroy (&cctx->cctx);
1450 1595
1451 /* coro_transfer creates new, empty cctx's */ 1596 /* coro_transfer creates new, empty cctx's */
… …
1453 { 1598 {
1454 #if CORO_USE_VALGRIND 1599 #if CORO_USE_VALGRIND
1455 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1600 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1456 #endif 1601 #endif
1457 1602
1458#if HAVE_MMAP 1603 #if HAVE_MMAP
1459 if (cctx->flags & CC_MAPPED) 1604 if (cctx->flags & CC_MAPPED)
1460 munmap (cctx->sptr, cctx->ssize); 1605 munmap (cctx->sptr, cctx->ssize);
1461 else 1606 else
1462#endif 1607 #endif
1463 Safefree (cctx->sptr); 1608 Safefree (cctx->sptr);
1464 } 1609 }
1465 1610
1466 Safefree (cctx); 1611 Safefree (cctx);
1467} 1612}
1468 1613
… …
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1615#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1616
1472static coro_cctx * 1617static coro_cctx *
1473cctx_get (pTHX) 1618cctx_get (pTHX)
1474{ 1619{
1475 while (expect_true (cctx_first)) 1620 while (ecb_expect_true (cctx_first))
1476 { 1621 {
1477 coro_cctx *cctx = cctx_first; 1622 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1623 cctx_first = cctx->next;
1479 --cctx_idle; 1624 --cctx_idle;
1480 1625
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1626 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1627 return cctx;
1483 1628
1484 cctx_destroy (cctx); 1629 cctx_destroy (cctx);
1485 } 1630 }
1486 1631
… …
1491cctx_put (coro_cctx *cctx) 1636cctx_put (coro_cctx *cctx)
1492{ 1637{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1494 1639
1495 /* free another cctx if overlimit */ 1640 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1642 {
1498 coro_cctx *first = cctx_first; 1643 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1644 cctx_first = first->next;
1500 --cctx_idle; 1645 --cctx_idle;
1501 1646
… …
1512static void 1657static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1658transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1659{
1515 /* TODO: throwing up here is considered harmful */ 1660 /* TODO: throwing up here is considered harmful */
1516 1661
1517 if (expect_true (prev != next)) 1662 if (ecb_expect_true (prev != next))
1518 { 1663 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1664 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,"); 1665 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1666
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1667 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,"); 1668 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1669
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1670#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1671 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,"); 1672 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1673#endif
1529 } 1674 }
1530} 1675}
1531 1676
1532/* always use the TRANSFER macro */ 1677/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1678static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1679transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1680{
1536 dSTACKLEVEL; 1681 dSTACKLEVEL;
1537 1682
1538 /* sometimes transfer is only called to set idle_sp */ 1683 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1684 if (ecb_expect_false (!prev))
1540 { 1685 {
1541 cctx_current->idle_sp = STACKLEVEL; 1686 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1687 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1688 }
1544 else if (expect_true (prev != next)) 1689 else if (ecb_expect_true (prev != next))
1545 { 1690 {
1546 coro_cctx *cctx_prev; 1691 coro_cctx *cctx_prev;
1547 1692
1548 if (expect_false (prev->flags & CF_NEW)) 1693 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1694 {
1550 /* create a new empty/source context */ 1695 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1696 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1697 prev->flags |= CF_RUNNING;
1553 } 1698 }
… …
1556 next->flags |= CF_RUNNING; 1701 next->flags |= CF_RUNNING;
1557 1702
1558 /* first get rid of the old state */ 1703 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1704 save_perl (aTHX_ prev);
1560 1705
1561 if (expect_false (next->flags & CF_NEW)) 1706 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1707 {
1563 /* need to start coroutine */ 1708 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1709 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1710 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1711 init_perl (aTHX_ next);
1567 } 1712 }
1568 else 1713 else
1569 load_perl (aTHX_ next); 1714 load_perl (aTHX_ next);
1570 1715
1571 /* possibly untie and reuse the cctx */ 1716 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1717 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1718 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1719 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1720 && !force_cctx
1576 )) 1721 ))
1577 { 1722 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1723 /* 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)); 1724 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1725
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1726 /* 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 */ 1727 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1728 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1729 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1730 next->cctx = cctx_get (aTHX);
1586 1731
1587 cctx_put (cctx_current); 1732 cctx_put (cctx_current);
1588 } 1733 }
1589 else 1734 else
1590 prev->cctx = cctx_current; 1735 prev->cctx = cctx_current;
1591 1736
1592 ++next->usecount; 1737 ++next->usecount;
1593 1738
1594 cctx_prev = cctx_current; 1739 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1740 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1741
1597 next->cctx = 0; 1742 next->cctx = 0;
1598 1743
1599 if (expect_false (cctx_prev != cctx_current)) 1744 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1745 {
1601 cctx_prev->top_env = PL_top_env; 1746 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1747 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1748 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1749 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1755#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) 1756#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1757
1613/** high level stuff ********************************************************/ 1758/** high level stuff ********************************************************/
1614 1759
1760/* this function is actually Coro, not Coro::State, but we call it from here */
1761/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1762static void
1763coro_call_on_destroy (pTHX_ struct coro *coro);
1764
1765static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1766coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1767{
1618 if (coro->flags & CF_DESTROYED) 1768 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1769 return;
1620 1770
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1771 slf_destroy (aTHX_ coro);
1623 1772
1624 coro->flags |= CF_DESTROYED; 1773 coro->flags |= CF_ZOMBIE;
1625 1774
1626 if (coro->flags & CF_READY) 1775 if (coro->flags & CF_READY)
1627 { 1776 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1777 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1778 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1779 --coro_nready;
1631 } 1780 }
1632 else 1781 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1782 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1783
1784 if (coro->next) coro->next->prev = coro->prev;
1785 if (coro->prev) coro->prev->next = coro->next;
1786 if (coro == coro_first) coro_first = coro->next;
1634 1787
1635 if (coro->mainstack 1788 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1789 && coro->mainstack != main_mainstack
1637 && coro->slot 1790 && coro->slot
1638 && !PL_dirty) 1791 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1792 destroy_perl (aTHX_ coro);
1640 1793
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); 1794 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1795 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1796 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1797 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1798 SvREFCNT_dec (CORO_THROW);
1650 1799
1651 return 1; 1800 coro_call_on_destroy (aTHX_ coro);
1801
1802 /* more destruction mayhem in coro_state_free */
1652} 1803}
1653 1804
1654static int 1805static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1806coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1807{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 struct coro *coro = (struct coro *)mg->mg_ptr;
1658 mg->mg_ptr = 0; 1809 mg->mg_ptr = 0;
1659 1810
1660 coro->hv = 0;
1661
1662 if (--coro->refcnt < 0)
1663 {
1664 coro_state_destroy (aTHX_ coro); 1811 coro_state_destroy (aTHX_ coro);
1812 SvREFCNT_dec (coro->on_destroy);
1813 SvREFCNT_dec (coro->status);
1814
1665 Safefree (coro); 1815 Safefree (coro);
1666 }
1667 1816
1668 return 0; 1817 return 0;
1669} 1818}
1670 1819
1671static int 1820static int ecb_cold
1672coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1821coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1673{ 1822{
1674 struct coro *coro = (struct coro *)mg->mg_ptr; 1823 /* called when perl clones the current process the slow way (windows process emulation) */
1675 1824 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1676 ++coro->refcnt; 1825 mg->mg_ptr = 0;
1826 mg->mg_virtual = 0;
1677 1827
1678 return 0; 1828 return 0;
1679} 1829}
1680 1830
1681static MGVTBL coro_state_vtbl = { 1831static MGVTBL coro_state_vtbl = {
… …
1706 TRANSFER (ta, 1); 1856 TRANSFER (ta, 1);
1707} 1857}
1708 1858
1709/** Coro ********************************************************************/ 1859/** Coro ********************************************************************/
1710 1860
1711INLINE void 1861ecb_inline void
1712coro_enq (pTHX_ struct coro *coro) 1862coro_enq (pTHX_ struct coro *coro)
1713{ 1863{
1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1864 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1715 1865
1716 SvREFCNT_inc_NN (coro->hv); 1866 SvREFCNT_inc_NN (coro->hv);
… …
1718 coro->next_ready = 0; 1868 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1869 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro; 1870 ready [1] = coro;
1721} 1871}
1722 1872
1723INLINE struct coro * 1873ecb_inline struct coro *
1724coro_deq (pTHX) 1874coro_deq (pTHX)
1725{ 1875{
1726 int prio; 1876 int prio;
1727 1877
1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1878 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1781{ 1931{
1782 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1932 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1783} 1933}
1784 1934
1785/* expects to own a reference to next->hv */ 1935/* expects to own a reference to next->hv */
1786INLINE void 1936ecb_inline void
1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1937prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1788{ 1938{
1789 SV *prev_sv = SvRV (coro_current); 1939 SV *prev_sv = SvRV (coro_current);
1790 1940
1791 ta->prev = SvSTATE_hv (prev_sv); 1941 ta->prev = SvSTATE_hv (prev_sv);
… …
1804{ 1954{
1805 for (;;) 1955 for (;;)
1806 { 1956 {
1807 struct coro *next = coro_deq (aTHX); 1957 struct coro *next = coro_deq (aTHX);
1808 1958
1809 if (expect_true (next)) 1959 if (ecb_expect_true (next))
1810 { 1960 {
1811 /* cannot transfer to destroyed coros, skip and look for next */ 1961 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1962 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 */ 1963 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else 1964 else
1815 { 1965 {
1816 next->flags &= ~CF_READY; 1966 next->flags &= ~CF_READY;
1817 --coro_nready; 1967 --coro_nready;
… …
1850 } 2000 }
1851 } 2001 }
1852 } 2002 }
1853} 2003}
1854 2004
1855INLINE void 2005ecb_inline void
1856prepare_cede (pTHX_ struct coro_transfer_args *ta) 2006prepare_cede (pTHX_ struct coro_transfer_args *ta)
1857{ 2007{
1858 api_ready (aTHX_ coro_current); 2008 api_ready (aTHX_ coro_current);
1859 prepare_schedule (aTHX_ ta); 2009 prepare_schedule (aTHX_ ta);
1860} 2010}
1861 2011
1862INLINE void 2012ecb_inline void
1863prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2013prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1864{ 2014{
1865 SV *prev = SvRV (coro_current); 2015 SV *prev = SvRV (coro_current);
1866 2016
1867 if (coro_nready) 2017 if (coro_nready)
… …
1897{ 2047{
1898 struct coro_transfer_args ta; 2048 struct coro_transfer_args ta;
1899 2049
1900 prepare_cede (aTHX_ &ta); 2050 prepare_cede (aTHX_ &ta);
1901 2051
1902 if (expect_true (ta.prev != ta.next)) 2052 if (ecb_expect_true (ta.prev != ta.next))
1903 { 2053 {
1904 TRANSFER (ta, 1); 2054 TRANSFER (ta, 1);
1905 return 1; 2055 return 1;
1906 } 2056 }
1907 else 2057 else
… …
1950 coro->slot->runops = RUNOPS_DEFAULT; 2100 coro->slot->runops = RUNOPS_DEFAULT;
1951 } 2101 }
1952} 2102}
1953 2103
1954static void 2104static void
2105coro_push_av (pTHX_ AV *av, I32 gimme_v)
2106{
2107 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2108 {
2109 dSP;
2110
2111 if (gimme_v == G_SCALAR)
2112 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2113 else
2114 {
2115 int i;
2116 EXTEND (SP, AvFILLp (av) + 1);
2117
2118 for (i = 0; i <= AvFILLp (av); ++i)
2119 PUSHs (AvARRAY (av)[i]);
2120 }
2121
2122 PUTBACK;
2123 }
2124}
2125
2126static void
2127coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2128{
2129 if (!coro->on_destroy)
2130 coro->on_destroy = newAV ();
2131
2132 av_push (coro->on_destroy, cb);
2133}
2134
2135static void
2136slf_destroy_join (pTHX_ struct CoroSLF *frame)
2137{
2138 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2139}
2140
2141static int
2142slf_check_join (pTHX_ struct CoroSLF *frame)
2143{
2144 struct coro *coro = (struct coro *)frame->data;
2145
2146 if (!coro->status)
2147 return 1;
2148
2149 frame->destroy = 0;
2150
2151 coro_push_av (aTHX_ coro->status, GIMME_V);
2152
2153 SvREFCNT_dec ((SV *)coro->hv);
2154
2155 return 0;
2156}
2157
2158static void
2159slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2160{
2161 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2162
2163 if (items > 1)
2164 croak ("join called with too many arguments");
2165
2166 if (coro->status)
2167 frame->prepare = prepare_nop;
2168 else
2169 {
2170 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2171 frame->prepare = prepare_schedule;
2172 }
2173
2174 frame->check = slf_check_join;
2175 frame->destroy = slf_destroy_join;
2176 frame->data = (void *)coro;
2177 SvREFCNT_inc (coro->hv);
2178}
2179
2180static void
1955coro_call_on_destroy (pTHX_ struct coro *coro) 2181coro_call_on_destroy (pTHX_ struct coro *coro)
1956{ 2182{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2183 AV *od = coro->on_destroy;
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959 2184
1960 if (on_destroyp) 2185 if (!od)
1961 { 2186 return;
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1963 2187
1964 while (AvFILLp (on_destroy) >= 0) 2188 while (AvFILLp (od) >= 0)
2189 {
2190 SV *cb = sv_2mortal (av_pop (od));
2191
2192 /* coro hv's (and only hv's at the moment) are supported as well */
2193 if (SvSTATEhv_p (aTHX_ cb))
2194 api_ready (aTHX_ cb);
2195 else
1965 { 2196 {
1966 dSP; /* don't disturb outer sp */ 2197 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy);
1968
1969 PUSHMARK (SP); 2198 PUSHMARK (SP);
1970 2199
1971 if (statusp) 2200 if (coro->status)
1972 { 2201 {
1973 int i; 2202 PUTBACK;
1974 AV *status = (AV *)SvRV (*statusp); 2203 coro_push_av (aTHX_ coro->status, G_ARRAY);
1975 EXTEND (SP, AvFILLp (status) + 1); 2204 SPAGAIN;
1976
1977 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]);
1979 } 2205 }
1980 2206
1981 PUTBACK; 2207 PUTBACK;
1982 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2208 call_sv (cb, G_VOID | G_DISCARD);
1983 } 2209 }
1984 } 2210 }
1985} 2211}
1986 2212
1987static void 2213static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2214coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1989{ 2215{
1990 int i; 2216 AV *av;
1991 HV *hv = (HV *)SvRV (coro_current); 2217
1992 AV *av = newAV (); 2218 if (coro->status)
2219 {
2220 av = coro->status;
2221 av_clear (av);
2222 }
2223 else
2224 av = coro->status = newAV ();
1993 2225
1994 /* items are actually not so common, so optimise for this case */ 2226 /* items are actually not so common, so optimise for this case */
1995 if (items) 2227 if (items)
1996 { 2228 {
2229 int i;
2230
1997 av_extend (av, items - 1); 2231 av_extend (av, items - 1);
1998 2232
1999 for (i = 0; i < items; ++i) 2233 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i])); 2234 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 } 2235 }
2236}
2002 2237
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2238static void
2004 2239slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2240{
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2241 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager); 2242 api_ready (aTHX_ sv_manager);
2007 2243
2008 frame->prepare = prepare_schedule; 2244 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat; 2245 frame->check = slf_check_repeat;
2010 2246
2011 /* as a minor optimisation, we could unwind all stacks here */ 2247 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */ 2248 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/ 2249 /*coro_unwind_stacks (aTHX);*/
2250}
2251
2252static void
2253slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2254{
2255 HV *coro_hv = (HV *)SvRV (coro_current);
2256
2257 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2258 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2259}
2260
2261static void
2262slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2263{
2264 HV *coro_hv;
2265 struct coro *coro;
2266
2267 if (items <= 0)
2268 croak ("Coro::cancel called without coro object,");
2269
2270 coro = SvSTATE (arg [0]);
2271 coro_hv = coro->hv;
2272
2273 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2274
2275 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2276 {
2277 /* coro currently busy cancelling something, so just notify it */
2278 coro->slf_frame.data = (void *)coro;
2279
2280 frame->prepare = prepare_nop;
2281 frame->check = slf_check_nop;
2282 }
2283 else if (coro_hv == (HV *)SvRV (coro_current))
2284 {
2285 /* cancelling the current coro is allowed, and equals terminate */
2286 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2287 }
2288 else
2289 {
2290 struct coro *self = SvSTATE_current;
2291
2292 /* otherwise we cancel directly, purely for speed reasons
2293 * unfortunately, this requires some magic trickery, as
2294 * somebody else could cancel us, so we have to fight the cancellation.
2295 * this is ugly, and hopefully fully worth the extra speed.
2296 * besides, I can't get the slow-but-safe version working...
2297 */
2298 slf_frame.data = 0;
2299 self->flags |= CF_NOCANCEL;
2300 coro_state_destroy (aTHX_ coro);
2301 self->flags &= ~CF_NOCANCEL;
2302
2303 if (slf_frame.data)
2304 {
2305 /* while we were busy we have been cancelled, so terminate */
2306 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2307 }
2308 else
2309 {
2310 frame->prepare = prepare_nop;
2311 frame->check = slf_check_nop;
2312 }
2313 }
2314}
2315
2316static int
2317slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2318{
2319 frame->prepare = 0;
2320 coro_unwind_stacks (aTHX);
2321
2322 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2323
2324 return 1;
2325}
2326
2327static int
2328safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2329{
2330 if (coro->cctx)
2331 croak ("coro inside C callback, unable to cancel at this time, caught");
2332
2333 if (coro->flags & CF_NEW)
2334 {
2335 coro_set_status (aTHX_ coro, arg, items);
2336 coro_state_destroy (aTHX_ coro);
2337 }
2338 else
2339 {
2340 if (!coro->slf_frame.prepare)
2341 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2342
2343 slf_destroy (aTHX_ coro);
2344
2345 coro_set_status (aTHX_ coro, arg, items);
2346 coro->slf_frame.prepare = prepare_nop;
2347 coro->slf_frame.check = slf_check_safe_cancel;
2348
2349 api_ready (aTHX_ (SV *)coro->hv);
2350 }
2351
2352 return 1;
2014} 2353}
2015 2354
2016/*****************************************************************************/ 2355/*****************************************************************************/
2017/* async pool handler */ 2356/* async pool handler */
2018 2357
… …
2049slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2388slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2050{ 2389{
2051 HV *hv = (HV *)SvRV (coro_current); 2390 HV *hv = (HV *)SvRV (coro_current);
2052 struct coro *coro = SvSTATE_hv ((SV *)hv); 2391 struct coro *coro = SvSTATE_hv ((SV *)hv);
2053 2392
2054 if (expect_true (coro->saved_deffh)) 2393 if (ecb_expect_true (coro->saved_deffh))
2055 { 2394 {
2056 /* subsequent iteration */ 2395 /* subsequent iteration */
2057 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2396 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2058 coro->saved_deffh = 0; 2397 coro->saved_deffh = 0;
2059 2398
2060 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2399 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2061 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2400 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2062 { 2401 {
2063 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2402 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2064 coro->invoke_av = newAV (); 2403 return;
2065
2066 frame->prepare = prepare_nop;
2067 } 2404 }
2068 else 2405 else
2069 { 2406 {
2070 av_clear (GvAV (PL_defgv)); 2407 av_clear (GvAV (PL_defgv));
2071 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2408 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2121 2458
2122static int 2459static int
2123slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2460slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2124{ 2461{
2125 SV *data = (SV *)frame->data; 2462 SV *data = (SV *)frame->data;
2126 2463
2127 if (CORO_THROW) 2464 if (CORO_THROW)
2128 return 0; 2465 return 0;
2129 2466
2130 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2131 return 1; 2468 return 1;
… …
2167 cb = sv_2mortal (coro->rouse_cb); 2504 cb = sv_2mortal (coro->rouse_cb);
2168 coro->rouse_cb = 0; 2505 coro->rouse_cb = 0;
2169 } 2506 }
2170 2507
2171 if (!SvROK (cb) 2508 if (!SvROK (cb)
2172 || SvTYPE (SvRV (cb)) != SVt_PVCV 2509 || SvTYPE (SvRV (cb)) != SVt_PVCV
2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2510 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2174 croak ("Coro::rouse_wait called with illegal callback argument,"); 2511 croak ("Coro::rouse_wait called with illegal callback argument,");
2175 2512
2176 { 2513 {
2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2514 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2294static void 2631static void
2295slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2632slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2296{ 2633{
2297 frame->prepare = prepare_cede_notself; 2634 frame->prepare = prepare_cede_notself;
2298 frame->check = slf_check_nop; 2635 frame->check = slf_check_nop;
2636}
2637
2638/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2639static void
2640slf_destroy (pTHX_ struct coro *coro)
2641{
2642 /* this callback is reserved for slf functions needing to do cleanup */
2643 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2644 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2645
2646 /*
2647 * The on_destroy above most likely is from an SLF call.
2648 * Since by definition the SLF call will not finish when we destroy
2649 * the coro, we will have to force-finish it here, otherwise
2650 * cleanup functions cannot call SLF functions.
2651 */
2652 coro->slf_frame.prepare = 0;
2299} 2653}
2300 2654
2301/* 2655/*
2302 * these not obviously related functions are all rolled into one 2656 * these not obviously related functions are all rolled into one
2303 * function to increase chances that they all will call transfer with the same 2657 * 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 */ 2664 I32 checkmark; /* mark SP to see how many elements check has pushed */
2311 2665
2312 /* set up the slf frame, unless it has already been set-up */ 2666 /* set up the slf frame, unless it has already been set-up */
2313 /* the latter happens when a new coro has been started */ 2667 /* the latter happens when a new coro has been started */
2314 /* or when a new cctx was attached to an existing coroutine */ 2668 /* or when a new cctx was attached to an existing coroutine */
2315 if (expect_true (!slf_frame.prepare)) 2669 if (ecb_expect_true (!slf_frame.prepare))
2316 { 2670 {
2317 /* first iteration */ 2671 /* first iteration */
2318 dSP; 2672 dSP;
2319 SV **arg = PL_stack_base + TOPMARK + 1; 2673 SV **arg = PL_stack_base + TOPMARK + 1;
2320 int items = SP - arg; /* args without function object */ 2674 int items = SP - arg; /* args without function object */
… …
2361 while (slf_frame.check (aTHX_ &slf_frame)); 2715 while (slf_frame.check (aTHX_ &slf_frame));
2362 2716
2363 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2717 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2364 2718
2365 /* exception handling */ 2719 /* exception handling */
2366 if (expect_false (CORO_THROW)) 2720 if (ecb_expect_false (CORO_THROW))
2367 { 2721 {
2368 SV *exception = sv_2mortal (CORO_THROW); 2722 SV *exception = sv_2mortal (CORO_THROW);
2369 2723
2370 CORO_THROW = 0; 2724 CORO_THROW = 0;
2371 sv_setsv (ERRSV, exception); 2725 sv_setsv (ERRSV, exception);
2372 croak (0); 2726 croak (0);
2373 } 2727 }
2374 2728
2375 /* return value handling - mostly like entersub */ 2729 /* return value handling - mostly like entersub */
2376 /* make sure we put something on the stack in scalar context */ 2730 /* make sure we put something on the stack in scalar context */
2377 if (GIMME_V == G_SCALAR) 2731 if (GIMME_V == G_SCALAR
2732 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2378 { 2733 {
2379 dSP; 2734 dSP;
2380 SV **bot = PL_stack_base + checkmark; 2735 SV **bot = PL_stack_base + checkmark;
2381 2736
2382 if (sp == bot) /* too few, push undef */ 2737 if (sp == bot) /* too few, push undef */
2383 bot [1] = &PL_sv_undef; 2738 bot [1] = &PL_sv_undef;
2384 else if (sp != bot + 1) /* too many, take last one */ 2739 else /* too many, take last one */
2385 bot [1] = *sp; 2740 bot [1] = *sp;
2386 2741
2387 SP = bot + 1; 2742 SP = bot + 1;
2388 2743
2389 PUTBACK; 2744 PUTBACK;
… …
2422 if (PL_op->op_flags & OPf_STACKED) 2777 if (PL_op->op_flags & OPf_STACKED)
2423 { 2778 {
2424 if (items > slf_arga) 2779 if (items > slf_arga)
2425 { 2780 {
2426 slf_arga = items; 2781 slf_arga = items;
2427 free (slf_argv); 2782 Safefree (slf_argv);
2428 slf_argv = malloc (slf_arga * sizeof (SV *)); 2783 New (0, slf_argv, slf_arga, SV *);
2429 } 2784 }
2430 2785
2431 slf_argc = items; 2786 slf_argc = items;
2432 2787
2433 for (i = 0; i < items; ++i) 2788 for (i = 0; i < items; ++i)
… …
2496{ 2851{
2497 PerlIOBuf base; 2852 PerlIOBuf base;
2498 NV next, every; 2853 NV next, every;
2499} PerlIOCede; 2854} PerlIOCede;
2500 2855
2501static IV 2856static IV ecb_cold
2502PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2857PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2503{ 2858{
2504 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2859 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2505 2860
2506 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2861 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2507 self->next = nvtime () + self->every; 2862 self->next = nvtime () + self->every;
2508 2863
2509 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2864 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2510} 2865}
2511 2866
2512static SV * 2867static SV * ecb_cold
2513PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2868PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2514{ 2869{
2515 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2870 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2516 2871
2517 return newSVnv (self->every); 2872 return newSVnv (self->every);
… …
2629 SvREFCNT_dec (cb); 2984 SvREFCNT_dec (cb);
2630 } 2985 }
2631} 2986}
2632 2987
2633static void 2988static void
2634coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2989coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2635{ 2990{
2636 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2991 /* call $sem->adjust (0) to possibly wake up some other waiters */
2637 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2992 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2638} 2993}
2639 2994
2640static int 2995static int
2641slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2996slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2642{ 2997{
2643 AV *av = (AV *)frame->data; 2998 AV *av = (AV *)frame->data;
2644 SV *count_sv = AvARRAY (av)[0]; 2999 SV *count_sv = AvARRAY (av)[0];
3000 SV *coro_hv = SvRV (coro_current);
2645 3001
2646 /* if we are about to throw, don't actually acquire the lock, just throw */ 3002 /* if we are about to throw, don't actually acquire the lock, just throw */
2647 if (CORO_THROW) 3003 if (CORO_THROW)
2648 return 0; 3004 return 0;
2649 else if (SvIVX (count_sv) > 0) 3005 else if (SvIVX (count_sv) > 0)
2650 { 3006 {
2651 SvSTATE_current->on_destroy = 0; 3007 frame->destroy = 0;
2652 3008
2653 if (acquire) 3009 if (acquire)
2654 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3010 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2655 else 3011 else
2656 coro_semaphore_adjust (aTHX_ av, 0); 3012 coro_semaphore_adjust (aTHX_ av, 0);
… …
2661 { 3017 {
2662 int i; 3018 int i;
2663 /* if we were woken up but can't down, we look through the whole */ 3019 /* 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 */ 3020 /* waiters list and only add us if we aren't in there already */
2665 /* this avoids some degenerate memory usage cases */ 3021 /* this avoids some degenerate memory usage cases */
2666 3022 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)) 3023 if (AvARRAY (av)[i] == coro_hv)
2669 return 1; 3024 return 1;
2670 3025
2671 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3026 av_push (av, SvREFCNT_inc (coro_hv));
2672 return 1; 3027 return 1;
2673 } 3028 }
2674} 3029}
2675 3030
2676static int 3031static int
… …
2699 { 3054 {
2700 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3055 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2701 3056
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3057 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2703 frame->prepare = prepare_schedule; 3058 frame->prepare = prepare_schedule;
2704
2705 /* to avoid race conditions when a woken-up coro gets terminated */ 3059 /* to avoid race conditions when a woken-up coro gets terminated */
2706 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3060 /* we arrange for a temporary on_destroy that calls adjust (0) */
2707 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3061 frame->destroy = coro_semaphore_destroy;
2708 } 3062 }
2709} 3063}
2710 3064
2711static void 3065static void
2712slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3066slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2794 { 3148 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]); 3149 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3150 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797 3151
2798 if (SvIVX (AvARRAY (av)[0])) 3152 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3153 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2800 3154
2801 frame->prepare = prepare_nop; 3155 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop; 3156 frame->check = slf_check_nop;
2803 } 3157 }
2804 else if (SvIVX (AvARRAY (av)[0])) 3158 else if (SvIVX (AvARRAY (av)[0]))
… …
2930 dSP; 3284 dSP;
2931 3285
2932 static SV *prio_cv; 3286 static SV *prio_cv;
2933 static SV *prio_sv; 3287 static SV *prio_sv;
2934 3288
2935 if (expect_false (!prio_cv)) 3289 if (ecb_expect_false (!prio_cv))
2936 { 3290 {
2937 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3291 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2938 prio_sv = newSViv (0); 3292 prio_sv = newSViv (0);
2939 } 3293 }
2940 3294
… …
2966 /* now call the AIO function - we assume our request is uncancelable */ 3320 /* now call the AIO function - we assume our request is uncancelable */
2967 PUTBACK; 3321 PUTBACK;
2968 call_sv ((SV *)req, G_VOID | G_DISCARD); 3322 call_sv ((SV *)req, G_VOID | G_DISCARD);
2969 } 3323 }
2970 3324
2971 /* now that the requets is going, we loop toll we have a result */ 3325 /* now that the request is going, we loop till we have a result */
2972 frame->data = (void *)state; 3326 frame->data = (void *)state;
2973 frame->prepare = prepare_schedule; 3327 frame->prepare = prepare_schedule;
2974 frame->check = slf_check_aio_req; 3328 frame->check = slf_check_aio_req;
2975} 3329}
2976 3330
… …
3046 } 3400 }
3047 3401
3048 return coro_sv; 3402 return coro_sv;
3049} 3403}
3050 3404
3405#ifndef __cplusplus
3406ecb_cold XS(boot_Coro__State);
3407#endif
3408
3409#if CORO_JIT
3410
3411static void ecb_noinline ecb_cold
3412pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3413{
3414 dSP;
3415 AV *av = newAV ();
3416
3417 av_store (av, 3, newSVuv (d));
3418 av_store (av, 2, newSVuv (c));
3419 av_store (av, 1, newSVuv (b));
3420 av_store (av, 0, newSVuv (a));
3421
3422 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3423
3424 PUTBACK;
3425}
3426
3427static void ecb_noinline ecb_cold
3428jit_init (pTHX)
3429{
3430 dSP;
3431 SV *load, *save;
3432 char *map_base;
3433 char *load_ptr, *save_ptr;
3434 STRLEN load_len, save_len, map_len;
3435 int count;
3436
3437 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3438
3439 PUSHMARK (SP);
3440 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3441 #include "state.h"
3442 count = call_pv ("Coro::State::_jit", G_ARRAY);
3443 SPAGAIN;
3444
3445 save = POPs; save_ptr = SvPVbyte (save, save_len);
3446 load = POPs; load_ptr = SvPVbyte (load, load_len);
3447
3448 map_len = load_len + save_len + 16;
3449
3450 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3451
3452 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3453
3454 load_perl_slots = (load_save_perl_slots_type)map_base;
3455 memcpy (map_base, load_ptr, load_len);
3456
3457 map_base += (load_len + 15) & ~15;
3458
3459 save_perl_slots = (load_save_perl_slots_type)map_base;
3460 memcpy (map_base, save_ptr, save_len);
3461
3462 /* we are good citizens and try to make the page read-only, so the evil evil */
3463 /* hackers might have it a bit more difficult */
3464 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3465
3466 PUTBACK;
3467 eval_pv ("undef &Coro::State::_jit", 1);
3468}
3469
3470#endif
3471
3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3472MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3052 3473
3053PROTOTYPES: DISABLE 3474PROTOTYPES: DISABLE
3054 3475
3055BOOT: 3476BOOT:
… …
3058# if CORO_PTHREAD 3479# if CORO_PTHREAD
3059 coro_thx = PERL_GET_CONTEXT; 3480 coro_thx = PERL_GET_CONTEXT;
3060# endif 3481# endif
3061#endif 3482#endif
3062 BOOT_PAGESIZE; 3483 BOOT_PAGESIZE;
3484
3485 /* perl defines these to check for existance first, but why it doesn't */
3486 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV;
3490 ERRSV;
3063 3491
3064 cctx_current = cctx_new_empty (); 3492 cctx_current = cctx_new_empty ();
3065 3493
3066 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3494 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3067 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3495 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3107 coroapi.prepare_nop = prepare_nop; 3535 coroapi.prepare_nop = prepare_nop;
3108 coroapi.prepare_schedule = prepare_schedule; 3536 coroapi.prepare_schedule = prepare_schedule;
3109 coroapi.prepare_cede = prepare_cede; 3537 coroapi.prepare_cede = prepare_cede;
3110 coroapi.prepare_cede_notself = prepare_cede_notself; 3538 coroapi.prepare_cede_notself = prepare_cede_notself;
3111 3539
3112 { 3540 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 3541
3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3542 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3543#if CORO_JIT
3544 PUTBACK;
3545 jit_init (aTHX);
3546 SPAGAIN;
3547#endif
3125} 3548}
3126 3549
3127SV * 3550SV *
3128new (SV *klass, ...) 3551new (SV *klass, ...)
3129 ALIAS: 3552 ALIAS:
… …
3136void 3559void
3137transfer (...) 3560transfer (...)
3138 PROTOTYPE: $$ 3561 PROTOTYPE: $$
3139 CODE: 3562 CODE:
3140 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3563 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 3564
3149void 3565void
3150_exit (int code) 3566_exit (int code)
3151 PROTOTYPE: $ 3567 PROTOTYPE: $
3152 CODE: 3568 CODE:
… …
3213void 3629void
3214list () 3630list ()
3215 PROTOTYPE: 3631 PROTOTYPE:
3216 PPCODE: 3632 PPCODE:
3217{ 3633{
3218 struct coro *coro; 3634 struct coro *coro;
3219 for (coro = coro_first; coro; coro = coro->next) 3635 for (coro = coro_first; coro; coro = coro->next)
3220 if (coro->hv) 3636 if (coro->hv)
3221 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3637 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3222} 3638}
3223 3639
… …
3228 CODE: 3644 CODE:
3229{ 3645{
3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3646 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3231 { 3647 {
3232 struct coro *current = SvSTATE_current; 3648 struct coro *current = SvSTATE_current;
3649 struct CoroSLF slf_save;
3233 3650
3234 if (current != coro) 3651 if (current != coro)
3235 { 3652 {
3236 PUTBACK; 3653 PUTBACK;
3237 save_perl (aTHX_ current); 3654 save_perl (aTHX_ current);
3238 load_perl (aTHX_ coro); 3655 load_perl (aTHX_ coro);
3656 /* the coro is most likely in an active SLF call.
3657 * while not strictly required (the code we execute is
3658 * not allowed to call any SLF functions), it's cleaner
3659 * to reinitialise the slf_frame and restore it later.
3660 * This might one day allow us to actually do SLF calls
3661 * from code executed here.
3662 */
3663 slf_save = slf_frame;
3664 slf_frame.prepare = 0;
3239 SPAGAIN; 3665 SPAGAIN;
3240 } 3666 }
3241 3667
3242 PUSHSTACK; 3668 PUSHSTACK;
3243 3669
… …
3253 SPAGAIN; 3679 SPAGAIN;
3254 3680
3255 if (current != coro) 3681 if (current != coro)
3256 { 3682 {
3257 PUTBACK; 3683 PUTBACK;
3684 slf_frame = slf_save;
3258 save_perl (aTHX_ coro); 3685 save_perl (aTHX_ coro);
3259 load_perl (aTHX_ current); 3686 load_perl (aTHX_ current);
3260 SPAGAIN; 3687 SPAGAIN;
3261 } 3688 }
3262 } 3689 }
… …
3267 PROTOTYPE: $ 3694 PROTOTYPE: $
3268 ALIAS: 3695 ALIAS:
3269 is_ready = CF_READY 3696 is_ready = CF_READY
3270 is_running = CF_RUNNING 3697 is_running = CF_RUNNING
3271 is_new = CF_NEW 3698 is_new = CF_NEW
3272 is_destroyed = CF_DESTROYED 3699 is_destroyed = CF_ZOMBIE
3700 is_zombie = CF_ZOMBIE
3273 is_suspended = CF_SUSPENDED 3701 is_suspended = CF_SUSPENDED
3274 CODE: 3702 CODE:
3275 RETVAL = boolSV (coro->flags & ix); 3703 RETVAL = boolSV (coro->flags & ix);
3276 OUTPUT: 3704 OUTPUT:
3277 RETVAL 3705 RETVAL
3278 3706
3279void 3707void
3280throw (Coro::State self, SV *throw = &PL_sv_undef) 3708throw (SV *self, SV *exception = &PL_sv_undef)
3281 PROTOTYPE: $;$ 3709 PROTOTYPE: $;$
3282 CODE: 3710 CODE:
3283{ 3711{
3712 struct coro *coro = SvSTATE (self);
3284 struct coro *current = SvSTATE_current; 3713 struct coro *current = SvSTATE_current;
3285 SV **throwp = self == current ? &CORO_THROW : &self->except; 3714 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3286 SvREFCNT_dec (*throwp); 3715 SvREFCNT_dec (*exceptionp);
3287 SvGETMAGIC (throw); 3716 SvGETMAGIC (exception);
3288 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3717 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3718
3719 api_ready (aTHX_ self);
3289} 3720}
3290 3721
3291void 3722void
3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3723api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3293 PROTOTYPE: $;$ 3724 PROTOTYPE: $;$
… …
3348 3779
3349void 3780void
3350cancel (Coro::State self) 3781cancel (Coro::State self)
3351 CODE: 3782 CODE:
3352 coro_state_destroy (aTHX_ self); 3783 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355 3784
3356SV * 3785SV *
3357enable_times (int enabled = enable_times) 3786enable_times (int enabled = enable_times)
3358 CODE: 3787 CODE:
3359{ 3788{
… …
3372 3801
3373void 3802void
3374times (Coro::State self) 3803times (Coro::State self)
3375 PPCODE: 3804 PPCODE:
3376{ 3805{
3377 struct coro *current = SvSTATE (coro_current); 3806 struct coro *current = SvSTATE (coro_current);
3378 3807
3379 if (expect_false (current == self)) 3808 if (ecb_expect_false (current == self))
3380 { 3809 {
3381 coro_times_update (); 3810 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current)); 3811 coro_times_add (SvSTATE (coro_current));
3383 } 3812 }
3384 3813
3385 EXTEND (SP, 2); 3814 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3815 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))); 3816 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388 3817
3389 if (expect_false (current == self)) 3818 if (ecb_expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current)); 3819 coro_times_sub (SvSTATE (coro_current));
3391} 3820}
3392 3821
3393void 3822void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3823swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3415BOOT: 3844BOOT:
3416{ 3845{
3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3846 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3847 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3848 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); 3849 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); 3850 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3851 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3852 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3853 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3426 3854
3427 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3855 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3856 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3429 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3857 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3430 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3858 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3431 3859
3432 coro_stash = gv_stashpv ("Coro", TRUE); 3860 coro_stash = gv_stashpv ("Coro", TRUE);
3433 3861
3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3862 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3863 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3864 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3464 api_ready (aTHX_ RETVAL); 3892 api_ready (aTHX_ RETVAL);
3465 OUTPUT: 3893 OUTPUT:
3466 RETVAL 3894 RETVAL
3467 3895
3468void 3896void
3897_destroy (Coro::State coro)
3898 CODE:
3899 /* used by the manager thread */
3900 coro_state_destroy (aTHX_ coro);
3901
3902void
3903on_destroy (Coro::State coro, SV *cb)
3904 CODE:
3905 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3906
3907void
3908join (...)
3909 CODE:
3910 CORO_EXECUTE_SLF_XS (slf_init_join);
3911
3912void
3469terminate (...) 3913terminate (...)
3470 CODE: 3914 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3915 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3916
3917void
3918cancel (...)
3919 CODE:
3920 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3921
3922int
3923safe_cancel (Coro::State self, ...)
3924 C_ARGS: aTHX_ self, &ST (1), items - 1
3472 3925
3473void 3926void
3474schedule (...) 3927schedule (...)
3475 CODE: 3928 CODE:
3476 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3929 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3633 on_leave = 1 4086 on_leave = 1
3634 PROTOTYPE: & 4087 PROTOTYPE: &
3635 CODE: 4088 CODE:
3636{ 4089{
3637 struct coro *coro = SvSTATE_current; 4090 struct coro *coro = SvSTATE_current;
3638 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4091 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3639 4092
3640 block = s_get_cv_croak (block); 4093 block = s_get_cv_croak (block);
3641 4094
3642 if (!*avp) 4095 if (!*avp)
3643 *avp = newAV (); 4096 *avp = newAV ();
… …
3663 4116
3664SV * 4117SV *
3665new (SV *klass, SV *count = 0) 4118new (SV *klass, SV *count = 0)
3666 CODE: 4119 CODE:
3667{ 4120{
3668 int semcnt = 1; 4121 int semcnt = 1;
3669 4122
3670 if (count) 4123 if (count)
3671 { 4124 {
3672 SvGETMAGIC (count); 4125 SvGETMAGIC (count);
3673 4126
… …
3733 XSRETURN_NO; 4186 XSRETURN_NO;
3734} 4187}
3735 4188
3736void 4189void
3737waiters (SV *self) 4190waiters (SV *self)
3738 PPCODE: 4191 PPCODE:
3739{ 4192{
3740 AV *av = (AV *)SvRV (self); 4193 AV *av = (AV *)SvRV (self);
3741 int wcount = AvFILLp (av) + 1 - 1; 4194 int wcount = AvFILLp (av) + 1 - 1;
3742 4195
3743 if (GIMME_V == G_SCALAR) 4196 if (GIMME_V == G_SCALAR)
… …
3752} 4205}
3753 4206
3754MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4207MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3755 4208
3756void 4209void
3757_may_delete (SV *sem, int count, int extra_refs) 4210_may_delete (SV *sem, int count, unsigned int extra_refs)
3758 PPCODE: 4211 PPCODE:
3759{ 4212{
3760 AV *av = (AV *)SvRV (sem); 4213 AV *av = (AV *)SvRV (sem);
3761 4214
3762 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4215 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3763 && AvFILLp (av) == 0 /* no waiters, just count */ 4216 && AvFILLp (av) == 0 /* no waiters, just count */
3764 && SvIV (AvARRAY (av)[0]) == count) 4217 && SvIV (AvARRAY (av)[0]) == count)
3765 XSRETURN_YES; 4218 XSRETURN_YES;
… …
3786 4239
3787void 4240void
3788broadcast (SV *self) 4241broadcast (SV *self)
3789 CODE: 4242 CODE:
3790{ 4243{
3791 AV *av = (AV *)SvRV (self); 4244 AV *av = (AV *)SvRV (self);
3792 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4245 coro_signal_wake (aTHX_ av, AvFILLp (av));
3793} 4246}
3794 4247
3795void 4248void
3796send (SV *self) 4249send (SV *self)
… …
3804 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4257 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3805} 4258}
3806 4259
3807IV 4260IV
3808awaited (SV *self) 4261awaited (SV *self)
3809 CODE: 4262 CODE:
3810 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4263 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3811 OUTPUT: 4264 OUTPUT:
3812 RETVAL 4265 RETVAL
3813 4266
3814 4267
… …
3819 4272
3820void 4273void
3821_schedule (...) 4274_schedule (...)
3822 CODE: 4275 CODE:
3823{ 4276{
3824 static int incede; 4277 static int incede;
3825 4278
3826 api_cede_notself (aTHX); 4279 api_cede_notself (aTHX);
3827 4280
3828 ++incede; 4281 ++incede;
3829 while (coro_nready >= incede && api_cede (aTHX)) 4282 while (coro_nready >= incede && api_cede (aTHX))
… …
3873 { 4326 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4327 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0; 4328 coro_old_pp_sselect = 0;
3876 } 4329 }
3877 4330
3878

Diff Legend

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