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.374 by root, Fri Oct 2 19:55:59 2009 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 2013 UTC

1#define NDEBUG 1 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
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
6#define PERL_EXT 9#define PERL_EXT
… …
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 1
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/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
51#endif
52
53#if defined(_WIN32)
54# undef HAS_GETTIMEOFDAY
24# undef setjmp 55# undef setjmp
25# undef longjmp 56# undef longjmp
26# undef _exit 57# undef _exit
27# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
28#else 59#else
29# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
30#endif 61#endif
31 62
32#ifdef HAVE_MMAP
33# include <unistd.h>
34# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS
36# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON
38# else
39# undef HAVE_MMAP
40# endif
41# endif
42# include <limits.h>
43# ifndef PAGESIZE
44# define PAGESIZE pagesize
45# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
46static long pagesize;
47# else
48# define BOOT_PAGESIZE (void)0
49# endif
50#else
51# define PAGESIZE 0
52# define BOOT_PAGESIZE (void)0
53#endif
54
55#if CORO_USE_VALGRIND
56# include <valgrind/valgrind.h>
57#endif
58
59/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
61 65
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
63# undef CORO_STACKGUARD 67# define HAS_SCOPESTACK_NAME 1
64#endif
65
66#ifndef CORO_STACKGUARD
67# define CORO_STACKGUARD 0
68#endif 68#endif
69 69
70/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
71#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
72# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
82# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
83#endif 83#endif
84 84
85#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
86 86
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" 87#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 88#define GCoroAPI (&coroapi) /* very sneaky */
104 89
105#ifdef USE_ITHREADS 90#ifdef USE_ITHREADS
106# if CORO_PTHREAD 91# if CORO_PTHREAD
… …
122static void (*u2time)(pTHX_ UV ret[2]); 107static void (*u2time)(pTHX_ UV ret[2]);
123 108
124/* we hijack an hopefully unused CV flag for our purposes */ 109/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 110#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 111static OP *pp_slf (pTHX);
112static void slf_destroy (pTHX_ struct coro *coro);
127 113
128static U32 cctx_gen; 114static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 115static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 116static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 117static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 147static char times_valid;
162 148
163static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
165 151
166enum { 152enum
153{
167 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176typedef struct coro_cctx 163typedef struct coro_cctx
177{ 164{
178 struct coro_cctx *next; 165 struct coro_cctx *next;
179 166
180 /* the stack */ 167 /* the stack */
181 void *sptr; 168 struct coro_stack stack;
182 size_t ssize;
183 169
184 /* cpu state */ 170 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
187 JMPENV *top_env; 175 JMPENV *top_env;
188 coro_context cctx; 176 coro_context cctx;
189 177
190 U32 gen; 178 U32 gen;
191#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
192 int valgrind_id; 180 int valgrind_id;
193#endif 181#endif
194 unsigned char flags; 182 unsigned char flags;
195} coro_cctx; 183} coro_cctx;
196 184
197coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
198 186
199/*****************************************************************************/ 187/*****************************************************************************/
200 188
189static MGVTBL coro_state_vtbl;
190
201enum { 191enum
192{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 197 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
198 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 199};
208 200
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 202typedef struct
211{ 203{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
218# include "state.h" 205 #include "state.h"
219#undef VAR
220} perl_slots; 206} perl_slots;
221 207
208/* 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)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 210
224/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
225struct coro { 212struct coro
213{
226 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 215 coro_cctx *cctx;
228 216
229 /* ready queue */ 217 /* ready queue */
230 struct coro *next_ready; 218 struct coro *next_ready;
… …
232 /* state data */ 220 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 222 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
236 224
237 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 229
244 /* statistics */ 230 /* statistics */
245 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
246 232
247 /* coro process data */ 233 /* coro process data */
248 int prio; 234 int prio;
249 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 236 SV *rouse_cb; /* last rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */
251 239
252 /* async_pool */ 240 /* async_pool */
253 SV *saved_deffh; 241 SV *saved_deffh;
254 SV *invoke_cb; 242 SV *invoke_cb;
255 AV *invoke_av; 243 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
273 261
274/* the following variables are effectively part of the perl context */ 262/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 263/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 264/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 265static struct CoroSLF slf_frame; /* the current slf frame */
278 266
279/** Coro ********************************************************************/ 267/** Coro ********************************************************************/
280 268
281#define CORO_PRIO_MAX 3 269#define CORO_PRIO_MAX 3
… …
287 275
288/* for Coro.pm */ 276/* for Coro.pm */
289static SV *coro_current; 277static SV *coro_current;
290static SV *coro_readyhook; 278static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 280static CV *cv_coro_run;
293static struct coro *coro_first; 281static struct coro *coro_first;
294#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
295 306
296/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
297 308
298static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 310static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 322 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 323 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 324 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 325}
315 326
327/** time stuff **************************************************************/
328
329#ifdef HAS_GETTIMEOFDAY
330
331ecb_inline void
332coro_u2time (pTHX_ UV ret[2])
333{
334 struct timeval tv;
335 gettimeofday (&tv, 0);
336
337 ret [0] = tv.tv_sec;
338 ret [1] = tv.tv_usec;
339}
340
341ecb_inline double
342coro_nvtime (void)
343{
344 struct timeval tv;
345 gettimeofday (&tv, 0);
346
347 return tv.tv_sec + tv.tv_usec * 1e-6;
348}
349
350ecb_inline void
351time_init (pTHX)
352{
353 nvtime = coro_nvtime;
354 u2time = coro_u2time;
355}
356
357#else
358
359ecb_inline void
360time_init (pTHX)
361{
362 SV **svp;
363
364 require_pv ("Time/HiRes.pm");
365
366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
367
368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
370
371 nvtime = INT2PTR (double (*)(), SvIV (*svp));
372
373 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
374 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
375}
376
377#endif
378
316/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
317 380
318static SV * 381static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
320{ 383{
321#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 385 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 386 get_sv (name, create);
324#endif 387#endif
325 return get_sv (name, create); 388 return get_sv (name, create);
326} 389}
327 390
328static AV * 391static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
330{ 393{
331#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 395 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 396 get_av (name, create);
334#endif 397#endif
335 return get_av (name, create); 398 return get_av (name, create);
336} 399}
337 400
338static HV * 401static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
340{ 403{
341#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 406 get_hv (name, create);
344#endif 407#endif
345 return get_hv (name, create); 408 return get_hv (name, create);
346} 409}
347 410
348INLINE void 411ecb_inline void
349coro_times_update () 412coro_times_update (void)
350{ 413{
351#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
352 struct timespec ts; 415 struct timespec ts;
353 416
354 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
368#endif 431#endif
369} 432}
370 433
371INLINE void 434ecb_inline void
372coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
373{ 436{
374 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
381} 444}
382 445
383INLINE void 446ecb_inline void
384coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
385{ 448{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 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]; 450 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 459/* magic glue */
397 460
398#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 463
401#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 467 : mg_find (sv, type))
405 468
406#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 472 : 0)
410 473
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#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) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 476
414INLINE struct coro * 477ecb_inline MAGIC *
478SvSTATEhv_p (pTHX_ SV *coro)
479{
480 MAGIC *mg;
481
482 if (ecb_expect_true (
483 SvTYPE (coro) == SVt_PVHV
484 && (mg = CORO_MAGIC_state (coro))
485 && mg->mg_virtual == &coro_state_vtbl
486 ))
487 return mg;
488
489 return 0;
490}
491
492ecb_inline struct coro *
415SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
416{ 494{
417 HV *stash;
418 MAGIC *mg; 495 MAGIC *mg;
419 496
420 if (SvROK (coro)) 497 if (SvROK (coro))
421 coro = SvRV (coro); 498 coro = SvRV (coro);
422 499
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
424 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
425 503
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; 504 return (struct coro *)mg->mg_ptr;
436} 505}
437 506
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 508
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 512
444/*****************************************************************************/ 513/*****************************************************************************/
445/* padlist management and caching */ 514/* padlist management and caching */
446 515
447static AV * 516ecb_inline PADLIST *
448coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
449{ 518{
450 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
452 523
453 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
454 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
455#if PERL_VERSION_ATLEAST (5,10,0)
456 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
457#else
458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
459#endif 553#endif
460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
461 --AvFILLp (padlist);
462 554
463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
464 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
465 559
466 return newpadlist; 560 return newpadlist;
467} 561}
468 562
469static void 563ecb_inline void
470free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
471{ 565{
472 /* may be during global destruction */ 566 /* may be during global destruction */
473 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
474 { 568 {
475 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
476 570
477 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
478 { 572 {
479 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
480 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
481 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
482 576
483 while (j >= 0) 577 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 579
486 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
488 } 582 }
489 583
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
491 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
492 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
494 } 594 }
495} 595}
496 596
497static int 597static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 599{
500 AV *padlist; 600 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 601 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
602 size_t len = *(size_t *)mg->mg_ptr;
502 603
503 /* perl manages to free our internal AV and _then_ call us */ 604 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 605 if (IN_DESTRUCT)
505 return 0; 606 return 0;
506 607
507 /* casting is fun. */ 608 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 610
513 return 0; 611 return 0;
514} 612}
515 613
516static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 615 0, 0, 0, 0,
518 coro_cv_free 616 coro_cv_free
519}; 617};
520 618
521/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
522static void 620ecb_inline void
523get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
524{ 622{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 624 size_t *lenp;
527 625
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 628 else
531 { 629 {
532#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 638 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 639#endif
542 } 640 }
543} 641}
544 642
545static void 643ecb_inline void
546put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
547{ 645{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 647
551 if (expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 650 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
651 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
652 mg->mg_len = 1; /* so mg_free frees mg_ptr */
653 }
654 else
655 Renew (mg->mg_ptr,
656 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
657 char);
553 658
554 av = (AV *)mg->mg_obj; 659 ((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} 660}
561 661
562/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
563 663
664ecb_inline void
665swap_sv (SV *a, SV *b)
666{
667 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
668 SV tmp;
669
670 /* swap sv_any */
671 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
672
673 /* swap sv_flags */
674 SvFLAGS (&tmp) = SvFLAGS (a);
675 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
676 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
677
678#if PERL_VERSION_ATLEAST (5,10,0)
679 /* perl 5.10 and later complicates this _quite_ a bit, but it also
680 * is much faster, so no quarrels here. alternatively, we could
681 * sv_upgrade to avoid this.
682 */
683 {
684 /* swap sv_u */
685 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
686
687 /* if SvANY points to the head, we need to adjust the pointers,
688 * as the pointer for a still points to b, and maybe vice versa.
689 */
690 #define svany_in_head(type) \
691 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
692
693 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695
696 if (svany_in_head (SvTYPE (b)))
697 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
698 }
699#endif
700}
701
564/* swap sv heads, at least logically */ 702/* swap sv heads, at least logically */
565static void 703static void
566swap_svs (pTHX_ Coro__State c) 704swap_svs (pTHX_ Coro__State c)
567{ 705{
568 int i; 706 int i;
569 707
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 709 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} 710}
610 711
611#define SWAP_SVS(coro) \ 712#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 713 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 714 swap_svs (aTHX_ (coro))
614 715
615static void 716static void
616on_enterleave_call (pTHX_ SV *cb); 717on_enterleave_call (pTHX_ SV *cb);
617 718
… …
621 perl_slots *slot = c->slot; 722 perl_slots *slot = c->slot;
622 c->slot = 0; 723 c->slot = 0;
623 724
624 PL_mainstack = c->mainstack; 725 PL_mainstack = c->mainstack;
625 726
626 GvSV (PL_defgv) = slot->defsv; 727#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 728 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 729#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 731 #include "state.h"
634 #undef VAR 732#endif
635 733
636 { 734 {
637 dSP; 735 dSP;
638 736
639 CV *cv; 737 CV *cv;
640 738
641 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
643 { 741 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 745 }
648 746
649 PUTBACK; 747 PUTBACK;
650 } 748 }
651 749
652 slf_frame = c->slf_frame; 750 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 751 CORO_THROW = c->except;
654 752
655 if (expect_false (enable_times)) 753 if (ecb_expect_false (enable_times))
656 { 754 {
657 if (expect_false (!times_valid)) 755 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 756 coro_times_update ();
659 757
660 coro_times_sub (c); 758 coro_times_sub (c);
661 } 759 }
662 760
663 if (expect_false (c->on_enter)) 761 if (ecb_expect_false (c->on_enter))
664 { 762 {
665 int i; 763 int i;
666 764
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 765 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 766 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 772static void
675save_perl (pTHX_ Coro__State c) 773save_perl (pTHX_ Coro__State c)
676{ 774{
677 SWAP_SVS (c); 775 SWAP_SVS (c);
678 776
679 if (expect_false (c->on_leave)) 777 if (ecb_expect_false (c->on_leave))
680 { 778 {
681 int i; 779 int i;
682 780
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 781 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 783 }
686 784
687 times_valid = 0; 785 times_valid = 0;
688 786
689 if (expect_false (enable_times)) 787 if (ecb_expect_false (enable_times))
690 { 788 {
691 coro_times_update (); times_valid = 1; 789 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 790 coro_times_add (c);
693 } 791 }
694 792
… …
708 806
709 XPUSHs (Nullsv); 807 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 808 /* this loop was inspired by pp_caller */
711 for (;;) 809 for (;;)
712 { 810 {
713 while (expect_true (cxix >= 0)) 811 while (ecb_expect_true (cxix >= 0))
714 { 812 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 813 PERL_CONTEXT *cx = &ccstk[cxix--];
716 814
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 815 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 816 {
719 CV *cv = cx->blk_sub.cv; 817 CV *cv = cx->blk_sub.cv;
720 818
721 if (expect_true (CvDEPTH (cv))) 819 if (ecb_expect_true (CvDEPTH (cv)))
722 { 820 {
821 EXTEND (SP, 3);
723 PUSHs ((SV *)CvPADLIST (cv)); 822 PUSHs ((SV *)CvPADLIST (cv));
724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 823 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
725 PUSHs ((SV *)cv); 824 PUSHs ((SV *)cv);
726 825
727 CvDEPTH (cv) = 0; 826 CvDEPTH (cv) = 0;
728 get_padlist (aTHX_ cv); 827 get_padlist (aTHX_ cv);
729 } 828 }
730 } 829 }
731 } 830 }
732 831
733 if (expect_true (top_si->si_type == PERLSI_MAIN)) 832 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
734 break; 833 break;
735 834
736 top_si = top_si->si_prev; 835 top_si = top_si->si_prev;
737 ccstk = top_si->si_cxstack; 836 ccstk = top_si->si_cxstack;
738 cxix = top_si->si_cxix; 837 cxix = top_si->si_cxix;
… …
740 839
741 PUTBACK; 840 PUTBACK;
742 } 841 }
743 842
744 /* allocate some space on the context stack for our purposes */ 843 /* allocate some space on the context stack for our purposes */
745 /* we manually unroll here, as usually 2 slots is enough */ 844 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
746 if (SLOT_COUNT >= 1) CXINC;
747 if (SLOT_COUNT >= 2) CXINC;
748 if (SLOT_COUNT >= 3) CXINC;
749 { 845 {
750 unsigned int i; 846 unsigned int i;
847
751 for (i = 3; i < SLOT_COUNT; ++i) 848 for (i = 0; i < SLOT_COUNT; ++i)
752 CXINC; 849 CXINC;
753 } 850
754 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 851 cxstack_ix -= SLOT_COUNT; /* undo allocation */
852 }
755 853
756 c->mainstack = PL_mainstack; 854 c->mainstack = PL_mainstack;
757 855
758 { 856 {
759 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 857 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
760 858
761 slot->defav = GvAV (PL_defgv); 859#if CORO_JIT
762 slot->defsv = DEFSV; 860 save_perl_slots (slot);
763 slot->errsv = ERRSV; 861#else
764 slot->irsgv = GvSV (irsgv);
765 slot->hinthv = GvHV (PL_hintgv);
766
767 #define VAR(name,type) slot->name = PL_ ## name; 862 #define VARx(name,expr,type) slot->name = expr;
768 # include "state.h" 863 #include "state.h"
769 #undef VAR 864#endif
770 } 865 }
771} 866}
772 867
773/* 868/*
774 * allocate various perl stacks. This is almost an exact copy 869 * allocate various perl stacks. This is almost an exact copy
… …
780# define coro_init_stacks(thx) init_stacks () 875# define coro_init_stacks(thx) init_stacks ()
781#else 876#else
782static void 877static void
783coro_init_stacks (pTHX) 878coro_init_stacks (pTHX)
784{ 879{
785 PL_curstackinfo = new_stackinfo(32, 8); 880 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
786 PL_curstackinfo->si_type = PERLSI_MAIN; 881 PL_curstackinfo->si_type = PERLSI_MAIN;
787 PL_curstack = PL_curstackinfo->si_stack; 882 PL_curstack = PL_curstackinfo->si_stack;
788 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 883 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
789 884
790 PL_stack_base = AvARRAY(PL_curstack); 885 PL_stack_base = AvARRAY(PL_curstack);
… …
805#endif 900#endif
806 901
807 New(54,PL_scopestack,8,I32); 902 New(54,PL_scopestack,8,I32);
808 PL_scopestack_ix = 0; 903 PL_scopestack_ix = 0;
809 PL_scopestack_max = 8; 904 PL_scopestack_max = 8;
905#if HAS_SCOPESTACK_NAME
906 New(54,PL_scopestack_name,8,const char*);
907#endif
810 908
811 New(54,PL_savestack,24,ANY); 909 New(54,PL_savestack,24,ANY);
812 PL_savestack_ix = 0; 910 PL_savestack_ix = 0;
813 PL_savestack_max = 24; 911 PL_savestack_max = 24;
814 912
… …
842 } 940 }
843 941
844 Safefree (PL_tmps_stack); 942 Safefree (PL_tmps_stack);
845 Safefree (PL_markstack); 943 Safefree (PL_markstack);
846 Safefree (PL_scopestack); 944 Safefree (PL_scopestack);
945#if HAS_SCOPESTACK_NAME
946 Safefree (PL_scopestack_name);
947#endif
847 Safefree (PL_savestack); 948 Safefree (PL_savestack);
848#if !PERL_VERSION_ATLEAST (5,10,0) 949#if !PERL_VERSION_ATLEAST (5,10,0)
849 Safefree (PL_retstack); 950 Safefree (PL_retstack);
850#endif 951#endif
851} 952}
… …
897#endif 998#endif
898 999
899/* 1000/*
900 * This overrides the default magic get method of %SIG elements. 1001 * This overrides the default magic get method of %SIG elements.
901 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1002 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
902 * and instead of trying to save and restore the hash elements, we just provide 1003 * and instead of trying to save and restore the hash elements (extremely slow),
903 * readback here. 1004 * we just provide our own readback here.
904 */ 1005 */
905static int 1006static int ecb_cold
906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1007coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
907{ 1008{
908 const char *s = MgPV_nolen_const (mg); 1009 const char *s = MgPV_nolen_const (mg);
909 1010
910 if (*s == '_') 1011 if (*s == '_')
911 { 1012 {
912 SV **svp = 0; 1013 SV **svp = 0;
913 1014
914 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
915 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
916 1017
917 if (svp) 1018 if (svp)
918 { 1019 {
919 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1020 SV *ssv;
1021
1022 if (!*svp)
1023 ssv = &PL_sv_undef;
1024 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1025 ssv = sv_2mortal (newRV_inc (*svp));
1026 else
1027 ssv = *svp;
1028
1029 sv_setsv (sv, ssv);
920 return 0; 1030 return 0;
921 } 1031 }
922 } 1032 }
923 1033
924 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
925} 1035}
926 1036
927static int 1037static int ecb_cold
928coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
929{ 1039{
930 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
931 1041
932 if (*s == '_') 1042 if (*s == '_')
… …
946 } 1056 }
947 1057
948 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1058 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
949} 1059}
950 1060
951static int 1061static int ecb_cold
952coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1062coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
953{ 1063{
954 const char *s = MgPV_nolen_const (mg); 1064 const char *s = MgPV_nolen_const (mg);
955 1065
956 if (*s == '_') 1066 if (*s == '_')
… …
991 return 1; 1101 return 1;
992} 1102}
993 1103
994static UNOP init_perl_op; 1104static UNOP init_perl_op;
995 1105
996static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1106ecb_noinline static void /* noinline to keep it out of the transfer fast path */
997init_perl (pTHX_ struct coro *coro) 1107init_perl (pTHX_ struct coro *coro)
998{ 1108{
999 /* 1109 /*
1000 * emulate part of the perl startup here. 1110 * emulate part of the perl startup here.
1001 */ 1111 */
… …
1009 PL_comppad_name_fill = 0; 1119 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0; 1120 PL_comppad_name_floor = 0;
1011 PL_curpm = 0; 1121 PL_curpm = 0;
1012 PL_curpad = 0; 1122 PL_curpad = 0;
1013 PL_localizing = 0; 1123 PL_localizing = 0;
1014 PL_dirty = 0;
1015 PL_restartop = 0; 1124 PL_restartop = 0;
1016#if PERL_VERSION_ATLEAST (5,10,0) 1125#if PERL_VERSION_ATLEAST (5,10,0)
1017 PL_parser = 0; 1126 PL_parser = 0;
1018#endif 1127#endif
1019 PL_hints = 0; 1128 PL_hints = 0;
1020 1129
1021 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
1022 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
1023 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1024 1133
1025 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
1026 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
1027 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
1028 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1029 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
1049 /* this newly created coroutine might be run on an existing cctx which most 1158 /* this newly created coroutine might be run on an existing cctx which most
1050 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1159 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1051 */ 1160 */
1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1161 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1162 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1163 slf_frame.destroy = 0;
1054 1164
1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1165 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1056 init_perl_op.op_next = PL_op; 1166 init_perl_op.op_next = PL_op;
1057 init_perl_op.op_type = OP_ENTERSUB; 1167 init_perl_op.op_type = OP_ENTERSUB;
1058 init_perl_op.op_ppaddr = pp_slf; 1168 init_perl_op.op_ppaddr = pp_slf;
… …
1063 /* copy throw, in case it was set before init_perl */ 1173 /* copy throw, in case it was set before init_perl */
1064 CORO_THROW = coro->except; 1174 CORO_THROW = coro->except;
1065 1175
1066 SWAP_SVS (coro); 1176 SWAP_SVS (coro);
1067 1177
1068 if (expect_false (enable_times)) 1178 if (ecb_expect_false (enable_times))
1069 { 1179 {
1070 coro_times_update (); 1180 coro_times_update ();
1071 coro_times_sub (coro); 1181 coro_times_sub (coro);
1072 } 1182 }
1073} 1183}
… …
1097destroy_perl (pTHX_ struct coro *coro) 1207destroy_perl (pTHX_ struct coro *coro)
1098{ 1208{
1099 SV *svf [9]; 1209 SV *svf [9];
1100 1210
1101 { 1211 {
1212 SV *old_current = SvRV (coro_current);
1102 struct coro *current = SvSTATE_current; 1213 struct coro *current = SvSTATE (old_current);
1103 1214
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1215 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105 1216
1106 save_perl (aTHX_ current); 1217 save_perl (aTHX_ current);
1218
1219 /* this will cause transfer_check to croak on block*/
1220 SvRV_set (coro_current, (SV *)coro->hv);
1221
1107 load_perl (aTHX_ coro); 1222 load_perl (aTHX_ coro);
1108 1223
1109 coro_unwind_stacks (aTHX); 1224 coro_unwind_stacks (aTHX);
1110 coro_destruct_stacks (aTHX);
1111 1225
1112 /* restore swapped sv's */ 1226 /* restore swapped sv's */
1113 SWAP_SVS (coro); 1227 SWAP_SVS (coro);
1114 1228
1229 coro_destruct_stacks (aTHX);
1230
1115 // now save some sv's to be free'd later 1231 /* now save some sv's to be free'd later */
1116 svf [0] = GvSV (PL_defgv); 1232 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv); 1233 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv); 1234 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv; 1235 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs; 1236 svf [4] = PL_rs;
… …
1122 svf [6] = (SV *)GvHV (PL_hintgv); 1238 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook; 1239 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook; 1240 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf)); 1241 assert (9 == sizeof (svf) / sizeof (*svf));
1126 1242
1243 SvRV_set (coro_current, old_current);
1244
1127 load_perl (aTHX_ current); 1245 load_perl (aTHX_ current);
1128 } 1246 }
1129 1247
1130 { 1248 {
1131 unsigned int i; 1249 unsigned int i;
… …
1135 1253
1136 SvREFCNT_dec (coro->saved_deffh); 1254 SvREFCNT_dec (coro->saved_deffh);
1137 SvREFCNT_dec (coro->rouse_cb); 1255 SvREFCNT_dec (coro->rouse_cb);
1138 SvREFCNT_dec (coro->invoke_cb); 1256 SvREFCNT_dec (coro->invoke_cb);
1139 SvREFCNT_dec (coro->invoke_av); 1257 SvREFCNT_dec (coro->invoke_av);
1140 SvREFCNT_dec (coro->swap_sv);
1141 } 1258 }
1142} 1259}
1143 1260
1144INLINE void 1261ecb_inline void
1145free_coro_mortal (pTHX) 1262free_coro_mortal (pTHX)
1146{ 1263{
1147 if (expect_true (coro_mortal)) 1264 if (ecb_expect_true (coro_mortal))
1148 { 1265 {
1149 SvREFCNT_dec (coro_mortal); 1266 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1267 coro_mortal = 0;
1151 } 1268 }
1152} 1269}
1153 1270
1154static int 1271static int
… …
1287 1404
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1405 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1406}
1290 1407
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1408/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1409static void ecb_noinline
1293cctx_prepare (pTHX) 1410cctx_prepare (pTHX)
1294{ 1411{
1295 PL_top_env = &PL_start_env; 1412 PL_top_env = &PL_start_env;
1296 1413
1297 if (cctx_current->flags & CC_TRACE) 1414 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1425 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1426 slf_frame.check = slf_check_set_stacklevel;
1310} 1427}
1311 1428
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1429/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1430ecb_inline void
1314transfer_tail (pTHX) 1431transfer_tail (pTHX)
1315{ 1432{
1316 free_coro_mortal (aTHX); 1433 free_coro_mortal (aTHX);
1434}
1435
1436/* try to exit the same way perl's main function would do */
1437/* we do not bother resetting the environment or other things *7
1438/* that are not, uhm, essential */
1439/* this obviously also doesn't work when perl is embedded */
1440static void ecb_noinline ecb_cold
1441perlish_exit (pTHX)
1442{
1443 int exitstatus = perl_destruct (PL_curinterp);
1444 perl_free (PL_curinterp);
1445 exit (exitstatus);
1317} 1446}
1318 1447
1319/* 1448/*
1320 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1321 */ 1450 */
… …
1350 */ 1479 */
1351 1480
1352 /* 1481 /*
1353 * If perl-run returns we assume exit() was being called or the coro 1482 * 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) 1483 * 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 1484 * 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" 1485 * 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 */ 1486 */
1361 PL_top_env = main_top_env; 1487 perlish_exit (aTHX);
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1488 }
1364} 1489}
1365 1490
1366static coro_cctx * 1491static coro_cctx *
1367cctx_new () 1492cctx_new (void)
1368{ 1493{
1369 coro_cctx *cctx; 1494 coro_cctx *cctx;
1370 1495
1371 ++cctx_count; 1496 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1497 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1503 return cctx;
1379} 1504}
1380 1505
1381/* create a new cctx only suitable as source */ 1506/* create a new cctx only suitable as source */
1382static coro_cctx * 1507static coro_cctx *
1383cctx_new_empty () 1508cctx_new_empty (void)
1384{ 1509{
1385 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1386 1511
1387 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1389 1514
1390 return cctx; 1515 return cctx;
1391} 1516}
1392 1517
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1519static coro_cctx *
1395cctx_new_run () 1520cctx_new_run (void)
1396{ 1521{
1397 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1398 void *stack_start;
1399 size_t stack_size;
1400 1523
1401#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1402 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1403 /* 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);
1405
1406 if (cctx->sptr != (void *)-1)
1407 {
1408 #if CORO_STACKGUARD
1409 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1410 #endif
1411 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1412 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1413 cctx->flags |= CC_MAPPED;
1414 } 1525 {
1415 else
1416#endif
1417 {
1418 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1419 New (0, cctx->sptr, cctx_stacksize, long);
1420
1421 if (!cctx->sptr)
1422 {
1423 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1424 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1425 }
1426
1427 stack_start = cctx->sptr;
1428 stack_size = cctx->ssize;
1429 } 1528 }
1430 1529
1431 #if CORO_USE_VALGRIND
1432 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1433 #endif
1434
1435 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1436 1531
1437 return cctx; 1532 return cctx;
1438} 1533}
1439 1534
1440static void 1535static void
1441cctx_destroy (coro_cctx *cctx) 1536cctx_destroy (coro_cctx *cctx)
1442{ 1537{
1443 if (!cctx) 1538 if (!cctx)
1444 return; 1539 return;
1445 1540
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1542
1448 --cctx_count; 1543 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1450 1545
1451 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1452 if (cctx->sptr)
1453 {
1454 #if CORO_USE_VALGRIND
1455 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1456 #endif
1457
1458#if HAVE_MMAP
1459 if (cctx->flags & CC_MAPPED)
1460 munmap (cctx->sptr, cctx->ssize);
1461 else
1462#endif
1463 Safefree (cctx->sptr);
1464 }
1465 1547
1466 Safefree (cctx); 1548 Safefree (cctx);
1467} 1549}
1468 1550
1469/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1552#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1553
1472static coro_cctx * 1554static coro_cctx *
1473cctx_get (pTHX) 1555cctx_get (pTHX)
1474{ 1556{
1475 while (expect_true (cctx_first)) 1557 while (ecb_expect_true (cctx_first))
1476 { 1558 {
1477 coro_cctx *cctx = cctx_first; 1559 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1560 cctx_first = cctx->next;
1479 --cctx_idle; 1561 --cctx_idle;
1480 1562
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1563 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1564 return cctx;
1483 1565
1484 cctx_destroy (cctx); 1566 cctx_destroy (cctx);
1485 } 1567 }
1486 1568
… …
1488} 1570}
1489 1571
1490static void 1572static void
1491cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1492{ 1574{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1575 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1494 1576
1495 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1579 {
1498 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1581 cctx_first = first->next;
1500 --cctx_idle; 1582 --cctx_idle;
1501 1583
… …
1512static void 1594static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1595transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1596{
1515 /* TODO: throwing up here is considered harmful */ 1597 /* TODO: throwing up here is considered harmful */
1516 1598
1517 if (expect_true (prev != next)) 1599 if (ecb_expect_true (prev != next))
1518 { 1600 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1601 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,"); 1602 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1603
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1604 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,"); 1605 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1606
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1607#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1608 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,"); 1609 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1610#endif
1529 } 1611 }
1530} 1612}
1531 1613
1532/* always use the TRANSFER macro */ 1614/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1615static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1616transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1617{
1536 dSTACKLEVEL; 1618 dSTACKLEVEL;
1537 1619
1538 /* sometimes transfer is only called to set idle_sp */ 1620 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1621 if (ecb_expect_false (!prev))
1540 { 1622 {
1541 cctx_current->idle_sp = STACKLEVEL; 1623 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1624 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1625 }
1544 else if (expect_true (prev != next)) 1626 else if (ecb_expect_true (prev != next))
1545 { 1627 {
1546 coro_cctx *cctx_prev; 1628 coro_cctx *cctx_prev;
1547 1629
1548 if (expect_false (prev->flags & CF_NEW)) 1630 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1631 {
1550 /* create a new empty/source context */ 1632 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1633 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1634 prev->flags |= CF_RUNNING;
1553 } 1635 }
… …
1556 next->flags |= CF_RUNNING; 1638 next->flags |= CF_RUNNING;
1557 1639
1558 /* first get rid of the old state */ 1640 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1641 save_perl (aTHX_ prev);
1560 1642
1561 if (expect_false (next->flags & CF_NEW)) 1643 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1644 {
1563 /* need to start coroutine */ 1645 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1646 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1647 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1648 init_perl (aTHX_ next);
1567 } 1649 }
1568 else 1650 else
1569 load_perl (aTHX_ next); 1651 load_perl (aTHX_ next);
1570 1652
1571 /* possibly untie and reuse the cctx */ 1653 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1654 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1655 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1656 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1657 && !force_cctx
1576 )) 1658 ))
1577 { 1659 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1660 /* 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)); 1661 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1662
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1663 /* 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 */ 1664 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1665 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1666 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1667 next->cctx = cctx_get (aTHX);
1586 1668
1587 cctx_put (cctx_current); 1669 cctx_put (cctx_current);
1588 } 1670 }
1589 else 1671 else
1590 prev->cctx = cctx_current; 1672 prev->cctx = cctx_current;
1591 1673
1592 ++next->usecount; 1674 ++next->usecount;
1593 1675
1594 cctx_prev = cctx_current; 1676 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1677 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1678
1597 next->cctx = 0; 1679 next->cctx = 0;
1598 1680
1599 if (expect_false (cctx_prev != cctx_current)) 1681 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1682 {
1601 cctx_prev->top_env = PL_top_env; 1683 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1684 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1685 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1686 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1692#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) 1693#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1694
1613/** high level stuff ********************************************************/ 1695/** high level stuff ********************************************************/
1614 1696
1697/* this function is actually Coro, not Coro::State, but we call it from here */
1698/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1699static void
1700coro_call_on_destroy (pTHX_ struct coro *coro);
1701
1702static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1703coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1704{
1618 if (coro->flags & CF_DESTROYED) 1705 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1706 return;
1620 1707
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1623 1709
1624 coro->flags |= CF_DESTROYED; 1710 coro->flags |= CF_ZOMBIE;
1625 1711
1626 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1627 { 1713 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1716 --coro_nready;
1631 } 1717 }
1632 else 1718 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1719 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1720
1721 if (coro->next) coro->next->prev = coro->prev;
1722 if (coro->prev) coro->prev->next = coro->next;
1723 if (coro == coro_first) coro_first = coro->next;
1634 1724
1635 if (coro->mainstack 1725 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1726 && coro->mainstack != main_mainstack
1637 && coro->slot 1727 && coro->slot
1638 && !PL_dirty) 1728 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1729 destroy_perl (aTHX_ coro);
1640 1730
1641 cctx_destroy (coro->cctx); 1731 cctx_destroy (coro->cctx);
1642 SvREFCNT_dec (coro->startcv); 1732 SvREFCNT_dec (coro->startcv);
1643 SvREFCNT_dec (coro->args); 1733 SvREFCNT_dec (coro->args);
1734 SvREFCNT_dec (coro->swap_sv);
1644 SvREFCNT_dec (CORO_THROW); 1735 SvREFCNT_dec (CORO_THROW);
1645 1736
1646 if (coro->next) coro->next->prev = coro->prev; 1737 coro_call_on_destroy (aTHX_ coro);
1647 if (coro->prev) coro->prev->next = coro->next;
1648 if (coro == coro_first) coro_first = coro->next;
1649 1738
1650 return 1; 1739 /* more destruction mayhem in coro_state_free */
1651} 1740}
1652 1741
1653static int 1742static int
1654coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1743coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1655{ 1744{
1656 struct coro *coro = (struct coro *)mg->mg_ptr; 1745 struct coro *coro = (struct coro *)mg->mg_ptr;
1657 mg->mg_ptr = 0; 1746 mg->mg_ptr = 0;
1658 1747
1659 coro->hv = 0;
1660
1661 if (--coro->refcnt < 0)
1662 {
1663 coro_state_destroy (aTHX_ coro); 1748 coro_state_destroy (aTHX_ coro);
1749 SvREFCNT_dec (coro->on_destroy);
1750 SvREFCNT_dec (coro->status);
1751
1664 Safefree (coro); 1752 Safefree (coro);
1665 }
1666 1753
1667 return 0; 1754 return 0;
1668} 1755}
1669 1756
1670static int 1757static int ecb_cold
1671coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1758coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1672{ 1759{
1673 struct coro *coro = (struct coro *)mg->mg_ptr; 1760 /* called when perl clones the current process the slow way (windows process emulation) */
1674 1761 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1675 ++coro->refcnt; 1762 mg->mg_ptr = 0;
1763 mg->mg_virtual = 0;
1676 1764
1677 return 0; 1765 return 0;
1678} 1766}
1679 1767
1680static MGVTBL coro_state_vtbl = { 1768static MGVTBL coro_state_vtbl = {
… …
1705 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1706} 1794}
1707 1795
1708/** Coro ********************************************************************/ 1796/** Coro ********************************************************************/
1709 1797
1710INLINE void 1798ecb_inline void
1711coro_enq (pTHX_ struct coro *coro) 1799coro_enq (pTHX_ struct coro *coro)
1712{ 1800{
1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1801 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1714 1802
1715 SvREFCNT_inc_NN (coro->hv); 1803 SvREFCNT_inc_NN (coro->hv);
… …
1717 coro->next_ready = 0; 1805 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1806 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro; 1807 ready [1] = coro;
1720} 1808}
1721 1809
1722INLINE struct coro * 1810ecb_inline struct coro *
1723coro_deq (pTHX) 1811coro_deq (pTHX)
1724{ 1812{
1725 int prio; 1813 int prio;
1726 1814
1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1815 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1780{ 1868{
1781 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1869 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1782} 1870}
1783 1871
1784/* expects to own a reference to next->hv */ 1872/* expects to own a reference to next->hv */
1785INLINE void 1873ecb_inline void
1786prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1874prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1787{ 1875{
1788 SV *prev_sv = SvRV (coro_current); 1876 SV *prev_sv = SvRV (coro_current);
1789 1877
1790 ta->prev = SvSTATE_hv (prev_sv); 1878 ta->prev = SvSTATE_hv (prev_sv);
… …
1803{ 1891{
1804 for (;;) 1892 for (;;)
1805 { 1893 {
1806 struct coro *next = coro_deq (aTHX); 1894 struct coro *next = coro_deq (aTHX);
1807 1895
1808 if (expect_true (next)) 1896 if (ecb_expect_true (next))
1809 { 1897 {
1810 /* cannot transfer to destroyed coros, skip and look for next */ 1898 /* cannot transfer to destroyed coros, skip and look for next */
1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1899 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1812 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1900 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1813 else 1901 else
1814 { 1902 {
1815 next->flags &= ~CF_READY; 1903 next->flags &= ~CF_READY;
1816 --coro_nready; 1904 --coro_nready;
… …
1823 { 1911 {
1824 /* nothing to schedule: call the idle handler */ 1912 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle) 1913 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle))) 1914 && SvOBJECT (SvRV (sv_idle)))
1827 { 1915 {
1916 if (SvRV (sv_idle) == SvRV (coro_current))
1917 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1918
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1919 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle)); 1920 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready; 1921 --coro_nready;
1831 } 1922 }
1832 else 1923 else
… …
1846 } 1937 }
1847 } 1938 }
1848 } 1939 }
1849} 1940}
1850 1941
1851INLINE void 1942ecb_inline void
1852prepare_cede (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede (pTHX_ struct coro_transfer_args *ta)
1853{ 1944{
1854 api_ready (aTHX_ coro_current); 1945 api_ready (aTHX_ coro_current);
1855 prepare_schedule (aTHX_ ta); 1946 prepare_schedule (aTHX_ ta);
1856} 1947}
1857 1948
1858INLINE void 1949ecb_inline void
1859prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1950prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1860{ 1951{
1861 SV *prev = SvRV (coro_current); 1952 SV *prev = SvRV (coro_current);
1862 1953
1863 if (coro_nready) 1954 if (coro_nready)
… …
1893{ 1984{
1894 struct coro_transfer_args ta; 1985 struct coro_transfer_args ta;
1895 1986
1896 prepare_cede (aTHX_ &ta); 1987 prepare_cede (aTHX_ &ta);
1897 1988
1898 if (expect_true (ta.prev != ta.next)) 1989 if (ecb_expect_true (ta.prev != ta.next))
1899 { 1990 {
1900 TRANSFER (ta, 1); 1991 TRANSFER (ta, 1);
1901 return 1; 1992 return 1;
1902 } 1993 }
1903 else 1994 else
… …
1946 coro->slot->runops = RUNOPS_DEFAULT; 2037 coro->slot->runops = RUNOPS_DEFAULT;
1947 } 2038 }
1948} 2039}
1949 2040
1950static void 2041static void
2042coro_push_av (pTHX_ AV *av, I32 gimme_v)
2043{
2044 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2045 {
2046 dSP;
2047
2048 if (gimme_v == G_SCALAR)
2049 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2050 else
2051 {
2052 int i;
2053 EXTEND (SP, AvFILLp (av) + 1);
2054
2055 for (i = 0; i <= AvFILLp (av); ++i)
2056 PUSHs (AvARRAY (av)[i]);
2057 }
2058
2059 PUTBACK;
2060 }
2061}
2062
2063static void
2064coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2065{
2066 if (!coro->on_destroy)
2067 coro->on_destroy = newAV ();
2068
2069 av_push (coro->on_destroy, cb);
2070}
2071
2072static void
2073slf_destroy_join (pTHX_ struct CoroSLF *frame)
2074{
2075 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2076}
2077
2078static int
2079slf_check_join (pTHX_ struct CoroSLF *frame)
2080{
2081 struct coro *coro = (struct coro *)frame->data;
2082
2083 if (!coro->status)
2084 return 1;
2085
2086 frame->destroy = 0;
2087
2088 coro_push_av (aTHX_ coro->status, GIMME_V);
2089
2090 SvREFCNT_dec ((SV *)coro->hv);
2091
2092 return 0;
2093}
2094
2095static void
2096slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2097{
2098 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2099
2100 if (items > 1)
2101 croak ("join called with too many arguments");
2102
2103 if (coro->status)
2104 frame->prepare = prepare_nop;
2105 else
2106 {
2107 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2108 frame->prepare = prepare_schedule;
2109 }
2110
2111 frame->check = slf_check_join;
2112 frame->destroy = slf_destroy_join;
2113 frame->data = (void *)coro;
2114 SvREFCNT_inc (coro->hv);
2115}
2116
2117static void
1951coro_call_on_destroy (pTHX_ struct coro *coro) 2118coro_call_on_destroy (pTHX_ struct coro *coro)
1952{ 2119{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2120 AV *od = coro->on_destroy;
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955 2121
1956 if (on_destroyp) 2122 if (!od)
1957 { 2123 return;
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1959 2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2127
1960 while (AvFILLp (on_destroy) >= 0) 2128 while (AvFILLp (od) >= 0)
2129 {
2130 SV *cb = sv_2mortal (av_pop (od));
2131
2132 /* coro hv's (and only hv's at the moment) are supported as well */
2133 if (SvSTATEhv_p (aTHX_ cb))
2134 api_ready (aTHX_ cb);
2135 else
1961 { 2136 {
1962 dSP; /* don't disturb outer sp */ 2137 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy);
1964
1965 PUSHMARK (SP); 2138 PUSHMARK (SP);
1966 2139
1967 if (statusp) 2140 if (coro->status)
1968 { 2141 {
1969 int i; 2142 PUTBACK;
1970 AV *status = (AV *)SvRV (*statusp); 2143 coro_push_av (aTHX_ coro->status, G_ARRAY);
1971 EXTEND (SP, AvFILLp (status) + 1); 2144 SPAGAIN;
1972
1973 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]);
1975 } 2145 }
1976 2146
1977 PUTBACK; 2147 PUTBACK;
1978 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2148 call_sv (cb, G_VOID | G_DISCARD);
1979 } 2149 }
1980 } 2150 }
1981} 2151}
1982 2152
1983static void 2153static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1985{ 2155{
1986 int i; 2156 AV *av;
1987 HV *hv = (HV *)SvRV (coro_current); 2157
1988 AV *av = newAV (); 2158 if (coro->status)
2159 {
2160 av = coro->status;
2161 av_clear (av);
2162 }
2163 else
2164 av = coro->status = newAV ();
1989 2165
1990 /* items are actually not so common, so optimise for this case */ 2166 /* items are actually not so common, so optimise for this case */
1991 if (items) 2167 if (items)
1992 { 2168 {
2169 int i;
2170
1993 av_extend (av, items - 1); 2171 av_extend (av, items - 1);
1994 2172
1995 for (i = 0; i < items; ++i) 2173 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i])); 2174 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 } 2175 }
2176}
1998 2177
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2178static void
2000 2179slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2180{
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2181 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager); 2182 api_ready (aTHX_ sv_manager);
2003 2183
2004 frame->prepare = prepare_schedule; 2184 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat; 2185 frame->check = slf_check_repeat;
2006 2186
2007 /* as a minor optimisation, we could unwind all stacks here */ 2187 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */ 2188 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/ 2189 /*coro_unwind_stacks (aTHX);*/
2190}
2191
2192static void
2193slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2194{
2195 HV *coro_hv = (HV *)SvRV (coro_current);
2196
2197 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2198 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2199}
2200
2201static void
2202slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2203{
2204 HV *coro_hv;
2205 struct coro *coro;
2206
2207 if (items <= 0)
2208 croak ("Coro::cancel called without coro object,");
2209
2210 coro = SvSTATE (arg [0]);
2211 coro_hv = coro->hv;
2212
2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2214
2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2216 {
2217 /* coro currently busy cancelling something, so just notify it */
2218 coro->slf_frame.data = (void *)coro;
2219
2220 frame->prepare = prepare_nop;
2221 frame->check = slf_check_nop;
2222 }
2223 else if (coro_hv == (HV *)SvRV (coro_current))
2224 {
2225 /* cancelling the current coro is allowed, and equals terminate */
2226 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2227 }
2228 else
2229 {
2230 struct coro *self = SvSTATE_current;
2231
2232 /* otherwise we cancel directly, purely for speed reasons
2233 * unfortunately, this requires some magic trickery, as
2234 * somebody else could cancel us, so we have to fight the cancellation.
2235 * this is ugly, and hopefully fully worth the extra speed.
2236 * besides, I can't get the slow-but-safe version working...
2237 */
2238 slf_frame.data = 0;
2239 self->flags |= CF_NOCANCEL;
2240 coro_state_destroy (aTHX_ coro);
2241 self->flags &= ~CF_NOCANCEL;
2242
2243 if (slf_frame.data)
2244 {
2245 /* while we were busy we have been cancelled, so terminate */
2246 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2247 }
2248 else
2249 {
2250 frame->prepare = prepare_nop;
2251 frame->check = slf_check_nop;
2252 }
2253 }
2254}
2255
2256static int
2257slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2258{
2259 frame->prepare = 0;
2260 coro_unwind_stacks (aTHX);
2261
2262 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2263
2264 return 1;
2265}
2266
2267static int
2268safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2269{
2270 if (coro->cctx)
2271 croak ("coro inside C callback, unable to cancel at this time, caught");
2272
2273 if (coro->flags & CF_NEW)
2274 {
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro_state_destroy (aTHX_ coro);
2277 }
2278 else
2279 {
2280 if (!coro->slf_frame.prepare)
2281 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2282
2283 slf_destroy (aTHX_ coro);
2284
2285 coro_set_status (aTHX_ coro, arg, items);
2286 coro->slf_frame.prepare = prepare_nop;
2287 coro->slf_frame.check = slf_check_safe_cancel;
2288
2289 api_ready (aTHX_ (SV *)coro->hv);
2290 }
2291
2292 return 1;
2010} 2293}
2011 2294
2012/*****************************************************************************/ 2295/*****************************************************************************/
2013/* async pool handler */ 2296/* async pool handler */
2014 2297
… …
2045slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2328slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2046{ 2329{
2047 HV *hv = (HV *)SvRV (coro_current); 2330 HV *hv = (HV *)SvRV (coro_current);
2048 struct coro *coro = SvSTATE_hv ((SV *)hv); 2331 struct coro *coro = SvSTATE_hv ((SV *)hv);
2049 2332
2050 if (expect_true (coro->saved_deffh)) 2333 if (ecb_expect_true (coro->saved_deffh))
2051 { 2334 {
2052 /* subsequent iteration */ 2335 /* subsequent iteration */
2053 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2336 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2054 coro->saved_deffh = 0; 2337 coro->saved_deffh = 0;
2055 2338
2056 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2339 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2057 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2340 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2058 { 2341 {
2059 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2342 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2060 coro->invoke_av = newAV (); 2343 return;
2061
2062 frame->prepare = prepare_nop;
2063 } 2344 }
2064 else 2345 else
2065 { 2346 {
2066 av_clear (GvAV (PL_defgv)); 2347 av_clear (GvAV (PL_defgv));
2067 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2348 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2117 2398
2118static int 2399static int
2119slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2120{ 2401{
2121 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2122 2403
2123 if (CORO_THROW) 2404 if (CORO_THROW)
2124 return 0; 2405 return 0;
2125 2406
2126 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2127 return 1; 2408 return 1;
… …
2163 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2164 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2165 } 2446 }
2166 2447
2167 if (!SvROK (cb) 2448 if (!SvROK (cb)
2168 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2170 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2171 2452
2172 { 2453 {
2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2290static void 2571static void
2291slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2572slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2292{ 2573{
2293 frame->prepare = prepare_cede_notself; 2574 frame->prepare = prepare_cede_notself;
2294 frame->check = slf_check_nop; 2575 frame->check = slf_check_nop;
2576}
2577
2578/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2579static void
2580slf_destroy (pTHX_ struct coro *coro)
2581{
2582 /* this callback is reserved for slf functions needing to do cleanup */
2583 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2584 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2585
2586 /*
2587 * The on_destroy above most likely is from an SLF call.
2588 * Since by definition the SLF call will not finish when we destroy
2589 * the coro, we will have to force-finish it here, otherwise
2590 * cleanup functions cannot call SLF functions.
2591 */
2592 coro->slf_frame.prepare = 0;
2295} 2593}
2296 2594
2297/* 2595/*
2298 * these not obviously related functions are all rolled into one 2596 * these not obviously related functions are all rolled into one
2299 * function to increase chances that they all will call transfer with the same 2597 * function to increase chances that they all will call transfer with the same
… …
2306 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2604 I32 checkmark; /* mark SP to see how many elements check has pushed */
2307 2605
2308 /* set up the slf frame, unless it has already been set-up */ 2606 /* set up the slf frame, unless it has already been set-up */
2309 /* the latter happens when a new coro has been started */ 2607 /* the latter happens when a new coro has been started */
2310 /* or when a new cctx was attached to an existing coroutine */ 2608 /* or when a new cctx was attached to an existing coroutine */
2311 if (expect_true (!slf_frame.prepare)) 2609 if (ecb_expect_true (!slf_frame.prepare))
2312 { 2610 {
2313 /* first iteration */ 2611 /* first iteration */
2314 dSP; 2612 dSP;
2315 SV **arg = PL_stack_base + TOPMARK + 1; 2613 SV **arg = PL_stack_base + TOPMARK + 1;
2316 int items = SP - arg; /* args without function object */ 2614 int items = SP - arg; /* args without function object */
… …
2357 while (slf_frame.check (aTHX_ &slf_frame)); 2655 while (slf_frame.check (aTHX_ &slf_frame));
2358 2656
2359 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2657 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2360 2658
2361 /* exception handling */ 2659 /* exception handling */
2362 if (expect_false (CORO_THROW)) 2660 if (ecb_expect_false (CORO_THROW))
2363 { 2661 {
2364 SV *exception = sv_2mortal (CORO_THROW); 2662 SV *exception = sv_2mortal (CORO_THROW);
2365 2663
2366 CORO_THROW = 0; 2664 CORO_THROW = 0;
2367 sv_setsv (ERRSV, exception); 2665 sv_setsv (ERRSV, exception);
2368 croak (0); 2666 croak (0);
2369 } 2667 }
2370 2668
2371 /* return value handling - mostly like entersub */ 2669 /* return value handling - mostly like entersub */
2372 /* make sure we put something on the stack in scalar context */ 2670 /* make sure we put something on the stack in scalar context */
2373 if (GIMME_V == G_SCALAR) 2671 if (GIMME_V == G_SCALAR
2672 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2374 { 2673 {
2375 dSP; 2674 dSP;
2376 SV **bot = PL_stack_base + checkmark; 2675 SV **bot = PL_stack_base + checkmark;
2377 2676
2378 if (sp == bot) /* too few, push undef */ 2677 if (sp == bot) /* too few, push undef */
2379 bot [1] = &PL_sv_undef; 2678 bot [1] = &PL_sv_undef;
2380 else if (sp != bot + 1) /* too many, take last one */ 2679 else /* too many, take last one */
2381 bot [1] = *sp; 2680 bot [1] = *sp;
2382 2681
2383 SP = bot + 1; 2682 SP = bot + 1;
2384 2683
2385 PUTBACK; 2684 PUTBACK;
… …
2418 if (PL_op->op_flags & OPf_STACKED) 2717 if (PL_op->op_flags & OPf_STACKED)
2419 { 2718 {
2420 if (items > slf_arga) 2719 if (items > slf_arga)
2421 { 2720 {
2422 slf_arga = items; 2721 slf_arga = items;
2423 free (slf_argv); 2722 Safefree (slf_argv);
2424 slf_argv = malloc (slf_arga * sizeof (SV *)); 2723 New (0, slf_argv, slf_arga, SV *);
2425 } 2724 }
2426 2725
2427 slf_argc = items; 2726 slf_argc = items;
2428 2727
2429 for (i = 0; i < items; ++i) 2728 for (i = 0; i < items; ++i)
… …
2492{ 2791{
2493 PerlIOBuf base; 2792 PerlIOBuf base;
2494 NV next, every; 2793 NV next, every;
2495} PerlIOCede; 2794} PerlIOCede;
2496 2795
2497static IV 2796static IV ecb_cold
2498PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2797PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2499{ 2798{
2500 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2799 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2501 2800
2502 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2801 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2503 self->next = nvtime () + self->every; 2802 self->next = nvtime () + self->every;
2504 2803
2505 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2804 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2506} 2805}
2507 2806
2508static SV * 2807static SV * ecb_cold
2509PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2808PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2510{ 2809{
2511 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2810 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2512 2811
2513 return newSVnv (self->every); 2812 return newSVnv (self->every);
… …
2625 SvREFCNT_dec (cb); 2924 SvREFCNT_dec (cb);
2626 } 2925 }
2627} 2926}
2628 2927
2629static void 2928static void
2630coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2929coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2631{ 2930{
2632 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2931 /* call $sem->adjust (0) to possibly wake up some other waiters */
2633 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2932 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2634} 2933}
2635 2934
2636static int 2935static int
2637slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2936slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2638{ 2937{
2639 AV *av = (AV *)frame->data; 2938 AV *av = (AV *)frame->data;
2640 SV *count_sv = AvARRAY (av)[0]; 2939 SV *count_sv = AvARRAY (av)[0];
2940 SV *coro_hv = SvRV (coro_current);
2641 2941
2642 /* if we are about to throw, don't actually acquire the lock, just throw */ 2942 /* if we are about to throw, don't actually acquire the lock, just throw */
2643 if (CORO_THROW) 2943 if (CORO_THROW)
2644 return 0; 2944 return 0;
2645 else if (SvIVX (count_sv) > 0) 2945 else if (SvIVX (count_sv) > 0)
2646 { 2946 {
2647 SvSTATE_current->on_destroy = 0; 2947 frame->destroy = 0;
2648 2948
2649 if (acquire) 2949 if (acquire)
2650 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2950 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2651 else 2951 else
2652 coro_semaphore_adjust (aTHX_ av, 0); 2952 coro_semaphore_adjust (aTHX_ av, 0);
… …
2657 { 2957 {
2658 int i; 2958 int i;
2659 /* if we were woken up but can't down, we look through the whole */ 2959 /* if we were woken up but can't down, we look through the whole */
2660 /* waiters list and only add us if we aren't in there already */ 2960 /* waiters list and only add us if we aren't in there already */
2661 /* this avoids some degenerate memory usage cases */ 2961 /* this avoids some degenerate memory usage cases */
2662 2962 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2663 for (i = 1; i <= AvFILLp (av); ++i)
2664 if (AvARRAY (av)[i] == SvRV (coro_current)) 2963 if (AvARRAY (av)[i] == coro_hv)
2665 return 1; 2964 return 1;
2666 2965
2667 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2966 av_push (av, SvREFCNT_inc (coro_hv));
2668 return 1; 2967 return 1;
2669 } 2968 }
2670} 2969}
2671 2970
2672static int 2971static int
… …
2695 { 2994 {
2696 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2995 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2697 2996
2698 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2997 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2699 frame->prepare = prepare_schedule; 2998 frame->prepare = prepare_schedule;
2700
2701 /* to avoid race conditions when a woken-up coro gets terminated */ 2999 /* to avoid race conditions when a woken-up coro gets terminated */
2702 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3000 /* we arrange for a temporary on_destroy that calls adjust (0) */
2703 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3001 frame->destroy = coro_semaphore_destroy;
2704 } 3002 }
2705} 3003}
2706 3004
2707static void 3005static void
2708slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3006slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2790 { 3088 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]); 3089 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3090 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793 3091
2794 if (SvIVX (AvARRAY (av)[0])) 3092 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3093 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2796 3094
2797 frame->prepare = prepare_nop; 3095 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop; 3096 frame->check = slf_check_nop;
2799 } 3097 }
2800 else if (SvIVX (AvARRAY (av)[0])) 3098 else if (SvIVX (AvARRAY (av)[0]))
… …
2877 /* it quickly returns */ 3175 /* it quickly returns */
2878 if (CORO_THROW) 3176 if (CORO_THROW)
2879 return 0; 3177 return 0;
2880 3178
2881 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
2882 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2883 return 1; 3181 return 1;
2884 3182
2885 /* restore status */ 3183 /* restore status */
2886 { 3184 {
2887 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
2926 dSP; 3224 dSP;
2927 3225
2928 static SV *prio_cv; 3226 static SV *prio_cv;
2929 static SV *prio_sv; 3227 static SV *prio_sv;
2930 3228
2931 if (expect_false (!prio_cv)) 3229 if (ecb_expect_false (!prio_cv))
2932 { 3230 {
2933 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3231 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2934 prio_sv = newSViv (0); 3232 prio_sv = newSViv (0);
2935 } 3233 }
2936 3234
… …
2962 /* now call the AIO function - we assume our request is uncancelable */ 3260 /* now call the AIO function - we assume our request is uncancelable */
2963 PUTBACK; 3261 PUTBACK;
2964 call_sv ((SV *)req, G_VOID | G_DISCARD); 3262 call_sv ((SV *)req, G_VOID | G_DISCARD);
2965 } 3263 }
2966 3264
2967 /* now that the requets is going, we loop toll we have a result */ 3265 /* now that the request is going, we loop till we have a result */
2968 frame->data = (void *)state; 3266 frame->data = (void *)state;
2969 frame->prepare = prepare_schedule; 3267 frame->prepare = prepare_schedule;
2970 frame->check = slf_check_aio_req; 3268 frame->check = slf_check_aio_req;
2971} 3269}
2972 3270
… …
3042 } 3340 }
3043 3341
3044 return coro_sv; 3342 return coro_sv;
3045} 3343}
3046 3344
3345#ifndef __cplusplus
3346ecb_cold XS(boot_Coro__State);
3347#endif
3348
3349#if CORO_JIT
3350
3351static void ecb_noinline ecb_cold
3352pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3353{
3354 dSP;
3355 AV *av = newAV ();
3356
3357 av_store (av, 3, newSVuv (d));
3358 av_store (av, 2, newSVuv (c));
3359 av_store (av, 1, newSVuv (b));
3360 av_store (av, 0, newSVuv (a));
3361
3362 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3363
3364 PUTBACK;
3365}
3366
3367static void ecb_noinline ecb_cold
3368jit_init (pTHX)
3369{
3370 dSP;
3371 SV *load, *save;
3372 char *map_base;
3373 char *load_ptr, *save_ptr;
3374 STRLEN load_len, save_len, map_len;
3375 int count;
3376
3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3378
3379 PUSHMARK (SP);
3380 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3381 #include "state.h"
3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3383 SPAGAIN;
3384
3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
3387
3388 map_len = load_len + save_len + 16;
3389
3390 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3391
3392 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3393
3394 load_perl_slots = (load_save_perl_slots_type)map_base;
3395 memcpy (map_base, load_ptr, load_len);
3396
3397 map_base += (load_len + 15) & ~15;
3398
3399 save_perl_slots = (load_save_perl_slots_type)map_base;
3400 memcpy (map_base, save_ptr, save_len);
3401
3402 /* we are good citizens and try to make the page read-only, so the evil evil */
3403 /* hackers might have it a bit more difficult */
3404 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3405
3406 PUTBACK;
3407 eval_pv ("undef &Coro::State::_jit", 1);
3408}
3409
3410#endif
3411
3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3412MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3048 3413
3049PROTOTYPES: DISABLE 3414PROTOTYPES: DISABLE
3050 3415
3051BOOT: 3416BOOT:
… …
3053#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
3054# if CORO_PTHREAD 3419# if CORO_PTHREAD
3055 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
3056# endif 3421# endif
3057#endif 3422#endif
3058 BOOT_PAGESIZE; 3423 /* perl defines these to check for existance first, but why it doesn't */
3424 /* just create them one at init time is not clear to me, except for */
3425 /* programs trying to delete them, but... */
3426 /* anyway, we declare this as invalid and make sure they are initialised here */
3427 DEFSV;
3428 ERRSV;
3059 3429
3060 cctx_current = cctx_new_empty (); 3430 cctx_current = cctx_new_empty ();
3061 3431
3062 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3432 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3063 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3433 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3103 coroapi.prepare_nop = prepare_nop; 3473 coroapi.prepare_nop = prepare_nop;
3104 coroapi.prepare_schedule = prepare_schedule; 3474 coroapi.prepare_schedule = prepare_schedule;
3105 coroapi.prepare_cede = prepare_cede; 3475 coroapi.prepare_cede = prepare_cede;
3106 coroapi.prepare_cede_notself = prepare_cede_notself; 3476 coroapi.prepare_cede_notself = prepare_cede_notself;
3107 3477
3108 { 3478 time_init (aTHX);
3109 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3110
3111 if (!svp) croak ("Time::HiRes is required");
3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3113
3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3118 }
3119 3479
3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3480 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3481#if CORO_JIT
3482 PUTBACK;
3483 jit_init (aTHX);
3484 SPAGAIN;
3485#endif
3121} 3486}
3122 3487
3123SV * 3488SV *
3124new (SV *klass, ...) 3489new (SV *klass, ...)
3125 ALIAS: 3490 ALIAS:
… …
3132void 3497void
3133transfer (...) 3498transfer (...)
3134 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3135 CODE: 3500 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3137
3138bool
3139_destroy (SV *coro_sv)
3140 CODE:
3141 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3142 OUTPUT:
3143 RETVAL
3144
3145void
3146_exit (int code)
3147 PROTOTYPE: $
3148 CODE:
3149 _exit (code);
3150 3502
3151SV * 3503SV *
3152clone (Coro::State coro) 3504clone (Coro::State coro)
3153 CODE: 3505 CODE:
3154{ 3506{
… …
3209void 3561void
3210list () 3562list ()
3211 PROTOTYPE: 3563 PROTOTYPE:
3212 PPCODE: 3564 PPCODE:
3213{ 3565{
3214 struct coro *coro; 3566 struct coro *coro;
3215 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3216 if (coro->hv) 3568 if (coro->hv)
3217 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3218} 3570}
3219 3571
… …
3224 CODE: 3576 CODE:
3225{ 3577{
3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3578 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3227 { 3579 {
3228 struct coro *current = SvSTATE_current; 3580 struct coro *current = SvSTATE_current;
3581 struct CoroSLF slf_save;
3229 3582
3230 if (current != coro) 3583 if (current != coro)
3231 { 3584 {
3232 PUTBACK; 3585 PUTBACK;
3233 save_perl (aTHX_ current); 3586 save_perl (aTHX_ current);
3234 load_perl (aTHX_ coro); 3587 load_perl (aTHX_ coro);
3588 /* the coro is most likely in an active SLF call.
3589 * while not strictly required (the code we execute is
3590 * not allowed to call any SLF functions), it's cleaner
3591 * to reinitialise the slf_frame and restore it later.
3592 * This might one day allow us to actually do SLF calls
3593 * from code executed here.
3594 */
3595 slf_save = slf_frame;
3596 slf_frame.prepare = 0;
3235 SPAGAIN; 3597 SPAGAIN;
3236 } 3598 }
3237 3599
3238 PUSHSTACK; 3600 PUSHSTACK;
3239 3601
… …
3249 SPAGAIN; 3611 SPAGAIN;
3250 3612
3251 if (current != coro) 3613 if (current != coro)
3252 { 3614 {
3253 PUTBACK; 3615 PUTBACK;
3616 slf_frame = slf_save;
3254 save_perl (aTHX_ coro); 3617 save_perl (aTHX_ coro);
3255 load_perl (aTHX_ current); 3618 load_perl (aTHX_ current);
3256 SPAGAIN; 3619 SPAGAIN;
3257 } 3620 }
3258 } 3621 }
… …
3263 PROTOTYPE: $ 3626 PROTOTYPE: $
3264 ALIAS: 3627 ALIAS:
3265 is_ready = CF_READY 3628 is_ready = CF_READY
3266 is_running = CF_RUNNING 3629 is_running = CF_RUNNING
3267 is_new = CF_NEW 3630 is_new = CF_NEW
3268 is_destroyed = CF_DESTROYED 3631 is_destroyed = CF_ZOMBIE
3632 is_zombie = CF_ZOMBIE
3269 is_suspended = CF_SUSPENDED 3633 is_suspended = CF_SUSPENDED
3270 CODE: 3634 CODE:
3271 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3272 OUTPUT: 3636 OUTPUT:
3273 RETVAL 3637 RETVAL
3274 3638
3275void 3639void
3276throw (Coro::State self, SV *throw = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3277 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3278 CODE: 3642 CODE:
3279{ 3643{
3644 struct coro *coro = SvSTATE (self);
3280 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3281 SV **throwp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3282 SvREFCNT_dec (*throwp); 3647 SvREFCNT_dec (*exceptionp);
3283 SvGETMAGIC (throw); 3648 SvGETMAGIC (exception);
3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3285} 3652}
3286 3653
3287void 3654void
3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3289 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
… …
3344 3711
3345void 3712void
3346cancel (Coro::State self) 3713cancel (Coro::State self)
3347 CODE: 3714 CODE:
3348 coro_state_destroy (aTHX_ self); 3715 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351 3716
3352SV * 3717SV *
3353enable_times (int enabled = enable_times) 3718enable_times (int enabled = enable_times)
3354 CODE: 3719 CODE:
3355{ 3720{
… …
3368 3733
3369void 3734void
3370times (Coro::State self) 3735times (Coro::State self)
3371 PPCODE: 3736 PPCODE:
3372{ 3737{
3373 struct coro *current = SvSTATE (coro_current); 3738 struct coro *current = SvSTATE (coro_current);
3374 3739
3375 if (expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3376 { 3741 {
3377 coro_times_update (); 3742 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current)); 3743 coro_times_add (SvSTATE (coro_current));
3379 } 3744 }
3380 3745
3381 EXTEND (SP, 2); 3746 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3747 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3748 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384 3749
3385 if (expect_false (current == self)) 3750 if (ecb_expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current)); 3751 coro_times_sub (SvSTATE (coro_current));
3387} 3752}
3388 3753
3389void 3754void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3755swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3396 SWAP_SVS (current); 3761 SWAP_SVS (current);
3397 3762
3398 if (!coro->swap_sv) 3763 if (!coro->swap_sv)
3399 coro->swap_sv = newAV (); 3764 coro->swap_sv = newAV ();
3400 3765
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (sv)); 3766 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (swapsv)); 3767 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3403 3768
3404 if (current == coro) 3769 if (current == coro)
3405 SWAP_SVS (current); 3770 SWAP_SVS (current);
3406} 3771}
3407 3772
… …
3411BOOT: 3776BOOT:
3412{ 3777{
3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3778 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3779 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3780 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3416 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3417 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3781 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3418 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3782 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3783 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3784 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3785 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3422 3786
3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3787 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3789 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3427 3791
3428 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3429 3793
3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3460 api_ready (aTHX_ RETVAL); 3824 api_ready (aTHX_ RETVAL);
3461 OUTPUT: 3825 OUTPUT:
3462 RETVAL 3826 RETVAL
3463 3827
3464void 3828void
3829_destroy (Coro::State coro)
3830 CODE:
3831 /* used by the manager thread */
3832 coro_state_destroy (aTHX_ coro);
3833
3834void
3835on_destroy (Coro::State coro, SV *cb)
3836 CODE:
3837 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3838
3839void
3840join (...)
3841 CODE:
3842 CORO_EXECUTE_SLF_XS (slf_init_join);
3843
3844void
3465terminate (...) 3845terminate (...)
3466 CODE: 3846 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3847 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3848
3849void
3850cancel (...)
3851 CODE:
3852 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3853
3854int
3855safe_cancel (Coro::State self, ...)
3856 C_ARGS: aTHX_ self, &ST (1), items - 1
3468 3857
3469void 3858void
3470schedule (...) 3859schedule (...)
3471 CODE: 3860 CODE:
3472 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3861 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3629 on_leave = 1 4018 on_leave = 1
3630 PROTOTYPE: & 4019 PROTOTYPE: &
3631 CODE: 4020 CODE:
3632{ 4021{
3633 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3635 4024
3636 block = s_get_cv_croak (block); 4025 block = s_get_cv_croak (block);
3637 4026
3638 if (!*avp) 4027 if (!*avp)
3639 *avp = newAV (); 4028 *avp = newAV ();
… …
3659 4048
3660SV * 4049SV *
3661new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
3662 CODE: 4051 CODE:
3663{ 4052{
3664 int semcnt = 1; 4053 int semcnt = 1;
3665 4054
3666 if (count) 4055 if (count)
3667 { 4056 {
3668 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
3669 4058
… …
3729 XSRETURN_NO; 4118 XSRETURN_NO;
3730} 4119}
3731 4120
3732void 4121void
3733waiters (SV *self) 4122waiters (SV *self)
3734 PPCODE: 4123 PPCODE:
3735{ 4124{
3736 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
3737 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
3738 4127
3739 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
3748} 4137}
3749 4138
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4139MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751 4140
3752void 4141void
3753_may_delete (SV *sem, int count, int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
3754 PPCODE: 4143 PPCODE:
3755{ 4144{
3756 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
3757 4146
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3759 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
3760 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
3761 XSRETURN_YES; 4150 XSRETURN_YES;
… …
3782 4171
3783void 4172void
3784broadcast (SV *self) 4173broadcast (SV *self)
3785 CODE: 4174 CODE:
3786{ 4175{
3787 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
3788 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
3789} 4178}
3790 4179
3791void 4180void
3792send (SV *self) 4181send (SV *self)
… …
3800 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3801} 4190}
3802 4191
3803IV 4192IV
3804awaited (SV *self) 4193awaited (SV *self)
3805 CODE: 4194 CODE:
3806 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3807 OUTPUT: 4196 OUTPUT:
3808 RETVAL 4197 RETVAL
3809 4198
3810 4199
… …
3815 4204
3816void 4205void
3817_schedule (...) 4206_schedule (...)
3818 CODE: 4207 CODE:
3819{ 4208{
3820 static int incede; 4209 static int incede;
3821 4210
3822 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
3823 4212
3824 ++incede; 4213 ++incede;
3825 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
3869 { 4258 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0; 4260 coro_old_pp_sselect = 0;
3872 } 4261 }
3873 4262
4263MODULE = Coro::State PACKAGE = Coro::Util
3874 4264
4265void
4266_exit (int code)
4267 CODE:
4268 _exit (code);
4269
4270NV
4271time ()
4272 CODE:
4273 RETVAL = nvtime (aTHX);
4274 OUTPUT:
4275 RETVAL
4276
4277NV
4278gettimeofday ()
4279 PPCODE:
4280{
4281 UV tv [2];
4282 u2time (aTHX_ tv);
4283 EXTEND (SP, 2);
4284 PUSHs (sv_2mortal (newSVuv (tv [0])));
4285 PUSHs (sv_2mortal (newSVuv (tv [1])));
4286}
4287

Diff Legend

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