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.337 by root, Fri Dec 5 18:26:10 2008 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 2013 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"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
51#endif
52
53#if defined(_WIN32)
54# undef HAS_GETTIMEOFDAY
18# undef setjmp 55# undef setjmp
19# undef longjmp 56# undef longjmp
20# undef _exit 57# undef _exit
21# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
22#else 59#else
23# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
24#endif 61#endif
25 62
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 */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \ 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 67# 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 68#endif
122 69
123/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
135# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
136#endif 83#endif
137 84
138#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
139 86
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" 87#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 88#define GCoroAPI (&coroapi) /* very sneaky */
157 89
158#ifdef USE_ITHREADS 90#ifdef USE_ITHREADS
159# if CORO_PTHREAD 91# if CORO_PTHREAD
160static void *coro_thx; 92static void *coro_thx;
161# endif 93# endif
162#endif 94#endif
163 95
96#ifdef __linux
97# include <time.h> /* for timespec */
98# include <syscall.h> /* for SYS_* */
99# ifdef SYS_clock_gettime
100# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
101# define CORO_CLOCK_MONOTONIC 1
102# define CORO_CLOCK_THREAD_CPUTIME_ID 3
103# endif
104#endif
105
164static double (*nvtime)(); /* so why doesn't it take void? */ 106static double (*nvtime)(); /* so why doesn't it take void? */
107static void (*u2time)(pTHX_ UV ret[2]);
165 108
166/* we hijack an hopefully unused CV flag for our purposes */ 109/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 110#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 111static OP *pp_slf (pTHX);
112static void slf_destroy (pTHX_ struct coro *coro);
169 113
170static U32 cctx_gen; 114static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 115static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 116static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 117static AV *main_mainstack; /* used to differentiate between $main and others */
190static SV *sv_pool_size; 134static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 135static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 136static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 137static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 138static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 139
197/* Coro::AnyEvent */ 140/* Coro::AnyEvent */
198static SV *sv_activity; 141static SV *sv_activity;
199 142
143/* enable processtime/realtime profiling */
144static char enable_times;
145typedef U32 coro_ts[2];
146static coro_ts time_real, time_cpu;
147static char times_valid;
148
200static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
202 151
203enum { 152enum
153{
204 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
213typedef struct coro_cctx 163typedef struct coro_cctx
214{ 164{
215 struct coro_cctx *next; 165 struct coro_cctx *next;
216 166
217 /* the stack */ 167 /* the stack */
218 void *sptr; 168 struct coro_stack stack;
219 size_t ssize;
220 169
221 /* cpu state */ 170 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
224 JMPENV *top_env; 175 JMPENV *top_env;
225 coro_context cctx; 176 coro_context cctx;
226 177
227 U32 gen; 178 U32 gen;
228#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
229 int valgrind_id; 180 int valgrind_id;
230#endif 181#endif
231 unsigned char flags; 182 unsigned char flags;
232} coro_cctx; 183} coro_cctx;
233 184
234coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
235 186
236/*****************************************************************************/ 187/*****************************************************************************/
237 188
189static MGVTBL coro_state_vtbl;
190
238enum { 191enum
192{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
197 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
198 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 199};
244 200
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 202typedef struct
247{ 203{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
254# include "state.h" 205 #include "state.h"
255#undef VAR
256} perl_slots; 206} perl_slots;
257 207
208/* how many context stack entries do we need for perl_slots */
258#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 210
260/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
261struct coro { 212struct coro
213{
262 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 215 coro_cctx *cctx;
216
217 /* ready queue */
218 struct coro *next_ready;
264 219
265 /* state data */ 220 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 222 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
269 224
270 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 229
277 /* statistics */ 230 /* statistics */
278 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
279 232
280 /* coro process data */ 233 /* coro process data */
281 int prio; 234 int prio;
282 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
283 SV *rouse_cb; 236 SV *rouse_cb; /* last rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */
284 239
285 /* async_pool */ 240 /* async_pool */
286 SV *saved_deffh; 241 SV *saved_deffh;
287 SV *invoke_cb; 242 SV *invoke_cb;
288 AV *invoke_av; 243 AV *invoke_av;
289 244
245 /* on_enter/on_leave */
246 AV *on_enter;
247 AV *on_leave;
248
249 /* swap_sv */
250 AV *swap_sv;
251
252 /* times */
253 coro_ts t_cpu, t_real;
254
290 /* linked list */ 255 /* linked list */
291 struct coro *next, *prev; 256 struct coro *next, *prev;
292}; 257};
293 258
294typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
296 261
297/* the following variables are effectively part of the perl context */ 262/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 263/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 264/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 265static struct CoroSLF slf_frame; /* the current slf frame */
301 266
302/** Coro ********************************************************************/ 267/** Coro ********************************************************************/
303 268
304#define PRIO_MAX 3 269#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 270#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 271#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 272#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 273#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 274#define CORO_PRIO_MIN -4
310 275
311/* for Coro.pm */ 276/* for Coro.pm */
312static SV *coro_current; 277static SV *coro_current;
313static SV *coro_readyhook; 278static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 280static CV *cv_coro_run;
316static struct coro *coro_first; 281static struct coro *coro_first;
317#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
318 283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
306
307/** Coro::Select ************************************************************/
308
309static OP *(*coro_old_pp_sselect) (pTHX);
310static SV *coro_select_select;
311
312/* horrible hack, but if it works... */
313static OP *
314coro_pp_sselect (pTHX)
315{
316 dSP;
317 PUSHMARK (SP - 4); /* fake argument list */
318 XPUSHs (coro_select_select);
319 PUTBACK;
320
321 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
322 PL_op->op_flags |= OPf_STACKED;
323 PL_op->op_private = 0;
324 return PL_ppaddr [OP_ENTERSUB](aTHX);
325}
326
327/** time stuff **************************************************************/
328
329#ifdef HAS_GETTIMEOFDAY
330
331ecb_inline void
332coro_u2time (pTHX_ UV ret[2])
333{
334 struct timeval tv;
335 gettimeofday (&tv, 0);
336
337 ret [0] = tv.tv_sec;
338 ret [1] = tv.tv_usec;
339}
340
341ecb_inline double
342coro_nvtime (void)
343{
344 struct timeval tv;
345 gettimeofday (&tv, 0);
346
347 return tv.tv_sec + tv.tv_usec * 1e-6;
348}
349
350ecb_inline void
351time_init (pTHX)
352{
353 nvtime = coro_nvtime;
354 u2time = coro_u2time;
355}
356
357#else
358
359ecb_inline void
360time_init (pTHX)
361{
362 SV **svp;
363
364 require_pv ("Time/HiRes.pm");
365
366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
367
368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
370
371 nvtime = INT2PTR (double (*)(), SvIV (*svp));
372
373 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
374 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
375}
376
377#endif
378
319/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
320 380
321static SV * 381static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
323{ 383{
324#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 385 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 386 get_sv (name, create);
327#endif 387#endif
328 return get_sv (name, create); 388 return get_sv (name, create);
329} 389}
330 390
331static AV * 391static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
333{ 393{
334#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 395 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 396 get_av (name, create);
337#endif 397#endif
338 return get_av (name, create); 398 return get_av (name, create);
339} 399}
340 400
341static HV * 401static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
343{ 403{
344#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 406 get_hv (name, create);
347#endif 407#endif
348 return get_hv (name, create); 408 return get_hv (name, create);
349} 409}
350 410
351/* may croak */ 411ecb_inline void
352INLINE CV * 412coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 413{
355 HV *st; 414#ifdef coro_clock_gettime
356 GV *gvp; 415 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 416
417 ts.tv_sec = ts.tv_nsec = 0;
418 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
419 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
420
421 ts.tv_sec = ts.tv_nsec = 0;
422 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
423 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
424#else
425 dTHX;
426 UV tv[2];
427
428 u2time (aTHX_ tv);
429 time_real [0] = tv [0];
430 time_real [1] = tv [1] * 1000;
431#endif
432}
433
434ecb_inline void
435coro_times_add (struct coro *c)
436{
437 c->t_real [1] += time_real [1];
438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
439 c->t_real [0] += time_real [0];
440
441 c->t_cpu [1] += time_cpu [1];
442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
443 c->t_cpu [0] += time_cpu [0];
444}
445
446ecb_inline void
447coro_times_sub (struct coro *c)
448{
449 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
450 c->t_real [1] -= time_real [1];
451 c->t_real [0] -= time_real [0];
452
453 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
454 c->t_cpu [1] -= time_cpu [1];
455 c->t_cpu [0] -= time_cpu [0];
358} 456}
359 457
360/*****************************************************************************/ 458/*****************************************************************************/
361/* magic glue */ 459/* magic glue */
362 460
363#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
365 463
366#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
369 : mg_find (sv, type)) 467 : mg_find (sv, type))
370 468
371#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
374 : 0) 472 : 0)
375 473
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378 476
379INLINE struct coro * 477ecb_inline MAGIC *
478SvSTATEhv_p (pTHX_ SV *coro)
479{
480 MAGIC *mg;
481
482 if (ecb_expect_true (
483 SvTYPE (coro) == SVt_PVHV
484 && (mg = CORO_MAGIC_state (coro))
485 && mg->mg_virtual == &coro_state_vtbl
486 ))
487 return mg;
488
489 return 0;
490}
491
492ecb_inline struct coro *
380SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
381{ 494{
382 HV *stash;
383 MAGIC *mg; 495 MAGIC *mg;
384 496
385 if (SvROK (coro)) 497 if (SvROK (coro))
386 coro = SvRV (coro); 498 coro = SvRV (coro);
387 499
388 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
389 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
390 503
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr; 504 return (struct coro *)mg->mg_ptr;
401} 505}
402 506
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404 508
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408 512
409/*****************************************************************************/ 513/*****************************************************************************/
410/* padlist management and caching */ 514/* padlist management and caching */
411 515
412static AV * 516ecb_inline PADLIST *
413coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
414{ 518{
415 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
416 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
417 523
418 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
419 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
420#if PERL_VERSION_ATLEAST (5,10,0)
421 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
422#else
423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
424#endif 553#endif
425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
426 --AvFILLp (padlist);
427 554
428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
429 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
430 559
431 return newpadlist; 560 return newpadlist;
432} 561}
433 562
434static void 563ecb_inline void
435free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
436{ 565{
437 /* may be during global destruction */ 566 /* may be during global destruction */
438 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
439 { 568 {
440 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
441 570
442 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
443 { 572 {
444 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
445 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
446 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
447 576
448 while (j >= 0) 577 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
450 579
451 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
452 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
453 } 582 }
454 583
455 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
456 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
457 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
458 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
459 } 594 }
460} 595}
461 596
462static int 597static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 599{
465 AV *padlist; 600 PADLIST *padlist;
466 AV *av = (AV *)mg->mg_obj; 601 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
602 size_t len = *(size_t *)mg->mg_ptr;
467 603
468 /* casting is fun. */ 604 /* perl manages to free our internal AV and _then_ call us */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 605 if (IN_DESTRUCT)
606 return 0;
607
608 while (len--)
470 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
471
472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
473 610
474 return 0; 611 return 0;
475} 612}
476 613
477static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
478 0, 0, 0, 0, 615 0, 0, 0, 0,
479 coro_cv_free 616 coro_cv_free
480}; 617};
481 618
482/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
483static void 620ecb_inline void
484get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
485{ 622{
486 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
487 AV *av; 624 size_t *lenp;
488 625
489 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
490 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
491 else 628 else
492 { 629 {
493#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
494 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
495 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 638 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
502#endif 639#endif
503 } 640 }
504} 641}
505 642
506static void 643ecb_inline void
507put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
508{ 645{
509 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
510 AV *av;
511 647
512 if (expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
513 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 650 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
651 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
652 mg->mg_len = 1; /* so mg_free frees mg_ptr */
653 }
654 else
655 Renew (mg->mg_ptr,
656 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
657 char);
514 658
515 av = (AV *)mg->mg_obj; 659 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
516
517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
518 av_extend (av, AvFILLp (av) + 1);
519
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 660}
522 661
523/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
663
664ecb_inline void
665swap_sv (SV *a, SV *b)
666{
667 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
668 SV tmp;
669
670 /* swap sv_any */
671 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
672
673 /* swap sv_flags */
674 SvFLAGS (&tmp) = SvFLAGS (a);
675 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
676 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
677
678#if PERL_VERSION_ATLEAST (5,10,0)
679 /* perl 5.10 and later complicates this _quite_ a bit, but it also
680 * is much faster, so no quarrels here. alternatively, we could
681 * sv_upgrade to avoid this.
682 */
683 {
684 /* swap sv_u */
685 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
686
687 /* if SvANY points to the head, we need to adjust the pointers,
688 * as the pointer for a still points to b, and maybe vice versa.
689 */
690 #define svany_in_head(type) \
691 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
692
693 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695
696 if (svany_in_head (SvTYPE (b)))
697 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
698 }
699#endif
700}
701
702/* swap sv heads, at least logically */
703static void
704swap_svs (pTHX_ Coro__State c)
705{
706 int i;
707
708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
709 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
710}
711
712#define SWAP_SVS(coro) \
713 if (ecb_expect_false ((coro)->swap_sv)) \
714 swap_svs (aTHX_ (coro))
715
716static void
717on_enterleave_call (pTHX_ SV *cb);
524 718
525static void 719static void
526load_perl (pTHX_ Coro__State c) 720load_perl (pTHX_ Coro__State c)
527{ 721{
528 perl_slots *slot = c->slot; 722 perl_slots *slot = c->slot;
529 c->slot = 0; 723 c->slot = 0;
530 724
531 PL_mainstack = c->mainstack; 725 PL_mainstack = c->mainstack;
532 726
533 GvSV (PL_defgv) = slot->defsv; 727#if CORO_JIT
534 GvAV (PL_defgv) = slot->defav; 728 load_perl_slots (slot);
535 GvSV (PL_errgv) = slot->errsv; 729#else
536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
538
539 #define VAR(name,type) PL_ ## name = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
540 # include "state.h" 731 #include "state.h"
541 #undef VAR 732#endif
542 733
543 { 734 {
544 dSP; 735 dSP;
545 736
546 CV *cv; 737 CV *cv;
547 738
548 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
549 while (expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
550 { 741 {
551 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
552 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
553 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
554 } 745 }
555 746
556 PUTBACK; 747 PUTBACK;
557 } 748 }
558 749
559 slf_frame = c->slf_frame; 750 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 751 CORO_THROW = c->except;
752
753 if (ecb_expect_false (enable_times))
754 {
755 if (ecb_expect_false (!times_valid))
756 coro_times_update ();
757
758 coro_times_sub (c);
759 }
760
761 if (ecb_expect_false (c->on_enter))
762 {
763 int i;
764
765 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
766 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
767 }
768
769 SWAP_SVS (c);
561} 770}
562 771
563static void 772static void
564save_perl (pTHX_ Coro__State c) 773save_perl (pTHX_ Coro__State c)
565{ 774{
775 SWAP_SVS (c);
776
777 if (ecb_expect_false (c->on_leave))
778 {
779 int i;
780
781 for (i = AvFILLp (c->on_leave); i >= 0; --i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
783 }
784
785 times_valid = 0;
786
787 if (ecb_expect_false (enable_times))
788 {
789 coro_times_update (); times_valid = 1;
790 coro_times_add (c);
791 }
792
566 c->except = CORO_THROW; 793 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 794 c->slf_frame = slf_frame;
568 795
569 { 796 {
570 dSP; 797 dSP;
579 806
580 XPUSHs (Nullsv); 807 XPUSHs (Nullsv);
581 /* this loop was inspired by pp_caller */ 808 /* this loop was inspired by pp_caller */
582 for (;;) 809 for (;;)
583 { 810 {
584 while (expect_true (cxix >= 0)) 811 while (ecb_expect_true (cxix >= 0))
585 { 812 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 813 PERL_CONTEXT *cx = &ccstk[cxix--];
587 814
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 815 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 816 {
590 CV *cv = cx->blk_sub.cv; 817 CV *cv = cx->blk_sub.cv;
591 818
592 if (expect_true (CvDEPTH (cv))) 819 if (ecb_expect_true (CvDEPTH (cv)))
593 { 820 {
594 EXTEND (SP, 3); 821 EXTEND (SP, 3);
595 PUSHs ((SV *)CvPADLIST (cv)); 822 PUSHs ((SV *)CvPADLIST (cv));
596 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 823 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
597 PUSHs ((SV *)cv); 824 PUSHs ((SV *)cv);
600 get_padlist (aTHX_ cv); 827 get_padlist (aTHX_ cv);
601 } 828 }
602 } 829 }
603 } 830 }
604 831
605 if (expect_true (top_si->si_type == PERLSI_MAIN)) 832 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
606 break; 833 break;
607 834
608 top_si = top_si->si_prev; 835 top_si = top_si->si_prev;
609 ccstk = top_si->si_cxstack; 836 ccstk = top_si->si_cxstack;
610 cxix = top_si->si_cxix; 837 cxix = top_si->si_cxix;
612 839
613 PUTBACK; 840 PUTBACK;
614 } 841 }
615 842
616 /* allocate some space on the context stack for our purposes */ 843 /* allocate some space on the context stack for our purposes */
617 /* we manually unroll here, as usually 2 slots is enough */ 844 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
618 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC;
621 { 845 {
622 int i; 846 unsigned int i;
847
623 for (i = 3; i < SLOT_COUNT; ++i) 848 for (i = 0; i < SLOT_COUNT; ++i)
624 CXINC; 849 CXINC;
625 } 850
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 851 cxstack_ix -= SLOT_COUNT; /* undo allocation */
852 }
627 853
628 c->mainstack = PL_mainstack; 854 c->mainstack = PL_mainstack;
629 855
630 { 856 {
631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 857 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
632 858
633 slot->defav = GvAV (PL_defgv); 859#if CORO_JIT
634 slot->defsv = DEFSV; 860 save_perl_slots (slot);
635 slot->errsv = ERRSV; 861#else
636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
638
639 #define VAR(name,type) slot->name = PL_ ## name; 862 #define VARx(name,expr,type) slot->name = expr;
640 # include "state.h" 863 #include "state.h"
641 #undef VAR 864#endif
642 } 865 }
643} 866}
644 867
645/* 868/*
646 * allocate various perl stacks. This is almost an exact copy 869 * allocate various perl stacks. This is almost an exact copy
652# define coro_init_stacks(thx) init_stacks () 875# define coro_init_stacks(thx) init_stacks ()
653#else 876#else
654static void 877static void
655coro_init_stacks (pTHX) 878coro_init_stacks (pTHX)
656{ 879{
657 PL_curstackinfo = new_stackinfo(32, 8); 880 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
658 PL_curstackinfo->si_type = PERLSI_MAIN; 881 PL_curstackinfo->si_type = PERLSI_MAIN;
659 PL_curstack = PL_curstackinfo->si_stack; 882 PL_curstack = PL_curstackinfo->si_stack;
660 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 883 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
661 884
662 PL_stack_base = AvARRAY(PL_curstack); 885 PL_stack_base = AvARRAY(PL_curstack);
677#endif 900#endif
678 901
679 New(54,PL_scopestack,8,I32); 902 New(54,PL_scopestack,8,I32);
680 PL_scopestack_ix = 0; 903 PL_scopestack_ix = 0;
681 PL_scopestack_max = 8; 904 PL_scopestack_max = 8;
905#if HAS_SCOPESTACK_NAME
906 New(54,PL_scopestack_name,8,const char*);
907#endif
682 908
683 New(54,PL_savestack,24,ANY); 909 New(54,PL_savestack,24,ANY);
684 PL_savestack_ix = 0; 910 PL_savestack_ix = 0;
685 PL_savestack_max = 24; 911 PL_savestack_max = 24;
686 912
714 } 940 }
715 941
716 Safefree (PL_tmps_stack); 942 Safefree (PL_tmps_stack);
717 Safefree (PL_markstack); 943 Safefree (PL_markstack);
718 Safefree (PL_scopestack); 944 Safefree (PL_scopestack);
945#if HAS_SCOPESTACK_NAME
946 Safefree (PL_scopestack_name);
947#endif
719 Safefree (PL_savestack); 948 Safefree (PL_savestack);
720#if !PERL_VERSION_ATLEAST (5,10,0) 949#if !PERL_VERSION_ATLEAST (5,10,0)
721 Safefree (PL_retstack); 950 Safefree (PL_retstack);
722#endif 951#endif
723} 952}
769#endif 998#endif
770 999
771/* 1000/*
772 * This overrides the default magic get method of %SIG elements. 1001 * This overrides the default magic get method of %SIG elements.
773 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1002 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
774 * and instead of tryign to save and restore the hash elements, we just provide 1003 * and instead of trying to save and restore the hash elements (extremely slow),
775 * readback here. 1004 * we just provide our own readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 1005 */
780static int 1006static int ecb_cold
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1007coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 1008{
783 const char *s = MgPV_nolen_const (mg); 1009 const char *s = MgPV_nolen_const (mg);
784 1010
785 if (*s == '_') 1011 if (*s == '_')
786 { 1012 {
787 SV **svp = 0; 1013 SV **svp = 0;
788 1014
789 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
790 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
791 1017
792 if (svp) 1018 if (svp)
793 { 1019 {
794 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1020 SV *ssv;
1021
1022 if (!*svp)
1023 ssv = &PL_sv_undef;
1024 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1025 ssv = sv_2mortal (newRV_inc (*svp));
1026 else
1027 ssv = *svp;
1028
1029 sv_setsv (sv, ssv);
795 return 0; 1030 return 0;
796 } 1031 }
797 } 1032 }
798 1033
799 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
800} 1035}
801 1036
802static int 1037static int ecb_cold
803coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
804{ 1039{
805 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
806 1041
807 if (*s == '_') 1042 if (*s == '_')
821 } 1056 }
822 1057
823 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1058 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
824} 1059}
825 1060
826static int 1061static int ecb_cold
827coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1062coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
828{ 1063{
829 const char *s = MgPV_nolen_const (mg); 1064 const char *s = MgPV_nolen_const (mg);
830 1065
831 if (*s == '_') 1066 if (*s == '_')
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1071 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 1072
838 if (svp) 1073 if (svp)
839 { 1074 {
840 SV *old = *svp; 1075 SV *old = *svp;
841 *svp = newSVsv (sv); 1076 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 1077 SvREFCNT_dec (old);
843 return 0; 1078 return 0;
844 } 1079 }
845 } 1080 }
846 1081
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 1099slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 1100{
866 return 1; 1101 return 1;
867} 1102}
868 1103
869static UNOP coro_setup_op; 1104static UNOP init_perl_op;
870 1105
871static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1106ecb_noinline static void /* noinline to keep it out of the transfer fast path */
872coro_setup (pTHX_ struct coro *coro) 1107init_perl (pTHX_ struct coro *coro)
873{ 1108{
874 /* 1109 /*
875 * emulate part of the perl startup here. 1110 * emulate part of the perl startup here.
876 */ 1111 */
877 coro_init_stacks (aTHX); 1112 coro_init_stacks (aTHX);
884 PL_comppad_name_fill = 0; 1119 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0; 1120 PL_comppad_name_floor = 0;
886 PL_curpm = 0; 1121 PL_curpm = 0;
887 PL_curpad = 0; 1122 PL_curpad = 0;
888 PL_localizing = 0; 1123 PL_localizing = 0;
889 PL_dirty = 0;
890 PL_restartop = 0; 1124 PL_restartop = 0;
891#if PERL_VERSION_ATLEAST (5,10,0) 1125#if PERL_VERSION_ATLEAST (5,10,0)
892 PL_parser = 0; 1126 PL_parser = 0;
893#endif 1127#endif
894 PL_hints = 0; 1128 PL_hints = 0;
895 1129
896 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
899 1133
900 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
901 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
902 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
924 /* this newly created coroutine might be run on an existing cctx which most 1158 /* this newly created coroutine might be run on an existing cctx which most
925 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1159 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
926 */ 1160 */
927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1161 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1162 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1163 slf_frame.destroy = 0;
929 1164
930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1165 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
931 coro_setup_op.op_next = PL_op; 1166 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1167 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1168 init_perl_op.op_ppaddr = pp_slf;
934 /* no flags etc. required, as an init function won't be called */ 1169 /* no flags etc. required, as an init function won't be called */
935 1170
936 PL_op = (OP *)&coro_setup_op; 1171 PL_op = (OP *)&init_perl_op;
937 1172
938 /* copy throw, in case it was set before coro_setup */ 1173 /* copy throw, in case it was set before init_perl */
939 CORO_THROW = coro->except; 1174 CORO_THROW = coro->except;
1175
1176 SWAP_SVS (coro);
1177
1178 if (ecb_expect_false (enable_times))
1179 {
1180 coro_times_update ();
1181 coro_times_sub (coro);
1182 }
940} 1183}
941 1184
942static void 1185static void
943coro_unwind_stacks (pTHX) 1186coro_unwind_stacks (pTHX)
944{ 1187{
959 dounwind (-1); 1202 dounwind (-1);
960 } 1203 }
961} 1204}
962 1205
963static void 1206static void
964coro_destruct_perl (pTHX_ struct coro *coro) 1207destroy_perl (pTHX_ struct coro *coro)
965{ 1208{
1209 SV *svf [9];
1210
1211 {
1212 SV *old_current = SvRV (coro_current);
1213 struct coro *current = SvSTATE (old_current);
1214
1215 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1216
1217 save_perl (aTHX_ current);
1218
1219 /* this will cause transfer_check to croak on block*/
1220 SvRV_set (coro_current, (SV *)coro->hv);
1221
1222 load_perl (aTHX_ coro);
1223
966 coro_unwind_stacks (aTHX); 1224 coro_unwind_stacks (aTHX);
967 1225
968 SvREFCNT_dec (GvSV (PL_defgv)); 1226 /* restore swapped sv's */
969 SvREFCNT_dec (GvAV (PL_defgv)); 1227 SWAP_SVS (coro);
970 SvREFCNT_dec (GvSV (PL_errgv));
971 SvREFCNT_dec (PL_defoutgv);
972 SvREFCNT_dec (PL_rs);
973 SvREFCNT_dec (GvSV (irsgv));
974 SvREFCNT_dec (GvHV (PL_hintgv));
975 1228
976 SvREFCNT_dec (PL_diehook); 1229 coro_destruct_stacks (aTHX);
977 SvREFCNT_dec (PL_warnhook); 1230
1231 /* now save some sv's to be free'd later */
1232 svf [0] = GvSV (PL_defgv);
1233 svf [1] = (SV *)GvAV (PL_defgv);
1234 svf [2] = GvSV (PL_errgv);
1235 svf [3] = (SV *)PL_defoutgv;
1236 svf [4] = PL_rs;
1237 svf [5] = GvSV (irsgv);
1238 svf [6] = (SV *)GvHV (PL_hintgv);
1239 svf [7] = PL_diehook;
1240 svf [8] = PL_warnhook;
1241 assert (9 == sizeof (svf) / sizeof (*svf));
1242
1243 SvRV_set (coro_current, old_current);
1244
1245 load_perl (aTHX_ current);
978 1246 }
1247
1248 {
1249 unsigned int i;
1250
1251 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1252 SvREFCNT_dec (svf [i]);
1253
979 SvREFCNT_dec (coro->saved_deffh); 1254 SvREFCNT_dec (coro->saved_deffh);
980 SvREFCNT_dec (coro->rouse_cb); 1255 SvREFCNT_dec (coro->rouse_cb);
981 SvREFCNT_dec (coro->invoke_cb); 1256 SvREFCNT_dec (coro->invoke_cb);
982 SvREFCNT_dec (coro->invoke_av); 1257 SvREFCNT_dec (coro->invoke_av);
983 1258 }
984 coro_destruct_stacks (aTHX);
985} 1259}
986 1260
987INLINE void 1261ecb_inline void
988free_coro_mortal (pTHX) 1262free_coro_mortal (pTHX)
989{ 1263{
990 if (expect_true (coro_mortal)) 1264 if (ecb_expect_true (coro_mortal))
991 { 1265 {
992 SvREFCNT_dec (coro_mortal); 1266 SvREFCNT_dec ((SV *)coro_mortal);
993 coro_mortal = 0; 1267 coro_mortal = 0;
994 } 1268 }
995} 1269}
996 1270
997static int 1271static int
1130 1404
1131 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1405 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1132} 1406}
1133 1407
1134/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1408/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1135static void NOINLINE 1409static void ecb_noinline
1136cctx_prepare (pTHX) 1410cctx_prepare (pTHX)
1137{ 1411{
1138 PL_top_env = &PL_start_env; 1412 PL_top_env = &PL_start_env;
1139 1413
1140 if (cctx_current->flags & CC_TRACE) 1414 if (cctx_current->flags & CC_TRACE)
1151 slf_frame.prepare = slf_prepare_set_stacklevel; 1425 slf_frame.prepare = slf_prepare_set_stacklevel;
1152 slf_frame.check = slf_check_set_stacklevel; 1426 slf_frame.check = slf_check_set_stacklevel;
1153} 1427}
1154 1428
1155/* the tail of transfer: execute stuff we can only do after a transfer */ 1429/* the tail of transfer: execute stuff we can only do after a transfer */
1156INLINE void 1430ecb_inline void
1157transfer_tail (pTHX) 1431transfer_tail (pTHX)
1158{ 1432{
1159 free_coro_mortal (aTHX); 1433 free_coro_mortal (aTHX);
1434}
1435
1436/* try to exit the same way perl's main function would do */
1437/* we do not bother resetting the environment or other things *7
1438/* that are not, uhm, essential */
1439/* this obviously also doesn't work when perl is embedded */
1440static void ecb_noinline ecb_cold
1441perlish_exit (pTHX)
1442{
1443 int exitstatus = perl_destruct (PL_curinterp);
1444 perl_free (PL_curinterp);
1445 exit (exitstatus);
1160} 1446}
1161 1447
1162/* 1448/*
1163 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1164 */ 1450 */
1186 /* somebody or something will hit me for both perl_run and PL_restartop */ 1472 /* somebody or something will hit me for both perl_run and PL_restartop */
1187 PL_restartop = PL_op; 1473 PL_restartop = PL_op;
1188 perl_run (PL_curinterp); 1474 perl_run (PL_curinterp);
1189 /* 1475 /*
1190 * Unfortunately, there is no way to get at the return values of the 1476 * Unfortunately, there is no way to get at the return values of the
1191 * coro body here, as perl_run destroys these 1477 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1478 * runtime errors here, as this is just a random interpreter, not a thread.
1192 */ 1479 */
1193 1480
1194 /* 1481 /*
1195 * If perl-run returns we assume exit() was being called or the coro 1482 * If perl-run returns we assume exit() was being called or the coro
1196 * fell off the end, which seems to be the only valid (non-bug) 1483 * fell off the end, which seems to be the only valid (non-bug)
1197 * reason for perl_run to return. We try to exit by jumping to the 1484 * reason for perl_run to return. We try to mimic whatever perl is normally
1198 * bootstrap-time "top" top_env, as we cannot restore the "main" 1485 * doing in that case. YMMV.
1199 * coroutine as Coro has no such concept.
1200 * This actually isn't valid with the pthread backend, but OSes requiring
1201 * that backend are too broken to do it in a standards-compliant way.
1202 */ 1486 */
1203 PL_top_env = main_top_env; 1487 perlish_exit (aTHX);
1204 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1205 } 1488 }
1206} 1489}
1207 1490
1208static coro_cctx * 1491static coro_cctx *
1209cctx_new () 1492cctx_new (void)
1210{ 1493{
1211 coro_cctx *cctx; 1494 coro_cctx *cctx;
1212 1495
1213 ++cctx_count; 1496 ++cctx_count;
1214 New (0, cctx, 1, coro_cctx); 1497 New (0, cctx, 1, coro_cctx);
1220 return cctx; 1503 return cctx;
1221} 1504}
1222 1505
1223/* create a new cctx only suitable as source */ 1506/* create a new cctx only suitable as source */
1224static coro_cctx * 1507static coro_cctx *
1225cctx_new_empty () 1508cctx_new_empty (void)
1226{ 1509{
1227 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1228 1511
1229 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1230 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1231 1514
1232 return cctx; 1515 return cctx;
1233} 1516}
1234 1517
1235/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1236static coro_cctx * 1519static coro_cctx *
1237cctx_new_run () 1520cctx_new_run (void)
1238{ 1521{
1239 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1240 void *stack_start;
1241 size_t stack_size;
1242 1523
1243#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1244 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1245 /* mmap supposedly does allocate-on-write for us */
1246 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1247
1248 if (cctx->sptr != (void *)-1)
1249 {
1250 #if CORO_STACKGUARD
1251 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1252 #endif
1253 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1254 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1255 cctx->flags |= CC_MAPPED;
1256 } 1525 {
1257 else
1258#endif
1259 {
1260 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1261 New (0, cctx->sptr, cctx_stacksize, long);
1262
1263 if (!cctx->sptr)
1264 {
1265 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1266 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1267 }
1268
1269 stack_start = cctx->sptr;
1270 stack_size = cctx->ssize;
1271 } 1528 }
1272 1529
1273 #if CORO_USE_VALGRIND
1274 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1275 #endif
1276
1277 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1278 1531
1279 return cctx; 1532 return cctx;
1280} 1533}
1281 1534
1282static void 1535static void
1283cctx_destroy (coro_cctx *cctx) 1536cctx_destroy (coro_cctx *cctx)
1284{ 1537{
1285 if (!cctx) 1538 if (!cctx)
1286 return; 1539 return;
1287 1540
1288 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1289 1542
1290 --cctx_count; 1543 --cctx_count;
1291 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1292 1545
1293 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1294 if (cctx->sptr)
1295 {
1296 #if CORO_USE_VALGRIND
1297 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1298 #endif
1299
1300#if HAVE_MMAP
1301 if (cctx->flags & CC_MAPPED)
1302 munmap (cctx->sptr, cctx->ssize);
1303 else
1304#endif
1305 Safefree (cctx->sptr);
1306 }
1307 1547
1308 Safefree (cctx); 1548 Safefree (cctx);
1309} 1549}
1310 1550
1311/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
1312#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1552#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1313 1553
1314static coro_cctx * 1554static coro_cctx *
1315cctx_get (pTHX) 1555cctx_get (pTHX)
1316{ 1556{
1317 while (expect_true (cctx_first)) 1557 while (ecb_expect_true (cctx_first))
1318 { 1558 {
1319 coro_cctx *cctx = cctx_first; 1559 coro_cctx *cctx = cctx_first;
1320 cctx_first = cctx->next; 1560 cctx_first = cctx->next;
1321 --cctx_idle; 1561 --cctx_idle;
1322 1562
1323 if (expect_true (!CCTX_EXPIRED (cctx))) 1563 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1324 return cctx; 1564 return cctx;
1325 1565
1326 cctx_destroy (cctx); 1566 cctx_destroy (cctx);
1327 } 1567 }
1328 1568
1330} 1570}
1331 1571
1332static void 1572static void
1333cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1334{ 1574{
1335 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1575 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1336 1576
1337 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1338 if (expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1339 { 1579 {
1340 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
1341 cctx_first = first->next; 1581 cctx_first = first->next;
1342 --cctx_idle; 1582 --cctx_idle;
1343 1583
1354static void 1594static void
1355transfer_check (pTHX_ struct coro *prev, struct coro *next) 1595transfer_check (pTHX_ struct coro *prev, struct coro *next)
1356{ 1596{
1357 /* TODO: throwing up here is considered harmful */ 1597 /* TODO: throwing up here is considered harmful */
1358 1598
1359 if (expect_true (prev != next)) 1599 if (ecb_expect_true (prev != next))
1360 { 1600 {
1361 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1601 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1362 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1602 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1363 1603
1364 if (expect_false (next->flags & CF_RUNNING)) 1604 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1365 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1366
1367 if (expect_false (next->flags & CF_DESTROYED))
1368 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1605 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1369 1606
1370#if !PERL_VERSION_ATLEAST (5,10,0) 1607#if !PERL_VERSION_ATLEAST (5,10,0)
1371 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1608 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1372 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1609 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1373#endif 1610#endif
1374 } 1611 }
1375} 1612}
1376 1613
1377/* always use the TRANSFER macro */ 1614/* always use the TRANSFER macro */
1378static void NOINLINE /* noinline so we have a fixed stackframe */ 1615static void ecb_noinline /* noinline so we have a fixed stackframe */
1379transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1616transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1380{ 1617{
1381 dSTACKLEVEL; 1618 dSTACKLEVEL;
1382 1619
1383 /* sometimes transfer is only called to set idle_sp */ 1620 /* sometimes transfer is only called to set idle_sp */
1384 if (expect_false (!prev)) 1621 if (ecb_expect_false (!prev))
1385 { 1622 {
1386 cctx_current->idle_sp = STACKLEVEL; 1623 cctx_current->idle_sp = STACKLEVEL;
1387 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1624 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1388 } 1625 }
1389 else if (expect_true (prev != next)) 1626 else if (ecb_expect_true (prev != next))
1390 { 1627 {
1391 coro_cctx *cctx_prev; 1628 coro_cctx *cctx_prev;
1392 1629
1393 if (expect_false (prev->flags & CF_NEW)) 1630 if (ecb_expect_false (prev->flags & CF_NEW))
1394 { 1631 {
1395 /* create a new empty/source context */ 1632 /* create a new empty/source context */
1396 prev->flags &= ~CF_NEW; 1633 prev->flags &= ~CF_NEW;
1397 prev->flags |= CF_RUNNING; 1634 prev->flags |= CF_RUNNING;
1398 } 1635 }
1401 next->flags |= CF_RUNNING; 1638 next->flags |= CF_RUNNING;
1402 1639
1403 /* first get rid of the old state */ 1640 /* first get rid of the old state */
1404 save_perl (aTHX_ prev); 1641 save_perl (aTHX_ prev);
1405 1642
1406 if (expect_false (next->flags & CF_NEW)) 1643 if (ecb_expect_false (next->flags & CF_NEW))
1407 { 1644 {
1408 /* need to start coroutine */ 1645 /* need to start coroutine */
1409 next->flags &= ~CF_NEW; 1646 next->flags &= ~CF_NEW;
1410 /* setup coroutine call */ 1647 /* setup coroutine call */
1411 coro_setup (aTHX_ next); 1648 init_perl (aTHX_ next);
1412 } 1649 }
1413 else 1650 else
1414 load_perl (aTHX_ next); 1651 load_perl (aTHX_ next);
1415 1652
1416 /* possibly untie and reuse the cctx */ 1653 /* possibly untie and reuse the cctx */
1417 if (expect_true ( 1654 if (ecb_expect_true (
1418 cctx_current->idle_sp == STACKLEVEL 1655 cctx_current->idle_sp == STACKLEVEL
1419 && !(cctx_current->flags & CC_TRACE) 1656 && !(cctx_current->flags & CC_TRACE)
1420 && !force_cctx 1657 && !force_cctx
1421 )) 1658 ))
1422 { 1659 {
1423 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1660 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1424 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1661 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1425 1662
1426 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1663 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1427 /* without this the next cctx_get might destroy the running cctx while still in use */ 1664 /* without this the next cctx_get might destroy the running cctx while still in use */
1428 if (expect_false (CCTX_EXPIRED (cctx_current))) 1665 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1429 if (expect_true (!next->cctx)) 1666 if (ecb_expect_true (!next->cctx))
1430 next->cctx = cctx_get (aTHX); 1667 next->cctx = cctx_get (aTHX);
1431 1668
1432 cctx_put (cctx_current); 1669 cctx_put (cctx_current);
1433 } 1670 }
1434 else 1671 else
1435 prev->cctx = cctx_current; 1672 prev->cctx = cctx_current;
1436 1673
1437 ++next->usecount; 1674 ++next->usecount;
1438 1675
1439 cctx_prev = cctx_current; 1676 cctx_prev = cctx_current;
1440 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1677 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1441 1678
1442 next->cctx = 0; 1679 next->cctx = 0;
1443 1680
1444 if (expect_false (cctx_prev != cctx_current)) 1681 if (ecb_expect_false (cctx_prev != cctx_current))
1445 { 1682 {
1446 cctx_prev->top_env = PL_top_env; 1683 cctx_prev->top_env = PL_top_env;
1447 PL_top_env = cctx_current->top_env; 1684 PL_top_env = cctx_current->top_env;
1448 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1685 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1449 } 1686 }
1455#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1692#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1456#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1693#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1457 1694
1458/** high level stuff ********************************************************/ 1695/** high level stuff ********************************************************/
1459 1696
1697/* this function is actually Coro, not Coro::State, but we call it from here */
1698/* because it is convenient - but it hasn't been declared yet for that reason */
1460static int 1699static void
1700coro_call_on_destroy (pTHX_ struct coro *coro);
1701
1702static void
1461coro_state_destroy (pTHX_ struct coro *coro) 1703coro_state_destroy (pTHX_ struct coro *coro)
1462{ 1704{
1463 if (coro->flags & CF_DESTROYED) 1705 if (coro->flags & CF_ZOMBIE)
1464 return 0; 1706 return;
1465 1707
1466 if (coro->on_destroy)
1467 coro->on_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1468 1709
1469 coro->flags |= CF_DESTROYED; 1710 coro->flags |= CF_ZOMBIE;
1470 1711
1471 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1472 { 1713 {
1473 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1474 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1475 --coro_nready; 1716 --coro_nready;
1476 } 1717 }
1477 else 1718 else
1478 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1719 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1720
1721 if (coro->next) coro->next->prev = coro->prev;
1722 if (coro->prev) coro->prev->next = coro->next;
1723 if (coro == coro_first) coro_first = coro->next;
1479 1724
1480 if (coro->mainstack 1725 if (coro->mainstack
1481 && coro->mainstack != main_mainstack 1726 && coro->mainstack != main_mainstack
1482 && coro->slot 1727 && coro->slot
1483 && !PL_dirty) 1728 && !PL_dirty)
1484 {
1485 struct coro temp;
1486
1487 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1488
1489 save_perl (aTHX_ &temp);
1490 load_perl (aTHX_ coro);
1491
1492 coro_destruct_perl (aTHX_ coro); 1729 destroy_perl (aTHX_ coro);
1493
1494 load_perl (aTHX_ &temp);
1495
1496 coro->slot = 0;
1497 }
1498 1730
1499 cctx_destroy (coro->cctx); 1731 cctx_destroy (coro->cctx);
1500 SvREFCNT_dec (coro->startcv); 1732 SvREFCNT_dec (coro->startcv);
1501 SvREFCNT_dec (coro->args); 1733 SvREFCNT_dec (coro->args);
1734 SvREFCNT_dec (coro->swap_sv);
1502 SvREFCNT_dec (CORO_THROW); 1735 SvREFCNT_dec (CORO_THROW);
1503 1736
1504 if (coro->next) coro->next->prev = coro->prev; 1737 coro_call_on_destroy (aTHX_ coro);
1505 if (coro->prev) coro->prev->next = coro->next;
1506 if (coro == coro_first) coro_first = coro->next;
1507 1738
1508 return 1; 1739 /* more destruction mayhem in coro_state_free */
1509} 1740}
1510 1741
1511static int 1742static int
1512coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1743coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1513{ 1744{
1514 struct coro *coro = (struct coro *)mg->mg_ptr; 1745 struct coro *coro = (struct coro *)mg->mg_ptr;
1515 mg->mg_ptr = 0; 1746 mg->mg_ptr = 0;
1516 1747
1517 coro->hv = 0;
1518
1519 if (--coro->refcnt < 0)
1520 {
1521 coro_state_destroy (aTHX_ coro); 1748 coro_state_destroy (aTHX_ coro);
1749 SvREFCNT_dec (coro->on_destroy);
1750 SvREFCNT_dec (coro->status);
1751
1522 Safefree (coro); 1752 Safefree (coro);
1523 }
1524 1753
1525 return 0; 1754 return 0;
1526} 1755}
1527 1756
1528static int 1757static int ecb_cold
1529coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1758coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1530{ 1759{
1531 struct coro *coro = (struct coro *)mg->mg_ptr; 1760 /* called when perl clones the current process the slow way (windows process emulation) */
1532 1761 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1533 ++coro->refcnt; 1762 mg->mg_ptr = 0;
1763 mg->mg_virtual = 0;
1534 1764
1535 return 0; 1765 return 0;
1536} 1766}
1537 1767
1538static MGVTBL coro_state_vtbl = { 1768static MGVTBL coro_state_vtbl = {
1561 1791
1562 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1792 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1563 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1564} 1794}
1565 1795
1566/*****************************************************************************/
1567/* gensub: simple closure generation utility */
1568
1569#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1570
1571/* create a closure from XS, returns a code reference */
1572/* the arg can be accessed via GENSUB_ARG from the callback */
1573/* the callback must use dXSARGS/XSRETURN */
1574static SV *
1575gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1576{
1577 CV *cv = (CV *)newSV (0);
1578
1579 sv_upgrade ((SV *)cv, SVt_PVCV);
1580
1581 CvANON_on (cv);
1582 CvISXSUB_on (cv);
1583 CvXSUB (cv) = xsub;
1584 GENSUB_ARG = arg;
1585
1586 return newRV_noinc ((SV *)cv);
1587}
1588
1589/** Coro ********************************************************************/ 1796/** Coro ********************************************************************/
1590 1797
1591INLINE void 1798ecb_inline void
1592coro_enq (pTHX_ struct coro *coro) 1799coro_enq (pTHX_ struct coro *coro)
1593{ 1800{
1594 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1801 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1595}
1596 1802
1597INLINE SV * 1803 SvREFCNT_inc_NN (coro->hv);
1804
1805 coro->next_ready = 0;
1806 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1807 ready [1] = coro;
1808}
1809
1810ecb_inline struct coro *
1598coro_deq (pTHX) 1811coro_deq (pTHX)
1599{ 1812{
1600 int prio; 1813 int prio;
1601 1814
1602 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1815 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1603 if (AvFILLp (coro_ready [prio]) >= 0) 1816 {
1604 return av_shift (coro_ready [prio]); 1817 struct coro **ready = coro_ready [prio];
1818
1819 if (ready [0])
1820 {
1821 struct coro *coro = ready [0];
1822 ready [0] = coro->next_ready;
1823 return coro;
1824 }
1825 }
1605 1826
1606 return 0; 1827 return 0;
1828}
1829
1830static void
1831invoke_sv_ready_hook_helper (void)
1832{
1833 dTHX;
1834 dSP;
1835
1836 ENTER;
1837 SAVETMPS;
1838
1839 PUSHMARK (SP);
1840 PUTBACK;
1841 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1842
1843 FREETMPS;
1844 LEAVE;
1607} 1845}
1608 1846
1609static int 1847static int
1610api_ready (pTHX_ SV *coro_sv) 1848api_ready (pTHX_ SV *coro_sv)
1611{ 1849{
1612 struct coro *coro;
1613 SV *sv_hook;
1614 void (*xs_hook)(void);
1615
1616 coro = SvSTATE (coro_sv); 1850 struct coro *coro = SvSTATE (coro_sv);
1617 1851
1618 if (coro->flags & CF_READY) 1852 if (coro->flags & CF_READY)
1619 return 0; 1853 return 0;
1620 1854
1621 coro->flags |= CF_READY; 1855 coro->flags |= CF_READY;
1622 1856
1623 sv_hook = coro_nready ? 0 : coro_readyhook;
1624 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1625
1626 coro_enq (aTHX_ coro); 1857 coro_enq (aTHX_ coro);
1627 ++coro_nready;
1628 1858
1629 if (sv_hook) 1859 if (!coro_nready++)
1630 { 1860 if (coroapi.readyhook)
1631 dSP; 1861 coroapi.readyhook ();
1632
1633 ENTER;
1634 SAVETMPS;
1635
1636 PUSHMARK (SP);
1637 PUTBACK;
1638 call_sv (sv_hook, G_VOID | G_DISCARD);
1639
1640 FREETMPS;
1641 LEAVE;
1642 }
1643
1644 if (xs_hook)
1645 xs_hook ();
1646 1862
1647 return 1; 1863 return 1;
1648} 1864}
1649 1865
1650static int 1866static int
1652{ 1868{
1653 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1869 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1654} 1870}
1655 1871
1656/* expects to own a reference to next->hv */ 1872/* expects to own a reference to next->hv */
1657INLINE void 1873ecb_inline void
1658prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1874prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1659{ 1875{
1660 SV *prev_sv = SvRV (coro_current); 1876 SV *prev_sv = SvRV (coro_current);
1661 1877
1662 ta->prev = SvSTATE_hv (prev_sv); 1878 ta->prev = SvSTATE_hv (prev_sv);
1673static void 1889static void
1674prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1890prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1675{ 1891{
1676 for (;;) 1892 for (;;)
1677 { 1893 {
1678 SV *next_sv = coro_deq (aTHX); 1894 struct coro *next = coro_deq (aTHX);
1679 1895
1680 if (expect_true (next_sv)) 1896 if (ecb_expect_true (next))
1681 { 1897 {
1682 struct coro *next = SvSTATE_hv (next_sv);
1683
1684 /* cannot transfer to destroyed coros, skip and look for next */ 1898 /* cannot transfer to destroyed coros, skip and look for next */
1685 if (expect_false (next->flags & CF_DESTROYED)) 1899 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1686 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1900 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1687 else 1901 else
1688 { 1902 {
1689 next->flags &= ~CF_READY; 1903 next->flags &= ~CF_READY;
1690 --coro_nready; 1904 --coro_nready;
1691 1905
1697 { 1911 {
1698 /* nothing to schedule: call the idle handler */ 1912 /* nothing to schedule: call the idle handler */
1699 if (SvROK (sv_idle) 1913 if (SvROK (sv_idle)
1700 && SvOBJECT (SvRV (sv_idle))) 1914 && SvOBJECT (SvRV (sv_idle)))
1701 { 1915 {
1916 if (SvRV (sv_idle) == SvRV (coro_current))
1917 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1918
1702 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1919 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1703 api_ready (aTHX_ SvRV (sv_idle)); 1920 api_ready (aTHX_ SvRV (sv_idle));
1704 --coro_nready; 1921 --coro_nready;
1705 } 1922 }
1706 else 1923 else
1707 { 1924 {
1925 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1708 dSP; 1926 dSP;
1709 1927
1710 ENTER; 1928 ENTER;
1711 SAVETMPS; 1929 SAVETMPS;
1712 1930
1719 } 1937 }
1720 } 1938 }
1721 } 1939 }
1722} 1940}
1723 1941
1724INLINE void 1942ecb_inline void
1725prepare_cede (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede (pTHX_ struct coro_transfer_args *ta)
1726{ 1944{
1727 api_ready (aTHX_ coro_current); 1945 api_ready (aTHX_ coro_current);
1728 prepare_schedule (aTHX_ ta); 1946 prepare_schedule (aTHX_ ta);
1729} 1947}
1730 1948
1731INLINE void 1949ecb_inline void
1732prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1950prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1733{ 1951{
1734 SV *prev = SvRV (coro_current); 1952 SV *prev = SvRV (coro_current);
1735 1953
1736 if (coro_nready) 1954 if (coro_nready)
1766{ 1984{
1767 struct coro_transfer_args ta; 1985 struct coro_transfer_args ta;
1768 1986
1769 prepare_cede (aTHX_ &ta); 1987 prepare_cede (aTHX_ &ta);
1770 1988
1771 if (expect_true (ta.prev != ta.next)) 1989 if (ecb_expect_true (ta.prev != ta.next))
1772 { 1990 {
1773 TRANSFER (ta, 1); 1991 TRANSFER (ta, 1);
1774 return 1; 1992 return 1;
1775 } 1993 }
1776 else 1994 else
1819 coro->slot->runops = RUNOPS_DEFAULT; 2037 coro->slot->runops = RUNOPS_DEFAULT;
1820 } 2038 }
1821} 2039}
1822 2040
1823static void 2041static void
2042coro_push_av (pTHX_ AV *av, I32 gimme_v)
2043{
2044 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2045 {
2046 dSP;
2047
2048 if (gimme_v == G_SCALAR)
2049 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2050 else
2051 {
2052 int i;
2053 EXTEND (SP, AvFILLp (av) + 1);
2054
2055 for (i = 0; i <= AvFILLp (av); ++i)
2056 PUSHs (AvARRAY (av)[i]);
2057 }
2058
2059 PUTBACK;
2060 }
2061}
2062
2063static void
2064coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2065{
2066 if (!coro->on_destroy)
2067 coro->on_destroy = newAV ();
2068
2069 av_push (coro->on_destroy, cb);
2070}
2071
2072static void
2073slf_destroy_join (pTHX_ struct CoroSLF *frame)
2074{
2075 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2076}
2077
2078static int
2079slf_check_join (pTHX_ struct CoroSLF *frame)
2080{
2081 struct coro *coro = (struct coro *)frame->data;
2082
2083 if (!coro->status)
2084 return 1;
2085
2086 frame->destroy = 0;
2087
2088 coro_push_av (aTHX_ coro->status, GIMME_V);
2089
2090 SvREFCNT_dec ((SV *)coro->hv);
2091
2092 return 0;
2093}
2094
2095static void
2096slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2097{
2098 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2099
2100 if (items > 1)
2101 croak ("join called with too many arguments");
2102
2103 if (coro->status)
2104 frame->prepare = prepare_nop;
2105 else
2106 {
2107 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2108 frame->prepare = prepare_schedule;
2109 }
2110
2111 frame->check = slf_check_join;
2112 frame->destroy = slf_destroy_join;
2113 frame->data = (void *)coro;
2114 SvREFCNT_inc (coro->hv);
2115}
2116
2117static void
1824coro_call_on_destroy (pTHX_ struct coro *coro) 2118coro_call_on_destroy (pTHX_ struct coro *coro)
1825{ 2119{
1826 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2120 AV *od = coro->on_destroy;
1827 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1828 2121
1829 if (on_destroyp) 2122 if (!od)
1830 { 2123 return;
1831 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1832 2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2127
1833 while (AvFILLp (on_destroy) >= 0) 2128 while (AvFILLp (od) >= 0)
2129 {
2130 SV *cb = sv_2mortal (av_pop (od));
2131
2132 /* coro hv's (and only hv's at the moment) are supported as well */
2133 if (SvSTATEhv_p (aTHX_ cb))
2134 api_ready (aTHX_ cb);
2135 else
1834 { 2136 {
1835 dSP; /* don't disturb outer sp */ 2137 dSP; /* don't disturb outer sp */
1836 SV *cb = av_pop (on_destroy);
1837
1838 PUSHMARK (SP); 2138 PUSHMARK (SP);
1839 2139
1840 if (statusp) 2140 if (coro->status)
1841 { 2141 {
1842 int i; 2142 PUTBACK;
1843 AV *status = (AV *)SvRV (*statusp); 2143 coro_push_av (aTHX_ coro->status, G_ARRAY);
1844 EXTEND (SP, AvFILLp (status) + 1); 2144 SPAGAIN;
1845
1846 for (i = 0; i <= AvFILLp (status); ++i)
1847 PUSHs (AvARRAY (status)[i]);
1848 } 2145 }
1849 2146
1850 PUTBACK; 2147 PUTBACK;
1851 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2148 call_sv (cb, G_VOID | G_DISCARD);
1852 } 2149 }
1853 } 2150 }
1854} 2151}
1855 2152
1856static void 2153static void
1857slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1858{ 2155{
2156 AV *av;
2157
2158 if (coro->status)
2159 {
2160 av = coro->status;
2161 av_clear (av);
2162 }
2163 else
2164 av = coro->status = newAV ();
2165
2166 /* items are actually not so common, so optimise for this case */
2167 if (items)
2168 {
1859 int i; 2169 int i;
1860 HV *hv = (HV *)SvRV (coro_current);
1861 AV *av = newAV ();
1862 2170
1863 av_extend (av, items - 1); 2171 av_extend (av, items - 1);
2172
1864 for (i = 0; i < items; ++i) 2173 for (i = 0; i < items; ++i)
1865 av_push (av, SvREFCNT_inc_NN (arg [i])); 2174 av_push (av, SvREFCNT_inc_NN (arg [i]));
2175 }
2176}
1866 2177
1867 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2178static void
1868 2179slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2180{
1869 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2181 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1870 api_ready (aTHX_ sv_manager); 2182 api_ready (aTHX_ sv_manager);
1871 2183
1872 frame->prepare = prepare_schedule; 2184 frame->prepare = prepare_schedule;
1873 frame->check = slf_check_repeat; 2185 frame->check = slf_check_repeat;
1874 2186
1875 /* as a minor optimisation, we could unwind all stacks here */ 2187 /* as a minor optimisation, we could unwind all stacks here */
1876 /* but that puts extra pressure on pp_slf, and is not worth much */ 2188 /* but that puts extra pressure on pp_slf, and is not worth much */
1877 /*coro_unwind_stacks (aTHX);*/ 2189 /*coro_unwind_stacks (aTHX);*/
2190}
2191
2192static void
2193slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2194{
2195 HV *coro_hv = (HV *)SvRV (coro_current);
2196
2197 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2198 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2199}
2200
2201static void
2202slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2203{
2204 HV *coro_hv;
2205 struct coro *coro;
2206
2207 if (items <= 0)
2208 croak ("Coro::cancel called without coro object,");
2209
2210 coro = SvSTATE (arg [0]);
2211 coro_hv = coro->hv;
2212
2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2214
2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2216 {
2217 /* coro currently busy cancelling something, so just notify it */
2218 coro->slf_frame.data = (void *)coro;
2219
2220 frame->prepare = prepare_nop;
2221 frame->check = slf_check_nop;
2222 }
2223 else if (coro_hv == (HV *)SvRV (coro_current))
2224 {
2225 /* cancelling the current coro is allowed, and equals terminate */
2226 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2227 }
2228 else
2229 {
2230 struct coro *self = SvSTATE_current;
2231
2232 /* otherwise we cancel directly, purely for speed reasons
2233 * unfortunately, this requires some magic trickery, as
2234 * somebody else could cancel us, so we have to fight the cancellation.
2235 * this is ugly, and hopefully fully worth the extra speed.
2236 * besides, I can't get the slow-but-safe version working...
2237 */
2238 slf_frame.data = 0;
2239 self->flags |= CF_NOCANCEL;
2240 coro_state_destroy (aTHX_ coro);
2241 self->flags &= ~CF_NOCANCEL;
2242
2243 if (slf_frame.data)
2244 {
2245 /* while we were busy we have been cancelled, so terminate */
2246 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2247 }
2248 else
2249 {
2250 frame->prepare = prepare_nop;
2251 frame->check = slf_check_nop;
2252 }
2253 }
2254}
2255
2256static int
2257slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2258{
2259 frame->prepare = 0;
2260 coro_unwind_stacks (aTHX);
2261
2262 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2263
2264 return 1;
2265}
2266
2267static int
2268safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2269{
2270 if (coro->cctx)
2271 croak ("coro inside C callback, unable to cancel at this time, caught");
2272
2273 if (coro->flags & CF_NEW)
2274 {
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro_state_destroy (aTHX_ coro);
2277 }
2278 else
2279 {
2280 if (!coro->slf_frame.prepare)
2281 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2282
2283 slf_destroy (aTHX_ coro);
2284
2285 coro_set_status (aTHX_ coro, arg, items);
2286 coro->slf_frame.prepare = prepare_nop;
2287 coro->slf_frame.check = slf_check_safe_cancel;
2288
2289 api_ready (aTHX_ (SV *)coro->hv);
2290 }
2291
2292 return 1;
1878} 2293}
1879 2294
1880/*****************************************************************************/ 2295/*****************************************************************************/
1881/* async pool handler */ 2296/* async pool handler */
1882 2297
1913slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2328slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1914{ 2329{
1915 HV *hv = (HV *)SvRV (coro_current); 2330 HV *hv = (HV *)SvRV (coro_current);
1916 struct coro *coro = SvSTATE_hv ((SV *)hv); 2331 struct coro *coro = SvSTATE_hv ((SV *)hv);
1917 2332
1918 if (expect_true (coro->saved_deffh)) 2333 if (ecb_expect_true (coro->saved_deffh))
1919 { 2334 {
1920 /* subsequent iteration */ 2335 /* subsequent iteration */
1921 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2336 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1922 coro->saved_deffh = 0; 2337 coro->saved_deffh = 0;
1923 2338
1924 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2339 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1925 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2340 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1926 { 2341 {
1927 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2342 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1928 coro->invoke_av = newAV (); 2343 return;
1929
1930 frame->prepare = prepare_nop;
1931 } 2344 }
1932 else 2345 else
1933 { 2346 {
1934 av_clear (GvAV (PL_defgv)); 2347 av_clear (GvAV (PL_defgv));
1935 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2348 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1960 2373
1961static void 2374static void
1962coro_rouse_callback (pTHX_ CV *cv) 2375coro_rouse_callback (pTHX_ CV *cv)
1963{ 2376{
1964 dXSARGS; 2377 dXSARGS;
1965 SV *data = (SV *)GENSUB_ARG; 2378 SV *data = (SV *)S_GENSUB_ARG;
1966 2379
1967 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1968 { 2381 {
1969 /* first call, set args */ 2382 /* first call, set args */
2383 SV *coro = SvRV (data);
1970 AV *av = newAV (); 2384 AV *av = newAV ();
1971 SV *coro = SvRV (data);
1972 2385
1973 SvRV_set (data, (SV *)av); 2386 SvRV_set (data, (SV *)av);
1974 api_ready (aTHX_ coro);
1975 SvREFCNT_dec (coro);
1976 2387
1977 /* better take a full copy of the arguments */ 2388 /* better take a full copy of the arguments */
1978 while (items--) 2389 while (items--)
1979 av_store (av, items, newSVsv (ST (items))); 2390 av_store (av, items, newSVsv (ST (items)));
2391
2392 api_ready (aTHX_ coro);
2393 SvREFCNT_dec (coro);
1980 } 2394 }
1981 2395
1982 XSRETURN_EMPTY; 2396 XSRETURN_EMPTY;
1983} 2397}
1984 2398
1985static int 2399static int
1986slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1987{ 2401{
1988 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
1989 2403
1990 if (CORO_THROW) 2404 if (CORO_THROW)
1991 return 0; 2405 return 0;
1992 2406
1993 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1994 return 1; 2408 return 1;
2001 2415
2002 EXTEND (SP, AvFILLp (av) + 1); 2416 EXTEND (SP, AvFILLp (av) + 1);
2003 for (i = 0; i <= AvFILLp (av); ++i) 2417 for (i = 0; i <= AvFILLp (av); ++i)
2004 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2418 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2005 2419
2006 /* we have stolen the elements, so ste length to zero and free */ 2420 /* we have stolen the elements, so set length to zero and free */
2007 AvFILLp (av) = -1; 2421 AvFILLp (av) = -1;
2008 av_undef (av); 2422 av_undef (av);
2009 2423
2010 PUTBACK; 2424 PUTBACK;
2011 } 2425 }
2030 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2031 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2032 } 2446 }
2033 2447
2034 if (!SvROK (cb) 2448 if (!SvROK (cb)
2035 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2036 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2037 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2038 2452
2039 { 2453 {
2040 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2041 SV *data = (SV *)GENSUB_ARG; 2455 SV *data = (SV *)S_GENSUB_ARG;
2042 2456
2043 frame->data = (void *)data; 2457 frame->data = (void *)data;
2044 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2458 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2045 frame->check = slf_check_rouse_wait; 2459 frame->check = slf_check_rouse_wait;
2046 } 2460 }
2050coro_new_rouse_cb (pTHX) 2464coro_new_rouse_cb (pTHX)
2051{ 2465{
2052 HV *hv = (HV *)SvRV (coro_current); 2466 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv (hv); 2467 struct coro *coro = SvSTATE_hv (hv);
2054 SV *data = newRV_inc ((SV *)hv); 2468 SV *data = newRV_inc ((SV *)hv);
2055 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2469 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2056 2470
2057 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2471 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2058 SvREFCNT_dec (data); /* magicext increases the refcount */ 2472 SvREFCNT_dec (data); /* magicext increases the refcount */
2059 2473
2060 SvREFCNT_dec (coro->rouse_cb); 2474 SvREFCNT_dec (coro->rouse_cb);
2157static void 2571static void
2158slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2572slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2159{ 2573{
2160 frame->prepare = prepare_cede_notself; 2574 frame->prepare = prepare_cede_notself;
2161 frame->check = slf_check_nop; 2575 frame->check = slf_check_nop;
2576}
2577
2578/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2579static void
2580slf_destroy (pTHX_ struct coro *coro)
2581{
2582 /* this callback is reserved for slf functions needing to do cleanup */
2583 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2584 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2585
2586 /*
2587 * The on_destroy above most likely is from an SLF call.
2588 * Since by definition the SLF call will not finish when we destroy
2589 * the coro, we will have to force-finish it here, otherwise
2590 * cleanup functions cannot call SLF functions.
2591 */
2592 coro->slf_frame.prepare = 0;
2162} 2593}
2163 2594
2164/* 2595/*
2165 * these not obviously related functions are all rolled into one 2596 * these not obviously related functions are all rolled into one
2166 * function to increase chances that they all will call transfer with the same 2597 * function to increase chances that they all will call transfer with the same
2173 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2604 I32 checkmark; /* mark SP to see how many elements check has pushed */
2174 2605
2175 /* set up the slf frame, unless it has already been set-up */ 2606 /* set up the slf frame, unless it has already been set-up */
2176 /* the latter happens when a new coro has been started */ 2607 /* the latter happens when a new coro has been started */
2177 /* or when a new cctx was attached to an existing coroutine */ 2608 /* or when a new cctx was attached to an existing coroutine */
2178 if (expect_true (!slf_frame.prepare)) 2609 if (ecb_expect_true (!slf_frame.prepare))
2179 { 2610 {
2180 /* first iteration */ 2611 /* first iteration */
2181 dSP; 2612 dSP;
2182 SV **arg = PL_stack_base + TOPMARK + 1; 2613 SV **arg = PL_stack_base + TOPMARK + 1;
2183 int items = SP - arg; /* args without function object */ 2614 int items = SP - arg; /* args without function object */
2224 while (slf_frame.check (aTHX_ &slf_frame)); 2655 while (slf_frame.check (aTHX_ &slf_frame));
2225 2656
2226 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2657 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2227 2658
2228 /* exception handling */ 2659 /* exception handling */
2229 if (expect_false (CORO_THROW)) 2660 if (ecb_expect_false (CORO_THROW))
2230 { 2661 {
2231 SV *exception = sv_2mortal (CORO_THROW); 2662 SV *exception = sv_2mortal (CORO_THROW);
2232 2663
2233 CORO_THROW = 0; 2664 CORO_THROW = 0;
2234 sv_setsv (ERRSV, exception); 2665 sv_setsv (ERRSV, exception);
2235 croak (0); 2666 croak (0);
2236 } 2667 }
2237 2668
2238 /* return value handling - mostly like entersub */ 2669 /* return value handling - mostly like entersub */
2239 /* make sure we put something on the stack in scalar context */ 2670 /* make sure we put something on the stack in scalar context */
2240 if (GIMME_V == G_SCALAR) 2671 if (GIMME_V == G_SCALAR
2672 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2241 { 2673 {
2242 dSP; 2674 dSP;
2243 SV **bot = PL_stack_base + checkmark; 2675 SV **bot = PL_stack_base + checkmark;
2244 2676
2245 if (sp == bot) /* too few, push undef */ 2677 if (sp == bot) /* too few, push undef */
2246 bot [1] = &PL_sv_undef; 2678 bot [1] = &PL_sv_undef;
2247 else if (sp != bot + 1) /* too many, take last one */ 2679 else /* too many, take last one */
2248 bot [1] = *sp; 2680 bot [1] = *sp;
2249 2681
2250 SP = bot + 1; 2682 SP = bot + 1;
2251 2683
2252 PUTBACK; 2684 PUTBACK;
2285 if (PL_op->op_flags & OPf_STACKED) 2717 if (PL_op->op_flags & OPf_STACKED)
2286 { 2718 {
2287 if (items > slf_arga) 2719 if (items > slf_arga)
2288 { 2720 {
2289 slf_arga = items; 2721 slf_arga = items;
2290 free (slf_argv); 2722 Safefree (slf_argv);
2291 slf_argv = malloc (slf_arga * sizeof (SV *)); 2723 New (0, slf_argv, slf_arga, SV *);
2292 } 2724 }
2293 2725
2294 slf_argc = items; 2726 slf_argc = items;
2295 2727
2296 for (i = 0; i < items; ++i) 2728 for (i = 0; i < items; ++i)
2301 2733
2302 PL_op->op_ppaddr = pp_slf; 2734 PL_op->op_ppaddr = pp_slf;
2303 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2735 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2304 2736
2305 PL_op = (OP *)&slf_restore; 2737 PL_op = (OP *)&slf_restore;
2738}
2739
2740/*****************************************************************************/
2741/* dynamic wind */
2742
2743static void
2744on_enterleave_call (pTHX_ SV *cb)
2745{
2746 dSP;
2747
2748 PUSHSTACK;
2749
2750 PUSHMARK (SP);
2751 PUTBACK;
2752 call_sv (cb, G_VOID | G_DISCARD);
2753 SPAGAIN;
2754
2755 POPSTACK;
2756}
2757
2758static SV *
2759coro_avp_pop_and_free (pTHX_ AV **avp)
2760{
2761 AV *av = *avp;
2762 SV *res = av_pop (av);
2763
2764 if (AvFILLp (av) < 0)
2765 {
2766 *avp = 0;
2767 SvREFCNT_dec (av);
2768 }
2769
2770 return res;
2771}
2772
2773static void
2774coro_pop_on_enter (pTHX_ void *coro)
2775{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2777 SvREFCNT_dec (cb);
2778}
2779
2780static void
2781coro_pop_on_leave (pTHX_ void *coro)
2782{
2783 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2784 on_enterleave_call (aTHX_ sv_2mortal (cb));
2306} 2785}
2307 2786
2308/*****************************************************************************/ 2787/*****************************************************************************/
2309/* PerlIO::cede */ 2788/* PerlIO::cede */
2310 2789
2312{ 2791{
2313 PerlIOBuf base; 2792 PerlIOBuf base;
2314 NV next, every; 2793 NV next, every;
2315} PerlIOCede; 2794} PerlIOCede;
2316 2795
2317static IV 2796static IV ecb_cold
2318PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2797PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2319{ 2798{
2320 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2799 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2321 2800
2322 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2801 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2323 self->next = nvtime () + self->every; 2802 self->next = nvtime () + self->every;
2324 2803
2325 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2804 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2326} 2805}
2327 2806
2328static SV * 2807static SV * ecb_cold
2329PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2808PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2330{ 2809{
2331 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2810 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2332 2811
2333 return newSVnv (self->every); 2812 return newSVnv (self->every);
2384/* Coro::Semaphore & Coro::Signal */ 2863/* Coro::Semaphore & Coro::Signal */
2385 2864
2386static SV * 2865static SV *
2387coro_waitarray_new (pTHX_ int count) 2866coro_waitarray_new (pTHX_ int count)
2388{ 2867{
2389 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2868 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2390 AV *av = newAV (); 2869 AV *av = newAV ();
2391 SV **ary; 2870 SV **ary;
2392 2871
2393 /* unfortunately, building manually saves memory */ 2872 /* unfortunately, building manually saves memory */
2394 Newx (ary, 2, SV *); 2873 Newx (ary, 2, SV *);
2445 SvREFCNT_dec (cb); 2924 SvREFCNT_dec (cb);
2446 } 2925 }
2447} 2926}
2448 2927
2449static void 2928static void
2450coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2929coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2451{ 2930{
2452 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2931 /* call $sem->adjust (0) to possibly wake up some other waiters */
2453 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2932 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2454} 2933}
2455 2934
2456static int 2935static int
2457slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2936slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2458{ 2937{
2459 AV *av = (AV *)frame->data; 2938 AV *av = (AV *)frame->data;
2460 SV *count_sv = AvARRAY (av)[0]; 2939 SV *count_sv = AvARRAY (av)[0];
2940 SV *coro_hv = SvRV (coro_current);
2461 2941
2462 /* if we are about to throw, don't actually acquire the lock, just throw */ 2942 /* if we are about to throw, don't actually acquire the lock, just throw */
2463 if (CORO_THROW) 2943 if (CORO_THROW)
2464 return 0; 2944 return 0;
2465 else if (SvIVX (count_sv) > 0) 2945 else if (SvIVX (count_sv) > 0)
2466 { 2946 {
2467 SvSTATE_current->on_destroy = 0; 2947 frame->destroy = 0;
2468 2948
2469 if (acquire) 2949 if (acquire)
2470 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2950 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2471 else 2951 else
2472 coro_semaphore_adjust (aTHX_ av, 0); 2952 coro_semaphore_adjust (aTHX_ av, 0);
2477 { 2957 {
2478 int i; 2958 int i;
2479 /* if we were woken up but can't down, we look through the whole */ 2959 /* if we were woken up but can't down, we look through the whole */
2480 /* waiters list and only add us if we aren't in there already */ 2960 /* waiters list and only add us if we aren't in there already */
2481 /* this avoids some degenerate memory usage cases */ 2961 /* this avoids some degenerate memory usage cases */
2482 2962 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2483 for (i = 1; i <= AvFILLp (av); ++i)
2484 if (AvARRAY (av)[i] == SvRV (coro_current)) 2963 if (AvARRAY (av)[i] == coro_hv)
2485 return 1; 2964 return 1;
2486 2965
2487 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2966 av_push (av, SvREFCNT_inc (coro_hv));
2488 return 1; 2967 return 1;
2489 } 2968 }
2490} 2969}
2491 2970
2492static int 2971static int
2515 { 2994 {
2516 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2995 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2517 2996
2518 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2997 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2519 frame->prepare = prepare_schedule; 2998 frame->prepare = prepare_schedule;
2520
2521 /* to avoid race conditions when a woken-up coro gets terminated */ 2999 /* to avoid race conditions when a woken-up coro gets terminated */
2522 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3000 /* we arrange for a temporary on_destroy that calls adjust (0) */
2523 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3001 frame->destroy = coro_semaphore_destroy;
2524 } 3002 }
2525} 3003}
2526 3004
2527static void 3005static void
2528slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3006slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2536{ 3014{
2537 if (items >= 2) 3015 if (items >= 2)
2538 { 3016 {
2539 /* callback form */ 3017 /* callback form */
2540 AV *av = (AV *)SvRV (arg [0]); 3018 AV *av = (AV *)SvRV (arg [0]);
2541 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3019 SV *cb_cv = s_get_cv_croak (arg [1]);
2542 3020
2543 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3021 av_push (av, SvREFCNT_inc_NN (cb_cv));
2544 3022
2545 if (SvIVX (AvARRAY (av)[0]) > 0) 3023 if (SvIVX (AvARRAY (av)[0]) > 0)
2546 coro_semaphore_adjust (aTHX_ av, 0); 3024 coro_semaphore_adjust (aTHX_ av, 0);
2547 3025
2548 frame->prepare = prepare_nop; 3026 frame->prepare = prepare_nop;
2572 AvARRAY (av)[0] = AvARRAY (av)[1]; 3050 AvARRAY (av)[0] = AvARRAY (av)[1];
2573 AvARRAY (av)[1] = cb; 3051 AvARRAY (av)[1] = cb;
2574 3052
2575 cb = av_shift (av); 3053 cb = av_shift (av);
2576 3054
3055 if (SvTYPE (cb) == SVt_PVCV)
3056 {
3057 dSP;
3058 PUSHMARK (SP);
3059 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3060 PUTBACK;
3061 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3062 }
3063 else
3064 {
2577 api_ready (aTHX_ cb); 3065 api_ready (aTHX_ cb);
2578 sv_setiv (cb, 0); /* signal waiter */ 3066 sv_setiv (cb, 0); /* signal waiter */
3067 }
3068
2579 SvREFCNT_dec (cb); 3069 SvREFCNT_dec (cb);
2580 3070
2581 --count; 3071 --count;
2582 } 3072 }
2583} 3073}
2592static void 3082static void
2593slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3083slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2594{ 3084{
2595 AV *av = (AV *)SvRV (arg [0]); 3085 AV *av = (AV *)SvRV (arg [0]);
2596 3086
3087 if (items >= 2)
3088 {
3089 SV *cb_cv = s_get_cv_croak (arg [1]);
3090 av_push (av, SvREFCNT_inc_NN (cb_cv));
3091
2597 if (SvIVX (AvARRAY (av)[0])) 3092 if (SvIVX (AvARRAY (av)[0]))
3093 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3094
3095 frame->prepare = prepare_nop;
3096 frame->check = slf_check_nop;
3097 }
3098 else if (SvIVX (AvARRAY (av)[0]))
2598 { 3099 {
2599 SvIVX (AvARRAY (av)[0]) = 0; 3100 SvIVX (AvARRAY (av)[0]) = 0;
2600 frame->prepare = prepare_nop; 3101 frame->prepare = prepare_nop;
2601 frame->check = slf_check_nop; 3102 frame->check = slf_check_nop;
2602 } 3103 }
2603 else 3104 else
2604 { 3105 {
2605 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3106 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2606 3107
2607 av_push (av, waiter); 3108 av_push (av, waiter);
2608 3109
2609 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3110 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2610 frame->prepare = prepare_schedule; 3111 frame->prepare = prepare_schedule;
2628 3129
2629static void 3130static void
2630coro_aio_callback (pTHX_ CV *cv) 3131coro_aio_callback (pTHX_ CV *cv)
2631{ 3132{
2632 dXSARGS; 3133 dXSARGS;
2633 AV *state = (AV *)GENSUB_ARG; 3134 AV *state = (AV *)S_GENSUB_ARG;
2634 SV *coro = av_pop (state); 3135 SV *coro = av_pop (state);
2635 SV *data_sv = newSV (sizeof (struct io_state)); 3136 SV *data_sv = newSV (sizeof (struct io_state));
2636 3137
2637 av_extend (state, items - 1); 3138 av_extend (state, items - 1);
2638 3139
2674 /* it quickly returns */ 3175 /* it quickly returns */
2675 if (CORO_THROW) 3176 if (CORO_THROW)
2676 return 0; 3177 return 0;
2677 3178
2678 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
2679 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2680 return 1; 3181 return 1;
2681 3182
2682 /* restore status */ 3183 /* restore status */
2683 { 3184 {
2684 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
2723 dSP; 3224 dSP;
2724 3225
2725 static SV *prio_cv; 3226 static SV *prio_cv;
2726 static SV *prio_sv; 3227 static SV *prio_sv;
2727 3228
2728 if (expect_false (!prio_cv)) 3229 if (ecb_expect_false (!prio_cv))
2729 { 3230 {
2730 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3231 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2731 prio_sv = newSViv (0); 3232 prio_sv = newSViv (0);
2732 } 3233 }
2733 3234
2752 3253
2753 for (i = 0; i < items; ++i) 3254 for (i = 0; i < items; ++i)
2754 PUSHs (arg [i]); 3255 PUSHs (arg [i]);
2755 3256
2756 /* now push the callback closure */ 3257 /* now push the callback closure */
2757 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3258 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2758 3259
2759 /* now call the AIO function - we assume our request is uncancelable */ 3260 /* now call the AIO function - we assume our request is uncancelable */
2760 PUTBACK; 3261 PUTBACK;
2761 call_sv ((SV *)req, G_VOID | G_DISCARD); 3262 call_sv ((SV *)req, G_VOID | G_DISCARD);
2762 } 3263 }
2763 3264
2764 /* now that the requets is going, we loop toll we have a result */ 3265 /* now that the request is going, we loop till we have a result */
2765 frame->data = (void *)state; 3266 frame->data = (void *)state;
2766 frame->prepare = prepare_schedule; 3267 frame->prepare = prepare_schedule;
2767 frame->check = slf_check_aio_req; 3268 frame->check = slf_check_aio_req;
2768} 3269}
2769 3270
2779 3280
2780/*****************************************************************************/ 3281/*****************************************************************************/
2781 3282
2782#if CORO_CLONE 3283#if CORO_CLONE
2783# include "clone.c" 3284# include "clone.c"
3285#endif
3286
3287/*****************************************************************************/
3288
3289static SV *
3290coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3291{
3292 SV *coro_sv;
3293 struct coro *coro;
3294 MAGIC *mg;
3295 HV *hv;
3296 SV *cb;
3297 int i;
3298
3299 if (argc > 0)
3300 {
3301 cb = s_get_cv_croak (argv [0]);
3302
3303 if (!is_coro)
3304 {
3305 if (CvISXSUB (cb))
3306 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3307
3308 if (!CvROOT (cb))
3309 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3310 }
3311 }
3312
3313 Newz (0, coro, 1, struct coro);
3314 coro->args = newAV ();
3315 coro->flags = CF_NEW;
3316
3317 if (coro_first) coro_first->prev = coro;
3318 coro->next = coro_first;
3319 coro_first = coro;
3320
3321 coro->hv = hv = newHV ();
3322 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3323 mg->mg_flags |= MGf_DUP;
3324 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3325
3326 if (argc > 0)
3327 {
3328 av_extend (coro->args, argc + is_coro - 1);
3329
3330 if (is_coro)
3331 {
3332 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3333 cb = (SV *)cv_coro_run;
3334 }
3335
3336 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3337
3338 for (i = 1; i < argc; i++)
3339 av_push (coro->args, newSVsv (argv [i]));
3340 }
3341
3342 return coro_sv;
3343}
3344
3345#ifndef __cplusplus
3346ecb_cold XS(boot_Coro__State);
3347#endif
3348
3349#if CORO_JIT
3350
3351static void ecb_noinline ecb_cold
3352pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3353{
3354 dSP;
3355 AV *av = newAV ();
3356
3357 av_store (av, 3, newSVuv (d));
3358 av_store (av, 2, newSVuv (c));
3359 av_store (av, 1, newSVuv (b));
3360 av_store (av, 0, newSVuv (a));
3361
3362 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3363
3364 PUTBACK;
3365}
3366
3367static void ecb_noinline ecb_cold
3368jit_init (pTHX)
3369{
3370 dSP;
3371 SV *load, *save;
3372 char *map_base;
3373 char *load_ptr, *save_ptr;
3374 STRLEN load_len, save_len, map_len;
3375 int count;
3376
3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3378
3379 PUSHMARK (SP);
3380 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3381 #include "state.h"
3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3383 SPAGAIN;
3384
3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
3387
3388 map_len = load_len + save_len + 16;
3389
3390 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3391
3392 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3393
3394 load_perl_slots = (load_save_perl_slots_type)map_base;
3395 memcpy (map_base, load_ptr, load_len);
3396
3397 map_base += (load_len + 15) & ~15;
3398
3399 save_perl_slots = (load_save_perl_slots_type)map_base;
3400 memcpy (map_base, save_ptr, save_len);
3401
3402 /* we are good citizens and try to make the page read-only, so the evil evil */
3403 /* hackers might have it a bit more difficult */
3404 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3405
3406 PUTBACK;
3407 eval_pv ("undef &Coro::State::_jit", 1);
3408}
3409
2784#endif 3410#endif
2785 3411
2786MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3412MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2787 3413
2788PROTOTYPES: DISABLE 3414PROTOTYPES: DISABLE
2792#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
2793# if CORO_PTHREAD 3419# if CORO_PTHREAD
2794 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
2795# endif 3421# endif
2796#endif 3422#endif
2797 BOOT_PAGESIZE; 3423 /* perl defines these to check for existance first, but why it doesn't */
3424 /* just create them one at init time is not clear to me, except for */
3425 /* programs trying to delete them, but... */
3426 /* anyway, we declare this as invalid and make sure they are initialised here */
3427 DEFSV;
3428 ERRSV;
2798 3429
2799 cctx_current = cctx_new_empty (); 3430 cctx_current = cctx_new_empty ();
2800 3431
2801 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3432 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2802 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3433 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2842 coroapi.prepare_nop = prepare_nop; 3473 coroapi.prepare_nop = prepare_nop;
2843 coroapi.prepare_schedule = prepare_schedule; 3474 coroapi.prepare_schedule = prepare_schedule;
2844 coroapi.prepare_cede = prepare_cede; 3475 coroapi.prepare_cede = prepare_cede;
2845 coroapi.prepare_cede_notself = prepare_cede_notself; 3476 coroapi.prepare_cede_notself = prepare_cede_notself;
2846 3477
2847 { 3478 time_init (aTHX);
2848 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2849 3479
2850 if (!svp) croak ("Time::HiRes is required");
2851 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2852
2853 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2854 }
2855
2856 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3480 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3481#if CORO_JIT
3482 PUTBACK;
3483 jit_init (aTHX);
3484 SPAGAIN;
3485#endif
2857} 3486}
2858 3487
2859SV * 3488SV *
2860new (char *klass, ...) 3489new (SV *klass, ...)
2861 ALIAS: 3490 ALIAS:
2862 Coro::new = 1 3491 Coro::new = 1
2863 CODE: 3492 CODE:
2864{ 3493 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2865 struct coro *coro; 3494 OUTPUT:
2866 MAGIC *mg;
2867 HV *hv;
2868 CV *cb;
2869 int i;
2870
2871 if (items > 1)
2872 {
2873 cb = coro_sv_2cv (aTHX_ ST (1));
2874
2875 if (!ix)
2876 {
2877 if (CvISXSUB (cb))
2878 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2879
2880 if (!CvROOT (cb))
2881 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2882 }
2883 }
2884
2885 Newz (0, coro, 1, struct coro);
2886 coro->args = newAV ();
2887 coro->flags = CF_NEW;
2888
2889 if (coro_first) coro_first->prev = coro;
2890 coro->next = coro_first;
2891 coro_first = coro;
2892
2893 coro->hv = hv = newHV ();
2894 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2895 mg->mg_flags |= MGf_DUP;
2896 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2897
2898 if (items > 1)
2899 {
2900 av_extend (coro->args, items - 1 + ix - 1);
2901
2902 if (ix)
2903 {
2904 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2905 cb = cv_coro_run;
2906 }
2907
2908 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2909
2910 for (i = 2; i < items; i++)
2911 av_push (coro->args, newSVsv (ST (i)));
2912 }
2913}
2914 OUTPUT:
2915 RETVAL 3495 RETVAL
2916 3496
2917void 3497void
2918transfer (...) 3498transfer (...)
2919 PROTOTYPE: $$ 3499 PROTOTYPE: $$
2920 CODE: 3500 CODE:
2921 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2922
2923bool
2924_destroy (SV *coro_sv)
2925 CODE:
2926 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2927 OUTPUT:
2928 RETVAL
2929
2930void
2931_exit (int code)
2932 PROTOTYPE: $
2933 CODE:
2934 _exit (code);
2935 3502
2936SV * 3503SV *
2937clone (Coro::State coro) 3504clone (Coro::State coro)
2938 CODE: 3505 CODE:
2939{ 3506{
2994void 3561void
2995list () 3562list ()
2996 PROTOTYPE: 3563 PROTOTYPE:
2997 PPCODE: 3564 PPCODE:
2998{ 3565{
2999 struct coro *coro; 3566 struct coro *coro;
3000 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3001 if (coro->hv) 3568 if (coro->hv)
3002 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3003} 3570}
3004 3571
3008 eval = 1 3575 eval = 1
3009 CODE: 3576 CODE:
3010{ 3577{
3011 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3578 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3012 { 3579 {
3013 struct coro temp; 3580 struct coro *current = SvSTATE_current;
3581 struct CoroSLF slf_save;
3014 3582
3015 if (!(coro->flags & CF_RUNNING)) 3583 if (current != coro)
3016 { 3584 {
3017 PUTBACK; 3585 PUTBACK;
3018 save_perl (aTHX_ &temp); 3586 save_perl (aTHX_ current);
3019 load_perl (aTHX_ coro); 3587 load_perl (aTHX_ coro);
3588 /* the coro is most likely in an active SLF call.
3589 * while not strictly required (the code we execute is
3590 * not allowed to call any SLF functions), it's cleaner
3591 * to reinitialise the slf_frame and restore it later.
3592 * This might one day allow us to actually do SLF calls
3593 * from code executed here.
3594 */
3595 slf_save = slf_frame;
3596 slf_frame.prepare = 0;
3597 SPAGAIN;
3020 } 3598 }
3021 3599
3022 {
3023 dSP;
3024 ENTER;
3025 SAVETMPS;
3026 PUTBACK;
3027 PUSHSTACK; 3600 PUSHSTACK;
3601
3028 PUSHMARK (SP); 3602 PUSHMARK (SP);
3603 PUTBACK;
3029 3604
3030 if (ix) 3605 if (ix)
3031 eval_sv (coderef, 0); 3606 eval_sv (coderef, 0);
3032 else 3607 else
3033 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3608 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3034 3609
3035 POPSTACK; 3610 POPSTACK;
3036 SPAGAIN; 3611 SPAGAIN;
3037 FREETMPS;
3038 LEAVE;
3039 PUTBACK;
3040 }
3041 3612
3042 if (!(coro->flags & CF_RUNNING)) 3613 if (current != coro)
3043 { 3614 {
3615 PUTBACK;
3616 slf_frame = slf_save;
3044 save_perl (aTHX_ coro); 3617 save_perl (aTHX_ coro);
3045 load_perl (aTHX_ &temp); 3618 load_perl (aTHX_ current);
3046 SPAGAIN; 3619 SPAGAIN;
3047 } 3620 }
3048 } 3621 }
3049} 3622}
3050 3623
3053 PROTOTYPE: $ 3626 PROTOTYPE: $
3054 ALIAS: 3627 ALIAS:
3055 is_ready = CF_READY 3628 is_ready = CF_READY
3056 is_running = CF_RUNNING 3629 is_running = CF_RUNNING
3057 is_new = CF_NEW 3630 is_new = CF_NEW
3058 is_destroyed = CF_DESTROYED 3631 is_destroyed = CF_ZOMBIE
3632 is_zombie = CF_ZOMBIE
3633 is_suspended = CF_SUSPENDED
3059 CODE: 3634 CODE:
3060 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3061 OUTPUT: 3636 OUTPUT:
3062 RETVAL 3637 RETVAL
3063 3638
3064void 3639void
3065throw (Coro::State self, SV *throw = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3066 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3067 CODE: 3642 CODE:
3068{ 3643{
3644 struct coro *coro = SvSTATE (self);
3069 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3070 SV **throwp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3071 SvREFCNT_dec (*throwp); 3647 SvREFCNT_dec (*exceptionp);
3072 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3648 SvGETMAGIC (exception);
3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3073} 3652}
3074 3653
3075void 3654void
3076api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3077 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
3128 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3707 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3129 3708
3130 SV *tmp = *src; *src = *dst; *dst = tmp; 3709 SV *tmp = *src; *src = *dst; *dst = tmp;
3131 } 3710 }
3132 3711
3712void
3713cancel (Coro::State self)
3714 CODE:
3715 coro_state_destroy (aTHX_ self);
3716
3717SV *
3718enable_times (int enabled = enable_times)
3719 CODE:
3720{
3721 RETVAL = boolSV (enable_times);
3722
3723 if (enabled != enable_times)
3724 {
3725 enable_times = enabled;
3726
3727 coro_times_update ();
3728 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3729 }
3730}
3731 OUTPUT:
3732 RETVAL
3733
3734void
3735times (Coro::State self)
3736 PPCODE:
3737{
3738 struct coro *current = SvSTATE (coro_current);
3739
3740 if (ecb_expect_false (current == self))
3741 {
3742 coro_times_update ();
3743 coro_times_add (SvSTATE (coro_current));
3744 }
3745
3746 EXTEND (SP, 2);
3747 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3748 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3749
3750 if (ecb_expect_false (current == self))
3751 coro_times_sub (SvSTATE (coro_current));
3752}
3753
3754void
3755swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3756 CODE:
3757{
3758 struct coro *current = SvSTATE_current;
3759
3760 if (current == coro)
3761 SWAP_SVS (current);
3762
3763 if (!coro->swap_sv)
3764 coro->swap_sv = newAV ();
3765
3766 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3767 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3768
3769 if (current == coro)
3770 SWAP_SVS (current);
3771}
3772
3133 3773
3134MODULE = Coro::State PACKAGE = Coro 3774MODULE = Coro::State PACKAGE = Coro
3135 3775
3136BOOT: 3776BOOT:
3137{ 3777{
3138 int i;
3139
3140 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3778 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3141 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3779 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3142 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3780 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3143 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3144 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3781 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3145 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3782 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3146 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3783 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3147 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3784 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3148 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3785 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3149 3786
3150 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3787 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3151 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3152 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3789 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3153 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3154 3791
3155 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3156 3793
3157 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3158 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3159 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3160 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3797 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3161 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3798 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3162 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3799 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3163
3164 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3165 coro_ready[i] = newAV ();
3166 3800
3167 { 3801 {
3168 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3802 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3169 3803
3170 coroapi.schedule = api_schedule; 3804 coroapi.schedule = api_schedule;
3180 sv_setiv (sv, (IV)&coroapi); 3814 sv_setiv (sv, (IV)&coroapi);
3181 SvREADONLY_on (sv); 3815 SvREADONLY_on (sv);
3182 } 3816 }
3183} 3817}
3184 3818
3819SV *
3820async (...)
3821 PROTOTYPE: &@
3822 CODE:
3823 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3824 api_ready (aTHX_ RETVAL);
3825 OUTPUT:
3826 RETVAL
3827
3828void
3829_destroy (Coro::State coro)
3830 CODE:
3831 /* used by the manager thread */
3832 coro_state_destroy (aTHX_ coro);
3833
3834void
3835on_destroy (Coro::State coro, SV *cb)
3836 CODE:
3837 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3838
3839void
3840join (...)
3841 CODE:
3842 CORO_EXECUTE_SLF_XS (slf_init_join);
3843
3185void 3844void
3186terminate (...) 3845terminate (...)
3187 CODE: 3846 CODE:
3188 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3847 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3189 3848
3190void 3849void
3850cancel (...)
3851 CODE:
3852 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3853
3854int
3855safe_cancel (Coro::State self, ...)
3856 C_ARGS: aTHX_ self, &ST (1), items - 1
3857
3858void
3191schedule (...) 3859schedule (...)
3192 CODE: 3860 CODE:
3193 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3861 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3194 3862
3195void 3863void
3209 3877
3210void 3878void
3211cede_notself (...) 3879cede_notself (...)
3212 CODE: 3880 CODE:
3213 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3881 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3214
3215void
3216_cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self);
3220 3882
3221void 3883void
3222_set_current (SV *current) 3884_set_current (SV *current)
3223 PROTOTYPE: $ 3885 PROTOTYPE: $
3224 CODE: 3886 CODE:
3228void 3890void
3229_set_readyhook (SV *hook) 3891_set_readyhook (SV *hook)
3230 PROTOTYPE: $ 3892 PROTOTYPE: $
3231 CODE: 3893 CODE:
3232 SvREFCNT_dec (coro_readyhook); 3894 SvREFCNT_dec (coro_readyhook);
3895 SvGETMAGIC (hook);
3896 if (SvOK (hook))
3897 {
3233 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3898 coro_readyhook = newSVsv (hook);
3899 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3900 }
3901 else
3902 {
3903 coro_readyhook = 0;
3904 CORO_READYHOOK = 0;
3905 }
3234 3906
3235int 3907int
3236prio (Coro::State coro, int newprio = 0) 3908prio (Coro::State coro, int newprio = 0)
3237 PROTOTYPE: $;$ 3909 PROTOTYPE: $;$
3238 ALIAS: 3910 ALIAS:
3244 if (items > 1) 3916 if (items > 1)
3245 { 3917 {
3246 if (ix) 3918 if (ix)
3247 newprio = coro->prio - newprio; 3919 newprio = coro->prio - newprio;
3248 3920
3249 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3921 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3250 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3922 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3251 3923
3252 coro->prio = newprio; 3924 coro->prio = newprio;
3253 } 3925 }
3254} 3926}
3255 OUTPUT: 3927 OUTPUT:
3270 RETVAL = coro_nready; 3942 RETVAL = coro_nready;
3271 OUTPUT: 3943 OUTPUT:
3272 RETVAL 3944 RETVAL
3273 3945
3274void 3946void
3947suspend (Coro::State self)
3948 PROTOTYPE: $
3949 CODE:
3950 self->flags |= CF_SUSPENDED;
3951
3952void
3953resume (Coro::State self)
3954 PROTOTYPE: $
3955 CODE:
3956 self->flags &= ~CF_SUSPENDED;
3957
3958void
3275_pool_handler (...) 3959_pool_handler (...)
3276 CODE: 3960 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3961 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3278 3962
3279void 3963void
3290 for (i = 1; i < items; ++i) 3974 for (i = 1; i < items; ++i)
3291 av_push (av, SvREFCNT_inc_NN (ST (i))); 3975 av_push (av, SvREFCNT_inc_NN (ST (i)));
3292 3976
3293 if ((SV *)hv == &PL_sv_undef) 3977 if ((SV *)hv == &PL_sv_undef)
3294 { 3978 {
3295 PUSHMARK (SP); 3979 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3296 EXTEND (SP, 2);
3297 PUSHs (sv_Coro);
3298 PUSHs ((SV *)cv_pool_handler);
3299 PUTBACK;
3300 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3301 SPAGAIN;
3302
3303 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3980 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3981 SvREFCNT_dec (sv);
3304 } 3982 }
3305 3983
3306 { 3984 {
3307 struct coro *coro = SvSTATE_hv (hv); 3985 struct coro *coro = SvSTATE_hv (hv);
3308 3986
3332rouse_wait (...) 4010rouse_wait (...)
3333 PROTOTYPE: ;$ 4011 PROTOTYPE: ;$
3334 PPCODE: 4012 PPCODE:
3335 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4013 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3336 4014
4015void
4016on_enter (SV *block)
4017 ALIAS:
4018 on_leave = 1
4019 PROTOTYPE: &
4020 CODE:
4021{
4022 struct coro *coro = SvSTATE_current;
4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4024
4025 block = s_get_cv_croak (block);
4026
4027 if (!*avp)
4028 *avp = newAV ();
4029
4030 av_push (*avp, SvREFCNT_inc (block));
4031
4032 if (!ix)
4033 on_enterleave_call (aTHX_ block);
4034
4035 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4036 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4037 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4038}
4039
3337 4040
3338MODULE = Coro::State PACKAGE = PerlIO::cede 4041MODULE = Coro::State PACKAGE = PerlIO::cede
3339 4042
3340BOOT: 4043BOOT:
3341 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4044 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3344MODULE = Coro::State PACKAGE = Coro::Semaphore 4047MODULE = Coro::State PACKAGE = Coro::Semaphore
3345 4048
3346SV * 4049SV *
3347new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
3348 CODE: 4051 CODE:
4052{
4053 int semcnt = 1;
4054
4055 if (count)
4056 {
4057 SvGETMAGIC (count);
4058
4059 if (SvOK (count))
4060 semcnt = SvIV (count);
4061 }
4062
3349 RETVAL = sv_bless ( 4063 RETVAL = sv_bless (
3350 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4064 coro_waitarray_new (aTHX_ semcnt),
3351 GvSTASH (CvGV (cv)) 4065 GvSTASH (CvGV (cv))
3352 ); 4066 );
4067}
3353 OUTPUT: 4068 OUTPUT:
3354 RETVAL 4069 RETVAL
3355 4070
3356# helper for Coro::Channel 4071# helper for Coro::Channel and others
3357SV * 4072SV *
3358_alloc (int count) 4073_alloc (int count)
3359 CODE: 4074 CODE:
3360 RETVAL = coro_waitarray_new (aTHX_ count); 4075 RETVAL = coro_waitarray_new (aTHX_ count);
3361 OUTPUT: 4076 OUTPUT:
3403 XSRETURN_NO; 4118 XSRETURN_NO;
3404} 4119}
3405 4120
3406void 4121void
3407waiters (SV *self) 4122waiters (SV *self)
3408 PPCODE: 4123 PPCODE:
3409{ 4124{
3410 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
3411 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
3412 4127
3413 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
3419 for (i = 1; i <= wcount; ++i) 4134 for (i = 1; i <= wcount; ++i)
3420 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4135 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3421 } 4136 }
3422} 4137}
3423 4138
4139MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4140
4141void
4142_may_delete (SV *sem, int count, unsigned int extra_refs)
4143 PPCODE:
4144{
4145 AV *av = (AV *)SvRV (sem);
4146
4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4148 && AvFILLp (av) == 0 /* no waiters, just count */
4149 && SvIV (AvARRAY (av)[0]) == count)
4150 XSRETURN_YES;
4151
4152 XSRETURN_NO;
4153}
4154
3424MODULE = Coro::State PACKAGE = Coro::Signal 4155MODULE = Coro::State PACKAGE = Coro::Signal
3425 4156
3426SV * 4157SV *
3427new (SV *klass) 4158new (SV *klass)
3428 CODE: 4159 CODE:
3440 4171
3441void 4172void
3442broadcast (SV *self) 4173broadcast (SV *self)
3443 CODE: 4174 CODE:
3444{ 4175{
3445 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
3446 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
3447} 4178}
3448 4179
3449void 4180void
3450send (SV *self) 4181send (SV *self)
3458 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3459} 4190}
3460 4191
3461IV 4192IV
3462awaited (SV *self) 4193awaited (SV *self)
3463 CODE: 4194 CODE:
3464 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3465 OUTPUT: 4196 OUTPUT:
3466 RETVAL 4197 RETVAL
3467 4198
3468 4199
3473 4204
3474void 4205void
3475_schedule (...) 4206_schedule (...)
3476 CODE: 4207 CODE:
3477{ 4208{
3478 static int incede; 4209 static int incede;
3479 4210
3480 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
3481 4212
3482 ++incede; 4213 ++incede;
3483 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
3499 4230
3500void 4231void
3501_register (char *target, char *proto, SV *req) 4232_register (char *target, char *proto, SV *req)
3502 CODE: 4233 CODE:
3503{ 4234{
3504 CV *req_cv = coro_sv_2cv (aTHX_ req); 4235 SV *req_cv = s_get_cv_croak (req);
3505 /* newXSproto doesn't return the CV on 5.8 */ 4236 /* newXSproto doesn't return the CV on 5.8 */
3506 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4237 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3507 sv_setpv ((SV *)slf_cv, proto); 4238 sv_setpv ((SV *)slf_cv, proto);
3508 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4239 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3509} 4240}
3510 4241
4242MODULE = Coro::State PACKAGE = Coro::Select
4243
4244void
4245patch_pp_sselect ()
4246 CODE:
4247 if (!coro_old_pp_sselect)
4248 {
4249 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4250 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4251 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4252 }
4253
4254void
4255unpatch_pp_sselect ()
4256 CODE:
4257 if (coro_old_pp_sselect)
4258 {
4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4260 coro_old_pp_sselect = 0;
4261 }
4262
4263MODULE = Coro::State PACKAGE = Coro::Util
4264
4265void
4266_exit (int code)
4267 CODE:
4268 _exit (code);
4269
4270NV
4271time ()
4272 CODE:
4273 RETVAL = nvtime (aTHX);
4274 OUTPUT:
4275 RETVAL
4276
4277NV
4278gettimeofday ()
4279 PPCODE:
4280{
4281 UV tv [2];
4282 u2time (aTHX_ tv);
4283 EXTEND (SP, 2);
4284 PUSHs (sv_2mortal (newSVuv (tv [0])));
4285 PUSHs (sv_2mortal (newSVuv (tv [1])));
4286}
4287

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines