ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.374 by root, Fri Oct 2 19:55:59 2009 UTC vs.
Revision 1.432 by root, Wed May 8 00:44:44 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
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
24# undef setjmp 49# undef setjmp
25# undef longjmp 50# undef longjmp
26# undef _exit 51# undef _exit
27# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
28#else 53#else
29# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
30#endif 55#endif
31 56
32#ifdef HAVE_MMAP
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 */ 57/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
61 59
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
63# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
64#endif
65
66#ifndef CORO_STACKGUARD
67# define CORO_STACKGUARD 0
68#endif 62#endif
69 63
70/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
71#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
72# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
82# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
83#endif 77#endif
84 78
85#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
86 80
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" 81#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
104 83
105#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
106# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
122static void (*u2time)(pTHX_ UV ret[2]); 101static void (*u2time)(pTHX_ UV ret[2]);
123 102
124/* we hijack an hopefully unused CV flag for our purposes */ 103/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 104#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 105static OP *pp_slf (pTHX);
106static void slf_destroy (pTHX_ struct coro *coro);
127 107
128static U32 cctx_gen; 108static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 109static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 110static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 111static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 141static char times_valid;
162 142
163static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
165 145
166enum { 146enum
147{
167 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176typedef struct coro_cctx 157typedef struct coro_cctx
177{ 158{
178 struct coro_cctx *next; 159 struct coro_cctx *next;
179 160
180 /* the stack */ 161 /* the stack */
181 void *sptr; 162 struct coro_stack stack;
182 size_t ssize;
183 163
184 /* cpu state */ 164 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
187 JMPENV *top_env; 169 JMPENV *top_env;
188 coro_context cctx; 170 coro_context cctx;
189 171
190 U32 gen; 172 U32 gen;
191#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
192 int valgrind_id; 174 int valgrind_id;
193#endif 175#endif
194 unsigned char flags; 176 unsigned char flags;
195} coro_cctx; 177} coro_cctx;
196 178
197coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
198 180
199/*****************************************************************************/ 181/*****************************************************************************/
200 182
183static MGVTBL coro_state_vtbl;
184
201enum { 185enum
186{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 193};
208 194
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 196typedef struct
211{ 197{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
218# include "state.h" 199 #include "state.h"
219#undef VAR
220} perl_slots; 200} perl_slots;
221 201
202/* 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)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 204
224/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
225struct coro { 206struct coro
207{
226 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 209 coro_cctx *cctx;
228 210
229 /* ready queue */ 211 /* ready queue */
230 struct coro *next_ready; 212 struct coro *next_ready;
… …
232 /* state data */ 214 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 216 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
236 218
237 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 223
244 /* statistics */ 224 /* statistics */
245 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
246 226
247 /* coro process data */ 227 /* coro process data */
248 int prio; 228 int prio;
249 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
251 233
252 /* async_pool */ 234 /* async_pool */
253 SV *saved_deffh; 235 SV *saved_deffh;
254 SV *invoke_cb; 236 SV *invoke_cb;
255 AV *invoke_av; 237 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 253typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 254typedef struct coro *Coro__State_or_hashref;
273 255
274/* the following variables are effectively part of the perl context */ 256/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 257/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 258/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 259static struct CoroSLF slf_frame; /* the current slf frame */
278 260
279/** Coro ********************************************************************/ 261/** Coro ********************************************************************/
280 262
281#define CORO_PRIO_MAX 3 263#define CORO_PRIO_MAX 3
… …
287 269
288/* for Coro.pm */ 270/* for Coro.pm */
289static SV *coro_current; 271static SV *coro_current;
290static SV *coro_readyhook; 272static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 274static CV *cv_coro_run;
293static struct coro *coro_first; 275static struct coro *coro_first;
294#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if ECB_AMD64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
295 300
296/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
297 302
298static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 304static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 317 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 319}
315 320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325ecb_inline void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335ecb_inline double
336coro_nvtime (void)
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344ecb_inline void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353ecb_inline void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
316/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
317 374
318static SV * 375static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
320{ 377{
321#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 380 get_sv (name, create);
324#endif 381#endif
325 return get_sv (name, create); 382 return get_sv (name, create);
326} 383}
327 384
328static AV * 385static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
330{ 387{
331#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 390 get_av (name, create);
334#endif 391#endif
335 return get_av (name, create); 392 return get_av (name, create);
336} 393}
337 394
338static HV * 395static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
340{ 397{
341#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 400 get_hv (name, create);
344#endif 401#endif
345 return get_hv (name, create); 402 return get_hv (name, create);
346} 403}
347 404
348INLINE void 405ecb_inline void
349coro_times_update () 406coro_times_update (void)
350{ 407{
351#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
352 struct timespec ts; 409 struct timespec ts;
353 410
354 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
368#endif 425#endif
369} 426}
370 427
371INLINE void 428ecb_inline void
372coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
373{ 430{
374 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
381} 438}
382 439
383INLINE void 440ecb_inline void
384coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
385{ 442{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 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]; 444 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 453/* magic glue */
397 454
398#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 457
401#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 461 : mg_find (sv, type))
405 462
406#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 466 : 0)
410 467
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#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) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 470
414INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
415SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
416{ 488{
417 HV *stash;
418 MAGIC *mg; 489 MAGIC *mg;
419 490
420 if (SvROK (coro)) 491 if (SvROK (coro))
421 coro = SvRV (coro); 492 coro = SvRV (coro);
422 493
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
424 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
425 497
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; 498 return (struct coro *)mg->mg_ptr;
436} 499}
437 500
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 502
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 506
444/*****************************************************************************/ 507/*****************************************************************************/
445/* padlist management and caching */ 508/* padlist management and caching */
446 509
447static AV * 510ecb_inline PADLIST *
448coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
449{ 512{
450 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
452 517
453 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
454 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
455#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
456 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
457#else 525#else
458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
459#endif 527#endif
460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
461 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
462 530
463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
464 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
465 535
466 return newpadlist; 536 return newpadlist;
467} 537}
468 538
469static void 539ecb_inline void
470free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
471{ 541{
472 /* may be during global destruction */ 542 /* may be during global destruction */
473 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
474 { 544 {
475 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
476 546
477 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
478 { 548 {
479 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
480 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
481 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
482 552
483 while (j >= 0) 553 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 555
486 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
488 } 558 }
489 559
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
491 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
492 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
494 } 570 }
495} 571}
496 572
497static int 573static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 575{
500 AV *padlist; 576 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
502 579
503 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
505 return 0; 582 return 0;
506 583
507 /* casting is fun. */ 584 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 586
513 return 0; 587 return 0;
514} 588}
515 589
516static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 591 0, 0, 0, 0,
518 coro_cv_free 592 coro_cv_free
519}; 593};
520 594
521/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
522static void 596ecb_inline void
523get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
524{ 598{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 600 size_t *lenp;
527 601
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 604 else
531 { 605 {
532#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 615#endif
542 } 616 }
543} 617}
544 618
545static void 619ecb_inline void
546put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
547{ 621{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 623
551 if (expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
553 634
554 av = (AV *)mg->mg_obj; 635 ((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} 636}
561 637
562/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
563 639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
564/* swap sv heads, at least logically */ 678/* swap sv heads, at least logically */
565static void 679static void
566swap_svs (pTHX_ Coro__State c) 680swap_svs (pTHX_ Coro__State c)
567{ 681{
568 int i; 682 int i;
569 683
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 685 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} 686}
610 687
611#define SWAP_SVS(coro) \ 688#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 689 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 690 swap_svs (aTHX_ (coro))
614 691
615static void 692static void
616on_enterleave_call (pTHX_ SV *cb); 693on_enterleave_call (pTHX_ SV *cb);
617 694
… …
621 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
622 c->slot = 0; 699 c->slot = 0;
623 700
624 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
625 702
626 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 705#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 707 #include "state.h"
634 #undef VAR 708#endif
635 709
636 { 710 {
637 dSP; 711 dSP;
638 712
639 CV *cv; 713 CV *cv;
640 714
641 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
643 { 717 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 721 }
648 722
649 PUTBACK; 723 PUTBACK;
650 } 724 }
651 725
652 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 727 CORO_THROW = c->except;
654 728
655 if (expect_false (enable_times)) 729 if (ecb_expect_false (enable_times))
656 { 730 {
657 if (expect_false (!times_valid)) 731 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 732 coro_times_update ();
659 733
660 coro_times_sub (c); 734 coro_times_sub (c);
661 } 735 }
662 736
663 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
664 { 738 {
665 int i; 739 int i;
666 740
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 748static void
675save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
676{ 750{
677 SWAP_SVS (c); 751 SWAP_SVS (c);
678 752
679 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
680 { 754 {
681 int i; 755 int i;
682 756
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 759 }
686 760
687 times_valid = 0; 761 times_valid = 0;
688 762
689 if (expect_false (enable_times)) 763 if (ecb_expect_false (enable_times))
690 { 764 {
691 coro_times_update (); times_valid = 1; 765 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 766 coro_times_add (c);
693 } 767 }
694 768
… …
708 782
709 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
711 for (;;) 785 for (;;)
712 { 786 {
713 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
714 { 788 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
716 790
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 792 {
719 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
720 794
721 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
722 { 796 {
797 EXTEND (SP, 3);
723 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
725 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
726 801
727 CvDEPTH (cv) = 0; 802 CvDEPTH (cv) = 0;
728 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
729 } 804 }
730 } 805 }
731 } 806 }
732 807
733 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
734 break; 809 break;
735 810
736 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
737 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
738 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
740 815
741 PUTBACK; 816 PUTBACK;
742 } 817 }
743 818
744 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
745 /* we manually unroll here, as usually 2 slots is enough */ 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
746 if (SLOT_COUNT >= 1) CXINC;
747 if (SLOT_COUNT >= 2) CXINC;
748 if (SLOT_COUNT >= 3) CXINC;
749 { 821 {
750 unsigned int i; 822 unsigned int i;
823
751 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
752 CXINC; 825 CXINC;
753 } 826
754 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
755 829
756 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
757 831
758 { 832 {
759 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
760 834
761 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
762 slot->defsv = DEFSV; 836 save_perl_slots (slot);
763 slot->errsv = ERRSV; 837#else
764 slot->irsgv = GvSV (irsgv);
765 slot->hinthv = GvHV (PL_hintgv);
766
767 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
768 # include "state.h" 839 #include "state.h"
769 #undef VAR 840#endif
770 } 841 }
771} 842}
772 843
773/* 844/*
774 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
780# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
781#else 852#else
782static void 853static void
783coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
784{ 855{
785 PL_curstackinfo = new_stackinfo(32, 8); 856 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
786 PL_curstackinfo->si_type = PERLSI_MAIN; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
787 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
788 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
789 860
790 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
805#endif 876#endif
806 877
807 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
808 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
809 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
810 884
811 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
812 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
813 PL_savestack_max = 24; 887 PL_savestack_max = 24;
814 888
… …
842 } 916 }
843 917
844 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
845 Safefree (PL_markstack); 919 Safefree (PL_markstack);
846 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
847 Safefree (PL_savestack); 924 Safefree (PL_savestack);
848#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
849 Safefree (PL_retstack); 926 Safefree (PL_retstack);
850#endif 927#endif
851} 928}
… …
897#endif 974#endif
898 975
899/* 976/*
900 * This overrides the default magic get method of %SIG elements. 977 * This overrides the default magic get method of %SIG elements.
901 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 978 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
902 * and instead of trying to save and restore the hash elements, we just provide 979 * and instead of trying to save and restore the hash elements (extremely slow),
903 * readback here. 980 * we just provide our own readback here.
904 */ 981 */
905static int 982static int ecb_cold
906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
907{ 984{
908 const char *s = MgPV_nolen_const (mg); 985 const char *s = MgPV_nolen_const (mg);
909 986
910 if (*s == '_') 987 if (*s == '_')
911 { 988 {
912 SV **svp = 0; 989 SV **svp = 0;
913 990
914 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
915 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
916 993
917 if (svp) 994 if (svp)
918 { 995 {
919 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
920 return 0; 1006 return 0;
921 } 1007 }
922 } 1008 }
923 1009
924 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
925} 1011}
926 1012
927static int 1013static int ecb_cold
928coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
929{ 1015{
930 const char *s = MgPV_nolen_const (mg); 1016 const char *s = MgPV_nolen_const (mg);
931 1017
932 if (*s == '_') 1018 if (*s == '_')
… …
946 } 1032 }
947 1033
948 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
949} 1035}
950 1036
951static int 1037static int ecb_cold
952coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
953{ 1039{
954 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
955 1041
956 if (*s == '_') 1042 if (*s == '_')
… …
991 return 1; 1077 return 1;
992} 1078}
993 1079
994static UNOP init_perl_op; 1080static UNOP init_perl_op;
995 1081
996static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */
997init_perl (pTHX_ struct coro *coro) 1083init_perl (pTHX_ struct coro *coro)
998{ 1084{
999 /* 1085 /*
1000 * emulate part of the perl startup here. 1086 * emulate part of the perl startup here.
1001 */ 1087 */
… …
1009 PL_comppad_name_fill = 0; 1095 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0; 1096 PL_comppad_name_floor = 0;
1011 PL_curpm = 0; 1097 PL_curpm = 0;
1012 PL_curpad = 0; 1098 PL_curpad = 0;
1013 PL_localizing = 0; 1099 PL_localizing = 0;
1014 PL_dirty = 0;
1015 PL_restartop = 0; 1100 PL_restartop = 0;
1016#if PERL_VERSION_ATLEAST (5,10,0) 1101#if PERL_VERSION_ATLEAST (5,10,0)
1017 PL_parser = 0; 1102 PL_parser = 0;
1018#endif 1103#endif
1019 PL_hints = 0; 1104 PL_hints = 0;
1020 1105
1021 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1022 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1023 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1024 1109
1025 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1026 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1027 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1028 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1029 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1049 /* this newly created coroutine might be run on an existing cctx which most 1134 /* this newly created coroutine might be run on an existing cctx which most
1050 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1135 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1051 */ 1136 */
1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1137 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1138 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1139 slf_frame.destroy = 0;
1054 1140
1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1141 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1056 init_perl_op.op_next = PL_op; 1142 init_perl_op.op_next = PL_op;
1057 init_perl_op.op_type = OP_ENTERSUB; 1143 init_perl_op.op_type = OP_ENTERSUB;
1058 init_perl_op.op_ppaddr = pp_slf; 1144 init_perl_op.op_ppaddr = pp_slf;
… …
1063 /* copy throw, in case it was set before init_perl */ 1149 /* copy throw, in case it was set before init_perl */
1064 CORO_THROW = coro->except; 1150 CORO_THROW = coro->except;
1065 1151
1066 SWAP_SVS (coro); 1152 SWAP_SVS (coro);
1067 1153
1068 if (expect_false (enable_times)) 1154 if (ecb_expect_false (enable_times))
1069 { 1155 {
1070 coro_times_update (); 1156 coro_times_update ();
1071 coro_times_sub (coro); 1157 coro_times_sub (coro);
1072 } 1158 }
1073} 1159}
… …
1097destroy_perl (pTHX_ struct coro *coro) 1183destroy_perl (pTHX_ struct coro *coro)
1098{ 1184{
1099 SV *svf [9]; 1185 SV *svf [9];
1100 1186
1101 { 1187 {
1188 SV *old_current = SvRV (coro_current);
1102 struct coro *current = SvSTATE_current; 1189 struct coro *current = SvSTATE (old_current);
1103 1190
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1191 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105 1192
1106 save_perl (aTHX_ current); 1193 save_perl (aTHX_ current);
1194
1195 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv);
1197
1107 load_perl (aTHX_ coro); 1198 load_perl (aTHX_ coro);
1108 1199
1109 coro_unwind_stacks (aTHX); 1200 coro_unwind_stacks (aTHX);
1110 coro_destruct_stacks (aTHX);
1111 1201
1112 /* restore swapped sv's */ 1202 /* restore swapped sv's */
1113 SWAP_SVS (coro); 1203 SWAP_SVS (coro);
1114 1204
1205 coro_destruct_stacks (aTHX);
1206
1115 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1116 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1122 svf [6] = (SV *)GvHV (PL_hintgv); 1214 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook; 1215 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook; 1216 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf)); 1217 assert (9 == sizeof (svf) / sizeof (*svf));
1126 1218
1219 SvRV_set (coro_current, old_current);
1220
1127 load_perl (aTHX_ current); 1221 load_perl (aTHX_ current);
1128 } 1222 }
1129 1223
1130 { 1224 {
1131 unsigned int i; 1225 unsigned int i;
… …
1135 1229
1136 SvREFCNT_dec (coro->saved_deffh); 1230 SvREFCNT_dec (coro->saved_deffh);
1137 SvREFCNT_dec (coro->rouse_cb); 1231 SvREFCNT_dec (coro->rouse_cb);
1138 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1139 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1140 SvREFCNT_dec (coro->swap_sv);
1141 } 1234 }
1142} 1235}
1143 1236
1144INLINE void 1237ecb_inline void
1145free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1146{ 1239{
1147 if (expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1148 { 1241 {
1149 SvREFCNT_dec (coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1243 coro_mortal = 0;
1151 } 1244 }
1152} 1245}
1153 1246
1154static int 1247static int
… …
1287 1380
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1381 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1382}
1290 1383
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1384/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1385static void ecb_noinline
1293cctx_prepare (pTHX) 1386cctx_prepare (pTHX)
1294{ 1387{
1295 PL_top_env = &PL_start_env; 1388 PL_top_env = &PL_start_env;
1296 1389
1297 if (cctx_current->flags & CC_TRACE) 1390 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1310} 1403}
1311 1404
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1406ecb_inline void
1314transfer_tail (pTHX) 1407transfer_tail (pTHX)
1315{ 1408{
1316 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1317} 1422}
1318 1423
1319/* 1424/*
1320 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1321 */ 1426 */
… …
1350 */ 1455 */
1351 1456
1352 /* 1457 /*
1353 * If perl-run returns we assume exit() was being called or the coro 1458 * 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) 1459 * 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 1460 * 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" 1461 * 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 */ 1462 */
1361 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1464 }
1364} 1465}
1365 1466
1366static coro_cctx * 1467static coro_cctx *
1367cctx_new () 1468cctx_new (void)
1368{ 1469{
1369 coro_cctx *cctx; 1470 coro_cctx *cctx;
1370 1471
1371 ++cctx_count; 1472 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1479 return cctx;
1379} 1480}
1380 1481
1381/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1382static coro_cctx * 1483static coro_cctx *
1383cctx_new_empty () 1484cctx_new_empty (void)
1384{ 1485{
1385 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1386 1487
1387 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1389 1490
1390 return cctx; 1491 return cctx;
1391} 1492}
1392 1493
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1495static coro_cctx *
1395cctx_new_run () 1496cctx_new_run (void)
1396{ 1497{
1397 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1398 void *stack_start;
1399 size_t stack_size;
1400 1499
1401#if HAVE_MMAP 1500 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 } 1501 {
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."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1424 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1425 }
1426
1427 stack_start = cctx->sptr;
1428 stack_size = cctx->ssize;
1429 } 1504 }
1430 1505
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); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1436 1507
1437 return cctx; 1508 return cctx;
1438} 1509}
1439 1510
1440static void 1511static void
1441cctx_destroy (coro_cctx *cctx) 1512cctx_destroy (coro_cctx *cctx)
1442{ 1513{
1443 if (!cctx) 1514 if (!cctx)
1444 return; 1515 return;
1445 1516
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1518
1448 --cctx_count; 1519 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1450 1521
1451 /* coro_transfer creates new, empty cctx's */ 1522 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 1523
1466 Safefree (cctx); 1524 Safefree (cctx);
1467} 1525}
1468 1526
1469/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1529
1472static coro_cctx * 1530static coro_cctx *
1473cctx_get (pTHX) 1531cctx_get (pTHX)
1474{ 1532{
1475 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1476 { 1534 {
1477 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1479 --cctx_idle; 1537 --cctx_idle;
1480 1538
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1540 return cctx;
1483 1541
1484 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1485 } 1543 }
1486 1544
… …
1488} 1546}
1489 1547
1490static void 1548static void
1491cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1492{ 1550{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1494 1552
1495 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1555 {
1498 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1557 cctx_first = first->next;
1500 --cctx_idle; 1558 --cctx_idle;
1501 1559
… …
1512static void 1570static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1572{
1515 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1516 1574
1517 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1518 { 1576 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 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,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1579
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 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,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1582
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 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,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1586#endif
1529 } 1587 }
1530} 1588}
1531 1589
1532/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1593{
1536 dSTACKLEVEL; 1594 dSTACKLEVEL;
1537 1595
1538 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1540 { 1598 {
1541 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1601 }
1544 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1545 { 1603 {
1546 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1547 1605
1548 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1607 {
1550 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1553 } 1611 }
… …
1556 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1557 1615
1558 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1560 1618
1561 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1620 {
1563 /* need to start coroutine */ 1621 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1623 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1624 init_perl (aTHX_ next);
1567 } 1625 }
1568 else 1626 else
1569 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1570 1628
1571 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1630 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1633 && !force_cctx
1576 )) 1634 ))
1577 { 1635 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1636 /* 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)); 1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1638
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1639 /* 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 */ 1640 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1586 1644
1587 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1588 } 1646 }
1589 else 1647 else
1590 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1591 1649
1592 ++next->usecount; 1650 ++next->usecount;
1593 1651
1594 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1654
1597 next->cctx = 0; 1655 next->cctx = 0;
1598 1656
1599 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1658 {
1601 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1662 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#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) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1670
1613/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1614 1672
1673/* this function is actually Coro, not Coro::State, but we call it from here */
1674/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1680{
1618 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1682 return;
1620 1683
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1623 1685
1624 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1625 1687
1626 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1627 { 1689 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1692 --coro_nready;
1631 } 1693 }
1632 else 1694 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1696
1697 if (coro->next) coro->next->prev = coro->prev;
1698 if (coro->prev) coro->prev->next = coro->next;
1699 if (coro == coro_first) coro_first = coro->next;
1634 1700
1635 if (coro->mainstack 1701 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1637 && coro->slot 1703 && coro->slot
1638 && !PL_dirty) 1704 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1640 1706
1641 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1642 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1643 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1644 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1645 1712
1646 if (coro->next) coro->next->prev = coro->prev; 1713 coro_call_on_destroy (aTHX_ coro);
1647 if (coro->prev) coro->prev->next = coro->next;
1648 if (coro == coro_first) coro_first = coro->next;
1649 1714
1650 return 1; 1715 /* more destruction mayhem in coro_state_free */
1651} 1716}
1652 1717
1653static int 1718static int
1654coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1655{ 1720{
1656 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1657 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1658 1723
1659 coro->hv = 0;
1660
1661 if (--coro->refcnt < 0)
1662 {
1663 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1664 Safefree (coro); 1728 Safefree (coro);
1665 }
1666 1729
1667 return 0; 1730 return 0;
1668} 1731}
1669 1732
1670static int 1733static int ecb_cold
1671coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1672{ 1735{
1673 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1674 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1675 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1676 1740
1677 return 0; 1741 return 0;
1678} 1742}
1679 1743
1680static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1705 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1706} 1770}
1707 1771
1708/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1709 1773
1710INLINE void 1774ecb_inline void
1711coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1712{ 1776{
1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1714 1778
1715 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1717 coro->next_ready = 0; 1781 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro; 1783 ready [1] = coro;
1720} 1784}
1721 1785
1722INLINE struct coro * 1786ecb_inline struct coro *
1723coro_deq (pTHX) 1787coro_deq (pTHX)
1724{ 1788{
1725 int prio; 1789 int prio;
1726 1790
1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1780{ 1844{
1781 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1782} 1846}
1783 1847
1784/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1785INLINE void 1849ecb_inline void
1786prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1787{ 1851{
1788 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1789 1853
1790 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1803{ 1867{
1804 for (;;) 1868 for (;;)
1805 { 1869 {
1806 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1807 1871
1808 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1809 { 1873 {
1810 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1812 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1813 else 1877 else
1814 { 1878 {
1815 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1816 --coro_nready; 1880 --coro_nready;
… …
1823 { 1887 {
1824 /* nothing to schedule: call the idle handler */ 1888 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle) 1889 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle))) 1890 && SvOBJECT (SvRV (sv_idle)))
1827 { 1891 {
1892 if (SvRV (sv_idle) == SvRV (coro_current))
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1894
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle)); 1896 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready; 1897 --coro_nready;
1831 } 1898 }
1832 else 1899 else
… …
1846 } 1913 }
1847 } 1914 }
1848 } 1915 }
1849} 1916}
1850 1917
1851INLINE void 1918ecb_inline void
1852prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1853{ 1920{
1854 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1855 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1856} 1923}
1857 1924
1858INLINE void 1925ecb_inline void
1859prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1860{ 1927{
1861 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1862 1929
1863 if (coro_nready) 1930 if (coro_nready)
… …
1893{ 1960{
1894 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1895 1962
1896 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1897 1964
1898 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1899 { 1966 {
1900 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1901 return 1; 1968 return 1;
1902 } 1969 }
1903 else 1970 else
… …
1946 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
1947 } 2014 }
1948} 2015}
1949 2016
1950static void 2017static void
2018coro_push_av (pTHX_ AV *av, I32 gimme_v)
2019{
2020 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2021 {
2022 dSP;
2023
2024 if (gimme_v == G_SCALAR)
2025 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2026 else
2027 {
2028 int i;
2029 EXTEND (SP, AvFILLp (av) + 1);
2030
2031 for (i = 0; i <= AvFILLp (av); ++i)
2032 PUSHs (AvARRAY (av)[i]);
2033 }
2034
2035 PUTBACK;
2036 }
2037}
2038
2039static void
2040coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2041{
2042 if (!coro->on_destroy)
2043 coro->on_destroy = newAV ();
2044
2045 av_push (coro->on_destroy, cb);
2046}
2047
2048static void
2049slf_destroy_join (pTHX_ struct CoroSLF *frame)
2050{
2051 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2052}
2053
2054static int
2055slf_check_join (pTHX_ struct CoroSLF *frame)
2056{
2057 struct coro *coro = (struct coro *)frame->data;
2058
2059 if (!coro->status)
2060 return 1;
2061
2062 frame->destroy = 0;
2063
2064 coro_push_av (aTHX_ coro->status, GIMME_V);
2065
2066 SvREFCNT_dec ((SV *)coro->hv);
2067
2068 return 0;
2069}
2070
2071static void
2072slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2073{
2074 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2075
2076 if (items > 1)
2077 croak ("join called with too many arguments");
2078
2079 if (coro->status)
2080 frame->prepare = prepare_nop;
2081 else
2082 {
2083 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2084 frame->prepare = prepare_schedule;
2085 }
2086
2087 frame->check = slf_check_join;
2088 frame->destroy = slf_destroy_join;
2089 frame->data = (void *)coro;
2090 SvREFCNT_inc (coro->hv);
2091}
2092
2093static void
1951coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
1952{ 2095{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955 2097
1956 if (on_destroyp) 2098 if (!od)
1957 { 2099 return;
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1959 2100
2101 coro->on_destroy = 0;
2102 sv_2mortal ((SV *)od);
2103
1960 while (AvFILLp (on_destroy) >= 0) 2104 while (AvFILLp (od) >= 0)
2105 {
2106 SV *cb = sv_2mortal (av_pop (od));
2107
2108 /* coro hv's (and only hv's at the moment) are supported as well */
2109 if (SvSTATEhv_p (aTHX_ cb))
2110 api_ready (aTHX_ cb);
2111 else
1961 { 2112 {
1962 dSP; /* don't disturb outer sp */ 2113 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy);
1964
1965 PUSHMARK (SP); 2114 PUSHMARK (SP);
1966 2115
1967 if (statusp) 2116 if (coro->status)
1968 { 2117 {
1969 int i; 2118 PUTBACK;
1970 AV *status = (AV *)SvRV (*statusp); 2119 coro_push_av (aTHX_ coro->status, G_ARRAY);
1971 EXTEND (SP, AvFILLp (status) + 1); 2120 SPAGAIN;
1972
1973 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]);
1975 } 2121 }
1976 2122
1977 PUTBACK; 2123 PUTBACK;
1978 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2124 call_sv (cb, G_VOID | G_DISCARD);
1979 } 2125 }
1980 } 2126 }
1981} 2127}
1982 2128
1983static void 2129static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2130coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1985{ 2131{
1986 int i; 2132 AV *av;
1987 HV *hv = (HV *)SvRV (coro_current); 2133
1988 AV *av = newAV (); 2134 if (coro->status)
2135 {
2136 av = coro->status;
2137 av_clear (av);
2138 }
2139 else
2140 av = coro->status = newAV ();
1989 2141
1990 /* items are actually not so common, so optimise for this case */ 2142 /* items are actually not so common, so optimise for this case */
1991 if (items) 2143 if (items)
1992 { 2144 {
2145 int i;
2146
1993 av_extend (av, items - 1); 2147 av_extend (av, items - 1);
1994 2148
1995 for (i = 0; i < items; ++i) 2149 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i])); 2150 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 } 2151 }
2152}
1998 2153
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2154static void
2000 2155slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2156{
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2157 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager); 2158 api_ready (aTHX_ sv_manager);
2003 2159
2004 frame->prepare = prepare_schedule; 2160 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat; 2161 frame->check = slf_check_repeat;
2006 2162
2007 /* as a minor optimisation, we could unwind all stacks here */ 2163 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */ 2164 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/ 2165 /*coro_unwind_stacks (aTHX);*/
2166}
2167
2168static void
2169slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2170{
2171 HV *coro_hv = (HV *)SvRV (coro_current);
2172
2173 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2174 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2175}
2176
2177static void
2178slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2179{
2180 HV *coro_hv;
2181 struct coro *coro;
2182
2183 if (items <= 0)
2184 croak ("Coro::cancel called without coro object,");
2185
2186 coro = SvSTATE (arg [0]);
2187 coro_hv = coro->hv;
2188
2189 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2190
2191 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2192 {
2193 /* coro currently busy cancelling something, so just notify it */
2194 coro->slf_frame.data = (void *)coro;
2195
2196 frame->prepare = prepare_nop;
2197 frame->check = slf_check_nop;
2198 }
2199 else if (coro_hv == (HV *)SvRV (coro_current))
2200 {
2201 /* cancelling the current coro is allowed, and equals terminate */
2202 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203 }
2204 else
2205 {
2206 struct coro *self = SvSTATE_current;
2207
2208 /* otherwise we cancel directly, purely for speed reasons
2209 * unfortunately, this requires some magic trickery, as
2210 * somebody else could cancel us, so we have to fight the cancellation.
2211 * this is ugly, and hopefully fully worth the extra speed.
2212 * besides, I can't get the slow-but-safe version working...
2213 */
2214 slf_frame.data = 0;
2215 self->flags |= CF_NOCANCEL;
2216 coro_state_destroy (aTHX_ coro);
2217 self->flags &= ~CF_NOCANCEL;
2218
2219 if (slf_frame.data)
2220 {
2221 /* while we were busy we have been cancelled, so terminate */
2222 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2223 }
2224 else
2225 {
2226 frame->prepare = prepare_nop;
2227 frame->check = slf_check_nop;
2228 }
2229 }
2230}
2231
2232static int
2233slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2234{
2235 frame->prepare = 0;
2236 coro_unwind_stacks (aTHX);
2237
2238 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2239
2240 return 1;
2241}
2242
2243static int
2244safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2245{
2246 if (coro->cctx)
2247 croak ("coro inside C callback, unable to cancel at this time, caught");
2248
2249 if (coro->flags & CF_NEW)
2250 {
2251 coro_set_status (aTHX_ coro, arg, items);
2252 coro_state_destroy (aTHX_ coro);
2253 }
2254 else
2255 {
2256 if (!coro->slf_frame.prepare)
2257 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2258
2259 slf_destroy (aTHX_ coro);
2260
2261 coro_set_status (aTHX_ coro, arg, items);
2262 coro->slf_frame.prepare = prepare_nop;
2263 coro->slf_frame.check = slf_check_safe_cancel;
2264
2265 api_ready (aTHX_ (SV *)coro->hv);
2266 }
2267
2268 return 1;
2010} 2269}
2011 2270
2012/*****************************************************************************/ 2271/*****************************************************************************/
2013/* async pool handler */ 2272/* async pool handler */
2014 2273
… …
2045slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2304slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2046{ 2305{
2047 HV *hv = (HV *)SvRV (coro_current); 2306 HV *hv = (HV *)SvRV (coro_current);
2048 struct coro *coro = SvSTATE_hv ((SV *)hv); 2307 struct coro *coro = SvSTATE_hv ((SV *)hv);
2049 2308
2050 if (expect_true (coro->saved_deffh)) 2309 if (ecb_expect_true (coro->saved_deffh))
2051 { 2310 {
2052 /* subsequent iteration */ 2311 /* subsequent iteration */
2053 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2312 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2054 coro->saved_deffh = 0; 2313 coro->saved_deffh = 0;
2055 2314
2056 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2315 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2057 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2316 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2058 { 2317 {
2059 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2318 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2060 coro->invoke_av = newAV (); 2319 return;
2061
2062 frame->prepare = prepare_nop;
2063 } 2320 }
2064 else 2321 else
2065 { 2322 {
2066 av_clear (GvAV (PL_defgv)); 2323 av_clear (GvAV (PL_defgv));
2067 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2324 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2117 2374
2118static int 2375static int
2119slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2376slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2120{ 2377{
2121 SV *data = (SV *)frame->data; 2378 SV *data = (SV *)frame->data;
2122 2379
2123 if (CORO_THROW) 2380 if (CORO_THROW)
2124 return 0; 2381 return 0;
2125 2382
2126 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2383 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2127 return 1; 2384 return 1;
… …
2163 cb = sv_2mortal (coro->rouse_cb); 2420 cb = sv_2mortal (coro->rouse_cb);
2164 coro->rouse_cb = 0; 2421 coro->rouse_cb = 0;
2165 } 2422 }
2166 2423
2167 if (!SvROK (cb) 2424 if (!SvROK (cb)
2168 || SvTYPE (SvRV (cb)) != SVt_PVCV 2425 || SvTYPE (SvRV (cb)) != SVt_PVCV
2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2426 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2170 croak ("Coro::rouse_wait called with illegal callback argument,"); 2427 croak ("Coro::rouse_wait called with illegal callback argument,");
2171 2428
2172 { 2429 {
2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2430 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2290static void 2547static void
2291slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2548slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2292{ 2549{
2293 frame->prepare = prepare_cede_notself; 2550 frame->prepare = prepare_cede_notself;
2294 frame->check = slf_check_nop; 2551 frame->check = slf_check_nop;
2552}
2553
2554/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2555static void
2556slf_destroy (pTHX_ struct coro *coro)
2557{
2558 /* this callback is reserved for slf functions needing to do cleanup */
2559 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2560 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2561
2562 /*
2563 * The on_destroy above most likely is from an SLF call.
2564 * Since by definition the SLF call will not finish when we destroy
2565 * the coro, we will have to force-finish it here, otherwise
2566 * cleanup functions cannot call SLF functions.
2567 */
2568 coro->slf_frame.prepare = 0;
2295} 2569}
2296 2570
2297/* 2571/*
2298 * these not obviously related functions are all rolled into one 2572 * these not obviously related functions are all rolled into one
2299 * function to increase chances that they all will call transfer with the same 2573 * function to increase chances that they all will call transfer with the same
… …
2306 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2580 I32 checkmark; /* mark SP to see how many elements check has pushed */
2307 2581
2308 /* set up the slf frame, unless it has already been set-up */ 2582 /* set up the slf frame, unless it has already been set-up */
2309 /* the latter happens when a new coro has been started */ 2583 /* the latter happens when a new coro has been started */
2310 /* or when a new cctx was attached to an existing coroutine */ 2584 /* or when a new cctx was attached to an existing coroutine */
2311 if (expect_true (!slf_frame.prepare)) 2585 if (ecb_expect_true (!slf_frame.prepare))
2312 { 2586 {
2313 /* first iteration */ 2587 /* first iteration */
2314 dSP; 2588 dSP;
2315 SV **arg = PL_stack_base + TOPMARK + 1; 2589 SV **arg = PL_stack_base + TOPMARK + 1;
2316 int items = SP - arg; /* args without function object */ 2590 int items = SP - arg; /* args without function object */
… …
2357 while (slf_frame.check (aTHX_ &slf_frame)); 2631 while (slf_frame.check (aTHX_ &slf_frame));
2358 2632
2359 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2633 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2360 2634
2361 /* exception handling */ 2635 /* exception handling */
2362 if (expect_false (CORO_THROW)) 2636 if (ecb_expect_false (CORO_THROW))
2363 { 2637 {
2364 SV *exception = sv_2mortal (CORO_THROW); 2638 SV *exception = sv_2mortal (CORO_THROW);
2365 2639
2366 CORO_THROW = 0; 2640 CORO_THROW = 0;
2367 sv_setsv (ERRSV, exception); 2641 sv_setsv (ERRSV, exception);
2368 croak (0); 2642 croak (0);
2369 } 2643 }
2370 2644
2371 /* return value handling - mostly like entersub */ 2645 /* return value handling - mostly like entersub */
2372 /* make sure we put something on the stack in scalar context */ 2646 /* make sure we put something on the stack in scalar context */
2373 if (GIMME_V == G_SCALAR) 2647 if (GIMME_V == G_SCALAR
2648 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2374 { 2649 {
2375 dSP; 2650 dSP;
2376 SV **bot = PL_stack_base + checkmark; 2651 SV **bot = PL_stack_base + checkmark;
2377 2652
2378 if (sp == bot) /* too few, push undef */ 2653 if (sp == bot) /* too few, push undef */
2379 bot [1] = &PL_sv_undef; 2654 bot [1] = &PL_sv_undef;
2380 else if (sp != bot + 1) /* too many, take last one */ 2655 else /* too many, take last one */
2381 bot [1] = *sp; 2656 bot [1] = *sp;
2382 2657
2383 SP = bot + 1; 2658 SP = bot + 1;
2384 2659
2385 PUTBACK; 2660 PUTBACK;
… …
2418 if (PL_op->op_flags & OPf_STACKED) 2693 if (PL_op->op_flags & OPf_STACKED)
2419 { 2694 {
2420 if (items > slf_arga) 2695 if (items > slf_arga)
2421 { 2696 {
2422 slf_arga = items; 2697 slf_arga = items;
2423 free (slf_argv); 2698 Safefree (slf_argv);
2424 slf_argv = malloc (slf_arga * sizeof (SV *)); 2699 New (0, slf_argv, slf_arga, SV *);
2425 } 2700 }
2426 2701
2427 slf_argc = items; 2702 slf_argc = items;
2428 2703
2429 for (i = 0; i < items; ++i) 2704 for (i = 0; i < items; ++i)
… …
2492{ 2767{
2493 PerlIOBuf base; 2768 PerlIOBuf base;
2494 NV next, every; 2769 NV next, every;
2495} PerlIOCede; 2770} PerlIOCede;
2496 2771
2497static IV 2772static IV ecb_cold
2498PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2773PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2499{ 2774{
2500 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2775 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2501 2776
2502 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2777 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2503 self->next = nvtime () + self->every; 2778 self->next = nvtime () + self->every;
2504 2779
2505 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2780 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2506} 2781}
2507 2782
2508static SV * 2783static SV * ecb_cold
2509PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2784PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2510{ 2785{
2511 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2786 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2512 2787
2513 return newSVnv (self->every); 2788 return newSVnv (self->every);
… …
2625 SvREFCNT_dec (cb); 2900 SvREFCNT_dec (cb);
2626 } 2901 }
2627} 2902}
2628 2903
2629static void 2904static void
2630coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2905coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2631{ 2906{
2632 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2907 /* call $sem->adjust (0) to possibly wake up some other waiters */
2633 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2908 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2634} 2909}
2635 2910
2636static int 2911static int
2637slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2912slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2638{ 2913{
2639 AV *av = (AV *)frame->data; 2914 AV *av = (AV *)frame->data;
2640 SV *count_sv = AvARRAY (av)[0]; 2915 SV *count_sv = AvARRAY (av)[0];
2916 SV *coro_hv = SvRV (coro_current);
2641 2917
2642 /* if we are about to throw, don't actually acquire the lock, just throw */ 2918 /* if we are about to throw, don't actually acquire the lock, just throw */
2643 if (CORO_THROW) 2919 if (CORO_THROW)
2644 return 0; 2920 return 0;
2645 else if (SvIVX (count_sv) > 0) 2921 else if (SvIVX (count_sv) > 0)
2646 { 2922 {
2647 SvSTATE_current->on_destroy = 0; 2923 frame->destroy = 0;
2648 2924
2649 if (acquire) 2925 if (acquire)
2650 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2926 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2651 else 2927 else
2652 coro_semaphore_adjust (aTHX_ av, 0); 2928 coro_semaphore_adjust (aTHX_ av, 0);
… …
2657 { 2933 {
2658 int i; 2934 int i;
2659 /* if we were woken up but can't down, we look through the whole */ 2935 /* if we were woken up but can't down, we look through the whole */
2660 /* waiters list and only add us if we aren't in there already */ 2936 /* waiters list and only add us if we aren't in there already */
2661 /* this avoids some degenerate memory usage cases */ 2937 /* this avoids some degenerate memory usage cases */
2662 2938 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2663 for (i = 1; i <= AvFILLp (av); ++i)
2664 if (AvARRAY (av)[i] == SvRV (coro_current)) 2939 if (AvARRAY (av)[i] == coro_hv)
2665 return 1; 2940 return 1;
2666 2941
2667 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2942 av_push (av, SvREFCNT_inc (coro_hv));
2668 return 1; 2943 return 1;
2669 } 2944 }
2670} 2945}
2671 2946
2672static int 2947static int
… …
2695 { 2970 {
2696 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2971 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2697 2972
2698 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2973 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2699 frame->prepare = prepare_schedule; 2974 frame->prepare = prepare_schedule;
2700
2701 /* to avoid race conditions when a woken-up coro gets terminated */ 2975 /* to avoid race conditions when a woken-up coro gets terminated */
2702 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2976 /* we arrange for a temporary on_destroy that calls adjust (0) */
2703 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2977 frame->destroy = coro_semaphore_destroy;
2704 } 2978 }
2705} 2979}
2706 2980
2707static void 2981static void
2708slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2982slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2790 { 3064 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]); 3065 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3066 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793 3067
2794 if (SvIVX (AvARRAY (av)[0])) 3068 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3069 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2796 3070
2797 frame->prepare = prepare_nop; 3071 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop; 3072 frame->check = slf_check_nop;
2799 } 3073 }
2800 else if (SvIVX (AvARRAY (av)[0])) 3074 else if (SvIVX (AvARRAY (av)[0]))
… …
2926 dSP; 3200 dSP;
2927 3201
2928 static SV *prio_cv; 3202 static SV *prio_cv;
2929 static SV *prio_sv; 3203 static SV *prio_sv;
2930 3204
2931 if (expect_false (!prio_cv)) 3205 if (ecb_expect_false (!prio_cv))
2932 { 3206 {
2933 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3207 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2934 prio_sv = newSViv (0); 3208 prio_sv = newSViv (0);
2935 } 3209 }
2936 3210
… …
2962 /* now call the AIO function - we assume our request is uncancelable */ 3236 /* now call the AIO function - we assume our request is uncancelable */
2963 PUTBACK; 3237 PUTBACK;
2964 call_sv ((SV *)req, G_VOID | G_DISCARD); 3238 call_sv ((SV *)req, G_VOID | G_DISCARD);
2965 } 3239 }
2966 3240
2967 /* now that the requets is going, we loop toll we have a result */ 3241 /* now that the request is going, we loop till we have a result */
2968 frame->data = (void *)state; 3242 frame->data = (void *)state;
2969 frame->prepare = prepare_schedule; 3243 frame->prepare = prepare_schedule;
2970 frame->check = slf_check_aio_req; 3244 frame->check = slf_check_aio_req;
2971} 3245}
2972 3246
… …
3042 } 3316 }
3043 3317
3044 return coro_sv; 3318 return coro_sv;
3045} 3319}
3046 3320
3321#ifndef __cplusplus
3322ecb_cold XS(boot_Coro__State);
3323#endif
3324
3325#if CORO_JIT
3326
3327static void ecb_noinline ecb_cold
3328pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3329{
3330 dSP;
3331 AV *av = newAV ();
3332
3333 av_store (av, 3, newSVuv (d));
3334 av_store (av, 2, newSVuv (c));
3335 av_store (av, 1, newSVuv (b));
3336 av_store (av, 0, newSVuv (a));
3337
3338 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3339
3340 PUTBACK;
3341}
3342
3343static void ecb_noinline ecb_cold
3344jit_init (pTHX)
3345{
3346 dSP;
3347 SV *load, *save;
3348 char *map_base;
3349 char *load_ptr, *save_ptr;
3350 STRLEN load_len, save_len, map_len;
3351 int count;
3352
3353 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3354
3355 PUSHMARK (SP);
3356 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3357 #include "state.h"
3358 count = call_pv ("Coro::State::_jit", G_ARRAY);
3359 SPAGAIN;
3360
3361 save = POPs; save_ptr = SvPVbyte (save, save_len);
3362 load = POPs; load_ptr = SvPVbyte (load, load_len);
3363
3364 map_len = load_len + save_len + 16;
3365
3366 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3367
3368 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3369
3370 load_perl_slots = (load_save_perl_slots_type)map_base;
3371 memcpy (map_base, load_ptr, load_len);
3372
3373 map_base += (load_len + 15) & ~15;
3374
3375 save_perl_slots = (load_save_perl_slots_type)map_base;
3376 memcpy (map_base, save_ptr, save_len);
3377
3378 /* we are good citizens and try to make the page read-only, so the evil evil */
3379 /* hackers might have it a bit more difficult */
3380 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3381
3382 PUTBACK;
3383 eval_pv ("undef &Coro::State::_jit", 1);
3384}
3385
3386#endif
3387
3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3388MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3048 3389
3049PROTOTYPES: DISABLE 3390PROTOTYPES: DISABLE
3050 3391
3051BOOT: 3392BOOT:
… …
3053#ifdef USE_ITHREADS 3394#ifdef USE_ITHREADS
3054# if CORO_PTHREAD 3395# if CORO_PTHREAD
3055 coro_thx = PERL_GET_CONTEXT; 3396 coro_thx = PERL_GET_CONTEXT;
3056# endif 3397# endif
3057#endif 3398#endif
3058 BOOT_PAGESIZE; 3399 /* perl defines these to check for existance first, but why it doesn't */
3400 /* just create them one at init time is not clear to me, except for */
3401 /* programs trying to delete them, but... */
3402 /* anyway, we declare this as invalid and make sure they are initialised here */
3403 DEFSV;
3404 ERRSV;
3059 3405
3060 cctx_current = cctx_new_empty (); 3406 cctx_current = cctx_new_empty ();
3061 3407
3062 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3408 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3063 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3409 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3103 coroapi.prepare_nop = prepare_nop; 3449 coroapi.prepare_nop = prepare_nop;
3104 coroapi.prepare_schedule = prepare_schedule; 3450 coroapi.prepare_schedule = prepare_schedule;
3105 coroapi.prepare_cede = prepare_cede; 3451 coroapi.prepare_cede = prepare_cede;
3106 coroapi.prepare_cede_notself = prepare_cede_notself; 3452 coroapi.prepare_cede_notself = prepare_cede_notself;
3107 3453
3108 { 3454 time_init (aTHX);
3109 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3110
3111 if (!svp) croak ("Time::HiRes is required");
3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3113
3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3118 }
3119 3455
3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3456 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3457#if CORO_JIT
3458 PUTBACK;
3459 jit_init (aTHX);
3460 SPAGAIN;
3461#endif
3121} 3462}
3122 3463
3123SV * 3464SV *
3124new (SV *klass, ...) 3465new (SV *klass, ...)
3125 ALIAS: 3466 ALIAS:
… …
3132void 3473void
3133transfer (...) 3474transfer (...)
3134 PROTOTYPE: $$ 3475 PROTOTYPE: $$
3135 CODE: 3476 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3477 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3137
3138bool
3139_destroy (SV *coro_sv)
3140 CODE:
3141 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3142 OUTPUT:
3143 RETVAL
3144
3145void
3146_exit (int code)
3147 PROTOTYPE: $
3148 CODE:
3149 _exit (code);
3150 3478
3151SV * 3479SV *
3152clone (Coro::State coro) 3480clone (Coro::State coro)
3153 CODE: 3481 CODE:
3154{ 3482{
… …
3209void 3537void
3210list () 3538list ()
3211 PROTOTYPE: 3539 PROTOTYPE:
3212 PPCODE: 3540 PPCODE:
3213{ 3541{
3214 struct coro *coro; 3542 struct coro *coro;
3215 for (coro = coro_first; coro; coro = coro->next) 3543 for (coro = coro_first; coro; coro = coro->next)
3216 if (coro->hv) 3544 if (coro->hv)
3217 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3545 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3218} 3546}
3219 3547
… …
3224 CODE: 3552 CODE:
3225{ 3553{
3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3554 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3227 { 3555 {
3228 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
3557 struct CoroSLF slf_save;
3229 3558
3230 if (current != coro) 3559 if (current != coro)
3231 { 3560 {
3232 PUTBACK; 3561 PUTBACK;
3233 save_perl (aTHX_ current); 3562 save_perl (aTHX_ current);
3234 load_perl (aTHX_ coro); 3563 load_perl (aTHX_ coro);
3564 /* the coro is most likely in an active SLF call.
3565 * while not strictly required (the code we execute is
3566 * not allowed to call any SLF functions), it's cleaner
3567 * to reinitialise the slf_frame and restore it later.
3568 * This might one day allow us to actually do SLF calls
3569 * from code executed here.
3570 */
3571 slf_save = slf_frame;
3572 slf_frame.prepare = 0;
3235 SPAGAIN; 3573 SPAGAIN;
3236 } 3574 }
3237 3575
3238 PUSHSTACK; 3576 PUSHSTACK;
3239 3577
… …
3249 SPAGAIN; 3587 SPAGAIN;
3250 3588
3251 if (current != coro) 3589 if (current != coro)
3252 { 3590 {
3253 PUTBACK; 3591 PUTBACK;
3592 slf_frame = slf_save;
3254 save_perl (aTHX_ coro); 3593 save_perl (aTHX_ coro);
3255 load_perl (aTHX_ current); 3594 load_perl (aTHX_ current);
3256 SPAGAIN; 3595 SPAGAIN;
3257 } 3596 }
3258 } 3597 }
… …
3263 PROTOTYPE: $ 3602 PROTOTYPE: $
3264 ALIAS: 3603 ALIAS:
3265 is_ready = CF_READY 3604 is_ready = CF_READY
3266 is_running = CF_RUNNING 3605 is_running = CF_RUNNING
3267 is_new = CF_NEW 3606 is_new = CF_NEW
3268 is_destroyed = CF_DESTROYED 3607 is_destroyed = CF_ZOMBIE
3608 is_zombie = CF_ZOMBIE
3269 is_suspended = CF_SUSPENDED 3609 is_suspended = CF_SUSPENDED
3270 CODE: 3610 CODE:
3271 RETVAL = boolSV (coro->flags & ix); 3611 RETVAL = boolSV (coro->flags & ix);
3272 OUTPUT: 3612 OUTPUT:
3273 RETVAL 3613 RETVAL
3274 3614
3275void 3615void
3276throw (Coro::State self, SV *throw = &PL_sv_undef) 3616throw (SV *self, SV *exception = &PL_sv_undef)
3277 PROTOTYPE: $;$ 3617 PROTOTYPE: $;$
3278 CODE: 3618 CODE:
3279{ 3619{
3620 struct coro *coro = SvSTATE (self);
3280 struct coro *current = SvSTATE_current; 3621 struct coro *current = SvSTATE_current;
3281 SV **throwp = self == current ? &CORO_THROW : &self->except; 3622 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3282 SvREFCNT_dec (*throwp); 3623 SvREFCNT_dec (*exceptionp);
3283 SvGETMAGIC (throw); 3624 SvGETMAGIC (exception);
3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3625 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3626
3627 api_ready (aTHX_ self);
3285} 3628}
3286 3629
3287void 3630void
3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3631api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3289 PROTOTYPE: $;$ 3632 PROTOTYPE: $;$
… …
3344 3687
3345void 3688void
3346cancel (Coro::State self) 3689cancel (Coro::State self)
3347 CODE: 3690 CODE:
3348 coro_state_destroy (aTHX_ self); 3691 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351 3692
3352SV * 3693SV *
3353enable_times (int enabled = enable_times) 3694enable_times (int enabled = enable_times)
3354 CODE: 3695 CODE:
3355{ 3696{
… …
3368 3709
3369void 3710void
3370times (Coro::State self) 3711times (Coro::State self)
3371 PPCODE: 3712 PPCODE:
3372{ 3713{
3373 struct coro *current = SvSTATE (coro_current); 3714 struct coro *current = SvSTATE (coro_current);
3374 3715
3375 if (expect_false (current == self)) 3716 if (ecb_expect_false (current == self))
3376 { 3717 {
3377 coro_times_update (); 3718 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current)); 3719 coro_times_add (SvSTATE (coro_current));
3379 } 3720 }
3380 3721
3381 EXTEND (SP, 2); 3722 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3723 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3724 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384 3725
3385 if (expect_false (current == self)) 3726 if (ecb_expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current)); 3727 coro_times_sub (SvSTATE (coro_current));
3387} 3728}
3388 3729
3389void 3730void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3731swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3396 SWAP_SVS (current); 3737 SWAP_SVS (current);
3397 3738
3398 if (!coro->swap_sv) 3739 if (!coro->swap_sv)
3399 coro->swap_sv = newAV (); 3740 coro->swap_sv = newAV ();
3400 3741
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (sv)); 3742 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (swapsv)); 3743 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3403 3744
3404 if (current == coro) 3745 if (current == coro)
3405 SWAP_SVS (current); 3746 SWAP_SVS (current);
3406} 3747}
3407 3748
… …
3411BOOT: 3752BOOT:
3412{ 3753{
3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3754 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3755 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3756 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3416 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3417 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3757 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3418 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3758 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3759 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3760 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3761 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3422 3762
3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3763 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3764 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3765 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3766 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3427 3767
3428 coro_stash = gv_stashpv ("Coro", TRUE); 3768 coro_stash = gv_stashpv ("Coro", TRUE);
3429 3769
3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3771 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3772 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3460 api_ready (aTHX_ RETVAL); 3800 api_ready (aTHX_ RETVAL);
3461 OUTPUT: 3801 OUTPUT:
3462 RETVAL 3802 RETVAL
3463 3803
3464void 3804void
3805_destroy (Coro::State coro)
3806 CODE:
3807 /* used by the manager thread */
3808 coro_state_destroy (aTHX_ coro);
3809
3810void
3811on_destroy (Coro::State coro, SV *cb)
3812 CODE:
3813 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3814
3815void
3816join (...)
3817 CODE:
3818 CORO_EXECUTE_SLF_XS (slf_init_join);
3819
3820void
3465terminate (...) 3821terminate (...)
3466 CODE: 3822 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3823 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3824
3825void
3826cancel (...)
3827 CODE:
3828 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3829
3830int
3831safe_cancel (Coro::State self, ...)
3832 C_ARGS: aTHX_ self, &ST (1), items - 1
3468 3833
3469void 3834void
3470schedule (...) 3835schedule (...)
3471 CODE: 3836 CODE:
3472 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3837 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3629 on_leave = 1 3994 on_leave = 1
3630 PROTOTYPE: & 3995 PROTOTYPE: &
3631 CODE: 3996 CODE:
3632{ 3997{
3633 struct coro *coro = SvSTATE_current; 3998 struct coro *coro = SvSTATE_current;
3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3999 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3635 4000
3636 block = s_get_cv_croak (block); 4001 block = s_get_cv_croak (block);
3637 4002
3638 if (!*avp) 4003 if (!*avp)
3639 *avp = newAV (); 4004 *avp = newAV ();
… …
3659 4024
3660SV * 4025SV *
3661new (SV *klass, SV *count = 0) 4026new (SV *klass, SV *count = 0)
3662 CODE: 4027 CODE:
3663{ 4028{
3664 int semcnt = 1; 4029 int semcnt = 1;
3665 4030
3666 if (count) 4031 if (count)
3667 { 4032 {
3668 SvGETMAGIC (count); 4033 SvGETMAGIC (count);
3669 4034
… …
3729 XSRETURN_NO; 4094 XSRETURN_NO;
3730} 4095}
3731 4096
3732void 4097void
3733waiters (SV *self) 4098waiters (SV *self)
3734 PPCODE: 4099 PPCODE:
3735{ 4100{
3736 AV *av = (AV *)SvRV (self); 4101 AV *av = (AV *)SvRV (self);
3737 int wcount = AvFILLp (av) + 1 - 1; 4102 int wcount = AvFILLp (av) + 1 - 1;
3738 4103
3739 if (GIMME_V == G_SCALAR) 4104 if (GIMME_V == G_SCALAR)
… …
3748} 4113}
3749 4114
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4115MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751 4116
3752void 4117void
3753_may_delete (SV *sem, int count, int extra_refs) 4118_may_delete (SV *sem, int count, unsigned int extra_refs)
3754 PPCODE: 4119 PPCODE:
3755{ 4120{
3756 AV *av = (AV *)SvRV (sem); 4121 AV *av = (AV *)SvRV (sem);
3757 4122
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4123 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3759 && AvFILLp (av) == 0 /* no waiters, just count */ 4124 && AvFILLp (av) == 0 /* no waiters, just count */
3760 && SvIV (AvARRAY (av)[0]) == count) 4125 && SvIV (AvARRAY (av)[0]) == count)
3761 XSRETURN_YES; 4126 XSRETURN_YES;
… …
3782 4147
3783void 4148void
3784broadcast (SV *self) 4149broadcast (SV *self)
3785 CODE: 4150 CODE:
3786{ 4151{
3787 AV *av = (AV *)SvRV (self); 4152 AV *av = (AV *)SvRV (self);
3788 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4153 coro_signal_wake (aTHX_ av, AvFILLp (av));
3789} 4154}
3790 4155
3791void 4156void
3792send (SV *self) 4157send (SV *self)
… …
3800 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4165 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3801} 4166}
3802 4167
3803IV 4168IV
3804awaited (SV *self) 4169awaited (SV *self)
3805 CODE: 4170 CODE:
3806 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4171 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3807 OUTPUT: 4172 OUTPUT:
3808 RETVAL 4173 RETVAL
3809 4174
3810 4175
… …
3815 4180
3816void 4181void
3817_schedule (...) 4182_schedule (...)
3818 CODE: 4183 CODE:
3819{ 4184{
3820 static int incede; 4185 static int incede;
3821 4186
3822 api_cede_notself (aTHX); 4187 api_cede_notself (aTHX);
3823 4188
3824 ++incede; 4189 ++incede;
3825 while (coro_nready >= incede && api_cede (aTHX)) 4190 while (coro_nready >= incede && api_cede (aTHX))
… …
3869 { 4234 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4235 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0; 4236 coro_old_pp_sselect = 0;
3872 } 4237 }
3873 4238
4239MODULE = Coro::State PACKAGE = Coro::Util
3874 4240
4241void
4242_exit (int code)
4243 CODE:
4244 _exit (code);
4245
4246NV
4247time ()
4248 CODE:
4249 RETVAL = nvtime (aTHX);
4250 OUTPUT:
4251 RETVAL
4252
4253NV
4254gettimeofday ()
4255 PPCODE:
4256{
4257 UV tv [2];
4258 u2time (aTHX_ tv);
4259 EXTEND (SP, 2);
4260 PUSHs (sv_2mortal (newSVuv (tv [0])));
4261 PUSHs (sv_2mortal (newSVuv (tv [1])));
4262}
4263

Diff Legend

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