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.351 by root, Sat Jun 20 08:58:25 2009 UTC vs.
Revision 1.474 by root, Tue Aug 14 15:46:03 2018 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#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
2 27
3#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 29#define PERL_EXT
5 30
6#include "EXTERN.h" 31#include "EXTERN.h"
7#include "perl.h" 32#include "perl.h"
8#include "XSUB.h" 33#include "XSUB.h"
9#include "perliol.h" 34#include "perliol.h"
10 35
11#include "patchlevel.h" 36#include "schmorp.h"
12 37
38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
40#include "ecb.h"
41
42#include <stddef.h>
13#include <stdio.h> 43#include <stdio.h>
14#include <errno.h> 44#include <errno.h>
15#include <assert.h> 45#include <assert.h>
16 46
17#ifdef WIN32 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
55#ifndef SVs_PADSTALE
56# define SVs_PADSTALE 0
57#endif
58
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
18# undef setjmp 90# undef setjmp
19# undef longjmp 91# undef longjmp
20# undef _exit 92# undef _exit
21# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
22#else 94#else
23# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
24#endif 96#endif
25 97
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 98/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
55 100
56#define PERL_VERSION_ATLEAST(a,b,c) \ 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 102# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 103#endif
122 104
123/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 117# define STACKLEVEL ((void *)&stacklevel)
136#endif 118#endif
137 119
138#define IN_DESTRUCT PL_dirty 120#define IN_DESTRUCT PL_dirty
139 121
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 122#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 123#define GCoroAPI (&coroapi) /* very sneaky */
157 124
158#ifdef USE_ITHREADS 125#ifdef USE_ITHREADS
159# if CORO_PTHREAD 126# if CORO_PTHREAD
160static void *coro_thx; 127static void *coro_thx;
161# endif 128# endif
162#endif 129#endif
163 130
131#ifdef __linux
132# include <time.h> /* for timespec */
133# include <syscall.h> /* for SYS_* */
134# ifdef SYS_clock_gettime
135# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
136# define CORO_CLOCK_MONOTONIC 1
137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
138# endif
139#endif
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
164static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
160static void (*u2time)(pTHX_ UV ret[2]);
165 161
166/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 164static OP *pp_slf (pTHX);
165static void slf_destroy (pTHX_ struct coro *coro);
169 166
170static U32 cctx_gen; 167static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
… …
181 178
182static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
183static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
184static SV *rv_diehook; 181static SV *rv_diehook;
185static SV *rv_warnhook; 182static SV *rv_warnhook;
186static HV *hv_sig; /* %SIG */
187 183
188/* async_pool helper stuff */ 184/* async_pool helper stuff */
189static SV *sv_pool_rss; 185static SV *sv_pool_rss;
190static SV *sv_pool_size; 186static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 188static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 189static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 190static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 191
197/* Coro::AnyEvent */ 192/* Coro::AnyEvent */
198static SV *sv_activity; 193static SV *sv_activity;
199 194
195/* enable processtime/realtime profiling */
196static char enable_times;
197typedef U32 coro_ts[2];
198static coro_ts time_real, time_cpu;
199static char times_valid;
200
200static struct coro_cctx *cctx_first; 201static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 202static int cctx_count, cctx_idle;
202 203
203enum { 204enum
205{
204 CC_MAPPED = 0x01, 206 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 207 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 208 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 209 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 215typedef struct coro_cctx
214{ 216{
215 struct coro_cctx *next; 217 struct coro_cctx *next;
216 218
217 /* the stack */ 219 /* the stack */
218 void *sptr; 220 struct coro_stack stack;
219 size_t ssize;
220 221
221 /* cpu state */ 222 /* cpu state */
222 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
223 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
224 JMPENV *top_env; 227 JMPENV *top_env;
225 coro_context cctx; 228 coro_context cctx;
226 229
227 U32 gen; 230 U32 gen;
228#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
229 int valgrind_id; 232 int valgrind_id;
230#endif 233#endif
231 unsigned char flags; 234 unsigned char flags;
232} coro_cctx; 235} coro_cctx;
233 236
234coro_cctx *cctx_current; /* the currently running cctx */ 237static coro_cctx *cctx_current; /* the currently running cctx */
235 238
236/*****************************************************************************/ 239/*****************************************************************************/
237 240
241static MGVTBL coro_state_vtbl;
242
238enum { 243enum
244{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 245 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 246 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 247 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 248 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 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) */
244}; 251};
245 252
246/* 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 */
247typedef struct 254typedef struct
248{ 255{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 256 #define VARx(name,expr,type) type name;
255# include "state.h" 257 #include "state.h"
256#undef VAR
257} perl_slots; 258} perl_slots;
258 259
260/* how many context stack entries do we need for perl_slots */
259#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))
260 262
261/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
262struct coro { 264struct coro
265{
263 /* the C coroutine allocated to this perl coroutine, if any */ 266 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 267 coro_cctx *cctx;
265 268
266 /* ready queue */ 269 /* ready queue */
267 struct coro *next_ready; 270 struct coro *next_ready;
… …
269 /* state data */ 272 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 273 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 274 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
273 276
274 CV *startcv; /* the CV to execute */ 277 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 278 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 279 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 280 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 281
281 /* statistics */ 282 /* statistics */
282 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
283 284
284 /* coro process data */ 285 /* coro process data */
285 int prio; 286 int prio;
286 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
287 SV *rouse_cb; 288 SV *rouse_cb; /* last rouse callback */
289 AV *on_destroy; /* callbacks or coros to notify on destroy */
290 AV *status; /* the exit status list */
288 291
289 /* async_pool */ 292 /* async_pool */
290 SV *saved_deffh; 293 SV *saved_deffh;
291 SV *invoke_cb; 294 SV *invoke_cb;
292 AV *invoke_av; 295 AV *invoke_av;
293 296
294 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
295 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
296 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
300
301 /* swap_sv */
302 AV *swap_sv;
303
304 /* times */
305 coro_ts t_cpu, t_real;
297 306
298 /* linked list */ 307 /* linked list */
299 struct coro *next, *prev; 308 struct coro *next, *prev;
300}; 309};
301 310
302typedef struct coro *Coro__State; 311typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 312typedef struct coro *Coro__State_or_hashref;
304 313
305/* the following variables are effectively part of the perl context */ 314/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 315/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 316/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 317static struct CoroSLF slf_frame; /* the current slf frame */
309 318
310/** Coro ********************************************************************/ 319/** Coro ********************************************************************/
311 320
312#define PRIO_MAX 3 321#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 322#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 323#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 324#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 325#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 326#define CORO_PRIO_MIN -4
318 327
319/* for Coro.pm */ 328/* for Coro.pm */
320static SV *coro_current; 329static SV *coro_current;
321static SV *coro_readyhook; 330static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 331static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 332static CV *cv_coro_run;
324static struct coro *coro_first; 333static struct coro *coro_first;
325#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
326 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
358
359/** Coro::Select ************************************************************/
360
361static OP *(*coro_old_pp_sselect) (pTHX);
362static SV *coro_select_select;
363
364/* horrible hack, but if it works... */
365static OP *
366coro_pp_sselect (pTHX)
367{
368 dSP;
369 PUSHMARK (SP - 4); /* fake argument list */
370 XPUSHs (coro_select_select);
371 PUTBACK;
372
373 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
374 PL_op->op_flags |= OPf_STACKED;
375 PL_op->op_private = 0;
376 return PL_ppaddr [OP_ENTERSUB](aTHX);
377}
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
327/** lowlevel stuff **********************************************************/ 431/** lowlevel stuff **********************************************************/
328 432
329static SV * 433static SV * ecb_noinline
330coro_get_sv (pTHX_ const char *name, int create) 434coro_get_sv (pTHX_ const char *name, int create)
331{ 435{
332#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_sv (name, create); 438 get_sv (name, create);
335#endif 439#endif
336 return get_sv (name, create); 440 return get_sv (name, create);
337} 441}
338 442
339static AV * 443static AV * ecb_noinline
340coro_get_av (pTHX_ const char *name, int create) 444coro_get_av (pTHX_ const char *name, int create)
341{ 445{
342#if PERL_VERSION_ATLEAST (5,10,0) 446#if PERL_VERSION_ATLEAST (5,10,0)
343 /* 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 */
344 get_av (name, create); 448 get_av (name, create);
345#endif 449#endif
346 return get_av (name, create); 450 return get_av (name, create);
347} 451}
348 452
349static HV * 453static HV * ecb_noinline
350coro_get_hv (pTHX_ const char *name, int create) 454coro_get_hv (pTHX_ const char *name, int create)
351{ 455{
352#if PERL_VERSION_ATLEAST (5,10,0) 456#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_hv (name, create); 458 get_hv (name, create);
355#endif 459#endif
356 return get_hv (name, create); 460 return get_hv (name, create);
357} 461}
358 462
359/* may croak */ 463ecb_inline void
360INLINE CV * 464coro_times_update (void)
361coro_sv_2cv (pTHX_ SV *sv)
362{ 465{
363 HV *st; 466#ifdef coro_clock_gettime
364 GV *gvp; 467 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 468
367 if (!cv) 469 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 470 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
471 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 472
370 return cv; 473 ts.tv_sec = ts.tv_nsec = 0;
474 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
475 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
476#else
477 dTHX;
478 UV tv[2];
479
480 u2time (aTHX_ tv);
481 time_real [0] = tv [0];
482 time_real [1] = tv [1] * 1000;
483#endif
484}
485
486ecb_inline void
487coro_times_add (struct coro *c)
488{
489 c->t_real [1] += time_real [1];
490 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
491 c->t_real [0] += time_real [0];
492
493 c->t_cpu [1] += time_cpu [1];
494 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
495 c->t_cpu [0] += time_cpu [0];
496}
497
498ecb_inline void
499coro_times_sub (struct coro *c)
500{
501 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
502 c->t_real [1] -= time_real [1];
503 c->t_real [0] -= time_real [0];
504
505 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
506 c->t_cpu [1] -= time_cpu [1];
507 c->t_cpu [0] -= time_cpu [0];
371} 508}
372 509
373/*****************************************************************************/ 510/*****************************************************************************/
374/* magic glue */ 511/* magic glue */
375 512
376#define CORO_MAGIC_type_cv 26 513#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext 514#define CORO_MAGIC_type_state PERL_MAGIC_ext
378 515
379#define CORO_MAGIC_NN(sv, type) \ 516#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \ 517 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \ 518 ? SvMAGIC (sv) \
382 : mg_find (sv, type)) 519 : mg_find (sv, type))
383 520
384#define CORO_MAGIC(sv, type) \ 521#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \ 522 (ecb_expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \ 523 ? CORO_MAGIC_NN (sv, type) \
387 : 0) 524 : 0)
388 525
389#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)
390#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)
391 528
392INLINE struct coro * 529ecb_inline MAGIC *
393SvSTATE_ (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
394{ 531{
395 HV *stash;
396 MAGIC *mg; 532 MAGIC *mg;
397 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
398 if (SvROK (coro)) 549 if (SvROK (coro_sv))
399 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
400 551
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
553 if (!mg)
402 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
403 555
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
414} 557}
415 558
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 559#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 560
… …
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421 564
422/*****************************************************************************/ 565/*****************************************************************************/
423/* padlist management and caching */ 566/* padlist management and caching */
424 567
425static AV * 568ecb_inline PADLIST *
426coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
427{ 570{
428 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
429 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
430 576
431 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. */
432 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
433#if PERL_VERSION_ATLEAST (5,10,0)
434 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
435#else
436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
437#endif 606#endif
438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
439 --AvFILLp (padlist);
440 607
441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
442 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;
443 616
444 return newpadlist; 617 return newpadlist;
445} 618}
446 619
447static void 620ecb_inline void
448free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
449{ 622{
450 /* may be during global destruction */ 623 /* may be during global destruction */
451 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
452 { 625 {
453 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
454 627
455 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
456 { 629 {
457 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
458 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
459 I32 j = AvFILLp (av);
460 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
461 while (j >= 0) 637 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
463 639
464 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
465 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
466 } 643 }
467 644
468 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
469 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
470 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
471 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
472 } 655 }
473} 656}
474 657
475static int 658static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 660{
478 AV *padlist; 661 PADLIST *padlist;
479 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;
480 664
481 /* casting is fun. */ 665 /* perl manages to free our internal AV and _then_ call us */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 666 if (IN_DESTRUCT)
667 return 0;
668
669 while (len--)
483 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
484
485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
486 671
487 return 0; 672 return 0;
488} 673}
489 674
490static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
491 0, 0, 0, 0, 676 0, 0, 0, 0,
492 coro_cv_free 677 coro_cv_free
493}; 678};
494 679
495/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
496static void 681ecb_inline void
497get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
498{ 683{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 685 size_t *lenp;
501 686
502 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
503 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
504 else 689 else
505 { 690 {
506#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
507 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
508 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
515#endif 700#endif
516 } 701 }
517} 702}
518 703
519static void 704ecb_inline void
520put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
521{ 706{
522 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
523 AV *av;
524 708
525 if (expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
526 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);
527 719
528 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
529
530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
531 av_extend (av, AvFILLp (av) + 1);
532
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 721}
535 722
536/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
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
767/* swap sv heads, at least logically */
768static void
769swap_svs_enter (pTHX_ Coro__State c)
770{
771 int i;
772
773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
775}
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
786#define SWAP_SVS_ENTER(coro) \
787 if (ecb_expect_false ((coro)->swap_sv)) \
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))
537 793
538static void 794static void
539on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
540 796
541static void 797static void
… …
544 perl_slots *slot = c->slot; 800 perl_slots *slot = c->slot;
545 c->slot = 0; 801 c->slot = 0;
546 802
547 PL_mainstack = c->mainstack; 803 PL_mainstack = c->mainstack;
548 804
549 GvSV (PL_defgv) = slot->defsv; 805#if CORO_JIT
550 GvAV (PL_defgv) = slot->defav; 806 load_perl_slots (slot);
551 GvSV (PL_errgv) = slot->errsv; 807#else
552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
554
555 #define VAR(name,type) PL_ ## name = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
556 # include "state.h" 809 #include "state.h"
557 #undef VAR 810#endif
558 811
559 { 812 {
560 dSP; 813 dSP;
561 814
562 CV *cv; 815 CV *cv;
563 816
564 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
565 while (expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
566 { 819 {
567 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
568 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
569 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
570 } 823 }
571 824
572 PUTBACK; 825 PUTBACK;
573 } 826 }
574 827
575 slf_frame = c->slf_frame; 828 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 829 CORO_THROW = c->except;
577 830
831 if (ecb_expect_false (enable_times))
832 {
833 if (ecb_expect_false (!times_valid))
834 coro_times_update ();
835
836 coro_times_sub (c);
837 }
838
578 if (expect_false (c->on_enter)) 839 if (ecb_expect_false (c->on_enter))
579 { 840 {
580 int i; 841 int i;
581 842
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 845 }
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
855 SWAP_SVS_ENTER (c);
585} 856}
586 857
587static void 858static void
588save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
589{ 860{
861 SWAP_SVS_LEAVE (c);
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
590 if (expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
591 { 872 {
592 int i; 873 int i;
593 874
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 875 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 876 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
877 }
878
879 times_valid = 0;
880
881 if (ecb_expect_false (enable_times))
882 {
883 coro_times_update (); times_valid = 1;
884 coro_times_add (c);
596 } 885 }
597 886
598 c->except = CORO_THROW; 887 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 888 c->slf_frame = slf_frame;
600 889
… …
611 900
612 XPUSHs (Nullsv); 901 XPUSHs (Nullsv);
613 /* this loop was inspired by pp_caller */ 902 /* this loop was inspired by pp_caller */
614 for (;;) 903 for (;;)
615 { 904 {
616 while (expect_true (cxix >= 0)) 905 while (ecb_expect_true (cxix >= 0))
617 { 906 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 907 PERL_CONTEXT *cx = &ccstk[cxix--];
619 908
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 909 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 910 {
622 CV *cv = cx->blk_sub.cv; 911 CV *cv = cx->blk_sub.cv;
623 912
624 if (expect_true (CvDEPTH (cv))) 913 if (ecb_expect_true (CvDEPTH (cv)))
625 { 914 {
626 EXTEND (SP, 3); 915 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 916 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 917 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 918 PUSHs ((SV *)cv);
… …
632 get_padlist (aTHX_ cv); 921 get_padlist (aTHX_ cv);
633 } 922 }
634 } 923 }
635 } 924 }
636 925
637 if (expect_true (top_si->si_type == PERLSI_MAIN)) 926 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
638 break; 927 break;
639 928
640 top_si = top_si->si_prev; 929 top_si = top_si->si_prev;
641 ccstk = top_si->si_cxstack; 930 ccstk = top_si->si_cxstack;
642 cxix = top_si->si_cxix; 931 cxix = top_si->si_cxix;
… …
644 933
645 PUTBACK; 934 PUTBACK;
646 } 935 }
647 936
648 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 939 {
654 int i; 940 unsigned int i;
941
655 for (i = 3; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 943 CXINC;
657 } 944
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 945 cxstack_ix -= SLOT_COUNT; /* undo allocation */
946 }
659 947
660 c->mainstack = PL_mainstack; 948 c->mainstack = PL_mainstack;
661 949
662 { 950 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 951 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
664 952
665 slot->defav = GvAV (PL_defgv); 953#if CORO_JIT
666 slot->defsv = DEFSV; 954 save_perl_slots (slot);
667 slot->errsv = ERRSV; 955#else
668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
670
671 #define VAR(name,type) slot->name = PL_ ## name; 956 #define VARx(name,expr,type) slot->name = expr;
672 # include "state.h" 957 #include "state.h"
673 #undef VAR 958#endif
674 } 959 }
675} 960}
676 961
677/* 962/*
678 * allocate various perl stacks. This is almost an exact copy 963 * allocate various perl stacks. This is almost an exact copy
… …
684# define coro_init_stacks(thx) init_stacks () 969# define coro_init_stacks(thx) init_stacks ()
685#else 970#else
686static void 971static void
687coro_init_stacks (pTHX) 972coro_init_stacks (pTHX)
688{ 973{
689 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() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 975 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 976 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 977 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 978
694 PL_stack_base = AvARRAY(PL_curstack); 979 PL_stack_base = AvARRAY(PL_curstack);
… …
709#endif 994#endif
710 995
711 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
712 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
713 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
714 1002
715 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
716 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
717 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
718 1011
719#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
720 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
721 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
722 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
746 } 1039 }
747 1040
748 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
749 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
750 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
751 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
752#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
753 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
754#endif 1050#endif
755} 1051}
… …
785 } 1081 }
786 1082
787 return rss; 1083 return rss;
788} 1084}
789 1085
790/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
791
792static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
793static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
794static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
795 1087
796/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
797#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
798#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
799 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
800 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
801#endif 1093#endif
802 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
803/* 1123/*
804 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
805 * 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
806 * 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),
807 * readback here. 1127 * we just provide our own readback here.
808 */ 1128 */
809static int 1129static int ecb_cold
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 1131{
812 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;
813 1135
814 if (*s == '_') 1136 SV *ssv;
815 {
816 SV **svp = 0;
817 1137
818 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
819 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
820
821 if (svp) 1138 if (!*svp)
822 { 1139 ssv = &PL_sv_undef;
823 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
824 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
825 } 1142 else
826 } 1143 ssv = *svp;
827 1144
828 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
829} 1147}
830 1148
831static int 1149static int ecb_cold
832coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
833{ 1151{
834 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;
835 1155
836 if (*s == '_')
837 {
838 SV **svp = 0;
839
840 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
841 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
842
843 if (svp)
844 {
845 SV *old = *svp; 1156 SV *old = *svp;
846 *svp = 0; 1157 *svp = 0;
847 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
848 return 0; 1159 return 0;
849 }
850 }
851
852 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
853} 1160}
854 1161
855static int 1162static int ecb_cold
856coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
857{ 1164{
858 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;
859 1168
860 if (*s == '_')
861 {
862 SV **svp = 0;
863
864 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
866
867 if (svp)
868 {
869 SV *old = *svp; 1169 SV *old = *svp;
870 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
871 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
872 return 0; 1172 return 0;
873 }
874 }
875
876 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
877} 1173}
878 1174
879static void 1175static void
880prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
881{ 1177{
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1190{
895 return 1; 1191 return 1;
896} 1192}
897 1193
898static UNOP coro_setup_op; 1194/** coroutine stack handling ************************************************/
899 1195
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1196static UNOP init_perl_op;
1197
1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
902{ 1200{
903 /* 1201 /*
904 * emulate part of the perl startup here. 1202 * emulate part of the perl startup here.
905 */ 1203 */
906 coro_init_stacks (aTHX); 1204 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1211 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1212 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1213 PL_curpm = 0;
916 PL_curpad = 0; 1214 PL_curpad = 0;
917 PL_localizing = 0; 1215 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1216 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1217#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1218 PL_parser = 0;
922#endif 1219#endif
923 PL_hints = 0; 1220 PL_hints = 0;
924 1221
925 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1225
929 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
932 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);
933 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
934 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
936 1236
937 { 1237 {
938 dSP; 1238 dSP;
… …
942 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
943 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
944 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
945 1245
946 PUSHMARK (SP); 1246 PUSHMARK (SP);
947 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
948 PUTBACK; 1248 PUTBACK;
949 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
950 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
951 } 1251 }
952 1252
953 /* 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
954 * 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.
955 */ 1255 */
956 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 */
957 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;
958 1259
959 /* 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 */
960 coro_setup_op.op_next = PL_op; 1261 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1262 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1263 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1264 /* no flags etc. required, as an init function won't be called */
964 1265
965 PL_op = (OP *)&coro_setup_op; 1266 PL_op = (OP *)&init_perl_op;
966 1267
967 /* copy throw, in case it was set before coro_setup */ 1268 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1270
1271 SWAP_SVS_ENTER (coro);
1272
1273 if (ecb_expect_false (enable_times))
1274 {
1275 coro_times_update ();
1276 coro_times_sub (coro);
1277 }
969} 1278}
970 1279
971static void 1280static void
972coro_unwind_stacks (pTHX) 1281coro_unwind_stacks (pTHX)
973{ 1282{
… …
988 dounwind (-1); 1297 dounwind (-1);
989 } 1298 }
990} 1299}
991 1300
992static void 1301static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1302destroy_perl (pTHX_ struct coro *coro)
994{ 1303{
995 SV *svf [9]; 1304 SV *svf [9];
996 1305
997 { 1306 {
1307 SV *old_current = SvRV (coro_current);
998 struct coro *current = SvSTATE_current; 1308 struct coro *current = SvSTATE (old_current);
999 1309
1000 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));
1001 1311
1002 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
1003 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1004 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1323
1005 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1006 1325
1007 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1008 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1009 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1010 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1011 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1012 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1014 svf [6] = (SV *)GvHV (PL_hintgv); 1333 svf [6] = (SV *)GvHV (PL_hintgv);
1015 svf [7] = PL_diehook; 1334 svf [7] = PL_diehook;
1016 svf [8] = PL_warnhook; 1335 svf [8] = PL_warnhook;
1017 assert (9 == sizeof (svf) / sizeof (*svf)); 1336 assert (9 == sizeof (svf) / sizeof (*svf));
1018 1337
1338 SvRV_set (coro_current, old_current);
1339
1019 load_perl (aTHX_ current); 1340 load_perl (aTHX_ current);
1020 } 1341 }
1021 1342
1022 { 1343 {
1023 int i; 1344 unsigned int i;
1024 1345
1025 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1346 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1026 SvREFCNT_dec (svf [i]); 1347 SvREFCNT_dec (svf [i]);
1027 1348
1028 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1029 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1030 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1031 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);
1032 } 1355 }
1033} 1356}
1034 1357
1035INLINE void 1358ecb_inline void
1036free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1037{ 1360{
1038 if (expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1039 { 1362 {
1040 SvREFCNT_dec (coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1041 coro_mortal = 0; 1364 coro_mortal = 0;
1042 } 1365 }
1043} 1366}
1044 1367
1045static int 1368static int
… …
1077 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1078 1401
1079 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1080 ENTER; 1403 ENTER;
1081 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1082 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1083 PUSHMARK (SP);
1084 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1085 PUSHs (fullname); 1408 PUSHs (fullname);
1086 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1087 PUTBACK; 1410 PUTBACK;
1088 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);
… …
1099 1422
1100 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1101 { 1424 {
1102 SV **cb; 1425 SV **cb;
1103 1426
1104 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1105 { 1428 {
1106 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1107 1430
1108 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1109 { 1432 {
… …
1115 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1116 1439
1117 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1118 ENTER; 1441 ENTER;
1119 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1120 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1121 PUSHMARK (SP);
1122 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1123 PUSHs (fullname); 1446 PUSHs (fullname);
1124 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);
1125 PUTBACK; 1448 PUTBACK;
1126 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);
1127 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);
1128 SPAGAIN; 1451 SPAGAIN;
1129 FREETMPS; 1452 FREETMPS;
… …
1139 dSP; 1462 dSP;
1140 1463
1141 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1142 ENTER; 1465 ENTER;
1143 SAVETMPS; 1466 SAVETMPS;
1144 EXTEND (SP, 3);
1145 PL_runops = RUNOPS_DEFAULT;
1146 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1147 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1148 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1149 PUTBACK; 1471 PUTBACK;
1150 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);
1151 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);
… …
1178 1500
1179 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 */
1180} 1502}
1181 1503
1182/* 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 */
1183static void NOINLINE 1505static void ecb_noinline
1184cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1185{ 1507{
1186 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1187 1509
1188 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1199 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1200 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1201} 1523}
1202 1524
1203/* 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 */
1204INLINE void 1526ecb_inline void
1205transfer_tail (pTHX) 1527transfer_tail (pTHX)
1206{ 1528{
1207 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);
1208} 1542}
1209 1543
1210/* 1544/*
1211 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1212 */ 1546 */
… …
1234 /* somebody or something will hit me for both perl_run and PL_restartop */ 1568 /* somebody or something will hit me for both perl_run and PL_restartop */
1235 PL_restartop = PL_op; 1569 PL_restartop = PL_op;
1236 perl_run (PL_curinterp); 1570 perl_run (PL_curinterp);
1237 /* 1571 /*
1238 * Unfortunately, there is no way to get at the return values of the 1572 * Unfortunately, there is no way to get at the return values of the
1239 * coro body here, as perl_run destroys these 1573 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1574 * runtime errors here, as this is just a random interpreter, not a thread.
1240 */ 1575 */
1576
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;
1241 1583
1242 /* 1584 /*
1243 * 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
1244 * 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)
1245 * 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
1246 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1247 * coroutine as Coro has no such concept.
1248 * This actually isn't valid with the pthread backend, but OSes requiring
1249 * that backend are too broken to do it in a standards-compliant way.
1250 */ 1589 */
1251 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1252 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1253 } 1591 }
1254} 1592}
1255 1593
1256static coro_cctx * 1594static coro_cctx *
1257cctx_new () 1595cctx_new (void)
1258{ 1596{
1259 coro_cctx *cctx; 1597 coro_cctx *cctx;
1260 1598
1261 ++cctx_count; 1599 ++cctx_count;
1262 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1268 return cctx; 1606 return cctx;
1269} 1607}
1270 1608
1271/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1272static coro_cctx * 1610static coro_cctx *
1273cctx_new_empty () 1611cctx_new_empty (void)
1274{ 1612{
1275 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1276 1614
1277 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1278 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1279 1617
1280 return cctx; 1618 return cctx;
1281} 1619}
1282 1620
1283/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1284static coro_cctx * 1622static coro_cctx *
1285cctx_new_run () 1623cctx_new_run (void)
1286{ 1624{
1287 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1288 void *stack_start;
1289 size_t stack_size;
1290 1626
1291#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1292 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1293 /* mmap supposedly does allocate-on-write for us */
1294 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1295
1296 if (cctx->sptr != (void *)-1)
1297 {
1298 #if CORO_STACKGUARD
1299 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1300 #endif
1301 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1302 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1303 cctx->flags |= CC_MAPPED;
1304 } 1628 {
1305 else
1306#endif
1307 {
1308 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1309 New (0, cctx->sptr, cctx_stacksize, long);
1310
1311 if (!cctx->sptr)
1312 {
1313 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1314 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1315 }
1316
1317 stack_start = cctx->sptr;
1318 stack_size = cctx->ssize;
1319 } 1631 }
1320 1632
1321 #if CORO_USE_VALGRIND
1322 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1323 #endif
1324
1325 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);
1326 1634
1327 return cctx; 1635 return cctx;
1328} 1636}
1329 1637
1330static void 1638static void
1331cctx_destroy (coro_cctx *cctx) 1639cctx_destroy (coro_cctx *cctx)
1332{ 1640{
1333 if (!cctx) 1641 if (!cctx)
1334 return; 1642 return;
1335 1643
1336 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1337 1645
1338 --cctx_count; 1646 --cctx_count;
1339 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1340 1648
1341 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1342 if (cctx->sptr)
1343 {
1344 #if CORO_USE_VALGRIND
1345 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1346 #endif
1347
1348#if HAVE_MMAP
1349 if (cctx->flags & CC_MAPPED)
1350 munmap (cctx->sptr, cctx->ssize);
1351 else
1352#endif
1353 Safefree (cctx->sptr);
1354 }
1355 1650
1356 Safefree (cctx); 1651 Safefree (cctx);
1357} 1652}
1358 1653
1359/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1360#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))
1361 1656
1362static coro_cctx * 1657static coro_cctx *
1363cctx_get (pTHX) 1658cctx_get (pTHX)
1364{ 1659{
1365 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1366 { 1661 {
1367 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1368 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1369 --cctx_idle; 1664 --cctx_idle;
1370 1665
1371 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1372 return cctx; 1667 return cctx;
1373 1668
1374 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1375 } 1670 }
1376 1671
… …
1378} 1673}
1379 1674
1380static void 1675static void
1381cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1382{ 1677{
1383 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));
1384 1679
1385 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1386 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1387 { 1682 {
1388 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1389 cctx_first = first->next; 1684 cctx_first = first->next;
1390 --cctx_idle; 1685 --cctx_idle;
1391 1686
… …
1402static void 1697static void
1403transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1404{ 1699{
1405 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1406 1701
1407 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1408 { 1703 {
1409 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1410 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,");
1411 1706
1412 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1413 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,");
1414 1709
1415#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1416 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1417 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,");
1418#endif 1713#endif
1419 } 1714 }
1420} 1715}
1421 1716
1422/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1423static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1424transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1425{ 1720{
1426 dSTACKLEVEL; 1721 dSTACKLEVEL;
1427 1722
1428 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1429 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1430 { 1725 {
1431 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1432 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 */
1433 } 1728 }
1434 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1435 { 1730 {
1436 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1437 1732
1438 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1439 { 1734 {
1440 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1441 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1442 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1443 } 1738 }
… …
1446 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1447 1742
1448 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1449 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1450 1745
1451 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1452 { 1747 {
1453 /* need to start coroutine */ 1748 /* need to start coroutine */
1454 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1455 /* setup coroutine call */ 1750 /* setup coroutine call */
1456 coro_setup (aTHX_ next); 1751 init_perl (aTHX_ next);
1457 } 1752 }
1458 else 1753 else
1459 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1460 1755
1461 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1462 if (expect_true ( 1757 if (ecb_expect_true (
1463 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1464 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1465 && !force_cctx 1760 && !force_cctx
1466 )) 1761 ))
1467 { 1762 {
1468 /* 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 */
1469 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));
1470 1765
1471 /* 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. */
1472 /* 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 */
1473 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1474 if (expect_true (!next->cctx)) 1769 if (ecb_expect_true (!next->cctx))
1475 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1476 1771
1477 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1478 } 1773 }
1479 else 1774 else
1480 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1481 1776
1482 ++next->usecount; 1777 ++next->usecount;
1483 1778
1484 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1485 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1486 1781
1487 next->cctx = 0; 1782 next->cctx = 0;
1488 1783
1489 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1490 { 1785 {
1491 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1492 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1493 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1494 } 1789 }
… …
1500#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))
1501#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1796#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1502 1797
1503/** high level stuff ********************************************************/ 1798/** high level stuff ********************************************************/
1504 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 */
1505static int 1802static void
1803coro_call_on_destroy (pTHX_ struct coro *coro);
1804
1805static void
1506coro_state_destroy (pTHX_ struct coro *coro) 1806coro_state_destroy (pTHX_ struct coro *coro)
1507{ 1807{
1508 if (coro->flags & CF_DESTROYED) 1808 if (coro->flags & CF_ZOMBIE)
1509 return 0; 1809 return;
1510 1810
1511 if (coro->on_destroy && !PL_dirty)
1512 coro->on_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1513 1812
1514 coro->flags |= CF_DESTROYED; 1813 coro->flags |= CF_ZOMBIE;
1515 1814
1516 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1517 { 1816 {
1518 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1519 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1520 --coro_nready; 1819 --coro_nready;
1521 } 1820 }
1522 else 1821 else
1523 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;
1524 1827
1525 if (coro->mainstack 1828 if (coro->mainstack
1526 && coro->mainstack != main_mainstack 1829 && coro->mainstack != main_mainstack
1527 && coro->slot 1830 && coro->slot
1528 && !PL_dirty) 1831 && !PL_dirty)
1529 coro_destruct_perl (aTHX_ coro); 1832 destroy_perl (aTHX_ coro);
1530 1833
1531 cctx_destroy (coro->cctx); 1834 cctx_destroy (coro->cctx);
1532 SvREFCNT_dec (coro->startcv); 1835 SvREFCNT_dec (coro->startcv);
1533 SvREFCNT_dec (coro->args); 1836 SvREFCNT_dec (coro->args);
1837 SvREFCNT_dec (coro->swap_sv);
1534 SvREFCNT_dec (CORO_THROW); 1838 SvREFCNT_dec (CORO_THROW);
1535 1839
1536 if (coro->next) coro->next->prev = coro->prev; 1840 coro_call_on_destroy (aTHX_ coro);
1537 if (coro->prev) coro->prev->next = coro->next;
1538 if (coro == coro_first) coro_first = coro->next;
1539 1841
1540 return 1; 1842 /* more destruction mayhem in coro_state_free */
1541} 1843}
1542 1844
1543static int 1845static int
1544coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1545{ 1847{
1546 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1547 mg->mg_ptr = 0; 1849 mg->mg_ptr = 0;
1548 1850
1549 coro->hv = 0;
1550
1551 if (--coro->refcnt < 0)
1552 {
1553 coro_state_destroy (aTHX_ coro); 1851 coro_state_destroy (aTHX_ coro);
1852 SvREFCNT_dec (coro->on_destroy);
1853 SvREFCNT_dec (coro->status);
1854
1554 Safefree (coro); 1855 Safefree (coro);
1555 }
1556 1856
1557 return 0; 1857 return 0;
1558} 1858}
1559 1859
1560static int 1860static int ecb_cold
1561coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1562{ 1862{
1563 struct coro *coro = (struct coro *)mg->mg_ptr; 1863 /* called when perl clones the current process the slow way (windows process emulation) */
1564 1864 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1565 ++coro->refcnt; 1865 mg->mg_ptr = 0;
1866 mg->mg_virtual = 0;
1566 1867
1567 return 0; 1868 return 0;
1568} 1869}
1569 1870
1570static MGVTBL coro_state_vtbl = { 1871static MGVTBL coro_state_vtbl = {
… …
1593 1894
1594 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1895 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1595 TRANSFER (ta, 1); 1896 TRANSFER (ta, 1);
1596} 1897}
1597 1898
1598/*****************************************************************************/
1599/* gensub: simple closure generation utility */
1600
1601#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1602
1603/* create a closure from XS, returns a code reference */
1604/* the arg can be accessed via GENSUB_ARG from the callback */
1605/* the callback must use dXSARGS/XSRETURN */
1606static SV *
1607gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1608{
1609 CV *cv = (CV *)newSV (0);
1610
1611 sv_upgrade ((SV *)cv, SVt_PVCV);
1612
1613 CvANON_on (cv);
1614 CvISXSUB_on (cv);
1615 CvXSUB (cv) = xsub;
1616 GENSUB_ARG = arg;
1617
1618 return newRV_noinc ((SV *)cv);
1619}
1620
1621/** Coro ********************************************************************/ 1899/** Coro ********************************************************************/
1622 1900
1623INLINE void 1901ecb_inline void
1624coro_enq (pTHX_ struct coro *coro) 1902coro_enq (pTHX_ struct coro *coro)
1625{ 1903{
1626 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1904 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1627 1905
1628 SvREFCNT_inc_NN (coro->hv); 1906 SvREFCNT_inc_NN (coro->hv);
1629 1907
1630 coro->next_ready = 0; 1908 coro->next_ready = 0;
1631 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1909 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1632 ready [1] = coro; 1910 ready [1] = coro;
1633} 1911}
1634 1912
1635INLINE struct coro * 1913ecb_inline struct coro *
1636coro_deq (pTHX) 1914coro_deq (pTHX)
1637{ 1915{
1638 int prio; 1916 int prio;
1639 1917
1640 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1918 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1641 { 1919 {
1642 struct coro **ready = coro_ready [prio]; 1920 struct coro **ready = coro_ready [prio];
1643 1921
1644 if (ready [0]) 1922 if (ready [0])
1645 { 1923 {
… …
1650 } 1928 }
1651 1929
1652 return 0; 1930 return 0;
1653} 1931}
1654 1932
1933static void
1934invoke_sv_ready_hook_helper (void)
1935{
1936 dTHX;
1937 dSP;
1938
1939 ENTER;
1940 SAVETMPS;
1941
1942 PUSHMARK (SP);
1943 PUTBACK;
1944 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1945
1946 FREETMPS;
1947 LEAVE;
1948}
1949
1655static int 1950static int
1656api_ready (pTHX_ SV *coro_sv) 1951api_ready (pTHX_ SV *coro_sv)
1657{ 1952{
1658 struct coro *coro;
1659 SV *sv_hook;
1660 void (*xs_hook)(void);
1661
1662 coro = SvSTATE (coro_sv); 1953 struct coro *coro = SvSTATE (coro_sv);
1663 1954
1664 if (coro->flags & CF_READY) 1955 if (coro->flags & CF_READY)
1665 return 0; 1956 return 0;
1666 1957
1667 coro->flags |= CF_READY; 1958 coro->flags |= CF_READY;
1668 1959
1669 sv_hook = coro_nready ? 0 : coro_readyhook;
1670 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1671
1672 coro_enq (aTHX_ coro); 1960 coro_enq (aTHX_ coro);
1673 ++coro_nready;
1674 1961
1675 if (sv_hook) 1962 if (!coro_nready++)
1676 { 1963 if (coroapi.readyhook)
1677 dSP; 1964 coroapi.readyhook ();
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (sv_hook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1688 }
1689
1690 if (xs_hook)
1691 xs_hook ();
1692 1965
1693 return 1; 1966 return 1;
1694} 1967}
1695 1968
1696static int 1969static int
… …
1698{ 1971{
1699 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1972 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1700} 1973}
1701 1974
1702/* expects to own a reference to next->hv */ 1975/* expects to own a reference to next->hv */
1703INLINE void 1976ecb_inline void
1704prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1977prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1705{ 1978{
1706 SV *prev_sv = SvRV (coro_current); 1979 SV *prev_sv = SvRV (coro_current);
1707 1980
1708 ta->prev = SvSTATE_hv (prev_sv); 1981 ta->prev = SvSTATE_hv (prev_sv);
… …
1721{ 1994{
1722 for (;;) 1995 for (;;)
1723 { 1996 {
1724 struct coro *next = coro_deq (aTHX); 1997 struct coro *next = coro_deq (aTHX);
1725 1998
1726 if (expect_true (next)) 1999 if (ecb_expect_true (next))
1727 { 2000 {
1728 /* cannot transfer to destroyed coros, skip and look for next */ 2001 /* cannot transfer to destroyed coros, skip and look for next */
1729 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 2002 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1730 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 2003 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1731 else 2004 else
1732 { 2005 {
1733 next->flags &= ~CF_READY; 2006 next->flags &= ~CF_READY;
1734 --coro_nready; 2007 --coro_nready;
… …
1741 { 2014 {
1742 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1743 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1744 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1745 { 2018 {
2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
2038
1746 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1747 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1748 --coro_nready; 2041 --coro_nready;
1749 } 2042 }
1750 else 2043 else
1751 { 2044 {
2045 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1752 dSP; 2046 dSP;
1753 2047
1754 ENTER; 2048 ENTER;
1755 SAVETMPS; 2049 SAVETMPS;
1756 2050
… …
1763 } 2057 }
1764 } 2058 }
1765 } 2059 }
1766} 2060}
1767 2061
1768INLINE void 2062ecb_inline void
1769prepare_cede (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede (pTHX_ struct coro_transfer_args *ta)
1770{ 2064{
1771 api_ready (aTHX_ coro_current); 2065 api_ready (aTHX_ coro_current);
1772 prepare_schedule (aTHX_ ta); 2066 prepare_schedule (aTHX_ ta);
1773} 2067}
1774 2068
1775INLINE void 2069ecb_inline void
1776prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2070prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1777{ 2071{
1778 SV *prev = SvRV (coro_current); 2072 SV *prev = SvRV (coro_current);
1779 2073
1780 if (coro_nready) 2074 if (coro_nready)
… …
1810{ 2104{
1811 struct coro_transfer_args ta; 2105 struct coro_transfer_args ta;
1812 2106
1813 prepare_cede (aTHX_ &ta); 2107 prepare_cede (aTHX_ &ta);
1814 2108
1815 if (expect_true (ta.prev != ta.next)) 2109 if (ecb_expect_true (ta.prev != ta.next))
1816 { 2110 {
1817 TRANSFER (ta, 1); 2111 TRANSFER (ta, 1);
1818 return 1; 2112 return 1;
1819 } 2113 }
1820 else 2114 else
… …
1863 coro->slot->runops = RUNOPS_DEFAULT; 2157 coro->slot->runops = RUNOPS_DEFAULT;
1864 } 2158 }
1865} 2159}
1866 2160
1867static void 2161static void
2162coro_push_av (pTHX_ AV *av, I32 gimme_v)
2163{
2164 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2165 {
2166 dSP;
2167
2168 if (gimme_v == G_SCALAR)
2169 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2170 else
2171 {
2172 int i;
2173 EXTEND (SP, AvFILLp (av) + 1);
2174
2175 for (i = 0; i <= AvFILLp (av); ++i)
2176 PUSHs (AvARRAY (av)[i]);
2177 }
2178
2179 PUTBACK;
2180 }
2181}
2182
2183static void
2184coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2185{
2186 if (!coro->on_destroy)
2187 coro->on_destroy = newAV ();
2188
2189 av_push (coro->on_destroy, cb);
2190}
2191
2192static void
2193slf_destroy_join (pTHX_ struct CoroSLF *frame)
2194{
2195 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2196}
2197
2198static int
2199slf_check_join (pTHX_ struct CoroSLF *frame)
2200{
2201 struct coro *coro = (struct coro *)frame->data;
2202
2203 if (!coro->status)
2204 return 1;
2205
2206 frame->destroy = 0;
2207
2208 coro_push_av (aTHX_ coro->status, GIMME_V);
2209
2210 SvREFCNT_dec ((SV *)coro->hv);
2211
2212 return 0;
2213}
2214
2215static void
2216slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{
2218 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2219
2220 if (items > 1)
2221 croak ("join called with too many arguments");
2222
2223 if (coro->status)
2224 frame->prepare = prepare_nop;
2225 else
2226 {
2227 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2228 frame->prepare = prepare_schedule;
2229 }
2230
2231 frame->check = slf_check_join;
2232 frame->destroy = slf_destroy_join;
2233 frame->data = (void *)coro;
2234 SvREFCNT_inc (coro->hv);
2235}
2236
2237static void
1868coro_call_on_destroy (pTHX_ struct coro *coro) 2238coro_call_on_destroy (pTHX_ struct coro *coro)
1869{ 2239{
1870 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2240 AV *od = coro->on_destroy;
1871 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1872 2241
1873 if (on_destroyp) 2242 if (!od)
1874 { 2243 return;
1875 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1876 2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2247
1877 while (AvFILLp (on_destroy) >= 0) 2248 while (AvFILLp (od) >= 0)
2249 {
2250 SV *cb = sv_2mortal (av_pop (od));
2251
2252 /* coro hv's (and only hv's at the moment) are supported as well */
2253 if (SvSTATEhv_p (aTHX_ cb))
2254 api_ready (aTHX_ cb);
2255 else
1878 { 2256 {
1879 dSP; /* don't disturb outer sp */ 2257 dSP; /* don't disturb outer sp */
1880 SV *cb = av_pop (on_destroy);
1881
1882 PUSHMARK (SP); 2258 PUSHMARK (SP);
1883 2259
1884 if (statusp) 2260 if (coro->status)
1885 { 2261 {
1886 int i; 2262 PUTBACK;
1887 AV *status = (AV *)SvRV (*statusp); 2263 coro_push_av (aTHX_ coro->status, G_ARRAY);
1888 EXTEND (SP, AvFILLp (status) + 1); 2264 SPAGAIN;
1889
1890 for (i = 0; i <= AvFILLp (status); ++i)
1891 PUSHs (AvARRAY (status)[i]);
1892 } 2265 }
1893 2266
1894 PUTBACK; 2267 PUTBACK;
1895 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2268 call_sv (cb, G_VOID | G_DISCARD);
1896 } 2269 }
1897 } 2270 }
1898} 2271}
1899 2272
1900static void 2273static void
1901slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2274coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1902{ 2275{
2276 AV *av;
2277
2278 if (coro->status)
2279 {
2280 av = coro->status;
2281 av_clear (av);
2282 }
2283 else
2284 av = coro->status = newAV ();
2285
2286 /* items are actually not so common, so optimise for this case */
2287 if (items)
2288 {
1903 int i; 2289 int i;
1904 HV *hv = (HV *)SvRV (coro_current);
1905 AV *av = newAV ();
1906 2290
1907 av_extend (av, items - 1); 2291 av_extend (av, items - 1);
2292
1908 for (i = 0; i < items; ++i) 2293 for (i = 0; i < items; ++i)
1909 av_push (av, SvREFCNT_inc_NN (arg [i])); 2294 av_push (av, SvREFCNT_inc_NN (arg [i]));
2295 }
2296}
1910 2297
1911 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2298static void
1912 2299slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2300{
1913 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2301 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1914 api_ready (aTHX_ sv_manager); 2302 api_ready (aTHX_ sv_manager);
1915 2303
1916 frame->prepare = prepare_schedule; 2304 frame->prepare = prepare_schedule;
1917 frame->check = slf_check_repeat; 2305 frame->check = slf_check_repeat;
1918 2306
1919 /* as a minor optimisation, we could unwind all stacks here */ 2307 /* as a minor optimisation, we could unwind all stacks here */
1920 /* but that puts extra pressure on pp_slf, and is not worth much */ 2308 /* but that puts extra pressure on pp_slf, and is not worth much */
1921 /*coro_unwind_stacks (aTHX);*/ 2309 /*coro_unwind_stacks (aTHX);*/
2310}
2311
2312static void
2313slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2314{
2315 HV *coro_hv = (HV *)SvRV (coro_current);
2316
2317 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2318 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2319}
2320
2321static void
2322slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2323{
2324 HV *coro_hv;
2325 struct coro *coro;
2326
2327 if (items <= 0)
2328 croak ("Coro::cancel called without coro object,");
2329
2330 coro = SvSTATE (arg [0]);
2331 coro_hv = coro->hv;
2332
2333 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2334
2335 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2336 {
2337 /* coro currently busy cancelling something, so just notify it */
2338 coro->slf_frame.data = (void *)coro;
2339
2340 frame->prepare = prepare_nop;
2341 frame->check = slf_check_nop;
2342 }
2343 else if (coro_hv == (HV *)SvRV (coro_current))
2344 {
2345 /* cancelling the current coro is allowed, and equals terminate */
2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2347 }
2348 else
2349 {
2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2354
2355 /* otherwise we cancel directly, purely for speed reasons
2356 * unfortunately, this requires some magic trickery, as
2357 * somebody else could cancel us, so we have to fight the cancellation.
2358 * this is ugly, and hopefully fully worth the extra speed.
2359 * besides, I can't get the slow-but-safe version working...
2360 */
2361 slf_frame.data = 0;
2362 self->flags |= CF_NOCANCEL;
2363 coro_state_destroy (aTHX_ coro);
2364 self->flags &= ~CF_NOCANCEL;
2365
2366 if (slf_frame.data)
2367 {
2368 /* while we were busy we have been cancelled, so terminate */
2369 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2370 }
2371 else
2372 {
2373 frame->prepare = prepare_nop;
2374 frame->check = slf_check_nop;
2375 }
2376 }
2377}
2378
2379static int
2380slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2381{
2382 frame->prepare = 0;
2383 coro_unwind_stacks (aTHX);
2384
2385 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2386
2387 return 1;
2388}
2389
2390static int
2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2392{
2393 if (coro->cctx)
2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2395
2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2397 {
2398 coro_set_status (aTHX_ coro, arg, items);
2399 coro_state_destroy (aTHX_ coro);
2400 }
2401 else
2402 {
2403 if (!coro->slf_frame.prepare)
2404 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2405
2406 slf_destroy (aTHX_ coro);
2407
2408 coro_set_status (aTHX_ coro, arg, items);
2409 coro->slf_frame.prepare = prepare_nop;
2410 coro->slf_frame.check = slf_check_safe_cancel;
2411
2412 api_ready (aTHX_ (SV *)coro->hv);
2413 }
2414
2415 return 1;
1922} 2416}
1923 2417
1924/*****************************************************************************/ 2418/*****************************************************************************/
1925/* async pool handler */ 2419/* async pool handler */
1926 2420
… …
1957slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2451slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1958{ 2452{
1959 HV *hv = (HV *)SvRV (coro_current); 2453 HV *hv = (HV *)SvRV (coro_current);
1960 struct coro *coro = SvSTATE_hv ((SV *)hv); 2454 struct coro *coro = SvSTATE_hv ((SV *)hv);
1961 2455
1962 if (expect_true (coro->saved_deffh)) 2456 if (ecb_expect_true (coro->saved_deffh))
1963 { 2457 {
1964 /* subsequent iteration */ 2458 /* subsequent iteration */
1965 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1966 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
1967 2461
1968 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1969 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1970 { 2464 {
1971 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2465 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1972 coro->invoke_av = newAV (); 2466 return;
1973
1974 frame->prepare = prepare_nop;
1975 } 2467 }
1976 else 2468 else
1977 { 2469 {
1978 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
1979 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1980 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
1981 coro->prio = 0; 2480 coro->prio = 0;
1982 2481
1983 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1984 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
1985 2484
1986 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
1987 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc (hv));
1988 } 2487 }
… …
2004 2503
2005static void 2504static void
2006coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2007{ 2506{
2008 dXSARGS; 2507 dXSARGS;
2009 SV *data = (SV *)GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2010 2509
2011 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2510 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2012 { 2511 {
2013 /* first call, set args */ 2512 /* first call, set args */
2014 SV *coro = SvRV (data); 2513 SV *coro = SvRV (data);
… …
2029 2528
2030static int 2529static int
2031slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2530slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2032{ 2531{
2033 SV *data = (SV *)frame->data; 2532 SV *data = (SV *)frame->data;
2034 2533
2035 if (CORO_THROW) 2534 if (CORO_THROW)
2036 return 0; 2535 return 0;
2037 2536
2038 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2537 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2039 return 1; 2538 return 1;
… …
2075 cb = sv_2mortal (coro->rouse_cb); 2574 cb = sv_2mortal (coro->rouse_cb);
2076 coro->rouse_cb = 0; 2575 coro->rouse_cb = 0;
2077 } 2576 }
2078 2577
2079 if (!SvROK (cb) 2578 if (!SvROK (cb)
2080 || SvTYPE (SvRV (cb)) != SVt_PVCV 2579 || SvTYPE (SvRV (cb)) != SVt_PVCV
2081 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2580 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2082 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2083 2582
2084 { 2583 {
2085 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2086 SV *data = (SV *)GENSUB_ARG; 2585 SV *data = (SV *)S_GENSUB_ARG;
2087 2586
2088 frame->data = (void *)data; 2587 frame->data = (void *)data;
2089 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2588 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2090 frame->check = slf_check_rouse_wait; 2589 frame->check = slf_check_rouse_wait;
2091 } 2590 }
… …
2095coro_new_rouse_cb (pTHX) 2594coro_new_rouse_cb (pTHX)
2096{ 2595{
2097 HV *hv = (HV *)SvRV (coro_current); 2596 HV *hv = (HV *)SvRV (coro_current);
2098 struct coro *coro = SvSTATE_hv (hv); 2597 struct coro *coro = SvSTATE_hv (hv);
2099 SV *data = newRV_inc ((SV *)hv); 2598 SV *data = newRV_inc ((SV *)hv);
2100 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2599 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2101 2600
2102 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2601 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2103 SvREFCNT_dec (data); /* magicext increases the refcount */ 2602 SvREFCNT_dec (data); /* magicext increases the refcount */
2104 2603
2105 SvREFCNT_dec (coro->rouse_cb); 2604 SvREFCNT_dec (coro->rouse_cb);
… …
2202static void 2701static void
2203slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2702slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2204{ 2703{
2205 frame->prepare = prepare_cede_notself; 2704 frame->prepare = prepare_cede_notself;
2206 frame->check = slf_check_nop; 2705 frame->check = slf_check_nop;
2706}
2707
2708/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2709static void
2710slf_destroy (pTHX_ struct coro *coro)
2711{
2712 struct CoroSLF frame = coro->slf_frame;
2713
2714 /*
2715 * The on_destroy below most likely is from an SLF call.
2716 * Since by definition the SLF call will not finish when we destroy
2717 * the coro, we will have to force-finish it here, otherwise
2718 * cleanup functions cannot call SLF functions.
2719 */
2720 coro->slf_frame.prepare = 0;
2721
2722 /* this callback is reserved for slf functions needing to do cleanup */
2723 if (frame.destroy && frame.prepare && !PL_dirty)
2724 frame.destroy (aTHX_ &frame);
2207} 2725}
2208 2726
2209/* 2727/*
2210 * these not obviously related functions are all rolled into one 2728 * these not obviously related functions are all rolled into one
2211 * function to increase chances that they all will call transfer with the same 2729 * function to increase chances that they all will call transfer with the same
… …
2218 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2736 I32 checkmark; /* mark SP to see how many elements check has pushed */
2219 2737
2220 /* set up the slf frame, unless it has already been set-up */ 2738 /* set up the slf frame, unless it has already been set-up */
2221 /* the latter happens when a new coro has been started */ 2739 /* the latter happens when a new coro has been started */
2222 /* or when a new cctx was attached to an existing coroutine */ 2740 /* or when a new cctx was attached to an existing coroutine */
2223 if (expect_true (!slf_frame.prepare)) 2741 if (ecb_expect_true (!slf_frame.prepare))
2224 { 2742 {
2225 /* first iteration */ 2743 /* first iteration */
2226 dSP; 2744 dSP;
2227 SV **arg = PL_stack_base + TOPMARK + 1; 2745 SV **arg = PL_stack_base + TOPMARK + 1;
2228 int items = SP - arg; /* args without function object */ 2746 int items = SP - arg; /* args without function object */
… …
2269 while (slf_frame.check (aTHX_ &slf_frame)); 2787 while (slf_frame.check (aTHX_ &slf_frame));
2270 2788
2271 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2789 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2272 2790
2273 /* exception handling */ 2791 /* exception handling */
2274 if (expect_false (CORO_THROW)) 2792 if (ecb_expect_false (CORO_THROW))
2275 { 2793 {
2276 SV *exception = sv_2mortal (CORO_THROW); 2794 SV *exception = sv_2mortal (CORO_THROW);
2277 2795
2278 CORO_THROW = 0; 2796 CORO_THROW = 0;
2279 sv_setsv (ERRSV, exception); 2797 sv_setsv (ERRSV, exception);
2280 croak (0); 2798 croak (0);
2281 } 2799 }
2282 2800
2283 /* return value handling - mostly like entersub */ 2801 /* return value handling - mostly like entersub */
2284 /* make sure we put something on the stack in scalar context */ 2802 /* make sure we put something on the stack in scalar context */
2285 if (GIMME_V == G_SCALAR) 2803 if (GIMME_V == G_SCALAR
2804 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2286 { 2805 {
2287 dSP; 2806 dSP;
2288 SV **bot = PL_stack_base + checkmark; 2807 SV **bot = PL_stack_base + checkmark;
2289 2808
2290 if (sp == bot) /* too few, push undef */ 2809 if (sp == bot) /* too few, push undef */
2291 bot [1] = &PL_sv_undef; 2810 bot [1] = &PL_sv_undef;
2292 else if (sp != bot + 1) /* too many, take last one */ 2811 else /* too many, take last one */
2293 bot [1] = *sp; 2812 bot [1] = *sp;
2294 2813
2295 SP = bot + 1; 2814 SP = bot + 1;
2296 2815
2297 PUTBACK; 2816 PUTBACK;
… …
2330 if (PL_op->op_flags & OPf_STACKED) 2849 if (PL_op->op_flags & OPf_STACKED)
2331 { 2850 {
2332 if (items > slf_arga) 2851 if (items > slf_arga)
2333 { 2852 {
2334 slf_arga = items; 2853 slf_arga = items;
2335 free (slf_argv); 2854 Safefree (slf_argv);
2336 slf_argv = malloc (slf_arga * sizeof (SV *)); 2855 New (0, slf_argv, slf_arga, SV *);
2337 } 2856 }
2338 2857
2339 slf_argc = items; 2858 slf_argc = items;
2340 2859
2341 for (i = 0; i < items; ++i) 2860 for (i = 0; i < items; ++i)
… …
2395{ 2914{
2396 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2915 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2397 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2916 on_enterleave_call (aTHX_ sv_2mortal (cb));
2398} 2917}
2399 2918
2919static void
2920enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2921{
2922 if (!hook)
2923 return;
2924
2925 if (!*avp)
2926 {
2927 *avp = newAV ();
2928 AvREAL_off (*avp);
2929 }
2930
2931 av_push (*avp, (SV *)hook);
2932 av_push (*avp, (SV *)arg);
2933}
2934
2935static void
2936enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2937{
2938 AV *av = *avp;
2939 int i;
2940
2941 if (!av)
2942 return;
2943
2944 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2945 if (AvARRAY (av)[i] == (SV *)hook)
2946 {
2947 if (execute)
2948 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2949
2950 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2951 av_pop (av);
2952 av_pop (av);
2953 break;
2954 }
2955
2956 if (AvFILLp (av) >= 0)
2957 {
2958 *avp = 0;
2959 SvREFCNT_dec_NN (av);
2960 }
2961}
2962
2963static void
2964api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2965{
2966 struct coro *coro = SvSTATE (coro_sv);
2967
2968 if (SvSTATE_current == coro)
2969 if (enter)
2970 enter (aTHX_ enter_arg);
2971
2972 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2973 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2974}
2975
2976static void
2977api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2978{
2979 struct coro *coro = SvSTATE (coro_sv);
2980
2981 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2982 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2983}
2984
2985static void
2986savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2987{
2988 struct coro *coro = SvSTATE_current;
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991}
2992
2993static void
2994savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2995{
2996 struct coro *coro = SvSTATE_current;
2997
2998 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2999}
3000
3001static void
3002api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3003{
3004 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3005
3006 /* this ought to be much cheaper than malloc + a single destructor call */
3007 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3008 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3009}
3010
2400/*****************************************************************************/ 3011/*****************************************************************************/
2401/* PerlIO::cede */ 3012/* PerlIO::cede */
2402 3013
2403typedef struct 3014typedef struct
2404{ 3015{
2405 PerlIOBuf base; 3016 PerlIOBuf base;
2406 NV next, every; 3017 NV next, every;
2407} PerlIOCede; 3018} PerlIOCede;
2408 3019
2409static IV 3020static IV ecb_cold
2410PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3021PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2411{ 3022{
2412 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3023 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2413 3024
2414 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3025 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2415 self->next = nvtime () + self->every; 3026 self->next = nvtime () + self->every;
2416 3027
2417 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3028 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2418} 3029}
2419 3030
2420static SV * 3031static SV * ecb_cold
2421PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3032PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2422{ 3033{
2423 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3034 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2424 3035
2425 return newSVnv (self->every); 3036 return newSVnv (self->every);
… …
2476/* Coro::Semaphore & Coro::Signal */ 3087/* Coro::Semaphore & Coro::Signal */
2477 3088
2478static SV * 3089static SV *
2479coro_waitarray_new (pTHX_ int count) 3090coro_waitarray_new (pTHX_ int count)
2480{ 3091{
2481 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3092 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2482 AV *av = newAV (); 3093 AV *av = newAV ();
2483 SV **ary; 3094 SV **ary;
2484 3095
2485 /* unfortunately, building manually saves memory */ 3096 /* unfortunately, building manually saves memory */
2486 Newx (ary, 2, SV *); 3097 Newx (ary, 2, SV *);
… …
2532 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3143 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2533 PUTBACK; 3144 PUTBACK;
2534 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3145 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2535 } 3146 }
2536 3147
2537 SvREFCNT_dec (cb); 3148 SvREFCNT_dec_NN (cb);
2538 } 3149 }
2539} 3150}
2540 3151
2541static void 3152static void
2542coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3153coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2543{ 3154{
2544 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3155 /* call $sem->adjust (0) to possibly wake up some other waiters */
2545 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3156 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2546} 3157}
2547 3158
2548static int 3159static int
2549slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3160slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2550{ 3161{
2551 AV *av = (AV *)frame->data; 3162 AV *av = (AV *)frame->data;
2552 SV *count_sv = AvARRAY (av)[0]; 3163 SV *count_sv = AvARRAY (av)[0];
3164 SV *coro_hv = SvRV (coro_current);
3165
3166 frame->destroy = 0;
2553 3167
2554 /* if we are about to throw, don't actually acquire the lock, just throw */ 3168 /* if we are about to throw, don't actually acquire the lock, just throw */
2555 if (CORO_THROW) 3169 if (ecb_expect_false (CORO_THROW))
3170 {
3171 /* we still might be responsible for the semaphore, so wake up others */
3172 coro_semaphore_adjust (aTHX_ av, 0);
3173
2556 return 0; 3174 return 0;
3175 }
2557 else if (SvIVX (count_sv) > 0) 3176 else if (SvIVX (count_sv) > 0)
2558 { 3177 {
2559 SvSTATE_current->on_destroy = 0;
2560
2561 if (acquire) 3178 if (acquire)
2562 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3179 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2563 else 3180 else
2564 coro_semaphore_adjust (aTHX_ av, 0); 3181 coro_semaphore_adjust (aTHX_ av, 0);
2565 3182
… …
2569 { 3186 {
2570 int i; 3187 int i;
2571 /* if we were woken up but can't down, we look through the whole */ 3188 /* if we were woken up but can't down, we look through the whole */
2572 /* waiters list and only add us if we aren't in there already */ 3189 /* waiters list and only add us if we aren't in there already */
2573 /* this avoids some degenerate memory usage cases */ 3190 /* this avoids some degenerate memory usage cases */
2574 3191 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2575 for (i = 1; i <= AvFILLp (av); ++i)
2576 if (AvARRAY (av)[i] == SvRV (coro_current)) 3192 if (AvARRAY (av)[i] == coro_hv)
2577 return 1; 3193 return 1;
2578 3194
2579 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3195 av_push (av, SvREFCNT_inc (coro_hv));
2580 return 1; 3196 return 1;
2581 } 3197 }
2582} 3198}
2583 3199
2584static int 3200static int
… …
2607 { 3223 {
2608 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3224 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2609 3225
2610 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3226 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2611 frame->prepare = prepare_schedule; 3227 frame->prepare = prepare_schedule;
2612
2613 /* to avoid race conditions when a woken-up coro gets terminated */ 3228 /* to avoid race conditions when a woken-up coro gets terminated */
2614 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3229 /* we arrange for a temporary on_destroy that calls adjust (0) */
2615 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3230 frame->destroy = coro_semaphore_destroy;
2616 } 3231 }
2617} 3232}
2618 3233
2619static void 3234static void
2620slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3235slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2628{ 3243{
2629 if (items >= 2) 3244 if (items >= 2)
2630 { 3245 {
2631 /* callback form */ 3246 /* callback form */
2632 AV *av = (AV *)SvRV (arg [0]); 3247 AV *av = (AV *)SvRV (arg [0]);
2633 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3248 SV *cb_cv = s_get_cv_croak (arg [1]);
2634 3249
2635 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3250 av_push (av, SvREFCNT_inc_NN (cb_cv));
2636 3251
2637 if (SvIVX (AvARRAY (av)[0]) > 0) 3252 if (SvIVX (AvARRAY (av)[0]) > 0)
2638 coro_semaphore_adjust (aTHX_ av, 0); 3253 coro_semaphore_adjust (aTHX_ av, 0);
2639 3254
2640 frame->prepare = prepare_nop; 3255 frame->prepare = prepare_nop;
… …
2664 AvARRAY (av)[0] = AvARRAY (av)[1]; 3279 AvARRAY (av)[0] = AvARRAY (av)[1];
2665 AvARRAY (av)[1] = cb; 3280 AvARRAY (av)[1] = cb;
2666 3281
2667 cb = av_shift (av); 3282 cb = av_shift (av);
2668 3283
3284 if (SvTYPE (cb) == SVt_PVCV)
3285 {
3286 dSP;
3287 PUSHMARK (SP);
3288 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3289 PUTBACK;
3290 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3291 }
3292 else
3293 {
2669 api_ready (aTHX_ cb); 3294 api_ready (aTHX_ cb);
2670 sv_setiv (cb, 0); /* signal waiter */ 3295 sv_setiv (cb, 0); /* signal waiter */
3296 }
3297
2671 SvREFCNT_dec (cb); 3298 SvREFCNT_dec_NN (cb);
2672 3299
2673 --count; 3300 --count;
2674 } 3301 }
2675} 3302}
2676 3303
… …
2684static void 3311static void
2685slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3312slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2686{ 3313{
2687 AV *av = (AV *)SvRV (arg [0]); 3314 AV *av = (AV *)SvRV (arg [0]);
2688 3315
3316 if (items >= 2)
3317 {
3318 SV *cb_cv = s_get_cv_croak (arg [1]);
3319 av_push (av, SvREFCNT_inc_NN (cb_cv));
3320
2689 if (SvIVX (AvARRAY (av)[0])) 3321 if (SvIVX (AvARRAY (av)[0]))
3322 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3323
3324 frame->prepare = prepare_nop;
3325 frame->check = slf_check_nop;
3326 }
3327 else if (SvIVX (AvARRAY (av)[0]))
2690 { 3328 {
2691 SvIVX (AvARRAY (av)[0]) = 0; 3329 SvIVX (AvARRAY (av)[0]) = 0;
2692 frame->prepare = prepare_nop; 3330 frame->prepare = prepare_nop;
2693 frame->check = slf_check_nop; 3331 frame->check = slf_check_nop;
2694 } 3332 }
2695 else 3333 else
2696 { 3334 {
2697 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3335 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2698 3336
2699 av_push (av, waiter); 3337 av_push (av, waiter);
2700 3338
2701 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3339 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2702 frame->prepare = prepare_schedule; 3340 frame->prepare = prepare_schedule;
… …
2720 3358
2721static void 3359static void
2722coro_aio_callback (pTHX_ CV *cv) 3360coro_aio_callback (pTHX_ CV *cv)
2723{ 3361{
2724 dXSARGS; 3362 dXSARGS;
2725 AV *state = (AV *)GENSUB_ARG; 3363 AV *state = (AV *)S_GENSUB_ARG;
2726 SV *coro = av_pop (state); 3364 SV *coro = av_pop (state);
2727 SV *data_sv = newSV (sizeof (struct io_state)); 3365 SV *data_sv = newSV (sizeof (struct io_state));
2728 3366
2729 av_extend (state, items - 1); 3367 av_extend (state, items - 1);
2730 3368
… …
2750 } 3388 }
2751 3389
2752 av_push (state, data_sv); 3390 av_push (state, data_sv);
2753 3391
2754 api_ready (aTHX_ coro); 3392 api_ready (aTHX_ coro);
2755 SvREFCNT_dec (coro); 3393 SvREFCNT_dec_NN (coro);
2756 SvREFCNT_dec ((AV *)state); 3394 SvREFCNT_dec_NN ((AV *)state);
2757} 3395}
2758 3396
2759static int 3397static int
2760slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3398slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2761{ 3399{
… …
2766 /* it quickly returns */ 3404 /* it quickly returns */
2767 if (CORO_THROW) 3405 if (CORO_THROW)
2768 return 0; 3406 return 0;
2769 3407
2770 /* one element that is an RV? repeat! */ 3408 /* one element that is an RV? repeat! */
2771 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3409 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2772 return 1; 3410 return 1;
2773 3411
2774 /* restore status */ 3412 /* restore status */
2775 { 3413 {
2776 SV *data_sv = av_pop (state); 3414 SV *data_sv = av_pop (state);
… …
2779 errno = data->errorno; 3417 errno = data->errorno;
2780 PL_laststype = data->laststype; 3418 PL_laststype = data->laststype;
2781 PL_laststatval = data->laststatval; 3419 PL_laststatval = data->laststatval;
2782 PL_statcache = data->statcache; 3420 PL_statcache = data->statcache;
2783 3421
2784 SvREFCNT_dec (data_sv); 3422 SvREFCNT_dec_NN (data_sv);
2785 } 3423 }
2786 3424
2787 /* push result values */ 3425 /* push result values */
2788 { 3426 {
2789 dSP; 3427 dSP;
… …
2815 dSP; 3453 dSP;
2816 3454
2817 static SV *prio_cv; 3455 static SV *prio_cv;
2818 static SV *prio_sv; 3456 static SV *prio_sv;
2819 3457
2820 if (expect_false (!prio_cv)) 3458 if (ecb_expect_false (!prio_cv))
2821 { 3459 {
2822 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3460 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2823 prio_sv = newSViv (0); 3461 prio_sv = newSViv (0);
2824 } 3462 }
2825 3463
… …
2844 3482
2845 for (i = 0; i < items; ++i) 3483 for (i = 0; i < items; ++i)
2846 PUSHs (arg [i]); 3484 PUSHs (arg [i]);
2847 3485
2848 /* now push the callback closure */ 3486 /* now push the callback closure */
2849 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3487 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2850 3488
2851 /* now call the AIO function - we assume our request is uncancelable */ 3489 /* now call the AIO function - we assume our request is uncancelable */
2852 PUTBACK; 3490 PUTBACK;
2853 call_sv ((SV *)req, G_VOID | G_DISCARD); 3491 call_sv ((SV *)req, G_VOID | G_DISCARD);
2854 } 3492 }
2855 3493
2856 /* now that the requets is going, we loop toll we have a result */ 3494 /* now that the request is going, we loop till we have a result */
2857 frame->data = (void *)state; 3495 frame->data = (void *)state;
2858 frame->prepare = prepare_schedule; 3496 frame->prepare = prepare_schedule;
2859 frame->check = slf_check_aio_req; 3497 frame->check = slf_check_aio_req;
2860} 3498}
2861 3499
… …
2873 3511
2874#if CORO_CLONE 3512#if CORO_CLONE
2875# include "clone.c" 3513# include "clone.c"
2876#endif 3514#endif
2877 3515
3516/*****************************************************************************/
3517
3518static SV *
3519coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3520{
3521 SV *coro_sv;
3522 struct coro *coro;
3523 MAGIC *mg;
3524 HV *hv;
3525 SV *cb;
3526 int i;
3527
3528 if (argc > 0)
3529 {
3530 cb = s_get_cv_croak (argv [0]);
3531
3532 if (!is_coro)
3533 {
3534 if (CvISXSUB (cb))
3535 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3536
3537 if (!CvROOT (cb))
3538 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3539 }
3540 }
3541
3542 Newz (0, coro, 1, struct coro);
3543 coro->args = newAV ();
3544 coro->flags = CF_NEW;
3545
3546 if (coro_first) coro_first->prev = coro;
3547 coro->next = coro_first;
3548 coro_first = coro;
3549
3550 coro->hv = hv = newHV ();
3551 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3552 mg->mg_flags |= MGf_DUP;
3553 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3554
3555 if (argc > 0)
3556 {
3557 av_extend (coro->args, argc + is_coro - 1);
3558
3559 if (is_coro)
3560 {
3561 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3562 cb = (SV *)cv_coro_run;
3563 }
3564
3565 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3566
3567 for (i = 1; i < argc; i++)
3568 av_push (coro->args, newSVsv (argv [i]));
3569 }
3570
3571 return coro_sv;
3572}
3573
3574#ifndef __cplusplus
3575ecb_cold XS(boot_Coro__State);
3576#endif
3577
3578#if CORO_JIT
3579
3580static void ecb_noinline ecb_cold
3581pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3582{
3583 dSP;
3584 AV *av = newAV ();
3585
3586 av_store (av, 3, newSVuv (d));
3587 av_store (av, 2, newSVuv (c));
3588 av_store (av, 1, newSVuv (b));
3589 av_store (av, 0, newSVuv (a));
3590
3591 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3592
3593 PUTBACK;
3594}
3595
3596static void ecb_noinline ecb_cold
3597jit_init (pTHX)
3598{
3599 dSP;
3600 SV *load, *save;
3601 char *map_base;
3602 char *load_ptr, *save_ptr;
3603 STRLEN load_len, save_len, map_len;
3604 int count;
3605
3606 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3607
3608 PUSHMARK (SP);
3609 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3610 #include "state.h"
3611 count = call_pv ("Coro::State::_jit", G_ARRAY);
3612 SPAGAIN;
3613
3614 save = POPs; save_ptr = SvPVbyte (save, save_len);
3615 load = POPs; load_ptr = SvPVbyte (load, load_len);
3616
3617 map_len = load_len + save_len + 16;
3618
3619 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3620
3621 if (map_base == (char *)MAP_FAILED)
3622 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3623
3624 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3625
3626 load_perl_slots = (load_save_perl_slots_type)map_base;
3627 memcpy (map_base, load_ptr, load_len);
3628
3629 map_base += (load_len + 15) & ~15;
3630
3631 save_perl_slots = (load_save_perl_slots_type)map_base;
3632 memcpy (map_base, save_ptr, save_len);
3633
3634 /* we are good citizens and try to make the page read-only, so the evil evil */
3635 /* hackers might have it a bit more difficult */
3636 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3637
3638 PUTBACK;
3639 eval_pv ("undef &Coro::State::_jit", 1);
3640}
3641
3642#endif
3643
2878MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3644MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2879 3645
2880PROTOTYPES: DISABLE 3646PROTOTYPES: DISABLE
2881 3647
2882BOOT: 3648BOOT:
2883{ 3649{
3650#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3651#include "state.h"
2884#ifdef USE_ITHREADS 3652#ifdef USE_ITHREADS
2885# if CORO_PTHREAD 3653# if CORO_PTHREAD
2886 coro_thx = PERL_GET_CONTEXT; 3654 coro_thx = PERL_GET_CONTEXT;
2887# endif 3655# endif
2888#endif 3656#endif
2889 BOOT_PAGESIZE; 3657 /* perl defines these to check for existance first, but why it doesn't */
3658 /* just create them one at init time is not clear to me, except for */
3659 /* programs trying to delete them, but... */
3660 /* anyway, we declare this as invalid and make sure they are initialised here */
3661 DEFSV;
3662 ERRSV;
2890 3663
2891 cctx_current = cctx_new_empty (); 3664 cctx_current = cctx_new_empty ();
2892 3665
2893 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3666 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2894 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3667 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2895 3668
2896 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3669 {
2897 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3670 /*
2898 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3671 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3672 * by coro_sig_vtbl in hash values.
3673 */
3674 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3675
3676 /* this only works if perl doesn't have a vtbl for %SIG */
3677 assert (!mg->mg_virtual);
3678
3679 /*
3680 * The irony is that the perl API itself asserts that mg_virtual
3681 * must be non-const, yet perl5porters insisted on marking their
3682 * vtbls as read-only, just to thwart perl modules from patching
3683 * them.
3684 */
3685 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3686 mg->mg_flags |= MGf_COPY;
3687
3688 coro_sigelem_vtbl = PL_vtbl_sigelem;
3689 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3690 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3691 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3692 }
2899 3693
2900 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2901 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3694 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2902 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3695 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2903 3696
2904 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3697 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3698
3699 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
2905 3700
2906 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3701 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
2907 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3702 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
2908 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3703 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
2909 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3704 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
2934 coroapi.prepare_nop = prepare_nop; 3729 coroapi.prepare_nop = prepare_nop;
2935 coroapi.prepare_schedule = prepare_schedule; 3730 coroapi.prepare_schedule = prepare_schedule;
2936 coroapi.prepare_cede = prepare_cede; 3731 coroapi.prepare_cede = prepare_cede;
2937 coroapi.prepare_cede_notself = prepare_cede_notself; 3732 coroapi.prepare_cede_notself = prepare_cede_notself;
2938 3733
2939 { 3734 time_init (aTHX);
2940 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2941 3735
2942 if (!svp) croak ("Time::HiRes is required");
2943 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2944
2945 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2946 }
2947
2948 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3736 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3737#if CORO_JIT
3738 PUTBACK;
3739 jit_init (aTHX);
3740 SPAGAIN;
3741#endif
2949} 3742}
2950 3743
2951SV * 3744SV *
2952new (char *klass, ...) 3745new (SV *klass, ...)
2953 ALIAS: 3746 ALIAS:
2954 Coro::new = 1 3747 Coro::new = 1
2955 CODE: 3748 CODE:
2956{ 3749 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2957 struct coro *coro; 3750 OUTPUT:
2958 MAGIC *mg;
2959 HV *hv;
2960 CV *cb;
2961 int i;
2962
2963 if (items > 1)
2964 {
2965 cb = coro_sv_2cv (aTHX_ ST (1));
2966
2967 if (!ix)
2968 {
2969 if (CvISXSUB (cb))
2970 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2971
2972 if (!CvROOT (cb))
2973 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2974 }
2975 }
2976
2977 Newz (0, coro, 1, struct coro);
2978 coro->args = newAV ();
2979 coro->flags = CF_NEW;
2980
2981 if (coro_first) coro_first->prev = coro;
2982 coro->next = coro_first;
2983 coro_first = coro;
2984
2985 coro->hv = hv = newHV ();
2986 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2987 mg->mg_flags |= MGf_DUP;
2988 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2989
2990 if (items > 1)
2991 {
2992 av_extend (coro->args, items - 1 + ix - 1);
2993
2994 if (ix)
2995 {
2996 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2997 cb = cv_coro_run;
2998 }
2999
3000 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3001
3002 for (i = 2; i < items; i++)
3003 av_push (coro->args, newSVsv (ST (i)));
3004 }
3005}
3006 OUTPUT:
3007 RETVAL 3751 RETVAL
3008 3752
3009void 3753void
3010transfer (...) 3754transfer (...)
3011 PROTOTYPE: $$ 3755 PROTOTYPE: $$
3012 CODE: 3756 CODE:
3013 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3757 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3014
3015bool
3016_destroy (SV *coro_sv)
3017 CODE:
3018 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3019 OUTPUT:
3020 RETVAL
3021
3022void
3023_exit (int code)
3024 PROTOTYPE: $
3025 CODE:
3026 _exit (code);
3027 3758
3028SV * 3759SV *
3029clone (Coro::State coro) 3760clone (Coro::State coro)
3030 CODE: 3761 CODE:
3031{ 3762{
… …
3086void 3817void
3087list () 3818list ()
3088 PROTOTYPE: 3819 PROTOTYPE:
3089 PPCODE: 3820 PPCODE:
3090{ 3821{
3091 struct coro *coro; 3822 struct coro *coro;
3092 for (coro = coro_first; coro; coro = coro->next) 3823 for (coro = coro_first; coro; coro = coro->next)
3093 if (coro->hv) 3824 if (coro->hv)
3094 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3825 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3095} 3826}
3096 3827
… …
3101 CODE: 3832 CODE:
3102{ 3833{
3103 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3834 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3104 { 3835 {
3105 struct coro *current = SvSTATE_current; 3836 struct coro *current = SvSTATE_current;
3837 struct CoroSLF slf_save;
3106 3838
3107 if (current != coro) 3839 if (current != coro)
3108 { 3840 {
3109 PUTBACK; 3841 PUTBACK;
3110 save_perl (aTHX_ current); 3842 save_perl (aTHX_ current);
3111 load_perl (aTHX_ coro); 3843 load_perl (aTHX_ coro);
3844 /* the coro is most likely in an active SLF call.
3845 * while not strictly required (the code we execute is
3846 * not allowed to call any SLF functions), it's cleaner
3847 * to reinitialise the slf_frame and restore it later.
3848 * This might one day allow us to actually do SLF calls
3849 * from code executed here.
3850 */
3851 slf_save = slf_frame;
3852 slf_frame.prepare = 0;
3112 SPAGAIN; 3853 SPAGAIN;
3113 } 3854 }
3114 3855
3115 PUSHSTACK; 3856 PUSHSTACK;
3116 3857
… …
3126 SPAGAIN; 3867 SPAGAIN;
3127 3868
3128 if (current != coro) 3869 if (current != coro)
3129 { 3870 {
3130 PUTBACK; 3871 PUTBACK;
3872 slf_frame = slf_save;
3131 save_perl (aTHX_ coro); 3873 save_perl (aTHX_ coro);
3132 load_perl (aTHX_ current); 3874 load_perl (aTHX_ current);
3133 SPAGAIN; 3875 SPAGAIN;
3134 } 3876 }
3135 } 3877 }
… …
3140 PROTOTYPE: $ 3882 PROTOTYPE: $
3141 ALIAS: 3883 ALIAS:
3142 is_ready = CF_READY 3884 is_ready = CF_READY
3143 is_running = CF_RUNNING 3885 is_running = CF_RUNNING
3144 is_new = CF_NEW 3886 is_new = CF_NEW
3145 is_destroyed = CF_DESTROYED 3887 is_destroyed = CF_ZOMBIE
3888 is_zombie = CF_ZOMBIE
3146 is_suspended = CF_SUSPENDED 3889 is_suspended = CF_SUSPENDED
3147 CODE: 3890 CODE:
3148 RETVAL = boolSV (coro->flags & ix); 3891 RETVAL = boolSV (coro->flags & ix);
3149 OUTPUT: 3892 OUTPUT:
3150 RETVAL 3893 RETVAL
3151 3894
3152void 3895void
3153throw (Coro::State self, SV *throw = &PL_sv_undef) 3896throw (SV *self, SV *exception = &PL_sv_undef)
3154 PROTOTYPE: $;$ 3897 PROTOTYPE: $;$
3155 CODE: 3898 CODE:
3156{ 3899{
3900 struct coro *coro = SvSTATE (self);
3157 struct coro *current = SvSTATE_current; 3901 struct coro *current = SvSTATE_current;
3158 SV **throwp = self == current ? &CORO_THROW : &self->except; 3902 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3159 SvREFCNT_dec (*throwp); 3903 SvREFCNT_dec (*exceptionp);
3160 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3904 SvGETMAGIC (exception);
3905 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3906
3907 api_ready (aTHX_ self);
3161} 3908}
3162 3909
3163void 3910void
3164api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3911api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3165 PROTOTYPE: $;$ 3912 PROTOTYPE: $;$
… …
3220 3967
3221void 3968void
3222cancel (Coro::State self) 3969cancel (Coro::State self)
3223 CODE: 3970 CODE:
3224 coro_state_destroy (aTHX_ self); 3971 coro_state_destroy (aTHX_ self);
3225 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3972
3973SV *
3974enable_times (int enabled = enable_times)
3975 CODE:
3976{
3977 RETVAL = boolSV (enable_times);
3978
3979 if (enabled != enable_times)
3980 {
3981 enable_times = enabled;
3982
3983 coro_times_update ();
3984 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3985 }
3986}
3987 OUTPUT:
3988 RETVAL
3989
3990void
3991times (Coro::State self)
3992 PPCODE:
3993{
3994 struct coro *current = SvSTATE (coro_current);
3995
3996 if (ecb_expect_false (current == self))
3997 {
3998 coro_times_update ();
3999 coro_times_add (SvSTATE (coro_current));
4000 }
4001
4002 EXTEND (SP, 2);
4003 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
4004 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
4005
4006 if (ecb_expect_false (current == self))
4007 coro_times_sub (SvSTATE (coro_current));
4008}
4009
4010void
4011swap_sv (Coro::State coro, SV *sva, SV *svb)
4012 CODE:
4013{
4014 struct coro *current = SvSTATE_current;
4015 AV *swap_sv;
4016 int i;
4017
4018 sva = SvRV (sva);
4019 svb = SvRV (svb);
4020
4021 if (current == coro)
4022 SWAP_SVS_LEAVE (current);
4023
4024 if (!coro->swap_sv)
4025 coro->swap_sv = newAV ();
4026
4027 swap_sv = coro->swap_sv;
4028
4029 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4030 {
4031 SV *a = AvARRAY (swap_sv)[i ];
4032 SV *b = AvARRAY (swap_sv)[i + 1];
4033
4034 if (a == sva && b == svb)
4035 {
4036 SvREFCNT_dec_NN (a);
4037 SvREFCNT_dec_NN (b);
4038
4039 for (; i <= AvFILLp (swap_sv) - 2; i++)
4040 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4041
4042 AvFILLp (swap_sv) -= 2;
4043
4044 goto removed;
4045 }
4046 }
4047
4048 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4049 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4050
4051 removed:
4052
4053 if (current == coro)
4054 SWAP_SVS_ENTER (current);
4055}
3226 4056
3227 4057
3228MODULE = Coro::State PACKAGE = Coro 4058MODULE = Coro::State PACKAGE = Coro
3229 4059
3230BOOT: 4060BOOT:
3231{ 4061{
4062 if (SVt_LAST > 32)
4063 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4064
3232 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4065 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3233 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4066 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3234 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4067 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3235 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3236 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4068 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3237 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4069 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3238 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4070 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3239 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4071 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3240 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4072 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3241 4073
3242 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4074 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3243 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4075 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3244 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4076 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3245 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4077 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3246 4078
3247 coro_stash = gv_stashpv ("Coro", TRUE); 4079 coro_stash = gv_stashpv ("Coro", TRUE);
3248 4080
3249 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4081 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3250 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4082 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3251 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4083 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3252 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4084 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3253 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4085 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3254 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4086 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3255 4087
3256 { 4088 {
3257 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4089 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3258 4090
3259 coroapi.schedule = api_schedule; 4091 coroapi.schedule = api_schedule;
… …
3263 coroapi.ready = api_ready; 4095 coroapi.ready = api_ready;
3264 coroapi.is_ready = api_is_ready; 4096 coroapi.is_ready = api_is_ready;
3265 coroapi.nready = coro_nready; 4097 coroapi.nready = coro_nready;
3266 coroapi.current = coro_current; 4098 coroapi.current = coro_current;
3267 4099
4100 coroapi.enterleave_hook = api_enterleave_hook;
4101 coroapi.enterleave_unhook = api_enterleave_unhook;
4102 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4103
3268 /*GCoroAPI = &coroapi;*/ 4104 /*GCoroAPI = &coroapi;*/
3269 sv_setiv (sv, (IV)&coroapi); 4105 sv_setiv (sv, PTR2IV (&coroapi));
3270 SvREADONLY_on (sv); 4106 SvREADONLY_on (sv);
3271 } 4107 }
3272} 4108}
4109
4110SV *
4111async (...)
4112 PROTOTYPE: &@
4113 CODE:
4114 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4115 api_ready (aTHX_ RETVAL);
4116 OUTPUT:
4117 RETVAL
4118
4119void
4120_destroy (Coro::State coro)
4121 CODE:
4122 /* used by the manager thread */
4123 coro_state_destroy (aTHX_ coro);
4124
4125void
4126on_destroy (Coro::State coro, SV *cb)
4127 CODE:
4128 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4129
4130void
4131join (...)
4132 CODE:
4133 CORO_EXECUTE_SLF_XS (slf_init_join);
3273 4134
3274void 4135void
3275terminate (...) 4136terminate (...)
3276 CODE: 4137 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4138 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3278 4139
3279void 4140void
4141cancel (...)
4142 CODE:
4143 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4144
4145int
4146safe_cancel (Coro::State self, ...)
4147 C_ARGS: aTHX_ self, &ST (1), items - 1
4148
4149void
3280schedule (...) 4150schedule (...)
3281 CODE: 4151 CODE:
3282 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4152 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3283 4153
3284void 4154void
… …
3303 4173
3304void 4174void
3305_set_current (SV *current) 4175_set_current (SV *current)
3306 PROTOTYPE: $ 4176 PROTOTYPE: $
3307 CODE: 4177 CODE:
3308 SvREFCNT_dec (SvRV (coro_current)); 4178 SvREFCNT_dec_NN (SvRV (coro_current));
3309 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4179 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3310 4180
3311void 4181void
3312_set_readyhook (SV *hook) 4182_set_readyhook (SV *hook)
3313 PROTOTYPE: $ 4183 PROTOTYPE: $
3314 CODE: 4184 CODE:
3315 SvREFCNT_dec (coro_readyhook); 4185 SvREFCNT_dec (coro_readyhook);
4186 SvGETMAGIC (hook);
4187 if (SvOK (hook))
4188 {
3316 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4189 coro_readyhook = newSVsv (hook);
4190 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4191 }
4192 else
4193 {
4194 coro_readyhook = 0;
4195 CORO_READYHOOK = 0;
4196 }
3317 4197
3318int 4198int
3319prio (Coro::State coro, int newprio = 0) 4199prio (Coro::State coro, int newprio = 0)
3320 PROTOTYPE: $;$ 4200 PROTOTYPE: $;$
3321 ALIAS: 4201 ALIAS:
… …
3327 if (items > 1) 4207 if (items > 1)
3328 { 4208 {
3329 if (ix) 4209 if (ix)
3330 newprio = coro->prio - newprio; 4210 newprio = coro->prio - newprio;
3331 4211
3332 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4212 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3333 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4213 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3334 4214
3335 coro->prio = newprio; 4215 coro->prio = newprio;
3336 } 4216 }
3337} 4217}
3338 OUTPUT: 4218 OUTPUT:
… …
3385 for (i = 1; i < items; ++i) 4265 for (i = 1; i < items; ++i)
3386 av_push (av, SvREFCNT_inc_NN (ST (i))); 4266 av_push (av, SvREFCNT_inc_NN (ST (i)));
3387 4267
3388 if ((SV *)hv == &PL_sv_undef) 4268 if ((SV *)hv == &PL_sv_undef)
3389 { 4269 {
3390 PUSHMARK (SP); 4270 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3391 EXTEND (SP, 2);
3392 PUSHs (sv_Coro);
3393 PUSHs ((SV *)cv_pool_handler);
3394 PUTBACK;
3395 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3396 SPAGAIN;
3397
3398 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4271 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4272 SvREFCNT_dec_NN (sv);
3399 } 4273 }
3400 4274
3401 { 4275 {
3402 struct coro *coro = SvSTATE_hv (hv); 4276 struct coro *coro = SvSTATE_hv (hv);
3403 4277
… …
3410 api_ready (aTHX_ (SV *)hv); 4284 api_ready (aTHX_ (SV *)hv);
3411 4285
3412 if (GIMME_V != G_VOID) 4286 if (GIMME_V != G_VOID)
3413 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4287 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3414 else 4288 else
3415 SvREFCNT_dec (hv); 4289 SvREFCNT_dec_NN (hv);
3416} 4290}
3417 4291
3418SV * 4292SV *
3419rouse_cb () 4293rouse_cb ()
3420 PROTOTYPE: 4294 PROTOTYPE:
… …
3435 on_leave = 1 4309 on_leave = 1
3436 PROTOTYPE: & 4310 PROTOTYPE: &
3437 CODE: 4311 CODE:
3438{ 4312{
3439 struct coro *coro = SvSTATE_current; 4313 struct coro *coro = SvSTATE_current;
3440 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4314 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3441 4315
3442 block = (SV *)coro_sv_2cv (aTHX_ block); 4316 block = s_get_cv_croak (block);
3443 4317
3444 if (!*avp) 4318 if (!*avp)
3445 *avp = newAV (); 4319 *avp = newAV ();
3446 4320
3447 av_push (*avp, SvREFCNT_inc (block)); 4321 av_push (*avp, SvREFCNT_inc (block));
… …
3464MODULE = Coro::State PACKAGE = Coro::Semaphore 4338MODULE = Coro::State PACKAGE = Coro::Semaphore
3465 4339
3466SV * 4340SV *
3467new (SV *klass, SV *count = 0) 4341new (SV *klass, SV *count = 0)
3468 CODE: 4342 CODE:
4343{
4344 int semcnt = 1;
4345
4346 if (count)
4347 {
4348 SvGETMAGIC (count);
4349
4350 if (SvOK (count))
4351 semcnt = SvIV (count);
4352 }
4353
3469 RETVAL = sv_bless ( 4354 RETVAL = sv_bless (
3470 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4355 coro_waitarray_new (aTHX_ semcnt),
3471 GvSTASH (CvGV (cv)) 4356 GvSTASH (CvGV (cv))
3472 ); 4357 );
4358}
3473 OUTPUT: 4359 OUTPUT:
3474 RETVAL 4360 RETVAL
3475 4361
3476# helper for Coro::Channel and others 4362# helper for Coro::Channel and others
3477SV * 4363SV *
… …
3487 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4373 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3488 OUTPUT: 4374 OUTPUT:
3489 RETVAL 4375 RETVAL
3490 4376
3491void 4377void
3492up (SV *self, int adjust = 1) 4378up (SV *self)
3493 ALIAS:
3494 adjust = 1
3495 CODE: 4379 CODE:
4380 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4381
4382void
4383adjust (SV *self, int adjust)
4384 CODE:
3496 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4385 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3497 4386
3498void 4387void
3499down (...) 4388down (...)
3500 CODE: 4389 CODE:
3501 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4390 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3523 XSRETURN_NO; 4412 XSRETURN_NO;
3524} 4413}
3525 4414
3526void 4415void
3527waiters (SV *self) 4416waiters (SV *self)
3528 PPCODE: 4417 PPCODE:
3529{ 4418{
3530 AV *av = (AV *)SvRV (self); 4419 AV *av = (AV *)SvRV (self);
3531 int wcount = AvFILLp (av) + 1 - 1; 4420 int wcount = AvFILLp (av) + 1 - 1;
3532 4421
3533 if (GIMME_V == G_SCALAR) 4422 if (GIMME_V == G_SCALAR)
… …
3542} 4431}
3543 4432
3544MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4433MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3545 4434
3546void 4435void
3547_may_delete (SV *sem, int count, int extra_refs) 4436_may_delete (SV *sem, int count, unsigned int extra_refs)
3548 PPCODE: 4437 PPCODE:
3549{ 4438{
3550 AV *av = (AV *)SvRV (sem); 4439 AV *av = (AV *)SvRV (sem);
3551 4440
3552 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4441 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3553 && AvFILLp (av) == 0 /* no waiters, just count */ 4442 && AvFILLp (av) == 0 /* no waiters, just count */
3554 && SvIV (AvARRAY (av)[0]) == count) 4443 && SvIV (AvARRAY (av)[0]) == count)
3555 XSRETURN_YES; 4444 XSRETURN_YES;
… …
3576 4465
3577void 4466void
3578broadcast (SV *self) 4467broadcast (SV *self)
3579 CODE: 4468 CODE:
3580{ 4469{
3581 AV *av = (AV *)SvRV (self); 4470 AV *av = (AV *)SvRV (self);
3582 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4471 coro_signal_wake (aTHX_ av, AvFILLp (av));
3583} 4472}
3584 4473
3585void 4474void
3586send (SV *self) 4475send (SV *self)
… …
3594 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4483 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3595} 4484}
3596 4485
3597IV 4486IV
3598awaited (SV *self) 4487awaited (SV *self)
3599 CODE: 4488 CODE:
3600 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4489 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3601 OUTPUT: 4490 OUTPUT:
3602 RETVAL 4491 RETVAL
3603 4492
3604 4493
… …
3609 4498
3610void 4499void
3611_schedule (...) 4500_schedule (...)
3612 CODE: 4501 CODE:
3613{ 4502{
3614 static int incede; 4503 static int incede;
3615 4504
3616 api_cede_notself (aTHX); 4505 api_cede_notself (aTHX);
3617 4506
3618 ++incede; 4507 ++incede;
3619 while (coro_nready >= incede && api_cede (aTHX)) 4508 while (coro_nready >= incede && api_cede (aTHX))
… …
3635 4524
3636void 4525void
3637_register (char *target, char *proto, SV *req) 4526_register (char *target, char *proto, SV *req)
3638 CODE: 4527 CODE:
3639{ 4528{
3640 CV *req_cv = coro_sv_2cv (aTHX_ req); 4529 SV *req_cv = s_get_cv_croak (req);
3641 /* newXSproto doesn't return the CV on 5.8 */ 4530 /* newXSproto doesn't return the CV on 5.8 */
3642 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4531 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3643 sv_setpv ((SV *)slf_cv, proto); 4532 sv_setpv ((SV *)slf_cv, proto);
3644 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4533 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3645} 4534}
3646 4535
4536MODULE = Coro::State PACKAGE = Coro::Select
4537
4538void
4539patch_pp_sselect ()
4540 CODE:
4541 if (!coro_old_pp_sselect)
4542 {
4543 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4544 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4545 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4546 }
4547
4548void
4549unpatch_pp_sselect ()
4550 CODE:
4551 if (coro_old_pp_sselect)
4552 {
4553 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4554 coro_old_pp_sselect = 0;
4555 }
4556
4557MODULE = Coro::State PACKAGE = Coro::Util
4558
4559void
4560_exit (int code)
4561 CODE:
4562 _exit (code);
4563
4564NV
4565time ()
4566 CODE:
4567 RETVAL = nvtime (aTHX);
4568 OUTPUT:
4569 RETVAL
4570
4571NV
4572gettimeofday ()
4573 PPCODE:
4574{
4575 UV tv [2];
4576 u2time (aTHX_ tv);
4577 EXTEND (SP, 2);
4578 PUSHs (sv_2mortal (newSVuv (tv [0])));
4579 PUSHs (sv_2mortal (newSVuv (tv [1])));
4580}
4581

Diff Legend

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