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

Diff Legend

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