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.382 by root, Thu Feb 10 08:06:27 2011 UTC vs.
Revision 1.472 by root, Thu Aug 31 16:24:19 2017 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/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
124static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
126 141
127/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 144static OP *pp_slf (pTHX);
145static void slf_destroy (pTHX_ struct coro *coro);
130 146
131static U32 cctx_gen; 147static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 148static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 149static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 150static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142 158
143static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
144static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
145static SV *rv_diehook; 161static SV *rv_diehook;
146static SV *rv_warnhook; 162static SV *rv_warnhook;
147static HV *hv_sig; /* %SIG */
148 163
149/* async_pool helper stuff */ 164/* async_pool helper stuff */
150static SV *sv_pool_rss; 165static SV *sv_pool_rss;
151static SV *sv_pool_size; 166static SV *sv_pool_size;
152static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
… …
164static char times_valid; 179static char times_valid;
165 180
166static struct coro_cctx *cctx_first; 181static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 182static int cctx_count, cctx_idle;
168 183
169enum { 184enum
185{
170 CC_MAPPED = 0x01, 186 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 187 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 188 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 189 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 190 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 195typedef struct coro_cctx
180{ 196{
181 struct coro_cctx *next; 197 struct coro_cctx *next;
182 198
183 /* the stack */ 199 /* the stack */
184 void *sptr; 200 struct coro_stack stack;
185 size_t ssize;
186 201
187 /* cpu state */ 202 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 205 JMPENV *idle_te; /* same as idle_sp, but for top_env */
206#endif
190 JMPENV *top_env; 207 JMPENV *top_env;
191 coro_context cctx; 208 coro_context cctx;
192 209
193 U32 gen; 210 U32 gen;
194#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
195 int valgrind_id; 212 int valgrind_id;
196#endif 213#endif
197 unsigned char flags; 214 unsigned char flags;
198} coro_cctx; 215} coro_cctx;
199 216
200coro_cctx *cctx_current; /* the currently running cctx */ 217static coro_cctx *cctx_current; /* the currently running cctx */
201 218
202/*****************************************************************************/ 219/*****************************************************************************/
203 220
221static MGVTBL coro_state_vtbl;
222
204enum { 223enum
224{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 225 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 226 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 227 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 228 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 229 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
230 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 231};
211 232
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 233/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 234typedef struct
214{ 235{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
221# include "state.h" 237 #include "state.h"
222#undef VAR
223} perl_slots; 238} perl_slots;
224 239
240/* 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)) 241#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 242
227/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
228struct coro { 244struct coro
245{
229 /* the C coroutine allocated to this perl coroutine, if any */ 246 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 247 coro_cctx *cctx;
231 248
232 /* ready queue */ 249 /* ready queue */
233 struct coro *next_ready; 250 struct coro *next_ready;
… …
235 /* state data */ 252 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 253 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 254 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 255 perl_slots *slot; /* basically the saved sp */
239 256
240 CV *startcv; /* the CV to execute */ 257 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 258 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 259 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 260 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro);
246 261
247 /* statistics */ 262 /* statistics */
248 int usecount; /* number of transfers to this coro */ 263 int usecount; /* number of transfers to this coro */
249 264
250 /* coro process data */ 265 /* coro process data */
251 int prio; 266 int prio;
252 SV *except; /* exception to be thrown */ 267 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 268 SV *rouse_cb; /* last rouse callback */
269 AV *on_destroy; /* callbacks or coros to notify on destroy */
270 AV *status; /* the exit status list */
254 271
255 /* async_pool */ 272 /* async_pool */
256 SV *saved_deffh; 273 SV *saved_deffh;
257 SV *invoke_cb; 274 SV *invoke_cb;
258 AV *invoke_av; 275 AV *invoke_av;
259 276
260 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
261 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
263 280
264 /* swap_sv */ 281 /* swap_sv */
265 AV *swap_sv; 282 AV *swap_sv;
266 283
267 /* times */ 284 /* times */
… …
274typedef struct coro *Coro__State; 291typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 292typedef struct coro *Coro__State_or_hashref;
276 293
277/* the following variables are effectively part of the perl context */ 294/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 295/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 296/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 297static struct CoroSLF slf_frame; /* the current slf frame */
281 298
282/** Coro ********************************************************************/ 299/** Coro ********************************************************************/
283 300
284#define CORO_PRIO_MAX 3 301#define CORO_PRIO_MAX 3
… …
290 307
291/* for Coro.pm */ 308/* for Coro.pm */
292static SV *coro_current; 309static SV *coro_current;
293static SV *coro_readyhook; 310static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 311static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 312static CV *cv_coro_run;
296static struct coro *coro_first; 313static struct coro *coro_first;
297#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
315
316/** JIT *********************************************************************/
317
318#if CORO_JIT
319 /* APPLE doesn't have mmap though */
320 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
321 #ifndef CORO_JIT_TYPE
322 #if ECB_AMD64 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "amd64-unix"
324 #elif __i386 && CORO_JIT_UNIXY
325 #define CORO_JIT_TYPE "x86-unix"
326 #endif
327 #endif
328#endif
329
330#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
331 #undef CORO_JIT
332#endif
333
334#if CORO_JIT
335 typedef void (*load_save_perl_slots_type)(perl_slots *);
336 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
337#endif
298 338
299/** Coro::Select ************************************************************/ 339/** Coro::Select ************************************************************/
300 340
301static OP *(*coro_old_pp_sselect) (pTHX); 341static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 342static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 354 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 355 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 356 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 357}
318 358
359/** time stuff **************************************************************/
360
361#ifdef HAS_GETTIMEOFDAY
362
363ecb_inline void
364coro_u2time (pTHX_ UV ret[2])
365{
366 struct timeval tv;
367 gettimeofday (&tv, 0);
368
369 ret [0] = tv.tv_sec;
370 ret [1] = tv.tv_usec;
371}
372
373ecb_inline double
374coro_nvtime (void)
375{
376 struct timeval tv;
377 gettimeofday (&tv, 0);
378
379 return tv.tv_sec + tv.tv_usec * 1e-6;
380}
381
382ecb_inline void
383time_init (pTHX)
384{
385 nvtime = coro_nvtime;
386 u2time = coro_u2time;
387}
388
389#else
390
391ecb_inline void
392time_init (pTHX)
393{
394 SV **svp;
395
396 require_pv ("Time/HiRes.pm");
397
398 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
399
400 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
401 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
402
403 nvtime = INT2PTR (double (*)(), SvIV (*svp));
404
405 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
406 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
407}
408
409#endif
410
319/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
320 412
321static SV * 413static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
323{ 415{
324#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 417 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 418 get_sv (name, create);
327#endif 419#endif
328 return get_sv (name, create); 420 return get_sv (name, create);
329} 421}
330 422
331static AV * 423static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
333{ 425{
334#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 427 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 428 get_av (name, create);
337#endif 429#endif
338 return get_av (name, create); 430 return get_av (name, create);
339} 431}
340 432
341static HV * 433static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
343{ 435{
344#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 437 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 438 get_hv (name, create);
347#endif 439#endif
348 return get_hv (name, create); 440 return get_hv (name, create);
349} 441}
350 442
351INLINE void 443ecb_inline void
352coro_times_update () 444coro_times_update (void)
353{ 445{
354#ifdef coro_clock_gettime 446#ifdef coro_clock_gettime
355 struct timespec ts; 447 struct timespec ts;
356 448
357 ts.tv_sec = ts.tv_nsec = 0; 449 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 461 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 462 time_real [1] = tv [1] * 1000;
371#endif 463#endif
372} 464}
373 465
374INLINE void 466ecb_inline void
375coro_times_add (struct coro *c) 467coro_times_add (struct coro *c)
376{ 468{
377 c->t_real [1] += time_real [1]; 469 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 470 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0]; 471 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 473 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 474 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0]; 475 c->t_cpu [0] += time_cpu [0];
384} 476}
385 477
386INLINE void 478ecb_inline void
387coro_times_sub (struct coro *c) 479coro_times_sub (struct coro *c)
388{ 480{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 481 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]; 482 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 483 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 491/* magic glue */
400 492
401#define CORO_MAGIC_type_cv 26 493#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 494#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 495
404#define CORO_MAGIC_NN(sv, type) \ 496#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 498 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 499 : mg_find (sv, type))
408 500
409#define CORO_MAGIC(sv, type) \ 501#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 502 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 503 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 504 : 0)
413 505
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 506#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) 507#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 508
417INLINE struct coro * 509ecb_inline MAGIC *
418SvSTATE_ (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
419{ 511{
420 HV *stash;
421 MAGIC *mg; 512 MAGIC *mg;
422 513
514 if (ecb_expect_true (
515 SvTYPE (coro) == SVt_PVHV
516 && (mg = CORO_MAGIC_state (coro))
517 && mg->mg_virtual == &coro_state_vtbl
518 ))
519 return mg;
520
521 return 0;
522}
523
524ecb_inline struct coro *
525SvSTATE_ (pTHX_ SV *coro_sv)
526{
527 MAGIC *mg;
528
423 if (SvROK (coro)) 529 if (SvROK (coro_sv))
424 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
425 531
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
533 if (!mg)
427 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
428 535
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; 536 return (struct coro *)mg->mg_ptr;
439} 537}
440 538
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 539#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 540
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 544
447/*****************************************************************************/ 545/*****************************************************************************/
448/* padlist management and caching */ 546/* padlist management and caching */
449 547
450static AV * 548ecb_inline PADLIST *
451coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
452{ 550{
453 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
455 556
456 newpadlist = newAV (); 557#if NEWPADAPI
558
559 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
560 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
561 while (!PadlistARRAY (padlist)[off - 1])
562 --off;
563
564 Perl_pad_push (aTHX_ padlist, off);
565
566 newpad = PadlistARRAY (padlist)[off];
567 PadlistARRAY (padlist)[off] = 0;
568
569#else
570
571#if PERL_VERSION_ATLEAST (5,10,0)
572 Perl_pad_push (aTHX_ padlist, off);
573#else
574 Perl_pad_push (aTHX_ padlist, off, 1);
575#endif
576
577 newpad = PadlistARRAY (padlist)[off];
578 PadlistMAX (padlist) = off - 1;
579
580#endif
581
582 newPADLIST (newpadlist);
583#if !PERL_VERSION_ATLEAST(5,15,3)
584 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
457 AvREAL_off (newpadlist); 585 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 586#endif
463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
464 --AvFILLp (padlist);
465 587
466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
467 av_store (newpadlist, 1, (SV *)newpad); 589 PadlistMAX (newpadlist) = 1;
590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
595 PadlistARRAY (newpadlist)[1] = newpad;
468 596
469 return newpadlist; 597 return newpadlist;
470} 598}
471 599
472static void 600ecb_inline void
473free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
474{ 602{
475 /* may be during global destruction */ 603 /* may be during global destruction */
476 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
477 { 605 {
478 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
479 607
480 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
481 { 609 {
482 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
483 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
484 I32 j = AvFILLp (av);
485 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
486 while (j >= 0) 617 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
488 619
489 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
490 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
491 } 623 }
492 624
493 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
494 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
495 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
496 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
497 } 635 }
498} 636}
499 637
500static int 638static int
501coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
502{ 640{
503 AV *padlist; 641 PADLIST *padlist;
504 AV *av = (AV *)mg->mg_obj; 642 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
643 size_t len = *(size_t *)mg->mg_ptr;
505 644
506 /* perl manages to free our internal AV and _then_ call us */ 645 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT) 646 if (IN_DESTRUCT)
508 return 0; 647 return 0;
509 648
510 /* casting is fun. */ 649 while (len--)
511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
512 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
513
514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
515 651
516 return 0; 652 return 0;
517} 653}
518 654
519static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
520 0, 0, 0, 0, 656 0, 0, 0, 0,
521 coro_cv_free 657 coro_cv_free
522}; 658};
523 659
524/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
525static void 661ecb_inline void
526get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
527{ 663{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 665 size_t *lenp;
530 666
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
533 else 669 else
534 { 670 {
535#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
537 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 680#endif
545 } 681 }
546} 682}
547 683
548static void 684ecb_inline void
549put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
550{ 686{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av;
553 688
554 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 691 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
692 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
693 mg->mg_len = 1; /* so mg_free frees mg_ptr */
694 }
695 else
696 Renew (mg->mg_ptr,
697 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
698 char);
556 699
557 av = (AV *)mg->mg_obj; 700 ((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} 701}
564 702
565/** load & save, init *******************************************************/ 703/** load & save, init *******************************************************/
566 704
705ecb_inline void
706swap_sv (SV *a, SV *b)
707{
708 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
709 SV tmp;
710
711 /* swap sv_any */
712 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
713
714 /* swap sv_flags */
715 SvFLAGS (&tmp) = SvFLAGS (a);
716 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
717 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
718
719#if PERL_VERSION_ATLEAST (5,10,0)
720 /* perl 5.10 and later complicates this _quite_ a bit, but it also
721 * is much faster, so no quarrels here. alternatively, we could
722 * sv_upgrade to avoid this.
723 */
724 {
725 /* swap sv_u */
726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
727
728 /* if SvANY points to the head, we need to adjust the pointers,
729 * as the pointer for a still points to b, and maybe vice versa.
730 */
731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
737
738 if (svany_in_head (SvTYPE (a)))
739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
740
741 if (svany_in_head (SvTYPE (b)))
742 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
743 }
744#endif
745}
746
567/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
568static void 748static void
569swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
570{ 750{
571 int i; 751 int i;
572 752
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 754 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} 755}
613 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
614#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
617 773
618static void 774static void
619on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
620 776
621static void 777static void
… …
624 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
625 c->slot = 0; 781 c->slot = 0;
626 782
627 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
628 784
629 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 787#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 789 #include "state.h"
637 #undef VAR 790#endif
638 791
639 { 792 {
640 dSP; 793 dSP;
641 794
642 CV *cv; 795 CV *cv;
643 796
644 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
646 { 799 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
650 } 803 }
651 804
652 PUTBACK; 805 PUTBACK;
653 } 806 }
654 807
655 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 809 CORO_THROW = c->except;
657 810
658 if (expect_false (enable_times)) 811 if (ecb_expect_false (enable_times))
659 { 812 {
660 if (expect_false (!times_valid)) 813 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 814 coro_times_update ();
662 815
663 coro_times_sub (c); 816 coro_times_sub (c);
664 } 817 }
665 818
666 if (expect_false (c->on_enter)) 819 if (ecb_expect_false (c->on_enter))
667 { 820 {
668 int i; 821 int i;
669 822
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 } 825 }
673 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
674 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
675} 836}
676 837
677static void 838static void
678save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
679{ 840{
680 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
681 842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
850
682 if (expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
683 { 852 {
684 int i; 853 int i;
685 854
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 855 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 856 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 857 }
689 858
690 times_valid = 0; 859 times_valid = 0;
691 860
692 if (expect_false (enable_times)) 861 if (ecb_expect_false (enable_times))
693 { 862 {
694 coro_times_update (); times_valid = 1; 863 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 864 coro_times_add (c);
696 } 865 }
697 866
… …
711 880
712 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
714 for (;;) 883 for (;;)
715 { 884 {
716 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
717 { 886 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
719 888
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 889 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 890 {
722 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
723 892
724 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
725 { 894 {
726 EXTEND (SP, 3); 895 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
733 } 902 }
734 } 903 }
735 } 904 }
736 905
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 907 break;
739 908
740 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
… …
744 913
745 PUTBACK; 914 PUTBACK;
746 } 915 }
747 916
748 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 918 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 { 919 {
754 unsigned int i; 920 unsigned int i;
921
755 for (i = 3; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 923 CXINC;
757 } 924
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 925 cxstack_ix -= SLOT_COUNT; /* undo allocation */
926 }
759 927
760 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
761 929
762 { 930 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 932
765 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
766 slot->defsv = DEFSV; 934 save_perl_slots (slot);
767 slot->errsv = ERRSV; 935#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 937 #include "state.h"
773 #undef VAR 938#endif
774 } 939 }
775} 940}
776 941
777/* 942/*
778 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 949# define coro_init_stacks(thx) init_stacks ()
785#else 950#else
786static void 951static void
787coro_init_stacks (pTHX) 952coro_init_stacks (pTHX)
788{ 953{
789 PL_curstackinfo = new_stackinfo(32, 8); 954 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; 955 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 956 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 957 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 958
794 PL_stack_base = AvARRAY(PL_curstack); 959 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 974#endif
810 975
811 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
813 PL_scopestack_max = 8; 978 PL_scopestack_max = 8;
979#if HAS_SCOPESTACK_NAME
980 New(54,PL_scopestack_name,8,const char*);
981#endif
814 982
815 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
817 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
818 991
819#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
820 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
821 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
822 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
846 } 1019 }
847 1020
848 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
851 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
854#endif 1030#endif
855} 1031}
… …
885 } 1061 }
886 1062
887 return rss; 1063 return rss;
888} 1064}
889 1065
890/** coroutine stack handling ************************************************/ 1066/** 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 1067
896/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
897#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
898#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
899 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
900 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
901#endif 1073#endif
902 1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
1102
903/* 1103/*
904 * This overrides the default magic get method of %SIG elements. 1104 * 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 1105 * 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 1106 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 1107 * we just provide our own readback here.
908 */ 1108 */
909static int 1109static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 1111{
912 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
913 1115
914 if (*s == '_') 1116 SV *ssv;
915 {
916 SV **svp = 0;
917 1117
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920
921 if (svp) 1118 if (!*svp)
922 { 1119 ssv = &PL_sv_undef;
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
924 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
925 } 1122 else
926 } 1123 ssv = *svp;
927 1124
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
929} 1127}
930 1128
931static int 1129static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1131{
934 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
935 1135
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; 1136 SV *old = *svp;
946 *svp = 0; 1137 *svp = 0;
947 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
948 return 0; 1139 return 0;
949 }
950 }
951
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1140}
954 1141
955static int 1142static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1144{
958 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
959 1148
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; 1149 SV *old = *svp;
970 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
971 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
972 return 0; 1152 return 0;
973 }
974 }
975
976 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
977} 1153}
978 1154
979static void 1155static void
980prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
981{ 1157{
… …
993slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
994{ 1170{
995 return 1; 1171 return 1;
996} 1172}
997 1173
1174/** coroutine stack handling ************************************************/
1175
998static UNOP init_perl_op; 1176static UNOP init_perl_op;
999 1177
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1002{ 1180{
1003 /* 1181 /*
1004 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
1005 */ 1183 */
… …
1013 PL_comppad_name_fill = 0; 1191 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0; 1192 PL_comppad_name_floor = 0;
1015 PL_curpm = 0; 1193 PL_curpm = 0;
1016 PL_curpad = 0; 1194 PL_curpad = 0;
1017 PL_localizing = 0; 1195 PL_localizing = 0;
1018 PL_dirty = 0;
1019 PL_restartop = 0; 1196 PL_restartop = 0;
1020#if PERL_VERSION_ATLEAST (5,10,0) 1197#if PERL_VERSION_ATLEAST (5,10,0)
1021 PL_parser = 0; 1198 PL_parser = 0;
1022#endif 1199#endif
1023 PL_hints = 0; 1200 PL_hints = 0;
1024 1201
1025 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
1026 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
1027 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1028 1205
1029 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1030 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1031 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1032 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1033 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1034 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1035 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1036 1216
1037 { 1217 {
1038 dSP; 1218 dSP;
… …
1053 /* this newly created coroutine might be run on an existing cctx which most 1233 /* this newly created coroutine might be run on an existing cctx which most
1054 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1234 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1055 */ 1235 */
1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1236 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1237 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1238 slf_frame.destroy = 0;
1058 1239
1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1240 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1060 init_perl_op.op_next = PL_op; 1241 init_perl_op.op_next = PL_op;
1061 init_perl_op.op_type = OP_ENTERSUB; 1242 init_perl_op.op_type = OP_ENTERSUB;
1062 init_perl_op.op_ppaddr = pp_slf; 1243 init_perl_op.op_ppaddr = pp_slf;
… …
1065 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1066 1247
1067 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1068 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1069 1250
1070 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1071 1252
1072 if (expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1073 { 1254 {
1074 coro_times_update (); 1255 coro_times_update ();
1075 coro_times_sub (coro); 1256 coro_times_sub (coro);
1076 } 1257 }
1077} 1258}
… …
1101destroy_perl (pTHX_ struct coro *coro) 1282destroy_perl (pTHX_ struct coro *coro)
1102{ 1283{
1103 SV *svf [9]; 1284 SV *svf [9];
1104 1285
1105 { 1286 {
1287 SV *old_current = SvRV (coro_current);
1106 struct coro *current = SvSTATE_current; 1288 struct coro *current = SvSTATE (old_current);
1107 1289
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1290 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109 1291
1110 save_perl (aTHX_ current); 1292 save_perl (aTHX_ current);
1293
1294 /* this will cause transfer_check to croak on block*/
1295 SvRV_set (coro_current, (SV *)coro->hv);
1296
1111 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1112 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1113 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1303
1114 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1115 1305
1116 /* restore swapped sv's */
1117 SWAP_SVS (coro);
1118
1119 // now save some sv's to be free'd later 1306 /* now save some sv's to be free'd later */
1120 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv); 1308 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv); 1309 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv; 1310 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs; 1311 svf [4] = PL_rs;
… …
1126 svf [6] = (SV *)GvHV (PL_hintgv); 1313 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook; 1314 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook; 1315 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf)); 1316 assert (9 == sizeof (svf) / sizeof (*svf));
1130 1317
1318 SvRV_set (coro_current, old_current);
1319
1131 load_perl (aTHX_ current); 1320 load_perl (aTHX_ current);
1132 } 1321 }
1133 1322
1134 { 1323 {
1135 unsigned int i; 1324 unsigned int i;
… …
1139 1328
1140 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1141 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1142 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1143 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1144 } 1335 }
1145} 1336}
1146 1337
1147INLINE void 1338ecb_inline void
1148free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1149{ 1340{
1150 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
1151 { 1342 {
1152 SvREFCNT_dec (coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
1153 coro_mortal = 0; 1344 coro_mortal = 0;
1154 } 1345 }
1155} 1346}
1156 1347
1157static int 1348static int
… …
1211 1402
1212 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1213 { 1404 {
1214 SV **cb; 1405 SV **cb;
1215 1406
1216 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1217 { 1408 {
1218 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1219 1410
1220 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1221 { 1412 {
… …
1231 SAVETMPS; 1422 SAVETMPS;
1232 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1233 PUSHMARK (SP); 1424 PUSHMARK (SP);
1234 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1235 PUSHs (fullname); 1426 PUSHs (fullname);
1236 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1237 PUTBACK; 1428 PUTBACK;
1238 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1239 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1240 SPAGAIN; 1431 SPAGAIN;
1241 FREETMPS; 1432 FREETMPS;
… …
1290 1481
1291 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1482 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1292} 1483}
1293 1484
1294/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1485/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1295static void NOINLINE 1486static void ecb_noinline
1296cctx_prepare (pTHX) 1487cctx_prepare (pTHX)
1297{ 1488{
1298 PL_top_env = &PL_start_env; 1489 PL_top_env = &PL_start_env;
1299 1490
1300 if (cctx_current->flags & CC_TRACE) 1491 if (cctx_current->flags & CC_TRACE)
… …
1311 slf_frame.prepare = slf_prepare_set_stacklevel; 1502 slf_frame.prepare = slf_prepare_set_stacklevel;
1312 slf_frame.check = slf_check_set_stacklevel; 1503 slf_frame.check = slf_check_set_stacklevel;
1313} 1504}
1314 1505
1315/* the tail of transfer: execute stuff we can only do after a transfer */ 1506/* the tail of transfer: execute stuff we can only do after a transfer */
1316INLINE void 1507ecb_inline void
1317transfer_tail (pTHX) 1508transfer_tail (pTHX)
1318{ 1509{
1319 free_coro_mortal (aTHX); 1510 free_coro_mortal (aTHX);
1511}
1512
1513/* try to exit the same way perl's main function would do */
1514/* we do not bother resetting the environment or other things *7
1515/* that are not, uhm, essential */
1516/* this obviously also doesn't work when perl is embedded */
1517static void ecb_noinline ecb_cold
1518perlish_exit (pTHX)
1519{
1520 int exitstatus = perl_destruct (PL_curinterp);
1521 perl_free (PL_curinterp);
1522 exit (exitstatus);
1320} 1523}
1321 1524
1322/* 1525/*
1323 * this is a _very_ stripped down perl interpreter ;) 1526 * this is a _very_ stripped down perl interpreter ;)
1324 */ 1527 */
… …
1351 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1554 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1352 * runtime errors here, as this is just a random interpreter, not a thread. 1555 * runtime errors here, as this is just a random interpreter, not a thread.
1353 */ 1556 */
1354 1557
1355 /* 1558 /*
1559 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1560 * requires PL_scopestack_ix, so do it here if required.
1561 */
1562 if (!PL_scopestack_ix)
1563 ENTER;
1564
1565 /*
1356 * If perl-run returns we assume exit() was being called or the coro 1566 * If perl-run returns we assume exit() was being called or the coro
1357 * fell off the end, which seems to be the only valid (non-bug) 1567 * fell off the end, which seems to be the only valid (non-bug)
1358 * reason for perl_run to return. We try to exit by jumping to the 1568 * reason for perl_run to return. We try to mimic whatever perl is normally
1359 * bootstrap-time "top" top_env, as we cannot restore the "main" 1569 * doing in that case. YMMV.
1360 * coroutine as Coro has no such concept.
1361 * This actually isn't valid with the pthread backend, but OSes requiring
1362 * that backend are too broken to do it in a standards-compliant way.
1363 */ 1570 */
1364 PL_top_env = main_top_env; 1571 perlish_exit (aTHX);
1365 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1366 } 1572 }
1367} 1573}
1368 1574
1369static coro_cctx * 1575static coro_cctx *
1370cctx_new () 1576cctx_new (void)
1371{ 1577{
1372 coro_cctx *cctx; 1578 coro_cctx *cctx;
1373 1579
1374 ++cctx_count; 1580 ++cctx_count;
1375 New (0, cctx, 1, coro_cctx); 1581 New (0, cctx, 1, coro_cctx);
… …
1381 return cctx; 1587 return cctx;
1382} 1588}
1383 1589
1384/* create a new cctx only suitable as source */ 1590/* create a new cctx only suitable as source */
1385static coro_cctx * 1591static coro_cctx *
1386cctx_new_empty () 1592cctx_new_empty (void)
1387{ 1593{
1388 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1389 1595
1390 cctx->sptr = 0; 1596 cctx->stack.sptr = 0;
1391 coro_create (&cctx->cctx, 0, 0, 0, 0); 1597 coro_create (&cctx->cctx, 0, 0, 0, 0);
1392 1598
1393 return cctx; 1599 return cctx;
1394} 1600}
1395 1601
1396/* create a new cctx suitable as destination/running a perl interpreter */ 1602/* create a new cctx suitable as destination/running a perl interpreter */
1397static coro_cctx * 1603static coro_cctx *
1398cctx_new_run () 1604cctx_new_run (void)
1399{ 1605{
1400 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1401 void *stack_start;
1402 size_t stack_size;
1403 1607
1404#if HAVE_MMAP 1608 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1405 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1406 /* mmap supposedly does allocate-on-write for us */
1407 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1408
1409 if (cctx->sptr != (void *)-1)
1410 {
1411 #if CORO_STACKGUARD
1412 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1413 #endif
1414 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1415 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1416 cctx->flags |= CC_MAPPED;
1417 } 1609 {
1418 else
1419#endif
1420 {
1421 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1422 New (0, cctx->sptr, cctx_stacksize, long);
1423
1424 if (!cctx->sptr)
1425 {
1426 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1610 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1427 _exit (EXIT_FAILURE); 1611 _exit (EXIT_FAILURE);
1428 }
1429
1430 stack_start = cctx->sptr;
1431 stack_size = cctx->ssize;
1432 } 1612 }
1433 1613
1434 #if CORO_USE_VALGRIND
1435 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1436 #endif
1437
1438 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1614 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1439 1615
1440 return cctx; 1616 return cctx;
1441} 1617}
1442 1618
1443static void 1619static void
1444cctx_destroy (coro_cctx *cctx) 1620cctx_destroy (coro_cctx *cctx)
1445{ 1621{
1446 if (!cctx) 1622 if (!cctx)
1447 return; 1623 return;
1448 1624
1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1625 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1450 1626
1451 --cctx_count; 1627 --cctx_count;
1452 coro_destroy (&cctx->cctx); 1628 coro_destroy (&cctx->cctx);
1453 1629
1454 /* coro_transfer creates new, empty cctx's */ 1630 coro_stack_free (&cctx->stack);
1455 if (cctx->sptr)
1456 {
1457 #if CORO_USE_VALGRIND
1458 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1459 #endif
1460
1461#if HAVE_MMAP
1462 if (cctx->flags & CC_MAPPED)
1463 munmap (cctx->sptr, cctx->ssize);
1464 else
1465#endif
1466 Safefree (cctx->sptr);
1467 }
1468 1631
1469 Safefree (cctx); 1632 Safefree (cctx);
1470} 1633}
1471 1634
1472/* wether this cctx should be destructed */ 1635/* wether this cctx should be destructed */
1473#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1636#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1474 1637
1475static coro_cctx * 1638static coro_cctx *
1476cctx_get (pTHX) 1639cctx_get (pTHX)
1477{ 1640{
1478 while (expect_true (cctx_first)) 1641 while (ecb_expect_true (cctx_first))
1479 { 1642 {
1480 coro_cctx *cctx = cctx_first; 1643 coro_cctx *cctx = cctx_first;
1481 cctx_first = cctx->next; 1644 cctx_first = cctx->next;
1482 --cctx_idle; 1645 --cctx_idle;
1483 1646
1484 if (expect_true (!CCTX_EXPIRED (cctx))) 1647 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1485 return cctx; 1648 return cctx;
1486 1649
1487 cctx_destroy (cctx); 1650 cctx_destroy (cctx);
1488 } 1651 }
1489 1652
… …
1491} 1654}
1492 1655
1493static void 1656static void
1494cctx_put (coro_cctx *cctx) 1657cctx_put (coro_cctx *cctx)
1495{ 1658{
1496 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1659 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1497 1660
1498 /* free another cctx if overlimit */ 1661 /* free another cctx if overlimit */
1499 if (expect_false (cctx_idle >= cctx_max_idle)) 1662 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1500 { 1663 {
1501 coro_cctx *first = cctx_first; 1664 coro_cctx *first = cctx_first;
1502 cctx_first = first->next; 1665 cctx_first = first->next;
1503 --cctx_idle; 1666 --cctx_idle;
1504 1667
… …
1515static void 1678static void
1516transfer_check (pTHX_ struct coro *prev, struct coro *next) 1679transfer_check (pTHX_ struct coro *prev, struct coro *next)
1517{ 1680{
1518 /* TODO: throwing up here is considered harmful */ 1681 /* TODO: throwing up here is considered harmful */
1519 1682
1520 if (expect_true (prev != next)) 1683 if (ecb_expect_true (prev != next))
1521 { 1684 {
1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1685 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1686 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1524 1687
1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1688 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1689 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1527 1690
1528#if !PERL_VERSION_ATLEAST (5,10,0) 1691#if !PERL_VERSION_ATLEAST (5,10,0)
1529 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1692 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1693 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1531#endif 1694#endif
1532 } 1695 }
1533} 1696}
1534 1697
1535/* always use the TRANSFER macro */ 1698/* always use the TRANSFER macro */
1536static void NOINLINE /* noinline so we have a fixed stackframe */ 1699static void ecb_noinline /* noinline so we have a fixed stackframe */
1537transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1700transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1538{ 1701{
1539 dSTACKLEVEL; 1702 dSTACKLEVEL;
1540 1703
1541 /* sometimes transfer is only called to set idle_sp */ 1704 /* sometimes transfer is only called to set idle_sp */
1542 if (expect_false (!prev)) 1705 if (ecb_expect_false (!prev))
1543 { 1706 {
1544 cctx_current->idle_sp = STACKLEVEL; 1707 cctx_current->idle_sp = STACKLEVEL;
1545 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1708 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1546 } 1709 }
1547 else if (expect_true (prev != next)) 1710 else if (ecb_expect_true (prev != next))
1548 { 1711 {
1549 coro_cctx *cctx_prev; 1712 coro_cctx *cctx_prev;
1550 1713
1551 if (expect_false (prev->flags & CF_NEW)) 1714 if (ecb_expect_false (prev->flags & CF_NEW))
1552 { 1715 {
1553 /* create a new empty/source context */ 1716 /* create a new empty/source context */
1554 prev->flags &= ~CF_NEW; 1717 prev->flags &= ~CF_NEW;
1555 prev->flags |= CF_RUNNING; 1718 prev->flags |= CF_RUNNING;
1556 } 1719 }
… …
1559 next->flags |= CF_RUNNING; 1722 next->flags |= CF_RUNNING;
1560 1723
1561 /* first get rid of the old state */ 1724 /* first get rid of the old state */
1562 save_perl (aTHX_ prev); 1725 save_perl (aTHX_ prev);
1563 1726
1564 if (expect_false (next->flags & CF_NEW)) 1727 if (ecb_expect_false (next->flags & CF_NEW))
1565 { 1728 {
1566 /* need to start coroutine */ 1729 /* need to start coroutine */
1567 next->flags &= ~CF_NEW; 1730 next->flags &= ~CF_NEW;
1568 /* setup coroutine call */ 1731 /* setup coroutine call */
1569 init_perl (aTHX_ next); 1732 init_perl (aTHX_ next);
1570 } 1733 }
1571 else 1734 else
1572 load_perl (aTHX_ next); 1735 load_perl (aTHX_ next);
1573 1736
1574 /* possibly untie and reuse the cctx */ 1737 /* possibly untie and reuse the cctx */
1575 if (expect_true ( 1738 if (ecb_expect_true (
1576 cctx_current->idle_sp == STACKLEVEL 1739 cctx_current->idle_sp == STACKLEVEL
1577 && !(cctx_current->flags & CC_TRACE) 1740 && !(cctx_current->flags & CC_TRACE)
1578 && !force_cctx 1741 && !force_cctx
1579 )) 1742 ))
1580 { 1743 {
1581 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1744 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1582 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1745 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1583 1746
1584 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1747 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1585 /* without this the next cctx_get might destroy the running cctx while still in use */ 1748 /* without this the next cctx_get might destroy the running cctx while still in use */
1586 if (expect_false (CCTX_EXPIRED (cctx_current))) 1749 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1587 if (expect_true (!next->cctx)) 1750 if (ecb_expect_true (!next->cctx))
1588 next->cctx = cctx_get (aTHX); 1751 next->cctx = cctx_get (aTHX);
1589 1752
1590 cctx_put (cctx_current); 1753 cctx_put (cctx_current);
1591 } 1754 }
1592 else 1755 else
1593 prev->cctx = cctx_current; 1756 prev->cctx = cctx_current;
1594 1757
1595 ++next->usecount; 1758 ++next->usecount;
1596 1759
1597 cctx_prev = cctx_current; 1760 cctx_prev = cctx_current;
1598 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1761 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1599 1762
1600 next->cctx = 0; 1763 next->cctx = 0;
1601 1764
1602 if (expect_false (cctx_prev != cctx_current)) 1765 if (ecb_expect_false (cctx_prev != cctx_current))
1603 { 1766 {
1604 cctx_prev->top_env = PL_top_env; 1767 cctx_prev->top_env = PL_top_env;
1605 PL_top_env = cctx_current->top_env; 1768 PL_top_env = cctx_current->top_env;
1606 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1769 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1607 } 1770 }
… …
1613#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1776#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1614#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1777#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1615 1778
1616/** high level stuff ********************************************************/ 1779/** high level stuff ********************************************************/
1617 1780
1781/* this function is actually Coro, not Coro::State, but we call it from here */
1782/* because it is convenient - but it hasn't been declared yet for that reason */
1618static int 1783static void
1784coro_call_on_destroy (pTHX_ struct coro *coro);
1785
1786static void
1619coro_state_destroy (pTHX_ struct coro *coro) 1787coro_state_destroy (pTHX_ struct coro *coro)
1620{ 1788{
1621 if (coro->flags & CF_DESTROYED) 1789 if (coro->flags & CF_ZOMBIE)
1622 return 0; 1790 return;
1623 1791
1624 if (coro->on_destroy && !PL_dirty)
1625 coro->on_destroy (aTHX_ coro); 1792 slf_destroy (aTHX_ coro);
1626 1793
1627 coro->flags |= CF_DESTROYED; 1794 coro->flags |= CF_ZOMBIE;
1628 1795
1629 if (coro->flags & CF_READY) 1796 if (coro->flags & CF_READY)
1630 { 1797 {
1631 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1798 /* reduce nready, as destroying a ready coro effectively unreadies it */
1632 /* alternative: look through all ready queues and remove the coro */ 1799 /* alternative: look through all ready queues and remove the coro */
1633 --coro_nready; 1800 --coro_nready;
1634 } 1801 }
1635 else 1802 else
1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1803 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1804
1805 if (coro->next) coro->next->prev = coro->prev;
1806 if (coro->prev) coro->prev->next = coro->next;
1807 if (coro == coro_first) coro_first = coro->next;
1637 1808
1638 if (coro->mainstack 1809 if (coro->mainstack
1639 && coro->mainstack != main_mainstack 1810 && coro->mainstack != main_mainstack
1640 && coro->slot 1811 && coro->slot
1641 && !PL_dirty) 1812 && !PL_dirty)
1642 destroy_perl (aTHX_ coro); 1813 destroy_perl (aTHX_ coro);
1643 1814
1644 if (coro->next) coro->next->prev = coro->prev;
1645 if (coro->prev) coro->prev->next = coro->next;
1646 if (coro == coro_first) coro_first = coro->next;
1647
1648 cctx_destroy (coro->cctx); 1815 cctx_destroy (coro->cctx);
1649 SvREFCNT_dec (coro->startcv); 1816 SvREFCNT_dec (coro->startcv);
1650 SvREFCNT_dec (coro->args); 1817 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv); 1818 SvREFCNT_dec (coro->swap_sv);
1652 SvREFCNT_dec (CORO_THROW); 1819 SvREFCNT_dec (CORO_THROW);
1653 1820
1654 return 1; 1821 coro_call_on_destroy (aTHX_ coro);
1822
1823 /* more destruction mayhem in coro_state_free */
1655} 1824}
1656 1825
1657static int 1826static int
1658coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1827coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1659{ 1828{
1660 struct coro *coro = (struct coro *)mg->mg_ptr; 1829 struct coro *coro = (struct coro *)mg->mg_ptr;
1661 mg->mg_ptr = 0; 1830 mg->mg_ptr = 0;
1662 1831
1663 coro->hv = 0;
1664
1665 if (--coro->refcnt < 0)
1666 {
1667 coro_state_destroy (aTHX_ coro); 1832 coro_state_destroy (aTHX_ coro);
1833 SvREFCNT_dec (coro->on_destroy);
1834 SvREFCNT_dec (coro->status);
1835
1668 Safefree (coro); 1836 Safefree (coro);
1669 }
1670 1837
1671 return 0; 1838 return 0;
1672} 1839}
1673 1840
1674static int 1841static int ecb_cold
1675coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1842coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1676{ 1843{
1677 struct coro *coro = (struct coro *)mg->mg_ptr; 1844 /* called when perl clones the current process the slow way (windows process emulation) */
1678 1845 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1679 ++coro->refcnt; 1846 mg->mg_ptr = 0;
1847 mg->mg_virtual = 0;
1680 1848
1681 return 0; 1849 return 0;
1682} 1850}
1683 1851
1684static MGVTBL coro_state_vtbl = { 1852static MGVTBL coro_state_vtbl = {
… …
1709 TRANSFER (ta, 1); 1877 TRANSFER (ta, 1);
1710} 1878}
1711 1879
1712/** Coro ********************************************************************/ 1880/** Coro ********************************************************************/
1713 1881
1714INLINE void 1882ecb_inline void
1715coro_enq (pTHX_ struct coro *coro) 1883coro_enq (pTHX_ struct coro *coro)
1716{ 1884{
1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1885 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1718 1886
1719 SvREFCNT_inc_NN (coro->hv); 1887 SvREFCNT_inc_NN (coro->hv);
… …
1721 coro->next_ready = 0; 1889 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1890 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro; 1891 ready [1] = coro;
1724} 1892}
1725 1893
1726INLINE struct coro * 1894ecb_inline struct coro *
1727coro_deq (pTHX) 1895coro_deq (pTHX)
1728{ 1896{
1729 int prio; 1897 int prio;
1730 1898
1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1899 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1784{ 1952{
1785 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1953 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1786} 1954}
1787 1955
1788/* expects to own a reference to next->hv */ 1956/* expects to own a reference to next->hv */
1789INLINE void 1957ecb_inline void
1790prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1958prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1791{ 1959{
1792 SV *prev_sv = SvRV (coro_current); 1960 SV *prev_sv = SvRV (coro_current);
1793 1961
1794 ta->prev = SvSTATE_hv (prev_sv); 1962 ta->prev = SvSTATE_hv (prev_sv);
… …
1807{ 1975{
1808 for (;;) 1976 for (;;)
1809 { 1977 {
1810 struct coro *next = coro_deq (aTHX); 1978 struct coro *next = coro_deq (aTHX);
1811 1979
1812 if (expect_true (next)) 1980 if (ecb_expect_true (next))
1813 { 1981 {
1814 /* cannot transfer to destroyed coros, skip and look for next */ 1982 /* cannot transfer to destroyed coros, skip and look for next */
1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1983 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1984 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1817 else 1985 else
1818 { 1986 {
1819 next->flags &= ~CF_READY; 1987 next->flags &= ~CF_READY;
1820 --coro_nready; 1988 --coro_nready;
… …
1828 /* nothing to schedule: call the idle handler */ 1996 /* nothing to schedule: call the idle handler */
1829 if (SvROK (sv_idle) 1997 if (SvROK (sv_idle)
1830 && SvOBJECT (SvRV (sv_idle))) 1998 && SvOBJECT (SvRV (sv_idle)))
1831 { 1999 {
1832 if (SvRV (sv_idle) == SvRV (coro_current)) 2000 if (SvRV (sv_idle) == SvRV (coro_current))
2001 {
2002 require_pv ("Carp");
2003
2004 {
2005 dSP;
2006
2007 ENTER;
2008 SAVETMPS;
2009
2010 PUSHMARK (SP);
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2011 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2012 PUTBACK;
2013 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2014
2015 FREETMPS;
2016 LEAVE;
2017 }
2018 }
1834 2019
1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2020 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1836 api_ready (aTHX_ SvRV (sv_idle)); 2021 api_ready (aTHX_ SvRV (sv_idle));
1837 --coro_nready; 2022 --coro_nready;
1838 } 2023 }
… …
1853 } 2038 }
1854 } 2039 }
1855 } 2040 }
1856} 2041}
1857 2042
1858INLINE void 2043ecb_inline void
1859prepare_cede (pTHX_ struct coro_transfer_args *ta) 2044prepare_cede (pTHX_ struct coro_transfer_args *ta)
1860{ 2045{
1861 api_ready (aTHX_ coro_current); 2046 api_ready (aTHX_ coro_current);
1862 prepare_schedule (aTHX_ ta); 2047 prepare_schedule (aTHX_ ta);
1863} 2048}
1864 2049
1865INLINE void 2050ecb_inline void
1866prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2051prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1867{ 2052{
1868 SV *prev = SvRV (coro_current); 2053 SV *prev = SvRV (coro_current);
1869 2054
1870 if (coro_nready) 2055 if (coro_nready)
… …
1900{ 2085{
1901 struct coro_transfer_args ta; 2086 struct coro_transfer_args ta;
1902 2087
1903 prepare_cede (aTHX_ &ta); 2088 prepare_cede (aTHX_ &ta);
1904 2089
1905 if (expect_true (ta.prev != ta.next)) 2090 if (ecb_expect_true (ta.prev != ta.next))
1906 { 2091 {
1907 TRANSFER (ta, 1); 2092 TRANSFER (ta, 1);
1908 return 1; 2093 return 1;
1909 } 2094 }
1910 else 2095 else
… …
1953 coro->slot->runops = RUNOPS_DEFAULT; 2138 coro->slot->runops = RUNOPS_DEFAULT;
1954 } 2139 }
1955} 2140}
1956 2141
1957static void 2142static void
2143coro_push_av (pTHX_ AV *av, I32 gimme_v)
2144{
2145 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2146 {
2147 dSP;
2148
2149 if (gimme_v == G_SCALAR)
2150 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2151 else
2152 {
2153 int i;
2154 EXTEND (SP, AvFILLp (av) + 1);
2155
2156 for (i = 0; i <= AvFILLp (av); ++i)
2157 PUSHs (AvARRAY (av)[i]);
2158 }
2159
2160 PUTBACK;
2161 }
2162}
2163
2164static void
2165coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2166{
2167 if (!coro->on_destroy)
2168 coro->on_destroy = newAV ();
2169
2170 av_push (coro->on_destroy, cb);
2171}
2172
2173static void
2174slf_destroy_join (pTHX_ struct CoroSLF *frame)
2175{
2176 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2177}
2178
2179static int
2180slf_check_join (pTHX_ struct CoroSLF *frame)
2181{
2182 struct coro *coro = (struct coro *)frame->data;
2183
2184 if (!coro->status)
2185 return 1;
2186
2187 frame->destroy = 0;
2188
2189 coro_push_av (aTHX_ coro->status, GIMME_V);
2190
2191 SvREFCNT_dec ((SV *)coro->hv);
2192
2193 return 0;
2194}
2195
2196static void
2197slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{
2199 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2200
2201 if (items > 1)
2202 croak ("join called with too many arguments");
2203
2204 if (coro->status)
2205 frame->prepare = prepare_nop;
2206 else
2207 {
2208 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2209 frame->prepare = prepare_schedule;
2210 }
2211
2212 frame->check = slf_check_join;
2213 frame->destroy = slf_destroy_join;
2214 frame->data = (void *)coro;
2215 SvREFCNT_inc (coro->hv);
2216}
2217
2218static void
1958coro_call_on_destroy (pTHX_ struct coro *coro) 2219coro_call_on_destroy (pTHX_ struct coro *coro)
1959{ 2220{
1960 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2221 AV *od = coro->on_destroy;
1961 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1962 2222
1963 if (on_destroyp) 2223 if (!od)
1964 { 2224 return;
1965 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1966 2225
2226 coro->on_destroy = 0;
2227 sv_2mortal ((SV *)od);
2228
1967 while (AvFILLp (on_destroy) >= 0) 2229 while (AvFILLp (od) >= 0)
2230 {
2231 SV *cb = sv_2mortal (av_pop (od));
2232
2233 /* coro hv's (and only hv's at the moment) are supported as well */
2234 if (SvSTATEhv_p (aTHX_ cb))
2235 api_ready (aTHX_ cb);
2236 else
1968 { 2237 {
1969 dSP; /* don't disturb outer sp */ 2238 dSP; /* don't disturb outer sp */
1970 SV *cb = av_pop (on_destroy);
1971
1972 PUSHMARK (SP); 2239 PUSHMARK (SP);
1973 2240
1974 if (statusp) 2241 if (coro->status)
1975 { 2242 {
1976 int i; 2243 PUTBACK;
1977 AV *status = (AV *)SvRV (*statusp); 2244 coro_push_av (aTHX_ coro->status, G_ARRAY);
1978 EXTEND (SP, AvFILLp (status) + 1); 2245 SPAGAIN;
1979
1980 for (i = 0; i <= AvFILLp (status); ++i)
1981 PUSHs (AvARRAY (status)[i]);
1982 } 2246 }
1983 2247
1984 PUTBACK; 2248 PUTBACK;
1985 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2249 call_sv (cb, G_VOID | G_DISCARD);
1986 } 2250 }
1987 } 2251 }
1988} 2252}
1989 2253
1990static void 2254static void
1991slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1992{ 2256{
1993 int i; 2257 AV *av;
1994 HV *hv = (HV *)SvRV (coro_current); 2258
1995 AV *av = newAV (); 2259 if (coro->status)
2260 {
2261 av = coro->status;
2262 av_clear (av);
2263 }
2264 else
2265 av = coro->status = newAV ();
1996 2266
1997 /* items are actually not so common, so optimise for this case */ 2267 /* items are actually not so common, so optimise for this case */
1998 if (items) 2268 if (items)
1999 { 2269 {
2270 int i;
2271
2000 av_extend (av, items - 1); 2272 av_extend (av, items - 1);
2001 2273
2002 for (i = 0; i < items; ++i) 2274 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2275 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 } 2276 }
2277}
2005 2278
2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2279static void
2007 2280slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2281{
2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2282 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2009 api_ready (aTHX_ sv_manager); 2283 api_ready (aTHX_ sv_manager);
2010 2284
2011 frame->prepare = prepare_schedule; 2285 frame->prepare = prepare_schedule;
2012 frame->check = slf_check_repeat; 2286 frame->check = slf_check_repeat;
2013 2287
2014 /* as a minor optimisation, we could unwind all stacks here */ 2288 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */ 2289 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/ 2290 /*coro_unwind_stacks (aTHX);*/
2291}
2292
2293static void
2294slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2295{
2296 HV *coro_hv = (HV *)SvRV (coro_current);
2297
2298 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2299 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2300}
2301
2302static void
2303slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2304{
2305 HV *coro_hv;
2306 struct coro *coro;
2307
2308 if (items <= 0)
2309 croak ("Coro::cancel called without coro object,");
2310
2311 coro = SvSTATE (arg [0]);
2312 coro_hv = coro->hv;
2313
2314 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2315
2316 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2317 {
2318 /* coro currently busy cancelling something, so just notify it */
2319 coro->slf_frame.data = (void *)coro;
2320
2321 frame->prepare = prepare_nop;
2322 frame->check = slf_check_nop;
2323 }
2324 else if (coro_hv == (HV *)SvRV (coro_current))
2325 {
2326 /* cancelling the current coro is allowed, and equals terminate */
2327 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2328 }
2329 else
2330 {
2331 struct coro *self = SvSTATE_current;
2332
2333 if (!self)
2334 croak ("Coro::cancel called outside of thread content,");
2335
2336 /* otherwise we cancel directly, purely for speed reasons
2337 * unfortunately, this requires some magic trickery, as
2338 * somebody else could cancel us, so we have to fight the cancellation.
2339 * this is ugly, and hopefully fully worth the extra speed.
2340 * besides, I can't get the slow-but-safe version working...
2341 */
2342 slf_frame.data = 0;
2343 self->flags |= CF_NOCANCEL;
2344 coro_state_destroy (aTHX_ coro);
2345 self->flags &= ~CF_NOCANCEL;
2346
2347 if (slf_frame.data)
2348 {
2349 /* while we were busy we have been cancelled, so terminate */
2350 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2351 }
2352 else
2353 {
2354 frame->prepare = prepare_nop;
2355 frame->check = slf_check_nop;
2356 }
2357 }
2358}
2359
2360static int
2361slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2362{
2363 frame->prepare = 0;
2364 coro_unwind_stacks (aTHX);
2365
2366 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2367
2368 return 1;
2369}
2370
2371static int
2372safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2373{
2374 if (coro->cctx)
2375 croak ("coro inside C callback, unable to cancel at this time, caught");
2376
2377 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2378 {
2379 coro_set_status (aTHX_ coro, arg, items);
2380 coro_state_destroy (aTHX_ coro);
2381 }
2382 else
2383 {
2384 if (!coro->slf_frame.prepare)
2385 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2386
2387 slf_destroy (aTHX_ coro);
2388
2389 coro_set_status (aTHX_ coro, arg, items);
2390 coro->slf_frame.prepare = prepare_nop;
2391 coro->slf_frame.check = slf_check_safe_cancel;
2392
2393 api_ready (aTHX_ (SV *)coro->hv);
2394 }
2395
2396 return 1;
2017} 2397}
2018 2398
2019/*****************************************************************************/ 2399/*****************************************************************************/
2020/* async pool handler */ 2400/* async pool handler */
2021 2401
… …
2052slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2432slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2053{ 2433{
2054 HV *hv = (HV *)SvRV (coro_current); 2434 HV *hv = (HV *)SvRV (coro_current);
2055 struct coro *coro = SvSTATE_hv ((SV *)hv); 2435 struct coro *coro = SvSTATE_hv ((SV *)hv);
2056 2436
2057 if (expect_true (coro->saved_deffh)) 2437 if (ecb_expect_true (coro->saved_deffh))
2058 { 2438 {
2059 /* subsequent iteration */ 2439 /* subsequent iteration */
2060 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2440 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2061 coro->saved_deffh = 0; 2441 coro->saved_deffh = 0;
2062 2442
2063 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2443 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2064 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2444 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2065 { 2445 {
2066 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2446 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2067 coro->invoke_av = newAV (); 2447 return;
2068
2069 frame->prepare = prepare_nop;
2070 } 2448 }
2071 else 2449 else
2072 { 2450 {
2073 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2074 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2452 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2075 2453
2454 if (ecb_expect_false (coro->swap_sv))
2455 {
2456 SWAP_SVS_LEAVE (coro);
2457 SvREFCNT_dec_NN (coro->swap_sv);
2458 coro->swap_sv = 0;
2459 }
2460
2076 coro->prio = 0; 2461 coro->prio = 0;
2077 2462
2078 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2079 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2080 2465
2081 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2082 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2083 } 2468 }
… …
2124 2509
2125static int 2510static int
2126slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2511slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2127{ 2512{
2128 SV *data = (SV *)frame->data; 2513 SV *data = (SV *)frame->data;
2129 2514
2130 if (CORO_THROW) 2515 if (CORO_THROW)
2131 return 0; 2516 return 0;
2132 2517
2133 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2518 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2134 return 1; 2519 return 1;
… …
2170 cb = sv_2mortal (coro->rouse_cb); 2555 cb = sv_2mortal (coro->rouse_cb);
2171 coro->rouse_cb = 0; 2556 coro->rouse_cb = 0;
2172 } 2557 }
2173 2558
2174 if (!SvROK (cb) 2559 if (!SvROK (cb)
2175 || SvTYPE (SvRV (cb)) != SVt_PVCV 2560 || SvTYPE (SvRV (cb)) != SVt_PVCV
2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2561 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2177 croak ("Coro::rouse_wait called with illegal callback argument,"); 2562 croak ("Coro::rouse_wait called with illegal callback argument,");
2178 2563
2179 { 2564 {
2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2565 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2297static void 2682static void
2298slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2683slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2299{ 2684{
2300 frame->prepare = prepare_cede_notself; 2685 frame->prepare = prepare_cede_notself;
2301 frame->check = slf_check_nop; 2686 frame->check = slf_check_nop;
2687}
2688
2689/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2690static void
2691slf_destroy (pTHX_ struct coro *coro)
2692{
2693 struct CoroSLF frame = coro->slf_frame;
2694
2695 /*
2696 * The on_destroy below most likely is from an SLF call.
2697 * Since by definition the SLF call will not finish when we destroy
2698 * the coro, we will have to force-finish it here, otherwise
2699 * cleanup functions cannot call SLF functions.
2700 */
2701 coro->slf_frame.prepare = 0;
2702
2703 /* this callback is reserved for slf functions needing to do cleanup */
2704 if (frame.destroy && frame.prepare && !PL_dirty)
2705 frame.destroy (aTHX_ &frame);
2302} 2706}
2303 2707
2304/* 2708/*
2305 * these not obviously related functions are all rolled into one 2709 * these not obviously related functions are all rolled into one
2306 * function to increase chances that they all will call transfer with the same 2710 * function to increase chances that they all will call transfer with the same
… …
2313 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2717 I32 checkmark; /* mark SP to see how many elements check has pushed */
2314 2718
2315 /* set up the slf frame, unless it has already been set-up */ 2719 /* set up the slf frame, unless it has already been set-up */
2316 /* the latter happens when a new coro has been started */ 2720 /* the latter happens when a new coro has been started */
2317 /* or when a new cctx was attached to an existing coroutine */ 2721 /* or when a new cctx was attached to an existing coroutine */
2318 if (expect_true (!slf_frame.prepare)) 2722 if (ecb_expect_true (!slf_frame.prepare))
2319 { 2723 {
2320 /* first iteration */ 2724 /* first iteration */
2321 dSP; 2725 dSP;
2322 SV **arg = PL_stack_base + TOPMARK + 1; 2726 SV **arg = PL_stack_base + TOPMARK + 1;
2323 int items = SP - arg; /* args without function object */ 2727 int items = SP - arg; /* args without function object */
… …
2364 while (slf_frame.check (aTHX_ &slf_frame)); 2768 while (slf_frame.check (aTHX_ &slf_frame));
2365 2769
2366 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2770 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2367 2771
2368 /* exception handling */ 2772 /* exception handling */
2369 if (expect_false (CORO_THROW)) 2773 if (ecb_expect_false (CORO_THROW))
2370 { 2774 {
2371 SV *exception = sv_2mortal (CORO_THROW); 2775 SV *exception = sv_2mortal (CORO_THROW);
2372 2776
2373 CORO_THROW = 0; 2777 CORO_THROW = 0;
2374 sv_setsv (ERRSV, exception); 2778 sv_setsv (ERRSV, exception);
2375 croak (0); 2779 croak (0);
2376 } 2780 }
2377 2781
2378 /* return value handling - mostly like entersub */ 2782 /* return value handling - mostly like entersub */
2379 /* make sure we put something on the stack in scalar context */ 2783 /* make sure we put something on the stack in scalar context */
2380 if (GIMME_V == G_SCALAR) 2784 if (GIMME_V == G_SCALAR
2785 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2381 { 2786 {
2382 dSP; 2787 dSP;
2383 SV **bot = PL_stack_base + checkmark; 2788 SV **bot = PL_stack_base + checkmark;
2384 2789
2385 if (sp == bot) /* too few, push undef */ 2790 if (sp == bot) /* too few, push undef */
2386 bot [1] = &PL_sv_undef; 2791 bot [1] = &PL_sv_undef;
2387 else if (sp != bot + 1) /* too many, take last one */ 2792 else /* too many, take last one */
2388 bot [1] = *sp; 2793 bot [1] = *sp;
2389 2794
2390 SP = bot + 1; 2795 SP = bot + 1;
2391 2796
2392 PUTBACK; 2797 PUTBACK;
… …
2490{ 2895{
2491 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2896 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2492 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2493} 2898}
2494 2899
2900static void
2901enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2902{
2903 if (!hook)
2904 return;
2905
2906 if (!*avp)
2907 {
2908 *avp = newAV ();
2909 AvREAL_off (*avp);
2910 }
2911
2912 av_push (*avp, (SV *)hook);
2913 av_push (*avp, (SV *)arg);
2914}
2915
2916static void
2917enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2918{
2919 AV *av = *avp;
2920 int i;
2921
2922 if (!av)
2923 return;
2924
2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2926 if (AvARRAY (av)[i] == (SV *)hook)
2927 {
2928 if (execute)
2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2930
2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2932 av_pop (av);
2933 av_pop (av);
2934 break;
2935 }
2936
2937 if (AvFILLp (av) >= 0)
2938 {
2939 *avp = 0;
2940 SvREFCNT_dec_NN (av);
2941 }
2942}
2943
2944static void
2945api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2946{
2947 struct coro *coro = SvSTATE (coro_sv);
2948
2949 if (SvSTATE_current == coro)
2950 if (enter)
2951 enter (aTHX_ enter_arg);
2952
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2955}
2956
2957static void
2958api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2959{
2960 struct coro *coro = SvSTATE (coro_sv);
2961
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2963 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2964}
2965
2966static void
2967savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2968{
2969 struct coro *coro = SvSTATE_current;
2970
2971 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2972}
2973
2974static void
2975savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2976{
2977 struct coro *coro = SvSTATE_current;
2978
2979 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2980}
2981
2982static void
2983api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2984{
2985 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2986
2987 /* this ought to be much cheaper than malloc + a single destructor call */
2988 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2989 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2990}
2991
2495/*****************************************************************************/ 2992/*****************************************************************************/
2496/* PerlIO::cede */ 2993/* PerlIO::cede */
2497 2994
2498typedef struct 2995typedef struct
2499{ 2996{
2500 PerlIOBuf base; 2997 PerlIOBuf base;
2501 NV next, every; 2998 NV next, every;
2502} PerlIOCede; 2999} PerlIOCede;
2503 3000
2504static IV 3001static IV ecb_cold
2505PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3002PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2506{ 3003{
2507 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3004 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2508 3005
2509 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3006 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2510 self->next = nvtime () + self->every; 3007 self->next = nvtime () + self->every;
2511 3008
2512 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3009 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2513} 3010}
2514 3011
2515static SV * 3012static SV * ecb_cold
2516PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3013PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2517{ 3014{
2518 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3015 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2519 3016
2520 return newSVnv (self->every); 3017 return newSVnv (self->every);
… …
2627 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2628 PUTBACK; 3125 PUTBACK;
2629 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2630 } 3127 }
2631 3128
2632 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2633 } 3130 }
2634} 3131}
2635 3132
2636static void 3133static void
2637coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2638{ 3135{
2639 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3136 /* call $sem->adjust (0) to possibly wake up some other waiters */
2640 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3137 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2641} 3138}
2642 3139
2643static int 3140static int
2644slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3141slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2645{ 3142{
2646 AV *av = (AV *)frame->data; 3143 AV *av = (AV *)frame->data;
2647 SV *count_sv = AvARRAY (av)[0]; 3144 SV *count_sv = AvARRAY (av)[0];
3145 SV *coro_hv = SvRV (coro_current);
3146
3147 frame->destroy = 0;
2648 3148
2649 /* if we are about to throw, don't actually acquire the lock, just throw */ 3149 /* if we are about to throw, don't actually acquire the lock, just throw */
2650 if (CORO_THROW) 3150 if (ecb_expect_false (CORO_THROW))
3151 {
3152 /* we still might be responsible for the semaphore, so wake up others */
3153 coro_semaphore_adjust (aTHX_ av, 0);
3154
2651 return 0; 3155 return 0;
3156 }
2652 else if (SvIVX (count_sv) > 0) 3157 else if (SvIVX (count_sv) > 0)
2653 { 3158 {
2654 SvSTATE_current->on_destroy = 0;
2655
2656 if (acquire) 3159 if (acquire)
2657 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3160 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2658 else 3161 else
2659 coro_semaphore_adjust (aTHX_ av, 0); 3162 coro_semaphore_adjust (aTHX_ av, 0);
2660 3163
… …
2664 { 3167 {
2665 int i; 3168 int i;
2666 /* if we were woken up but can't down, we look through the whole */ 3169 /* if we were woken up but can't down, we look through the whole */
2667 /* waiters list and only add us if we aren't in there already */ 3170 /* waiters list and only add us if we aren't in there already */
2668 /* this avoids some degenerate memory usage cases */ 3171 /* this avoids some degenerate memory usage cases */
2669 3172 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2670 for (i = 1; i <= AvFILLp (av); ++i)
2671 if (AvARRAY (av)[i] == SvRV (coro_current)) 3173 if (AvARRAY (av)[i] == coro_hv)
2672 return 1; 3174 return 1;
2673 3175
2674 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3176 av_push (av, SvREFCNT_inc (coro_hv));
2675 return 1; 3177 return 1;
2676 } 3178 }
2677} 3179}
2678 3180
2679static int 3181static int
… …
2702 { 3204 {
2703 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3205 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2704 3206
2705 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3207 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2706 frame->prepare = prepare_schedule; 3208 frame->prepare = prepare_schedule;
2707
2708 /* to avoid race conditions when a woken-up coro gets terminated */ 3209 /* to avoid race conditions when a woken-up coro gets terminated */
2709 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3210 /* we arrange for a temporary on_destroy that calls adjust (0) */
2710 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3211 frame->destroy = coro_semaphore_destroy;
2711 } 3212 }
2712} 3213}
2713 3214
2714static void 3215static void
2715slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3216slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2773 { 3274 {
2774 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
2775 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
2776 } 3277 }
2777 3278
2778 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
2779 3280
2780 --count; 3281 --count;
2781 } 3282 }
2782} 3283}
2783 3284
… …
2868 } 3369 }
2869 3370
2870 av_push (state, data_sv); 3371 av_push (state, data_sv);
2871 3372
2872 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
2873 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
2874 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
2875} 3376}
2876 3377
2877static int 3378static int
2878slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2879{ 3380{
… …
2884 /* it quickly returns */ 3385 /* it quickly returns */
2885 if (CORO_THROW) 3386 if (CORO_THROW)
2886 return 0; 3387 return 0;
2887 3388
2888 /* one element that is an RV? repeat! */ 3389 /* one element that is an RV? repeat! */
2889 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3390 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2890 return 1; 3391 return 1;
2891 3392
2892 /* restore status */ 3393 /* restore status */
2893 { 3394 {
2894 SV *data_sv = av_pop (state); 3395 SV *data_sv = av_pop (state);
… …
2897 errno = data->errorno; 3398 errno = data->errorno;
2898 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
2899 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
2900 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
2901 3402
2902 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
2903 } 3404 }
2904 3405
2905 /* push result values */ 3406 /* push result values */
2906 { 3407 {
2907 dSP; 3408 dSP;
… …
2933 dSP; 3434 dSP;
2934 3435
2935 static SV *prio_cv; 3436 static SV *prio_cv;
2936 static SV *prio_sv; 3437 static SV *prio_sv;
2937 3438
2938 if (expect_false (!prio_cv)) 3439 if (ecb_expect_false (!prio_cv))
2939 { 3440 {
2940 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3441 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2941 prio_sv = newSViv (0); 3442 prio_sv = newSViv (0);
2942 } 3443 }
2943 3444
… …
3049 } 3550 }
3050 3551
3051 return coro_sv; 3552 return coro_sv;
3052} 3553}
3053 3554
3555#ifndef __cplusplus
3556ecb_cold XS(boot_Coro__State);
3557#endif
3558
3559#if CORO_JIT
3560
3561static void ecb_noinline ecb_cold
3562pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3563{
3564 dSP;
3565 AV *av = newAV ();
3566
3567 av_store (av, 3, newSVuv (d));
3568 av_store (av, 2, newSVuv (c));
3569 av_store (av, 1, newSVuv (b));
3570 av_store (av, 0, newSVuv (a));
3571
3572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3573
3574 PUTBACK;
3575}
3576
3577static void ecb_noinline ecb_cold
3578jit_init (pTHX)
3579{
3580 dSP;
3581 SV *load, *save;
3582 char *map_base;
3583 char *load_ptr, *save_ptr;
3584 STRLEN load_len, save_len, map_len;
3585 int count;
3586
3587 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3588
3589 PUSHMARK (SP);
3590 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3591 #include "state.h"
3592 count = call_pv ("Coro::State::_jit", G_ARRAY);
3593 SPAGAIN;
3594
3595 save = POPs; save_ptr = SvPVbyte (save, save_len);
3596 load = POPs; load_ptr = SvPVbyte (load, load_len);
3597
3598 map_len = load_len + save_len + 16;
3599
3600 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3601
3602 if (map_base == (char *)MAP_FAILED)
3603 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3604
3605 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3606
3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3608 memcpy (map_base, load_ptr, load_len);
3609
3610 map_base += (load_len + 15) & ~15;
3611
3612 save_perl_slots = (load_save_perl_slots_type)map_base;
3613 memcpy (map_base, save_ptr, save_len);
3614
3615 /* we are good citizens and try to make the page read-only, so the evil evil */
3616 /* hackers might have it a bit more difficult */
3617 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3618
3619 PUTBACK;
3620 eval_pv ("undef &Coro::State::_jit", 1);
3621}
3622
3623#endif
3624
3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3625MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3055 3626
3056PROTOTYPES: DISABLE 3627PROTOTYPES: DISABLE
3057 3628
3058BOOT: 3629BOOT:
3059{ 3630{
3631#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3632#include "state.h"
3060#ifdef USE_ITHREADS 3633#ifdef USE_ITHREADS
3061# if CORO_PTHREAD 3634# if CORO_PTHREAD
3062 coro_thx = PERL_GET_CONTEXT; 3635 coro_thx = PERL_GET_CONTEXT;
3063# endif 3636# endif
3064#endif 3637#endif
3065 BOOT_PAGESIZE; 3638 /* perl defines these to check for existance first, but why it doesn't */
3639 /* just create them one at init time is not clear to me, except for */
3640 /* programs trying to delete them, but... */
3641 /* anyway, we declare this as invalid and make sure they are initialised here */
3642 DEFSV;
3643 ERRSV;
3066 3644
3067 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3068 3646
3069 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3070 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3071 3649
3072 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3073 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3074 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3652 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3653 * by coro_sig_vtbl in hash values.
3654 */
3655 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3656
3657 /* this only works if perl doesn't have a vtbl for %SIG */
3658 assert (!mg->mg_virtual);
3659
3660 /*
3661 * The irony is that the perl API itself asserts that mg_virtual
3662 * must be non-const, yet perl5porters insisted on marking their
3663 * vtbls as read-only, just to thwart perl modules from patching
3664 * them.
3665 */
3666 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3667 mg->mg_flags |= MGf_COPY;
3668
3669 coro_sigelem_vtbl = PL_vtbl_sigelem;
3670 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3671 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3672 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3673 }
3075 3674
3076 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3077 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3675 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3078 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3676 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3079 3677
3080 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3081 3679
… …
3110 coroapi.prepare_nop = prepare_nop; 3708 coroapi.prepare_nop = prepare_nop;
3111 coroapi.prepare_schedule = prepare_schedule; 3709 coroapi.prepare_schedule = prepare_schedule;
3112 coroapi.prepare_cede = prepare_cede; 3710 coroapi.prepare_cede = prepare_cede;
3113 coroapi.prepare_cede_notself = prepare_cede_notself; 3711 coroapi.prepare_cede_notself = prepare_cede_notself;
3114 3712
3115 { 3713 time_init (aTHX);
3116 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3117
3118 if (!svp) croak ("Time::HiRes is required");
3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3120
3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3125 }
3126 3714
3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3715 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3716#if CORO_JIT
3717 PUTBACK;
3718 jit_init (aTHX);
3719 SPAGAIN;
3720#endif
3128} 3721}
3129 3722
3130SV * 3723SV *
3131new (SV *klass, ...) 3724new (SV *klass, ...)
3132 ALIAS: 3725 ALIAS:
… …
3139void 3732void
3140transfer (...) 3733transfer (...)
3141 PROTOTYPE: $$ 3734 PROTOTYPE: $$
3142 CODE: 3735 CODE:
3143 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3736 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3144
3145bool
3146_destroy (SV *coro_sv)
3147 CODE:
3148 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3149 OUTPUT:
3150 RETVAL
3151
3152void
3153_exit (int code)
3154 PROTOTYPE: $
3155 CODE:
3156 _exit (code);
3157 3737
3158SV * 3738SV *
3159clone (Coro::State coro) 3739clone (Coro::State coro)
3160 CODE: 3740 CODE:
3161{ 3741{
… …
3216void 3796void
3217list () 3797list ()
3218 PROTOTYPE: 3798 PROTOTYPE:
3219 PPCODE: 3799 PPCODE:
3220{ 3800{
3221 struct coro *coro; 3801 struct coro *coro;
3222 for (coro = coro_first; coro; coro = coro->next) 3802 for (coro = coro_first; coro; coro = coro->next)
3223 if (coro->hv) 3803 if (coro->hv)
3224 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3804 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3225} 3805}
3226 3806
… …
3231 CODE: 3811 CODE:
3232{ 3812{
3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3813 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3234 { 3814 {
3235 struct coro *current = SvSTATE_current; 3815 struct coro *current = SvSTATE_current;
3816 struct CoroSLF slf_save;
3236 3817
3237 if (current != coro) 3818 if (current != coro)
3238 { 3819 {
3239 PUTBACK; 3820 PUTBACK;
3240 save_perl (aTHX_ current); 3821 save_perl (aTHX_ current);
3241 load_perl (aTHX_ coro); 3822 load_perl (aTHX_ coro);
3823 /* the coro is most likely in an active SLF call.
3824 * while not strictly required (the code we execute is
3825 * not allowed to call any SLF functions), it's cleaner
3826 * to reinitialise the slf_frame and restore it later.
3827 * This might one day allow us to actually do SLF calls
3828 * from code executed here.
3829 */
3830 slf_save = slf_frame;
3831 slf_frame.prepare = 0;
3242 SPAGAIN; 3832 SPAGAIN;
3243 } 3833 }
3244 3834
3245 PUSHSTACK; 3835 PUSHSTACK;
3246 3836
… …
3256 SPAGAIN; 3846 SPAGAIN;
3257 3847
3258 if (current != coro) 3848 if (current != coro)
3259 { 3849 {
3260 PUTBACK; 3850 PUTBACK;
3851 slf_frame = slf_save;
3261 save_perl (aTHX_ coro); 3852 save_perl (aTHX_ coro);
3262 load_perl (aTHX_ current); 3853 load_perl (aTHX_ current);
3263 SPAGAIN; 3854 SPAGAIN;
3264 } 3855 }
3265 } 3856 }
… …
3270 PROTOTYPE: $ 3861 PROTOTYPE: $
3271 ALIAS: 3862 ALIAS:
3272 is_ready = CF_READY 3863 is_ready = CF_READY
3273 is_running = CF_RUNNING 3864 is_running = CF_RUNNING
3274 is_new = CF_NEW 3865 is_new = CF_NEW
3275 is_destroyed = CF_DESTROYED 3866 is_destroyed = CF_ZOMBIE
3867 is_zombie = CF_ZOMBIE
3276 is_suspended = CF_SUSPENDED 3868 is_suspended = CF_SUSPENDED
3277 CODE: 3869 CODE:
3278 RETVAL = boolSV (coro->flags & ix); 3870 RETVAL = boolSV (coro->flags & ix);
3279 OUTPUT: 3871 OUTPUT:
3280 RETVAL 3872 RETVAL
3281 3873
3282void 3874void
3283throw (Coro::State self, SV *exception = &PL_sv_undef) 3875throw (SV *self, SV *exception = &PL_sv_undef)
3284 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
3285 CODE: 3877 CODE:
3286{ 3878{
3879 struct coro *coro = SvSTATE (self);
3287 struct coro *current = SvSTATE_current; 3880 struct coro *current = SvSTATE_current;
3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3881 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3289 SvREFCNT_dec (*exceptionp); 3882 SvREFCNT_dec (*exceptionp);
3290 SvGETMAGIC (exception); 3883 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3884 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3885
3886 api_ready (aTHX_ self);
3292} 3887}
3293 3888
3294void 3889void
3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3890api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3296 PROTOTYPE: $;$ 3891 PROTOTYPE: $;$
… …
3351 3946
3352void 3947void
3353cancel (Coro::State self) 3948cancel (Coro::State self)
3354 CODE: 3949 CODE:
3355 coro_state_destroy (aTHX_ self); 3950 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358 3951
3359SV * 3952SV *
3360enable_times (int enabled = enable_times) 3953enable_times (int enabled = enable_times)
3361 CODE: 3954 CODE:
3362{ 3955{
… …
3375 3968
3376void 3969void
3377times (Coro::State self) 3970times (Coro::State self)
3378 PPCODE: 3971 PPCODE:
3379{ 3972{
3380 struct coro *current = SvSTATE (coro_current); 3973 struct coro *current = SvSTATE (coro_current);
3381 3974
3382 if (expect_false (current == self)) 3975 if (ecb_expect_false (current == self))
3383 { 3976 {
3384 coro_times_update (); 3977 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current)); 3978 coro_times_add (SvSTATE (coro_current));
3386 } 3979 }
3387 3980
3388 EXTEND (SP, 2); 3981 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3982 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3983 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391 3984
3392 if (expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3394} 3987}
3395 3988
3396void 3989void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3398 CODE: 3991 CODE:
3399{ 3992{
3400 struct coro *current = SvSTATE_current; 3993 struct coro *current = SvSTATE_current;
3994 AV *swap_sv;
3995 int i;
3996
3997 sva = SvRV (sva);
3998 svb = SvRV (svb);
3401 3999
3402 if (current == coro) 4000 if (current == coro)
3403 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3404 4002
3405 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3406 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3407 4005
4006 swap_sv = coro->swap_sv;
4007
4008 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4009 {
4010 SV *a = AvARRAY (swap_sv)[i ];
4011 SV *b = AvARRAY (swap_sv)[i + 1];
4012
4013 if (a == sva && b == svb)
4014 {
4015 SvREFCNT_dec_NN (a);
4016 SvREFCNT_dec_NN (b);
4017
4018 for (; i <= AvFILLp (swap_sv) - 2; i++)
4019 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4020
4021 AvFILLp (swap_sv) -= 2;
4022
4023 goto removed;
4024 }
4025 }
4026
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3409 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3410 4031
3411 if (current == coro) 4032 if (current == coro)
3412 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3413} 4034}
3414 4035
3415 4036
3416MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3417 4038
3418BOOT: 4039BOOT:
3419{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4047 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3425 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3426 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4049 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3427 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4050 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4051 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3429 4052
3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4053 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4054 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4055 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4056 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3434 4057
3435 coro_stash = gv_stashpv ("Coro", TRUE); 4058 coro_stash = gv_stashpv ("Coro", TRUE);
3436 4059
3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4060 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4061 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4062 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3451 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3452 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3453 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3454 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3455 4078
4079 coroapi.enterleave_hook = api_enterleave_hook;
4080 coroapi.enterleave_unhook = api_enterleave_unhook;
4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4082
3456 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3457 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3458 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3459 } 4086 }
3460} 4087}
3461 4088
3462SV * 4089SV *
… …
3467 api_ready (aTHX_ RETVAL); 4094 api_ready (aTHX_ RETVAL);
3468 OUTPUT: 4095 OUTPUT:
3469 RETVAL 4096 RETVAL
3470 4097
3471void 4098void
4099_destroy (Coro::State coro)
4100 CODE:
4101 /* used by the manager thread */
4102 coro_state_destroy (aTHX_ coro);
4103
4104void
4105on_destroy (Coro::State coro, SV *cb)
4106 CODE:
4107 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4108
4109void
4110join (...)
4111 CODE:
4112 CORO_EXECUTE_SLF_XS (slf_init_join);
4113
4114void
3472terminate (...) 4115terminate (...)
3473 CODE: 4116 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4117 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4118
4119void
4120cancel (...)
4121 CODE:
4122 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4123
4124int
4125safe_cancel (Coro::State self, ...)
4126 C_ARGS: aTHX_ self, &ST (1), items - 1
3475 4127
3476void 4128void
3477schedule (...) 4129schedule (...)
3478 CODE: 4130 CODE:
3479 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4131 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3500 4152
3501void 4153void
3502_set_current (SV *current) 4154_set_current (SV *current)
3503 PROTOTYPE: $ 4155 PROTOTYPE: $
3504 CODE: 4156 CODE:
3505 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3506 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3507 4159
3508void 4160void
3509_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3510 PROTOTYPE: $ 4162 PROTOTYPE: $
… …
3594 4246
3595 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
3596 { 4248 {
3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3599 SvREFCNT_dec (sv); 4251 SvREFCNT_dec_NN (sv);
3600 } 4252 }
3601 4253
3602 { 4254 {
3603 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
3604 4256
… …
3611 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
3612 4264
3613 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
3614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3615 else 4267 else
3616 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
3617} 4269}
3618 4270
3619SV * 4271SV *
3620rouse_cb () 4272rouse_cb ()
3621 PROTOTYPE: 4273 PROTOTYPE:
… …
3636 on_leave = 1 4288 on_leave = 1
3637 PROTOTYPE: & 4289 PROTOTYPE: &
3638 CODE: 4290 CODE:
3639{ 4291{
3640 struct coro *coro = SvSTATE_current; 4292 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4293 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642 4294
3643 block = s_get_cv_croak (block); 4295 block = s_get_cv_croak (block);
3644 4296
3645 if (!*avp) 4297 if (!*avp)
3646 *avp = newAV (); 4298 *avp = newAV ();
… …
3666 4318
3667SV * 4319SV *
3668new (SV *klass, SV *count = 0) 4320new (SV *klass, SV *count = 0)
3669 CODE: 4321 CODE:
3670{ 4322{
3671 int semcnt = 1; 4323 int semcnt = 1;
3672 4324
3673 if (count) 4325 if (count)
3674 { 4326 {
3675 SvGETMAGIC (count); 4327 SvGETMAGIC (count);
3676 4328
… …
3700 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3701 OUTPUT: 4353 OUTPUT:
3702 RETVAL 4354 RETVAL
3703 4355
3704void 4356void
3705up (SV *self, int adjust = 1) 4357up (SV *self)
3706 ALIAS:
3707 adjust = 1
3708 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
3709 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3710 4365
3711void 4366void
3712down (...) 4367down (...)
3713 CODE: 4368 CODE:
3714 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3736 XSRETURN_NO; 4391 XSRETURN_NO;
3737} 4392}
3738 4393
3739void 4394void
3740waiters (SV *self) 4395waiters (SV *self)
3741 PPCODE: 4396 PPCODE:
3742{ 4397{
3743 AV *av = (AV *)SvRV (self); 4398 AV *av = (AV *)SvRV (self);
3744 int wcount = AvFILLp (av) + 1 - 1; 4399 int wcount = AvFILLp (av) + 1 - 1;
3745 4400
3746 if (GIMME_V == G_SCALAR) 4401 if (GIMME_V == G_SCALAR)
… …
3755} 4410}
3756 4411
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4412MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758 4413
3759void 4414void
3760_may_delete (SV *sem, int count, int extra_refs) 4415_may_delete (SV *sem, int count, unsigned int extra_refs)
3761 PPCODE: 4416 PPCODE:
3762{ 4417{
3763 AV *av = (AV *)SvRV (sem); 4418 AV *av = (AV *)SvRV (sem);
3764 4419
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4420 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */ 4421 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count) 4422 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES; 4423 XSRETURN_YES;
… …
3789 4444
3790void 4445void
3791broadcast (SV *self) 4446broadcast (SV *self)
3792 CODE: 4447 CODE:
3793{ 4448{
3794 AV *av = (AV *)SvRV (self); 4449 AV *av = (AV *)SvRV (self);
3795 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4450 coro_signal_wake (aTHX_ av, AvFILLp (av));
3796} 4451}
3797 4452
3798void 4453void
3799send (SV *self) 4454send (SV *self)
… …
3807 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4462 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3808} 4463}
3809 4464
3810IV 4465IV
3811awaited (SV *self) 4466awaited (SV *self)
3812 CODE: 4467 CODE:
3813 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4468 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3814 OUTPUT: 4469 OUTPUT:
3815 RETVAL 4470 RETVAL
3816 4471
3817 4472
… …
3822 4477
3823void 4478void
3824_schedule (...) 4479_schedule (...)
3825 CODE: 4480 CODE:
3826{ 4481{
3827 static int incede; 4482 static int incede;
3828 4483
3829 api_cede_notself (aTHX); 4484 api_cede_notself (aTHX);
3830 4485
3831 ++incede; 4486 ++incede;
3832 while (coro_nready >= incede && api_cede (aTHX)) 4487 while (coro_nready >= incede && api_cede (aTHX))
… …
3876 { 4531 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4532 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0; 4533 coro_old_pp_sselect = 0;
3879 } 4534 }
3880 4535
4536MODULE = Coro::State PACKAGE = Coro::Util
4537
4538void
4539_exit (int code)
4540 CODE:
4541 _exit (code);
4542
4543NV
4544time ()
4545 CODE:
4546 RETVAL = nvtime (aTHX);
4547 OUTPUT:
4548 RETVAL
4549
4550NV
4551gettimeofday ()
4552 PPCODE:
4553{
4554 UV tv [2];
4555 u2time (aTHX_ tv);
4556 EXTEND (SP, 2);
4557 PUSHs (sv_2mortal (newSVuv (tv [0])));
4558 PUSHs (sv_2mortal (newSVuv (tv [1])));
4559}
4560

Diff Legend

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