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.384 by root, Thu Feb 17 01:32:18 2011 UTC vs.
Revision 1.468 by root, Sat Oct 29 19:12:46 2016 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 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
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
24#endif 37#endif
25 38
26#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
27# undef setjmp 70# undef setjmp
28# undef longjmp 71# undef longjmp
29# undef _exit 72# undef _exit
30# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
31#else 74#else
32# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
33#endif 76#endif
34 77
35#ifdef HAVE_MMAP
36# include <unistd.h>
37# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON
41# else
42# undef HAVE_MMAP
43# endif
44# endif
45# include <limits.h>
46# ifndef PAGESIZE
47# define PAGESIZE pagesize
48# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
49static long pagesize;
50# else
51# define BOOT_PAGESIZE (void)0
52# endif
53#else
54# define PAGESIZE 0
55# define BOOT_PAGESIZE (void)0
56#endif
57
58#if CORO_USE_VALGRIND
59# include <valgrind/valgrind.h>
60#endif
61
62/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
64 80
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 83#endif
72 84
73/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
86#endif 98#endif
87 99
88#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
89 101
90#if __GNUC__ >= 3
91# define attribute(x) __attribute__(x)
92# define expect(expr,value) __builtin_expect ((expr), (value))
93# define INLINE static inline
94#else
95# define attribute(x)
96# define expect(expr,value) (expr)
97# define INLINE static
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103#define NOINLINE attribute ((noinline))
104
105#include "CoroAPI.h" 102#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
107 104
108#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
109# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
119# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif 118# endif
122#endif 119#endif
123 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
124static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
126 129
127/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 132static OP *pp_slf (pTHX);
133static void slf_destroy (pTHX_ struct coro *coro);
130 134
131static U32 cctx_gen; 135static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 136static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 137static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 138static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142 146
143static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
144static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
145static SV *rv_diehook; 149static SV *rv_diehook;
146static SV *rv_warnhook; 150static SV *rv_warnhook;
147static HV *hv_sig; /* %SIG */
148 151
149/* async_pool helper stuff */ 152/* async_pool helper stuff */
150static SV *sv_pool_rss; 153static SV *sv_pool_rss;
151static SV *sv_pool_size; 154static SV *sv_pool_size;
152static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
… …
164static char times_valid; 167static char times_valid;
165 168
166static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
168 171
169enum { 172enum
173{
170 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 183typedef struct coro_cctx
180{ 184{
181 struct coro_cctx *next; 185 struct coro_cctx *next;
182 186
183 /* the stack */ 187 /* the stack */
184 void *sptr; 188 struct coro_stack stack;
185 size_t ssize;
186 189
187 /* cpu state */ 190 /* cpu state */
188 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
189 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
190 JMPENV *top_env; 195 JMPENV *top_env;
191 coro_context cctx; 196 coro_context cctx;
192 197
193 U32 gen; 198 U32 gen;
194#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
195 int valgrind_id; 200 int valgrind_id;
196#endif 201#endif
197 unsigned char flags; 202 unsigned char flags;
198} coro_cctx; 203} coro_cctx;
199 204
200coro_cctx *cctx_current; /* the currently running cctx */ 205static coro_cctx *cctx_current; /* the currently running cctx */
201 206
202/*****************************************************************************/ 207/*****************************************************************************/
203 208
209static MGVTBL coro_state_vtbl;
210
204enum { 211enum
212{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 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) */
210}; 219};
211 220
212/* 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 */
213typedef struct 222typedef struct
214{ 223{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
221# include "state.h" 225 #include "state.h"
222#undef VAR
223} perl_slots; 226} perl_slots;
224 227
228/* how many context stack entries do we need for perl_slots */
225#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))
226 230
227/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
228struct coro { 232struct coro
233{
229 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 235 coro_cctx *cctx;
231 236
232 /* ready queue */ 237 /* ready queue */
233 struct coro *next_ready; 238 struct coro *next_ready;
… …
235 /* state data */ 240 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 242 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
239 244
240 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
246 249
247 /* statistics */ 250 /* statistics */
248 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
249 252
250 /* coro process data */ 253 /* coro process data */
251 int prio; 254 int prio;
252 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
253 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 */
254 259
255 /* async_pool */ 260 /* async_pool */
256 SV *saved_deffh; 261 SV *saved_deffh;
257 SV *invoke_cb; 262 SV *invoke_cb;
258 AV *invoke_av; 263 AV *invoke_av;
259 264
260 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
261 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
263 268
264 /* swap_sv */ 269 /* swap_sv */
265 AV *swap_sv; 270 AV *swap_sv;
266 271
267 /* times */ 272 /* times */
… …
274typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
276 281
277/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
281 286
282/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
283 288
284#define CORO_PRIO_MAX 3 289#define CORO_PRIO_MAX 3
… …
290 295
291/* for Coro.pm */ 296/* for Coro.pm */
292static SV *coro_current; 297static SV *coro_current;
293static SV *coro_readyhook; 298static SV *coro_readyhook;
294static 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 */
295static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
296static struct coro *coro_first; 301static struct coro *coro_first;
297#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
298 326
299/** Coro::Select ************************************************************/ 327/** Coro::Select ************************************************************/
300 328
301static OP *(*coro_old_pp_sselect) (pTHX); 329static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 330static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 342 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 343 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 344 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 345}
318 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
319/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
320 400
321static SV * 401static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
323{ 403{
324#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 406 get_sv (name, create);
327#endif 407#endif
328 return get_sv (name, create); 408 return get_sv (name, create);
329} 409}
330 410
331static AV * 411static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
333{ 413{
334#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 416 get_av (name, create);
337#endif 417#endif
338 return get_av (name, create); 418 return get_av (name, create);
339} 419}
340 420
341static HV * 421static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
343{ 423{
344#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 426 get_hv (name, create);
347#endif 427#endif
348 return get_hv (name, create); 428 return get_hv (name, create);
349} 429}
350 430
351INLINE void 431ecb_inline void
352coro_times_update () 432coro_times_update (void)
353{ 433{
354#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
355 struct timespec ts; 435 struct timespec ts;
356 436
357 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
371#endif 451#endif
372} 452}
373 453
374INLINE void 454ecb_inline void
375coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
376{ 456{
377 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
378 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]; }
379 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
382 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]; }
383 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
384} 464}
385 465
386INLINE void 466ecb_inline void
387coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
388{ 468{
389 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]; }
390 c->t_real [1] -= time_real [1]; 470 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 479/* magic glue */
400 480
401#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 483
404#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 487 : mg_find (sv, type))
408 488
409#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 492 : 0)
413 493
414#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)
415#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)
416 496
417INLINE struct coro * 497ecb_inline MAGIC *
418SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
419{ 499{
420 HV *stash;
421 MAGIC *mg; 500 MAGIC *mg;
422 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
423 if (SvROK (coro)) 517 if (SvROK (coro_sv))
424 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
425 519
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
427 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
428 523
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
439} 525}
440 526
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 528
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 532
447/*****************************************************************************/ 533/*****************************************************************************/
448/* padlist management and caching */ 534/* padlist management and caching */
449 535
450static AV * 536ecb_inline PADLIST *
451coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
452{ 538{
453 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
455 544
456 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. */
457 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
458#if PERL_VERSION_ATLEAST (5,10,0)
459 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
460#else
461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
462#endif 574#endif
463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
464 --AvFILLp (padlist);
465 575
466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
467 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;
468 584
469 return newpadlist; 585 return newpadlist;
470} 586}
471 587
472static void 588ecb_inline void
473free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
474{ 590{
475 /* may be during global destruction */ 591 /* may be during global destruction */
476 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
477 { 593 {
478 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
479 595
480 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
481 { 597 {
482 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
483 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
484 I32 j = AvFILLp (av);
485 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
486 while (j >= 0) 605 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
488 607
489 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
490 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
491 } 611 }
492 612
493 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
494 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
495 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
496 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
497 } 623 }
498} 624}
499 625
500static int 626static int
501coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
502{ 628{
503 AV *padlist; 629 PADLIST *padlist;
504 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;
505 632
506 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
508 return 0; 635 return 0;
509 636
510 /* casting is fun. */ 637 while (len--)
511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
512 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
513
514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
515 639
516 return 0; 640 return 0;
517} 641}
518 642
519static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
520 0, 0, 0, 0, 644 0, 0, 0, 0,
521 coro_cv_free 645 coro_cv_free
522}; 646};
523 647
524/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
525static void 649ecb_inline void
526get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
527{ 651{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 653 size_t *lenp;
530 654
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
533 else 657 else
534 { 658 {
535#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
537 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 668#endif
545 } 669 }
546} 670}
547 671
548static void 672ecb_inline void
549put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
550{ 674{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av;
553 676
554 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
555 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);
556 687
557 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
558
559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1);
561
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 689}
564 690
565/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
566 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
567/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
568static void 736static void
569swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
570{ 738{
571 int i; 739 int i;
572 740
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612} 743}
613 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
614#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
616 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))
617 761
618static void 762static void
619on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
620 764
621static void 765static void
… …
624 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
625 c->slot = 0; 769 c->slot = 0;
626 770
627 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
628 772
629 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 775#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 777 #include "state.h"
637 #undef VAR 778#endif
638 779
639 { 780 {
640 dSP; 781 dSP;
641 782
642 CV *cv; 783 CV *cv;
643 784
644 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
646 { 787 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
650 } 791 }
651 792
652 PUTBACK; 793 PUTBACK;
653 } 794 }
654 795
655 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 797 CORO_THROW = c->except;
657 798
658 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
659 { 800 {
660 if (expect_false (!times_valid)) 801 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 802 coro_times_update ();
662 803
663 coro_times_sub (c); 804 coro_times_sub (c);
664 } 805 }
665 806
666 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
667 { 808 {
668 int i; 809 int i;
669 810
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 } 813 }
673 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
674 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
675} 824}
676 825
677static void 826static void
678save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
679{ 828{
680 SWAP_SVS (c); 829 SWAP_SVS_LEAVE (c);
681 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
682 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
683 { 840 {
684 int i; 841 int i;
685 842
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 845 }
689 846
690 times_valid = 0; 847 times_valid = 0;
691 848
692 if (expect_false (enable_times)) 849 if (ecb_expect_false (enable_times))
693 { 850 {
694 coro_times_update (); times_valid = 1; 851 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 852 coro_times_add (c);
696 } 853 }
697 854
… …
711 868
712 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
714 for (;;) 871 for (;;)
715 { 872 {
716 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
717 { 874 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
719 876
720 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))
721 { 878 {
722 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
723 880
724 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
725 { 882 {
726 EXTEND (SP, 3); 883 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
733 } 890 }
734 } 891 }
735 } 892 }
736 893
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 895 break;
739 896
740 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
744 901
745 PUTBACK; 902 PUTBACK;
746 } 903 }
747 904
748 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 907 {
754 unsigned int i; 908 unsigned int i;
909
755 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 911 CXINC;
757 } 912
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
759 915
760 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
761 917
762 { 918 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 920
765 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
766 slot->defsv = DEFSV; 922 save_perl_slots (slot);
767 slot->errsv = ERRSV; 923#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 925 #include "state.h"
773 #undef VAR 926#endif
774 } 927 }
775} 928}
776 929
777/* 930/*
778 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
785#else 938#else
786static void 939static void
787coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
788{ 941{
789 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() */
790 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 946
794 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 962#endif
810 963
811 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
813 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
814 970
815 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
817 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
818 979
819#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
820 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
821 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
822 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
846 } 1007 }
847 1008
848 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
851 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
854#endif 1018#endif
855} 1019}
… …
885 } 1049 }
886 1050
887 return rss; 1051 return rss;
888} 1052}
889 1053
890/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
891
892static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
893static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
894static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
895 1055
896/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
897#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
898#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
899 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
900 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
901#endif 1061#endif
902 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
903/* 1091/*
904 * This overrides the default magic get method of %SIG elements. 1092 * This overrides the default magic get method of %SIG elements.
905 * 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
906 * 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),
907 * readback here. 1095 * we just provide our own readback here.
908 */ 1096 */
909static int 1097static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 1099{
912 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;
913 1103
914 if (*s == '_') 1104 SV *ssv;
915 {
916 SV **svp = 0;
917 1105
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920
921 if (svp) 1106 if (!*svp)
922 { 1107 ssv = &PL_sv_undef;
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
924 return 0; 1109 ssv = sv_2mortal (newRV_inc (*svp));
925 } 1110 else
926 } 1111 ssv = *svp;
927 1112
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1113 sv_setsv (sv, ssv);
1114 return 0;
929} 1115}
930 1116
931static int 1117static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1119{
934 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;
935 1123
936 if (*s == '_')
937 {
938 SV **svp = 0;
939
940 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
941 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
942
943 if (svp)
944 {
945 SV *old = *svp; 1124 SV *old = *svp;
946 *svp = 0; 1125 *svp = 0;
947 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
948 return 0; 1127 return 0;
949 }
950 }
951
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1128}
954 1129
955static int 1130static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1132{
958 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;
959 1136
960 if (*s == '_')
961 {
962 SV **svp = 0;
963
964 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
965 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
966
967 if (svp)
968 {
969 SV *old = *svp; 1137 SV *old = *svp;
970 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
971 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
972 return 0; 1140 return 0;
973 }
974 }
975
976 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
977} 1141}
978 1142
979static void 1143static void
980prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
981{ 1145{
… …
993slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
994{ 1158{
995 return 1; 1159 return 1;
996} 1160}
997 1161
1162/** coroutine stack handling ************************************************/
1163
998static UNOP init_perl_op; 1164static UNOP init_perl_op;
999 1165
1000static 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 */
1001init_perl (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
1002{ 1168{
1003 /* 1169 /*
1004 * emulate part of the perl startup here. 1170 * emulate part of the perl startup here.
1005 */ 1171 */
… …
1020 PL_parser = 0; 1186 PL_parser = 0;
1021#endif 1187#endif
1022 PL_hints = 0; 1188 PL_hints = 0;
1023 1189
1024 /* recreate the die/warn hooks */ 1190 /* recreate the die/warn hooks */
1025 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1191 PL_diehook = SvREFCNT_inc (rv_diehook);
1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1192 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1027 1193
1028 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
1029 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
1030 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
1031 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);
1032 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
1033 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
1034 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1035 1204
1036 { 1205 {
1037 dSP; 1206 dSP;
… …
1052 /* 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
1053 * 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.
1054 */ 1223 */
1055 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 */
1056 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;
1057 1227
1058 /* 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 */
1059 init_perl_op.op_next = PL_op; 1229 init_perl_op.op_next = PL_op;
1060 init_perl_op.op_type = OP_ENTERSUB; 1230 init_perl_op.op_type = OP_ENTERSUB;
1061 init_perl_op.op_ppaddr = pp_slf; 1231 init_perl_op.op_ppaddr = pp_slf;
… …
1064 PL_op = (OP *)&init_perl_op; 1234 PL_op = (OP *)&init_perl_op;
1065 1235
1066 /* copy throw, in case it was set before init_perl */ 1236 /* copy throw, in case it was set before init_perl */
1067 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
1068 1238
1069 SWAP_SVS (coro); 1239 SWAP_SVS_ENTER (coro);
1070 1240
1071 if (expect_false (enable_times)) 1241 if (ecb_expect_false (enable_times))
1072 { 1242 {
1073 coro_times_update (); 1243 coro_times_update ();
1074 coro_times_sub (coro); 1244 coro_times_sub (coro);
1075 } 1245 }
1076} 1246}
… …
1100destroy_perl (pTHX_ struct coro *coro) 1270destroy_perl (pTHX_ struct coro *coro)
1101{ 1271{
1102 SV *svf [9]; 1272 SV *svf [9];
1103 1273
1104 { 1274 {
1275 SV *old_current = SvRV (coro_current);
1105 struct coro *current = SvSTATE_current; 1276 struct coro *current = SvSTATE (old_current);
1106 1277
1107 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));
1108 1279
1109 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
1110 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1111 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1112 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1291
1113 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1114 1293
1115 /* restore swapped sv's */
1116 SWAP_SVS (coro);
1117
1118 // now save some sv's to be free'd later 1294 /* now save some sv's to be free'd later */
1119 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv); 1296 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv); 1297 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv; 1298 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs; 1299 svf [4] = PL_rs;
… …
1125 svf [6] = (SV *)GvHV (PL_hintgv); 1301 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook; 1302 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook; 1303 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf)); 1304 assert (9 == sizeof (svf) / sizeof (*svf));
1129 1305
1306 SvRV_set (coro_current, old_current);
1307
1130 load_perl (aTHX_ current); 1308 load_perl (aTHX_ current);
1131 } 1309 }
1132 1310
1133 { 1311 {
1134 unsigned int i; 1312 unsigned int i;
… …
1138 1316
1139 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1140 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1141 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1142 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1143 } 1323 }
1144} 1324}
1145 1325
1146INLINE void 1326ecb_inline void
1147free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1148{ 1328{
1149 if (expect_true (coro_mortal)) 1329 if (ecb_expect_true (coro_mortal))
1150 { 1330 {
1151 SvREFCNT_dec (coro_mortal); 1331 SvREFCNT_dec ((SV *)coro_mortal);
1152 coro_mortal = 0; 1332 coro_mortal = 0;
1153 } 1333 }
1154} 1334}
1155 1335
1156static int 1336static int
… …
1210 1390
1211 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1212 { 1392 {
1213 SV **cb; 1393 SV **cb;
1214 1394
1215 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1216 { 1396 {
1217 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1218 1398
1219 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1220 { 1400 {
… …
1289 1469
1290 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 */
1291} 1471}
1292 1472
1293/* 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 */
1294static void NOINLINE 1474static void ecb_noinline
1295cctx_prepare (pTHX) 1475cctx_prepare (pTHX)
1296{ 1476{
1297 PL_top_env = &PL_start_env; 1477 PL_top_env = &PL_start_env;
1298 1478
1299 if (cctx_current->flags & CC_TRACE) 1479 if (cctx_current->flags & CC_TRACE)
… …
1310 slf_frame.prepare = slf_prepare_set_stacklevel; 1490 slf_frame.prepare = slf_prepare_set_stacklevel;
1311 slf_frame.check = slf_check_set_stacklevel; 1491 slf_frame.check = slf_check_set_stacklevel;
1312} 1492}
1313 1493
1314/* 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 */
1315INLINE void 1495ecb_inline void
1316transfer_tail (pTHX) 1496transfer_tail (pTHX)
1317{ 1497{
1318 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);
1319} 1511}
1320 1512
1321/* 1513/*
1322 * this is a _very_ stripped down perl interpreter ;) 1514 * this is a _very_ stripped down perl interpreter ;)
1323 */ 1515 */
… …
1350 * 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
1351 * 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.
1352 */ 1544 */
1353 1545
1354 /* 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 /*
1355 * 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
1356 * 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)
1357 * 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
1358 * bootstrap-time "top" top_env, as we cannot restore the "main" 1557 * doing in that case. YMMV.
1359 * coroutine as Coro has no such concept.
1360 * This actually isn't valid with the pthread backend, but OSes requiring
1361 * that backend are too broken to do it in a standards-compliant way.
1362 */ 1558 */
1363 PL_top_env = main_top_env; 1559 perlish_exit (aTHX);
1364 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1365 } 1560 }
1366} 1561}
1367 1562
1368static coro_cctx * 1563static coro_cctx *
1369cctx_new () 1564cctx_new (void)
1370{ 1565{
1371 coro_cctx *cctx; 1566 coro_cctx *cctx;
1372 1567
1373 ++cctx_count; 1568 ++cctx_count;
1374 New (0, cctx, 1, coro_cctx); 1569 New (0, cctx, 1, coro_cctx);
… …
1380 return cctx; 1575 return cctx;
1381} 1576}
1382 1577
1383/* create a new cctx only suitable as source */ 1578/* create a new cctx only suitable as source */
1384static coro_cctx * 1579static coro_cctx *
1385cctx_new_empty () 1580cctx_new_empty (void)
1386{ 1581{
1387 coro_cctx *cctx = cctx_new (); 1582 coro_cctx *cctx = cctx_new ();
1388 1583
1389 cctx->sptr = 0; 1584 cctx->stack.sptr = 0;
1390 coro_create (&cctx->cctx, 0, 0, 0, 0); 1585 coro_create (&cctx->cctx, 0, 0, 0, 0);
1391 1586
1392 return cctx; 1587 return cctx;
1393} 1588}
1394 1589
1395/* create a new cctx suitable as destination/running a perl interpreter */ 1590/* create a new cctx suitable as destination/running a perl interpreter */
1396static coro_cctx * 1591static coro_cctx *
1397cctx_new_run () 1592cctx_new_run (void)
1398{ 1593{
1399 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1400 void *stack_start;
1401 size_t stack_size;
1402 1595
1403#if HAVE_MMAP 1596 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1404 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1405 /* mmap supposedly does allocate-on-write for us */
1406 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1407
1408 if (cctx->sptr != (void *)-1)
1409 {
1410 #if CORO_STACKGUARD
1411 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1412 #endif
1413 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1414 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1415 cctx->flags |= CC_MAPPED;
1416 } 1597 {
1417 else
1418#endif
1419 {
1420 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1421 New (0, cctx->sptr, cctx_stacksize, long);
1422
1423 if (!cctx->sptr)
1424 {
1425 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1598 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1426 _exit (EXIT_FAILURE); 1599 _exit (EXIT_FAILURE);
1427 }
1428
1429 stack_start = cctx->sptr;
1430 stack_size = cctx->ssize;
1431 } 1600 }
1432 1601
1433 #if CORO_USE_VALGRIND
1434 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1435 #endif
1436
1437 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);
1438 1603
1439 return cctx; 1604 return cctx;
1440} 1605}
1441 1606
1442static void 1607static void
1443cctx_destroy (coro_cctx *cctx) 1608cctx_destroy (coro_cctx *cctx)
1444{ 1609{
1445 if (!cctx) 1610 if (!cctx)
1446 return; 1611 return;
1447 1612
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1613 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1614
1450 --cctx_count; 1615 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1616 coro_destroy (&cctx->cctx);
1452 1617
1453 /* coro_transfer creates new, empty cctx's */ 1618 coro_stack_free (&cctx->stack);
1454 if (cctx->sptr)
1455 {
1456 #if CORO_USE_VALGRIND
1457 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1458 #endif
1459
1460#if HAVE_MMAP
1461 if (cctx->flags & CC_MAPPED)
1462 munmap (cctx->sptr, cctx->ssize);
1463 else
1464#endif
1465 Safefree (cctx->sptr);
1466 }
1467 1619
1468 Safefree (cctx); 1620 Safefree (cctx);
1469} 1621}
1470 1622
1471/* wether this cctx should be destructed */ 1623/* wether this cctx should be destructed */
1472#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))
1473 1625
1474static coro_cctx * 1626static coro_cctx *
1475cctx_get (pTHX) 1627cctx_get (pTHX)
1476{ 1628{
1477 while (expect_true (cctx_first)) 1629 while (ecb_expect_true (cctx_first))
1478 { 1630 {
1479 coro_cctx *cctx = cctx_first; 1631 coro_cctx *cctx = cctx_first;
1480 cctx_first = cctx->next; 1632 cctx_first = cctx->next;
1481 --cctx_idle; 1633 --cctx_idle;
1482 1634
1483 if (expect_true (!CCTX_EXPIRED (cctx))) 1635 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1484 return cctx; 1636 return cctx;
1485 1637
1486 cctx_destroy (cctx); 1638 cctx_destroy (cctx);
1487 } 1639 }
1488 1640
… …
1490} 1642}
1491 1643
1492static void 1644static void
1493cctx_put (coro_cctx *cctx) 1645cctx_put (coro_cctx *cctx)
1494{ 1646{
1495 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));
1496 1648
1497 /* free another cctx if overlimit */ 1649 /* free another cctx if overlimit */
1498 if (expect_false (cctx_idle >= cctx_max_idle)) 1650 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1499 { 1651 {
1500 coro_cctx *first = cctx_first; 1652 coro_cctx *first = cctx_first;
1501 cctx_first = first->next; 1653 cctx_first = first->next;
1502 --cctx_idle; 1654 --cctx_idle;
1503 1655
… …
1514static void 1666static void
1515transfer_check (pTHX_ struct coro *prev, struct coro *next) 1667transfer_check (pTHX_ struct coro *prev, struct coro *next)
1516{ 1668{
1517 /* TODO: throwing up here is considered harmful */ 1669 /* TODO: throwing up here is considered harmful */
1518 1670
1519 if (expect_true (prev != next)) 1671 if (ecb_expect_true (prev != next))
1520 { 1672 {
1521 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1673 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1522 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,");
1523 1675
1524 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1676 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1525 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,");
1526 1678
1527#if !PERL_VERSION_ATLEAST (5,10,0) 1679#if !PERL_VERSION_ATLEAST (5,10,0)
1528 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1680 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1529 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,");
1530#endif 1682#endif
1531 } 1683 }
1532} 1684}
1533 1685
1534/* always use the TRANSFER macro */ 1686/* always use the TRANSFER macro */
1535static void NOINLINE /* noinline so we have a fixed stackframe */ 1687static void ecb_noinline /* noinline so we have a fixed stackframe */
1536transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1688transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1537{ 1689{
1538 dSTACKLEVEL; 1690 dSTACKLEVEL;
1539 1691
1540 /* sometimes transfer is only called to set idle_sp */ 1692 /* sometimes transfer is only called to set idle_sp */
1541 if (expect_false (!prev)) 1693 if (ecb_expect_false (!prev))
1542 { 1694 {
1543 cctx_current->idle_sp = STACKLEVEL; 1695 cctx_current->idle_sp = STACKLEVEL;
1544 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 */
1545 } 1697 }
1546 else if (expect_true (prev != next)) 1698 else if (ecb_expect_true (prev != next))
1547 { 1699 {
1548 coro_cctx *cctx_prev; 1700 coro_cctx *cctx_prev;
1549 1701
1550 if (expect_false (prev->flags & CF_NEW)) 1702 if (ecb_expect_false (prev->flags & CF_NEW))
1551 { 1703 {
1552 /* create a new empty/source context */ 1704 /* create a new empty/source context */
1553 prev->flags &= ~CF_NEW; 1705 prev->flags &= ~CF_NEW;
1554 prev->flags |= CF_RUNNING; 1706 prev->flags |= CF_RUNNING;
1555 } 1707 }
… …
1558 next->flags |= CF_RUNNING; 1710 next->flags |= CF_RUNNING;
1559 1711
1560 /* first get rid of the old state */ 1712 /* first get rid of the old state */
1561 save_perl (aTHX_ prev); 1713 save_perl (aTHX_ prev);
1562 1714
1563 if (expect_false (next->flags & CF_NEW)) 1715 if (ecb_expect_false (next->flags & CF_NEW))
1564 { 1716 {
1565 /* need to start coroutine */ 1717 /* need to start coroutine */
1566 next->flags &= ~CF_NEW; 1718 next->flags &= ~CF_NEW;
1567 /* setup coroutine call */ 1719 /* setup coroutine call */
1568 init_perl (aTHX_ next); 1720 init_perl (aTHX_ next);
1569 } 1721 }
1570 else 1722 else
1571 load_perl (aTHX_ next); 1723 load_perl (aTHX_ next);
1572 1724
1573 /* possibly untie and reuse the cctx */ 1725 /* possibly untie and reuse the cctx */
1574 if (expect_true ( 1726 if (ecb_expect_true (
1575 cctx_current->idle_sp == STACKLEVEL 1727 cctx_current->idle_sp == STACKLEVEL
1576 && !(cctx_current->flags & CC_TRACE) 1728 && !(cctx_current->flags & CC_TRACE)
1577 && !force_cctx 1729 && !force_cctx
1578 )) 1730 ))
1579 { 1731 {
1580 /* 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 */
1581 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));
1582 1734
1583 /* 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. */
1584 /* 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 */
1585 if (expect_false (CCTX_EXPIRED (cctx_current))) 1737 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1586 if (expect_true (!next->cctx)) 1738 if (ecb_expect_true (!next->cctx))
1587 next->cctx = cctx_get (aTHX); 1739 next->cctx = cctx_get (aTHX);
1588 1740
1589 cctx_put (cctx_current); 1741 cctx_put (cctx_current);
1590 } 1742 }
1591 else 1743 else
1592 prev->cctx = cctx_current; 1744 prev->cctx = cctx_current;
1593 1745
1594 ++next->usecount; 1746 ++next->usecount;
1595 1747
1596 cctx_prev = cctx_current; 1748 cctx_prev = cctx_current;
1597 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1749 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1598 1750
1599 next->cctx = 0; 1751 next->cctx = 0;
1600 1752
1601 if (expect_false (cctx_prev != cctx_current)) 1753 if (ecb_expect_false (cctx_prev != cctx_current))
1602 { 1754 {
1603 cctx_prev->top_env = PL_top_env; 1755 cctx_prev->top_env = PL_top_env;
1604 PL_top_env = cctx_current->top_env; 1756 PL_top_env = cctx_current->top_env;
1605 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1757 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1606 } 1758 }
… …
1612#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))
1613#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1765#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1614 1766
1615/** high level stuff ********************************************************/ 1767/** high level stuff ********************************************************/
1616 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 */
1617static int 1771static void
1772coro_call_on_destroy (pTHX_ struct coro *coro);
1773
1774static void
1618coro_state_destroy (pTHX_ struct coro *coro) 1775coro_state_destroy (pTHX_ struct coro *coro)
1619{ 1776{
1620 if (coro->flags & CF_DESTROYED) 1777 if (coro->flags & CF_ZOMBIE)
1621 return 0; 1778 return;
1622 1779
1623 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1780 slf_destroy (aTHX_ coro);
1625 1781
1626 coro->flags |= CF_DESTROYED; 1782 coro->flags |= CF_ZOMBIE;
1627 1783
1628 if (coro->flags & CF_READY) 1784 if (coro->flags & CF_READY)
1629 { 1785 {
1630 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1786 /* reduce nready, as destroying a ready coro effectively unreadies it */
1631 /* alternative: look through all ready queues and remove the coro */ 1787 /* alternative: look through all ready queues and remove the coro */
1632 --coro_nready; 1788 --coro_nready;
1633 } 1789 }
1634 else 1790 else
1635 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;
1636 1796
1637 if (coro->mainstack 1797 if (coro->mainstack
1638 && coro->mainstack != main_mainstack 1798 && coro->mainstack != main_mainstack
1639 && coro->slot 1799 && coro->slot
1640 && !PL_dirty) 1800 && !PL_dirty)
1641 destroy_perl (aTHX_ coro); 1801 destroy_perl (aTHX_ coro);
1642 1802
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1646
1647 cctx_destroy (coro->cctx); 1803 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv); 1804 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args); 1805 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv); 1806 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW); 1807 SvREFCNT_dec (CORO_THROW);
1652 1808
1653 return 1; 1809 coro_call_on_destroy (aTHX_ coro);
1810
1811 /* more destruction mayhem in coro_state_free */
1654} 1812}
1655 1813
1656static int 1814static int
1657coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1815coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1658{ 1816{
1659 struct coro *coro = (struct coro *)mg->mg_ptr; 1817 struct coro *coro = (struct coro *)mg->mg_ptr;
1660 mg->mg_ptr = 0; 1818 mg->mg_ptr = 0;
1661 1819
1662 coro->hv = 0;
1663
1664 if (--coro->refcnt < 0)
1665 {
1666 coro_state_destroy (aTHX_ coro); 1820 coro_state_destroy (aTHX_ coro);
1821 SvREFCNT_dec (coro->on_destroy);
1822 SvREFCNT_dec (coro->status);
1823
1667 Safefree (coro); 1824 Safefree (coro);
1668 }
1669 1825
1670 return 0; 1826 return 0;
1671} 1827}
1672 1828
1673static int 1829static int ecb_cold
1674coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1830coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1675{ 1831{
1676 struct coro *coro = (struct coro *)mg->mg_ptr; 1832 /* called when perl clones the current process the slow way (windows process emulation) */
1677 1833 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1678 ++coro->refcnt; 1834 mg->mg_ptr = 0;
1835 mg->mg_virtual = 0;
1679 1836
1680 return 0; 1837 return 0;
1681} 1838}
1682 1839
1683static MGVTBL coro_state_vtbl = { 1840static MGVTBL coro_state_vtbl = {
… …
1708 TRANSFER (ta, 1); 1865 TRANSFER (ta, 1);
1709} 1866}
1710 1867
1711/** Coro ********************************************************************/ 1868/** Coro ********************************************************************/
1712 1869
1713INLINE void 1870ecb_inline void
1714coro_enq (pTHX_ struct coro *coro) 1871coro_enq (pTHX_ struct coro *coro)
1715{ 1872{
1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1873 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1717 1874
1718 SvREFCNT_inc_NN (coro->hv); 1875 SvREFCNT_inc_NN (coro->hv);
… …
1720 coro->next_ready = 0; 1877 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1878 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro; 1879 ready [1] = coro;
1723} 1880}
1724 1881
1725INLINE struct coro * 1882ecb_inline struct coro *
1726coro_deq (pTHX) 1883coro_deq (pTHX)
1727{ 1884{
1728 int prio; 1885 int prio;
1729 1886
1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1887 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1783{ 1940{
1784 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1941 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1785} 1942}
1786 1943
1787/* expects to own a reference to next->hv */ 1944/* expects to own a reference to next->hv */
1788INLINE void 1945ecb_inline void
1789prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1946prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1790{ 1947{
1791 SV *prev_sv = SvRV (coro_current); 1948 SV *prev_sv = SvRV (coro_current);
1792 1949
1793 ta->prev = SvSTATE_hv (prev_sv); 1950 ta->prev = SvSTATE_hv (prev_sv);
… …
1806{ 1963{
1807 for (;;) 1964 for (;;)
1808 { 1965 {
1809 struct coro *next = coro_deq (aTHX); 1966 struct coro *next = coro_deq (aTHX);
1810 1967
1811 if (expect_true (next)) 1968 if (ecb_expect_true (next))
1812 { 1969 {
1813 /* cannot transfer to destroyed coros, skip and look for next */ 1970 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1971 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1815 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 */
1816 else 1973 else
1817 { 1974 {
1818 next->flags &= ~CF_READY; 1975 next->flags &= ~CF_READY;
1819 --coro_nready; 1976 --coro_nready;
… …
1827 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1828 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1829 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1830 { 1987 {
1831 if (SvRV (sv_idle) == SvRV (coro_current)) 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);
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 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 }
1833 2007
1834 ++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 */
1835 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1836 --coro_nready; 2010 --coro_nready;
1837 } 2011 }
… …
1852 } 2026 }
1853 } 2027 }
1854 } 2028 }
1855} 2029}
1856 2030
1857INLINE void 2031ecb_inline void
1858prepare_cede (pTHX_ struct coro_transfer_args *ta) 2032prepare_cede (pTHX_ struct coro_transfer_args *ta)
1859{ 2033{
1860 api_ready (aTHX_ coro_current); 2034 api_ready (aTHX_ coro_current);
1861 prepare_schedule (aTHX_ ta); 2035 prepare_schedule (aTHX_ ta);
1862} 2036}
1863 2037
1864INLINE void 2038ecb_inline void
1865prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2039prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1866{ 2040{
1867 SV *prev = SvRV (coro_current); 2041 SV *prev = SvRV (coro_current);
1868 2042
1869 if (coro_nready) 2043 if (coro_nready)
… …
1899{ 2073{
1900 struct coro_transfer_args ta; 2074 struct coro_transfer_args ta;
1901 2075
1902 prepare_cede (aTHX_ &ta); 2076 prepare_cede (aTHX_ &ta);
1903 2077
1904 if (expect_true (ta.prev != ta.next)) 2078 if (ecb_expect_true (ta.prev != ta.next))
1905 { 2079 {
1906 TRANSFER (ta, 1); 2080 TRANSFER (ta, 1);
1907 return 1; 2081 return 1;
1908 } 2082 }
1909 else 2083 else
… …
1952 coro->slot->runops = RUNOPS_DEFAULT; 2126 coro->slot->runops = RUNOPS_DEFAULT;
1953 } 2127 }
1954} 2128}
1955 2129
1956static 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
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2207coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2208{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2209 AV *od = coro->on_destroy;
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2210
1962 if (on_destroyp) 2211 if (!od)
1963 { 2212 return;
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965 2213
2214 coro->on_destroy = 0;
2215 sv_2mortal ((SV *)od);
2216
1966 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
1967 { 2225 {
1968 dSP; /* don't disturb outer sp */ 2226 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP); 2227 PUSHMARK (SP);
1972 2228
1973 if (statusp) 2229 if (coro->status)
1974 { 2230 {
1975 int i; 2231 PUTBACK;
1976 AV *status = (AV *)SvRV (*statusp); 2232 coro_push_av (aTHX_ coro->status, G_ARRAY);
1977 EXTEND (SP, AvFILLp (status) + 1); 2233 SPAGAIN;
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 } 2234 }
1982 2235
1983 PUTBACK; 2236 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2237 call_sv (cb, G_VOID | G_DISCARD);
1985 } 2238 }
1986 } 2239 }
1987} 2240}
1988 2241
1989static void 2242static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2243coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1991{ 2244{
1992 int i; 2245 AV *av;
1993 HV *hv = (HV *)SvRV (coro_current); 2246
1994 AV *av = newAV (); 2247 if (coro->status)
2248 {
2249 av = coro->status;
2250 av_clear (av);
2251 }
2252 else
2253 av = coro->status = newAV ();
1995 2254
1996 /* items are actually not so common, so optimise for this case */ 2255 /* items are actually not so common, so optimise for this case */
1997 if (items) 2256 if (items)
1998 { 2257 {
2258 int i;
2259
1999 av_extend (av, items - 1); 2260 av_extend (av, items - 1);
2000 2261
2001 for (i = 0; i < items; ++i) 2262 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2263 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2264 }
2265}
2004 2266
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2267static void
2006 2268slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2269{
2007 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 */
2008 api_ready (aTHX_ sv_manager); 2271 api_ready (aTHX_ sv_manager);
2009 2272
2010 frame->prepare = prepare_schedule; 2273 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2274 frame->check = slf_check_repeat;
2012 2275
2013 /* as a minor optimisation, we could unwind all stacks here */ 2276 /* as a minor optimisation, we could unwind all stacks here */
2014 /* 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 */
2015 /*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;
2016} 2385}
2017 2386
2018/*****************************************************************************/ 2387/*****************************************************************************/
2019/* async pool handler */ 2388/* async pool handler */
2020 2389
… …
2051slf_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)
2052{ 2421{
2053 HV *hv = (HV *)SvRV (coro_current); 2422 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2423 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2424
2056 if (expect_true (coro->saved_deffh)) 2425 if (ecb_expect_true (coro->saved_deffh))
2057 { 2426 {
2058 /* subsequent iteration */ 2427 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2428 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2429 coro->saved_deffh = 0;
2061 2430
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2431 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2432 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2433 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2434 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2435 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2436 }
2070 else 2437 else
2071 { 2438 {
2072 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
2073 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);
2074 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
2075 coro->prio = 0; 2449 coro->prio = 0;
2076 2450
2077 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2078 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
2079 2453
2080 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
2081 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
2082 } 2456 }
… …
2123 2497
2124static int 2498static int
2125slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2499slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2126{ 2500{
2127 SV *data = (SV *)frame->data; 2501 SV *data = (SV *)frame->data;
2128 2502
2129 if (CORO_THROW) 2503 if (CORO_THROW)
2130 return 0; 2504 return 0;
2131 2505
2132 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2506 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2133 return 1; 2507 return 1;
… …
2169 cb = sv_2mortal (coro->rouse_cb); 2543 cb = sv_2mortal (coro->rouse_cb);
2170 coro->rouse_cb = 0; 2544 coro->rouse_cb = 0;
2171 } 2545 }
2172 2546
2173 if (!SvROK (cb) 2547 if (!SvROK (cb)
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2548 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2549 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2550 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2551
2178 { 2552 {
2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2553 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2296static void 2670static void
2297slf_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)
2298{ 2672{
2299 frame->prepare = prepare_cede_notself; 2673 frame->prepare = prepare_cede_notself;
2300 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);
2301} 2694}
2302 2695
2303/* 2696/*
2304 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2305 * 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
… …
2312 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 */
2313 2706
2314 /* 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 */
2315 /* the latter happens when a new coro has been started */ 2708 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2709 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2710 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2711 {
2319 /* first iteration */ 2712 /* first iteration */
2320 dSP; 2713 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2714 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2715 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2756 while (slf_frame.check (aTHX_ &slf_frame));
2364 2757
2365 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 */
2366 2759
2367 /* exception handling */ 2760 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2761 if (ecb_expect_false (CORO_THROW))
2369 { 2762 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2763 SV *exception = sv_2mortal (CORO_THROW);
2371 2764
2372 CORO_THROW = 0; 2765 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2766 sv_setsv (ERRSV, exception);
2374 croak (0); 2767 croak (0);
2375 } 2768 }
2376 2769
2377 /* return value handling - mostly like entersub */ 2770 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2771 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2772 if (GIMME_V == G_SCALAR
2773 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2774 {
2381 dSP; 2775 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2776 SV **bot = PL_stack_base + checkmark;
2383 2777
2384 if (sp == bot) /* too few, push undef */ 2778 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2779 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2780 else /* too many, take last one */
2387 bot [1] = *sp; 2781 bot [1] = *sp;
2388 2782
2389 SP = bot + 1; 2783 SP = bot + 1;
2390 2784
2391 PUTBACK; 2785 PUTBACK;
… …
2489{ 2883{
2490 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);
2491 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2492} 2886}
2493 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
2494/*****************************************************************************/ 2980/*****************************************************************************/
2495/* PerlIO::cede */ 2981/* PerlIO::cede */
2496 2982
2497typedef struct 2983typedef struct
2498{ 2984{
2499 PerlIOBuf base; 2985 PerlIOBuf base;
2500 NV next, every; 2986 NV next, every;
2501} PerlIOCede; 2987} PerlIOCede;
2502 2988
2503static IV 2989static IV ecb_cold
2504PerlIOCede_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)
2505{ 2991{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2993
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2994 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2995 self->next = nvtime () + self->every;
2510 2996
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2997 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2998}
2513 2999
2514static SV * 3000static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3001PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 3002{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 3004
2519 return newSVnv (self->every); 3005 return newSVnv (self->every);
… …
2626 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2627 PUTBACK; 3113 PUTBACK;
2628 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2629 } 3115 }
2630 3116
2631 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2632 } 3118 }
2633} 3119}
2634 3120
2635static void 3121static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 3123{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3124 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3125 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 3126}
2641 3127
2642static int 3128static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3129slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 3130{
2645 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2646 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;
2647 3136
2648 /* 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 */
2649 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
2650 return 0; 3143 return 0;
3144 }
2651 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2652 { 3146 {
2653 SvSTATE_current->on_destroy = 0;
2654
2655 if (acquire) 3147 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 3149 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2659 3151
… …
2663 { 3155 {
2664 int i; 3156 int i;
2665 /* 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 */
2666 /* 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 */
2667 /* this avoids some degenerate memory usage cases */ 3159 /* this avoids some degenerate memory usage cases */
2668 3160 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 3161 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 3162 return 1;
2672 3163
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3164 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 3165 return 1;
2675 } 3166 }
2676} 3167}
2677 3168
2678static int 3169static int
… …
2701 { 3192 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3193 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3194
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3195 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3196 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3197 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3198 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3199 frame->destroy = coro_semaphore_destroy;
2710 } 3200 }
2711} 3201}
2712 3202
2713static void 3203static void
2714slf_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)
… …
2772 { 3262 {
2773 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
2774 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
2775 } 3265 }
2776 3266
2777 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
2778 3268
2779 --count; 3269 --count;
2780 } 3270 }
2781} 3271}
2782 3272
… …
2867 } 3357 }
2868 3358
2869 av_push (state, data_sv); 3359 av_push (state, data_sv);
2870 3360
2871 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
2872 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
2873 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
2874} 3364}
2875 3365
2876static int 3366static int
2877slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2878{ 3368{
… …
2883 /* it quickly returns */ 3373 /* it quickly returns */
2884 if (CORO_THROW) 3374 if (CORO_THROW)
2885 return 0; 3375 return 0;
2886 3376
2887 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
2888 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2889 return 1; 3379 return 1;
2890 3380
2891 /* restore status */ 3381 /* restore status */
2892 { 3382 {
2893 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
… …
2896 errno = data->errorno; 3386 errno = data->errorno;
2897 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
2898 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
2899 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
2900 3390
2901 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
2902 } 3392 }
2903 3393
2904 /* push result values */ 3394 /* push result values */
2905 { 3395 {
2906 dSP; 3396 dSP;
… …
2932 dSP; 3422 dSP;
2933 3423
2934 static SV *prio_cv; 3424 static SV *prio_cv;
2935 static SV *prio_sv; 3425 static SV *prio_sv;
2936 3426
2937 if (expect_false (!prio_cv)) 3427 if (ecb_expect_false (!prio_cv))
2938 { 3428 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3429 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3430 prio_sv = newSViv (0);
2941 } 3431 }
2942 3432
… …
3048 } 3538 }
3049 3539
3050 return coro_sv; 3540 return coro_sv;
3051} 3541}
3052 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
3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3613MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3054 3614
3055PROTOTYPES: DISABLE 3615PROTOTYPES: DISABLE
3056 3616
3057BOOT: 3617BOOT:
3058{ 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"
3059#ifdef USE_ITHREADS 3621#ifdef USE_ITHREADS
3060# if CORO_PTHREAD 3622# if CORO_PTHREAD
3061 coro_thx = PERL_GET_CONTEXT; 3623 coro_thx = PERL_GET_CONTEXT;
3062# endif 3624# endif
3063#endif 3625#endif
3064 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;
3065 3632
3066 cctx_current = cctx_new_empty (); 3633 cctx_current = cctx_new_empty ();
3067 3634
3068 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3635 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3069 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3636 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3070 3637
3071 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3638 {
3072 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3639 /*
3073 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 }
3074 3662
3075 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3076 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));
3077 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));
3078 3665
3079 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3666 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3080 3667
… …
3109 coroapi.prepare_nop = prepare_nop; 3696 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3697 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3698 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3699 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3700
3114 { 3701 time_init (aTHX);
3115 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3116
3117 if (!svp) croak ("Time::HiRes is required");
3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3119
3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3124 }
3125 3702
3126 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
3127} 3709}
3128 3710
3129SV * 3711SV *
3130new (SV *klass, ...) 3712new (SV *klass, ...)
3131 ALIAS: 3713 ALIAS:
… …
3138void 3720void
3139transfer (...) 3721transfer (...)
3140 PROTOTYPE: $$ 3722 PROTOTYPE: $$
3141 CODE: 3723 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3724 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3143
3144bool
3145_destroy (SV *coro_sv)
3146 CODE:
3147 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3148 OUTPUT:
3149 RETVAL
3150
3151void
3152_exit (int code)
3153 PROTOTYPE: $
3154 CODE:
3155 _exit (code);
3156 3725
3157SV * 3726SV *
3158clone (Coro::State coro) 3727clone (Coro::State coro)
3159 CODE: 3728 CODE:
3160{ 3729{
… …
3215void 3784void
3216list () 3785list ()
3217 PROTOTYPE: 3786 PROTOTYPE:
3218 PPCODE: 3787 PPCODE:
3219{ 3788{
3220 struct coro *coro; 3789 struct coro *coro;
3221 for (coro = coro_first; coro; coro = coro->next) 3790 for (coro = coro_first; coro; coro = coro->next)
3222 if (coro->hv) 3791 if (coro->hv)
3223 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3792 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3224} 3793}
3225 3794
… …
3230 CODE: 3799 CODE:
3231{ 3800{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3801 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3802 {
3234 struct coro *current = SvSTATE_current; 3803 struct coro *current = SvSTATE_current;
3804 struct CoroSLF slf_save;
3235 3805
3236 if (current != coro) 3806 if (current != coro)
3237 { 3807 {
3238 PUTBACK; 3808 PUTBACK;
3239 save_perl (aTHX_ current); 3809 save_perl (aTHX_ current);
3240 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;
3241 SPAGAIN; 3820 SPAGAIN;
3242 } 3821 }
3243 3822
3244 PUSHSTACK; 3823 PUSHSTACK;
3245 3824
… …
3255 SPAGAIN; 3834 SPAGAIN;
3256 3835
3257 if (current != coro) 3836 if (current != coro)
3258 { 3837 {
3259 PUTBACK; 3838 PUTBACK;
3839 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3840 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3841 load_perl (aTHX_ current);
3262 SPAGAIN; 3842 SPAGAIN;
3263 } 3843 }
3264 } 3844 }
… …
3269 PROTOTYPE: $ 3849 PROTOTYPE: $
3270 ALIAS: 3850 ALIAS:
3271 is_ready = CF_READY 3851 is_ready = CF_READY
3272 is_running = CF_RUNNING 3852 is_running = CF_RUNNING
3273 is_new = CF_NEW 3853 is_new = CF_NEW
3274 is_destroyed = CF_DESTROYED 3854 is_destroyed = CF_ZOMBIE
3855 is_zombie = CF_ZOMBIE
3275 is_suspended = CF_SUSPENDED 3856 is_suspended = CF_SUSPENDED
3276 CODE: 3857 CODE:
3277 RETVAL = boolSV (coro->flags & ix); 3858 RETVAL = boolSV (coro->flags & ix);
3278 OUTPUT: 3859 OUTPUT:
3279 RETVAL 3860 RETVAL
3280 3861
3281void 3862void
3282throw (Coro::State self, SV *exception = &PL_sv_undef) 3863throw (SV *self, SV *exception = &PL_sv_undef)
3283 PROTOTYPE: $;$ 3864 PROTOTYPE: $;$
3284 CODE: 3865 CODE:
3285{ 3866{
3867 struct coro *coro = SvSTATE (self);
3286 struct coro *current = SvSTATE_current; 3868 struct coro *current = SvSTATE_current;
3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3869 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3288 SvREFCNT_dec (*exceptionp); 3870 SvREFCNT_dec (*exceptionp);
3289 SvGETMAGIC (exception); 3871 SvGETMAGIC (exception);
3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3872 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3873
3874 api_ready (aTHX_ self);
3291} 3875}
3292 3876
3293void 3877void
3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3878api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3295 PROTOTYPE: $;$ 3879 PROTOTYPE: $;$
… …
3350 3934
3351void 3935void
3352cancel (Coro::State self) 3936cancel (Coro::State self)
3353 CODE: 3937 CODE:
3354 coro_state_destroy (aTHX_ self); 3938 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3939
3358SV * 3940SV *
3359enable_times (int enabled = enable_times) 3941enable_times (int enabled = enable_times)
3360 CODE: 3942 CODE:
3361{ 3943{
… …
3374 3956
3375void 3957void
3376times (Coro::State self) 3958times (Coro::State self)
3377 PPCODE: 3959 PPCODE:
3378{ 3960{
3379 struct coro *current = SvSTATE (coro_current); 3961 struct coro *current = SvSTATE (coro_current);
3380 3962
3381 if (expect_false (current == self)) 3963 if (ecb_expect_false (current == self))
3382 { 3964 {
3383 coro_times_update (); 3965 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current)); 3966 coro_times_add (SvSTATE (coro_current));
3385 } 3967 }
3386 3968
3387 EXTEND (SP, 2); 3969 EXTEND (SP, 2);
3388 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)));
3389 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)));
3390 3972
3391 if (expect_false (current == self)) 3973 if (ecb_expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current)); 3974 coro_times_sub (SvSTATE (coro_current));
3393} 3975}
3394 3976
3395void 3977void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3978swap_sv (Coro::State coro, SV *sva, SV *svb)
3397 CODE: 3979 CODE:
3398{ 3980{
3399 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);
3400 3987
3401 if (current == coro) 3988 if (current == coro)
3402 SWAP_SVS (current); 3989 SWAP_SVS_LEAVE (current);
3403 3990
3404 if (!coro->swap_sv) 3991 if (!coro->swap_sv)
3405 coro->swap_sv = newAV (); 3992 coro->swap_sv = newAV ();
3406 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
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4015 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4016 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4017
4018 removed:
3409 4019
3410 if (current == coro) 4020 if (current == coro)
3411 SWAP_SVS (current); 4021 SWAP_SVS_ENTER (current);
3412} 4022}
3413 4023
3414 4024
3415MODULE = Coro::State PACKAGE = Coro 4025MODULE = Coro::State PACKAGE = Coro
3416 4026
3417BOOT: 4027BOOT:
3418{ 4028{
4029 if (SVt_LAST > 32)
4030 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4031
3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4032 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4033 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4034 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3423 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);
3424 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4036 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4037 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4038 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4039 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3428 4040
3429 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);
3430 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4042 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3431 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);
3432 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 */
3433 4045
3434 coro_stash = gv_stashpv ("Coro", TRUE); 4046 coro_stash = gv_stashpv ("Coro", TRUE);
3435 4047
3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4048 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4049 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4050 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3450 coroapi.ready = api_ready; 4062 coroapi.ready = api_ready;
3451 coroapi.is_ready = api_is_ready; 4063 coroapi.is_ready = api_is_ready;
3452 coroapi.nready = coro_nready; 4064 coroapi.nready = coro_nready;
3453 coroapi.current = coro_current; 4065 coroapi.current = coro_current;
3454 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
3455 /*GCoroAPI = &coroapi;*/ 4071 /*GCoroAPI = &coroapi;*/
3456 sv_setiv (sv, (IV)&coroapi); 4072 sv_setiv (sv, (IV)&coroapi);
3457 SvREADONLY_on (sv); 4073 SvREADONLY_on (sv);
3458 } 4074 }
3459} 4075}
… …
3466 api_ready (aTHX_ RETVAL); 4082 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 4083 OUTPUT:
3468 RETVAL 4084 RETVAL
3469 4085
3470void 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
3471terminate (...) 4103terminate (...)
3472 CODE: 4104 CODE:
3473 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
3474 4115
3475void 4116void
3476schedule (...) 4117schedule (...)
3477 CODE: 4118 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4119 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3499 4140
3500void 4141void
3501_set_current (SV *current) 4142_set_current (SV *current)
3502 PROTOTYPE: $ 4143 PROTOTYPE: $
3503 CODE: 4144 CODE:
3504 SvREFCNT_dec (SvRV (coro_current)); 4145 SvREFCNT_dec_NN (SvRV (coro_current));
3505 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4146 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3506 4147
3507void 4148void
3508_set_readyhook (SV *hook) 4149_set_readyhook (SV *hook)
3509 PROTOTYPE: $ 4150 PROTOTYPE: $
… …
3593 4234
3594 if ((SV *)hv == &PL_sv_undef) 4235 if ((SV *)hv == &PL_sv_undef)
3595 { 4236 {
3596 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);
3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4238 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3598 SvREFCNT_dec (sv); 4239 SvREFCNT_dec_NN (sv);
3599 } 4240 }
3600 4241
3601 { 4242 {
3602 struct coro *coro = SvSTATE_hv (hv); 4243 struct coro *coro = SvSTATE_hv (hv);
3603 4244
… …
3610 api_ready (aTHX_ (SV *)hv); 4251 api_ready (aTHX_ (SV *)hv);
3611 4252
3612 if (GIMME_V != G_VOID) 4253 if (GIMME_V != G_VOID)
3613 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4254 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3614 else 4255 else
3615 SvREFCNT_dec (hv); 4256 SvREFCNT_dec_NN (hv);
3616} 4257}
3617 4258
3618SV * 4259SV *
3619rouse_cb () 4260rouse_cb ()
3620 PROTOTYPE: 4261 PROTOTYPE:
… …
3635 on_leave = 1 4276 on_leave = 1
3636 PROTOTYPE: & 4277 PROTOTYPE: &
3637 CODE: 4278 CODE:
3638{ 4279{
3639 struct coro *coro = SvSTATE_current; 4280 struct coro *coro = SvSTATE_current;
3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4281 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3641 4282
3642 block = s_get_cv_croak (block); 4283 block = s_get_cv_croak (block);
3643 4284
3644 if (!*avp) 4285 if (!*avp)
3645 *avp = newAV (); 4286 *avp = newAV ();
… …
3665 4306
3666SV * 4307SV *
3667new (SV *klass, SV *count = 0) 4308new (SV *klass, SV *count = 0)
3668 CODE: 4309 CODE:
3669{ 4310{
3670 int semcnt = 1; 4311 int semcnt = 1;
3671 4312
3672 if (count) 4313 if (count)
3673 { 4314 {
3674 SvGETMAGIC (count); 4315 SvGETMAGIC (count);
3675 4316
… …
3699 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4340 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3700 OUTPUT: 4341 OUTPUT:
3701 RETVAL 4342 RETVAL
3702 4343
3703void 4344void
3704up (SV *self, int adjust = 1) 4345up (SV *self)
3705 ALIAS:
3706 adjust = 1
3707 CODE: 4346 CODE:
4347 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4348
4349void
4350adjust (SV *self, int adjust)
4351 CODE:
3708 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4352 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3709 4353
3710void 4354void
3711down (...) 4355down (...)
3712 CODE: 4356 CODE:
3713 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4357 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3735 XSRETURN_NO; 4379 XSRETURN_NO;
3736} 4380}
3737 4381
3738void 4382void
3739waiters (SV *self) 4383waiters (SV *self)
3740 PPCODE: 4384 PPCODE:
3741{ 4385{
3742 AV *av = (AV *)SvRV (self); 4386 AV *av = (AV *)SvRV (self);
3743 int wcount = AvFILLp (av) + 1 - 1; 4387 int wcount = AvFILLp (av) + 1 - 1;
3744 4388
3745 if (GIMME_V == G_SCALAR) 4389 if (GIMME_V == G_SCALAR)
… …
3754} 4398}
3755 4399
3756MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4400MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3757 4401
3758void 4402void
3759_may_delete (SV *sem, int count, int extra_refs) 4403_may_delete (SV *sem, int count, unsigned int extra_refs)
3760 PPCODE: 4404 PPCODE:
3761{ 4405{
3762 AV *av = (AV *)SvRV (sem); 4406 AV *av = (AV *)SvRV (sem);
3763 4407
3764 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4408 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3765 && AvFILLp (av) == 0 /* no waiters, just count */ 4409 && AvFILLp (av) == 0 /* no waiters, just count */
3766 && SvIV (AvARRAY (av)[0]) == count) 4410 && SvIV (AvARRAY (av)[0]) == count)
3767 XSRETURN_YES; 4411 XSRETURN_YES;
… …
3788 4432
3789void 4433void
3790broadcast (SV *self) 4434broadcast (SV *self)
3791 CODE: 4435 CODE:
3792{ 4436{
3793 AV *av = (AV *)SvRV (self); 4437 AV *av = (AV *)SvRV (self);
3794 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4438 coro_signal_wake (aTHX_ av, AvFILLp (av));
3795} 4439}
3796 4440
3797void 4441void
3798send (SV *self) 4442send (SV *self)
… …
3806 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4450 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3807} 4451}
3808 4452
3809IV 4453IV
3810awaited (SV *self) 4454awaited (SV *self)
3811 CODE: 4455 CODE:
3812 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4456 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3813 OUTPUT: 4457 OUTPUT:
3814 RETVAL 4458 RETVAL
3815 4459
3816 4460
… …
3821 4465
3822void 4466void
3823_schedule (...) 4467_schedule (...)
3824 CODE: 4468 CODE:
3825{ 4469{
3826 static int incede; 4470 static int incede;
3827 4471
3828 api_cede_notself (aTHX); 4472 api_cede_notself (aTHX);
3829 4473
3830 ++incede; 4474 ++incede;
3831 while (coro_nready >= incede && api_cede (aTHX)) 4475 while (coro_nready >= incede && api_cede (aTHX))
… …
3875 { 4519 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4520 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0; 4521 coro_old_pp_sselect = 0;
3878 } 4522 }
3879 4523
4524MODULE = Coro::State PACKAGE = Coro::Util
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