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.375 by root, Fri Oct 2 19:58:02 2009 UTC vs.
Revision 1.468 by root, Sat Oct 29 19:12:46 2016 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#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
15#include <stdio.h> 23#include <stdio.h>
16#include <errno.h> 24#include <errno.h>
17#include <assert.h> 25#include <assert.h>
18 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
19#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
21#endif 37#endif
22 38
23#ifdef WIN32 39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
24# undef setjmp 70# undef setjmp
25# undef longjmp 71# undef longjmp
26# undef _exit 72# undef _exit
27# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
28#else 74#else
29# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
30#endif 76#endif
31 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
61 80
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
63# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
64#endif
65
66#ifndef CORO_STACKGUARD
67# define CORO_STACKGUARD 0
68#endif 83#endif
69 84
70/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
71#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
72# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
82# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
83#endif 98#endif
84 99
85#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
86 101
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" 102#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
104 104
105#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
106# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
116# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif 118# endif
119#endif 119#endif
120 120
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
121static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
123 129
124/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 132static OP *pp_slf (pTHX);
133static void slf_destroy (pTHX_ struct coro *coro);
127 134
128static U32 cctx_gen; 135static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 136static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 137static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 138static AV *main_mainstack; /* used to differentiate between $main and others */
… …
139 146
140static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
141static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
142static SV *rv_diehook; 149static SV *rv_diehook;
143static SV *rv_warnhook; 150static SV *rv_warnhook;
144static HV *hv_sig; /* %SIG */
145 151
146/* async_pool helper stuff */ 152/* async_pool helper stuff */
147static SV *sv_pool_rss; 153static SV *sv_pool_rss;
148static SV *sv_pool_size; 154static SV *sv_pool_size;
149static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
… …
161static char times_valid; 167static char times_valid;
162 168
163static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
165 171
166enum { 172enum
173{
167 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176typedef struct coro_cctx 183typedef struct coro_cctx
177{ 184{
178 struct coro_cctx *next; 185 struct coro_cctx *next;
179 186
180 /* the stack */ 187 /* the stack */
181 void *sptr; 188 struct coro_stack stack;
182 size_t ssize;
183 189
184 /* cpu state */ 190 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
192#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
194#endif
187 JMPENV *top_env; 195 JMPENV *top_env;
188 coro_context cctx; 196 coro_context cctx;
189 197
190 U32 gen; 198 U32 gen;
191#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
192 int valgrind_id; 200 int valgrind_id;
193#endif 201#endif
194 unsigned char flags; 202 unsigned char flags;
195} coro_cctx; 203} coro_cctx;
196 204
197coro_cctx *cctx_current; /* the currently running cctx */ 205static coro_cctx *cctx_current; /* the currently running cctx */
198 206
199/*****************************************************************************/ 207/*****************************************************************************/
200 208
209static MGVTBL coro_state_vtbl;
210
201enum { 211enum
212{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 217 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 219};
208 220
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 221/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 222typedef struct
211{ 223{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
218# include "state.h" 225 #include "state.h"
219#undef VAR
220} perl_slots; 226} perl_slots;
221 227
228/* 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)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 230
224/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
225struct coro { 232struct coro
233{
226 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 235 coro_cctx *cctx;
228 236
229 /* ready queue */ 237 /* ready queue */
230 struct coro *next_ready; 238 struct coro *next_ready;
… …
232 /* state data */ 240 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 242 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
236 244
237 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 249
244 /* statistics */ 250 /* statistics */
245 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
246 252
247 /* coro process data */ 253 /* coro process data */
248 int prio; 254 int prio;
249 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 256 SV *rouse_cb; /* last rouse callback */
257 AV *on_destroy; /* callbacks or coros to notify on destroy */
258 AV *status; /* the exit status list */
251 259
252 /* async_pool */ 260 /* async_pool */
253 SV *saved_deffh; 261 SV *saved_deffh;
254 SV *invoke_cb; 262 SV *invoke_cb;
255 AV *invoke_av; 263 AV *invoke_av;
256 264
257 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
258 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
259 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
260 268
261 /* swap_sv */ 269 /* swap_sv */
262 AV *swap_sv; 270 AV *swap_sv;
263 271
264 /* times */ 272 /* times */
… …
271typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
273 281
274/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
278 286
279/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
280 288
281#define CORO_PRIO_MAX 3 289#define CORO_PRIO_MAX 3
… …
287 295
288/* for Coro.pm */ 296/* for Coro.pm */
289static SV *coro_current; 297static SV *coro_current;
290static SV *coro_readyhook; 298static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
293static struct coro *coro_first; 301static struct coro *coro_first;
294#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
303
304/** JIT *********************************************************************/
305
306#if CORO_JIT
307 /* APPLE doesn't have mmap though */
308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
309 #ifndef CORO_JIT_TYPE
310 #if ECB_AMD64 && CORO_JIT_UNIXY
311 #define CORO_JIT_TYPE "amd64-unix"
312 #elif __i386 && CORO_JIT_UNIXY
313 #define CORO_JIT_TYPE "x86-unix"
314 #endif
315 #endif
316#endif
317
318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
319 #undef CORO_JIT
320#endif
321
322#if CORO_JIT
323 typedef void (*load_save_perl_slots_type)(perl_slots *);
324 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
325#endif
295 326
296/** Coro::Select ************************************************************/ 327/** Coro::Select ************************************************************/
297 328
298static OP *(*coro_old_pp_sselect) (pTHX); 329static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 330static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 342 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 343 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 344 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 345}
315 346
347/** time stuff **************************************************************/
348
349#ifdef HAS_GETTIMEOFDAY
350
351ecb_inline void
352coro_u2time (pTHX_ UV ret[2])
353{
354 struct timeval tv;
355 gettimeofday (&tv, 0);
356
357 ret [0] = tv.tv_sec;
358 ret [1] = tv.tv_usec;
359}
360
361ecb_inline double
362coro_nvtime (void)
363{
364 struct timeval tv;
365 gettimeofday (&tv, 0);
366
367 return tv.tv_sec + tv.tv_usec * 1e-6;
368}
369
370ecb_inline void
371time_init (pTHX)
372{
373 nvtime = coro_nvtime;
374 u2time = coro_u2time;
375}
376
377#else
378
379ecb_inline void
380time_init (pTHX)
381{
382 SV **svp;
383
384 require_pv ("Time/HiRes.pm");
385
386 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
387
388 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
389 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
390
391 nvtime = INT2PTR (double (*)(), SvIV (*svp));
392
393 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
394 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
395}
396
397#endif
398
316/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
317 400
318static SV * 401static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
320{ 403{
321#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 406 get_sv (name, create);
324#endif 407#endif
325 return get_sv (name, create); 408 return get_sv (name, create);
326} 409}
327 410
328static AV * 411static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
330{ 413{
331#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 416 get_av (name, create);
334#endif 417#endif
335 return get_av (name, create); 418 return get_av (name, create);
336} 419}
337 420
338static HV * 421static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
340{ 423{
341#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 426 get_hv (name, create);
344#endif 427#endif
345 return get_hv (name, create); 428 return get_hv (name, create);
346} 429}
347 430
348INLINE void 431ecb_inline void
349coro_times_update () 432coro_times_update (void)
350{ 433{
351#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
352 struct timespec ts; 435 struct timespec ts;
353 436
354 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
368#endif 451#endif
369} 452}
370 453
371INLINE void 454ecb_inline void
372coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
373{ 456{
374 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
381} 464}
382 465
383INLINE void 466ecb_inline void
384coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
385{ 468{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 469 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]; 470 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 479/* magic glue */
397 480
398#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 483
401#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 487 : mg_find (sv, type))
405 488
406#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 492 : 0)
410 493
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 494#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) 495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 496
414INLINE struct coro * 497ecb_inline MAGIC *
415SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
416{ 499{
417 HV *stash;
418 MAGIC *mg; 500 MAGIC *mg;
419 501
502 if (ecb_expect_true (
503 SvTYPE (coro) == SVt_PVHV
504 && (mg = CORO_MAGIC_state (coro))
505 && mg->mg_virtual == &coro_state_vtbl
506 ))
507 return mg;
508
509 return 0;
510}
511
512ecb_inline struct coro *
513SvSTATE_ (pTHX_ SV *coro_sv)
514{
515 MAGIC *mg;
516
420 if (SvROK (coro)) 517 if (SvROK (coro_sv))
421 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
422 519
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
424 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
425 523
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; 524 return (struct coro *)mg->mg_ptr;
436} 525}
437 526
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 528
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 532
444/*****************************************************************************/ 533/*****************************************************************************/
445/* padlist management and caching */ 534/* padlist management and caching */
446 535
447static AV * 536ecb_inline PADLIST *
448coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
449{ 538{
450 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
452 544
453 newpadlist = newAV (); 545#if NEWPADAPI
546
547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off);
561#else
562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif
564
565 newpad = PadlistARRAY (padlist)[off];
566 PadlistMAX (padlist) = off - 1;
567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
454 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
455#if PERL_VERSION_ATLEAST (5,10,0)
456 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
457#else
458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
459#endif 574#endif
460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
461 --AvFILLp (padlist);
462 575
463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
464 av_store (newpadlist, 1, (SV *)newpad); 577 PadlistMAX (newpadlist) = 1;
578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
583 PadlistARRAY (newpadlist)[1] = newpad;
465 584
466 return newpadlist; 585 return newpadlist;
467} 586}
468 587
469static void 588ecb_inline void
470free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
471{ 590{
472 /* may be during global destruction */ 591 /* may be during global destruction */
473 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
474 { 593 {
475 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
476 595
477 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
478 { 597 {
479 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
480 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
481 I32 j = AvFILLp (av);
482 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
483 while (j >= 0) 605 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 607
486 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
488 } 611 }
489 612
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
491 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
492 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
494 } 623 }
495} 624}
496 625
497static int 626static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 628{
500 AV *padlist; 629 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 630 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
631 size_t len = *(size_t *)mg->mg_ptr;
502 632
503 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
505 return 0; 635 return 0;
506 636
507 /* casting is fun. */ 637 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 639
513 return 0; 640 return 0;
514} 641}
515 642
516static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 644 0, 0, 0, 0,
518 coro_cv_free 645 coro_cv_free
519}; 646};
520 647
521/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
522static void 649ecb_inline void
523get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
524{ 651{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 653 size_t *lenp;
527 654
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 657 else
531 { 658 {
532#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 668#endif
542 } 669 }
543} 670}
544 671
545static void 672ecb_inline void
546put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
547{ 674{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 676
551 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 679 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
680 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
681 mg->mg_len = 1; /* so mg_free frees mg_ptr */
682 }
683 else
684 Renew (mg->mg_ptr,
685 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
686 char);
553 687
554 av = (AV *)mg->mg_obj; 688 ((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} 689}
561 690
562/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
563 692
693ecb_inline void
694swap_sv (SV *a, SV *b)
695{
696 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
697 SV tmp;
698
699 /* swap sv_any */
700 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
701
702 /* swap sv_flags */
703 SvFLAGS (&tmp) = SvFLAGS (a);
704 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
705 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
706
707#if PERL_VERSION_ATLEAST (5,10,0)
708 /* perl 5.10 and later complicates this _quite_ a bit, but it also
709 * is much faster, so no quarrels here. alternatively, we could
710 * sv_upgrade to avoid this.
711 */
712 {
713 /* swap sv_u */
714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
715
716 /* if SvANY points to the head, we need to adjust the pointers,
717 * as the pointer for a still points to b, and maybe vice versa.
718 */
719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
725
726 if (svany_in_head (SvTYPE (a)))
727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
728
729 if (svany_in_head (SvTYPE (b)))
730 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
731 }
732#endif
733}
734
564/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
565static void 736static void
566swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
567{ 738{
568 int i; 739 int i;
569 740
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 742 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} 743}
610 744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
611#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
614 761
615static void 762static void
616on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
617 764
618static void 765static void
… …
621 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
622 c->slot = 0; 769 c->slot = 0;
623 770
624 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
625 772
626 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 775#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 777 #include "state.h"
634 #undef VAR 778#endif
635 779
636 { 780 {
637 dSP; 781 dSP;
638 782
639 CV *cv; 783 CV *cv;
640 784
641 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
643 { 787 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 791 }
648 792
649 PUTBACK; 793 PUTBACK;
650 } 794 }
651 795
652 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 797 CORO_THROW = c->except;
654 798
655 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
656 { 800 {
657 if (expect_false (!times_valid)) 801 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 802 coro_times_update ();
659 803
660 coro_times_sub (c); 804 coro_times_sub (c);
661 } 805 }
662 806
663 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
664 { 808 {
665 int i; 809 int i;
666 810
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
669 } 813 }
670 814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
671 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
672} 824}
673 825
674static void 826static void
675save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
676{ 828{
677 SWAP_SVS (c); 829 SWAP_SVS_LEAVE (c);
678 830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
838
679 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
680 { 840 {
681 int i; 841 int i;
682 842
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 845 }
686 846
687 times_valid = 0; 847 times_valid = 0;
688 848
689 if (expect_false (enable_times)) 849 if (ecb_expect_false (enable_times))
690 { 850 {
691 coro_times_update (); times_valid = 1; 851 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 852 coro_times_add (c);
693 } 853 }
694 854
… …
708 868
709 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
711 for (;;) 871 for (;;)
712 { 872 {
713 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
714 { 874 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
716 876
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 877 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 878 {
719 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
720 880
721 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
722 { 882 {
883 EXTEND (SP, 3);
723 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
725 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
726 887
727 CvDEPTH (cv) = 0; 888 CvDEPTH (cv) = 0;
728 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
729 } 890 }
730 } 891 }
731 } 892 }
732 893
733 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
734 break; 895 break;
735 896
736 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
737 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
738 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
740 901
741 PUTBACK; 902 PUTBACK;
742 } 903 }
743 904
744 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
745 /* we manually unroll here, as usually 2 slots is enough */ 906 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 { 907 {
750 unsigned int i; 908 unsigned int i;
909
751 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
752 CXINC; 911 CXINC;
753 } 912
754 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
755 915
756 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
757 917
758 { 918 {
759 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
760 920
761 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
762 slot->defsv = DEFSV; 922 save_perl_slots (slot);
763 slot->errsv = ERRSV; 923#else
764 slot->irsgv = GvSV (irsgv);
765 slot->hinthv = GvHV (PL_hintgv);
766
767 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
768 # include "state.h" 925 #include "state.h"
769 #undef VAR 926#endif
770 } 927 }
771} 928}
772 929
773/* 930/*
774 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
780# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
781#else 938#else
782static void 939static void
783coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
784{ 941{
785 PL_curstackinfo = new_stackinfo(32, 8); 942 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; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
787 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
788 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
789 946
790 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
805#endif 962#endif
806 963
807 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
808 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
809 PL_scopestack_max = 8; 966 PL_scopestack_max = 8;
967#if HAS_SCOPESTACK_NAME
968 New(54,PL_scopestack_name,8,const char*);
969#endif
810 970
811 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
812 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
813 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
814 979
815#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
816 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
817 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
818 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
842 } 1007 }
843 1008
844 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
845 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
846 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
847 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
848#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
849 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
850#endif 1018#endif
851} 1019}
… …
881 } 1049 }
882 1050
883 return rss; 1051 return rss;
884} 1052}
885 1053
886/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
887
888static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
889static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
890static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
891 1055
892/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
893#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
894#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
895 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
896 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
897#endif 1061#endif
898 1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 char *key = SvPV_nolen ((SV *)name);
1070
1071 /* do what mg_copy normally does */
1072 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1073 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1074
1075 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1076 if (*key == '_'
1077 && (strEQ (key, "__DIE__")
1078 || strEQ (key, "__WARN__")))
1079 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1080
1081 return 1;
1082}
1083
1084/* perl does not have a %SIG vtbl, we provide one so we can override */
1085/* the magic vtbl for the __DIE__ and __WARN__ members */
1086static const MGVTBL coro_sig_vtbl = {
1087 0, 0, 0, 0, 0,
1088 coro_sig_copy
1089};
1090
899/* 1091/*
900 * This overrides the default magic get method of %SIG elements. 1092 * 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 1093 * 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 1094 * and instead of trying to save and restore the hash elements (extremely slow),
903 * readback here. 1095 * we just provide our own readback here.
904 */ 1096 */
905static int 1097static int ecb_cold
906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
907{ 1099{
908 const char *s = MgPV_nolen_const (mg); 1100 const char *s = MgPV_nolen_const (mg);
1101 /* the key must be either __DIE__ or __WARN__ here */
1102 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
909 1103
910 if (*s == '_') 1104 SV *ssv;
911 {
912 SV **svp = 0;
913 1105
914 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
915 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
916
917 if (svp) 1106 if (!*svp)
918 { 1107 ssv = &PL_sv_undef;
919 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
920 return 0; 1109 ssv = sv_2mortal (newRV_inc (*svp));
921 } 1110 else
922 } 1111 ssv = *svp;
923 1112
924 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1113 sv_setsv (sv, ssv);
1114 return 0;
925} 1115}
926 1116
927static int 1117static int ecb_cold
928coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
929{ 1119{
930 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
1121 /* the key must be either __DIE__ or __WARN__ here */
1122 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
931 1123
932 if (*s == '_')
933 {
934 SV **svp = 0;
935
936 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
937 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
938
939 if (svp)
940 {
941 SV *old = *svp; 1124 SV *old = *svp;
942 *svp = 0; 1125 *svp = 0;
943 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
944 return 0; 1127 return 0;
945 }
946 }
947
948 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
949} 1128}
950 1129
951static int 1130static int ecb_cold
952coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
953{ 1132{
954 const char *s = MgPV_nolen_const (mg); 1133 const char *s = MgPV_nolen_const (mg);
1134 /* the key must be either __DIE__ or __WARN__ here */
1135 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
955 1136
956 if (*s == '_')
957 {
958 SV **svp = 0;
959
960 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
961 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
962
963 if (svp)
964 {
965 SV *old = *svp; 1137 SV *old = *svp;
966 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
967 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
968 return 0; 1140 return 0;
969 }
970 }
971
972 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
973} 1141}
974 1142
975static void 1143static void
976prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
977{ 1145{
… …
989slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
990{ 1158{
991 return 1; 1159 return 1;
992} 1160}
993 1161
1162/** coroutine stack handling ************************************************/
1163
994static UNOP init_perl_op; 1164static UNOP init_perl_op;
995 1165
996static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1166ecb_noinline static void /* noinline to keep it out of the transfer fast path */
997init_perl (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
998{ 1168{
999 /* 1169 /*
1000 * emulate part of the perl startup here. 1170 * emulate part of the perl startup here.
1001 */ 1171 */
… …
1009 PL_comppad_name_fill = 0; 1179 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0; 1180 PL_comppad_name_floor = 0;
1011 PL_curpm = 0; 1181 PL_curpm = 0;
1012 PL_curpad = 0; 1182 PL_curpad = 0;
1013 PL_localizing = 0; 1183 PL_localizing = 0;
1014 PL_dirty = 0;
1015 PL_restartop = 0; 1184 PL_restartop = 0;
1016#if PERL_VERSION_ATLEAST (5,10,0) 1185#if PERL_VERSION_ATLEAST (5,10,0)
1017 PL_parser = 0; 1186 PL_parser = 0;
1018#endif 1187#endif
1019 PL_hints = 0; 1188 PL_hints = 0;
1020 1189
1021 /* recreate the die/warn hooks */ 1190 /* recreate the die/warn hooks */
1022 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1191 PL_diehook = SvREFCNT_inc (rv_diehook);
1023 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1192 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1024 1193
1025 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
1026 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
1027 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
1028 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1197 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1029 GvHV (PL_hintgv) = 0; 1198 GvHV (PL_hintgv) = newHV ();
1199#if PERL_VERSION_ATLEAST (5,10,0)
1200 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1201#endif
1030 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
1031 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1032 1204
1033 { 1205 {
1034 dSP; 1206 dSP;
… …
1049 /* this newly created coroutine might be run on an existing cctx which most 1221 /* 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. 1222 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1051 */ 1223 */
1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1224 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 */ 1225 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1226 slf_frame.destroy = 0;
1054 1227
1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1228 /* 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; 1229 init_perl_op.op_next = PL_op;
1057 init_perl_op.op_type = OP_ENTERSUB; 1230 init_perl_op.op_type = OP_ENTERSUB;
1058 init_perl_op.op_ppaddr = pp_slf; 1231 init_perl_op.op_ppaddr = pp_slf;
… …
1061 PL_op = (OP *)&init_perl_op; 1234 PL_op = (OP *)&init_perl_op;
1062 1235
1063 /* copy throw, in case it was set before init_perl */ 1236 /* copy throw, in case it was set before init_perl */
1064 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
1065 1238
1066 SWAP_SVS (coro); 1239 SWAP_SVS_ENTER (coro);
1067 1240
1068 if (expect_false (enable_times)) 1241 if (ecb_expect_false (enable_times))
1069 { 1242 {
1070 coro_times_update (); 1243 coro_times_update ();
1071 coro_times_sub (coro); 1244 coro_times_sub (coro);
1072 } 1245 }
1073} 1246}
… …
1097destroy_perl (pTHX_ struct coro *coro) 1270destroy_perl (pTHX_ struct coro *coro)
1098{ 1271{
1099 SV *svf [9]; 1272 SV *svf [9];
1100 1273
1101 { 1274 {
1275 SV *old_current = SvRV (coro_current);
1102 struct coro *current = SvSTATE_current; 1276 struct coro *current = SvSTATE (old_current);
1103 1277
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1278 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105 1279
1106 save_perl (aTHX_ current); 1280 save_perl (aTHX_ current);
1281
1282 /* this will cause transfer_check to croak on block*/
1283 SvRV_set (coro_current, (SV *)coro->hv);
1284
1107 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1108 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1109 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1291
1110 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1111 1293
1112 /* restore swapped sv's */
1113 SWAP_SVS (coro);
1114
1115 // now save some sv's to be free'd later 1294 /* now save some sv's to be free'd later */
1116 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv); 1296 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv); 1297 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv; 1298 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs; 1299 svf [4] = PL_rs;
… …
1122 svf [6] = (SV *)GvHV (PL_hintgv); 1301 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook; 1302 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook; 1303 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf)); 1304 assert (9 == sizeof (svf) / sizeof (*svf));
1126 1305
1306 SvRV_set (coro_current, old_current);
1307
1127 load_perl (aTHX_ current); 1308 load_perl (aTHX_ current);
1128 } 1309 }
1129 1310
1130 { 1311 {
1131 unsigned int i; 1312 unsigned int i;
… …
1135 1316
1136 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1137 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1138 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1139 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1140 SvREFCNT_dec (coro->swap_sv); 1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1141 } 1323 }
1142} 1324}
1143 1325
1144INLINE void 1326ecb_inline void
1145free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1146{ 1328{
1147 if (expect_true (coro_mortal)) 1329 if (ecb_expect_true (coro_mortal))
1148 { 1330 {
1149 SvREFCNT_dec (coro_mortal); 1331 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1332 coro_mortal = 0;
1151 } 1333 }
1152} 1334}
1153 1335
1154static int 1336static int
… …
1208 1390
1209 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1210 { 1392 {
1211 SV **cb; 1393 SV **cb;
1212 1394
1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1214 { 1396 {
1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1216 1398
1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1218 { 1400 {
… …
1287 1469
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1470 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1471}
1290 1472
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1473/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1474static void ecb_noinline
1293cctx_prepare (pTHX) 1475cctx_prepare (pTHX)
1294{ 1476{
1295 PL_top_env = &PL_start_env; 1477 PL_top_env = &PL_start_env;
1296 1478
1297 if (cctx_current->flags & CC_TRACE) 1479 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1490 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1491 slf_frame.check = slf_check_set_stacklevel;
1310} 1492}
1311 1493
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1494/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1495ecb_inline void
1314transfer_tail (pTHX) 1496transfer_tail (pTHX)
1315{ 1497{
1316 free_coro_mortal (aTHX); 1498 free_coro_mortal (aTHX);
1499}
1500
1501/* try to exit the same way perl's main function would do */
1502/* we do not bother resetting the environment or other things *7
1503/* that are not, uhm, essential */
1504/* this obviously also doesn't work when perl is embedded */
1505static void ecb_noinline ecb_cold
1506perlish_exit (pTHX)
1507{
1508 int exitstatus = perl_destruct (PL_curinterp);
1509 perl_free (PL_curinterp);
1510 exit (exitstatus);
1317} 1511}
1318 1512
1319/* 1513/*
1320 * this is a _very_ stripped down perl interpreter ;) 1514 * this is a _very_ stripped down perl interpreter ;)
1321 */ 1515 */
… …
1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1542 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread. 1543 * runtime errors here, as this is just a random interpreter, not a thread.
1350 */ 1544 */
1351 1545
1352 /* 1546 /*
1547 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1548 * requires PL_scopestack_ix, so do it here if required.
1549 */
1550 if (!PL_scopestack_ix)
1551 ENTER;
1552
1553 /*
1353 * If perl-run returns we assume exit() was being called or the coro 1554 * 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) 1555 * 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 1556 * 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" 1557 * 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 */ 1558 */
1361 PL_top_env = main_top_env; 1559 perlish_exit (aTHX);
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1560 }
1364} 1561}
1365 1562
1366static coro_cctx * 1563static coro_cctx *
1367cctx_new () 1564cctx_new (void)
1368{ 1565{
1369 coro_cctx *cctx; 1566 coro_cctx *cctx;
1370 1567
1371 ++cctx_count; 1568 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1569 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1575 return cctx;
1379} 1576}
1380 1577
1381/* create a new cctx only suitable as source */ 1578/* create a new cctx only suitable as source */
1382static coro_cctx * 1579static coro_cctx *
1383cctx_new_empty () 1580cctx_new_empty (void)
1384{ 1581{
1385 coro_cctx *cctx = cctx_new (); 1582 coro_cctx *cctx = cctx_new ();
1386 1583
1387 cctx->sptr = 0; 1584 cctx->stack.sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1585 coro_create (&cctx->cctx, 0, 0, 0, 0);
1389 1586
1390 return cctx; 1587 return cctx;
1391} 1588}
1392 1589
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1590/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1591static coro_cctx *
1395cctx_new_run () 1592cctx_new_run (void)
1396{ 1593{
1397 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1398 void *stack_start;
1399 size_t stack_size;
1400 1595
1401#if HAVE_MMAP 1596 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 } 1597 {
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."); 1598 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1424 _exit (EXIT_FAILURE); 1599 _exit (EXIT_FAILURE);
1425 }
1426
1427 stack_start = cctx->sptr;
1428 stack_size = cctx->ssize;
1429 } 1600 }
1430 1601
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); 1602 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1436 1603
1437 return cctx; 1604 return cctx;
1438} 1605}
1439 1606
1440static void 1607static void
1441cctx_destroy (coro_cctx *cctx) 1608cctx_destroy (coro_cctx *cctx)
1442{ 1609{
1443 if (!cctx) 1610 if (!cctx)
1444 return; 1611 return;
1445 1612
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1613 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1614
1448 --cctx_count; 1615 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1616 coro_destroy (&cctx->cctx);
1450 1617
1451 /* coro_transfer creates new, empty cctx's */ 1618 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 1619
1466 Safefree (cctx); 1620 Safefree (cctx);
1467} 1621}
1468 1622
1469/* wether this cctx should be destructed */ 1623/* wether this cctx should be destructed */
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1624#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1625
1472static coro_cctx * 1626static coro_cctx *
1473cctx_get (pTHX) 1627cctx_get (pTHX)
1474{ 1628{
1475 while (expect_true (cctx_first)) 1629 while (ecb_expect_true (cctx_first))
1476 { 1630 {
1477 coro_cctx *cctx = cctx_first; 1631 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1632 cctx_first = cctx->next;
1479 --cctx_idle; 1633 --cctx_idle;
1480 1634
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1635 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1636 return cctx;
1483 1637
1484 cctx_destroy (cctx); 1638 cctx_destroy (cctx);
1485 } 1639 }
1486 1640
… …
1488} 1642}
1489 1643
1490static void 1644static void
1491cctx_put (coro_cctx *cctx) 1645cctx_put (coro_cctx *cctx)
1492{ 1646{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1647 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1494 1648
1495 /* free another cctx if overlimit */ 1649 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1650 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1651 {
1498 coro_cctx *first = cctx_first; 1652 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1653 cctx_first = first->next;
1500 --cctx_idle; 1654 --cctx_idle;
1501 1655
… …
1512static void 1666static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1667transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1668{
1515 /* TODO: throwing up here is considered harmful */ 1669 /* TODO: throwing up here is considered harmful */
1516 1670
1517 if (expect_true (prev != next)) 1671 if (ecb_expect_true (prev != next))
1518 { 1672 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1673 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,"); 1674 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1675
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1676 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,"); 1677 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1678
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1679#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1680 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,"); 1681 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1682#endif
1529 } 1683 }
1530} 1684}
1531 1685
1532/* always use the TRANSFER macro */ 1686/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1687static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1688transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1689{
1536 dSTACKLEVEL; 1690 dSTACKLEVEL;
1537 1691
1538 /* sometimes transfer is only called to set idle_sp */ 1692 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1693 if (ecb_expect_false (!prev))
1540 { 1694 {
1541 cctx_current->idle_sp = STACKLEVEL; 1695 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1696 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1697 }
1544 else if (expect_true (prev != next)) 1698 else if (ecb_expect_true (prev != next))
1545 { 1699 {
1546 coro_cctx *cctx_prev; 1700 coro_cctx *cctx_prev;
1547 1701
1548 if (expect_false (prev->flags & CF_NEW)) 1702 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1703 {
1550 /* create a new empty/source context */ 1704 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1705 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1706 prev->flags |= CF_RUNNING;
1553 } 1707 }
… …
1556 next->flags |= CF_RUNNING; 1710 next->flags |= CF_RUNNING;
1557 1711
1558 /* first get rid of the old state */ 1712 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1713 save_perl (aTHX_ prev);
1560 1714
1561 if (expect_false (next->flags & CF_NEW)) 1715 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1716 {
1563 /* need to start coroutine */ 1717 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1718 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1719 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1720 init_perl (aTHX_ next);
1567 } 1721 }
1568 else 1722 else
1569 load_perl (aTHX_ next); 1723 load_perl (aTHX_ next);
1570 1724
1571 /* possibly untie and reuse the cctx */ 1725 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1726 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1727 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1728 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1729 && !force_cctx
1576 )) 1730 ))
1577 { 1731 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1732 /* 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)); 1733 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1734
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1735 /* 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 */ 1736 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1737 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1738 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1739 next->cctx = cctx_get (aTHX);
1586 1740
1587 cctx_put (cctx_current); 1741 cctx_put (cctx_current);
1588 } 1742 }
1589 else 1743 else
1590 prev->cctx = cctx_current; 1744 prev->cctx = cctx_current;
1591 1745
1592 ++next->usecount; 1746 ++next->usecount;
1593 1747
1594 cctx_prev = cctx_current; 1748 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1749 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1750
1597 next->cctx = 0; 1751 next->cctx = 0;
1598 1752
1599 if (expect_false (cctx_prev != cctx_current)) 1753 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1754 {
1601 cctx_prev->top_env = PL_top_env; 1755 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1756 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1757 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1758 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1764#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) 1765#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1766
1613/** high level stuff ********************************************************/ 1767/** high level stuff ********************************************************/
1614 1768
1769/* this function is actually Coro, not Coro::State, but we call it from here */
1770/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1771static void
1772coro_call_on_destroy (pTHX_ struct coro *coro);
1773
1774static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1775coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1776{
1618 if (coro->flags & CF_DESTROYED) 1777 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1778 return;
1620 1779
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1780 slf_destroy (aTHX_ coro);
1623 1781
1624 coro->flags |= CF_DESTROYED; 1782 coro->flags |= CF_ZOMBIE;
1625 1783
1626 if (coro->flags & CF_READY) 1784 if (coro->flags & CF_READY)
1627 { 1785 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1786 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1787 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1788 --coro_nready;
1631 } 1789 }
1632 else 1790 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1791 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1792
1793 if (coro->next) coro->next->prev = coro->prev;
1794 if (coro->prev) coro->prev->next = coro->next;
1795 if (coro == coro_first) coro_first = coro->next;
1634 1796
1635 if (coro->mainstack 1797 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1798 && coro->mainstack != main_mainstack
1637 && coro->slot 1799 && coro->slot
1638 && !PL_dirty) 1800 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1801 destroy_perl (aTHX_ coro);
1640 1802
1641 cctx_destroy (coro->cctx); 1803 cctx_destroy (coro->cctx);
1642 SvREFCNT_dec (coro->startcv); 1804 SvREFCNT_dec (coro->startcv);
1643 SvREFCNT_dec (coro->args); 1805 SvREFCNT_dec (coro->args);
1806 SvREFCNT_dec (coro->swap_sv);
1644 SvREFCNT_dec (CORO_THROW); 1807 SvREFCNT_dec (CORO_THROW);
1645 1808
1646 if (coro->next) coro->next->prev = coro->prev; 1809 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 1810
1650 return 1; 1811 /* more destruction mayhem in coro_state_free */
1651} 1812}
1652 1813
1653static int 1814static int
1654coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1815coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1655{ 1816{
1656 struct coro *coro = (struct coro *)mg->mg_ptr; 1817 struct coro *coro = (struct coro *)mg->mg_ptr;
1657 mg->mg_ptr = 0; 1818 mg->mg_ptr = 0;
1658 1819
1659 coro->hv = 0;
1660
1661 if (--coro->refcnt < 0)
1662 {
1663 coro_state_destroy (aTHX_ coro); 1820 coro_state_destroy (aTHX_ coro);
1821 SvREFCNT_dec (coro->on_destroy);
1822 SvREFCNT_dec (coro->status);
1823
1664 Safefree (coro); 1824 Safefree (coro);
1665 }
1666 1825
1667 return 0; 1826 return 0;
1668} 1827}
1669 1828
1670static int 1829static int ecb_cold
1671coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1830coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1672{ 1831{
1673 struct coro *coro = (struct coro *)mg->mg_ptr; 1832 /* called when perl clones the current process the slow way (windows process emulation) */
1674 1833 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1675 ++coro->refcnt; 1834 mg->mg_ptr = 0;
1835 mg->mg_virtual = 0;
1676 1836
1677 return 0; 1837 return 0;
1678} 1838}
1679 1839
1680static MGVTBL coro_state_vtbl = { 1840static MGVTBL coro_state_vtbl = {
… …
1705 TRANSFER (ta, 1); 1865 TRANSFER (ta, 1);
1706} 1866}
1707 1867
1708/** Coro ********************************************************************/ 1868/** Coro ********************************************************************/
1709 1869
1710INLINE void 1870ecb_inline void
1711coro_enq (pTHX_ struct coro *coro) 1871coro_enq (pTHX_ struct coro *coro)
1712{ 1872{
1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1873 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1714 1874
1715 SvREFCNT_inc_NN (coro->hv); 1875 SvREFCNT_inc_NN (coro->hv);
… …
1717 coro->next_ready = 0; 1877 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1878 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro; 1879 ready [1] = coro;
1720} 1880}
1721 1881
1722INLINE struct coro * 1882ecb_inline struct coro *
1723coro_deq (pTHX) 1883coro_deq (pTHX)
1724{ 1884{
1725 int prio; 1885 int prio;
1726 1886
1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1887 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1780{ 1940{
1781 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1941 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1782} 1942}
1783 1943
1784/* expects to own a reference to next->hv */ 1944/* expects to own a reference to next->hv */
1785INLINE void 1945ecb_inline void
1786prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1946prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1787{ 1947{
1788 SV *prev_sv = SvRV (coro_current); 1948 SV *prev_sv = SvRV (coro_current);
1789 1949
1790 ta->prev = SvSTATE_hv (prev_sv); 1950 ta->prev = SvSTATE_hv (prev_sv);
… …
1803{ 1963{
1804 for (;;) 1964 for (;;)
1805 { 1965 {
1806 struct coro *next = coro_deq (aTHX); 1966 struct coro *next = coro_deq (aTHX);
1807 1967
1808 if (expect_true (next)) 1968 if (ecb_expect_true (next))
1809 { 1969 {
1810 /* cannot transfer to destroyed coros, skip and look for next */ 1970 /* cannot transfer to destroyed coros, skip and look for next */
1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1971 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 */ 1972 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1813 else 1973 else
1814 { 1974 {
1815 next->flags &= ~CF_READY; 1975 next->flags &= ~CF_READY;
1816 --coro_nready; 1976 --coro_nready;
… …
1823 { 1983 {
1824 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1827 { 1987 {
1988 if (SvRV (sv_idle) == SvRV (coro_current))
1989 {
1990 require_pv ("Carp");
1991
1992 {
1993 dSP;
1994
1995 ENTER;
1996 SAVETMPS;
1997
1998 PUSHMARK (SP);
1999 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2000 PUTBACK;
2001 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2002
2003 FREETMPS;
2004 LEAVE;
2005 }
2006 }
2007
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2008 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready; 2010 --coro_nready;
1831 } 2011 }
1832 else 2012 else
… …
1846 } 2026 }
1847 } 2027 }
1848 } 2028 }
1849} 2029}
1850 2030
1851INLINE void 2031ecb_inline void
1852prepare_cede (pTHX_ struct coro_transfer_args *ta) 2032prepare_cede (pTHX_ struct coro_transfer_args *ta)
1853{ 2033{
1854 api_ready (aTHX_ coro_current); 2034 api_ready (aTHX_ coro_current);
1855 prepare_schedule (aTHX_ ta); 2035 prepare_schedule (aTHX_ ta);
1856} 2036}
1857 2037
1858INLINE void 2038ecb_inline void
1859prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2039prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1860{ 2040{
1861 SV *prev = SvRV (coro_current); 2041 SV *prev = SvRV (coro_current);
1862 2042
1863 if (coro_nready) 2043 if (coro_nready)
… …
1893{ 2073{
1894 struct coro_transfer_args ta; 2074 struct coro_transfer_args ta;
1895 2075
1896 prepare_cede (aTHX_ &ta); 2076 prepare_cede (aTHX_ &ta);
1897 2077
1898 if (expect_true (ta.prev != ta.next)) 2078 if (ecb_expect_true (ta.prev != ta.next))
1899 { 2079 {
1900 TRANSFER (ta, 1); 2080 TRANSFER (ta, 1);
1901 return 1; 2081 return 1;
1902 } 2082 }
1903 else 2083 else
… …
1946 coro->slot->runops = RUNOPS_DEFAULT; 2126 coro->slot->runops = RUNOPS_DEFAULT;
1947 } 2127 }
1948} 2128}
1949 2129
1950static void 2130static void
2131coro_push_av (pTHX_ AV *av, I32 gimme_v)
2132{
2133 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2134 {
2135 dSP;
2136
2137 if (gimme_v == G_SCALAR)
2138 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2139 else
2140 {
2141 int i;
2142 EXTEND (SP, AvFILLp (av) + 1);
2143
2144 for (i = 0; i <= AvFILLp (av); ++i)
2145 PUSHs (AvARRAY (av)[i]);
2146 }
2147
2148 PUTBACK;
2149 }
2150}
2151
2152static void
2153coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2154{
2155 if (!coro->on_destroy)
2156 coro->on_destroy = newAV ();
2157
2158 av_push (coro->on_destroy, cb);
2159}
2160
2161static void
2162slf_destroy_join (pTHX_ struct CoroSLF *frame)
2163{
2164 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2165}
2166
2167static int
2168slf_check_join (pTHX_ struct CoroSLF *frame)
2169{
2170 struct coro *coro = (struct coro *)frame->data;
2171
2172 if (!coro->status)
2173 return 1;
2174
2175 frame->destroy = 0;
2176
2177 coro_push_av (aTHX_ coro->status, GIMME_V);
2178
2179 SvREFCNT_dec ((SV *)coro->hv);
2180
2181 return 0;
2182}
2183
2184static void
2185slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{
2187 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2188
2189 if (items > 1)
2190 croak ("join called with too many arguments");
2191
2192 if (coro->status)
2193 frame->prepare = prepare_nop;
2194 else
2195 {
2196 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2197 frame->prepare = prepare_schedule;
2198 }
2199
2200 frame->check = slf_check_join;
2201 frame->destroy = slf_destroy_join;
2202 frame->data = (void *)coro;
2203 SvREFCNT_inc (coro->hv);
2204}
2205
2206static void
1951coro_call_on_destroy (pTHX_ struct coro *coro) 2207coro_call_on_destroy (pTHX_ struct coro *coro)
1952{ 2208{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2209 AV *od = coro->on_destroy;
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955 2210
1956 if (on_destroyp) 2211 if (!od)
1957 { 2212 return;
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1959 2213
2214 coro->on_destroy = 0;
2215 sv_2mortal ((SV *)od);
2216
1960 while (AvFILLp (on_destroy) >= 0) 2217 while (AvFILLp (od) >= 0)
2218 {
2219 SV *cb = sv_2mortal (av_pop (od));
2220
2221 /* coro hv's (and only hv's at the moment) are supported as well */
2222 if (SvSTATEhv_p (aTHX_ cb))
2223 api_ready (aTHX_ cb);
2224 else
1961 { 2225 {
1962 dSP; /* don't disturb outer sp */ 2226 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy);
1964
1965 PUSHMARK (SP); 2227 PUSHMARK (SP);
1966 2228
1967 if (statusp) 2229 if (coro->status)
1968 { 2230 {
1969 int i; 2231 PUTBACK;
1970 AV *status = (AV *)SvRV (*statusp); 2232 coro_push_av (aTHX_ coro->status, G_ARRAY);
1971 EXTEND (SP, AvFILLp (status) + 1); 2233 SPAGAIN;
1972
1973 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]);
1975 } 2234 }
1976 2235
1977 PUTBACK; 2236 PUTBACK;
1978 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2237 call_sv (cb, G_VOID | G_DISCARD);
1979 } 2238 }
1980 } 2239 }
1981} 2240}
1982 2241
1983static void 2242static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2243coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1985{ 2244{
1986 int i; 2245 AV *av;
1987 HV *hv = (HV *)SvRV (coro_current); 2246
1988 AV *av = newAV (); 2247 if (coro->status)
2248 {
2249 av = coro->status;
2250 av_clear (av);
2251 }
2252 else
2253 av = coro->status = newAV ();
1989 2254
1990 /* items are actually not so common, so optimise for this case */ 2255 /* items are actually not so common, so optimise for this case */
1991 if (items) 2256 if (items)
1992 { 2257 {
2258 int i;
2259
1993 av_extend (av, items - 1); 2260 av_extend (av, items - 1);
1994 2261
1995 for (i = 0; i < items; ++i) 2262 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i])); 2263 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 } 2264 }
2265}
1998 2266
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2267static void
2000 2268slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2269{
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2270 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager); 2271 api_ready (aTHX_ sv_manager);
2003 2272
2004 frame->prepare = prepare_schedule; 2273 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat; 2274 frame->check = slf_check_repeat;
2006 2275
2007 /* as a minor optimisation, we could unwind all stacks here */ 2276 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */ 2277 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/ 2278 /*coro_unwind_stacks (aTHX);*/
2279}
2280
2281static void
2282slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2283{
2284 HV *coro_hv = (HV *)SvRV (coro_current);
2285
2286 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2287 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2288}
2289
2290static void
2291slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2292{
2293 HV *coro_hv;
2294 struct coro *coro;
2295
2296 if (items <= 0)
2297 croak ("Coro::cancel called without coro object,");
2298
2299 coro = SvSTATE (arg [0]);
2300 coro_hv = coro->hv;
2301
2302 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2303
2304 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2305 {
2306 /* coro currently busy cancelling something, so just notify it */
2307 coro->slf_frame.data = (void *)coro;
2308
2309 frame->prepare = prepare_nop;
2310 frame->check = slf_check_nop;
2311 }
2312 else if (coro_hv == (HV *)SvRV (coro_current))
2313 {
2314 /* cancelling the current coro is allowed, and equals terminate */
2315 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2316 }
2317 else
2318 {
2319 struct coro *self = SvSTATE_current;
2320
2321 if (!self)
2322 croak ("Coro::cancel called outside of thread content,");
2323
2324 /* otherwise we cancel directly, purely for speed reasons
2325 * unfortunately, this requires some magic trickery, as
2326 * somebody else could cancel us, so we have to fight the cancellation.
2327 * this is ugly, and hopefully fully worth the extra speed.
2328 * besides, I can't get the slow-but-safe version working...
2329 */
2330 slf_frame.data = 0;
2331 self->flags |= CF_NOCANCEL;
2332 coro_state_destroy (aTHX_ coro);
2333 self->flags &= ~CF_NOCANCEL;
2334
2335 if (slf_frame.data)
2336 {
2337 /* while we were busy we have been cancelled, so terminate */
2338 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2339 }
2340 else
2341 {
2342 frame->prepare = prepare_nop;
2343 frame->check = slf_check_nop;
2344 }
2345 }
2346}
2347
2348static int
2349slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2350{
2351 frame->prepare = 0;
2352 coro_unwind_stacks (aTHX);
2353
2354 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2355
2356 return 1;
2357}
2358
2359static int
2360safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2361{
2362 if (coro->cctx)
2363 croak ("coro inside C callback, unable to cancel at this time, caught");
2364
2365 if (coro->flags & CF_NEW)
2366 {
2367 coro_set_status (aTHX_ coro, arg, items);
2368 coro_state_destroy (aTHX_ coro);
2369 }
2370 else
2371 {
2372 if (!coro->slf_frame.prepare)
2373 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2374
2375 slf_destroy (aTHX_ coro);
2376
2377 coro_set_status (aTHX_ coro, arg, items);
2378 coro->slf_frame.prepare = prepare_nop;
2379 coro->slf_frame.check = slf_check_safe_cancel;
2380
2381 api_ready (aTHX_ (SV *)coro->hv);
2382 }
2383
2384 return 1;
2010} 2385}
2011 2386
2012/*****************************************************************************/ 2387/*****************************************************************************/
2013/* async pool handler */ 2388/* async pool handler */
2014 2389
… …
2045slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2420slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2046{ 2421{
2047 HV *hv = (HV *)SvRV (coro_current); 2422 HV *hv = (HV *)SvRV (coro_current);
2048 struct coro *coro = SvSTATE_hv ((SV *)hv); 2423 struct coro *coro = SvSTATE_hv ((SV *)hv);
2049 2424
2050 if (expect_true (coro->saved_deffh)) 2425 if (ecb_expect_true (coro->saved_deffh))
2051 { 2426 {
2052 /* subsequent iteration */ 2427 /* subsequent iteration */
2053 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2428 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2054 coro->saved_deffh = 0; 2429 coro->saved_deffh = 0;
2055 2430
2056 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2431 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2057 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2432 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2058 { 2433 {
2059 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2434 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2060 coro->invoke_av = newAV (); 2435 return;
2061
2062 frame->prepare = prepare_nop;
2063 } 2436 }
2064 else 2437 else
2065 { 2438 {
2066 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
2067 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2440 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2068 2441
2442 if (ecb_expect_false (coro->swap_sv))
2443 {
2444 SWAP_SVS_LEAVE (coro);
2445 SvREFCNT_dec_NN (coro->swap_sv);
2446 coro->swap_sv = 0;
2447 }
2448
2069 coro->prio = 0; 2449 coro->prio = 0;
2070 2450
2071 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2072 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
2073 2453
2074 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
2075 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
2076 } 2456 }
… …
2117 2497
2118static int 2498static int
2119slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2499slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2120{ 2500{
2121 SV *data = (SV *)frame->data; 2501 SV *data = (SV *)frame->data;
2122 2502
2123 if (CORO_THROW) 2503 if (CORO_THROW)
2124 return 0; 2504 return 0;
2125 2505
2126 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2506 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2127 return 1; 2507 return 1;
… …
2163 cb = sv_2mortal (coro->rouse_cb); 2543 cb = sv_2mortal (coro->rouse_cb);
2164 coro->rouse_cb = 0; 2544 coro->rouse_cb = 0;
2165 } 2545 }
2166 2546
2167 if (!SvROK (cb) 2547 if (!SvROK (cb)
2168 || SvTYPE (SvRV (cb)) != SVt_PVCV 2548 || SvTYPE (SvRV (cb)) != SVt_PVCV
2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2549 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2170 croak ("Coro::rouse_wait called with illegal callback argument,"); 2550 croak ("Coro::rouse_wait called with illegal callback argument,");
2171 2551
2172 { 2552 {
2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2553 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2290static void 2670static void
2291slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2671slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2292{ 2672{
2293 frame->prepare = prepare_cede_notself; 2673 frame->prepare = prepare_cede_notself;
2294 frame->check = slf_check_nop; 2674 frame->check = slf_check_nop;
2675}
2676
2677/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2678static void
2679slf_destroy (pTHX_ struct coro *coro)
2680{
2681 struct CoroSLF frame = coro->slf_frame;
2682
2683 /*
2684 * The on_destroy below most likely is from an SLF call.
2685 * Since by definition the SLF call will not finish when we destroy
2686 * the coro, we will have to force-finish it here, otherwise
2687 * cleanup functions cannot call SLF functions.
2688 */
2689 coro->slf_frame.prepare = 0;
2690
2691 /* this callback is reserved for slf functions needing to do cleanup */
2692 if (frame.destroy && frame.prepare && !PL_dirty)
2693 frame.destroy (aTHX_ &frame);
2295} 2694}
2296 2695
2297/* 2696/*
2298 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2299 * function to increase chances that they all will call transfer with the same 2698 * 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 */ 2705 I32 checkmark; /* mark SP to see how many elements check has pushed */
2307 2706
2308 /* set up the slf frame, unless it has already been set-up */ 2707 /* set up the slf frame, unless it has already been set-up */
2309 /* the latter happens when a new coro has been started */ 2708 /* the latter happens when a new coro has been started */
2310 /* or when a new cctx was attached to an existing coroutine */ 2709 /* or when a new cctx was attached to an existing coroutine */
2311 if (expect_true (!slf_frame.prepare)) 2710 if (ecb_expect_true (!slf_frame.prepare))
2312 { 2711 {
2313 /* first iteration */ 2712 /* first iteration */
2314 dSP; 2713 dSP;
2315 SV **arg = PL_stack_base + TOPMARK + 1; 2714 SV **arg = PL_stack_base + TOPMARK + 1;
2316 int items = SP - arg; /* args without function object */ 2715 int items = SP - arg; /* args without function object */
… …
2357 while (slf_frame.check (aTHX_ &slf_frame)); 2756 while (slf_frame.check (aTHX_ &slf_frame));
2358 2757
2359 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2758 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2360 2759
2361 /* exception handling */ 2760 /* exception handling */
2362 if (expect_false (CORO_THROW)) 2761 if (ecb_expect_false (CORO_THROW))
2363 { 2762 {
2364 SV *exception = sv_2mortal (CORO_THROW); 2763 SV *exception = sv_2mortal (CORO_THROW);
2365 2764
2366 CORO_THROW = 0; 2765 CORO_THROW = 0;
2367 sv_setsv (ERRSV, exception); 2766 sv_setsv (ERRSV, exception);
2368 croak (0); 2767 croak (0);
2369 } 2768 }
2370 2769
2371 /* return value handling - mostly like entersub */ 2770 /* return value handling - mostly like entersub */
2372 /* make sure we put something on the stack in scalar context */ 2771 /* make sure we put something on the stack in scalar context */
2373 if (GIMME_V == G_SCALAR) 2772 if (GIMME_V == G_SCALAR
2773 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2374 { 2774 {
2375 dSP; 2775 dSP;
2376 SV **bot = PL_stack_base + checkmark; 2776 SV **bot = PL_stack_base + checkmark;
2377 2777
2378 if (sp == bot) /* too few, push undef */ 2778 if (sp == bot) /* too few, push undef */
2379 bot [1] = &PL_sv_undef; 2779 bot [1] = &PL_sv_undef;
2380 else if (sp != bot + 1) /* too many, take last one */ 2780 else /* too many, take last one */
2381 bot [1] = *sp; 2781 bot [1] = *sp;
2382 2782
2383 SP = bot + 1; 2783 SP = bot + 1;
2384 2784
2385 PUTBACK; 2785 PUTBACK;
… …
2418 if (PL_op->op_flags & OPf_STACKED) 2818 if (PL_op->op_flags & OPf_STACKED)
2419 { 2819 {
2420 if (items > slf_arga) 2820 if (items > slf_arga)
2421 { 2821 {
2422 slf_arga = items; 2822 slf_arga = items;
2423 free (slf_argv); 2823 Safefree (slf_argv);
2424 slf_argv = malloc (slf_arga * sizeof (SV *)); 2824 New (0, slf_argv, slf_arga, SV *);
2425 } 2825 }
2426 2826
2427 slf_argc = items; 2827 slf_argc = items;
2428 2828
2429 for (i = 0; i < items; ++i) 2829 for (i = 0; i < items; ++i)
… …
2483{ 2883{
2484 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2884 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2485 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2486} 2886}
2487 2887
2888static void
2889enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2890{
2891 if (!hook)
2892 return;
2893
2894 if (!*avp)
2895 {
2896 *avp = newAV ();
2897 AvREAL_off (*avp);
2898 }
2899
2900 av_push (*avp, (SV *)hook);
2901 av_push (*avp, (SV *)arg);
2902}
2903
2904static void
2905enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2906{
2907 AV *av = *avp;
2908 int i;
2909
2910 if (!av)
2911 return;
2912
2913 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2914 if (AvARRAY (av)[i] == (SV *)hook)
2915 {
2916 if (execute)
2917 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2918
2919 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2920 av_pop (av);
2921 av_pop (av);
2922 break;
2923 }
2924
2925 if (AvFILLp (av) >= 0)
2926 {
2927 *avp = 0;
2928 SvREFCNT_dec_NN (av);
2929 }
2930}
2931
2932static void
2933api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2934{
2935 struct coro *coro = SvSTATE (coro_sv);
2936
2937 if (SvSTATE_current == coro)
2938 if (enter)
2939 enter (aTHX_ enter_arg);
2940
2941 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2943}
2944
2945static void
2946api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2947{
2948 struct coro *coro = SvSTATE (coro_sv);
2949
2950 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2952}
2953
2954static void
2955savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2956{
2957 struct coro *coro = SvSTATE_current;
2958
2959 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2960}
2961
2962static void
2963savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2964{
2965 struct coro *coro = SvSTATE_current;
2966
2967 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2968}
2969
2970static void
2971api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2972{
2973 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2974
2975 /* this ought to be much cheaper than malloc + a single destructor call */
2976 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2977 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2978}
2979
2488/*****************************************************************************/ 2980/*****************************************************************************/
2489/* PerlIO::cede */ 2981/* PerlIO::cede */
2490 2982
2491typedef struct 2983typedef struct
2492{ 2984{
2493 PerlIOBuf base; 2985 PerlIOBuf base;
2494 NV next, every; 2986 NV next, every;
2495} PerlIOCede; 2987} PerlIOCede;
2496 2988
2497static IV 2989static IV ecb_cold
2498PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2990PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2499{ 2991{
2500 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2501 2993
2502 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2994 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2503 self->next = nvtime () + self->every; 2995 self->next = nvtime () + self->every;
2504 2996
2505 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2997 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2506} 2998}
2507 2999
2508static SV * 3000static SV * ecb_cold
2509PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3001PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2510{ 3002{
2511 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2512 3004
2513 return newSVnv (self->every); 3005 return newSVnv (self->every);
… …
2620 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2621 PUTBACK; 3113 PUTBACK;
2622 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2623 } 3115 }
2624 3116
2625 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2626 } 3118 }
2627} 3119}
2628 3120
2629static void 3121static void
2630coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2631{ 3123{
2632 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3124 /* call $sem->adjust (0) to possibly wake up some other waiters */
2633 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3125 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2634} 3126}
2635 3127
2636static int 3128static int
2637slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3129slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2638{ 3130{
2639 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2640 SV *count_sv = AvARRAY (av)[0]; 3132 SV *count_sv = AvARRAY (av)[0];
3133 SV *coro_hv = SvRV (coro_current);
3134
3135 frame->destroy = 0;
2641 3136
2642 /* if we are about to throw, don't actually acquire the lock, just throw */ 3137 /* if we are about to throw, don't actually acquire the lock, just throw */
2643 if (CORO_THROW) 3138 if (ecb_expect_false (CORO_THROW))
3139 {
3140 /* we still might be responsible for the semaphore, so wake up others */
3141 coro_semaphore_adjust (aTHX_ av, 0);
3142
2644 return 0; 3143 return 0;
3144 }
2645 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2646 { 3146 {
2647 SvSTATE_current->on_destroy = 0;
2648
2649 if (acquire) 3147 if (acquire)
2650 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2651 else 3149 else
2652 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2653 3151
… …
2657 { 3155 {
2658 int i; 3156 int i;
2659 /* if we were woken up but can't down, we look through the whole */ 3157 /* 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 */ 3158 /* waiters list and only add us if we aren't in there already */
2661 /* this avoids some degenerate memory usage cases */ 3159 /* this avoids some degenerate memory usage cases */
2662 3160 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)) 3161 if (AvARRAY (av)[i] == coro_hv)
2665 return 1; 3162 return 1;
2666 3163
2667 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3164 av_push (av, SvREFCNT_inc (coro_hv));
2668 return 1; 3165 return 1;
2669 } 3166 }
2670} 3167}
2671 3168
2672static int 3169static int
… …
2695 { 3192 {
2696 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3193 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2697 3194
2698 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3195 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2699 frame->prepare = prepare_schedule; 3196 frame->prepare = prepare_schedule;
2700
2701 /* to avoid race conditions when a woken-up coro gets terminated */ 3197 /* to avoid race conditions when a woken-up coro gets terminated */
2702 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3198 /* we arrange for a temporary on_destroy that calls adjust (0) */
2703 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3199 frame->destroy = coro_semaphore_destroy;
2704 } 3200 }
2705} 3201}
2706 3202
2707static void 3203static void
2708slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3204slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2766 { 3262 {
2767 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
2768 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
2769 } 3265 }
2770 3266
2771 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
2772 3268
2773 --count; 3269 --count;
2774 } 3270 }
2775} 3271}
2776 3272
… …
2790 { 3286 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]); 3287 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3288 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793 3289
2794 if (SvIVX (AvARRAY (av)[0])) 3290 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3291 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2796 3292
2797 frame->prepare = prepare_nop; 3293 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop; 3294 frame->check = slf_check_nop;
2799 } 3295 }
2800 else if (SvIVX (AvARRAY (av)[0])) 3296 else if (SvIVX (AvARRAY (av)[0]))
… …
2861 } 3357 }
2862 3358
2863 av_push (state, data_sv); 3359 av_push (state, data_sv);
2864 3360
2865 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
2866 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
2867 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
2868} 3364}
2869 3365
2870static int 3366static int
2871slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2872{ 3368{
… …
2877 /* it quickly returns */ 3373 /* it quickly returns */
2878 if (CORO_THROW) 3374 if (CORO_THROW)
2879 return 0; 3375 return 0;
2880 3376
2881 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
2882 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2883 return 1; 3379 return 1;
2884 3380
2885 /* restore status */ 3381 /* restore status */
2886 { 3382 {
2887 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
… …
2890 errno = data->errorno; 3386 errno = data->errorno;
2891 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
2892 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
2893 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
2894 3390
2895 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
2896 } 3392 }
2897 3393
2898 /* push result values */ 3394 /* push result values */
2899 { 3395 {
2900 dSP; 3396 dSP;
… …
2926 dSP; 3422 dSP;
2927 3423
2928 static SV *prio_cv; 3424 static SV *prio_cv;
2929 static SV *prio_sv; 3425 static SV *prio_sv;
2930 3426
2931 if (expect_false (!prio_cv)) 3427 if (ecb_expect_false (!prio_cv))
2932 { 3428 {
2933 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3429 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2934 prio_sv = newSViv (0); 3430 prio_sv = newSViv (0);
2935 } 3431 }
2936 3432
… …
2962 /* now call the AIO function - we assume our request is uncancelable */ 3458 /* now call the AIO function - we assume our request is uncancelable */
2963 PUTBACK; 3459 PUTBACK;
2964 call_sv ((SV *)req, G_VOID | G_DISCARD); 3460 call_sv ((SV *)req, G_VOID | G_DISCARD);
2965 } 3461 }
2966 3462
2967 /* now that the requets is going, we loop toll we have a result */ 3463 /* now that the request is going, we loop till we have a result */
2968 frame->data = (void *)state; 3464 frame->data = (void *)state;
2969 frame->prepare = prepare_schedule; 3465 frame->prepare = prepare_schedule;
2970 frame->check = slf_check_aio_req; 3466 frame->check = slf_check_aio_req;
2971} 3467}
2972 3468
… …
3042 } 3538 }
3043 3539
3044 return coro_sv; 3540 return coro_sv;
3045} 3541}
3046 3542
3543#ifndef __cplusplus
3544ecb_cold XS(boot_Coro__State);
3545#endif
3546
3547#if CORO_JIT
3548
3549static void ecb_noinline ecb_cold
3550pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3551{
3552 dSP;
3553 AV *av = newAV ();
3554
3555 av_store (av, 3, newSVuv (d));
3556 av_store (av, 2, newSVuv (c));
3557 av_store (av, 1, newSVuv (b));
3558 av_store (av, 0, newSVuv (a));
3559
3560 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3561
3562 PUTBACK;
3563}
3564
3565static void ecb_noinline ecb_cold
3566jit_init (pTHX)
3567{
3568 dSP;
3569 SV *load, *save;
3570 char *map_base;
3571 char *load_ptr, *save_ptr;
3572 STRLEN load_len, save_len, map_len;
3573 int count;
3574
3575 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3576
3577 PUSHMARK (SP);
3578 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3579 #include "state.h"
3580 count = call_pv ("Coro::State::_jit", G_ARRAY);
3581 SPAGAIN;
3582
3583 save = POPs; save_ptr = SvPVbyte (save, save_len);
3584 load = POPs; load_ptr = SvPVbyte (load, load_len);
3585
3586 map_len = load_len + save_len + 16;
3587
3588 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3589
3590 if (map_base == (char *)MAP_FAILED)
3591 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3592
3593 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3594
3595 load_perl_slots = (load_save_perl_slots_type)map_base;
3596 memcpy (map_base, load_ptr, load_len);
3597
3598 map_base += (load_len + 15) & ~15;
3599
3600 save_perl_slots = (load_save_perl_slots_type)map_base;
3601 memcpy (map_base, save_ptr, save_len);
3602
3603 /* we are good citizens and try to make the page read-only, so the evil evil */
3604 /* hackers might have it a bit more difficult */
3605 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3606
3607 PUTBACK;
3608 eval_pv ("undef &Coro::State::_jit", 1);
3609}
3610
3611#endif
3612
3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3613MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3048 3614
3049PROTOTYPES: DISABLE 3615PROTOTYPES: DISABLE
3050 3616
3051BOOT: 3617BOOT:
3052{ 3618{
3619#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3620#include "state.h"
3053#ifdef USE_ITHREADS 3621#ifdef USE_ITHREADS
3054# if CORO_PTHREAD 3622# if CORO_PTHREAD
3055 coro_thx = PERL_GET_CONTEXT; 3623 coro_thx = PERL_GET_CONTEXT;
3056# endif 3624# endif
3057#endif 3625#endif
3058 BOOT_PAGESIZE; 3626 /* perl defines these to check for existance first, but why it doesn't */
3627 /* just create them one at init time is not clear to me, except for */
3628 /* programs trying to delete them, but... */
3629 /* anyway, we declare this as invalid and make sure they are initialised here */
3630 DEFSV;
3631 ERRSV;
3059 3632
3060 cctx_current = cctx_new_empty (); 3633 cctx_current = cctx_new_empty ();
3061 3634
3062 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3635 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3063 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3636 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3064 3637
3065 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3638 {
3066 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3639 /*
3067 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3640 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3641 * by coro_sig_vtbl in hash values.
3642 */
3643 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3644
3645 /* this only works if perl doesn't have a vtbl for %SIG */
3646 assert (!mg->mg_virtual);
3647
3648 /*
3649 * The irony is that the perl API itself asserts that mg_virtual
3650 * must be non-const, yet perl5porters insisted on marking their
3651 * vtbls as read-only, just to thwart perl modules from patching
3652 * them.
3653 */
3654 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3655 mg->mg_flags |= MGf_COPY;
3656
3657 coro_sigelem_vtbl = PL_vtbl_sigelem;
3658 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3659 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3660 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3661 }
3068 3662
3069 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3070 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3663 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3071 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3664 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3072 3665
3073 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3666 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3074 3667
… …
3103 coroapi.prepare_nop = prepare_nop; 3696 coroapi.prepare_nop = prepare_nop;
3104 coroapi.prepare_schedule = prepare_schedule; 3697 coroapi.prepare_schedule = prepare_schedule;
3105 coroapi.prepare_cede = prepare_cede; 3698 coroapi.prepare_cede = prepare_cede;
3106 coroapi.prepare_cede_notself = prepare_cede_notself; 3699 coroapi.prepare_cede_notself = prepare_cede_notself;
3107 3700
3108 { 3701 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 3702
3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3703 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3704#if CORO_JIT
3705 PUTBACK;
3706 jit_init (aTHX);
3707 SPAGAIN;
3708#endif
3121} 3709}
3122 3710
3123SV * 3711SV *
3124new (SV *klass, ...) 3712new (SV *klass, ...)
3125 ALIAS: 3713 ALIAS:
… …
3132void 3720void
3133transfer (...) 3721transfer (...)
3134 PROTOTYPE: $$ 3722 PROTOTYPE: $$
3135 CODE: 3723 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3724 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 3725
3151SV * 3726SV *
3152clone (Coro::State coro) 3727clone (Coro::State coro)
3153 CODE: 3728 CODE:
3154{ 3729{
… …
3209void 3784void
3210list () 3785list ()
3211 PROTOTYPE: 3786 PROTOTYPE:
3212 PPCODE: 3787 PPCODE:
3213{ 3788{
3214 struct coro *coro; 3789 struct coro *coro;
3215 for (coro = coro_first; coro; coro = coro->next) 3790 for (coro = coro_first; coro; coro = coro->next)
3216 if (coro->hv) 3791 if (coro->hv)
3217 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3792 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3218} 3793}
3219 3794
… …
3224 CODE: 3799 CODE:
3225{ 3800{
3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3801 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3227 { 3802 {
3228 struct coro *current = SvSTATE_current; 3803 struct coro *current = SvSTATE_current;
3804 struct CoroSLF slf_save;
3229 3805
3230 if (current != coro) 3806 if (current != coro)
3231 { 3807 {
3232 PUTBACK; 3808 PUTBACK;
3233 save_perl (aTHX_ current); 3809 save_perl (aTHX_ current);
3234 load_perl (aTHX_ coro); 3810 load_perl (aTHX_ coro);
3811 /* the coro is most likely in an active SLF call.
3812 * while not strictly required (the code we execute is
3813 * not allowed to call any SLF functions), it's cleaner
3814 * to reinitialise the slf_frame and restore it later.
3815 * This might one day allow us to actually do SLF calls
3816 * from code executed here.
3817 */
3818 slf_save = slf_frame;
3819 slf_frame.prepare = 0;
3235 SPAGAIN; 3820 SPAGAIN;
3236 } 3821 }
3237 3822
3238 PUSHSTACK; 3823 PUSHSTACK;
3239 3824
… …
3249 SPAGAIN; 3834 SPAGAIN;
3250 3835
3251 if (current != coro) 3836 if (current != coro)
3252 { 3837 {
3253 PUTBACK; 3838 PUTBACK;
3839 slf_frame = slf_save;
3254 save_perl (aTHX_ coro); 3840 save_perl (aTHX_ coro);
3255 load_perl (aTHX_ current); 3841 load_perl (aTHX_ current);
3256 SPAGAIN; 3842 SPAGAIN;
3257 } 3843 }
3258 } 3844 }
… …
3263 PROTOTYPE: $ 3849 PROTOTYPE: $
3264 ALIAS: 3850 ALIAS:
3265 is_ready = CF_READY 3851 is_ready = CF_READY
3266 is_running = CF_RUNNING 3852 is_running = CF_RUNNING
3267 is_new = CF_NEW 3853 is_new = CF_NEW
3268 is_destroyed = CF_DESTROYED 3854 is_destroyed = CF_ZOMBIE
3855 is_zombie = CF_ZOMBIE
3269 is_suspended = CF_SUSPENDED 3856 is_suspended = CF_SUSPENDED
3270 CODE: 3857 CODE:
3271 RETVAL = boolSV (coro->flags & ix); 3858 RETVAL = boolSV (coro->flags & ix);
3272 OUTPUT: 3859 OUTPUT:
3273 RETVAL 3860 RETVAL
3274 3861
3275void 3862void
3276throw (Coro::State self, SV *throw = &PL_sv_undef) 3863throw (SV *self, SV *exception = &PL_sv_undef)
3277 PROTOTYPE: $;$ 3864 PROTOTYPE: $;$
3278 CODE: 3865 CODE:
3279{ 3866{
3867 struct coro *coro = SvSTATE (self);
3280 struct coro *current = SvSTATE_current; 3868 struct coro *current = SvSTATE_current;
3281 SV **throwp = self == current ? &CORO_THROW : &self->except; 3869 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3282 SvREFCNT_dec (*throwp); 3870 SvREFCNT_dec (*exceptionp);
3283 SvGETMAGIC (throw); 3871 SvGETMAGIC (exception);
3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3872 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3873
3874 api_ready (aTHX_ self);
3285} 3875}
3286 3876
3287void 3877void
3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3878api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3289 PROTOTYPE: $;$ 3879 PROTOTYPE: $;$
… …
3344 3934
3345void 3935void
3346cancel (Coro::State self) 3936cancel (Coro::State self)
3347 CODE: 3937 CODE:
3348 coro_state_destroy (aTHX_ self); 3938 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351 3939
3352SV * 3940SV *
3353enable_times (int enabled = enable_times) 3941enable_times (int enabled = enable_times)
3354 CODE: 3942 CODE:
3355{ 3943{
… …
3368 3956
3369void 3957void
3370times (Coro::State self) 3958times (Coro::State self)
3371 PPCODE: 3959 PPCODE:
3372{ 3960{
3373 struct coro *current = SvSTATE (coro_current); 3961 struct coro *current = SvSTATE (coro_current);
3374 3962
3375 if (expect_false (current == self)) 3963 if (ecb_expect_false (current == self))
3376 { 3964 {
3377 coro_times_update (); 3965 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current)); 3966 coro_times_add (SvSTATE (coro_current));
3379 } 3967 }
3380 3968
3381 EXTEND (SP, 2); 3969 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3970 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))); 3971 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384 3972
3385 if (expect_false (current == self)) 3973 if (ecb_expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current)); 3974 coro_times_sub (SvSTATE (coro_current));
3387} 3975}
3388 3976
3389void 3977void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3978swap_sv (Coro::State coro, SV *sva, SV *svb)
3391 CODE: 3979 CODE:
3392{ 3980{
3393 struct coro *current = SvSTATE_current; 3981 struct coro *current = SvSTATE_current;
3982 AV *swap_sv;
3983 int i;
3984
3985 sva = SvRV (sva);
3986 svb = SvRV (svb);
3394 3987
3395 if (current == coro) 3988 if (current == coro)
3396 SWAP_SVS (current); 3989 SWAP_SVS_LEAVE (current);
3397 3990
3398 if (!coro->swap_sv) 3991 if (!coro->swap_sv)
3399 coro->swap_sv = newAV (); 3992 coro->swap_sv = newAV ();
3400 3993
3994 swap_sv = coro->swap_sv;
3995
3996 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3997 {
3998 SV *a = AvARRAY (swap_sv)[i ];
3999 SV *b = AvARRAY (swap_sv)[i + 1];
4000
4001 if (a == sva && b == svb)
4002 {
4003 SvREFCNT_dec_NN (a);
4004 SvREFCNT_dec_NN (b);
4005
4006 for (; i <= AvFILLp (swap_sv) - 2; i++)
4007 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4008
4009 AvFILLp (swap_sv) -= 2;
4010
4011 goto removed;
4012 }
4013 }
4014
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4015 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4016 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4017
4018 removed:
3403 4019
3404 if (current == coro) 4020 if (current == coro)
3405 SWAP_SVS (current); 4021 SWAP_SVS_ENTER (current);
3406} 4022}
3407 4023
3408 4024
3409MODULE = Coro::State PACKAGE = Coro 4025MODULE = Coro::State PACKAGE = Coro
3410 4026
3411BOOT: 4027BOOT:
3412{ 4028{
4029 if (SVt_LAST > 32)
4030 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4031
3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4032 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4033 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4034 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); 4035 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); 4036 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4037 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4038 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4039 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3422 4040
3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4041 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); 4042 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); 4043 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 */ 4044 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3427 4045
3428 coro_stash = gv_stashpv ("Coro", TRUE); 4046 coro_stash = gv_stashpv ("Coro", TRUE);
3429 4047
3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4048 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4049 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4050 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3444 coroapi.ready = api_ready; 4062 coroapi.ready = api_ready;
3445 coroapi.is_ready = api_is_ready; 4063 coroapi.is_ready = api_is_ready;
3446 coroapi.nready = coro_nready; 4064 coroapi.nready = coro_nready;
3447 coroapi.current = coro_current; 4065 coroapi.current = coro_current;
3448 4066
4067 coroapi.enterleave_hook = api_enterleave_hook;
4068 coroapi.enterleave_unhook = api_enterleave_unhook;
4069 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4070
3449 /*GCoroAPI = &coroapi;*/ 4071 /*GCoroAPI = &coroapi;*/
3450 sv_setiv (sv, (IV)&coroapi); 4072 sv_setiv (sv, (IV)&coroapi);
3451 SvREADONLY_on (sv); 4073 SvREADONLY_on (sv);
3452 } 4074 }
3453} 4075}
… …
3460 api_ready (aTHX_ RETVAL); 4082 api_ready (aTHX_ RETVAL);
3461 OUTPUT: 4083 OUTPUT:
3462 RETVAL 4084 RETVAL
3463 4085
3464void 4086void
4087_destroy (Coro::State coro)
4088 CODE:
4089 /* used by the manager thread */
4090 coro_state_destroy (aTHX_ coro);
4091
4092void
4093on_destroy (Coro::State coro, SV *cb)
4094 CODE:
4095 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4096
4097void
4098join (...)
4099 CODE:
4100 CORO_EXECUTE_SLF_XS (slf_init_join);
4101
4102void
3465terminate (...) 4103terminate (...)
3466 CODE: 4104 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4105 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4106
4107void
4108cancel (...)
4109 CODE:
4110 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4111
4112int
4113safe_cancel (Coro::State self, ...)
4114 C_ARGS: aTHX_ self, &ST (1), items - 1
3468 4115
3469void 4116void
3470schedule (...) 4117schedule (...)
3471 CODE: 4118 CODE:
3472 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4119 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3493 4140
3494void 4141void
3495_set_current (SV *current) 4142_set_current (SV *current)
3496 PROTOTYPE: $ 4143 PROTOTYPE: $
3497 CODE: 4144 CODE:
3498 SvREFCNT_dec (SvRV (coro_current)); 4145 SvREFCNT_dec_NN (SvRV (coro_current));
3499 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4146 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3500 4147
3501void 4148void
3502_set_readyhook (SV *hook) 4149_set_readyhook (SV *hook)
3503 PROTOTYPE: $ 4150 PROTOTYPE: $
… …
3587 4234
3588 if ((SV *)hv == &PL_sv_undef) 4235 if ((SV *)hv == &PL_sv_undef)
3589 { 4236 {
3590 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4237 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3591 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4238 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3592 SvREFCNT_dec (sv); 4239 SvREFCNT_dec_NN (sv);
3593 } 4240 }
3594 4241
3595 { 4242 {
3596 struct coro *coro = SvSTATE_hv (hv); 4243 struct coro *coro = SvSTATE_hv (hv);
3597 4244
… …
3604 api_ready (aTHX_ (SV *)hv); 4251 api_ready (aTHX_ (SV *)hv);
3605 4252
3606 if (GIMME_V != G_VOID) 4253 if (GIMME_V != G_VOID)
3607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4254 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3608 else 4255 else
3609 SvREFCNT_dec (hv); 4256 SvREFCNT_dec_NN (hv);
3610} 4257}
3611 4258
3612SV * 4259SV *
3613rouse_cb () 4260rouse_cb ()
3614 PROTOTYPE: 4261 PROTOTYPE:
… …
3629 on_leave = 1 4276 on_leave = 1
3630 PROTOTYPE: & 4277 PROTOTYPE: &
3631 CODE: 4278 CODE:
3632{ 4279{
3633 struct coro *coro = SvSTATE_current; 4280 struct coro *coro = SvSTATE_current;
3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4281 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3635 4282
3636 block = s_get_cv_croak (block); 4283 block = s_get_cv_croak (block);
3637 4284
3638 if (!*avp) 4285 if (!*avp)
3639 *avp = newAV (); 4286 *avp = newAV ();
… …
3659 4306
3660SV * 4307SV *
3661new (SV *klass, SV *count = 0) 4308new (SV *klass, SV *count = 0)
3662 CODE: 4309 CODE:
3663{ 4310{
3664 int semcnt = 1; 4311 int semcnt = 1;
3665 4312
3666 if (count) 4313 if (count)
3667 { 4314 {
3668 SvGETMAGIC (count); 4315 SvGETMAGIC (count);
3669 4316
… …
3693 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4340 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3694 OUTPUT: 4341 OUTPUT:
3695 RETVAL 4342 RETVAL
3696 4343
3697void 4344void
3698up (SV *self, int adjust = 1) 4345up (SV *self)
3699 ALIAS:
3700 adjust = 1
3701 CODE: 4346 CODE:
4347 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4348
4349void
4350adjust (SV *self, int adjust)
4351 CODE:
3702 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4352 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3703 4353
3704void 4354void
3705down (...) 4355down (...)
3706 CODE: 4356 CODE:
3707 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4357 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3729 XSRETURN_NO; 4379 XSRETURN_NO;
3730} 4380}
3731 4381
3732void 4382void
3733waiters (SV *self) 4383waiters (SV *self)
3734 PPCODE: 4384 PPCODE:
3735{ 4385{
3736 AV *av = (AV *)SvRV (self); 4386 AV *av = (AV *)SvRV (self);
3737 int wcount = AvFILLp (av) + 1 - 1; 4387 int wcount = AvFILLp (av) + 1 - 1;
3738 4388
3739 if (GIMME_V == G_SCALAR) 4389 if (GIMME_V == G_SCALAR)
… …
3748} 4398}
3749 4399
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4400MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751 4401
3752void 4402void
3753_may_delete (SV *sem, int count, int extra_refs) 4403_may_delete (SV *sem, int count, unsigned int extra_refs)
3754 PPCODE: 4404 PPCODE:
3755{ 4405{
3756 AV *av = (AV *)SvRV (sem); 4406 AV *av = (AV *)SvRV (sem);
3757 4407
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4408 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3759 && AvFILLp (av) == 0 /* no waiters, just count */ 4409 && AvFILLp (av) == 0 /* no waiters, just count */
3760 && SvIV (AvARRAY (av)[0]) == count) 4410 && SvIV (AvARRAY (av)[0]) == count)
3761 XSRETURN_YES; 4411 XSRETURN_YES;
… …
3782 4432
3783void 4433void
3784broadcast (SV *self) 4434broadcast (SV *self)
3785 CODE: 4435 CODE:
3786{ 4436{
3787 AV *av = (AV *)SvRV (self); 4437 AV *av = (AV *)SvRV (self);
3788 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4438 coro_signal_wake (aTHX_ av, AvFILLp (av));
3789} 4439}
3790 4440
3791void 4441void
3792send (SV *self) 4442send (SV *self)
… …
3800 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4450 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3801} 4451}
3802 4452
3803IV 4453IV
3804awaited (SV *self) 4454awaited (SV *self)
3805 CODE: 4455 CODE:
3806 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4456 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3807 OUTPUT: 4457 OUTPUT:
3808 RETVAL 4458 RETVAL
3809 4459
3810 4460
… …
3815 4465
3816void 4466void
3817_schedule (...) 4467_schedule (...)
3818 CODE: 4468 CODE:
3819{ 4469{
3820 static int incede; 4470 static int incede;
3821 4471
3822 api_cede_notself (aTHX); 4472 api_cede_notself (aTHX);
3823 4473
3824 ++incede; 4474 ++incede;
3825 while (coro_nready >= incede && api_cede (aTHX)) 4475 while (coro_nready >= incede && api_cede (aTHX))
… …
3869 { 4519 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4520 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0; 4521 coro_old_pp_sselect = 0;
3872 } 4522 }
3873 4523
4524MODULE = Coro::State PACKAGE = Coro::Util
3874 4525
4526void
4527_exit (int code)
4528 CODE:
4529 _exit (code);
4530
4531NV
4532time ()
4533 CODE:
4534 RETVAL = nvtime (aTHX);
4535 OUTPUT:
4536 RETVAL
4537
4538NV
4539gettimeofday ()
4540 PPCODE:
4541{
4542 UV tv [2];
4543 u2time (aTHX_ tv);
4544 EXTEND (SP, 2);
4545 PUSHs (sv_2mortal (newSVuv (tv [0])));
4546 PUSHs (sv_2mortal (newSVuv (tv [1])));
4547}
4548

Diff Legend

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