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.379 by root, Tue Jul 27 14:50:17 2010 UTC vs.
Revision 1.438 by root, Mon Nov 18 10:27:53 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);
482 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
483 while (j >= 0) 580 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 582
486 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
488 } 586 }
489 587
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
491 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
492 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
494 } 598 }
495} 599}
496 600
497static int 601static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 603{
500 AV *padlist; 604 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
502 607
503 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
505 return 0; 610 return 0;
506 611
507 /* casting is fun. */ 612 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 614
513 return 0; 615 return 0;
514} 616}
515 617
516static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 619 0, 0, 0, 0,
518 coro_cv_free 620 coro_cv_free
519}; 621};
520 622
521/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
522static void 624ecb_inline void
523get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
524{ 626{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 628 size_t *lenp;
527 629
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 632 else
531 { 633 {
532#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 643#endif
542 } 644 }
543} 645}
544 646
545static void 647ecb_inline void
546put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
547{ 649{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 651
551 if (expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
553 662
554 av = (AV *)mg->mg_obj; 663 ((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} 664}
561 665
562/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
563 667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
564/* swap sv heads, at least logically */ 706/* swap sv heads, at least logically */
565static void 707static void
566swap_svs (pTHX_ Coro__State c) 708swap_svs (pTHX_ Coro__State c)
567{ 709{
568 int i; 710 int i;
569 711
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 713 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} 714}
610 715
611#define SWAP_SVS(coro) \ 716#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 717 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 718 swap_svs (aTHX_ (coro))
614 719
615static void 720static void
616on_enterleave_call (pTHX_ SV *cb); 721on_enterleave_call (pTHX_ SV *cb);
617 722
… …
621 perl_slots *slot = c->slot; 726 perl_slots *slot = c->slot;
622 c->slot = 0; 727 c->slot = 0;
623 728
624 PL_mainstack = c->mainstack; 729 PL_mainstack = c->mainstack;
625 730
626 GvSV (PL_defgv) = slot->defsv; 731#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 732 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 733#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 735 #include "state.h"
634 #undef VAR 736#endif
635 737
636 { 738 {
637 dSP; 739 dSP;
638 740
639 CV *cv; 741 CV *cv;
640 742
641 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
643 { 745 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 749 }
648 750
649 PUTBACK; 751 PUTBACK;
650 } 752 }
651 753
652 slf_frame = c->slf_frame; 754 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 755 CORO_THROW = c->except;
654 756
655 if (expect_false (enable_times)) 757 if (ecb_expect_false (enable_times))
656 { 758 {
657 if (expect_false (!times_valid)) 759 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 760 coro_times_update ();
659 761
660 coro_times_sub (c); 762 coro_times_sub (c);
661 } 763 }
662 764
663 if (expect_false (c->on_enter)) 765 if (ecb_expect_false (c->on_enter))
664 { 766 {
665 int i; 767 int i;
666 768
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 769 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 776static void
675save_perl (pTHX_ Coro__State c) 777save_perl (pTHX_ Coro__State c)
676{ 778{
677 SWAP_SVS (c); 779 SWAP_SVS (c);
678 780
679 if (expect_false (c->on_leave)) 781 if (ecb_expect_false (c->on_leave))
680 { 782 {
681 int i; 783 int i;
682 784
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 785 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 786 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 787 }
686 788
687 times_valid = 0; 789 times_valid = 0;
688 790
689 if (expect_false (enable_times)) 791 if (ecb_expect_false (enable_times))
690 { 792 {
691 coro_times_update (); times_valid = 1; 793 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 794 coro_times_add (c);
693 } 795 }
694 796
… …
708 810
709 XPUSHs (Nullsv); 811 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 812 /* this loop was inspired by pp_caller */
711 for (;;) 813 for (;;)
712 { 814 {
713 while (expect_true (cxix >= 0)) 815 while (ecb_expect_true (cxix >= 0))
714 { 816 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 817 PERL_CONTEXT *cx = &ccstk[cxix--];
716 818
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 819 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 820 {
719 CV *cv = cx->blk_sub.cv; 821 CV *cv = cx->blk_sub.cv;
720 822
721 if (expect_true (CvDEPTH (cv))) 823 if (ecb_expect_true (CvDEPTH (cv)))
722 { 824 {
723 EXTEND (SP, 3); 825 EXTEND (SP, 3);
724 PUSHs ((SV *)CvPADLIST (cv)); 826 PUSHs ((SV *)CvPADLIST (cv));
725 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 827 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
726 PUSHs ((SV *)cv); 828 PUSHs ((SV *)cv);
… …
729 get_padlist (aTHX_ cv); 831 get_padlist (aTHX_ cv);
730 } 832 }
731 } 833 }
732 } 834 }
733 835
734 if (expect_true (top_si->si_type == PERLSI_MAIN)) 836 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
735 break; 837 break;
736 838
737 top_si = top_si->si_prev; 839 top_si = top_si->si_prev;
738 ccstk = top_si->si_cxstack; 840 ccstk = top_si->si_cxstack;
739 cxix = top_si->si_cxix; 841 cxix = top_si->si_cxix;
… …
741 843
742 PUTBACK; 844 PUTBACK;
743 } 845 }
744 846
745 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
746 /* we manually unroll here, as usually 2 slots is enough */ 848 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
747 if (SLOT_COUNT >= 1) CXINC;
748 if (SLOT_COUNT >= 2) CXINC;
749 if (SLOT_COUNT >= 3) CXINC;
750 { 849 {
751 unsigned int i; 850 unsigned int i;
851
752 for (i = 3; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
753 CXINC; 853 CXINC;
754 } 854
755 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 855 cxstack_ix -= SLOT_COUNT; /* undo allocation */
856 }
756 857
757 c->mainstack = PL_mainstack; 858 c->mainstack = PL_mainstack;
758 859
759 { 860 {
760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 861 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
761 862
762 slot->defav = GvAV (PL_defgv); 863#if CORO_JIT
763 slot->defsv = DEFSV; 864 save_perl_slots (slot);
764 slot->errsv = ERRSV; 865#else
765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
767
768 #define VAR(name,type) slot->name = PL_ ## name; 866 #define VARx(name,expr,type) slot->name = expr;
769 # include "state.h" 867 #include "state.h"
770 #undef VAR 868#endif
771 } 869 }
772} 870}
773 871
774/* 872/*
775 * allocate various perl stacks. This is almost an exact copy 873 * allocate various perl stacks. This is almost an exact copy
… …
781# define coro_init_stacks(thx) init_stacks () 879# define coro_init_stacks(thx) init_stacks ()
782#else 880#else
783static void 881static void
784coro_init_stacks (pTHX) 882coro_init_stacks (pTHX)
785{ 883{
786 PL_curstackinfo = new_stackinfo(32, 8); 884 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
787 PL_curstackinfo->si_type = PERLSI_MAIN; 885 PL_curstackinfo->si_type = PERLSI_MAIN;
788 PL_curstack = PL_curstackinfo->si_stack; 886 PL_curstack = PL_curstackinfo->si_stack;
789 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 887 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
790 888
791 PL_stack_base = AvARRAY(PL_curstack); 889 PL_stack_base = AvARRAY(PL_curstack);
… …
806#endif 904#endif
807 905
808 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
809 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
810 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
811 912
812 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
813 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
814 PL_savestack_max = 24; 915 PL_savestack_max = 24;
815 916
… …
843 } 944 }
844 945
845 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
846 Safefree (PL_markstack); 947 Safefree (PL_markstack);
847 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
848 Safefree (PL_savestack); 952 Safefree (PL_savestack);
849#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
850 Safefree (PL_retstack); 954 Safefree (PL_retstack);
851#endif 955#endif
852} 956}
… …
898#endif 1002#endif
899 1003
900/* 1004/*
901 * This overrides the default magic get method of %SIG elements. 1005 * This overrides the default magic get method of %SIG elements.
902 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1006 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
903 * and instead of trying to save and restore the hash elements, we just provide 1007 * and instead of trying to save and restore the hash elements (extremely slow),
904 * readback here. 1008 * we just provide our own readback here.
905 */ 1009 */
906static int 1010static int ecb_cold
907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
908{ 1012{
909 const char *s = MgPV_nolen_const (mg); 1013 const char *s = MgPV_nolen_const (mg);
910 1014
911 if (*s == '_') 1015 if (*s == '_')
912 { 1016 {
913 SV **svp = 0; 1017 SV **svp = 0;
914 1018
915 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
916 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
917 1021
918 if (svp) 1022 if (svp)
919 { 1023 {
920 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
921 return 0; 1034 return 0;
922 } 1035 }
923 } 1036 }
924 1037
925 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
926} 1039}
927 1040
928static int 1041static int ecb_cold
929coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
930{ 1043{
931 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
932 1045
933 if (*s == '_') 1046 if (*s == '_')
… …
947 } 1060 }
948 1061
949 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
950} 1063}
951 1064
952static int 1065static int ecb_cold
953coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
954{ 1067{
955 const char *s = MgPV_nolen_const (mg); 1068 const char *s = MgPV_nolen_const (mg);
956 1069
957 if (*s == '_') 1070 if (*s == '_')
… …
992 return 1; 1105 return 1;
993} 1106}
994 1107
995static UNOP init_perl_op; 1108static UNOP init_perl_op;
996 1109
997static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1110ecb_noinline static void /* noinline to keep it out of the transfer fast path */
998init_perl (pTHX_ struct coro *coro) 1111init_perl (pTHX_ struct coro *coro)
999{ 1112{
1000 /* 1113 /*
1001 * emulate part of the perl startup here. 1114 * emulate part of the perl startup here.
1002 */ 1115 */
… …
1010 PL_comppad_name_fill = 0; 1123 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1124 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1125 PL_curpm = 0;
1013 PL_curpad = 0; 1126 PL_curpad = 0;
1014 PL_localizing = 0; 1127 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1128 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1129#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1130 PL_parser = 0;
1019#endif 1131#endif
1020 PL_hints = 0; 1132 PL_hints = 0;
1021 1133
1022 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1025 1137
1026 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
1027 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
1028 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
1050 /* this newly created coroutine might be run on an existing cctx which most 1162 /* this newly created coroutine might be run on an existing cctx which most
1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1163 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1052 */ 1164 */
1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1165 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1166 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1167 slf_frame.destroy = 0;
1055 1168
1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1169 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1057 init_perl_op.op_next = PL_op; 1170 init_perl_op.op_next = PL_op;
1058 init_perl_op.op_type = OP_ENTERSUB; 1171 init_perl_op.op_type = OP_ENTERSUB;
1059 init_perl_op.op_ppaddr = pp_slf; 1172 init_perl_op.op_ppaddr = pp_slf;
… …
1064 /* copy throw, in case it was set before init_perl */ 1177 /* copy throw, in case it was set before init_perl */
1065 CORO_THROW = coro->except; 1178 CORO_THROW = coro->except;
1066 1179
1067 SWAP_SVS (coro); 1180 SWAP_SVS (coro);
1068 1181
1069 if (expect_false (enable_times)) 1182 if (ecb_expect_false (enable_times))
1070 { 1183 {
1071 coro_times_update (); 1184 coro_times_update ();
1072 coro_times_sub (coro); 1185 coro_times_sub (coro);
1073 } 1186 }
1074} 1187}
… …
1098destroy_perl (pTHX_ struct coro *coro) 1211destroy_perl (pTHX_ struct coro *coro)
1099{ 1212{
1100 SV *svf [9]; 1213 SV *svf [9];
1101 1214
1102 { 1215 {
1216 SV *old_current = SvRV (coro_current);
1103 struct coro *current = SvSTATE_current; 1217 struct coro *current = SvSTATE (old_current);
1104 1218
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1219 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1220
1107 save_perl (aTHX_ current); 1221 save_perl (aTHX_ current);
1222
1223 /* this will cause transfer_check to croak on block*/
1224 SvRV_set (coro_current, (SV *)coro->hv);
1225
1108 load_perl (aTHX_ coro); 1226 load_perl (aTHX_ coro);
1109 1227
1110 coro_unwind_stacks (aTHX); 1228 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112 1229
1113 /* restore swapped sv's */ 1230 /* restore swapped sv's */
1114 SWAP_SVS (coro); 1231 SWAP_SVS (coro);
1115 1232
1233 coro_destruct_stacks (aTHX);
1234
1116 // now save some sv's to be free'd later 1235 /* now save some sv's to be free'd later */
1117 svf [0] = GvSV (PL_defgv); 1236 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv); 1237 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv); 1238 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv; 1239 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs; 1240 svf [4] = PL_rs;
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1242 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1243 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1244 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1245 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1246
1247 SvRV_set (coro_current, old_current);
1248
1128 load_perl (aTHX_ current); 1249 load_perl (aTHX_ current);
1129 } 1250 }
1130 1251
1131 { 1252 {
1132 unsigned int i; 1253 unsigned int i;
… …
1139 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1140 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1141 } 1262 }
1142} 1263}
1143 1264
1144INLINE void 1265ecb_inline void
1145free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1146{ 1267{
1147 if (expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1148 { 1269 {
1149 SvREFCNT_dec (coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1271 coro_mortal = 0;
1151 } 1272 }
1152} 1273}
1153 1274
1154static int 1275static int
… …
1287 1408
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1409 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1410}
1290 1411
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1412/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1413static void ecb_noinline
1293cctx_prepare (pTHX) 1414cctx_prepare (pTHX)
1294{ 1415{
1295 PL_top_env = &PL_start_env; 1416 PL_top_env = &PL_start_env;
1296 1417
1297 if (cctx_current->flags & CC_TRACE) 1418 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1310} 1431}
1311 1432
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1434ecb_inline void
1314transfer_tail (pTHX) 1435transfer_tail (pTHX)
1315{ 1436{
1316 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1317} 1450}
1318 1451
1319/* 1452/*
1320 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1321 */ 1454 */
… …
1350 */ 1483 */
1351 1484
1352 /* 1485 /*
1353 * If perl-run returns we assume exit() was being called or the coro 1486 * 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) 1487 * 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 1488 * 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" 1489 * 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 */ 1490 */
1361 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1492 }
1364} 1493}
1365 1494
1366static coro_cctx * 1495static coro_cctx *
1367cctx_new () 1496cctx_new (void)
1368{ 1497{
1369 coro_cctx *cctx; 1498 coro_cctx *cctx;
1370 1499
1371 ++cctx_count; 1500 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1501 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1507 return cctx;
1379} 1508}
1380 1509
1381/* create a new cctx only suitable as source */ 1510/* create a new cctx only suitable as source */
1382static coro_cctx * 1511static coro_cctx *
1383cctx_new_empty () 1512cctx_new_empty (void)
1384{ 1513{
1385 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1386 1515
1387 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1389 1518
1390 return cctx; 1519 return cctx;
1391} 1520}
1392 1521
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1523static coro_cctx *
1395cctx_new_run () 1524cctx_new_run (void)
1396{ 1525{
1397 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1398 void *stack_start;
1399 size_t stack_size;
1400 1527
1401#if HAVE_MMAP 1528 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 } 1529 {
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."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1424 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1425 }
1426
1427 stack_start = cctx->sptr;
1428 stack_size = cctx->ssize;
1429 } 1532 }
1430 1533
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); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1436 1535
1437 return cctx; 1536 return cctx;
1438} 1537}
1439 1538
1440static void 1539static void
1441cctx_destroy (coro_cctx *cctx) 1540cctx_destroy (coro_cctx *cctx)
1442{ 1541{
1443 if (!cctx) 1542 if (!cctx)
1444 return; 1543 return;
1445 1544
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1546
1448 --cctx_count; 1547 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1450 1549
1451 /* coro_transfer creates new, empty cctx's */ 1550 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 1551
1466 Safefree (cctx); 1552 Safefree (cctx);
1467} 1553}
1468 1554
1469/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1556#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1557
1472static coro_cctx * 1558static coro_cctx *
1473cctx_get (pTHX) 1559cctx_get (pTHX)
1474{ 1560{
1475 while (expect_true (cctx_first)) 1561 while (ecb_expect_true (cctx_first))
1476 { 1562 {
1477 coro_cctx *cctx = cctx_first; 1563 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1564 cctx_first = cctx->next;
1479 --cctx_idle; 1565 --cctx_idle;
1480 1566
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1567 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1568 return cctx;
1483 1569
1484 cctx_destroy (cctx); 1570 cctx_destroy (cctx);
1485 } 1571 }
1486 1572
… …
1488} 1574}
1489 1575
1490static void 1576static void
1491cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1492{ 1578{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1494 1580
1495 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1583 {
1498 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1585 cctx_first = first->next;
1500 --cctx_idle; 1586 --cctx_idle;
1501 1587
… …
1512static void 1598static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1599transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1600{
1515 /* TODO: throwing up here is considered harmful */ 1601 /* TODO: throwing up here is considered harmful */
1516 1602
1517 if (expect_true (prev != next)) 1603 if (ecb_expect_true (prev != next))
1518 { 1604 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1605 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,"); 1606 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1607
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1608 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,"); 1609 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1610
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1611#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1612 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,"); 1613 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1614#endif
1529 } 1615 }
1530} 1616}
1531 1617
1532/* always use the TRANSFER macro */ 1618/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1619static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1620transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1621{
1536 dSTACKLEVEL; 1622 dSTACKLEVEL;
1537 1623
1538 /* sometimes transfer is only called to set idle_sp */ 1624 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1625 if (ecb_expect_false (!prev))
1540 { 1626 {
1541 cctx_current->idle_sp = STACKLEVEL; 1627 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1628 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1629 }
1544 else if (expect_true (prev != next)) 1630 else if (ecb_expect_true (prev != next))
1545 { 1631 {
1546 coro_cctx *cctx_prev; 1632 coro_cctx *cctx_prev;
1547 1633
1548 if (expect_false (prev->flags & CF_NEW)) 1634 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1635 {
1550 /* create a new empty/source context */ 1636 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1637 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1638 prev->flags |= CF_RUNNING;
1553 } 1639 }
… …
1556 next->flags |= CF_RUNNING; 1642 next->flags |= CF_RUNNING;
1557 1643
1558 /* first get rid of the old state */ 1644 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1645 save_perl (aTHX_ prev);
1560 1646
1561 if (expect_false (next->flags & CF_NEW)) 1647 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1648 {
1563 /* need to start coroutine */ 1649 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1650 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1651 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1652 init_perl (aTHX_ next);
1567 } 1653 }
1568 else 1654 else
1569 load_perl (aTHX_ next); 1655 load_perl (aTHX_ next);
1570 1656
1571 /* possibly untie and reuse the cctx */ 1657 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1658 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1659 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1660 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1661 && !force_cctx
1576 )) 1662 ))
1577 { 1663 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1664 /* 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)); 1665 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1666
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1667 /* 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 */ 1668 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1669 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1670 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1671 next->cctx = cctx_get (aTHX);
1586 1672
1587 cctx_put (cctx_current); 1673 cctx_put (cctx_current);
1588 } 1674 }
1589 else 1675 else
1590 prev->cctx = cctx_current; 1676 prev->cctx = cctx_current;
1591 1677
1592 ++next->usecount; 1678 ++next->usecount;
1593 1679
1594 cctx_prev = cctx_current; 1680 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1681 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1682
1597 next->cctx = 0; 1683 next->cctx = 0;
1598 1684
1599 if (expect_false (cctx_prev != cctx_current)) 1685 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1686 {
1601 cctx_prev->top_env = PL_top_env; 1687 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1688 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1689 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1690 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1696#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) 1697#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1698
1613/** high level stuff ********************************************************/ 1699/** high level stuff ********************************************************/
1614 1700
1701/* this function is actually Coro, not Coro::State, but we call it from here */
1702/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1703static void
1704coro_call_on_destroy (pTHX_ struct coro *coro);
1705
1706static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1707coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1708{
1618 if (coro->flags & CF_DESTROYED) 1709 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1710 return;
1620 1711
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1623 1713
1624 coro->flags |= CF_DESTROYED; 1714 coro->flags |= CF_ZOMBIE;
1625 1715
1626 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1627 { 1717 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1720 --coro_nready;
1631 } 1721 }
1632 else 1722 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1723 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1724
1725 if (coro->next) coro->next->prev = coro->prev;
1726 if (coro->prev) coro->prev->next = coro->next;
1727 if (coro == coro_first) coro_first = coro->next;
1634 1728
1635 if (coro->mainstack 1729 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1730 && coro->mainstack != main_mainstack
1637 && coro->slot 1731 && coro->slot
1638 && !PL_dirty) 1732 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1733 destroy_perl (aTHX_ coro);
1640 1734
1641 if (coro->next) coro->next->prev = coro->prev;
1642 if (coro->prev) coro->prev->next = coro->next;
1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx); 1735 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1736 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1737 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1738 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1739 SvREFCNT_dec (CORO_THROW);
1650 1740
1651 return 1; 1741 coro_call_on_destroy (aTHX_ coro);
1742
1743 /* more destruction mayhem in coro_state_free */
1652} 1744}
1653 1745
1654static int 1746static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1747coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1748{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1749 struct coro *coro = (struct coro *)mg->mg_ptr;
1658 mg->mg_ptr = 0; 1750 mg->mg_ptr = 0;
1659 1751
1660 coro->hv = 0;
1661
1662 if (--coro->refcnt < 0)
1663 {
1664 coro_state_destroy (aTHX_ coro); 1752 coro_state_destroy (aTHX_ coro);
1753 SvREFCNT_dec (coro->on_destroy);
1754 SvREFCNT_dec (coro->status);
1755
1665 Safefree (coro); 1756 Safefree (coro);
1666 }
1667 1757
1668 return 0; 1758 return 0;
1669} 1759}
1670 1760
1671static int 1761static int ecb_cold
1672coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1762coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1673{ 1763{
1674 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 /* called when perl clones the current process the slow way (windows process emulation) */
1675 1765 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1676 ++coro->refcnt; 1766 mg->mg_ptr = 0;
1767 mg->mg_virtual = 0;
1677 1768
1678 return 0; 1769 return 0;
1679} 1770}
1680 1771
1681static MGVTBL coro_state_vtbl = { 1772static MGVTBL coro_state_vtbl = {
… …
1706 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1707} 1798}
1708 1799
1709/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1710 1801
1711INLINE void 1802ecb_inline void
1712coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1713{ 1804{
1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1715 1806
1716 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1718 coro->next_ready = 0; 1809 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro; 1811 ready [1] = coro;
1721} 1812}
1722 1813
1723INLINE struct coro * 1814ecb_inline struct coro *
1724coro_deq (pTHX) 1815coro_deq (pTHX)
1725{ 1816{
1726 int prio; 1817 int prio;
1727 1818
1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1781{ 1872{
1782 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1783} 1874}
1784 1875
1785/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1786INLINE void 1877ecb_inline void
1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1788{ 1879{
1789 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1790 1881
1791 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1804{ 1895{
1805 for (;;) 1896 for (;;)
1806 { 1897 {
1807 struct coro *next = coro_deq (aTHX); 1898 struct coro *next = coro_deq (aTHX);
1808 1899
1809 if (expect_true (next)) 1900 if (ecb_expect_true (next))
1810 { 1901 {
1811 /* cannot transfer to destroyed coros, skip and look for next */ 1902 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1903 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1904 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else 1905 else
1815 { 1906 {
1816 next->flags &= ~CF_READY; 1907 next->flags &= ~CF_READY;
1817 --coro_nready; 1908 --coro_nready;
… …
1850 } 1941 }
1851 } 1942 }
1852 } 1943 }
1853} 1944}
1854 1945
1855INLINE void 1946ecb_inline void
1856prepare_cede (pTHX_ struct coro_transfer_args *ta) 1947prepare_cede (pTHX_ struct coro_transfer_args *ta)
1857{ 1948{
1858 api_ready (aTHX_ coro_current); 1949 api_ready (aTHX_ coro_current);
1859 prepare_schedule (aTHX_ ta); 1950 prepare_schedule (aTHX_ ta);
1860} 1951}
1861 1952
1862INLINE void 1953ecb_inline void
1863prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1954prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1864{ 1955{
1865 SV *prev = SvRV (coro_current); 1956 SV *prev = SvRV (coro_current);
1866 1957
1867 if (coro_nready) 1958 if (coro_nready)
… …
1897{ 1988{
1898 struct coro_transfer_args ta; 1989 struct coro_transfer_args ta;
1899 1990
1900 prepare_cede (aTHX_ &ta); 1991 prepare_cede (aTHX_ &ta);
1901 1992
1902 if (expect_true (ta.prev != ta.next)) 1993 if (ecb_expect_true (ta.prev != ta.next))
1903 { 1994 {
1904 TRANSFER (ta, 1); 1995 TRANSFER (ta, 1);
1905 return 1; 1996 return 1;
1906 } 1997 }
1907 else 1998 else
… …
1950 coro->slot->runops = RUNOPS_DEFAULT; 2041 coro->slot->runops = RUNOPS_DEFAULT;
1951 } 2042 }
1952} 2043}
1953 2044
1954static void 2045static void
2046coro_push_av (pTHX_ AV *av, I32 gimme_v)
2047{
2048 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2049 {
2050 dSP;
2051
2052 if (gimme_v == G_SCALAR)
2053 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2054 else
2055 {
2056 int i;
2057 EXTEND (SP, AvFILLp (av) + 1);
2058
2059 for (i = 0; i <= AvFILLp (av); ++i)
2060 PUSHs (AvARRAY (av)[i]);
2061 }
2062
2063 PUTBACK;
2064 }
2065}
2066
2067static void
2068coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2069{
2070 if (!coro->on_destroy)
2071 coro->on_destroy = newAV ();
2072
2073 av_push (coro->on_destroy, cb);
2074}
2075
2076static void
2077slf_destroy_join (pTHX_ struct CoroSLF *frame)
2078{
2079 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2080}
2081
2082static int
2083slf_check_join (pTHX_ struct CoroSLF *frame)
2084{
2085 struct coro *coro = (struct coro *)frame->data;
2086
2087 if (!coro->status)
2088 return 1;
2089
2090 frame->destroy = 0;
2091
2092 coro_push_av (aTHX_ coro->status, GIMME_V);
2093
2094 SvREFCNT_dec ((SV *)coro->hv);
2095
2096 return 0;
2097}
2098
2099static void
2100slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2101{
2102 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2103
2104 if (items > 1)
2105 croak ("join called with too many arguments");
2106
2107 if (coro->status)
2108 frame->prepare = prepare_nop;
2109 else
2110 {
2111 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2112 frame->prepare = prepare_schedule;
2113 }
2114
2115 frame->check = slf_check_join;
2116 frame->destroy = slf_destroy_join;
2117 frame->data = (void *)coro;
2118 SvREFCNT_inc (coro->hv);
2119}
2120
2121static void
1955coro_call_on_destroy (pTHX_ struct coro *coro) 2122coro_call_on_destroy (pTHX_ struct coro *coro)
1956{ 2123{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2124 AV *od = coro->on_destroy;
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959 2125
1960 if (on_destroyp) 2126 if (!od)
1961 { 2127 return;
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1963 2128
2129 coro->on_destroy = 0;
2130 sv_2mortal ((SV *)od);
2131
1964 while (AvFILLp (on_destroy) >= 0) 2132 while (AvFILLp (od) >= 0)
2133 {
2134 SV *cb = sv_2mortal (av_pop (od));
2135
2136 /* coro hv's (and only hv's at the moment) are supported as well */
2137 if (SvSTATEhv_p (aTHX_ cb))
2138 api_ready (aTHX_ cb);
2139 else
1965 { 2140 {
1966 dSP; /* don't disturb outer sp */ 2141 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy);
1968
1969 PUSHMARK (SP); 2142 PUSHMARK (SP);
1970 2143
1971 if (statusp) 2144 if (coro->status)
1972 { 2145 {
1973 int i; 2146 PUTBACK;
1974 AV *status = (AV *)SvRV (*statusp); 2147 coro_push_av (aTHX_ coro->status, G_ARRAY);
1975 EXTEND (SP, AvFILLp (status) + 1); 2148 SPAGAIN;
1976
1977 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]);
1979 } 2149 }
1980 2150
1981 PUTBACK; 2151 PUTBACK;
1982 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2152 call_sv (cb, G_VOID | G_DISCARD);
1983 } 2153 }
1984 } 2154 }
1985} 2155}
1986 2156
1987static void 2157static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2158coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1989{ 2159{
1990 int i; 2160 AV *av;
1991 HV *hv = (HV *)SvRV (coro_current); 2161
1992 AV *av = newAV (); 2162 if (coro->status)
2163 {
2164 av = coro->status;
2165 av_clear (av);
2166 }
2167 else
2168 av = coro->status = newAV ();
1993 2169
1994 /* items are actually not so common, so optimise for this case */ 2170 /* items are actually not so common, so optimise for this case */
1995 if (items) 2171 if (items)
1996 { 2172 {
2173 int i;
2174
1997 av_extend (av, items - 1); 2175 av_extend (av, items - 1);
1998 2176
1999 for (i = 0; i < items; ++i) 2177 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i])); 2178 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 } 2179 }
2180}
2002 2181
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2182static void
2004 2183slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2184{
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2185 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager); 2186 api_ready (aTHX_ sv_manager);
2007 2187
2008 frame->prepare = prepare_schedule; 2188 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat; 2189 frame->check = slf_check_repeat;
2010 2190
2011 /* as a minor optimisation, we could unwind all stacks here */ 2191 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */ 2192 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/ 2193 /*coro_unwind_stacks (aTHX);*/
2194}
2195
2196static void
2197slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{
2199 HV *coro_hv = (HV *)SvRV (coro_current);
2200
2201 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2202 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203}
2204
2205static void
2206slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2207{
2208 HV *coro_hv;
2209 struct coro *coro;
2210
2211 if (items <= 0)
2212 croak ("Coro::cancel called without coro object,");
2213
2214 coro = SvSTATE (arg [0]);
2215 coro_hv = coro->hv;
2216
2217 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2218
2219 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2220 {
2221 /* coro currently busy cancelling something, so just notify it */
2222 coro->slf_frame.data = (void *)coro;
2223
2224 frame->prepare = prepare_nop;
2225 frame->check = slf_check_nop;
2226 }
2227 else if (coro_hv == (HV *)SvRV (coro_current))
2228 {
2229 /* cancelling the current coro is allowed, and equals terminate */
2230 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2231 }
2232 else
2233 {
2234 struct coro *self = SvSTATE_current;
2235
2236 /* otherwise we cancel directly, purely for speed reasons
2237 * unfortunately, this requires some magic trickery, as
2238 * somebody else could cancel us, so we have to fight the cancellation.
2239 * this is ugly, and hopefully fully worth the extra speed.
2240 * besides, I can't get the slow-but-safe version working...
2241 */
2242 slf_frame.data = 0;
2243 self->flags |= CF_NOCANCEL;
2244 coro_state_destroy (aTHX_ coro);
2245 self->flags &= ~CF_NOCANCEL;
2246
2247 if (slf_frame.data)
2248 {
2249 /* while we were busy we have been cancelled, so terminate */
2250 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2251 }
2252 else
2253 {
2254 frame->prepare = prepare_nop;
2255 frame->check = slf_check_nop;
2256 }
2257 }
2258}
2259
2260static int
2261slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2262{
2263 frame->prepare = 0;
2264 coro_unwind_stacks (aTHX);
2265
2266 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2267
2268 return 1;
2269}
2270
2271static int
2272safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2273{
2274 if (coro->cctx)
2275 croak ("coro inside C callback, unable to cancel at this time, caught");
2276
2277 if (coro->flags & CF_NEW)
2278 {
2279 coro_set_status (aTHX_ coro, arg, items);
2280 coro_state_destroy (aTHX_ coro);
2281 }
2282 else
2283 {
2284 if (!coro->slf_frame.prepare)
2285 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2286
2287 slf_destroy (aTHX_ coro);
2288
2289 coro_set_status (aTHX_ coro, arg, items);
2290 coro->slf_frame.prepare = prepare_nop;
2291 coro->slf_frame.check = slf_check_safe_cancel;
2292
2293 api_ready (aTHX_ (SV *)coro->hv);
2294 }
2295
2296 return 1;
2014} 2297}
2015 2298
2016/*****************************************************************************/ 2299/*****************************************************************************/
2017/* async pool handler */ 2300/* async pool handler */
2018 2301
… …
2049slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2332slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2050{ 2333{
2051 HV *hv = (HV *)SvRV (coro_current); 2334 HV *hv = (HV *)SvRV (coro_current);
2052 struct coro *coro = SvSTATE_hv ((SV *)hv); 2335 struct coro *coro = SvSTATE_hv ((SV *)hv);
2053 2336
2054 if (expect_true (coro->saved_deffh)) 2337 if (ecb_expect_true (coro->saved_deffh))
2055 { 2338 {
2056 /* subsequent iteration */ 2339 /* subsequent iteration */
2057 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2340 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2058 coro->saved_deffh = 0; 2341 coro->saved_deffh = 0;
2059 2342
2060 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2343 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2061 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2344 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2062 { 2345 {
2063 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2346 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2064 coro->invoke_av = newAV (); 2347 return;
2065
2066 frame->prepare = prepare_nop;
2067 } 2348 }
2068 else 2349 else
2069 { 2350 {
2070 av_clear (GvAV (PL_defgv)); 2351 av_clear (GvAV (PL_defgv));
2071 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2352 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2121 2402
2122static int 2403static int
2123slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2404slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2124{ 2405{
2125 SV *data = (SV *)frame->data; 2406 SV *data = (SV *)frame->data;
2126 2407
2127 if (CORO_THROW) 2408 if (CORO_THROW)
2128 return 0; 2409 return 0;
2129 2410
2130 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2411 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2131 return 1; 2412 return 1;
… …
2167 cb = sv_2mortal (coro->rouse_cb); 2448 cb = sv_2mortal (coro->rouse_cb);
2168 coro->rouse_cb = 0; 2449 coro->rouse_cb = 0;
2169 } 2450 }
2170 2451
2171 if (!SvROK (cb) 2452 if (!SvROK (cb)
2172 || SvTYPE (SvRV (cb)) != SVt_PVCV 2453 || SvTYPE (SvRV (cb)) != SVt_PVCV
2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2454 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2174 croak ("Coro::rouse_wait called with illegal callback argument,"); 2455 croak ("Coro::rouse_wait called with illegal callback argument,");
2175 2456
2176 { 2457 {
2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2458 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2294static void 2575static void
2295slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2576slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2296{ 2577{
2297 frame->prepare = prepare_cede_notself; 2578 frame->prepare = prepare_cede_notself;
2298 frame->check = slf_check_nop; 2579 frame->check = slf_check_nop;
2580}
2581
2582/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2583static void
2584slf_destroy (pTHX_ struct coro *coro)
2585{
2586 /* this callback is reserved for slf functions needing to do cleanup */
2587 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2588 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2589
2590 /*
2591 * The on_destroy above most likely is from an SLF call.
2592 * Since by definition the SLF call will not finish when we destroy
2593 * the coro, we will have to force-finish it here, otherwise
2594 * cleanup functions cannot call SLF functions.
2595 */
2596 coro->slf_frame.prepare = 0;
2299} 2597}
2300 2598
2301/* 2599/*
2302 * these not obviously related functions are all rolled into one 2600 * these not obviously related functions are all rolled into one
2303 * function to increase chances that they all will call transfer with the same 2601 * function to increase chances that they all will call transfer with the same
… …
2310 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2608 I32 checkmark; /* mark SP to see how many elements check has pushed */
2311 2609
2312 /* set up the slf frame, unless it has already been set-up */ 2610 /* set up the slf frame, unless it has already been set-up */
2313 /* the latter happens when a new coro has been started */ 2611 /* the latter happens when a new coro has been started */
2314 /* or when a new cctx was attached to an existing coroutine */ 2612 /* or when a new cctx was attached to an existing coroutine */
2315 if (expect_true (!slf_frame.prepare)) 2613 if (ecb_expect_true (!slf_frame.prepare))
2316 { 2614 {
2317 /* first iteration */ 2615 /* first iteration */
2318 dSP; 2616 dSP;
2319 SV **arg = PL_stack_base + TOPMARK + 1; 2617 SV **arg = PL_stack_base + TOPMARK + 1;
2320 int items = SP - arg; /* args without function object */ 2618 int items = SP - arg; /* args without function object */
… …
2361 while (slf_frame.check (aTHX_ &slf_frame)); 2659 while (slf_frame.check (aTHX_ &slf_frame));
2362 2660
2363 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2661 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2364 2662
2365 /* exception handling */ 2663 /* exception handling */
2366 if (expect_false (CORO_THROW)) 2664 if (ecb_expect_false (CORO_THROW))
2367 { 2665 {
2368 SV *exception = sv_2mortal (CORO_THROW); 2666 SV *exception = sv_2mortal (CORO_THROW);
2369 2667
2370 CORO_THROW = 0; 2668 CORO_THROW = 0;
2371 sv_setsv (ERRSV, exception); 2669 sv_setsv (ERRSV, exception);
2372 croak (0); 2670 croak (0);
2373 } 2671 }
2374 2672
2375 /* return value handling - mostly like entersub */ 2673 /* return value handling - mostly like entersub */
2376 /* make sure we put something on the stack in scalar context */ 2674 /* make sure we put something on the stack in scalar context */
2377 if (GIMME_V == G_SCALAR) 2675 if (GIMME_V == G_SCALAR
2676 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2378 { 2677 {
2379 dSP; 2678 dSP;
2380 SV **bot = PL_stack_base + checkmark; 2679 SV **bot = PL_stack_base + checkmark;
2381 2680
2382 if (sp == bot) /* too few, push undef */ 2681 if (sp == bot) /* too few, push undef */
2383 bot [1] = &PL_sv_undef; 2682 bot [1] = &PL_sv_undef;
2384 else if (sp != bot + 1) /* too many, take last one */ 2683 else /* too many, take last one */
2385 bot [1] = *sp; 2684 bot [1] = *sp;
2386 2685
2387 SP = bot + 1; 2686 SP = bot + 1;
2388 2687
2389 PUTBACK; 2688 PUTBACK;
… …
2496{ 2795{
2497 PerlIOBuf base; 2796 PerlIOBuf base;
2498 NV next, every; 2797 NV next, every;
2499} PerlIOCede; 2798} PerlIOCede;
2500 2799
2501static IV 2800static IV ecb_cold
2502PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2801PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2503{ 2802{
2504 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2505 2804
2506 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2805 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2507 self->next = nvtime () + self->every; 2806 self->next = nvtime () + self->every;
2508 2807
2509 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2808 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2510} 2809}
2511 2810
2512static SV * 2811static SV * ecb_cold
2513PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2812PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2514{ 2813{
2515 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2814 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2516 2815
2517 return newSVnv (self->every); 2816 return newSVnv (self->every);
… …
2629 SvREFCNT_dec (cb); 2928 SvREFCNT_dec (cb);
2630 } 2929 }
2631} 2930}
2632 2931
2633static void 2932static void
2634coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2933coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2635{ 2934{
2636 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2935 /* call $sem->adjust (0) to possibly wake up some other waiters */
2637 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2936 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2638} 2937}
2639 2938
2640static int 2939static int
2641slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2940slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2642{ 2941{
2643 AV *av = (AV *)frame->data; 2942 AV *av = (AV *)frame->data;
2644 SV *count_sv = AvARRAY (av)[0]; 2943 SV *count_sv = AvARRAY (av)[0];
2944 SV *coro_hv = SvRV (coro_current);
2645 2945
2646 /* if we are about to throw, don't actually acquire the lock, just throw */ 2946 /* if we are about to throw, don't actually acquire the lock, just throw */
2647 if (CORO_THROW) 2947 if (CORO_THROW)
2648 return 0; 2948 return 0;
2649 else if (SvIVX (count_sv) > 0) 2949 else if (SvIVX (count_sv) > 0)
2650 { 2950 {
2651 SvSTATE_current->on_destroy = 0; 2951 frame->destroy = 0;
2652 2952
2653 if (acquire) 2953 if (acquire)
2654 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2954 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2655 else 2955 else
2656 coro_semaphore_adjust (aTHX_ av, 0); 2956 coro_semaphore_adjust (aTHX_ av, 0);
… …
2661 { 2961 {
2662 int i; 2962 int i;
2663 /* if we were woken up but can't down, we look through the whole */ 2963 /* if we were woken up but can't down, we look through the whole */
2664 /* waiters list and only add us if we aren't in there already */ 2964 /* waiters list and only add us if we aren't in there already */
2665 /* this avoids some degenerate memory usage cases */ 2965 /* this avoids some degenerate memory usage cases */
2666 2966 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2667 for (i = 1; i <= AvFILLp (av); ++i)
2668 if (AvARRAY (av)[i] == SvRV (coro_current)) 2967 if (AvARRAY (av)[i] == coro_hv)
2669 return 1; 2968 return 1;
2670 2969
2671 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2970 av_push (av, SvREFCNT_inc (coro_hv));
2672 return 1; 2971 return 1;
2673 } 2972 }
2674} 2973}
2675 2974
2676static int 2975static int
… …
2699 { 2998 {
2700 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2999 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2701 3000
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3001 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2703 frame->prepare = prepare_schedule; 3002 frame->prepare = prepare_schedule;
2704
2705 /* to avoid race conditions when a woken-up coro gets terminated */ 3003 /* to avoid race conditions when a woken-up coro gets terminated */
2706 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3004 /* we arrange for a temporary on_destroy that calls adjust (0) */
2707 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3005 frame->destroy = coro_semaphore_destroy;
2708 } 3006 }
2709} 3007}
2710 3008
2711static void 3009static void
2712slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3010slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2794 { 3092 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]); 3093 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3094 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797 3095
2798 if (SvIVX (AvARRAY (av)[0])) 3096 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3097 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2800 3098
2801 frame->prepare = prepare_nop; 3099 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop; 3100 frame->check = slf_check_nop;
2803 } 3101 }
2804 else if (SvIVX (AvARRAY (av)[0])) 3102 else if (SvIVX (AvARRAY (av)[0]))
… …
2881 /* it quickly returns */ 3179 /* it quickly returns */
2882 if (CORO_THROW) 3180 if (CORO_THROW)
2883 return 0; 3181 return 0;
2884 3182
2885 /* one element that is an RV? repeat! */ 3183 /* one element that is an RV? repeat! */
2886 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3184 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2887 return 1; 3185 return 1;
2888 3186
2889 /* restore status */ 3187 /* restore status */
2890 { 3188 {
2891 SV *data_sv = av_pop (state); 3189 SV *data_sv = av_pop (state);
… …
2930 dSP; 3228 dSP;
2931 3229
2932 static SV *prio_cv; 3230 static SV *prio_cv;
2933 static SV *prio_sv; 3231 static SV *prio_sv;
2934 3232
2935 if (expect_false (!prio_cv)) 3233 if (ecb_expect_false (!prio_cv))
2936 { 3234 {
2937 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3235 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2938 prio_sv = newSViv (0); 3236 prio_sv = newSViv (0);
2939 } 3237 }
2940 3238
… …
2966 /* now call the AIO function - we assume our request is uncancelable */ 3264 /* now call the AIO function - we assume our request is uncancelable */
2967 PUTBACK; 3265 PUTBACK;
2968 call_sv ((SV *)req, G_VOID | G_DISCARD); 3266 call_sv ((SV *)req, G_VOID | G_DISCARD);
2969 } 3267 }
2970 3268
2971 /* now that the requets is going, we loop toll we have a result */ 3269 /* now that the request is going, we loop till we have a result */
2972 frame->data = (void *)state; 3270 frame->data = (void *)state;
2973 frame->prepare = prepare_schedule; 3271 frame->prepare = prepare_schedule;
2974 frame->check = slf_check_aio_req; 3272 frame->check = slf_check_aio_req;
2975} 3273}
2976 3274
… …
3046 } 3344 }
3047 3345
3048 return coro_sv; 3346 return coro_sv;
3049} 3347}
3050 3348
3349#ifndef __cplusplus
3350ecb_cold XS(boot_Coro__State);
3351#endif
3352
3353#if CORO_JIT
3354
3355static void ecb_noinline ecb_cold
3356pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3357{
3358 dSP;
3359 AV *av = newAV ();
3360
3361 av_store (av, 3, newSVuv (d));
3362 av_store (av, 2, newSVuv (c));
3363 av_store (av, 1, newSVuv (b));
3364 av_store (av, 0, newSVuv (a));
3365
3366 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3367
3368 PUTBACK;
3369}
3370
3371static void ecb_noinline ecb_cold
3372jit_init (pTHX)
3373{
3374 dSP;
3375 SV *load, *save;
3376 char *map_base;
3377 char *load_ptr, *save_ptr;
3378 STRLEN load_len, save_len, map_len;
3379 int count;
3380
3381 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3382
3383 PUSHMARK (SP);
3384 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3385 #include "state.h"
3386 count = call_pv ("Coro::State::_jit", G_ARRAY);
3387 SPAGAIN;
3388
3389 save = POPs; save_ptr = SvPVbyte (save, save_len);
3390 load = POPs; load_ptr = SvPVbyte (load, load_len);
3391
3392 map_len = load_len + save_len + 16;
3393
3394 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3395
3396 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3397
3398 load_perl_slots = (load_save_perl_slots_type)map_base;
3399 memcpy (map_base, load_ptr, load_len);
3400
3401 map_base += (load_len + 15) & ~15;
3402
3403 save_perl_slots = (load_save_perl_slots_type)map_base;
3404 memcpy (map_base, save_ptr, save_len);
3405
3406 /* we are good citizens and try to make the page read-only, so the evil evil */
3407 /* hackers might have it a bit more difficult */
3408 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3409
3410 PUTBACK;
3411 eval_pv ("undef &Coro::State::_jit", 1);
3412}
3413
3414#endif
3415
3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3416MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3052 3417
3053PROTOTYPES: DISABLE 3418PROTOTYPES: DISABLE
3054 3419
3055BOOT: 3420BOOT:
… …
3057#ifdef USE_ITHREADS 3422#ifdef USE_ITHREADS
3058# if CORO_PTHREAD 3423# if CORO_PTHREAD
3059 coro_thx = PERL_GET_CONTEXT; 3424 coro_thx = PERL_GET_CONTEXT;
3060# endif 3425# endif
3061#endif 3426#endif
3062 BOOT_PAGESIZE; 3427 /* perl defines these to check for existance first, but why it doesn't */
3428 /* just create them one at init time is not clear to me, except for */
3429 /* programs trying to delete them, but... */
3430 /* anyway, we declare this as invalid and make sure they are initialised here */
3431 DEFSV;
3432 ERRSV;
3063 3433
3064 cctx_current = cctx_new_empty (); 3434 cctx_current = cctx_new_empty ();
3065 3435
3066 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3436 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3067 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3437 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3107 coroapi.prepare_nop = prepare_nop; 3477 coroapi.prepare_nop = prepare_nop;
3108 coroapi.prepare_schedule = prepare_schedule; 3478 coroapi.prepare_schedule = prepare_schedule;
3109 coroapi.prepare_cede = prepare_cede; 3479 coroapi.prepare_cede = prepare_cede;
3110 coroapi.prepare_cede_notself = prepare_cede_notself; 3480 coroapi.prepare_cede_notself = prepare_cede_notself;
3111 3481
3112 { 3482 time_init (aTHX);
3113 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3114
3115 if (!svp) croak ("Time::HiRes is required");
3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3117
3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3122 }
3123 3483
3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3484 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3485#if CORO_JIT
3486 PUTBACK;
3487 jit_init (aTHX);
3488 SPAGAIN;
3489#endif
3125} 3490}
3126 3491
3127SV * 3492SV *
3128new (SV *klass, ...) 3493new (SV *klass, ...)
3129 ALIAS: 3494 ALIAS:
… …
3136void 3501void
3137transfer (...) 3502transfer (...)
3138 PROTOTYPE: $$ 3503 PROTOTYPE: $$
3139 CODE: 3504 CODE:
3140 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3505 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3141
3142bool
3143_destroy (SV *coro_sv)
3144 CODE:
3145 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3146 OUTPUT:
3147 RETVAL
3148
3149void
3150_exit (int code)
3151 PROTOTYPE: $
3152 CODE:
3153 _exit (code);
3154 3506
3155SV * 3507SV *
3156clone (Coro::State coro) 3508clone (Coro::State coro)
3157 CODE: 3509 CODE:
3158{ 3510{
… …
3213void 3565void
3214list () 3566list ()
3215 PROTOTYPE: 3567 PROTOTYPE:
3216 PPCODE: 3568 PPCODE:
3217{ 3569{
3218 struct coro *coro; 3570 struct coro *coro;
3219 for (coro = coro_first; coro; coro = coro->next) 3571 for (coro = coro_first; coro; coro = coro->next)
3220 if (coro->hv) 3572 if (coro->hv)
3221 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3222} 3574}
3223 3575
… …
3228 CODE: 3580 CODE:
3229{ 3581{
3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3582 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3231 { 3583 {
3232 struct coro *current = SvSTATE_current; 3584 struct coro *current = SvSTATE_current;
3585 struct CoroSLF slf_save;
3233 3586
3234 if (current != coro) 3587 if (current != coro)
3235 { 3588 {
3236 PUTBACK; 3589 PUTBACK;
3237 save_perl (aTHX_ current); 3590 save_perl (aTHX_ current);
3238 load_perl (aTHX_ coro); 3591 load_perl (aTHX_ coro);
3592 /* the coro is most likely in an active SLF call.
3593 * while not strictly required (the code we execute is
3594 * not allowed to call any SLF functions), it's cleaner
3595 * to reinitialise the slf_frame and restore it later.
3596 * This might one day allow us to actually do SLF calls
3597 * from code executed here.
3598 */
3599 slf_save = slf_frame;
3600 slf_frame.prepare = 0;
3239 SPAGAIN; 3601 SPAGAIN;
3240 } 3602 }
3241 3603
3242 PUSHSTACK; 3604 PUSHSTACK;
3243 3605
… …
3253 SPAGAIN; 3615 SPAGAIN;
3254 3616
3255 if (current != coro) 3617 if (current != coro)
3256 { 3618 {
3257 PUTBACK; 3619 PUTBACK;
3620 slf_frame = slf_save;
3258 save_perl (aTHX_ coro); 3621 save_perl (aTHX_ coro);
3259 load_perl (aTHX_ current); 3622 load_perl (aTHX_ current);
3260 SPAGAIN; 3623 SPAGAIN;
3261 } 3624 }
3262 } 3625 }
… …
3267 PROTOTYPE: $ 3630 PROTOTYPE: $
3268 ALIAS: 3631 ALIAS:
3269 is_ready = CF_READY 3632 is_ready = CF_READY
3270 is_running = CF_RUNNING 3633 is_running = CF_RUNNING
3271 is_new = CF_NEW 3634 is_new = CF_NEW
3272 is_destroyed = CF_DESTROYED 3635 is_destroyed = CF_ZOMBIE
3636 is_zombie = CF_ZOMBIE
3273 is_suspended = CF_SUSPENDED 3637 is_suspended = CF_SUSPENDED
3274 CODE: 3638 CODE:
3275 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3276 OUTPUT: 3640 OUTPUT:
3277 RETVAL 3641 RETVAL
3278 3642
3279void 3643void
3280throw (Coro::State self, SV *exception = &PL_sv_undef) 3644throw (SV *self, SV *exception = &PL_sv_undef)
3281 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3282 CODE: 3646 CODE:
3283{ 3647{
3648 struct coro *coro = SvSTATE (self);
3284 struct coro *current = SvSTATE_current; 3649 struct coro *current = SvSTATE_current;
3285 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3650 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3286 SvREFCNT_dec (*exceptionp); 3651 SvREFCNT_dec (*exceptionp);
3287 SvGETMAGIC (exception); 3652 SvGETMAGIC (exception);
3288 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3653 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3654
3655 api_ready (aTHX_ self);
3289} 3656}
3290 3657
3291void 3658void
3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3659api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3293 PROTOTYPE: $;$ 3660 PROTOTYPE: $;$
… …
3348 3715
3349void 3716void
3350cancel (Coro::State self) 3717cancel (Coro::State self)
3351 CODE: 3718 CODE:
3352 coro_state_destroy (aTHX_ self); 3719 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355 3720
3356SV * 3721SV *
3357enable_times (int enabled = enable_times) 3722enable_times (int enabled = enable_times)
3358 CODE: 3723 CODE:
3359{ 3724{
… …
3372 3737
3373void 3738void
3374times (Coro::State self) 3739times (Coro::State self)
3375 PPCODE: 3740 PPCODE:
3376{ 3741{
3377 struct coro *current = SvSTATE (coro_current); 3742 struct coro *current = SvSTATE (coro_current);
3378 3743
3379 if (expect_false (current == self)) 3744 if (ecb_expect_false (current == self))
3380 { 3745 {
3381 coro_times_update (); 3746 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current)); 3747 coro_times_add (SvSTATE (coro_current));
3383 } 3748 }
3384 3749
3385 EXTEND (SP, 2); 3750 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3751 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3752 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388 3753
3389 if (expect_false (current == self)) 3754 if (ecb_expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current)); 3755 coro_times_sub (SvSTATE (coro_current));
3391} 3756}
3392 3757
3393void 3758void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3759swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3415BOOT: 3780BOOT:
3416{ 3781{
3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3782 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3783 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3784 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3785 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3786 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3787 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3788 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3789 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3426 3790
3427 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3791 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3792 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3429 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3793 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3430 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3794 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3431 3795
3432 coro_stash = gv_stashpv ("Coro", TRUE); 3796 coro_stash = gv_stashpv ("Coro", TRUE);
3433 3797
3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3798 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3799 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3800 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3464 api_ready (aTHX_ RETVAL); 3828 api_ready (aTHX_ RETVAL);
3465 OUTPUT: 3829 OUTPUT:
3466 RETVAL 3830 RETVAL
3467 3831
3468void 3832void
3833_destroy (Coro::State coro)
3834 CODE:
3835 /* used by the manager thread */
3836 coro_state_destroy (aTHX_ coro);
3837
3838void
3839on_destroy (Coro::State coro, SV *cb)
3840 CODE:
3841 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3842
3843void
3844join (...)
3845 CODE:
3846 CORO_EXECUTE_SLF_XS (slf_init_join);
3847
3848void
3469terminate (...) 3849terminate (...)
3470 CODE: 3850 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3851 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3852
3853void
3854cancel (...)
3855 CODE:
3856 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3857
3858int
3859safe_cancel (Coro::State self, ...)
3860 C_ARGS: aTHX_ self, &ST (1), items - 1
3472 3861
3473void 3862void
3474schedule (...) 3863schedule (...)
3475 CODE: 3864 CODE:
3476 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3865 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3633 on_leave = 1 4022 on_leave = 1
3634 PROTOTYPE: & 4023 PROTOTYPE: &
3635 CODE: 4024 CODE:
3636{ 4025{
3637 struct coro *coro = SvSTATE_current; 4026 struct coro *coro = SvSTATE_current;
3638 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4027 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3639 4028
3640 block = s_get_cv_croak (block); 4029 block = s_get_cv_croak (block);
3641 4030
3642 if (!*avp) 4031 if (!*avp)
3643 *avp = newAV (); 4032 *avp = newAV ();
… …
3663 4052
3664SV * 4053SV *
3665new (SV *klass, SV *count = 0) 4054new (SV *klass, SV *count = 0)
3666 CODE: 4055 CODE:
3667{ 4056{
3668 int semcnt = 1; 4057 int semcnt = 1;
3669 4058
3670 if (count) 4059 if (count)
3671 { 4060 {
3672 SvGETMAGIC (count); 4061 SvGETMAGIC (count);
3673 4062
… …
3733 XSRETURN_NO; 4122 XSRETURN_NO;
3734} 4123}
3735 4124
3736void 4125void
3737waiters (SV *self) 4126waiters (SV *self)
3738 PPCODE: 4127 PPCODE:
3739{ 4128{
3740 AV *av = (AV *)SvRV (self); 4129 AV *av = (AV *)SvRV (self);
3741 int wcount = AvFILLp (av) + 1 - 1; 4130 int wcount = AvFILLp (av) + 1 - 1;
3742 4131
3743 if (GIMME_V == G_SCALAR) 4132 if (GIMME_V == G_SCALAR)
… …
3752} 4141}
3753 4142
3754MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4143MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3755 4144
3756void 4145void
3757_may_delete (SV *sem, int count, int extra_refs) 4146_may_delete (SV *sem, int count, unsigned int extra_refs)
3758 PPCODE: 4147 PPCODE:
3759{ 4148{
3760 AV *av = (AV *)SvRV (sem); 4149 AV *av = (AV *)SvRV (sem);
3761 4150
3762 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4151 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3763 && AvFILLp (av) == 0 /* no waiters, just count */ 4152 && AvFILLp (av) == 0 /* no waiters, just count */
3764 && SvIV (AvARRAY (av)[0]) == count) 4153 && SvIV (AvARRAY (av)[0]) == count)
3765 XSRETURN_YES; 4154 XSRETURN_YES;
… …
3786 4175
3787void 4176void
3788broadcast (SV *self) 4177broadcast (SV *self)
3789 CODE: 4178 CODE:
3790{ 4179{
3791 AV *av = (AV *)SvRV (self); 4180 AV *av = (AV *)SvRV (self);
3792 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4181 coro_signal_wake (aTHX_ av, AvFILLp (av));
3793} 4182}
3794 4183
3795void 4184void
3796send (SV *self) 4185send (SV *self)
… …
3804 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4193 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3805} 4194}
3806 4195
3807IV 4196IV
3808awaited (SV *self) 4197awaited (SV *self)
3809 CODE: 4198 CODE:
3810 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4199 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3811 OUTPUT: 4200 OUTPUT:
3812 RETVAL 4201 RETVAL
3813 4202
3814 4203
… …
3819 4208
3820void 4209void
3821_schedule (...) 4210_schedule (...)
3822 CODE: 4211 CODE:
3823{ 4212{
3824 static int incede; 4213 static int incede;
3825 4214
3826 api_cede_notself (aTHX); 4215 api_cede_notself (aTHX);
3827 4216
3828 ++incede; 4217 ++incede;
3829 while (coro_nready >= incede && api_cede (aTHX)) 4218 while (coro_nready >= incede && api_cede (aTHX))
… …
3873 { 4262 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4263 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0; 4264 coro_old_pp_sselect = 0;
3876 } 4265 }
3877 4266
4267MODULE = Coro::State PACKAGE = Coro::Util
3878 4268
4269void
4270_exit (int code)
4271 CODE:
4272 _exit (code);
4273
4274NV
4275time ()
4276 CODE:
4277 RETVAL = nvtime (aTHX);
4278 OUTPUT:
4279 RETVAL
4280
4281NV
4282gettimeofday ()
4283 PPCODE:
4284{
4285 UV tv [2];
4286 u2time (aTHX_ tv);
4287 EXTEND (SP, 2);
4288 PUSHs (sv_2mortal (newSVuv (tv [0])));
4289 PUSHs (sv_2mortal (newSVuv (tv [1])));
4290}
4291

Diff Legend

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