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.381 by root, Sat Oct 23 09:28:50 2010 UTC vs.
Revision 1.480 by root, Fri Jun 25 01:13:21 2021 UTC

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

Diff Legend

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