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.380 by root, Sun Sep 12 03:06:38 2010 UTC vs.
Revision 1.478 by root, Mon Mar 16 11:12:52 2020 UTC

1#define NDEBUG 1 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
4 27
5#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
6#define PERL_EXT 29#define PERL_EXT
7 30
8#include "EXTERN.h" 31#include "EXTERN.h"
… …
10#include "XSUB.h" 33#include "XSUB.h"
11#include "perliol.h" 34#include "perliol.h"
12 35
13#include "schmorp.h" 36#include "schmorp.h"
14 37
38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
40#include "ecb.h"
41
42#include <stddef.h>
15#include <stdio.h> 43#include <stdio.h>
16#include <errno.h> 44#include <errno.h>
17#include <assert.h> 45#include <assert.h>
18 46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
54
19#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
21#endif 57#endif
22 58
23#ifdef WIN32 59#ifdef PadARRAY
60# define NEWPADAPI 1
61# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
62#else
63typedef AV PADNAMELIST;
64# if !PERL_VERSION_ATLEAST(5,8,0)
65typedef AV PADLIST;
66typedef AV PAD;
67# endif
68# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
69# define PadlistMAX(pl) AvFILLp (pl)
70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
71# define PadARRAY AvARRAY
72# define PadMAX AvFILLp
73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
81
82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
84#if PERL_VERSION_ATLEAST(5,19,0)
85# define SVt_BIND SVt_IV
86#endif
87
88#if defined(_WIN32)
89# undef HAS_GETTIMEOFDAY
24# undef setjmp 90# undef setjmp
25# undef longjmp 91# undef longjmp
26# undef _exit 92# undef _exit
27# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
28#else 94#else
29# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
30#endif 96#endif
31 97
32#ifdef HAVE_MMAP
33# include <unistd.h>
34# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS
36# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON
38# else
39# undef HAVE_MMAP
40# endif
41# endif
42# include <limits.h>
43# ifndef PAGESIZE
44# define PAGESIZE pagesize
45# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
46static long pagesize;
47# else
48# define BOOT_PAGESIZE (void)0
49# endif
50#else
51# define PAGESIZE 0
52# define BOOT_PAGESIZE (void)0
53#endif
54
55#if CORO_USE_VALGRIND
56# include <valgrind/valgrind.h>
57#endif
58
59/* the maximum number of idle cctx that will be pooled */ 98/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
61 100
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
63# undef CORO_STACKGUARD 102# define HAS_SCOPESTACK_NAME 1
64#endif
65
66#ifndef CORO_STACKGUARD
67# define CORO_STACKGUARD 0
68#endif 103#endif
69 104
70/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
71#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
72# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
… …
82# define STACKLEVEL ((void *)&stacklevel) 117# define STACKLEVEL ((void *)&stacklevel)
83#endif 118#endif
84 119
85#define IN_DESTRUCT PL_dirty 120#define IN_DESTRUCT PL_dirty
86 121
87#if __GNUC__ >= 3
88# define attribute(x) __attribute__(x)
89# define expect(expr,value) __builtin_expect ((expr), (value))
90# define INLINE static inline
91#else
92# define attribute(x)
93# define expect(expr,value) (expr)
94# define INLINE static
95#endif
96
97#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1)
99
100#define NOINLINE attribute ((noinline))
101
102#include "CoroAPI.h" 122#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 123#define GCoroAPI (&coroapi) /* very sneaky */
104 124
105#ifdef USE_ITHREADS 125#ifdef USE_ITHREADS
106# if CORO_PTHREAD 126# if CORO_PTHREAD
… …
116# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif 138# endif
119#endif 139#endif
120 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
121static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
123 161
124/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 164static OP *pp_slf (pTHX);
165static void slf_destroy (pTHX_ struct coro *coro);
127 166
128static U32 cctx_gen; 167static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
… …
139 178
140static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
141static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
142static SV *rv_diehook; 181static SV *rv_diehook;
143static SV *rv_warnhook; 182static SV *rv_warnhook;
144static HV *hv_sig; /* %SIG */
145 183
146/* async_pool helper stuff */ 184/* async_pool helper stuff */
147static SV *sv_pool_rss; 185static SV *sv_pool_rss;
148static SV *sv_pool_size; 186static SV *sv_pool_size;
149static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
161static char times_valid; 199static char times_valid;
162 200
163static struct coro_cctx *cctx_first; 201static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 202static int cctx_count, cctx_idle;
165 203
166enum { 204enum
205{
167 CC_MAPPED = 0x01, 206 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 207 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 208 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 209 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176typedef struct coro_cctx 215typedef struct coro_cctx
177{ 216{
178 struct coro_cctx *next; 217 struct coro_cctx *next;
179 218
180 /* the stack */ 219 /* the stack */
181 void *sptr; 220 struct coro_stack stack;
182 size_t ssize;
183 221
184 /* cpu state */ 222 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 223 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
224#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env */
226#endif
187 JMPENV *top_env; 227 JMPENV *top_env;
188 coro_context cctx; 228 coro_context cctx;
189 229
190 U32 gen; 230 U32 gen;
191#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
192 int valgrind_id; 232 int valgrind_id;
193#endif 233#endif
194 unsigned char flags; 234 unsigned char flags;
195} coro_cctx; 235} coro_cctx;
196 236
197coro_cctx *cctx_current; /* the currently running cctx */ 237static coro_cctx *cctx_current; /* the currently running cctx */
198 238
199/*****************************************************************************/ 239/*****************************************************************************/
200 240
241static MGVTBL coro_state_vtbl;
242
201enum { 243enum
244{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 245 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 246 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 247 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 248 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 249 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
250 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 251};
208 252
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 253/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 254typedef struct
211{ 255{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 256 #define VARx(name,expr,type) type name;
218# include "state.h" 257 #include "state.h"
219#undef VAR
220} perl_slots; 258} perl_slots;
221 259
260/* how many context stack entries do we need for perl_slots */
222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 261#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 262
224/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
225struct coro { 264struct coro
265{
226 /* the C coroutine allocated to this perl coroutine, if any */ 266 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 267 coro_cctx *cctx;
228 268
229 /* ready queue */ 269 /* ready queue */
230 struct coro *next_ready; 270 struct coro *next_ready;
… …
232 /* state data */ 272 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 273 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 274 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
236 276
237 CV *startcv; /* the CV to execute */ 277 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 278 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 279 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 280 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 281
244 /* statistics */ 282 /* statistics */
245 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
246 284
247 /* coro process data */ 285 /* coro process data */
248 int prio; 286 int prio;
249 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 288 SV *rouse_cb; /* most recently created rouse callback */
289 AV *on_destroy; /* callbacks or coros to notify on destroy */
290 AV *status; /* the exit status list */
251 291
252 /* async_pool */ 292 /* async_pool */
253 SV *saved_deffh; 293 SV *saved_deffh;
254 SV *invoke_cb; 294 SV *invoke_cb;
255 AV *invoke_av; 295 AV *invoke_av;
256 296
257 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
258 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
259 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
260 300
261 /* swap_sv */ 301 /* swap_sv */
262 AV *swap_sv; 302 AV *swap_sv;
263 303
264 /* times */ 304 /* times */
… …
271typedef struct coro *Coro__State; 311typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 312typedef struct coro *Coro__State_or_hashref;
273 313
274/* the following variables are effectively part of the perl context */ 314/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 315/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 316/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 317static struct CoroSLF slf_frame; /* the current slf frame */
278 318
279/** Coro ********************************************************************/ 319/** Coro ********************************************************************/
280 320
281#define CORO_PRIO_MAX 3 321#define CORO_PRIO_MAX 3
… …
287 327
288/* for Coro.pm */ 328/* for Coro.pm */
289static SV *coro_current; 329static SV *coro_current;
290static SV *coro_readyhook; 330static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 331static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 332static CV *cv_coro_run;
293static struct coro *coro_first; 333static struct coro *coro_first;
294#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
335
336/** JIT *********************************************************************/
337
338#if CORO_JIT
339 /* APPLE doesn't have mmap though */
340 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
341 #ifndef CORO_JIT_TYPE
342 #if ECB_AMD64 && CORO_JIT_UNIXY
343 #define CORO_JIT_TYPE "amd64-unix"
344 #elif __i386 && CORO_JIT_UNIXY
345 #define CORO_JIT_TYPE "x86-unix"
346 #endif
347 #endif
348#endif
349
350#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
351 #undef CORO_JIT
352#endif
353
354#if CORO_JIT
355 typedef void (*load_save_perl_slots_type)(perl_slots *);
356 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
357#endif
295 358
296/** Coro::Select ************************************************************/ 359/** Coro::Select ************************************************************/
297 360
298static OP *(*coro_old_pp_sselect) (pTHX); 361static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 362static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 374 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 375 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 376 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 377}
315 378
379/** time stuff **************************************************************/
380
381#ifdef HAS_GETTIMEOFDAY
382
383ecb_inline void
384coro_u2time (pTHX_ UV ret[2])
385{
386 struct timeval tv;
387 gettimeofday (&tv, 0);
388
389 ret [0] = tv.tv_sec;
390 ret [1] = tv.tv_usec;
391}
392
393ecb_inline double
394coro_nvtime (void)
395{
396 struct timeval tv;
397 gettimeofday (&tv, 0);
398
399 return tv.tv_sec + tv.tv_usec * 1e-6;
400}
401
402ecb_inline void
403time_init (pTHX)
404{
405 nvtime = coro_nvtime;
406 u2time = coro_u2time;
407}
408
409#else
410
411ecb_inline void
412time_init (pTHX)
413{
414 SV **svp;
415
416 require_pv ("Time/HiRes.pm");
417
418 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
419
420 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
421 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
422
423 nvtime = INT2PTR (double (*)(), SvIV (*svp));
424
425 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
426 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
427}
428
429#endif
430
316/** lowlevel stuff **********************************************************/ 431/** lowlevel stuff **********************************************************/
317 432
318static SV * 433static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 434coro_get_sv (pTHX_ const char *name, int create)
320{ 435{
321#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
322 /* 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 */
323 get_sv (name, create); 438 get_sv (name, create);
324#endif 439#endif
325 return get_sv (name, create); 440 return get_sv (name, create);
326} 441}
327 442
328static AV * 443static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 444coro_get_av (pTHX_ const char *name, int create)
330{ 445{
331#if PERL_VERSION_ATLEAST (5,10,0) 446#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 447 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 448 get_av (name, create);
334#endif 449#endif
335 return get_av (name, create); 450 return get_av (name, create);
336} 451}
337 452
338static HV * 453static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 454coro_get_hv (pTHX_ const char *name, int create)
340{ 455{
341#if PERL_VERSION_ATLEAST (5,10,0) 456#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 457 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 458 get_hv (name, create);
344#endif 459#endif
345 return get_hv (name, create); 460 return get_hv (name, create);
346} 461}
347 462
348INLINE void 463ecb_inline void
349coro_times_update () 464coro_times_update (void)
350{ 465{
351#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
352 struct timespec ts; 467 struct timespec ts;
353 468
354 ts.tv_sec = ts.tv_nsec = 0; 469 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
368#endif 483#endif
369} 484}
370 485
371INLINE void 486ecb_inline void
372coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
373{ 488{
374 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 490 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 494 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
381} 496}
382 497
383INLINE void 498ecb_inline void
384coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
385{ 500{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 501 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 511/* magic glue */
397 512
398#define CORO_MAGIC_type_cv 26 513#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 514#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 515
401#define CORO_MAGIC_NN(sv, type) \ 516#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 517 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 518 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 519 : mg_find (sv, type))
405 520
406#define CORO_MAGIC(sv, type) \ 521#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 522 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 523 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 524 : 0)
410 525
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 526#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 527#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 528
414INLINE struct coro * 529ecb_inline MAGIC *
415SvSTATE_ (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
416{ 531{
417 HV *stash;
418 MAGIC *mg; 532 MAGIC *mg;
419 533
534 if (ecb_expect_true (
535 SvTYPE (coro) == SVt_PVHV
536 && (mg = CORO_MAGIC_state (coro))
537 && mg->mg_virtual == &coro_state_vtbl
538 ))
539 return mg;
540
541 return 0;
542}
543
544ecb_inline struct coro *
545SvSTATE_ (pTHX_ SV *coro_sv)
546{
547 MAGIC *mg;
548
420 if (SvROK (coro)) 549 if (SvROK (coro_sv))
421 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
422 551
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
553 if (!mg)
424 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
425 555
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
436} 557}
437 558
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 559#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 560
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 564
444/*****************************************************************************/ 565/*****************************************************************************/
445/* padlist management and caching */ 566/* padlist management and caching */
446 567
447static AV * 568ecb_inline PADLIST *
448coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
449{ 570{
450 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
452 576
453 newpadlist = newAV (); 577#if NEWPADAPI
578
579 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
580 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
581 while (!PadlistARRAY (padlist)[off - 1])
582 --off;
583
584 Perl_pad_push (aTHX_ padlist, off);
585
586 newpad = PadlistARRAY (padlist)[off];
587 PadlistARRAY (padlist)[off] = 0;
588
589#else
590
591#if PERL_VERSION_ATLEAST (5,10,0)
592 Perl_pad_push (aTHX_ padlist, off);
593#else
594 Perl_pad_push (aTHX_ padlist, off, 1);
595#endif
596
597 newpad = PadlistARRAY (padlist)[off];
598 PadlistMAX (padlist) = off - 1;
599
600#endif
601
602 newPADLIST (newpadlist);
603#if !PERL_VERSION_ATLEAST(5,15,3)
604 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
454 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
455#if PERL_VERSION_ATLEAST (5,10,0)
456 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
457#else
458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
459#endif 606#endif
460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
461 --AvFILLp (padlist);
462 607
463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
464 av_store (newpadlist, 1, (SV *)newpad); 609 PadlistMAX (newpadlist) = 1;
610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
615 PadlistARRAY (newpadlist)[1] = newpad;
465 616
466 return newpadlist; 617 return newpadlist;
467} 618}
468 619
469static void 620ecb_inline void
470free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
471{ 622{
472 /* may be during global destruction */ 623 /* may be during global destruction */
473 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
474 { 625 {
475 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
476 627
477 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
478 { 629 {
479 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
480 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
481 I32 j = AvFILLp (av);
482 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
483 while (j >= 0) 637 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 639
486 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
488 } 643 }
489 644
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
491 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
492 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
494 } 655 }
495} 656}
496 657
497static int 658static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 660{
500 AV *padlist; 661 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 662 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
663 size_t len = *(size_t *)mg->mg_ptr;
502 664
503 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
505 return 0; 667 return 0;
506 668
507 /* casting is fun. */ 669 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 671
513 return 0; 672 return 0;
514} 673}
515 674
516static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 676 0, 0, 0, 0,
518 coro_cv_free 677 coro_cv_free
519}; 678};
520 679
521/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
522static void 681ecb_inline void
523get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
524{ 683{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 685 size_t *lenp;
527 686
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 689 else
531 { 690 {
532#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 700#endif
542 } 701 }
543} 702}
544 703
545static void 704ecb_inline void
546put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
547{ 706{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 708
551 if (expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 711 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
712 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
713 mg->mg_len = 1; /* so mg_free frees mg_ptr */
714 }
715 else
716 Renew (mg->mg_ptr,
717 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
718 char);
553 719
554 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
555
556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
557 av_extend (av, AvFILLp (av) + 1);
558
559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
560} 721}
561 722
562/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
563 724
725ecb_inline void
726swap_sv (SV *a, SV *b)
727{
728 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
729 SV tmp;
730
731 /* swap sv_any */
732 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
733
734 /* swap sv_flags */
735 SvFLAGS (&tmp) = SvFLAGS (a);
736 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
737 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
738
739#if PERL_VERSION_ATLEAST (5,10,0)
740 /* perl 5.10 and later complicates this _quite_ a bit, but it also
741 * is much faster, so no quarrels here. alternatively, we could
742 * sv_upgrade to avoid this.
743 */
744 {
745 /* swap sv_u */
746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
747
748 /* if SvANY points to the head, we need to adjust the pointers,
749 * as the pointer for a still points to b, and maybe vice versa.
750 */
751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
757
758 if (svany_in_head (SvTYPE (a)))
759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
760
761 if (svany_in_head (SvTYPE (b)))
762 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
763 }
764#endif
765}
766
564/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
565static void 768static void
566swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
567{ 770{
568 int i; 771 int i;
569 772
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609} 775}
610 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
611#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
614 793
615static void 794static void
616on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
617 796
618static void 797static void
… …
621 perl_slots *slot = c->slot; 800 perl_slots *slot = c->slot;
622 c->slot = 0; 801 c->slot = 0;
623 802
624 PL_mainstack = c->mainstack; 803 PL_mainstack = c->mainstack;
625 804
626 GvSV (PL_defgv) = slot->defsv; 805#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 806 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 807#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 809 #include "state.h"
634 #undef VAR 810#endif
635 811
636 { 812 {
637 dSP; 813 dSP;
638 814
639 CV *cv; 815 CV *cv;
640 816
641 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
643 { 819 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 823 }
648 824
649 PUTBACK; 825 PUTBACK;
650 } 826 }
651 827
652 slf_frame = c->slf_frame; 828 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 829 CORO_THROW = c->except;
654 830
655 if (expect_false (enable_times)) 831 if (ecb_expect_false (enable_times))
656 { 832 {
657 if (expect_false (!times_valid)) 833 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 834 coro_times_update ();
659 835
660 coro_times_sub (c); 836 coro_times_sub (c);
661 } 837 }
662 838
663 if (expect_false (c->on_enter)) 839 if (ecb_expect_false (c->on_enter))
664 { 840 {
665 int i; 841 int i;
666 842
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
669 } 845 }
670 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
671 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
672} 856}
673 857
674static void 858static void
675save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
676{ 860{
677 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
678 862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
870
679 if (expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
680 { 872 {
681 int i; 873 int i;
682 874
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 875 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 876 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 877 }
686 878
687 times_valid = 0; 879 times_valid = 0;
688 880
689 if (expect_false (enable_times)) 881 if (ecb_expect_false (enable_times))
690 { 882 {
691 coro_times_update (); times_valid = 1; 883 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 884 coro_times_add (c);
693 } 885 }
694 886
… …
708 900
709 XPUSHs (Nullsv); 901 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 902 /* this loop was inspired by pp_caller */
711 for (;;) 903 for (;;)
712 { 904 {
713 while (expect_true (cxix >= 0)) 905 while (ecb_expect_true (cxix >= 0))
714 { 906 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 907 PERL_CONTEXT *cx = &ccstk[cxix--];
716 908
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 909 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 910 {
719 CV *cv = cx->blk_sub.cv; 911 CV *cv = cx->blk_sub.cv;
720 912
721 if (expect_true (CvDEPTH (cv))) 913 if (ecb_expect_true (CvDEPTH (cv)))
722 { 914 {
723 EXTEND (SP, 3); 915 EXTEND (SP, 3);
724 PUSHs ((SV *)CvPADLIST (cv)); 916 PUSHs ((SV *)CvPADLIST (cv));
725 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 917 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
726 PUSHs ((SV *)cv); 918 PUSHs ((SV *)cv);
… …
729 get_padlist (aTHX_ cv); 921 get_padlist (aTHX_ cv);
730 } 922 }
731 } 923 }
732 } 924 }
733 925
734 if (expect_true (top_si->si_type == PERLSI_MAIN)) 926 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
735 break; 927 break;
736 928
737 top_si = top_si->si_prev; 929 top_si = top_si->si_prev;
738 ccstk = top_si->si_cxstack; 930 ccstk = top_si->si_cxstack;
739 cxix = top_si->si_cxix; 931 cxix = top_si->si_cxix;
… …
741 933
742 PUTBACK; 934 PUTBACK;
743 } 935 }
744 936
745 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
746 /* we manually unroll here, as usually 2 slots is enough */ 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
747 if (SLOT_COUNT >= 1) CXINC;
748 if (SLOT_COUNT >= 2) CXINC;
749 if (SLOT_COUNT >= 3) CXINC;
750 { 939 {
751 unsigned int i; 940 unsigned int i;
941
752 for (i = 3; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
753 CXINC; 943 CXINC;
754 } 944
755 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 945 cxstack_ix -= SLOT_COUNT; /* undo allocation */
946 }
756 947
757 c->mainstack = PL_mainstack; 948 c->mainstack = PL_mainstack;
758 949
759 { 950 {
760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 951 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
761 952
762 slot->defav = GvAV (PL_defgv); 953#if CORO_JIT
763 slot->defsv = DEFSV; 954 save_perl_slots (slot);
764 slot->errsv = ERRSV; 955#else
765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
767
768 #define VAR(name,type) slot->name = PL_ ## name; 956 #define VARx(name,expr,type) slot->name = expr;
769 # include "state.h" 957 #include "state.h"
770 #undef VAR 958#endif
771 } 959 }
772} 960}
773 961
774/* 962/*
775 * allocate various perl stacks. This is almost an exact copy 963 * allocate various perl stacks. This is almost an exact copy
… …
781# define coro_init_stacks(thx) init_stacks () 969# define coro_init_stacks(thx) init_stacks ()
782#else 970#else
783static void 971static void
784coro_init_stacks (pTHX) 972coro_init_stacks (pTHX)
785{ 973{
786 PL_curstackinfo = new_stackinfo(32, 8); 974 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
787 PL_curstackinfo->si_type = PERLSI_MAIN; 975 PL_curstackinfo->si_type = PERLSI_MAIN;
788 PL_curstack = PL_curstackinfo->si_stack; 976 PL_curstack = PL_curstackinfo->si_stack;
789 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 977 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
790 978
791 PL_stack_base = AvARRAY(PL_curstack); 979 PL_stack_base = AvARRAY(PL_curstack);
… …
806#endif 994#endif
807 995
808 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
809 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
810 PL_scopestack_max = 8; 998 PL_scopestack_max = 8;
999#if HAS_SCOPESTACK_NAME
1000 New(54,PL_scopestack_name,8,const char*);
1001#endif
811 1002
812 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
813 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
814 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
815 1011
816#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
817 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
818 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
819 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
843 } 1039 }
844 1040
845 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
846 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
847 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
848 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
849#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
850 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
851#endif 1050#endif
852} 1051}
… …
882 } 1081 }
883 1082
884 return rss; 1083 return rss;
885} 1084}
886 1085
887/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
888
889static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
890static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
891static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
892 1087
893/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
894#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
895#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
896 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
897 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
898#endif 1093#endif
899 1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
1122
900/* 1123/*
901 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
902 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1125 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
903 * and instead of trying to save and restore the hash elements, we just provide 1126 * and instead of trying to save and restore the hash elements (extremely slow),
904 * readback here. 1127 * we just provide our own readback here.
905 */ 1128 */
906static int 1129static int ecb_cold
907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
908{ 1131{
909 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;
910 1135
911 if (*s == '_') 1136 SV *ssv;
912 {
913 SV **svp = 0;
914 1137
915 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
916 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
917
918 if (svp) 1138 if (!*svp)
919 { 1139 ssv = &PL_sv_undef;
920 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
921 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
922 } 1142 else
923 } 1143 ssv = *svp;
924 1144
925 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
926} 1147}
927 1148
928static int 1149static int ecb_cold
929coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
930{ 1151{
931 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
932 1155
933 if (*s == '_')
934 {
935 SV **svp = 0;
936
937 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
938 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
939
940 if (svp)
941 {
942 SV *old = *svp; 1156 SV *old = *svp;
943 *svp = 0; 1157 *svp = 0;
944 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
945 return 0; 1159 return 0;
946 }
947 }
948
949 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
950} 1160}
951 1161
952static int 1162static int ecb_cold
953coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
954{ 1164{
955 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
956 1168
957 if (*s == '_')
958 {
959 SV **svp = 0;
960
961 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
962 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
963
964 if (svp)
965 {
966 SV *old = *svp; 1169 SV *old = *svp;
967 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
968 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
969 return 0; 1172 return 0;
970 }
971 }
972
973 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
974} 1173}
975 1174
976static void 1175static void
977prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
978{ 1177{
… …
990slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
991{ 1190{
992 return 1; 1191 return 1;
993} 1192}
994 1193
1194/** coroutine stack handling ************************************************/
1195
995static UNOP init_perl_op; 1196static UNOP init_perl_op;
996 1197
997static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
998init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
999{ 1200{
1000 /* 1201 /*
1001 * emulate part of the perl startup here. 1202 * emulate part of the perl startup here.
1002 */ 1203 */
… …
1010 PL_comppad_name_fill = 0; 1211 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1212 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1213 PL_curpm = 0;
1013 PL_curpad = 0; 1214 PL_curpad = 0;
1014 PL_localizing = 0; 1215 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1216 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1217#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1218 PL_parser = 0;
1019#endif 1219#endif
1020 PL_hints = 0; 1220 PL_hints = 0;
1021 1221
1022 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1025 1225
1026 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1027 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1028 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1031 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1032 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1033 1236
1034 { 1237 {
1035 dSP; 1238 dSP;
… …
1039 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1040 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1041 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1042 1245
1043 PUSHMARK (SP); 1246 PUSHMARK (SP);
1044 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1045 PUTBACK; 1248 PUTBACK;
1046 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1047 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1048 } 1251 }
1049 1252
1050 /* this newly created coroutine might be run on an existing cctx which most 1253 /* this newly created coroutine might be run on an existing cctx which most
1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1254 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1052 */ 1255 */
1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1256 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1257 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1258 slf_frame.destroy = 0;
1055 1259
1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1260 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1057 init_perl_op.op_next = PL_op; 1261 init_perl_op.op_next = PL_op;
1058 init_perl_op.op_type = OP_ENTERSUB; 1262 init_perl_op.op_type = OP_ENTERSUB;
1059 init_perl_op.op_ppaddr = pp_slf; 1263 init_perl_op.op_ppaddr = pp_slf;
… …
1062 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1063 1267
1064 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1065 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1066 1270
1067 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1068 1272
1069 if (expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1070 { 1274 {
1071 coro_times_update (); 1275 coro_times_update ();
1072 coro_times_sub (coro); 1276 coro_times_sub (coro);
1073 } 1277 }
1074} 1278}
… …
1098destroy_perl (pTHX_ struct coro *coro) 1302destroy_perl (pTHX_ struct coro *coro)
1099{ 1303{
1100 SV *svf [9]; 1304 SV *svf [9];
1101 1305
1102 { 1306 {
1307 SV *old_current = SvRV (coro_current);
1103 struct coro *current = SvSTATE_current; 1308 struct coro *current = SvSTATE (old_current);
1104 1309
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1311
1107 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1313
1314 /* this will cause transfer_check to croak on block*/
1315 SvRV_set (coro_current, (SV *)coro->hv);
1316
1108 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1109 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1110 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1323
1111 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1112 1325
1113 /* restore swapped sv's */
1114 SWAP_SVS (coro);
1115
1116 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1117 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1333 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1334 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1335 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1336 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1337
1338 SvRV_set (coro_current, old_current);
1339
1128 load_perl (aTHX_ current); 1340 load_perl (aTHX_ current);
1129 } 1341 }
1130 1342
1131 { 1343 {
1132 unsigned int i; 1344 unsigned int i;
… …
1136 1348
1137 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1138 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1139 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1140 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1141 } 1355 }
1142} 1356}
1143 1357
1144INLINE void 1358ecb_inline void
1145free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1146{ 1360{
1147 if (expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1148 { 1362 {
1149 SvREFCNT_dec (coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1364 coro_mortal = 0;
1151 } 1365 }
1152} 1366}
1153 1367
1154static int 1368static int
… …
1186 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1187 1401
1188 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1189 ENTER; 1403 ENTER;
1190 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1191 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1192 PUSHMARK (SP);
1193 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1194 PUSHs (fullname); 1408 PUSHs (fullname);
1195 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1196 PUTBACK; 1410 PUTBACK;
1197 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
… …
1208 1422
1209 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1210 { 1424 {
1211 SV **cb; 1425 SV **cb;
1212 1426
1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1214 { 1428 {
1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1216 1430
1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1218 { 1432 {
… …
1224 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1225 1439
1226 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1227 ENTER; 1441 ENTER;
1228 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1229 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1230 PUSHMARK (SP);
1231 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1232 PUSHs (fullname); 1446 PUSHs (fullname);
1233 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1234 PUTBACK; 1448 PUTBACK;
1235 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1236 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1237 SPAGAIN; 1451 SPAGAIN;
1238 FREETMPS; 1452 FREETMPS;
… …
1248 dSP; 1462 dSP;
1249 1463
1250 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1251 ENTER; 1465 ENTER;
1252 SAVETMPS; 1466 SAVETMPS;
1253 EXTEND (SP, 3);
1254 PL_runops = RUNOPS_DEFAULT;
1255 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1256 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1257 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1258 PUTBACK; 1471 PUTBACK;
1259 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1260 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
… …
1287 1500
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1501 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1502}
1290 1503
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1504/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1505static void ecb_noinline
1293cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1294{ 1507{
1295 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1296 1509
1297 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1310} 1523}
1311 1524
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1525/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1526ecb_inline void
1314transfer_tail (pTHX) 1527transfer_tail (pTHX)
1315{ 1528{
1316 free_coro_mortal (aTHX); 1529 free_coro_mortal (aTHX);
1530}
1531
1532/* try to exit the same way perl's main function would do */
1533/* we do not bother resetting the environment or other things *7
1534/* that are not, uhm, essential */
1535/* this obviously also doesn't work when perl is embedded */
1536static void ecb_noinline ecb_cold
1537perlish_exit (pTHX)
1538{
1539 int exitstatus = perl_destruct (PL_curinterp);
1540 perl_free (PL_curinterp);
1541 exit (exitstatus);
1317} 1542}
1318 1543
1319/* 1544/*
1320 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1321 */ 1546 */
… …
1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1350 */ 1575 */
1351 1576
1352 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1353 * If perl-run returns we assume exit() was being called or the coro 1585 * If perl-run returns we assume exit() was being called or the coro
1354 * fell off the end, which seems to be the only valid (non-bug) 1586 * fell off the end, which seems to be the only valid (non-bug)
1355 * reason for perl_run to return. We try to exit by jumping to the 1587 * reason for perl_run to return. We try to mimic whatever perl is normally
1356 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1357 * coroutine as Coro has no such concept.
1358 * This actually isn't valid with the pthread backend, but OSes requiring
1359 * that backend are too broken to do it in a standards-compliant way.
1360 */ 1589 */
1361 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1591 }
1364} 1592}
1365 1593
1366static coro_cctx * 1594static coro_cctx *
1367cctx_new () 1595cctx_new (void)
1368{ 1596{
1369 coro_cctx *cctx; 1597 coro_cctx *cctx;
1370 1598
1371 ++cctx_count; 1599 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1606 return cctx;
1379} 1607}
1380 1608
1381/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1382static coro_cctx * 1610static coro_cctx *
1383cctx_new_empty () 1611cctx_new_empty (void)
1384{ 1612{
1385 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1386 1614
1387 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1389 1617
1390 return cctx; 1618 return cctx;
1391} 1619}
1392 1620
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1622static coro_cctx *
1395cctx_new_run () 1623cctx_new_run (void)
1396{ 1624{
1397 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1398 void *stack_start;
1399 size_t stack_size;
1400 1626
1401#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1402 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1403 /* mmap supposedly does allocate-on-write for us */
1404 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1405
1406 if (cctx->sptr != (void *)-1)
1407 {
1408 #if CORO_STACKGUARD
1409 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1410 #endif
1411 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1412 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1413 cctx->flags |= CC_MAPPED;
1414 } 1628 {
1415 else
1416#endif
1417 {
1418 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1419 New (0, cctx->sptr, cctx_stacksize, long);
1420
1421 if (!cctx->sptr)
1422 {
1423 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1424 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1425 }
1426
1427 stack_start = cctx->sptr;
1428 stack_size = cctx->ssize;
1429 } 1631 }
1430 1632
1431 #if CORO_USE_VALGRIND
1432 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1433 #endif
1434
1435 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1633 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1436 1634
1437 return cctx; 1635 return cctx;
1438} 1636}
1439 1637
1440static void 1638static void
1441cctx_destroy (coro_cctx *cctx) 1639cctx_destroy (coro_cctx *cctx)
1442{ 1640{
1443 if (!cctx) 1641 if (!cctx)
1444 return; 1642 return;
1445 1643
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1645
1448 --cctx_count; 1646 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1450 1648
1451 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1452 if (cctx->sptr)
1453 {
1454 #if CORO_USE_VALGRIND
1455 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1456 #endif
1457
1458#if HAVE_MMAP
1459 if (cctx->flags & CC_MAPPED)
1460 munmap (cctx->sptr, cctx->ssize);
1461 else
1462#endif
1463 Safefree (cctx->sptr);
1464 }
1465 1650
1466 Safefree (cctx); 1651 Safefree (cctx);
1467} 1652}
1468 1653
1469/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1655#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1656
1472static coro_cctx * 1657static coro_cctx *
1473cctx_get (pTHX) 1658cctx_get (pTHX)
1474{ 1659{
1475 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1476 { 1661 {
1477 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1479 --cctx_idle; 1664 --cctx_idle;
1480 1665
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1667 return cctx;
1483 1668
1484 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1485 } 1670 }
1486 1671
… …
1488} 1673}
1489 1674
1490static void 1675static void
1491cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1492{ 1677{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1678 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1494 1679
1495 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1682 {
1498 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1684 cctx_first = first->next;
1500 --cctx_idle; 1685 --cctx_idle;
1501 1686
… …
1512static void 1697static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1699{
1515 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1516 1701
1517 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1518 { 1703 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1705 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1706
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1708 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1709
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1712 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1713#endif
1529 } 1714 }
1530} 1715}
1531 1716
1532/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1720{
1536 dSTACKLEVEL; 1721 dSTACKLEVEL;
1537 1722
1538 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1540 { 1725 {
1541 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1727 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1728 }
1544 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1545 { 1730 {
1546 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1547 1732
1548 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1734 {
1550 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1553 } 1738 }
… …
1556 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1557 1742
1558 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1560 1745
1561 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1747 {
1563 /* need to start coroutine */ 1748 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1750 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1751 init_perl (aTHX_ next);
1567 } 1752 }
1568 else 1753 else
1569 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1570 1755
1571 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1757 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1760 && !force_cctx
1576 )) 1761 ))
1577 { 1762 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1763 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1764 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1765
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1766 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1582 /* without this the next cctx_get might destroy the running cctx while still in use */ 1767 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1769 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1586 1771
1587 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1588 } 1773 }
1589 else 1774 else
1590 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1591 1776
1592 ++next->usecount; 1777 ++next->usecount;
1593 1778
1594 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1781
1597 next->cctx = 0; 1782 next->cctx = 0;
1598 1783
1599 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1785 {
1601 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1789 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1795#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1611#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1796#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1797
1613/** high level stuff ********************************************************/ 1798/** high level stuff ********************************************************/
1614 1799
1800/* this function is actually Coro, not Coro::State, but we call it from here */
1801/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1802static void
1803coro_call_on_destroy (pTHX_ struct coro *coro);
1804
1805static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1806coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1807{
1618 if (coro->flags & CF_DESTROYED) 1808 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1809 return;
1620 1810
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1623 1812
1624 coro->flags |= CF_DESTROYED; 1813 coro->flags |= CF_ZOMBIE;
1625 1814
1626 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1627 { 1816 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1819 --coro_nready;
1631 } 1820 }
1632 else 1821 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1822 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1823
1824 if (coro->next) coro->next->prev = coro->prev;
1825 if (coro->prev) coro->prev->next = coro->next;
1826 if (coro == coro_first) coro_first = coro->next;
1634 1827
1635 if (coro->mainstack 1828 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1829 && coro->mainstack != main_mainstack
1637 && coro->slot 1830 && coro->slot
1638 && !PL_dirty) 1831 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1832 destroy_perl (aTHX_ coro);
1640 1833
1641 if (coro->next) coro->next->prev = coro->prev;
1642 if (coro->prev) coro->prev->next = coro->next;
1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx); 1834 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1835 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1836 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1837 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1838 SvREFCNT_dec (CORO_THROW);
1650 1839
1651 return 1; 1840 coro_call_on_destroy (aTHX_ coro);
1841
1842 /* more destruction mayhem in coro_state_free */
1652} 1843}
1653 1844
1654static int 1845static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1847{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1658 mg->mg_ptr = 0; 1849 mg->mg_ptr = 0;
1659 1850
1660 coro->hv = 0;
1661
1662 if (--coro->refcnt < 0)
1663 {
1664 coro_state_destroy (aTHX_ coro); 1851 coro_state_destroy (aTHX_ coro);
1852 SvREFCNT_dec (coro->on_destroy);
1853 SvREFCNT_dec (coro->status);
1854
1665 Safefree (coro); 1855 Safefree (coro);
1666 }
1667 1856
1668 return 0; 1857 return 0;
1669} 1858}
1670 1859
1671static int 1860static int ecb_cold
1672coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1673{ 1862{
1674 struct coro *coro = (struct coro *)mg->mg_ptr; 1863 /* called when perl clones the current process the slow way (windows process emulation) */
1675 1864 /* we simply nuke the pointers in the copy, causing perl to croak */
1676 ++coro->refcnt; 1865 mg->mg_ptr = 0;
1866 mg->mg_virtual = 0;
1677 1867
1678 return 0; 1868 return 0;
1679} 1869}
1680 1870
1681static MGVTBL coro_state_vtbl = { 1871static MGVTBL coro_state_vtbl = {
… …
1706 TRANSFER (ta, 1); 1896 TRANSFER (ta, 1);
1707} 1897}
1708 1898
1709/** Coro ********************************************************************/ 1899/** Coro ********************************************************************/
1710 1900
1711INLINE void 1901ecb_inline void
1712coro_enq (pTHX_ struct coro *coro) 1902coro_enq (pTHX_ struct coro *coro)
1713{ 1903{
1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1904 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1715 1905
1716 SvREFCNT_inc_NN (coro->hv); 1906 SvREFCNT_inc_NN (coro->hv);
… …
1718 coro->next_ready = 0; 1908 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1909 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro; 1910 ready [1] = coro;
1721} 1911}
1722 1912
1723INLINE struct coro * 1913ecb_inline struct coro *
1724coro_deq (pTHX) 1914coro_deq (pTHX)
1725{ 1915{
1726 int prio; 1916 int prio;
1727 1917
1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1918 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1781{ 1971{
1782 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1972 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1783} 1973}
1784 1974
1785/* expects to own a reference to next->hv */ 1975/* expects to own a reference to next->hv */
1786INLINE void 1976ecb_inline void
1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1977prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1788{ 1978{
1789 SV *prev_sv = SvRV (coro_current); 1979 SV *prev_sv = SvRV (coro_current);
1790 1980
1791 ta->prev = SvSTATE_hv (prev_sv); 1981 ta->prev = SvSTATE_hv (prev_sv);
… …
1804{ 1994{
1805 for (;;) 1995 for (;;)
1806 { 1996 {
1807 struct coro *next = coro_deq (aTHX); 1997 struct coro *next = coro_deq (aTHX);
1808 1998
1809 if (expect_true (next)) 1999 if (ecb_expect_true (next))
1810 { 2000 {
1811 /* cannot transfer to destroyed coros, skip and look for next */ 2001 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 2002 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 2003 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else 2004 else
1815 { 2005 {
1816 next->flags &= ~CF_READY; 2006 next->flags &= ~CF_READY;
1817 --coro_nready; 2007 --coro_nready;
… …
1825 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1826 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1827 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1828 { 2018 {
1829 if (SvRV (sv_idle) == SvRV (coro_current)) 2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
1830 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
1831 2038
1832 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1833 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1834 --coro_nready; 2041 --coro_nready;
1835 } 2042 }
… …
1850 } 2057 }
1851 } 2058 }
1852 } 2059 }
1853} 2060}
1854 2061
1855INLINE void 2062ecb_inline void
1856prepare_cede (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede (pTHX_ struct coro_transfer_args *ta)
1857{ 2064{
1858 api_ready (aTHX_ coro_current); 2065 api_ready (aTHX_ coro_current);
1859 prepare_schedule (aTHX_ ta); 2066 prepare_schedule (aTHX_ ta);
1860} 2067}
1861 2068
1862INLINE void 2069ecb_inline void
1863prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2070prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1864{ 2071{
1865 SV *prev = SvRV (coro_current); 2072 SV *prev = SvRV (coro_current);
1866 2073
1867 if (coro_nready) 2074 if (coro_nready)
… …
1897{ 2104{
1898 struct coro_transfer_args ta; 2105 struct coro_transfer_args ta;
1899 2106
1900 prepare_cede (aTHX_ &ta); 2107 prepare_cede (aTHX_ &ta);
1901 2108
1902 if (expect_true (ta.prev != ta.next)) 2109 if (ecb_expect_true (ta.prev != ta.next))
1903 { 2110 {
1904 TRANSFER (ta, 1); 2111 TRANSFER (ta, 1);
1905 return 1; 2112 return 1;
1906 } 2113 }
1907 else 2114 else
… …
1950 coro->slot->runops = RUNOPS_DEFAULT; 2157 coro->slot->runops = RUNOPS_DEFAULT;
1951 } 2158 }
1952} 2159}
1953 2160
1954static void 2161static void
2162coro_push_av (pTHX_ AV *av, I32 gimme_v)
2163{
2164 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2165 {
2166 dSP;
2167
2168 if (gimme_v == G_SCALAR)
2169 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2170 else
2171 {
2172 int i;
2173 EXTEND (SP, AvFILLp (av) + 1);
2174
2175 for (i = 0; i <= AvFILLp (av); ++i)
2176 PUSHs (AvARRAY (av)[i]);
2177 }
2178
2179 PUTBACK;
2180 }
2181}
2182
2183static void
2184coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2185{
2186 if (!coro->on_destroy)
2187 coro->on_destroy = newAV ();
2188
2189 av_push (coro->on_destroy, cb);
2190}
2191
2192static void
2193slf_destroy_join (pTHX_ struct CoroSLF *frame)
2194{
2195 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2196}
2197
2198static int
2199slf_check_join (pTHX_ struct CoroSLF *frame)
2200{
2201 struct coro *coro = (struct coro *)frame->data;
2202
2203 if (!coro->status)
2204 return 1;
2205
2206 frame->destroy = 0;
2207
2208 coro_push_av (aTHX_ coro->status, GIMME_V);
2209
2210 SvREFCNT_dec ((SV *)coro->hv);
2211
2212 return 0;
2213}
2214
2215static void
2216slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{
2218 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2219
2220 if (items > 1)
2221 croak ("join called with too many arguments");
2222
2223 if (coro->status)
2224 frame->prepare = prepare_nop;
2225 else
2226 {
2227 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2228 frame->prepare = prepare_schedule;
2229 }
2230
2231 frame->check = slf_check_join;
2232 frame->destroy = slf_destroy_join;
2233 frame->data = (void *)coro;
2234 SvREFCNT_inc (coro->hv);
2235}
2236
2237static void
1955coro_call_on_destroy (pTHX_ struct coro *coro) 2238coro_call_on_destroy (pTHX_ struct coro *coro)
1956{ 2239{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2240 AV *od = coro->on_destroy;
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959 2241
1960 if (on_destroyp) 2242 if (!od)
1961 { 2243 return;
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1963 2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2247
1964 while (AvFILLp (on_destroy) >= 0) 2248 while (AvFILLp (od) >= 0)
2249 {
2250 SV *cb = sv_2mortal (av_pop (od));
2251
2252 /* coro hv's (and only hv's at the moment) are supported as well */
2253 if (SvSTATEhv_p (aTHX_ cb))
2254 api_ready (aTHX_ cb);
2255 else
1965 { 2256 {
1966 dSP; /* don't disturb outer sp */ 2257 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy);
1968
1969 PUSHMARK (SP); 2258 PUSHMARK (SP);
1970 2259
1971 if (statusp) 2260 if (coro->status)
1972 { 2261 {
1973 int i; 2262 PUTBACK;
1974 AV *status = (AV *)SvRV (*statusp); 2263 coro_push_av (aTHX_ coro->status, G_ARRAY);
1975 EXTEND (SP, AvFILLp (status) + 1); 2264 SPAGAIN;
1976
1977 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]);
1979 } 2265 }
1980 2266
1981 PUTBACK; 2267 PUTBACK;
1982 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2268 call_sv (cb, G_VOID | G_DISCARD);
1983 } 2269 }
1984 } 2270 }
1985} 2271}
1986 2272
1987static void 2273static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2274coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1989{ 2275{
1990 int i; 2276 AV *av;
1991 HV *hv = (HV *)SvRV (coro_current); 2277
1992 AV *av = newAV (); 2278 if (coro->status)
2279 {
2280 av = coro->status;
2281 av_clear (av);
2282 }
2283 else
2284 av = coro->status = newAV ();
1993 2285
1994 /* items are actually not so common, so optimise for this case */ 2286 /* items are actually not so common, so optimise for this case */
1995 if (items) 2287 if (items)
1996 { 2288 {
2289 int i;
2290
1997 av_extend (av, items - 1); 2291 av_extend (av, items - 1);
1998 2292
1999 for (i = 0; i < items; ++i) 2293 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i])); 2294 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 } 2295 }
2296}
2002 2297
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2298static void
2004 2299slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2300{
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2301 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager); 2302 api_ready (aTHX_ sv_manager);
2007 2303
2008 frame->prepare = prepare_schedule; 2304 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat; 2305 frame->check = slf_check_repeat;
2010 2306
2011 /* as a minor optimisation, we could unwind all stacks here */ 2307 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */ 2308 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/ 2309 /*coro_unwind_stacks (aTHX);*/
2310}
2311
2312static void
2313slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2314{
2315 HV *coro_hv = (HV *)SvRV (coro_current);
2316
2317 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2318 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2319}
2320
2321static void
2322slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2323{
2324 HV *coro_hv;
2325 struct coro *coro;
2326
2327 if (items <= 0)
2328 croak ("Coro::cancel called without coro object,");
2329
2330 coro = SvSTATE (arg [0]);
2331 coro_hv = coro->hv;
2332
2333 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2334
2335 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2336 {
2337 /* coro currently busy cancelling something, so just notify it */
2338 coro->slf_frame.data = (void *)coro;
2339
2340 frame->prepare = prepare_nop;
2341 frame->check = slf_check_nop;
2342 }
2343 else if (coro_hv == (HV *)SvRV (coro_current))
2344 {
2345 /* cancelling the current coro is allowed, and equals terminate */
2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2347 }
2348 else
2349 {
2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2354
2355 /* otherwise we cancel directly, purely for speed reasons
2356 * unfortunately, this requires some magic trickery, as
2357 * somebody else could cancel us, so we have to fight the cancellation.
2358 * this is ugly, and hopefully fully worth the extra speed.
2359 * besides, I can't get the slow-but-safe version working...
2360 */
2361 slf_frame.data = 0;
2362 self->flags |= CF_NOCANCEL;
2363 coro_state_destroy (aTHX_ coro);
2364 self->flags &= ~CF_NOCANCEL;
2365
2366 if (slf_frame.data)
2367 {
2368 /* while we were busy we have been cancelled, so terminate */
2369 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2370 }
2371 else
2372 {
2373 frame->prepare = prepare_nop;
2374 frame->check = slf_check_nop;
2375 }
2376 }
2377}
2378
2379static int
2380slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2381{
2382 frame->prepare = 0;
2383 coro_unwind_stacks (aTHX);
2384
2385 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2386
2387 return 1;
2388}
2389
2390static int
2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2392{
2393 if (coro->cctx)
2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2395
2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2397 {
2398 coro_set_status (aTHX_ coro, arg, items);
2399 coro_state_destroy (aTHX_ coro);
2400 }
2401 else
2402 {
2403 if (!coro->slf_frame.prepare)
2404 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2405
2406 slf_destroy (aTHX_ coro);
2407
2408 coro_set_status (aTHX_ coro, arg, items);
2409 coro->slf_frame.prepare = prepare_nop;
2410 coro->slf_frame.check = slf_check_safe_cancel;
2411
2412 api_ready (aTHX_ (SV *)coro->hv);
2413 }
2414
2415 return 1;
2014} 2416}
2015 2417
2016/*****************************************************************************/ 2418/*****************************************************************************/
2017/* async pool handler */ 2419/* async pool handler */
2018 2420
… …
2049slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2451slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2050{ 2452{
2051 HV *hv = (HV *)SvRV (coro_current); 2453 HV *hv = (HV *)SvRV (coro_current);
2052 struct coro *coro = SvSTATE_hv ((SV *)hv); 2454 struct coro *coro = SvSTATE_hv ((SV *)hv);
2053 2455
2054 if (expect_true (coro->saved_deffh)) 2456 if (ecb_expect_true (coro->saved_deffh))
2055 { 2457 {
2056 /* subsequent iteration */ 2458 /* subsequent iteration */
2057 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2058 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
2059 2461
2060 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2061 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2062 { 2464 {
2063 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2465 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2064 coro->invoke_av = newAV (); 2466 return;
2065
2066 frame->prepare = prepare_nop;
2067 } 2467 }
2068 else 2468 else
2069 { 2469 {
2070 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2071 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2072 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
2073 coro->prio = 0; 2480 coro->prio = 0;
2074 2481
2075 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2076 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2077 2484
2078 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2079 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2080 } 2487 }
2081 } 2488 }
2082 else 2489 else
2083 { 2490 {
2084 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
… …
2097static void 2504static void
2098coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2099{ 2506{
2100 dXSARGS; 2507 dXSARGS;
2101 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2509 SV *coro = SvRV (data);
2102 2510
2511 /* data starts being either undef or a coro, and is replaced by the results when done */
2103 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (coro) != SVt_PVAV)
2104 { 2513 {
2105 /* first call, set args */ 2514 /* first call, set args */
2106 SV *coro = SvRV (data);
2107 AV *av = newAV ();
2108 2515
2109 SvRV_set (data, (SV *)av); 2516 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2517 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2110 2518
2111 /* better take a full copy of the arguments */ 2519 if (coro != &PL_sv_undef)
2112 while (items--) 2520 {
2113 av_store (av, items, newSVsv (ST (items)));
2114
2115 api_ready (aTHX_ coro); 2521 api_ready (aTHX_ coro);
2116 SvREFCNT_dec (coro); 2522 SvREFCNT_dec_NN (coro);
2523 }
2117 } 2524 }
2118 2525
2119 XSRETURN_EMPTY; 2526 XSRETURN_EMPTY;
2120} 2527}
2121 2528
2122static int 2529static int
2123slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2530slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2124{ 2531{
2125 SV *data = (SV *)frame->data; 2532 SV *data = (SV *)frame->data;
2126 2533
2127 if (CORO_THROW) 2534 if (CORO_THROW)
2128 return 0; 2535 return 0;
2129 2536
2130 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2537 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2131 return 1; 2538 return 1;
… …
2138 2545
2139 EXTEND (SP, AvFILLp (av) + 1); 2546 EXTEND (SP, AvFILLp (av) + 1);
2140 for (i = 0; i <= AvFILLp (av); ++i) 2547 for (i = 0; i <= AvFILLp (av); ++i)
2141 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2548 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2142 2549
2143 /* we have stolen the elements, so set length to zero and free */ 2550 /* we have stolen the elements, make it unreal and free */
2144 AvFILLp (av) = -1; 2551 AvREAL_off (av);
2145 av_undef (av); 2552 av_undef (av);
2146 2553
2147 PUTBACK; 2554 PUTBACK;
2148 } 2555 }
2149 2556
… …
2167 cb = sv_2mortal (coro->rouse_cb); 2574 cb = sv_2mortal (coro->rouse_cb);
2168 coro->rouse_cb = 0; 2575 coro->rouse_cb = 0;
2169 } 2576 }
2170 2577
2171 if (!SvROK (cb) 2578 if (!SvROK (cb)
2172 || SvTYPE (SvRV (cb)) != SVt_PVCV 2579 || SvTYPE (SvRV (cb)) != SVt_PVCV
2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2580 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2174 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2175 2582
2176 { 2583 {
2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2178 SV *data = (SV *)S_GENSUB_ARG; 2585 SV *data = (SV *)S_GENSUB_ARG;
2586 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2587
2588 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2589 if (!data_ready)
2590 if (SvRV (data) != &PL_sv_undef)
2591 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2592 else
2593 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2179 2594
2180 frame->data = (void *)data; 2595 frame->data = (void *)data;
2181 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2596 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2182 frame->check = slf_check_rouse_wait; 2597 frame->check = slf_check_rouse_wait;
2183 } 2598 }
2184} 2599}
2185 2600
2186static SV * 2601static SV *
2187coro_new_rouse_cb (pTHX) 2602coro_new_rouse_cb (pTHX)
2188{ 2603{
2189 HV *hv = (HV *)SvRV (coro_current); 2604 HV *hv = (HV *)SvRV (coro_current);
2190 struct coro *coro = SvSTATE_hv (hv); 2605 struct coro *coro = SvSTATE_hv (hv);
2191 SV *data = newRV_inc ((SV *)hv); 2606 SV *data = newRV_noinc (&PL_sv_undef);
2192 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2607 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2193 2608
2194 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2609 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2195 SvREFCNT_dec (data); /* magicext increases the refcount */ 2610 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2196 2611
2197 SvREFCNT_dec (coro->rouse_cb); 2612 SvREFCNT_dec (coro->rouse_cb);
2198 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2613 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2199 2614
2200 return cb; 2615 return cb;
… …
2294static void 2709static void
2295slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2710slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2296{ 2711{
2297 frame->prepare = prepare_cede_notself; 2712 frame->prepare = prepare_cede_notself;
2298 frame->check = slf_check_nop; 2713 frame->check = slf_check_nop;
2714}
2715
2716/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2717static void
2718slf_destroy (pTHX_ struct coro *coro)
2719{
2720 struct CoroSLF frame = coro->slf_frame;
2721
2722 /*
2723 * The on_destroy below most likely is from an SLF call.
2724 * Since by definition the SLF call will not finish when we destroy
2725 * the coro, we will have to force-finish it here, otherwise
2726 * cleanup functions cannot call SLF functions.
2727 */
2728 coro->slf_frame.prepare = 0;
2729
2730 /* this callback is reserved for slf functions needing to do cleanup */
2731 if (frame.destroy && frame.prepare && !PL_dirty)
2732 frame.destroy (aTHX_ &frame);
2299} 2733}
2300 2734
2301/* 2735/*
2302 * these not obviously related functions are all rolled into one 2736 * these not obviously related functions are all rolled into one
2303 * function to increase chances that they all will call transfer with the same 2737 * function to increase chances that they all will call transfer with the same
… …
2310 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2744 I32 checkmark; /* mark SP to see how many elements check has pushed */
2311 2745
2312 /* set up the slf frame, unless it has already been set-up */ 2746 /* set up the slf frame, unless it has already been set-up */
2313 /* the latter happens when a new coro has been started */ 2747 /* the latter happens when a new coro has been started */
2314 /* or when a new cctx was attached to an existing coroutine */ 2748 /* or when a new cctx was attached to an existing coroutine */
2315 if (expect_true (!slf_frame.prepare)) 2749 if (ecb_expect_true (!slf_frame.prepare))
2316 { 2750 {
2317 /* first iteration */ 2751 /* first iteration */
2318 dSP; 2752 dSP;
2319 SV **arg = PL_stack_base + TOPMARK + 1; 2753 SV **arg = PL_stack_base + TOPMARK + 1;
2320 int items = SP - arg; /* args without function object */ 2754 int items = SP - arg; /* args without function object */
… …
2361 while (slf_frame.check (aTHX_ &slf_frame)); 2795 while (slf_frame.check (aTHX_ &slf_frame));
2362 2796
2363 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2797 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2364 2798
2365 /* exception handling */ 2799 /* exception handling */
2366 if (expect_false (CORO_THROW)) 2800 if (ecb_expect_false (CORO_THROW))
2367 { 2801 {
2368 SV *exception = sv_2mortal (CORO_THROW); 2802 SV *exception = sv_2mortal (CORO_THROW);
2369 2803
2370 CORO_THROW = 0; 2804 CORO_THROW = 0;
2371 sv_setsv (ERRSV, exception); 2805 sv_setsv (ERRSV, exception);
2372 croak (0); 2806 croak (0);
2373 } 2807 }
2374 2808
2375 /* return value handling - mostly like entersub */ 2809 /* return value handling - mostly like entersub */
2376 /* make sure we put something on the stack in scalar context */ 2810 /* make sure we put something on the stack in scalar context */
2377 if (GIMME_V == G_SCALAR) 2811 if (GIMME_V == G_SCALAR
2812 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2378 { 2813 {
2379 dSP; 2814 dSP;
2380 SV **bot = PL_stack_base + checkmark; 2815 SV **bot = PL_stack_base + checkmark;
2381 2816
2382 if (sp == bot) /* too few, push undef */ 2817 if (sp == bot) /* too few, push undef */
2383 bot [1] = &PL_sv_undef; 2818 bot [1] = &PL_sv_undef;
2384 else if (sp != bot + 1) /* too many, take last one */ 2819 else /* too many, take last one */
2385 bot [1] = *sp; 2820 bot [1] = *sp;
2386 2821
2387 SP = bot + 1; 2822 SP = bot + 1;
2388 2823
2389 PUTBACK; 2824 PUTBACK;
… …
2487{ 2922{
2488 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2923 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2489 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2924 on_enterleave_call (aTHX_ sv_2mortal (cb));
2490} 2925}
2491 2926
2927static void
2928enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2929{
2930 if (!hook)
2931 return;
2932
2933 if (!*avp)
2934 {
2935 *avp = newAV ();
2936 AvREAL_off (*avp);
2937 }
2938
2939 av_push (*avp, (SV *)hook);
2940 av_push (*avp, (SV *)arg);
2941}
2942
2943static void
2944enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2945{
2946 AV *av = *avp;
2947 int i;
2948
2949 if (!av)
2950 return;
2951
2952 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2953 if (AvARRAY (av)[i] == (SV *)hook)
2954 {
2955 if (execute)
2956 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2957
2958 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2959 av_pop (av);
2960 av_pop (av);
2961 break;
2962 }
2963
2964 if (AvFILLp (av) >= 0)
2965 {
2966 *avp = 0;
2967 SvREFCNT_dec_NN (av);
2968 }
2969}
2970
2971static void
2972api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 struct coro *coro = SvSTATE (coro_sv);
2975
2976 if (SvSTATE_current == coro)
2977 if (enter)
2978 enter (aTHX_ enter_arg);
2979
2980 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2982}
2983
2984static void
2985api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2986{
2987 struct coro *coro = SvSTATE (coro_sv);
2988
2989 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2991}
2992
2993static void
2994savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2995{
2996 struct coro *coro = SvSTATE_current;
2997
2998 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2999}
3000
3001static void
3002savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3003{
3004 struct coro *coro = SvSTATE_current;
3005
3006 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3007}
3008
3009static void
3010api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3011{
3012 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3013
3014 /* this ought to be much cheaper than malloc + a single destructor call */
3015 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3016 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3017}
3018
2492/*****************************************************************************/ 3019/*****************************************************************************/
2493/* PerlIO::cede */ 3020/* PerlIO::cede */
2494 3021
2495typedef struct 3022typedef struct
2496{ 3023{
2497 PerlIOBuf base; 3024 PerlIOBuf base;
2498 NV next, every; 3025 NV next, every;
2499} PerlIOCede; 3026} PerlIOCede;
2500 3027
2501static IV 3028static IV ecb_cold
2502PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3029PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2503{ 3030{
2504 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3031 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2505 3032
2506 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3033 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2507 self->next = nvtime () + self->every; 3034 self->next = nvtime () + self->every;
2508 3035
2509 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3036 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2510} 3037}
2511 3038
2512static SV * 3039static SV * ecb_cold
2513PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3040PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2514{ 3041{
2515 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3042 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2516 3043
2517 return newSVnv (self->every); 3044 return newSVnv (self->every);
… …
2624 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3151 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2625 PUTBACK; 3152 PUTBACK;
2626 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3153 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2627 } 3154 }
2628 3155
2629 SvREFCNT_dec (cb); 3156 SvREFCNT_dec_NN (cb);
2630 } 3157 }
2631} 3158}
2632 3159
2633static void 3160static void
2634coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3161coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2635{ 3162{
2636 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3163 /* call $sem->adjust (0) to possibly wake up some other waiters */
2637 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3164 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2638} 3165}
2639 3166
2640static int 3167static int
2641slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3168slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2642{ 3169{
2643 AV *av = (AV *)frame->data; 3170 AV *av = (AV *)frame->data;
2644 SV *count_sv = AvARRAY (av)[0]; 3171 SV *count_sv = AvARRAY (av)[0];
3172 SV *coro_hv = SvRV (coro_current);
3173
3174 frame->destroy = 0;
2645 3175
2646 /* if we are about to throw, don't actually acquire the lock, just throw */ 3176 /* if we are about to throw, don't actually acquire the lock, just throw */
2647 if (CORO_THROW) 3177 if (ecb_expect_false (CORO_THROW))
3178 {
3179 /* we still might be responsible for the semaphore, so wake up others */
3180 coro_semaphore_adjust (aTHX_ av, 0);
3181
2648 return 0; 3182 return 0;
3183 }
2649 else if (SvIVX (count_sv) > 0) 3184 else if (SvIVX (count_sv) > 0)
2650 { 3185 {
2651 SvSTATE_current->on_destroy = 0;
2652
2653 if (acquire) 3186 if (acquire)
2654 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3187 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2655 else 3188 else
2656 coro_semaphore_adjust (aTHX_ av, 0); 3189 coro_semaphore_adjust (aTHX_ av, 0);
2657 3190
… …
2661 { 3194 {
2662 int i; 3195 int i;
2663 /* if we were woken up but can't down, we look through the whole */ 3196 /* if we were woken up but can't down, we look through the whole */
2664 /* waiters list and only add us if we aren't in there already */ 3197 /* waiters list and only add us if we aren't in there already */
2665 /* this avoids some degenerate memory usage cases */ 3198 /* this avoids some degenerate memory usage cases */
2666 3199 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2667 for (i = 1; i <= AvFILLp (av); ++i)
2668 if (AvARRAY (av)[i] == SvRV (coro_current)) 3200 if (AvARRAY (av)[i] == coro_hv)
2669 return 1; 3201 return 1;
2670 3202
2671 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3203 av_push (av, SvREFCNT_inc (coro_hv));
2672 return 1; 3204 return 1;
2673 } 3205 }
2674} 3206}
2675 3207
2676static int 3208static int
… …
2699 { 3231 {
2700 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3232 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2701 3233
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3234 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2703 frame->prepare = prepare_schedule; 3235 frame->prepare = prepare_schedule;
2704
2705 /* to avoid race conditions when a woken-up coro gets terminated */ 3236 /* to avoid race conditions when a woken-up coro gets terminated */
2706 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3237 /* we arrange for a temporary on_destroy that calls adjust (0) */
2707 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3238 frame->destroy = coro_semaphore_destroy;
2708 } 3239 }
2709} 3240}
2710 3241
2711static void 3242static void
2712slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3243slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2770 { 3301 {
2771 api_ready (aTHX_ cb); 3302 api_ready (aTHX_ cb);
2772 sv_setiv (cb, 0); /* signal waiter */ 3303 sv_setiv (cb, 0); /* signal waiter */
2773 } 3304 }
2774 3305
2775 SvREFCNT_dec (cb); 3306 SvREFCNT_dec_NN (cb);
2776 3307
2777 --count; 3308 --count;
2778 } 3309 }
2779} 3310}
2780 3311
… …
2794 { 3325 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]); 3326 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3327 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797 3328
2798 if (SvIVX (AvARRAY (av)[0])) 3329 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3330 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2800 3331
2801 frame->prepare = prepare_nop; 3332 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop; 3333 frame->check = slf_check_nop;
2803 } 3334 }
2804 else if (SvIVX (AvARRAY (av)[0])) 3335 else if (SvIVX (AvARRAY (av)[0]))
… …
2865 } 3396 }
2866 3397
2867 av_push (state, data_sv); 3398 av_push (state, data_sv);
2868 3399
2869 api_ready (aTHX_ coro); 3400 api_ready (aTHX_ coro);
2870 SvREFCNT_dec (coro); 3401 SvREFCNT_dec_NN (coro);
2871 SvREFCNT_dec ((AV *)state); 3402 SvREFCNT_dec_NN ((AV *)state);
2872} 3403}
2873 3404
2874static int 3405static int
2875slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3406slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2876{ 3407{
… …
2881 /* it quickly returns */ 3412 /* it quickly returns */
2882 if (CORO_THROW) 3413 if (CORO_THROW)
2883 return 0; 3414 return 0;
2884 3415
2885 /* one element that is an RV? repeat! */ 3416 /* one element that is an RV? repeat! */
2886 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3417 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2887 return 1; 3418 return 1;
2888 3419
2889 /* restore status */ 3420 /* restore status */
2890 { 3421 {
2891 SV *data_sv = av_pop (state); 3422 SV *data_sv = av_pop (state);
… …
2894 errno = data->errorno; 3425 errno = data->errorno;
2895 PL_laststype = data->laststype; 3426 PL_laststype = data->laststype;
2896 PL_laststatval = data->laststatval; 3427 PL_laststatval = data->laststatval;
2897 PL_statcache = data->statcache; 3428 PL_statcache = data->statcache;
2898 3429
2899 SvREFCNT_dec (data_sv); 3430 SvREFCNT_dec_NN (data_sv);
2900 } 3431 }
2901 3432
2902 /* push result values */ 3433 /* push result values */
2903 { 3434 {
2904 dSP; 3435 dSP;
… …
2930 dSP; 3461 dSP;
2931 3462
2932 static SV *prio_cv; 3463 static SV *prio_cv;
2933 static SV *prio_sv; 3464 static SV *prio_sv;
2934 3465
2935 if (expect_false (!prio_cv)) 3466 if (ecb_expect_false (!prio_cv))
2936 { 3467 {
2937 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3468 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2938 prio_sv = newSViv (0); 3469 prio_sv = newSViv (0);
2939 } 3470 }
2940 3471
… …
3046 } 3577 }
3047 3578
3048 return coro_sv; 3579 return coro_sv;
3049} 3580}
3050 3581
3582#ifndef __cplusplus
3583ecb_cold XS(boot_Coro__State);
3584#endif
3585
3586#if CORO_JIT
3587
3588static void ecb_noinline ecb_cold
3589pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3590{
3591 dSP;
3592 AV *av = newAV ();
3593
3594 av_store (av, 3, newSVuv (d));
3595 av_store (av, 2, newSVuv (c));
3596 av_store (av, 1, newSVuv (b));
3597 av_store (av, 0, newSVuv (a));
3598
3599 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3600
3601 PUTBACK;
3602}
3603
3604static void ecb_noinline ecb_cold
3605jit_init (pTHX)
3606{
3607 dSP;
3608 SV *load, *save;
3609 char *map_base;
3610 char *load_ptr, *save_ptr;
3611 STRLEN load_len, save_len, map_len;
3612 int count;
3613
3614 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3615
3616 PUSHMARK (SP);
3617 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3618 #include "state.h"
3619 count = call_pv ("Coro::State::_jit", G_ARRAY);
3620 SPAGAIN;
3621
3622 save = POPs; save_ptr = SvPVbyte (save, save_len);
3623 load = POPs; load_ptr = SvPVbyte (load, load_len);
3624
3625 map_len = load_len + save_len + 16;
3626
3627 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3628
3629 if (map_base == (char *)MAP_FAILED)
3630 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3631
3632 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3633
3634 load_perl_slots = (load_save_perl_slots_type)map_base;
3635 memcpy (map_base, load_ptr, load_len);
3636
3637 map_base += (load_len + 15) & ~15;
3638
3639 save_perl_slots = (load_save_perl_slots_type)map_base;
3640 memcpy (map_base, save_ptr, save_len);
3641
3642 /* we are good citizens and try to make the page read-only, so the evil evil */
3643 /* hackers might have it a bit more difficult */
3644 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3645
3646 PUTBACK;
3647 eval_pv ("undef &Coro::State::_jit", 1);
3648}
3649
3650#endif
3651
3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3652MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3052 3653
3053PROTOTYPES: DISABLE 3654PROTOTYPES: DISABLE
3054 3655
3055BOOT: 3656BOOT:
3056{ 3657{
3658#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3659#include "state.h"
3057#ifdef USE_ITHREADS 3660#ifdef USE_ITHREADS
3058# if CORO_PTHREAD 3661# if CORO_PTHREAD
3059 coro_thx = PERL_GET_CONTEXT; 3662 coro_thx = PERL_GET_CONTEXT;
3060# endif 3663# endif
3061#endif 3664#endif
3062 BOOT_PAGESIZE; 3665 /* perl defines these to check for existance first, but why it doesn't */
3666 /* just create them one at init time is not clear to me, except for */
3667 /* programs trying to delete them, but... */
3668 /* anyway, we declare this as invalid and make sure they are initialised here */
3669 DEFSV;
3670 ERRSV;
3063 3671
3064 cctx_current = cctx_new_empty (); 3672 cctx_current = cctx_new_empty ();
3065 3673
3066 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3674 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3067 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3675 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3068 3676
3069 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3677 {
3070 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3678 /*
3071 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3679 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3680 * by coro_sig_vtbl in hash values.
3681 */
3682 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3683
3684 /* this only works if perl doesn't have a vtbl for %SIG */
3685 assert (!mg->mg_virtual);
3686
3687 /*
3688 * The irony is that the perl API itself asserts that mg_virtual
3689 * must be non-const, yet perl5porters insisted on marking their
3690 * vtbls as read-only, just to thwart perl modules from patching
3691 * them.
3692 */
3693 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3694 mg->mg_flags |= MGf_COPY;
3695
3696 coro_sigelem_vtbl = PL_vtbl_sigelem;
3697 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3698 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3699 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3700 }
3072 3701
3073 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3074 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3702 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3075 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3703 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3076 3704
3077 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3705 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3706
3707 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3078 3708
3079 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3080 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3081 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3082 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3107 coroapi.prepare_nop = prepare_nop; 3737 coroapi.prepare_nop = prepare_nop;
3108 coroapi.prepare_schedule = prepare_schedule; 3738 coroapi.prepare_schedule = prepare_schedule;
3109 coroapi.prepare_cede = prepare_cede; 3739 coroapi.prepare_cede = prepare_cede;
3110 coroapi.prepare_cede_notself = prepare_cede_notself; 3740 coroapi.prepare_cede_notself = prepare_cede_notself;
3111 3741
3112 { 3742 time_init (aTHX);
3113 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3114
3115 if (!svp) croak ("Time::HiRes is required");
3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3117
3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3122 }
3123 3743
3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3744 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3745#if CORO_JIT
3746 PUTBACK;
3747 jit_init (aTHX);
3748 SPAGAIN;
3749#endif
3125} 3750}
3126 3751
3127SV * 3752SV *
3128new (SV *klass, ...) 3753new (SV *klass, ...)
3129 ALIAS: 3754 ALIAS:
… …
3136void 3761void
3137transfer (...) 3762transfer (...)
3138 PROTOTYPE: $$ 3763 PROTOTYPE: $$
3139 CODE: 3764 CODE:
3140 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3765 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3141
3142bool
3143_destroy (SV *coro_sv)
3144 CODE:
3145 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3146 OUTPUT:
3147 RETVAL
3148
3149void
3150_exit (int code)
3151 PROTOTYPE: $
3152 CODE:
3153 _exit (code);
3154 3766
3155SV * 3767SV *
3156clone (Coro::State coro) 3768clone (Coro::State coro)
3157 CODE: 3769 CODE:
3158{ 3770{
… …
3213void 3825void
3214list () 3826list ()
3215 PROTOTYPE: 3827 PROTOTYPE:
3216 PPCODE: 3828 PPCODE:
3217{ 3829{
3218 struct coro *coro; 3830 struct coro *coro;
3219 for (coro = coro_first; coro; coro = coro->next) 3831 for (coro = coro_first; coro; coro = coro->next)
3220 if (coro->hv) 3832 if (coro->hv)
3221 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3833 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3222} 3834}
3223 3835
… …
3225call (Coro::State coro, SV *coderef) 3837call (Coro::State coro, SV *coderef)
3226 ALIAS: 3838 ALIAS:
3227 eval = 1 3839 eval = 1
3228 CODE: 3840 CODE:
3229{ 3841{
3842 struct coro *current = SvSTATE_current;
3843
3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3844 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3231 { 3845 {
3232 struct coro *current = SvSTATE_current; 3846 struct CoroSLF slf_save;
3233 3847
3234 if (current != coro) 3848 if (current != coro)
3235 { 3849 {
3236 PUTBACK; 3850 PUTBACK;
3237 save_perl (aTHX_ current); 3851 save_perl (aTHX_ current);
3238 load_perl (aTHX_ coro); 3852 load_perl (aTHX_ coro);
3853 /* the coro is most likely in an active SLF call.
3854 * while not strictly required (the code we execute is
3855 * not allowed to call any SLF functions), it's cleaner
3856 * to reinitialise the slf_frame and restore it later.
3857 * This might one day allow us to actually do SLF calls
3858 * from code executed here.
3859 */
3860 slf_save = slf_frame;
3861 slf_frame.prepare = 0;
3239 SPAGAIN; 3862 SPAGAIN;
3240 } 3863 }
3241 3864
3242 PUSHSTACK; 3865 PUSHSTACK;
3243 3866
… …
3253 SPAGAIN; 3876 SPAGAIN;
3254 3877
3255 if (current != coro) 3878 if (current != coro)
3256 { 3879 {
3257 PUTBACK; 3880 PUTBACK;
3881 slf_frame = slf_save;
3258 save_perl (aTHX_ coro); 3882 save_perl (aTHX_ coro);
3259 load_perl (aTHX_ current); 3883 load_perl (aTHX_ current);
3260 SPAGAIN; 3884 SPAGAIN;
3261 } 3885 }
3262 } 3886 }
… …
3267 PROTOTYPE: $ 3891 PROTOTYPE: $
3268 ALIAS: 3892 ALIAS:
3269 is_ready = CF_READY 3893 is_ready = CF_READY
3270 is_running = CF_RUNNING 3894 is_running = CF_RUNNING
3271 is_new = CF_NEW 3895 is_new = CF_NEW
3272 is_destroyed = CF_DESTROYED 3896 is_destroyed = CF_ZOMBIE
3897 is_zombie = CF_ZOMBIE
3273 is_suspended = CF_SUSPENDED 3898 is_suspended = CF_SUSPENDED
3274 CODE: 3899 CODE:
3275 RETVAL = boolSV (coro->flags & ix); 3900 RETVAL = boolSV (coro->flags & ix);
3276 OUTPUT: 3901 OUTPUT:
3277 RETVAL 3902 RETVAL
3278 3903
3279void 3904void
3280throw (Coro::State self, SV *exception = &PL_sv_undef) 3905throw (SV *self, SV *exception = &PL_sv_undef)
3281 PROTOTYPE: $;$ 3906 PROTOTYPE: $;$
3282 CODE: 3907 CODE:
3283{ 3908{
3909 struct coro *coro = SvSTATE (self);
3284 struct coro *current = SvSTATE_current; 3910 struct coro *current = SvSTATE_current;
3285 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3911 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3286 SvREFCNT_dec (*exceptionp); 3912 SvREFCNT_dec (*exceptionp);
3287 SvGETMAGIC (exception); 3913 SvGETMAGIC (exception);
3288 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3914 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3915
3916 api_ready (aTHX_ self);
3289} 3917}
3290 3918
3291void 3919void
3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3920api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3293 PROTOTYPE: $;$ 3921 PROTOTYPE: $;$
… …
3348 3976
3349void 3977void
3350cancel (Coro::State self) 3978cancel (Coro::State self)
3351 CODE: 3979 CODE:
3352 coro_state_destroy (aTHX_ self); 3980 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355 3981
3356SV * 3982SV *
3357enable_times (int enabled = enable_times) 3983enable_times (int enabled = enable_times)
3358 CODE: 3984 CODE:
3359{ 3985{
… …
3372 3998
3373void 3999void
3374times (Coro::State self) 4000times (Coro::State self)
3375 PPCODE: 4001 PPCODE:
3376{ 4002{
3377 struct coro *current = SvSTATE (coro_current); 4003 struct coro *current = SvSTATE (coro_current);
3378 4004
3379 if (expect_false (current == self)) 4005 if (ecb_expect_false (current == self))
3380 { 4006 {
3381 coro_times_update (); 4007 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current)); 4008 coro_times_add (SvSTATE (coro_current));
3383 } 4009 }
3384 4010
3385 EXTEND (SP, 2); 4011 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 4012 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 4013 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388 4014
3389 if (expect_false (current == self)) 4015 if (ecb_expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current)); 4016 coro_times_sub (SvSTATE (coro_current));
3391} 4017}
3392 4018
3393void 4019void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4020swap_sv (Coro::State coro, SV *sva, SV *svb)
3395 CODE: 4021 CODE:
3396{ 4022{
3397 struct coro *current = SvSTATE_current; 4023 struct coro *current = SvSTATE_current;
4024 AV *swap_sv;
4025 int i;
4026
4027 sva = SvRV (sva);
4028 svb = SvRV (svb);
3398 4029
3399 if (current == coro) 4030 if (current == coro)
3400 SWAP_SVS (current); 4031 SWAP_SVS_LEAVE (current);
3401 4032
3402 if (!coro->swap_sv) 4033 if (!coro->swap_sv)
3403 coro->swap_sv = newAV (); 4034 coro->swap_sv = newAV ();
3404 4035
4036 swap_sv = coro->swap_sv;
4037
4038 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4039 {
4040 SV *a = AvARRAY (swap_sv)[i ];
4041 SV *b = AvARRAY (swap_sv)[i + 1];
4042
4043 if (a == sva && b == svb)
4044 {
4045 SvREFCNT_dec_NN (a);
4046 SvREFCNT_dec_NN (b);
4047
4048 for (; i <= AvFILLp (swap_sv) - 2; i++)
4049 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4050
4051 AvFILLp (swap_sv) -= 2;
4052
4053 goto removed;
4054 }
4055 }
4056
3405 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4057 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3406 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4059
4060 removed:
3407 4061
3408 if (current == coro) 4062 if (current == coro)
3409 SWAP_SVS (current); 4063 SWAP_SVS_ENTER (current);
3410} 4064}
3411 4065
3412 4066
3413MODULE = Coro::State PACKAGE = Coro 4067MODULE = Coro::State PACKAGE = Coro
3414 4068
3415BOOT: 4069BOOT:
3416{ 4070{
4071 if (SVt_LAST > 32)
4072 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4073
3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4074 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4075 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4076 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4077 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4078 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4079 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4080 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4081 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3426 4082
3427 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4083 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4084 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3429 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4085 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3430 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4086 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3431 4087
3432 coro_stash = gv_stashpv ("Coro", TRUE); 4088 coro_stash = gv_stashpv ("Coro", TRUE);
3433 4089
3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4090 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4091 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4092 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3448 coroapi.ready = api_ready; 4104 coroapi.ready = api_ready;
3449 coroapi.is_ready = api_is_ready; 4105 coroapi.is_ready = api_is_ready;
3450 coroapi.nready = coro_nready; 4106 coroapi.nready = coro_nready;
3451 coroapi.current = coro_current; 4107 coroapi.current = coro_current;
3452 4108
4109 coroapi.enterleave_hook = api_enterleave_hook;
4110 coroapi.enterleave_unhook = api_enterleave_unhook;
4111 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4112
3453 /*GCoroAPI = &coroapi;*/ 4113 /*GCoroAPI = &coroapi;*/
3454 sv_setiv (sv, (IV)&coroapi); 4114 sv_setiv (sv, PTR2IV (&coroapi));
3455 SvREADONLY_on (sv); 4115 SvREADONLY_on (sv);
3456 } 4116 }
3457} 4117}
3458 4118
3459SV * 4119SV *
… …
3464 api_ready (aTHX_ RETVAL); 4124 api_ready (aTHX_ RETVAL);
3465 OUTPUT: 4125 OUTPUT:
3466 RETVAL 4126 RETVAL
3467 4127
3468void 4128void
4129_destroy (Coro::State coro)
4130 CODE:
4131 /* used by the manager thread */
4132 coro_state_destroy (aTHX_ coro);
4133
4134void
4135on_destroy (Coro::State coro, SV *cb)
4136 CODE:
4137 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4138
4139void
4140join (...)
4141 CODE:
4142 CORO_EXECUTE_SLF_XS (slf_init_join);
4143
4144void
3469terminate (...) 4145terminate (...)
3470 CODE: 4146 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4147 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4148
4149void
4150cancel (...)
4151 CODE:
4152 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4153
4154int
4155safe_cancel (Coro::State self, ...)
4156 C_ARGS: aTHX_ self, &ST (1), items - 1
3472 4157
3473void 4158void
3474schedule (...) 4159schedule (...)
3475 CODE: 4160 CODE:
3476 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4161 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3497 4182
3498void 4183void
3499_set_current (SV *current) 4184_set_current (SV *current)
3500 PROTOTYPE: $ 4185 PROTOTYPE: $
3501 CODE: 4186 CODE:
3502 SvREFCNT_dec (SvRV (coro_current)); 4187 SvREFCNT_dec_NN (SvRV (coro_current));
3503 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4188 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3504 4189
3505void 4190void
3506_set_readyhook (SV *hook) 4191_set_readyhook (SV *hook)
3507 PROTOTYPE: $ 4192 PROTOTYPE: $
… …
3591 4276
3592 if ((SV *)hv == &PL_sv_undef) 4277 if ((SV *)hv == &PL_sv_undef)
3593 { 4278 {
3594 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4279 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3595 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4280 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3596 SvREFCNT_dec (sv); 4281 SvREFCNT_dec_NN (sv);
3597 } 4282 }
3598 4283
3599 { 4284 {
3600 struct coro *coro = SvSTATE_hv (hv); 4285 struct coro *coro = SvSTATE_hv (hv);
3601 4286
… …
3608 api_ready (aTHX_ (SV *)hv); 4293 api_ready (aTHX_ (SV *)hv);
3609 4294
3610 if (GIMME_V != G_VOID) 4295 if (GIMME_V != G_VOID)
3611 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4296 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3612 else 4297 else
3613 SvREFCNT_dec (hv); 4298 SvREFCNT_dec_NN (hv);
3614} 4299}
3615 4300
3616SV * 4301SV *
3617rouse_cb () 4302rouse_cb ()
3618 PROTOTYPE: 4303 PROTOTYPE:
… …
3633 on_leave = 1 4318 on_leave = 1
3634 PROTOTYPE: & 4319 PROTOTYPE: &
3635 CODE: 4320 CODE:
3636{ 4321{
3637 struct coro *coro = SvSTATE_current; 4322 struct coro *coro = SvSTATE_current;
3638 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4323 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3639 4324
3640 block = s_get_cv_croak (block); 4325 block = s_get_cv_croak (block);
3641 4326
3642 if (!*avp) 4327 if (!*avp)
3643 *avp = newAV (); 4328 *avp = newAV ();
… …
3663 4348
3664SV * 4349SV *
3665new (SV *klass, SV *count = 0) 4350new (SV *klass, SV *count = 0)
3666 CODE: 4351 CODE:
3667{ 4352{
3668 int semcnt = 1; 4353 int semcnt = 1;
3669 4354
3670 if (count) 4355 if (count)
3671 { 4356 {
3672 SvGETMAGIC (count); 4357 SvGETMAGIC (count);
3673 4358
… …
3697 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4382 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3698 OUTPUT: 4383 OUTPUT:
3699 RETVAL 4384 RETVAL
3700 4385
3701void 4386void
3702up (SV *self, int adjust = 1) 4387up (SV *self)
3703 ALIAS:
3704 adjust = 1
3705 CODE: 4388 CODE:
4389 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4390
4391void
4392adjust (SV *self, int adjust)
4393 CODE:
3706 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4394 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3707 4395
3708void 4396void
3709down (...) 4397down (...)
3710 CODE: 4398 CODE:
3711 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4399 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3733 XSRETURN_NO; 4421 XSRETURN_NO;
3734} 4422}
3735 4423
3736void 4424void
3737waiters (SV *self) 4425waiters (SV *self)
3738 PPCODE: 4426 PPCODE:
3739{ 4427{
3740 AV *av = (AV *)SvRV (self); 4428 AV *av = (AV *)SvRV (self);
3741 int wcount = AvFILLp (av) + 1 - 1; 4429 int wcount = AvFILLp (av) + 1 - 1;
3742 4430
3743 if (GIMME_V == G_SCALAR) 4431 if (GIMME_V == G_SCALAR)
… …
3752} 4440}
3753 4441
3754MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4442MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3755 4443
3756void 4444void
3757_may_delete (SV *sem, int count, int extra_refs) 4445_may_delete (SV *sem, int count, unsigned int extra_refs)
3758 PPCODE: 4446 PPCODE:
3759{ 4447{
3760 AV *av = (AV *)SvRV (sem); 4448 AV *av = (AV *)SvRV (sem);
3761 4449
3762 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4450 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3763 && AvFILLp (av) == 0 /* no waiters, just count */ 4451 && AvFILLp (av) == 0 /* no waiters, just count */
3764 && SvIV (AvARRAY (av)[0]) == count) 4452 && SvIV (AvARRAY (av)[0]) == count)
3765 XSRETURN_YES; 4453 XSRETURN_YES;
… …
3786 4474
3787void 4475void
3788broadcast (SV *self) 4476broadcast (SV *self)
3789 CODE: 4477 CODE:
3790{ 4478{
3791 AV *av = (AV *)SvRV (self); 4479 AV *av = (AV *)SvRV (self);
3792 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4480 coro_signal_wake (aTHX_ av, AvFILLp (av));
3793} 4481}
3794 4482
3795void 4483void
3796send (SV *self) 4484send (SV *self)
… …
3804 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4492 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3805} 4493}
3806 4494
3807IV 4495IV
3808awaited (SV *self) 4496awaited (SV *self)
3809 CODE: 4497 CODE:
3810 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4498 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3811 OUTPUT: 4499 OUTPUT:
3812 RETVAL 4500 RETVAL
3813 4501
3814 4502
… …
3819 4507
3820void 4508void
3821_schedule (...) 4509_schedule (...)
3822 CODE: 4510 CODE:
3823{ 4511{
3824 static int incede; 4512 static int incede;
3825 4513
3826 api_cede_notself (aTHX); 4514 api_cede_notself (aTHX);
3827 4515
3828 ++incede; 4516 ++incede;
3829 while (coro_nready >= incede && api_cede (aTHX)) 4517 while (coro_nready >= incede && api_cede (aTHX))
… …
3873 { 4561 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4562 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0; 4563 coro_old_pp_sselect = 0;
3876 } 4564 }
3877 4565
4566MODULE = Coro::State PACKAGE = Coro::Util
3878 4567
4568void
4569_exit (int code)
4570 CODE:
4571 _exit (code);
4572
4573NV
4574time ()
4575 CODE:
4576 RETVAL = nvtime (aTHX);
4577 OUTPUT:
4578 RETVAL
4579
4580NV
4581gettimeofday ()
4582 PPCODE:
4583{
4584 UV tv [2];
4585 u2time (aTHX_ tv);
4586 EXTEND (SP, 2);
4587 PUSHs (sv_2mortal (newSVuv (tv [0])));
4588 PUSHs (sv_2mortal (newSVuv (tv [1])));
4589}
4590

Diff Legend

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