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.358 by root, Mon Jun 29 04:30:25 2009 UTC vs.
Revision 1.481 by root, Thu Aug 19 22:43:02 2021 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
… …
169# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 138# endif
172#endif 139#endif
173 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
174static 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]);
175 161
176/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 164static OP *pp_slf (pTHX);
165static void slf_destroy (pTHX_ struct coro *coro);
179 166
180static U32 cctx_gen; 167static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
… …
191 178
192static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
193static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
194static SV *rv_diehook; 181static SV *rv_diehook;
195static SV *rv_warnhook; 182static SV *rv_warnhook;
196static HV *hv_sig; /* %SIG */
197 183
198/* async_pool helper stuff */ 184/* async_pool helper stuff */
199static SV *sv_pool_rss; 185static SV *sv_pool_rss;
200static SV *sv_pool_size; 186static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 188static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 189static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 190static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 191
207/* Coro::AnyEvent */ 192/* Coro::AnyEvent */
208static SV *sv_activity; 193static SV *sv_activity;
209 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
210static struct coro_cctx *cctx_first; 201static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 202static int cctx_count, cctx_idle;
212 203
213enum { 204enum
205{
214 CC_MAPPED = 0x01, 206 CC_MAPPED = 0x01,
215 CC_NOREUSE = 0x02, /* throw this away after tracing */ 207 CC_NOREUSE = 0x02, /* throw this away after tracing */
216 CC_TRACE = 0x04, 208 CC_TRACE = 0x04,
217 CC_TRACE_SUB = 0x08, /* trace sub calls */ 209 CC_TRACE_SUB = 0x08, /* trace sub calls */
218 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
223typedef struct coro_cctx 215typedef struct coro_cctx
224{ 216{
225 struct coro_cctx *next; 217 struct coro_cctx *next;
226 218
227 /* the stack */ 219 /* the stack */
228 void *sptr; 220 struct coro_stack stack;
229 size_t ssize;
230 221
231 /* cpu state */ 222 /* cpu state */
232 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
233 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
234 JMPENV *top_env; 227 JMPENV *top_env;
235 coro_context cctx; 228 coro_context cctx;
236 229
237 U32 gen; 230 U32 gen;
238#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
239 int valgrind_id; 232 int valgrind_id;
240#endif 233#endif
241 unsigned char flags; 234 unsigned char flags;
242} coro_cctx; 235} coro_cctx;
243 236
244coro_cctx *cctx_current; /* the currently running cctx */ 237static coro_cctx *cctx_current; /* the currently running cctx */
245 238
246/*****************************************************************************/ 239/*****************************************************************************/
247 240
241static MGVTBL coro_state_vtbl;
242
248enum { 243enum
244{
249 CF_RUNNING = 0x0001, /* coroutine is running */ 245 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 246 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 247 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 248 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
253 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) */
254}; 251};
255 252
256/* 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 */
257typedef struct 254typedef struct
258{ 255{
259 SV *defsv;
260 AV *defav;
261 SV *errsv;
262 SV *irsgv;
263 HV *hinthv;
264#define VAR(name,type) type name; 256 #define VARx(name,expr,type) type name;
265# include "state.h" 257 #include "state.h"
266#undef VAR
267} perl_slots; 258} perl_slots;
268 259
260/* how many context stack entries do we need for perl_slots */
269#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))
270 262
271/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
272struct coro { 264struct coro
265{
273 /* the C coroutine allocated to this perl coroutine, if any */ 266 /* the C coroutine allocated to this perl coroutine, if any */
274 coro_cctx *cctx; 267 coro_cctx *cctx;
275 268
276 /* ready queue */ 269 /* ready queue */
277 struct coro *next_ready; 270 struct coro *next_ready;
… …
279 /* state data */ 272 /* state data */
280 struct CoroSLF slf_frame; /* saved slf frame */ 273 struct CoroSLF slf_frame; /* saved slf frame */
281 AV *mainstack; 274 AV *mainstack;
282 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
283 276
284 CV *startcv; /* the CV to execute */ 277 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 278 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 279 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 280 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro);
290 281
291 /* statistics */ 282 /* statistics */
292 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
293 284
294 /* coro process data */ 285 /* coro process data */
295 int prio; 286 int prio;
296 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
297 SV *rouse_cb; 288 SV *rouse_cb; /* most recently created rouse callback */
289 AV *on_destroy; /* callbacks or coros to notify on destroy */
290 AV *status; /* the exit status list */
298 291
299 /* async_pool */ 292 /* async_pool */
300 SV *saved_deffh; 293 SV *saved_deffh;
301 SV *invoke_cb; 294 SV *invoke_cb;
302 AV *invoke_av; 295 AV *invoke_av;
303 296
304 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
305 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
306 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;
307 306
308 /* linked list */ 307 /* linked list */
309 struct coro *next, *prev; 308 struct coro *next, *prev;
310}; 309};
311 310
312typedef struct coro *Coro__State; 311typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 312typedef struct coro *Coro__State_or_hashref;
314 313
315/* the following variables are effectively part of the perl context */ 314/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 315/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 316/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 317static struct CoroSLF slf_frame; /* the current slf frame */
319 318
320/** Coro ********************************************************************/ 319/** Coro ********************************************************************/
321 320
322#define CORO_PRIO_MAX 3 321#define CORO_PRIO_MAX 3
… …
328 327
329/* for Coro.pm */ 328/* for Coro.pm */
330static SV *coro_current; 329static SV *coro_current;
331static SV *coro_readyhook; 330static SV *coro_readyhook;
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 331static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 332static CV *cv_coro_run;
334static struct coro *coro_first; 333static struct coro *coro_first;
335#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
336 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
337/** lowlevel stuff **********************************************************/ 431/** lowlevel stuff **********************************************************/
338 432
339static SV * 433static SV * ecb_noinline
340coro_get_sv (pTHX_ const char *name, int create) 434coro_get_sv (pTHX_ const char *name, int create)
341{ 435{
342#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
343 /* 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 */
344 get_sv (name, create); 438 get_sv (name, create);
345#endif 439#endif
346 return get_sv (name, create); 440 return get_sv (name, create);
347} 441}
348 442
349static AV * 443static AV * ecb_noinline
350coro_get_av (pTHX_ const char *name, int create) 444coro_get_av (pTHX_ const char *name, int create)
351{ 445{
352#if PERL_VERSION_ATLEAST (5,10,0) 446#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_av (name, create); 448 get_av (name, create);
355#endif 449#endif
356 return get_av (name, create); 450 return get_av (name, create);
357} 451}
358 452
359static HV * 453static HV * ecb_noinline
360coro_get_hv (pTHX_ const char *name, int create) 454coro_get_hv (pTHX_ const char *name, int create)
361{ 455{
362#if PERL_VERSION_ATLEAST (5,10,0) 456#if PERL_VERSION_ATLEAST (5,10,0)
363 /* 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 */
364 get_hv (name, create); 458 get_hv (name, create);
365#endif 459#endif
366 return get_hv (name, create); 460 return get_hv (name, create);
367} 461}
368 462
369/* may croak */ 463ecb_inline void
370INLINE CV * 464coro_times_update (void)
371coro_sv_2cv (pTHX_ SV *sv)
372{ 465{
373 HV *st; 466#ifdef coro_clock_gettime
374 GV *gvp; 467 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 468
377 if (!cv) 469 ts.tv_sec = ts.tv_nsec = 0;
378 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;
379 472
380 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];
381} 508}
382 509
383/*****************************************************************************/ 510/*****************************************************************************/
384/* magic glue */ 511/* magic glue */
385 512
386#define CORO_MAGIC_type_cv 26 513#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext 514#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 515
389#define CORO_MAGIC_NN(sv, type) \ 516#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \ 517 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \ 518 ? SvMAGIC (sv) \
392 : mg_find (sv, type)) 519 : mg_find (sv, type))
393 520
394#define CORO_MAGIC(sv, type) \ 521#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \ 522 (ecb_expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \ 523 ? CORO_MAGIC_NN (sv, type) \
397 : 0) 524 : 0)
398 525
399#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)
400#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)
401 528
402INLINE struct coro * 529ecb_inline MAGIC *
403SvSTATE_ (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
404{ 531{
405 HV *stash;
406 MAGIC *mg; 532 MAGIC *mg;
407 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
408 if (SvROK (coro)) 549 if (SvROK (coro_sv))
409 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
410 551
411 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
553 if (!mg)
412 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
413 555
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
424} 557}
425 558
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 559#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427 560
… …
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431 564
432/*****************************************************************************/ 565/*****************************************************************************/
433/* padlist management and caching */ 566/* padlist management and caching */
434 567
435static AV * 568ecb_inline PADLIST *
436coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
437{ 570{
438 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
439 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
440 576
441 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. */
442 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
443#if PERL_VERSION_ATLEAST (5,10,0)
444 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
445#else
446 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
447#endif 606#endif
448 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
449 --AvFILLp (padlist);
450 607
451 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
452 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;
453 616
454 return newpadlist; 617 return newpadlist;
455} 618}
456 619
457static void 620ecb_inline void
458free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
459{ 622{
460 /* may be during global destruction */ 623 /* may be during global destruction */
461 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
462 { 625 {
463 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
464 627
465 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
466 { 629 {
467 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
468 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
469 I32 j = AvFILLp (av);
470 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
471 while (j >= 0) 637 while (j >= 0)
472 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
473 639
474 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
475 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
476 } 643 }
477 644
478 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
479 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
480 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
481 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
482 } 655 }
483} 656}
484 657
485static int 658static int
486coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
487{ 660{
488 AV *padlist; 661 PADLIST *padlist;
489 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;
490 664
491 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
493 return; 667 return 0;
494 668
495 /* casting is fun. */ 669 while (len--)
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
498
499 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
500 671
501 return 0; 672 return 0;
502} 673}
503 674
504static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
505 0, 0, 0, 0, 676 0, 0, 0, 0,
506 coro_cv_free 677 coro_cv_free
507}; 678};
508 679
509/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
510static void 681ecb_inline void
511get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
512{ 683{
513 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
514 AV *av; 685 size_t *lenp;
515 686
516 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
517 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
518 else 689 else
519 { 690 {
520#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
521 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
522 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
528 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
529#endif 700#endif
530 } 701 }
531} 702}
532 703
533static void 704ecb_inline void
534put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
535{ 706{
536 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
537 AV *av;
538 708
539 if (expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
540 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);
541 719
542 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
543
544 if (expect_false (AvFILLp (av) >= AvMAX (av)))
545 av_extend (av, AvFILLp (av) + 1);
546
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 721}
549 722
550/** 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))
551 793
552static void 794static void
553on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
554 796
555static void 797static void
… …
558 perl_slots *slot = c->slot; 800 perl_slots *slot = c->slot;
559 c->slot = 0; 801 c->slot = 0;
560 802
561 PL_mainstack = c->mainstack; 803 PL_mainstack = c->mainstack;
562 804
563 GvSV (PL_defgv) = slot->defsv; 805#if CORO_JIT
564 GvAV (PL_defgv) = slot->defav; 806 load_perl_slots (slot);
565 GvSV (PL_errgv) = slot->errsv; 807#else
566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
568
569 #define VAR(name,type) PL_ ## name = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
570 # include "state.h" 809 #include "state.h"
571 #undef VAR 810#endif
572 811
573 { 812 {
574 dSP; 813 dSP;
575 814
576 CV *cv; 815 CV *cv;
577 816
578 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
579 while (expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
580 { 819 {
581 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
582 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
583 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
584 } 823 }
585 824
586 PUTBACK; 825 PUTBACK;
587 } 826 }
588 827
589 slf_frame = c->slf_frame; 828 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 829 CORO_THROW = c->except;
591 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
592 if (expect_false (c->on_enter)) 839 if (ecb_expect_false (c->on_enter))
593 { 840 {
594 int i; 841 int i;
595 842
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 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);
599} 856}
600 857
601static void 858static void
602save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
603{ 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
604 if (expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
605 { 872 {
606 int i; 873 int i;
607 874
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 875 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 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);
610 } 885 }
611 886
612 c->except = CORO_THROW; 887 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 888 c->slf_frame = slf_frame;
614 889
… …
625 900
626 XPUSHs (Nullsv); 901 XPUSHs (Nullsv);
627 /* this loop was inspired by pp_caller */ 902 /* this loop was inspired by pp_caller */
628 for (;;) 903 for (;;)
629 { 904 {
630 while (expect_true (cxix >= 0)) 905 while (ecb_expect_true (cxix >= 0))
631 { 906 {
632 PERL_CONTEXT *cx = &ccstk[cxix--]; 907 PERL_CONTEXT *cx = &ccstk[cxix--];
633 908
634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 909 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
635 { 910 {
636 CV *cv = cx->blk_sub.cv; 911 CV *cv = cx->blk_sub.cv;
637 912
638 if (expect_true (CvDEPTH (cv))) 913 if (ecb_expect_true (CvDEPTH (cv)))
639 { 914 {
640 EXTEND (SP, 3); 915 EXTEND (SP, 3);
641 PUSHs ((SV *)CvPADLIST (cv)); 916 PUSHs ((SV *)CvPADLIST (cv));
642 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 917 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
643 PUSHs ((SV *)cv); 918 PUSHs ((SV *)cv);
… …
646 get_padlist (aTHX_ cv); 921 get_padlist (aTHX_ cv);
647 } 922 }
648 } 923 }
649 } 924 }
650 925
651 if (expect_true (top_si->si_type == PERLSI_MAIN)) 926 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
652 break; 927 break;
653 928
654 top_si = top_si->si_prev; 929 top_si = top_si->si_prev;
655 ccstk = top_si->si_cxstack; 930 ccstk = top_si->si_cxstack;
656 cxix = top_si->si_cxix; 931 cxix = top_si->si_cxix;
… …
658 933
659 PUTBACK; 934 PUTBACK;
660 } 935 }
661 936
662 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 939 {
668 int i; 940 unsigned int i;
941
669 for (i = 3; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 943 CXINC;
671 } 944
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 945 cxstack_ix -= SLOT_COUNT; /* undo allocation */
946 }
673 947
674 c->mainstack = PL_mainstack; 948 c->mainstack = PL_mainstack;
675 949
676 { 950 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 951 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
678 952
679 slot->defav = GvAV (PL_defgv); 953#if CORO_JIT
680 slot->defsv = DEFSV; 954 save_perl_slots (slot);
681 slot->errsv = ERRSV; 955#else
682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
684
685 #define VAR(name,type) slot->name = PL_ ## name; 956 #define VARx(name,expr,type) slot->name = expr;
686 # include "state.h" 957 #include "state.h"
687 #undef VAR 958#endif
688 } 959 }
689} 960}
690 961
691/* 962/*
692 * allocate various perl stacks. This is almost an exact copy 963 * allocate various perl stacks. This is almost an exact copy
… …
698# define coro_init_stacks(thx) init_stacks () 969# define coro_init_stacks(thx) init_stacks ()
699#else 970#else
700static void 971static void
701coro_init_stacks (pTHX) 972coro_init_stacks (pTHX)
702{ 973{
703 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() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 975 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 976 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 977 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 978
708 PL_stack_base = AvARRAY(PL_curstack); 979 PL_stack_base = AvARRAY(PL_curstack);
… …
723#endif 994#endif
724 995
725 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
726 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
727 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
728 1002
729 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
730 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
731 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
732 1011
733#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
734 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
735 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
736 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
760 } 1039 }
761 1040
762 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
763 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
764 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
765 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
766#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
767 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
768#endif 1050#endif
769} 1051}
… …
799 } 1081 }
800 1082
801 return rss; 1083 return rss;
802} 1084}
803 1085
804/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
805
806static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
807static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
808static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
809 1087
810/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
811#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
812#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
813 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
814 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
815#endif 1093#endif
816 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
817/* 1123/*
818 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
819 * 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
820 * 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),
821 * readback here. 1127 * we just provide our own readback here.
822 */ 1128 */
823static int 1129static int ecb_cold
824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
825{ 1131{
826 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;
827 1135
828 if (*s == '_') 1136 SV *ssv;
829 {
830 SV **svp = 0;
831 1137
832 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
833 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
834
835 if (svp) 1138 if (!*svp)
836 { 1139 ssv = &PL_sv_undef;
837 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
838 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
839 } 1142 else
840 } 1143 ssv = *svp;
841 1144
842 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
843} 1147}
844 1148
845static int 1149static int ecb_cold
846coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
847{ 1151{
848 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;
849 1155
850 if (*s == '_')
851 {
852 SV **svp = 0;
853
854 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
855 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
856
857 if (svp)
858 {
859 SV *old = *svp; 1156 SV *old = *svp;
860 *svp = 0; 1157 *svp = 0;
861 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
862 return 0; 1159 return 0;
863 }
864 }
865
866 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
867} 1160}
868 1161
869static int 1162static int ecb_cold
870coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
871{ 1164{
872 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;
873 1168
874 if (*s == '_')
875 {
876 SV **svp = 0;
877
878 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
880
881 if (svp)
882 {
883 SV *old = *svp; 1169 SV *old = *svp;
884 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
885 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
886 return 0; 1172 return 0;
887 }
888 }
889
890 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
891} 1173}
892 1174
893static void 1175static void
894prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
895{ 1177{
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1190{
909 return 1; 1191 return 1;
910} 1192}
911 1193
912static UNOP coro_setup_op; 1194/** coroutine stack handling ************************************************/
913 1195
914static 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 */
915coro_setup (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
916{ 1200{
917 /* 1201 /*
918 * emulate part of the perl startup here. 1202 * emulate part of the perl startup here.
919 */ 1203 */
920 coro_init_stacks (aTHX); 1204 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1211 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1212 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1213 PL_curpm = 0;
930 PL_curpad = 0; 1214 PL_curpad = 0;
931 PL_localizing = 0; 1215 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1216 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1217#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1218 PL_parser = 0;
936#endif 1219#endif
937 PL_hints = 0; 1220 PL_hints = 0;
938 1221
939 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
942 1225
943 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
944 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
945 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
946 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);
947 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
948 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
949 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
950 1236
951 { 1237 {
952 dSP; 1238 dSP;
… …
956 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
957 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
958 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
959 1245
960 PUSHMARK (SP); 1246 PUSHMARK (SP);
961 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
962 PUTBACK; 1248 PUTBACK;
963 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
964 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
965 } 1251 }
966 1252
967 /* 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
968 * 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.
969 */ 1255 */
970 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 */
971 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;
972 1259
973 /* 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 */
974 coro_setup_op.op_next = PL_op; 1261 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1262 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1263 init_perl_op.op_ppaddr = pp_slf;
977 /* 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 */
978 1265
979 PL_op = (OP *)&coro_setup_op; 1266 PL_op = (OP *)&init_perl_op;
980 1267
981 /* copy throw, in case it was set before coro_setup */ 1268 /* copy throw, in case it was set before init_perl */
982 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 }
983} 1278}
984 1279
985static void 1280static void
986coro_unwind_stacks (pTHX) 1281coro_unwind_stacks (pTHX)
987{ 1282{
… …
1002 dounwind (-1); 1297 dounwind (-1);
1003 } 1298 }
1004} 1299}
1005 1300
1006static void 1301static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1302destroy_perl (pTHX_ struct coro *coro)
1008{ 1303{
1009 SV *svf [9]; 1304 SV *svf [9];
1010 1305
1011 { 1306 {
1307 SV *old_current = SvRV (coro_current);
1012 struct coro *current = SvSTATE_current; 1308 struct coro *current = SvSTATE (old_current);
1013 1309
1014 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));
1015 1311
1016 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
1017 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1018 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1019 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1323
1020 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1021 1325
1022 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1023 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1333 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1334 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1335 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1336 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1337
1338 SvRV_set (coro_current, old_current);
1339
1034 load_perl (aTHX_ current); 1340 load_perl (aTHX_ current);
1035 } 1341 }
1036 1342
1037 { 1343 {
1038 int i; 1344 unsigned int i;
1039 1345
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1346 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1347 SvREFCNT_dec (svf [i]);
1042 1348
1043 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1044 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1045 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1046 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);
1047 } 1355 }
1048} 1356}
1049 1357
1050INLINE void 1358ecb_inline void
1051free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1052{ 1360{
1053 if (expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1054 { 1362 {
1055 SvREFCNT_dec (coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1056 coro_mortal = 0; 1364 coro_mortal = 0;
1057 } 1365 }
1058} 1366}
1059 1367
1060static int 1368static int
… …
1092 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1093 1401
1094 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1095 ENTER; 1403 ENTER;
1096 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1097 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1098 PUSHMARK (SP);
1099 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1100 PUSHs (fullname); 1408 PUSHs (fullname);
1101 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1102 PUTBACK; 1410 PUTBACK;
1103 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);
… …
1114 1422
1115 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1116 { 1424 {
1117 SV **cb; 1425 SV **cb;
1118 1426
1119 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1120 { 1428 {
1121 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1122 1430
1123 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1124 { 1432 {
… …
1130 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1131 1439
1132 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1133 ENTER; 1441 ENTER;
1134 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1135 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1136 PUSHMARK (SP);
1137 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1138 PUSHs (fullname); 1446 PUSHs (fullname);
1139 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);
1140 PUTBACK; 1448 PUTBACK;
1141 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);
1142 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);
1143 SPAGAIN; 1451 SPAGAIN;
1144 FREETMPS; 1452 FREETMPS;
… …
1154 dSP; 1462 dSP;
1155 1463
1156 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1157 ENTER; 1465 ENTER;
1158 SAVETMPS; 1466 SAVETMPS;
1159 EXTEND (SP, 3);
1160 PL_runops = RUNOPS_DEFAULT;
1161 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1162 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1163 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1164 PUTBACK; 1471 PUTBACK;
1165 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);
1166 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);
… …
1193 1500
1194 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 */
1195} 1502}
1196 1503
1197/* 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 */
1198static void NOINLINE 1505static void ecb_noinline
1199cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1200{ 1507{
1201 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1202 1509
1203 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1214 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1215 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1216} 1523}
1217 1524
1218/* 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 */
1219INLINE void 1526ecb_inline void
1220transfer_tail (pTHX) 1527transfer_tail (pTHX)
1221{ 1528{
1222 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);
1223} 1542}
1224 1543
1225/* 1544/*
1226 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1227 */ 1546 */
… …
1249 /* 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 */
1250 PL_restartop = PL_op; 1569 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1570 perl_run (PL_curinterp);
1252 /* 1571 /*
1253 * 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
1254 * 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.
1255 */ 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;
1256 1583
1257 /* 1584 /*
1258 * 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
1259 * 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)
1260 * 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
1261 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1262 * coroutine as Coro has no such concept.
1263 * This actually isn't valid with the pthread backend, but OSes requiring
1264 * that backend are too broken to do it in a standards-compliant way.
1265 */ 1589 */
1266 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1268 } 1591 }
1269} 1592}
1270 1593
1271static coro_cctx * 1594static coro_cctx *
1272cctx_new () 1595cctx_new (void)
1273{ 1596{
1274 coro_cctx *cctx; 1597 coro_cctx *cctx;
1275 1598
1276 ++cctx_count; 1599 ++cctx_count;
1277 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1283 return cctx; 1606 return cctx;
1284} 1607}
1285 1608
1286/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1287static coro_cctx * 1610static coro_cctx *
1288cctx_new_empty () 1611cctx_new_empty (void)
1289{ 1612{
1290 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1291 1614
1292 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1293 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1294 1617
1295 return cctx; 1618 return cctx;
1296} 1619}
1297 1620
1298/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1299static coro_cctx * 1622static coro_cctx *
1300cctx_new_run () 1623cctx_new_run (void)
1301{ 1624{
1302 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1303 void *stack_start;
1304 size_t stack_size;
1305 1626
1306#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1307 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1308 /* mmap supposedly does allocate-on-write for us */
1309 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1310
1311 if (cctx->sptr != (void *)-1)
1312 {
1313 #if CORO_STACKGUARD
1314 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1315 #endif
1316 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1317 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1318 cctx->flags |= CC_MAPPED;
1319 } 1628 {
1320 else
1321#endif
1322 {
1323 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1324 New (0, cctx->sptr, cctx_stacksize, long);
1325
1326 if (!cctx->sptr)
1327 {
1328 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1329 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1330 }
1331
1332 stack_start = cctx->sptr;
1333 stack_size = cctx->ssize;
1334 } 1631 }
1335 1632
1336 #if CORO_USE_VALGRIND
1337 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1338 #endif
1339
1340 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);
1341 1634
1342 return cctx; 1635 return cctx;
1343} 1636}
1344 1637
1345static void 1638static void
1346cctx_destroy (coro_cctx *cctx) 1639cctx_destroy (coro_cctx *cctx)
1347{ 1640{
1348 if (!cctx) 1641 if (!cctx)
1349 return; 1642 return;
1350 1643
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1645
1353 --cctx_count; 1646 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1355 1648
1356 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1357 if (cctx->sptr)
1358 {
1359 #if CORO_USE_VALGRIND
1360 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1361 #endif
1362
1363#if HAVE_MMAP
1364 if (cctx->flags & CC_MAPPED)
1365 munmap (cctx->sptr, cctx->ssize);
1366 else
1367#endif
1368 Safefree (cctx->sptr);
1369 }
1370 1650
1371 Safefree (cctx); 1651 Safefree (cctx);
1372} 1652}
1373 1653
1374/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1375#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))
1376 1656
1377static coro_cctx * 1657static coro_cctx *
1378cctx_get (pTHX) 1658cctx_get (pTHX)
1379{ 1659{
1380 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1381 { 1661 {
1382 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1383 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1384 --cctx_idle; 1664 --cctx_idle;
1385 1665
1386 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1387 return cctx; 1667 return cctx;
1388 1668
1389 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1390 } 1670 }
1391 1671
… …
1393} 1673}
1394 1674
1395static void 1675static void
1396cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1397{ 1677{
1398 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));
1399 1679
1400 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1401 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1402 { 1682 {
1403 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1404 cctx_first = first->next; 1684 cctx_first = first->next;
1405 --cctx_idle; 1685 --cctx_idle;
1406 1686
… …
1417static void 1697static void
1418transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1419{ 1699{
1420 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1421 1701
1422 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1423 { 1703 {
1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1425 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,");
1426 1706
1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1428 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,");
1429 1709
1430#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1431 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1432 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,");
1433#endif 1713#endif
1434 } 1714 }
1435} 1715}
1436 1716
1437/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1438static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1439transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1440{ 1720{
1441 dSTACKLEVEL; 1721 dSTACKLEVEL;
1442 1722
1443 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1444 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1445 { 1725 {
1446 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1447 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 */
1448 } 1728 }
1449 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1450 { 1730 {
1451 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1452 1732
1453 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1454 { 1734 {
1455 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1456 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1457 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1458 } 1738 }
… …
1461 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1462 1742
1463 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1464 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1465 1745
1466 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1467 { 1747 {
1468 /* need to start coroutine */ 1748 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1750 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1751 init_perl (aTHX_ next);
1472 } 1752 }
1473 else 1753 else
1474 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1475 1755
1476 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1477 if (expect_true ( 1757 if (ecb_expect_true (
1478 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1479 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1480 && !force_cctx 1760 && !force_cctx
1481 )) 1761 ))
1482 { 1762 {
1483 /* 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 */
1484 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));
1485 1765
1486 /* 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. */
1487 /* 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 */
1488 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1489 if (expect_true (!next->cctx)) 1769 if (ecb_expect_true (!next->cctx))
1490 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1491 1771
1492 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1493 } 1773 }
1494 else 1774 else
1495 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1496 1776
1497 ++next->usecount; 1777 ++next->usecount;
1498 1778
1499 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1500 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1501 1781
1502 next->cctx = 0; 1782 next->cctx = 0;
1503 1783
1504 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1505 { 1785 {
1506 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1507 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1508 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1509 } 1789 }
… …
1515#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))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1796#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1797
1518/** high level stuff ********************************************************/ 1798/** high level stuff ********************************************************/
1519 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 */
1520static int 1802static void
1803coro_call_on_destroy (pTHX_ struct coro *coro);
1804
1805static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1806coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1807{
1523 if (coro->flags & CF_DESTROYED) 1808 if (coro->flags & CF_ZOMBIE)
1524 return 0; 1809 return;
1525 1810
1526 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1528 1812
1529 coro->flags |= CF_DESTROYED; 1813 coro->flags |= CF_ZOMBIE;
1530 1814
1531 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1532 { 1816 {
1533 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1534 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1535 --coro_nready; 1819 --coro_nready;
1536 } 1820 }
1537 else 1821 else
1538 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;
1539 1827
1540 if (coro->mainstack 1828 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1829 && coro->mainstack != main_mainstack
1542 && coro->slot 1830 && coro->slot
1543 && !PL_dirty) 1831 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1832 destroy_perl (aTHX_ coro);
1545 1833
1546 cctx_destroy (coro->cctx); 1834 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1835 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1836 SvREFCNT_dec (coro->args);
1837 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1838 SvREFCNT_dec (CORO_THROW);
1550 1839
1551 if (coro->next) coro->next->prev = coro->prev; 1840 coro_call_on_destroy (aTHX_ coro);
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554 1841
1555 return 1; 1842 /* more destruction mayhem in coro_state_free */
1556} 1843}
1557 1844
1558static int 1845static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1847{
1561 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1562 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1563 1852
1564 coro->hv = 0; 1853 SvREFCNT_dec (coro->on_destroy);
1854 SvREFCNT_dec (coro->status);
1565 1855
1566 if (--coro->refcnt < 0)
1567 {
1568 coro_state_destroy (aTHX_ coro);
1569 Safefree (coro); 1856 Safefree (coro);
1570 }
1571 1857
1572 return 0; 1858 return 0;
1573} 1859}
1574 1860
1575static int 1861static int ecb_cold
1576coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1577{ 1863{
1578 struct coro *coro = (struct coro *)mg->mg_ptr; 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1579 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1580 ++coro->refcnt; 1866 mg->mg_ptr = 0;
1867 mg->mg_virtual = 0;
1581 1868
1582 return 0; 1869 return 0;
1583} 1870}
1584 1871
1585static MGVTBL coro_state_vtbl = { 1872static MGVTBL coro_state_vtbl = {
… …
1608 1895
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1896 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1897 TRANSFER (ta, 1);
1611} 1898}
1612 1899
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1900/** Coro ********************************************************************/
1637 1901
1638INLINE void 1902ecb_inline void
1639coro_enq (pTHX_ struct coro *coro) 1903coro_enq (pTHX_ struct coro *coro)
1640{ 1904{
1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1905 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1642 1906
1643 SvREFCNT_inc_NN (coro->hv); 1907 SvREFCNT_inc_NN (coro->hv);
… …
1645 coro->next_ready = 0; 1909 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1910 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro; 1911 ready [1] = coro;
1648} 1912}
1649 1913
1650INLINE struct coro * 1914ecb_inline struct coro *
1651coro_deq (pTHX) 1915coro_deq (pTHX)
1652{ 1916{
1653 int prio; 1917 int prio;
1654 1918
1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1919 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1665 } 1929 }
1666 1930
1667 return 0; 1931 return 0;
1668} 1932}
1669 1933
1934static void
1935invoke_sv_ready_hook_helper (void)
1936{
1937 dTHX;
1938 dSP;
1939
1940 ENTER;
1941 SAVETMPS;
1942
1943 PUSHMARK (SP);
1944 PUTBACK;
1945 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1946
1947 FREETMPS;
1948 LEAVE;
1949}
1950
1670static int 1951static int
1671api_ready (pTHX_ SV *coro_sv) 1952api_ready (pTHX_ SV *coro_sv)
1672{ 1953{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1954 struct coro *coro = SvSTATE (coro_sv);
1678 1955
1679 if (coro->flags & CF_READY) 1956 if (coro->flags & CF_READY)
1680 return 0; 1957 return 0;
1681 1958
1682 coro->flags |= CF_READY; 1959 coro->flags |= CF_READY;
1683 1960
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1961 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1962
1690 if (sv_hook) 1963 if (!coro_nready++)
1691 { 1964 if (coroapi.readyhook)
1692 dSP; 1965 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1966
1708 return 1; 1967 return 1;
1709} 1968}
1710 1969
1711static int 1970static int
… …
1713{ 1972{
1714 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1973 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1715} 1974}
1716 1975
1717/* expects to own a reference to next->hv */ 1976/* expects to own a reference to next->hv */
1718INLINE void 1977ecb_inline void
1719prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1978prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1720{ 1979{
1721 SV *prev_sv = SvRV (coro_current); 1980 SV *prev_sv = SvRV (coro_current);
1722 1981
1723 ta->prev = SvSTATE_hv (prev_sv); 1982 ta->prev = SvSTATE_hv (prev_sv);
… …
1736{ 1995{
1737 for (;;) 1996 for (;;)
1738 { 1997 {
1739 struct coro *next = coro_deq (aTHX); 1998 struct coro *next = coro_deq (aTHX);
1740 1999
1741 if (expect_true (next)) 2000 if (ecb_expect_true (next))
1742 { 2001 {
1743 /* cannot transfer to destroyed coros, skip and look for next */ 2002 /* cannot transfer to destroyed coros, skip and look for next */
1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 2003 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 2004 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1746 else 2005 else
1747 { 2006 {
1748 next->flags &= ~CF_READY; 2007 next->flags &= ~CF_READY;
1749 --coro_nready; 2008 --coro_nready;
… …
1756 { 2015 {
1757 /* nothing to schedule: call the idle handler */ 2016 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 2017 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 2018 && SvOBJECT (SvRV (sv_idle)))
1760 { 2019 {
2020 if (SvRV (sv_idle) == SvRV (coro_current))
2021 {
2022 require_pv ("Carp");
2023
2024 {
2025 dSP;
2026
2027 ENTER;
2028 SAVETMPS;
2029
2030 PUSHMARK (SP);
2031 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2032 PUTBACK;
2033 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2034
2035 FREETMPS;
2036 LEAVE;
2037 }
2038 }
2039
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2040 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle)); 2041 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 2042 --coro_nready;
1764 } 2043 }
1765 else 2044 else
1766 { 2045 {
2046 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 2047 dSP;
1768 2048
1769 ENTER; 2049 ENTER;
1770 SAVETMPS; 2050 SAVETMPS;
1771 2051
… …
1778 } 2058 }
1779 } 2059 }
1780 } 2060 }
1781} 2061}
1782 2062
1783INLINE void 2063ecb_inline void
1784prepare_cede (pTHX_ struct coro_transfer_args *ta) 2064prepare_cede (pTHX_ struct coro_transfer_args *ta)
1785{ 2065{
1786 api_ready (aTHX_ coro_current); 2066 api_ready (aTHX_ coro_current);
1787 prepare_schedule (aTHX_ ta); 2067 prepare_schedule (aTHX_ ta);
1788} 2068}
1789 2069
1790INLINE void 2070ecb_inline void
1791prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2071prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1792{ 2072{
1793 SV *prev = SvRV (coro_current); 2073 SV *prev = SvRV (coro_current);
1794 2074
1795 if (coro_nready) 2075 if (coro_nready)
… …
1825{ 2105{
1826 struct coro_transfer_args ta; 2106 struct coro_transfer_args ta;
1827 2107
1828 prepare_cede (aTHX_ &ta); 2108 prepare_cede (aTHX_ &ta);
1829 2109
1830 if (expect_true (ta.prev != ta.next)) 2110 if (ecb_expect_true (ta.prev != ta.next))
1831 { 2111 {
1832 TRANSFER (ta, 1); 2112 TRANSFER (ta, 1);
1833 return 1; 2113 return 1;
1834 } 2114 }
1835 else 2115 else
… …
1878 coro->slot->runops = RUNOPS_DEFAULT; 2158 coro->slot->runops = RUNOPS_DEFAULT;
1879 } 2159 }
1880} 2160}
1881 2161
1882static void 2162static void
2163coro_push_av (pTHX_ AV *av, I32 gimme_v)
2164{
2165 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2166 {
2167 dSP;
2168
2169 if (gimme_v == G_SCALAR)
2170 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2171 else
2172 {
2173 int i;
2174 EXTEND (SP, AvFILLp (av) + 1);
2175
2176 for (i = 0; i <= AvFILLp (av); ++i)
2177 PUSHs (AvARRAY (av)[i]);
2178 }
2179
2180 PUTBACK;
2181 }
2182}
2183
2184static void
2185coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2186{
2187 if (!coro->on_destroy)
2188 coro->on_destroy = newAV ();
2189
2190 av_push (coro->on_destroy, cb);
2191}
2192
2193static void
2194slf_destroy_join (pTHX_ struct CoroSLF *frame)
2195{
2196 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2197}
2198
2199static int
2200slf_check_join (pTHX_ struct CoroSLF *frame)
2201{
2202 struct coro *coro = (struct coro *)frame->data;
2203
2204 if (!coro->status)
2205 return 1;
2206
2207 frame->destroy = 0;
2208
2209 coro_push_av (aTHX_ coro->status, GIMME_V);
2210
2211 SvREFCNT_dec ((SV *)coro->hv);
2212
2213 return 0;
2214}
2215
2216static void
2217slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{
2219 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2220
2221 if (items > 1)
2222 croak ("join called with too many arguments");
2223
2224 if (coro->status)
2225 frame->prepare = prepare_nop;
2226 else
2227 {
2228 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2229 frame->prepare = prepare_schedule;
2230 }
2231
2232 frame->check = slf_check_join;
2233 frame->destroy = slf_destroy_join;
2234 frame->data = (void *)coro;
2235 SvREFCNT_inc (coro->hv);
2236}
2237
2238static void
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2239coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2240{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2241 AV *od = coro->on_destroy;
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2242
1888 if (on_destroyp) 2243 if (!od)
1889 { 2244 return;
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1891 2245
2246 coro->on_destroy = 0;
2247 sv_2mortal ((SV *)od);
2248
1892 while (AvFILLp (on_destroy) >= 0) 2249 while (AvFILLp (od) >= 0)
2250 {
2251 SV *cb = sv_2mortal (av_pop (od));
2252
2253 /* coro hv's (and only hv's at the moment) are supported as well */
2254 if (SvSTATEhv_p (aTHX_ cb))
2255 api_ready (aTHX_ cb);
2256 else
1893 { 2257 {
1894 dSP; /* don't disturb outer sp */ 2258 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy);
1896
1897 PUSHMARK (SP); 2259 PUSHMARK (SP);
1898 2260
1899 if (statusp) 2261 if (coro->status)
1900 { 2262 {
1901 int i; 2263 PUTBACK;
1902 AV *status = (AV *)SvRV (*statusp); 2264 coro_push_av (aTHX_ coro->status, G_ARRAY);
1903 EXTEND (SP, AvFILLp (status) + 1); 2265 SPAGAIN;
1904
1905 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]);
1907 } 2266 }
1908 2267
1909 PUTBACK; 2268 PUTBACK;
1910 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2269 call_sv (cb, G_VOID | G_DISCARD);
1911 } 2270 }
1912 } 2271 }
1913} 2272}
1914 2273
1915static void 2274static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2275coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1917{ 2276{
2277 AV *av;
2278
2279 if (coro->status)
2280 {
2281 av = coro->status;
2282 av_clear (av);
2283 }
2284 else
2285 av = coro->status = newAV ();
2286
2287 /* items are actually not so common, so optimise for this case */
2288 if (items)
2289 {
1918 int i; 2290 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV ();
1921 2291
1922 av_extend (av, items - 1); 2292 av_extend (av, items - 1);
2293
1923 for (i = 0; i < items; ++i) 2294 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2295 av_push (av, SvREFCNT_inc_NN (arg [i]));
2296 }
2297}
1925 2298
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2299static void
1927 2300slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2301{
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2302 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2303 api_ready (aTHX_ sv_manager);
1930 2304
1931 frame->prepare = prepare_schedule; 2305 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2306 frame->check = slf_check_repeat;
1933 2307
1934 /* as a minor optimisation, we could unwind all stacks here */ 2308 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2309 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2310 /*coro_unwind_stacks (aTHX);*/
2311}
2312
2313static void
2314slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2315{
2316 HV *coro_hv = (HV *)SvRV (coro_current);
2317
2318 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2319 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2320}
2321
2322static void
2323slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2324{
2325 HV *coro_hv;
2326 struct coro *coro;
2327
2328 if (items <= 0)
2329 croak ("Coro::cancel called without coro object,");
2330
2331 coro = SvSTATE (arg [0]);
2332 coro_hv = coro->hv;
2333
2334 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2335
2336 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2337 {
2338 /* coro currently busy cancelling something, so just notify it */
2339 coro->slf_frame.data = (void *)coro;
2340
2341 frame->prepare = prepare_nop;
2342 frame->check = slf_check_nop;
2343 }
2344 else if (coro_hv == (HV *)SvRV (coro_current))
2345 {
2346 /* cancelling the current coro is allowed, and equals terminate */
2347 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2348 }
2349 else
2350 {
2351 struct coro *self = SvSTATE_current;
2352
2353 if (!self)
2354 croak ("Coro::cancel called outside of thread content,");
2355
2356 /* otherwise we cancel directly, purely for speed reasons
2357 * unfortunately, this requires some magic trickery, as
2358 * somebody else could cancel us, so we have to fight the cancellation.
2359 * this is ugly, and hopefully fully worth the extra speed.
2360 * besides, I can't get the slow-but-safe version working...
2361 */
2362 slf_frame.data = 0;
2363 self->flags |= CF_NOCANCEL;
2364 coro_state_destroy (aTHX_ coro);
2365 self->flags &= ~CF_NOCANCEL;
2366
2367 if (slf_frame.data)
2368 {
2369 /* while we were busy we have been cancelled, so terminate */
2370 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2371 }
2372 else
2373 {
2374 frame->prepare = prepare_nop;
2375 frame->check = slf_check_nop;
2376 }
2377 }
2378}
2379
2380static int
2381slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2382{
2383 frame->prepare = 0;
2384 coro_unwind_stacks (aTHX);
2385
2386 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2387
2388 return 1;
2389}
2390
2391static int
2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2393{
2394 if (coro->cctx)
2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2396
2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2398 {
2399 coro_set_status (aTHX_ coro, arg, items);
2400 coro_state_destroy (aTHX_ coro);
2401 }
2402 else
2403 {
2404 if (!coro->slf_frame.prepare)
2405 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2406
2407 slf_destroy (aTHX_ coro);
2408
2409 coro_set_status (aTHX_ coro, arg, items);
2410 coro->slf_frame.prepare = prepare_nop;
2411 coro->slf_frame.check = slf_check_safe_cancel;
2412
2413 api_ready (aTHX_ (SV *)coro->hv);
2414 }
2415
2416 return 1;
1937} 2417}
1938 2418
1939/*****************************************************************************/ 2419/*****************************************************************************/
1940/* async pool handler */ 2420/* async pool handler */
1941 2421
… …
1972slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2452slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1973{ 2453{
1974 HV *hv = (HV *)SvRV (coro_current); 2454 HV *hv = (HV *)SvRV (coro_current);
1975 struct coro *coro = SvSTATE_hv ((SV *)hv); 2455 struct coro *coro = SvSTATE_hv ((SV *)hv);
1976 2456
1977 if (expect_true (coro->saved_deffh)) 2457 if (ecb_expect_true (coro->saved_deffh))
1978 { 2458 {
1979 /* subsequent iteration */ 2459 /* subsequent iteration */
1980 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2460 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1981 coro->saved_deffh = 0; 2461 coro->saved_deffh = 0;
1982 2462
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2463 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2464 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 { 2465 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2466 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1987 coro->invoke_av = newAV (); 2467 return;
1988
1989 frame->prepare = prepare_nop;
1990 } 2468 }
1991 else 2469 else
1992 { 2470 {
1993 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1995 2473
2474 if (ecb_expect_false (coro->swap_sv))
2475 {
2476 SWAP_SVS_LEAVE (coro);
2477 SvREFCNT_dec_NN (coro->swap_sv);
2478 coro->swap_sv = 0;
2479 }
2480
1996 coro->prio = 0; 2481 coro->prio = 0;
1997 2482
1998 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1999 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2000 2485
2001 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2002 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2003 } 2488 }
2004 } 2489 }
2005 else 2490 else
2006 { 2491 {
2007 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2019 2504
2020static void 2505static void
2021coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2022{ 2507{
2023 dXSARGS; 2508 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2025 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2027 { 2514 {
2028 /* first call, set args */ 2515 /* first call, set args */
2029 SV *coro = SvRV (data);
2030 AV *av = newAV ();
2031 2516
2032 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2033 2519
2034 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2035 while (items--) 2521 {
2036 av_store (av, items, newSVsv (ST (items)));
2037
2038 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2039 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2040 } 2525 }
2041 2526
2042 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2043} 2528}
2044 2529
2045static int 2530static int
2046slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2531slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2047{ 2532{
2048 SV *data = (SV *)frame->data; 2533 SV *data = (SV *)frame->data;
2049 2534
2050 if (CORO_THROW) 2535 if (CORO_THROW)
2051 return 0; 2536 return 0;
2052 2537
2053 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2538 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2054 return 1; 2539 return 1;
… …
2061 2546
2062 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2063 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2064 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2065 2550
2066 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2067 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2068 av_undef (av); 2553 av_undef (av);
2069 2554
2070 PUTBACK; 2555 PUTBACK;
2071 } 2556 }
2072 2557
… …
2090 cb = sv_2mortal (coro->rouse_cb); 2575 cb = sv_2mortal (coro->rouse_cb);
2091 coro->rouse_cb = 0; 2576 coro->rouse_cb = 0;
2092 } 2577 }
2093 2578
2094 if (!SvROK (cb) 2579 if (!SvROK (cb)
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2580 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2581 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2583
2099 { 2584 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2102 2595
2103 frame->data = (void *)data; 2596 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2106 } 2599 }
2107} 2600}
2108 2601
2109static SV * 2602static SV *
2110coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2111{ 2604{
2112 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2609
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2119 2612
2120 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2121 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2122 2615
2123 return cb; 2616 return cb;
… …
2217static void 2710static void
2218slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2711slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{ 2712{
2220 frame->prepare = prepare_cede_notself; 2713 frame->prepare = prepare_cede_notself;
2221 frame->check = slf_check_nop; 2714 frame->check = slf_check_nop;
2715}
2716
2717/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2718static void
2719slf_destroy (pTHX_ struct coro *coro)
2720{
2721 struct CoroSLF frame = coro->slf_frame;
2722
2723 /*
2724 * The on_destroy below most likely is from an SLF call.
2725 * Since by definition the SLF call will not finish when we destroy
2726 * the coro, we will have to force-finish it here, otherwise
2727 * cleanup functions cannot call SLF functions.
2728 */
2729 coro->slf_frame.prepare = 0;
2730
2731 /* this callback is reserved for slf functions needing to do cleanup */
2732 if (frame.destroy && frame.prepare && !PL_dirty)
2733 frame.destroy (aTHX_ &frame);
2222} 2734}
2223 2735
2224/* 2736/*
2225 * these not obviously related functions are all rolled into one 2737 * these not obviously related functions are all rolled into one
2226 * function to increase chances that they all will call transfer with the same 2738 * function to increase chances that they all will call transfer with the same
… …
2233 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2745 I32 checkmark; /* mark SP to see how many elements check has pushed */
2234 2746
2235 /* set up the slf frame, unless it has already been set-up */ 2747 /* set up the slf frame, unless it has already been set-up */
2236 /* the latter happens when a new coro has been started */ 2748 /* the latter happens when a new coro has been started */
2237 /* or when a new cctx was attached to an existing coroutine */ 2749 /* or when a new cctx was attached to an existing coroutine */
2238 if (expect_true (!slf_frame.prepare)) 2750 if (ecb_expect_true (!slf_frame.prepare))
2239 { 2751 {
2240 /* first iteration */ 2752 /* first iteration */
2241 dSP; 2753 dSP;
2242 SV **arg = PL_stack_base + TOPMARK + 1; 2754 SV **arg = PL_stack_base + TOPMARK + 1;
2243 int items = SP - arg; /* args without function object */ 2755 int items = SP - arg; /* args without function object */
… …
2284 while (slf_frame.check (aTHX_ &slf_frame)); 2796 while (slf_frame.check (aTHX_ &slf_frame));
2285 2797
2286 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2798 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2287 2799
2288 /* exception handling */ 2800 /* exception handling */
2289 if (expect_false (CORO_THROW)) 2801 if (ecb_expect_false (CORO_THROW))
2290 { 2802 {
2291 SV *exception = sv_2mortal (CORO_THROW); 2803 SV *exception = sv_2mortal (CORO_THROW);
2292 2804
2293 CORO_THROW = 0; 2805 CORO_THROW = 0;
2294 sv_setsv (ERRSV, exception); 2806 sv_setsv (ERRSV, exception);
2295 croak (0); 2807 croak (0);
2296 } 2808 }
2297 2809
2298 /* return value handling - mostly like entersub */ 2810 /* return value handling - mostly like entersub */
2299 /* make sure we put something on the stack in scalar context */ 2811 /* make sure we put something on the stack in scalar context */
2300 if (GIMME_V == G_SCALAR) 2812 if (GIMME_V == G_SCALAR
2813 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2301 { 2814 {
2302 dSP; 2815 dSP;
2303 SV **bot = PL_stack_base + checkmark; 2816 SV **bot = PL_stack_base + checkmark;
2304 2817
2305 if (sp == bot) /* too few, push undef */ 2818 if (sp == bot) /* too few, push undef */
2306 bot [1] = &PL_sv_undef; 2819 bot [1] = &PL_sv_undef;
2307 else if (sp != bot + 1) /* too many, take last one */ 2820 else /* too many, take last one */
2308 bot [1] = *sp; 2821 bot [1] = *sp;
2309 2822
2310 SP = bot + 1; 2823 SP = bot + 1;
2311 2824
2312 PUTBACK; 2825 PUTBACK;
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2858 if (PL_op->op_flags & OPf_STACKED)
2346 { 2859 {
2347 if (items > slf_arga) 2860 if (items > slf_arga)
2348 { 2861 {
2349 slf_arga = items; 2862 slf_arga = items;
2350 free (slf_argv); 2863 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2864 New (0, slf_argv, slf_arga, SV *);
2352 } 2865 }
2353 2866
2354 slf_argc = items; 2867 slf_argc = items;
2355 2868
2356 for (i = 0; i < items; ++i) 2869 for (i = 0; i < items; ++i)
… …
2410{ 2923{
2411 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2924 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2412 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2925 on_enterleave_call (aTHX_ sv_2mortal (cb));
2413} 2926}
2414 2927
2928static void
2929enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2930{
2931 if (!hook)
2932 return;
2933
2934 if (!*avp)
2935 {
2936 *avp = newAV ();
2937 AvREAL_off (*avp);
2938 }
2939
2940 av_push (*avp, (SV *)hook);
2941 av_push (*avp, (SV *)arg);
2942}
2943
2944static void
2945enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2946{
2947 AV *av = *avp;
2948 int i;
2949
2950 if (!av)
2951 return;
2952
2953 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2954 if (AvARRAY (av)[i] == (SV *)hook)
2955 {
2956 if (execute)
2957 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2958
2959 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2960 av_pop (av);
2961 av_pop (av);
2962 break;
2963 }
2964
2965 if (AvFILLp (av) >= 0)
2966 {
2967 *avp = 0;
2968 SvREFCNT_dec_NN (av);
2969 }
2970}
2971
2972static void
2973api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2974{
2975 struct coro *coro = SvSTATE (coro_sv);
2976
2977 if (SvSTATE_current == coro)
2978 if (enter)
2979 enter (aTHX_ enter_arg);
2980
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2982 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2983}
2984
2985static void
2986api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2987{
2988 struct coro *coro = SvSTATE (coro_sv);
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2992}
2993
2994static void
2995savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
3000}
3001
3002static void
3003savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3004{
3005 struct coro *coro = SvSTATE_current;
3006
3007 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3008}
3009
3010static void
3011api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3012{
3013 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3014
3015 /* this ought to be much cheaper than malloc + a single destructor call */
3016 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3017 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3018}
3019
2415/*****************************************************************************/ 3020/*****************************************************************************/
2416/* PerlIO::cede */ 3021/* PerlIO::cede */
2417 3022
2418typedef struct 3023typedef struct
2419{ 3024{
2420 PerlIOBuf base; 3025 PerlIOBuf base;
2421 NV next, every; 3026 NV next, every;
2422} PerlIOCede; 3027} PerlIOCede;
2423 3028
2424static IV 3029static IV ecb_cold
2425PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3030PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2426{ 3031{
2427 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3032 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2428 3033
2429 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3034 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2430 self->next = nvtime () + self->every; 3035 self->next = nvtime () + self->every;
2431 3036
2432 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3037 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2433} 3038}
2434 3039
2435static SV * 3040static SV * ecb_cold
2436PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3041PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2437{ 3042{
2438 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3043 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2439 3044
2440 return newSVnv (self->every); 3045 return newSVnv (self->every);
… …
2547 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3152 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2548 PUTBACK; 3153 PUTBACK;
2549 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3154 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2550 } 3155 }
2551 3156
2552 SvREFCNT_dec (cb); 3157 SvREFCNT_dec_NN (cb);
2553 } 3158 }
2554} 3159}
2555 3160
2556static void 3161static void
2557coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3162coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2558{ 3163{
2559 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3164 /* call $sem->adjust (0) to possibly wake up some other waiters */
2560 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3165 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2561} 3166}
2562 3167
2563static int 3168static int
2564slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3169slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2565{ 3170{
2566 AV *av = (AV *)frame->data; 3171 AV *av = (AV *)frame->data;
2567 SV *count_sv = AvARRAY (av)[0]; 3172 SV *count_sv = AvARRAY (av)[0];
3173 SV *coro_hv = SvRV (coro_current);
3174
3175 frame->destroy = 0;
2568 3176
2569 /* if we are about to throw, don't actually acquire the lock, just throw */ 3177 /* if we are about to throw, don't actually acquire the lock, just throw */
2570 if (CORO_THROW) 3178 if (ecb_expect_false (CORO_THROW))
3179 {
3180 /* we still might be responsible for the semaphore, so wake up others */
3181 coro_semaphore_adjust (aTHX_ av, 0);
3182
2571 return 0; 3183 return 0;
3184 }
2572 else if (SvIVX (count_sv) > 0) 3185 else if (SvIVX (count_sv) > 0)
2573 { 3186 {
2574 SvSTATE_current->on_destroy = 0;
2575
2576 if (acquire) 3187 if (acquire)
2577 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3188 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2578 else 3189 else
2579 coro_semaphore_adjust (aTHX_ av, 0); 3190 coro_semaphore_adjust (aTHX_ av, 0);
2580 3191
… …
2584 { 3195 {
2585 int i; 3196 int i;
2586 /* if we were woken up but can't down, we look through the whole */ 3197 /* if we were woken up but can't down, we look through the whole */
2587 /* waiters list and only add us if we aren't in there already */ 3198 /* waiters list and only add us if we aren't in there already */
2588 /* this avoids some degenerate memory usage cases */ 3199 /* this avoids some degenerate memory usage cases */
2589 3200 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2590 for (i = 1; i <= AvFILLp (av); ++i)
2591 if (AvARRAY (av)[i] == SvRV (coro_current)) 3201 if (AvARRAY (av)[i] == coro_hv)
2592 return 1; 3202 return 1;
2593 3203
2594 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3204 av_push (av, SvREFCNT_inc (coro_hv));
2595 return 1; 3205 return 1;
2596 } 3206 }
2597} 3207}
2598 3208
2599static int 3209static int
… …
2622 { 3232 {
2623 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3233 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2624 3234
2625 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3235 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2626 frame->prepare = prepare_schedule; 3236 frame->prepare = prepare_schedule;
2627
2628 /* to avoid race conditions when a woken-up coro gets terminated */ 3237 /* to avoid race conditions when a woken-up coro gets terminated */
2629 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3238 /* we arrange for a temporary on_destroy that calls adjust (0) */
2630 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3239 frame->destroy = coro_semaphore_destroy;
2631 } 3240 }
2632} 3241}
2633 3242
2634static void 3243static void
2635slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3244slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2643{ 3252{
2644 if (items >= 2) 3253 if (items >= 2)
2645 { 3254 {
2646 /* callback form */ 3255 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 3256 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3257 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 3258
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3259 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 3260
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 3261 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 3262 coro_semaphore_adjust (aTHX_ av, 0);
… …
2693 { 3302 {
2694 api_ready (aTHX_ cb); 3303 api_ready (aTHX_ cb);
2695 sv_setiv (cb, 0); /* signal waiter */ 3304 sv_setiv (cb, 0); /* signal waiter */
2696 } 3305 }
2697 3306
2698 SvREFCNT_dec (cb); 3307 SvREFCNT_dec_NN (cb);
2699 3308
2700 --count; 3309 --count;
2701 } 3310 }
2702} 3311}
2703 3312
… …
2713{ 3322{
2714 AV *av = (AV *)SvRV (arg [0]); 3323 AV *av = (AV *)SvRV (arg [0]);
2715 3324
2716 if (items >= 2) 3325 if (items >= 2)
2717 { 3326 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3327 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3328 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 3329
2721 if (SvIVX (AvARRAY (av)[0])) 3330 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3331 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 3332
2724 frame->prepare = prepare_nop; 3333 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 3334 frame->check = slf_check_nop;
2726 } 3335 }
2727 else if (SvIVX (AvARRAY (av)[0])) 3336 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 3367
2759static void 3368static void
2760coro_aio_callback (pTHX_ CV *cv) 3369coro_aio_callback (pTHX_ CV *cv)
2761{ 3370{
2762 dXSARGS; 3371 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 3372 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 3373 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 3374 SV *data_sv = newSV (sizeof (struct io_state));
2766 3375
2767 av_extend (state, items - 1); 3376 av_extend (state, items - 1);
2768 3377
… …
2788 } 3397 }
2789 3398
2790 av_push (state, data_sv); 3399 av_push (state, data_sv);
2791 3400
2792 api_ready (aTHX_ coro); 3401 api_ready (aTHX_ coro);
2793 SvREFCNT_dec (coro); 3402 SvREFCNT_dec_NN (coro);
2794 SvREFCNT_dec ((AV *)state); 3403 SvREFCNT_dec_NN ((AV *)state);
2795} 3404}
2796 3405
2797static int 3406static int
2798slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3407slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2799{ 3408{
… …
2804 /* it quickly returns */ 3413 /* it quickly returns */
2805 if (CORO_THROW) 3414 if (CORO_THROW)
2806 return 0; 3415 return 0;
2807 3416
2808 /* one element that is an RV? repeat! */ 3417 /* one element that is an RV? repeat! */
2809 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3418 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2810 return 1; 3419 return 1;
2811 3420
2812 /* restore status */ 3421 /* restore status */
2813 { 3422 {
2814 SV *data_sv = av_pop (state); 3423 SV *data_sv = av_pop (state);
… …
2817 errno = data->errorno; 3426 errno = data->errorno;
2818 PL_laststype = data->laststype; 3427 PL_laststype = data->laststype;
2819 PL_laststatval = data->laststatval; 3428 PL_laststatval = data->laststatval;
2820 PL_statcache = data->statcache; 3429 PL_statcache = data->statcache;
2821 3430
2822 SvREFCNT_dec (data_sv); 3431 SvREFCNT_dec_NN (data_sv);
2823 } 3432 }
2824 3433
2825 /* push result values */ 3434 /* push result values */
2826 { 3435 {
2827 dSP; 3436 dSP;
… …
2853 dSP; 3462 dSP;
2854 3463
2855 static SV *prio_cv; 3464 static SV *prio_cv;
2856 static SV *prio_sv; 3465 static SV *prio_sv;
2857 3466
2858 if (expect_false (!prio_cv)) 3467 if (ecb_expect_false (!prio_cv))
2859 { 3468 {
2860 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3469 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2861 prio_sv = newSViv (0); 3470 prio_sv = newSViv (0);
2862 } 3471 }
2863 3472
… …
2882 3491
2883 for (i = 0; i < items; ++i) 3492 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3493 PUSHs (arg [i]);
2885 3494
2886 /* now push the callback closure */ 3495 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3496 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3497
2889 /* now call the AIO function - we assume our request is uncancelable */ 3498 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3499 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3500 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3501 }
2893 3502
2894 /* now that the requets is going, we loop toll we have a result */ 3503 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3504 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3505 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3506 frame->check = slf_check_aio_req;
2898} 3507}
2899 3508
… …
2911 3520
2912#if CORO_CLONE 3521#if CORO_CLONE
2913# include "clone.c" 3522# include "clone.c"
2914#endif 3523#endif
2915 3524
3525/*****************************************************************************/
3526
3527static SV *
3528coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3529{
3530 SV *coro_sv;
3531 struct coro *coro;
3532 MAGIC *mg;
3533 HV *hv;
3534 SV *cb;
3535 int i;
3536
3537 if (argc > 0)
3538 {
3539 cb = s_get_cv_croak (argv [0]);
3540
3541 if (!is_coro)
3542 {
3543 if (CvISXSUB (cb))
3544 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3545
3546 if (!CvROOT (cb))
3547 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3548 }
3549 }
3550
3551 Newz (0, coro, 1, struct coro);
3552 coro->args = newAV ();
3553 coro->flags = CF_NEW;
3554
3555 if (coro_first) coro_first->prev = coro;
3556 coro->next = coro_first;
3557 coro_first = coro;
3558
3559 coro->hv = hv = newHV ();
3560 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3561 mg->mg_flags |= MGf_DUP;
3562 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3563
3564 if (argc > 0)
3565 {
3566 av_extend (coro->args, argc + is_coro - 1);
3567
3568 if (is_coro)
3569 {
3570 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3571 cb = (SV *)cv_coro_run;
3572 }
3573
3574 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3575
3576 for (i = 1; i < argc; i++)
3577 av_push (coro->args, newSVsv (argv [i]));
3578 }
3579
3580 return coro_sv;
3581}
3582
3583#ifndef __cplusplus
3584ecb_cold XS(boot_Coro__State);
3585#endif
3586
3587#if CORO_JIT
3588
3589static void ecb_noinline ecb_cold
3590pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3591{
3592 dSP;
3593 AV *av = newAV ();
3594
3595 av_store (av, 3, newSVuv (d));
3596 av_store (av, 2, newSVuv (c));
3597 av_store (av, 1, newSVuv (b));
3598 av_store (av, 0, newSVuv (a));
3599
3600 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3601
3602 PUTBACK;
3603}
3604
3605static void ecb_noinline ecb_cold
3606jit_init (pTHX)
3607{
3608 dSP;
3609 SV *load, *save;
3610 char *map_base;
3611 char *load_ptr, *save_ptr;
3612 STRLEN load_len, save_len, map_len;
3613 int count;
3614
3615 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3616
3617 PUSHMARK (SP);
3618 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3619 #include "state.h"
3620 count = call_pv ("Coro::State::_jit", G_ARRAY);
3621 SPAGAIN;
3622
3623 save = POPs; save_ptr = SvPVbyte (save, save_len);
3624 load = POPs; load_ptr = SvPVbyte (load, load_len);
3625
3626 map_len = load_len + save_len + 16;
3627
3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3629
3630 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3631
3632 load_perl_slots = (load_save_perl_slots_type)map_base;
3633 memcpy (load_perl_slots, load_ptr, load_len);
3634
3635 save_perl_slots = (load_save_perl_slots_type)(map_base + ((load_len + 15) & ~15));
3636 memcpy (save_perl_slots, save_ptr, save_len);
3637
3638 /* we are good citizens and try to make the page read-only, so the evil evil */
3639 /* hackers might have it a bit more difficult */
3640 /* we do this in two steps, to potentially appease some security frameworks */
3641 mprotect (map_base, map_len, PROT_READ);
3642 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3643
3644 PUTBACK;
3645 eval_pv ("undef &Coro::State::_jit", 1);
3646}
3647
3648#endif
3649
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3650MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3651
2918PROTOTYPES: DISABLE 3652PROTOTYPES: DISABLE
2919 3653
2920BOOT: 3654BOOT:
2921{ 3655{
3656#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3657#include "state.h"
2922#ifdef USE_ITHREADS 3658#ifdef USE_ITHREADS
2923# if CORO_PTHREAD 3659# if CORO_PTHREAD
2924 coro_thx = PERL_GET_CONTEXT; 3660 coro_thx = PERL_GET_CONTEXT;
2925# endif 3661# endif
2926#endif 3662#endif
2927 BOOT_PAGESIZE; 3663 /* perl defines these to check for existance first, but why it doesn't */
3664 /* just create them one at init time is not clear to me, except for */
3665 /* programs trying to delete them, but... */
3666 /* anyway, we declare this as invalid and make sure they are initialised here */
3667 DEFSV;
3668 ERRSV;
2928 3669
2929 cctx_current = cctx_new_empty (); 3670 cctx_current = cctx_new_empty ();
2930 3671
2931 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3672 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2932 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3673 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2933 3674
2934 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3675 {
2935 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3676 /*
2936 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3677 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3678 * by coro_sig_vtbl in hash values.
3679 */
3680 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3681
3682 /* this only works if perl doesn't have a vtbl for %SIG */
3683 assert (!mg->mg_virtual);
3684
3685 /*
3686 * The irony is that the perl API itself asserts that mg_virtual
3687 * must be non-const, yet perl5porters insisted on marking their
3688 * vtbls as read-only, just to thwart perl modules from patching
3689 * them.
3690 */
3691 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3692 mg->mg_flags |= MGf_COPY;
3693
3694 coro_sigelem_vtbl = PL_vtbl_sigelem;
3695 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3696 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3697 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3698 }
2937 3699
2938 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2939 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3700 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2940 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3701 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2941 3702
2942 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3703 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3704
3705 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
2943 3706
2944 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3707 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
2945 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3708 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
2946 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
2947 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
2972 coroapi.prepare_nop = prepare_nop; 3735 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3736 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3737 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3738 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3739
2977 { 3740 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3741
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3742 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3743#if CORO_JIT
3744 PUTBACK;
3745 jit_init (aTHX);
3746 SPAGAIN;
3747#endif
2987} 3748}
2988 3749
2989SV * 3750SV *
2990new (char *klass, ...) 3751new (SV *klass, ...)
2991 ALIAS: 3752 ALIAS:
2992 Coro::new = 1 3753 Coro::new = 1
2993 CODE: 3754 CODE:
2994{ 3755 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3756 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3757 RETVAL
3046 3758
3047void 3759void
3048transfer (...) 3760transfer (...)
3049 PROTOTYPE: $$ 3761 PROTOTYPE: $$
3050 CODE: 3762 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3763 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3052
3053bool
3054_destroy (SV *coro_sv)
3055 CODE:
3056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3057 OUTPUT:
3058 RETVAL
3059
3060void
3061_exit (int code)
3062 PROTOTYPE: $
3063 CODE:
3064 _exit (code);
3065 3764
3066SV * 3765SV *
3067clone (Coro::State coro) 3766clone (Coro::State coro)
3068 CODE: 3767 CODE:
3069{ 3768{
… …
3124void 3823void
3125list () 3824list ()
3126 PROTOTYPE: 3825 PROTOTYPE:
3127 PPCODE: 3826 PPCODE:
3128{ 3827{
3129 struct coro *coro; 3828 struct coro *coro;
3130 for (coro = coro_first; coro; coro = coro->next) 3829 for (coro = coro_first; coro; coro = coro->next)
3131 if (coro->hv) 3830 if (coro->hv)
3132 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3831 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3133} 3832}
3134 3833
… …
3136call (Coro::State coro, SV *coderef) 3835call (Coro::State coro, SV *coderef)
3137 ALIAS: 3836 ALIAS:
3138 eval = 1 3837 eval = 1
3139 CODE: 3838 CODE:
3140{ 3839{
3840 struct coro *current = SvSTATE_current;
3841
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3842 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3142 { 3843 {
3143 struct coro *current = SvSTATE_current; 3844 struct CoroSLF slf_save;
3144 3845
3145 if (current != coro) 3846 if (current != coro)
3146 { 3847 {
3147 PUTBACK; 3848 PUTBACK;
3148 save_perl (aTHX_ current); 3849 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3850 load_perl (aTHX_ coro);
3851 /* the coro is most likely in an active SLF call.
3852 * while not strictly required (the code we execute is
3853 * not allowed to call any SLF functions), it's cleaner
3854 * to reinitialise the slf_frame and restore it later.
3855 * This might one day allow us to actually do SLF calls
3856 * from code executed here.
3857 */
3858 slf_save = slf_frame;
3859 slf_frame.prepare = 0;
3150 SPAGAIN; 3860 SPAGAIN;
3151 } 3861 }
3152 3862
3153 PUSHSTACK; 3863 PUSHSTACK;
3154 3864
… …
3164 SPAGAIN; 3874 SPAGAIN;
3165 3875
3166 if (current != coro) 3876 if (current != coro)
3167 { 3877 {
3168 PUTBACK; 3878 PUTBACK;
3879 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3880 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3881 load_perl (aTHX_ current);
3171 SPAGAIN; 3882 SPAGAIN;
3172 } 3883 }
3173 } 3884 }
… …
3178 PROTOTYPE: $ 3889 PROTOTYPE: $
3179 ALIAS: 3890 ALIAS:
3180 is_ready = CF_READY 3891 is_ready = CF_READY
3181 is_running = CF_RUNNING 3892 is_running = CF_RUNNING
3182 is_new = CF_NEW 3893 is_new = CF_NEW
3183 is_destroyed = CF_DESTROYED 3894 is_destroyed = CF_ZOMBIE
3895 is_zombie = CF_ZOMBIE
3184 is_suspended = CF_SUSPENDED 3896 is_suspended = CF_SUSPENDED
3185 CODE: 3897 CODE:
3186 RETVAL = boolSV (coro->flags & ix); 3898 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3899 OUTPUT:
3188 RETVAL 3900 RETVAL
3189 3901
3190void 3902void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3903throw (SV *self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3904 PROTOTYPE: $;$
3193 CODE: 3905 CODE:
3194{ 3906{
3907 struct coro *coro = SvSTATE (self);
3195 struct coro *current = SvSTATE_current; 3908 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3909 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3197 SvREFCNT_dec (*throwp); 3910 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3911 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3912 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3913
3914 api_ready (aTHX_ self);
3200} 3915}
3201 3916
3202void 3917void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3918api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3919 PROTOTYPE: $;$
… …
3259 3974
3260void 3975void
3261cancel (Coro::State self) 3976cancel (Coro::State self)
3262 CODE: 3977 CODE:
3263 coro_state_destroy (aTHX_ self); 3978 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3979
3980SV *
3981enable_times (int enabled = enable_times)
3982 CODE:
3983{
3984 RETVAL = boolSV (enable_times);
3985
3986 if (enabled != enable_times)
3987 {
3988 enable_times = enabled;
3989
3990 coro_times_update ();
3991 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3992 }
3993}
3994 OUTPUT:
3995 RETVAL
3996
3997void
3998times (Coro::State self)
3999 PPCODE:
4000{
4001 struct coro *current = SvSTATE (coro_current);
4002
4003 if (ecb_expect_false (current == self))
4004 {
4005 coro_times_update ();
4006 coro_times_add (SvSTATE (coro_current));
4007 }
4008
4009 EXTEND (SP, 2);
4010 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
4011 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
4012
4013 if (ecb_expect_false (current == self))
4014 coro_times_sub (SvSTATE (coro_current));
4015}
4016
4017void
4018swap_sv (Coro::State coro, SV *sva, SV *svb)
4019 CODE:
4020{
4021 struct coro *current = SvSTATE_current;
4022 AV *swap_sv;
4023 int i;
4024
4025 sva = SvRV (sva);
4026 svb = SvRV (svb);
4027
4028 if (current == coro)
4029 SWAP_SVS_LEAVE (current);
4030
4031 if (!coro->swap_sv)
4032 coro->swap_sv = newAV ();
4033
4034 swap_sv = coro->swap_sv;
4035
4036 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4037 {
4038 SV *a = AvARRAY (swap_sv)[i ];
4039 SV *b = AvARRAY (swap_sv)[i + 1];
4040
4041 if (a == sva && b == svb)
4042 {
4043 SvREFCNT_dec_NN (a);
4044 SvREFCNT_dec_NN (b);
4045
4046 for (; i <= AvFILLp (swap_sv) - 2; i++)
4047 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4048
4049 AvFILLp (swap_sv) -= 2;
4050
4051 goto removed;
4052 }
4053 }
4054
4055 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4056 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4057
4058 removed:
4059
4060 if (current == coro)
4061 SWAP_SVS_ENTER (current);
4062}
3265 4063
3266 4064
3267MODULE = Coro::State PACKAGE = Coro 4065MODULE = Coro::State PACKAGE = Coro
3268 4066
3269BOOT: 4067BOOT:
3270{ 4068{
4069 if (SVt_LAST > 32)
4070 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4071
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4072 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4073 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4074 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4075 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4076 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4077 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4078 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4079 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 4080
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4081 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4082 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4083 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4084 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 4085
3286 coro_stash = gv_stashpv ("Coro", TRUE); 4086 coro_stash = gv_stashpv ("Coro", TRUE);
3287 4087
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4088 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4089 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3302 coroapi.ready = api_ready; 4102 coroapi.ready = api_ready;
3303 coroapi.is_ready = api_is_ready; 4103 coroapi.is_ready = api_is_ready;
3304 coroapi.nready = coro_nready; 4104 coroapi.nready = coro_nready;
3305 coroapi.current = coro_current; 4105 coroapi.current = coro_current;
3306 4106
4107 coroapi.enterleave_hook = api_enterleave_hook;
4108 coroapi.enterleave_unhook = api_enterleave_unhook;
4109 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4110
3307 /*GCoroAPI = &coroapi;*/ 4111 /*GCoroAPI = &coroapi;*/
3308 sv_setiv (sv, (IV)&coroapi); 4112 sv_setiv (sv, PTR2IV (&coroapi));
3309 SvREADONLY_on (sv); 4113 SvREADONLY_on (sv);
3310 } 4114 }
3311} 4115}
4116
4117SV *
4118async (...)
4119 PROTOTYPE: &@
4120 CODE:
4121 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4122 api_ready (aTHX_ RETVAL);
4123 OUTPUT:
4124 RETVAL
4125
4126void
4127_destroy (Coro::State coro)
4128 CODE:
4129 /* used by the manager thread */
4130 coro_state_destroy (aTHX_ coro);
4131
4132void
4133on_destroy (Coro::State coro, SV *cb)
4134 CODE:
4135 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4136
4137void
4138join (...)
4139 CODE:
4140 CORO_EXECUTE_SLF_XS (slf_init_join);
3312 4141
3313void 4142void
3314terminate (...) 4143terminate (...)
3315 CODE: 4144 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4145 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3317 4146
3318void 4147void
4148cancel (...)
4149 CODE:
4150 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4151
4152int
4153safe_cancel (Coro::State self, ...)
4154 C_ARGS: aTHX_ self, &ST (1), items - 1
4155
4156void
3319schedule (...) 4157schedule (...)
3320 CODE: 4158 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4159 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3322 4160
3323void 4161void
… …
3342 4180
3343void 4181void
3344_set_current (SV *current) 4182_set_current (SV *current)
3345 PROTOTYPE: $ 4183 PROTOTYPE: $
3346 CODE: 4184 CODE:
3347 SvREFCNT_dec (SvRV (coro_current)); 4185 SvREFCNT_dec_NN (SvRV (coro_current));
3348 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4186 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3349 4187
3350void 4188void
3351_set_readyhook (SV *hook) 4189_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 4190 PROTOTYPE: $
3353 CODE: 4191 CODE:
3354 SvREFCNT_dec (coro_readyhook); 4192 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 4193 SvGETMAGIC (hook);
4194 if (SvOK (hook))
4195 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4196 coro_readyhook = newSVsv (hook);
4197 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4198 }
4199 else
4200 {
4201 coro_readyhook = 0;
4202 CORO_READYHOOK = 0;
4203 }
3357 4204
3358int 4205int
3359prio (Coro::State coro, int newprio = 0) 4206prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 4207 PROTOTYPE: $;$
3361 ALIAS: 4208 ALIAS:
… …
3367 if (items > 1) 4214 if (items > 1)
3368 { 4215 {
3369 if (ix) 4216 if (ix)
3370 newprio = coro->prio - newprio; 4217 newprio = coro->prio - newprio;
3371 4218
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4219 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4220 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 4221
3375 coro->prio = newprio; 4222 coro->prio = newprio;
3376 } 4223 }
3377} 4224}
3378 OUTPUT: 4225 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 4272 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 4273 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 4274
3428 if ((SV *)hv == &PL_sv_undef) 4275 if ((SV *)hv == &PL_sv_undef)
3429 { 4276 {
3430 PUSHMARK (SP); 4277 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4278 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4279 SvREFCNT_dec_NN (sv);
3439 } 4280 }
3440 4281
3441 { 4282 {
3442 struct coro *coro = SvSTATE_hv (hv); 4283 struct coro *coro = SvSTATE_hv (hv);
3443 4284
… …
3450 api_ready (aTHX_ (SV *)hv); 4291 api_ready (aTHX_ (SV *)hv);
3451 4292
3452 if (GIMME_V != G_VOID) 4293 if (GIMME_V != G_VOID)
3453 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4294 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3454 else 4295 else
3455 SvREFCNT_dec (hv); 4296 SvREFCNT_dec_NN (hv);
3456} 4297}
3457 4298
3458SV * 4299SV *
3459rouse_cb () 4300rouse_cb ()
3460 PROTOTYPE: 4301 PROTOTYPE:
… …
3475 on_leave = 1 4316 on_leave = 1
3476 PROTOTYPE: & 4317 PROTOTYPE: &
3477 CODE: 4318 CODE:
3478{ 4319{
3479 struct coro *coro = SvSTATE_current; 4320 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4321 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 4322
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 4323 block = s_get_cv_croak (block);
3483 4324
3484 if (!*avp) 4325 if (!*avp)
3485 *avp = newAV (); 4326 *avp = newAV ();
3486 4327
3487 av_push (*avp, SvREFCNT_inc (block)); 4328 av_push (*avp, SvREFCNT_inc (block));
… …
3505 4346
3506SV * 4347SV *
3507new (SV *klass, SV *count = 0) 4348new (SV *klass, SV *count = 0)
3508 CODE: 4349 CODE:
3509{ 4350{
3510 int semcnt = 1; 4351 int semcnt = 1;
3511 4352
3512 if (count) 4353 if (count)
3513 { 4354 {
3514 SvGETMAGIC (count); 4355 SvGETMAGIC (count);
3515 4356
… …
3539 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4380 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3540 OUTPUT: 4381 OUTPUT:
3541 RETVAL 4382 RETVAL
3542 4383
3543void 4384void
3544up (SV *self, int adjust = 1) 4385up (SV *self)
3545 ALIAS:
3546 adjust = 1
3547 CODE: 4386 CODE:
4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4388
4389void
4390adjust (SV *self, int adjust)
4391 CODE:
3548 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4392 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3549 4393
3550void 4394void
3551down (...) 4395down (...)
3552 CODE: 4396 CODE:
3553 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4397 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3575 XSRETURN_NO; 4419 XSRETURN_NO;
3576} 4420}
3577 4421
3578void 4422void
3579waiters (SV *self) 4423waiters (SV *self)
3580 PPCODE: 4424 PPCODE:
3581{ 4425{
3582 AV *av = (AV *)SvRV (self); 4426 AV *av = (AV *)SvRV (self);
3583 int wcount = AvFILLp (av) + 1 - 1; 4427 int wcount = AvFILLp (av) + 1 - 1;
3584 4428
3585 if (GIMME_V == G_SCALAR) 4429 if (GIMME_V == G_SCALAR)
… …
3594} 4438}
3595 4439
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4440MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597 4441
3598void 4442void
3599_may_delete (SV *sem, int count, int extra_refs) 4443_may_delete (SV *sem, int count, unsigned int extra_refs)
3600 PPCODE: 4444 PPCODE:
3601{ 4445{
3602 AV *av = (AV *)SvRV (sem); 4446 AV *av = (AV *)SvRV (sem);
3603 4447
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4448 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */ 4449 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count) 4450 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES; 4451 XSRETURN_YES;
… …
3628 4472
3629void 4473void
3630broadcast (SV *self) 4474broadcast (SV *self)
3631 CODE: 4475 CODE:
3632{ 4476{
3633 AV *av = (AV *)SvRV (self); 4477 AV *av = (AV *)SvRV (self);
3634 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4478 coro_signal_wake (aTHX_ av, AvFILLp (av));
3635} 4479}
3636 4480
3637void 4481void
3638send (SV *self) 4482send (SV *self)
… …
3646 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4490 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3647} 4491}
3648 4492
3649IV 4493IV
3650awaited (SV *self) 4494awaited (SV *self)
3651 CODE: 4495 CODE:
3652 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4496 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3653 OUTPUT: 4497 OUTPUT:
3654 RETVAL 4498 RETVAL
3655 4499
3656 4500
… …
3661 4505
3662void 4506void
3663_schedule (...) 4507_schedule (...)
3664 CODE: 4508 CODE:
3665{ 4509{
3666 static int incede; 4510 static int incede;
3667 4511
3668 api_cede_notself (aTHX); 4512 api_cede_notself (aTHX);
3669 4513
3670 ++incede; 4514 ++incede;
3671 while (coro_nready >= incede && api_cede (aTHX)) 4515 while (coro_nready >= incede && api_cede (aTHX))
… …
3687 4531
3688void 4532void
3689_register (char *target, char *proto, SV *req) 4533_register (char *target, char *proto, SV *req)
3690 CODE: 4534 CODE:
3691{ 4535{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 4536 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 4537 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4538 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 4539 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4540 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 4541}
3698 4542
4543MODULE = Coro::State PACKAGE = Coro::Select
4544
4545void
4546patch_pp_sselect ()
4547 CODE:
4548 if (!coro_old_pp_sselect)
4549 {
4550 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4551 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4552 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4553 }
4554
4555void
4556unpatch_pp_sselect ()
4557 CODE:
4558 if (coro_old_pp_sselect)
4559 {
4560 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4561 coro_old_pp_sselect = 0;
4562 }
4563
4564MODULE = Coro::State PACKAGE = Coro::Util
4565
4566void
4567_exit (int code)
4568 CODE:
4569 _exit (code);
4570
4571NV
4572time ()
4573 CODE:
4574 RETVAL = nvtime (aTHX);
4575 OUTPUT:
4576 RETVAL
4577
4578NV
4579gettimeofday ()
4580 PPCODE:
4581{
4582 UV tv [2];
4583 u2time (aTHX_ tv);
4584 EXTEND (SP, 2);
4585 PUSHs (sv_2mortal (newSVuv (tv [0])));
4586 PUSHs (sv_2mortal (newSVuv (tv [1])));
4587}
4588

Diff Legend

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