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.354 by root, Tue Jun 23 00:56:14 2009 UTC vs.
Revision 1.449 by root, Sun Jun 21 17:02:49 2015 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#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
58#endif
59
60#if defined(_WIN32)
61# undef HAS_GETTIMEOFDAY
18# undef setjmp 62# undef setjmp
19# undef longjmp 63# undef longjmp
20# undef _exit 64# undef _exit
21# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
22#else 66#else
23# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
24#endif 68#endif
25 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
55 72
56#define PERL_VERSION_ATLEAST(a,b,c) \ 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 74# 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 75#endif
122 76
123/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 89# define STACKLEVEL ((void *)&stacklevel)
136#endif 90#endif
137 91
138#define IN_DESTRUCT PL_dirty 92#define IN_DESTRUCT PL_dirty
139 93
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" 94#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 95#define GCoroAPI (&coroapi) /* very sneaky */
157 96
158#ifdef USE_ITHREADS 97#ifdef USE_ITHREADS
159# if CORO_PTHREAD 98# if CORO_PTHREAD
160static void *coro_thx; 99static void *coro_thx;
161# endif 100# endif
162#endif 101#endif
163 102
103#ifdef __linux
104# include <time.h> /* for timespec */
105# include <syscall.h> /* for SYS_* */
106# ifdef SYS_clock_gettime
107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
108# define CORO_CLOCK_MONOTONIC 1
109# define CORO_CLOCK_THREAD_CPUTIME_ID 3
110# endif
111#endif
112
164static double (*nvtime)(); /* so why doesn't it take void? */ 113static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]);
165 115
166/* we hijack an hopefully unused CV flag for our purposes */ 116/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 117#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 118static OP *pp_slf (pTHX);
119static void slf_destroy (pTHX_ struct coro *coro);
169 120
170static U32 cctx_gen; 121static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 122static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 141static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 142static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 143static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 144static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 145static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 146
197/* Coro::AnyEvent */ 147/* Coro::AnyEvent */
198static SV *sv_activity; 148static SV *sv_activity;
199 149
150/* enable processtime/realtime profiling */
151static char enable_times;
152typedef U32 coro_ts[2];
153static coro_ts time_real, time_cpu;
154static char times_valid;
155
200static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
202 158
203enum { 159enum
160{
204 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 170typedef struct coro_cctx
214{ 171{
215 struct coro_cctx *next; 172 struct coro_cctx *next;
216 173
217 /* the stack */ 174 /* the stack */
218 void *sptr; 175 struct coro_stack stack;
219 size_t ssize;
220 176
221 /* cpu state */ 177 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
224 JMPENV *top_env; 182 JMPENV *top_env;
225 coro_context cctx; 183 coro_context cctx;
226 184
227 U32 gen; 185 U32 gen;
228#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
229 int valgrind_id; 187 int valgrind_id;
230#endif 188#endif
231 unsigned char flags; 189 unsigned char flags;
232} coro_cctx; 190} coro_cctx;
233 191
234coro_cctx *cctx_current; /* the currently running cctx */ 192static coro_cctx *cctx_current; /* the currently running cctx */
235 193
236/*****************************************************************************/ 194/*****************************************************************************/
237 195
196static MGVTBL coro_state_vtbl;
197
238enum { 198enum
199{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 206};
245 207
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 209typedef struct
248{ 210{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
255# include "state.h" 212 #include "state.h"
256#undef VAR
257} perl_slots; 213} perl_slots;
258 214
215/* how many context stack entries do we need for perl_slots */
259#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 217
261/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
262struct coro { 219struct coro
220{
263 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 222 coro_cctx *cctx;
265 223
266 /* ready queue */ 224 /* ready queue */
267 struct coro *next_ready; 225 struct coro *next_ready;
… …
269 /* state data */ 227 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 229 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
273 231
274 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 236
281 /* statistics */ 237 /* statistics */
282 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
283 239
284 /* coro process data */ 240 /* coro process data */
285 int prio; 241 int prio;
286 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
287 SV *rouse_cb; 243 SV *rouse_cb; /* last rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */
288 246
289 /* async_pool */ 247 /* async_pool */
290 SV *saved_deffh; 248 SV *saved_deffh;
291 SV *invoke_cb; 249 SV *invoke_cb;
292 AV *invoke_av; 250 AV *invoke_av;
293 251
294 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
295 AV *on_enter; 253 AV *on_enter;
296 AV *on_leave; 254 AV *on_leave;
297 255
256 /* swap_sv */
257 AV *swap_sv;
258
259 /* times */
260 coro_ts t_cpu, t_real;
261
298 /* linked list */ 262 /* linked list */
299 struct coro *next, *prev; 263 struct coro *next, *prev;
300}; 264};
301 265
302typedef struct coro *Coro__State; 266typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 267typedef struct coro *Coro__State_or_hashref;
304 268
305/* the following variables are effectively part of the perl context */ 269/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 270/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 271/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 272static struct CoroSLF slf_frame; /* the current slf frame */
309 273
310/** Coro ********************************************************************/ 274/** Coro ********************************************************************/
311 275
312#define PRIO_MAX 3 276#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 277#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 278#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 279#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 280#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 281#define CORO_PRIO_MIN -4
318 282
319/* for Coro.pm */ 283/* for Coro.pm */
320static SV *coro_current; 284static SV *coro_current;
321static SV *coro_readyhook; 285static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 287static CV *cv_coro_run;
324static struct coro *coro_first; 288static struct coro *coro_first;
325#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
326 290
291/** JIT *********************************************************************/
292
293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE
297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix"
299 #elif __i386 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "x86-unix"
301 #endif
302 #endif
303#endif
304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
313
314/** Coro::Select ************************************************************/
315
316static OP *(*coro_old_pp_sselect) (pTHX);
317static SV *coro_select_select;
318
319/* horrible hack, but if it works... */
320static OP *
321coro_pp_sselect (pTHX)
322{
323 dSP;
324 PUSHMARK (SP - 4); /* fake argument list */
325 XPUSHs (coro_select_select);
326 PUTBACK;
327
328 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
329 PL_op->op_flags |= OPf_STACKED;
330 PL_op->op_private = 0;
331 return PL_ppaddr [OP_ENTERSUB](aTHX);
332}
333
334/** time stuff **************************************************************/
335
336#ifdef HAS_GETTIMEOFDAY
337
338ecb_inline void
339coro_u2time (pTHX_ UV ret[2])
340{
341 struct timeval tv;
342 gettimeofday (&tv, 0);
343
344 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec;
346}
347
348ecb_inline double
349coro_nvtime (void)
350{
351 struct timeval tv;
352 gettimeofday (&tv, 0);
353
354 return tv.tv_sec + tv.tv_usec * 1e-6;
355}
356
357ecb_inline void
358time_init (pTHX)
359{
360 nvtime = coro_nvtime;
361 u2time = coro_u2time;
362}
363
364#else
365
366ecb_inline void
367time_init (pTHX)
368{
369 SV **svp;
370
371 require_pv ("Time/HiRes.pm");
372
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
377
378 nvtime = INT2PTR (double (*)(), SvIV (*svp));
379
380 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
381 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
382}
383
384#endif
385
327/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
328 387
329static SV * 388static SV * ecb_noinline
330coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
331{ 390{
332#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_sv (name, create); 393 get_sv (name, create);
335#endif 394#endif
336 return get_sv (name, create); 395 return get_sv (name, create);
337} 396}
338 397
339static AV * 398static AV * ecb_noinline
340coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
341{ 400{
342#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_av (name, create); 403 get_av (name, create);
345#endif 404#endif
346 return get_av (name, create); 405 return get_av (name, create);
347} 406}
348 407
349static HV * 408static HV * ecb_noinline
350coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
351{ 410{
352#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_hv (name, create); 413 get_hv (name, create);
355#endif 414#endif
356 return get_hv (name, create); 415 return get_hv (name, create);
357} 416}
358 417
359/* may croak */ 418ecb_inline void
360INLINE CV * 419coro_times_update (void)
361coro_sv_2cv (pTHX_ SV *sv)
362{ 420{
363 HV *st; 421#ifdef coro_clock_gettime
364 GV *gvp; 422 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 423
367 if (!cv) 424 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 425 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
426 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 427
370 return cv; 428 ts.tv_sec = ts.tv_nsec = 0;
429 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
430 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
431#else
432 dTHX;
433 UV tv[2];
434
435 u2time (aTHX_ tv);
436 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000;
438#endif
439}
440
441ecb_inline void
442coro_times_add (struct coro *c)
443{
444 c->t_real [1] += time_real [1];
445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
446 c->t_real [0] += time_real [0];
447
448 c->t_cpu [1] += time_cpu [1];
449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
450 c->t_cpu [0] += time_cpu [0];
451}
452
453ecb_inline void
454coro_times_sub (struct coro *c)
455{
456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
457 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0];
459
460 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
461 c->t_cpu [1] -= time_cpu [1];
462 c->t_cpu [0] -= time_cpu [0];
371} 463}
372 464
373/*****************************************************************************/ 465/*****************************************************************************/
374/* magic glue */ 466/* magic glue */
375 467
376#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
378 470
379#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
382 : mg_find (sv, type)) 474 : mg_find (sv, type))
383 475
384#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
387 : 0) 479 : 0)
388 480
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391 483
392INLINE struct coro * 484ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro)
486{
487 MAGIC *mg;
488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
499ecb_inline struct coro *
393SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro)
394{ 501{
395 HV *stash;
396 MAGIC *mg; 502 MAGIC *mg;
397 503
398 if (SvROK (coro)) 504 if (SvROK (coro))
399 coro = SvRV (coro); 505 coro = SvRV (coro);
400 506
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
402 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
403 510
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
414} 512}
415 513
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 515
… …
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421 519
422/*****************************************************************************/ 520/*****************************************************************************/
423/* padlist management and caching */ 521/* padlist management and caching */
424 522
425static AV * 523ecb_inline PADLIST *
426coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
427{ 525{
428 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
429 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
430 531
431 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
432 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
433#if PERL_VERSION_ATLEAST (5,10,0)
434 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
435#else
436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
437#endif 561#endif
438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
439 --AvFILLp (padlist);
440 562
441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
442 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
443 571
444 return newpadlist; 572 return newpadlist;
445} 573}
446 574
447static void 575ecb_inline void
448free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
449{ 577{
450 /* may be during global destruction */ 578 /* may be during global destruction */
451 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
452 { 580 {
453 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
454 582
455 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
456 { 584 {
457 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
458 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
459 I32 j = AvFILLp (av);
460 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
461 while (j >= 0) 592 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
463 594
464 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
465 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
466 } 598 }
467 599
468 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
469 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
470 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
471 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
472 } 610 }
473} 611}
474 612
475static int 613static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 615{
478 AV *padlist; 616 PADLIST *padlist;
479 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
480 619
481 /* casting is fun. */ 620 /* perl manages to free our internal AV and _then_ call us */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 621 if (IN_DESTRUCT)
622 return 0;
623
624 while (len--)
483 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
484
485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
486 626
487 return 0; 627 return 0;
488} 628}
489 629
490static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
491 0, 0, 0, 0, 631 0, 0, 0, 0,
492 coro_cv_free 632 coro_cv_free
493}; 633};
494 634
495/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
496static void 636ecb_inline void
497get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
498{ 638{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 640 size_t *lenp;
501 641
502 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
503 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
504 else 644 else
505 { 645 {
506#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
507 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
508 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
515#endif 655#endif
516 } 656 }
517} 657}
518 658
519static void 659ecb_inline void
520put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
521{ 661{
522 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
523 AV *av;
524 663
525 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
527 674
528 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
529
530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
531 av_extend (av, AvFILLp (av) + 1);
532
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 676}
535 677
536/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
718/* swap sv heads, at least logically */
719static void
720swap_svs (pTHX_ Coro__State c)
721{
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
726}
727
728#define SWAP_SVS(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \
730 swap_svs (aTHX_ (coro))
537 731
538static void 732static void
539on_enterleave_call (pTHX_ SV *cb); 733on_enterleave_call (pTHX_ SV *cb);
540 734
541static void 735static void
… …
544 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
545 c->slot = 0; 739 c->slot = 0;
546 740
547 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
548 742
549 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
550 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
551 GvSV (PL_errgv) = slot->errsv; 745#else
552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
554
555 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
556 # include "state.h" 747 #include "state.h"
557 #undef VAR 748#endif
558 749
559 { 750 {
560 dSP; 751 dSP;
561 752
562 CV *cv; 753 CV *cv;
563 754
564 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
565 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
566 { 757 {
567 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
568 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
569 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
570 } 761 }
571 762
572 PUTBACK; 763 PUTBACK;
573 } 764 }
574 765
575 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 767 CORO_THROW = c->except;
577 768
769 if (ecb_expect_false (enable_times))
770 {
771 if (ecb_expect_false (!times_valid))
772 coro_times_update ();
773
774 coro_times_sub (c);
775 }
776
578 if (expect_false (c->on_enter)) 777 if (ecb_expect_false (c->on_enter))
579 { 778 {
580 int i; 779 int i;
581 780
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 783 }
784
785 SWAP_SVS (c);
585} 786}
586 787
587static void 788static void
588save_perl (pTHX_ Coro__State c) 789save_perl (pTHX_ Coro__State c)
589{ 790{
791 SWAP_SVS (c);
792
590 if (expect_false (c->on_leave)) 793 if (ecb_expect_false (c->on_leave))
591 { 794 {
592 int i; 795 int i;
593 796
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 797 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 798 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
799 }
800
801 times_valid = 0;
802
803 if (ecb_expect_false (enable_times))
804 {
805 coro_times_update (); times_valid = 1;
806 coro_times_add (c);
596 } 807 }
597 808
598 c->except = CORO_THROW; 809 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 810 c->slf_frame = slf_frame;
600 811
… …
611 822
612 XPUSHs (Nullsv); 823 XPUSHs (Nullsv);
613 /* this loop was inspired by pp_caller */ 824 /* this loop was inspired by pp_caller */
614 for (;;) 825 for (;;)
615 { 826 {
616 while (expect_true (cxix >= 0)) 827 while (ecb_expect_true (cxix >= 0))
617 { 828 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 829 PERL_CONTEXT *cx = &ccstk[cxix--];
619 830
620 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 831 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 832 {
622 CV *cv = cx->blk_sub.cv; 833 CV *cv = cx->blk_sub.cv;
623 834
624 if (expect_true (CvDEPTH (cv))) 835 if (ecb_expect_true (CvDEPTH (cv)))
625 { 836 {
626 EXTEND (SP, 3); 837 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 838 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 839 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 840 PUSHs ((SV *)cv);
… …
632 get_padlist (aTHX_ cv); 843 get_padlist (aTHX_ cv);
633 } 844 }
634 } 845 }
635 } 846 }
636 847
637 if (expect_true (top_si->si_type == PERLSI_MAIN)) 848 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
638 break; 849 break;
639 850
640 top_si = top_si->si_prev; 851 top_si = top_si->si_prev;
641 ccstk = top_si->si_cxstack; 852 ccstk = top_si->si_cxstack;
642 cxix = top_si->si_cxix; 853 cxix = top_si->si_cxix;
… …
644 855
645 PUTBACK; 856 PUTBACK;
646 } 857 }
647 858
648 /* allocate some space on the context stack for our purposes */ 859 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 860 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 861 {
654 int i; 862 unsigned int i;
863
655 for (i = 3; i < SLOT_COUNT; ++i) 864 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 865 CXINC;
657 } 866
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 867 cxstack_ix -= SLOT_COUNT; /* undo allocation */
868 }
659 869
660 c->mainstack = PL_mainstack; 870 c->mainstack = PL_mainstack;
661 871
662 { 872 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 873 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
664 874
665 slot->defav = GvAV (PL_defgv); 875#if CORO_JIT
666 slot->defsv = DEFSV; 876 save_perl_slots (slot);
667 slot->errsv = ERRSV; 877#else
668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
670
671 #define VAR(name,type) slot->name = PL_ ## name; 878 #define VARx(name,expr,type) slot->name = expr;
672 # include "state.h" 879 #include "state.h"
673 #undef VAR 880#endif
674 } 881 }
675} 882}
676 883
677/* 884/*
678 * allocate various perl stacks. This is almost an exact copy 885 * allocate various perl stacks. This is almost an exact copy
… …
684# define coro_init_stacks(thx) init_stacks () 891# define coro_init_stacks(thx) init_stacks ()
685#else 892#else
686static void 893static void
687coro_init_stacks (pTHX) 894coro_init_stacks (pTHX)
688{ 895{
689 PL_curstackinfo = new_stackinfo(32, 8); 896 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 897 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 898 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 899 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 900
694 PL_stack_base = AvARRAY(PL_curstack); 901 PL_stack_base = AvARRAY(PL_curstack);
… …
709#endif 916#endif
710 917
711 New(54,PL_scopestack,8,I32); 918 New(54,PL_scopestack,8,I32);
712 PL_scopestack_ix = 0; 919 PL_scopestack_ix = 0;
713 PL_scopestack_max = 8; 920 PL_scopestack_max = 8;
921#if HAS_SCOPESTACK_NAME
922 New(54,PL_scopestack_name,8,const char*);
923#endif
714 924
715 New(54,PL_savestack,24,ANY); 925 New(54,PL_savestack,24,ANY);
716 PL_savestack_ix = 0; 926 PL_savestack_ix = 0;
717 PL_savestack_max = 24; 927 PL_savestack_max = 24;
718 928
… …
746 } 956 }
747 957
748 Safefree (PL_tmps_stack); 958 Safefree (PL_tmps_stack);
749 Safefree (PL_markstack); 959 Safefree (PL_markstack);
750 Safefree (PL_scopestack); 960 Safefree (PL_scopestack);
961#if HAS_SCOPESTACK_NAME
962 Safefree (PL_scopestack_name);
963#endif
751 Safefree (PL_savestack); 964 Safefree (PL_savestack);
752#if !PERL_VERSION_ATLEAST (5,10,0) 965#if !PERL_VERSION_ATLEAST (5,10,0)
753 Safefree (PL_retstack); 966 Safefree (PL_retstack);
754#endif 967#endif
755} 968}
… …
801#endif 1014#endif
802 1015
803/* 1016/*
804 * This overrides the default magic get method of %SIG elements. 1017 * This overrides the default magic get method of %SIG elements.
805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1018 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
806 * and instead of trying to save and restore the hash elements, we just provide 1019 * and instead of trying to save and restore the hash elements (extremely slow),
807 * readback here. 1020 * we just provide our own readback here.
808 */ 1021 */
809static int 1022static int ecb_cold
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 1024{
812 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
813 1026
814 if (*s == '_') 1027 if (*s == '_')
815 { 1028 {
816 SV **svp = 0; 1029 SV **svp = 0;
817 1030
818 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
819 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
820 1033
821 if (svp) 1034 if (svp)
822 { 1035 {
823 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
824 return 0; 1046 return 0;
825 } 1047 }
826 } 1048 }
827 1049
828 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
829} 1051}
830 1052
831static int 1053static int ecb_cold
832coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
833{ 1055{
834 const char *s = MgPV_nolen_const (mg); 1056 const char *s = MgPV_nolen_const (mg);
835 1057
836 if (*s == '_') 1058 if (*s == '_')
… …
850 } 1072 }
851 1073
852 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
853} 1075}
854 1076
855static int 1077static int ecb_cold
856coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
857{ 1079{
858 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
859 1081
860 if (*s == '_') 1082 if (*s == '_')
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1115slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1116{
895 return 1; 1117 return 1;
896} 1118}
897 1119
898static UNOP coro_setup_op; 1120static UNOP init_perl_op;
899 1121
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1122ecb_noinline static void /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 1123init_perl (pTHX_ struct coro *coro)
902{ 1124{
903 /* 1125 /*
904 * emulate part of the perl startup here. 1126 * emulate part of the perl startup here.
905 */ 1127 */
906 coro_init_stacks (aTHX); 1128 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1135 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1136 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1137 PL_curpm = 0;
916 PL_curpad = 0; 1138 PL_curpad = 0;
917 PL_localizing = 0; 1139 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1140 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1141#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1142 PL_parser = 0;
922#endif 1143#endif
923 PL_hints = 0; 1144 PL_hints = 0;
924 1145
925 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1149
929 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
933 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
934 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
936 1160
937 { 1161 {
938 dSP; 1162 dSP;
… …
953 /* this newly created coroutine might be run on an existing cctx which most 1177 /* this newly created coroutine might be run on an existing cctx which most
954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1178 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
955 */ 1179 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1180 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1181 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1182 slf_frame.destroy = 0;
958 1183
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1184 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
960 coro_setup_op.op_next = PL_op; 1185 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1186 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1187 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1188 /* no flags etc. required, as an init function won't be called */
964 1189
965 PL_op = (OP *)&coro_setup_op; 1190 PL_op = (OP *)&init_perl_op;
966 1191
967 /* copy throw, in case it was set before coro_setup */ 1192 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1193 CORO_THROW = coro->except;
1194
1195 SWAP_SVS (coro);
1196
1197 if (ecb_expect_false (enable_times))
1198 {
1199 coro_times_update ();
1200 coro_times_sub (coro);
1201 }
969} 1202}
970 1203
971static void 1204static void
972coro_unwind_stacks (pTHX) 1205coro_unwind_stacks (pTHX)
973{ 1206{
… …
988 dounwind (-1); 1221 dounwind (-1);
989 } 1222 }
990} 1223}
991 1224
992static void 1225static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1226destroy_perl (pTHX_ struct coro *coro)
994{ 1227{
995 SV *svf [9]; 1228 SV *svf [9];
996 1229
997 { 1230 {
1231 SV *old_current = SvRV (coro_current);
998 struct coro *current = SvSTATE_current; 1232 struct coro *current = SvSTATE (old_current);
999 1233
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1234 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001 1235
1002 save_perl (aTHX_ current); 1236 save_perl (aTHX_ current);
1237
1238 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv);
1240
1003 load_perl (aTHX_ coro); 1241 load_perl (aTHX_ coro);
1004 1242
1005 coro_unwind_stacks (aTHX); 1243 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247
1006 coro_destruct_stacks (aTHX); 1248 coro_destruct_stacks (aTHX);
1007 1249
1008 // now save some sv's to be free'd later 1250 /* now save some sv's to be free'd later */
1009 svf [0] = GvSV (PL_defgv); 1251 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1252 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv); 1253 svf [2] = GvSV (PL_errgv);
1012 svf [3] = (SV *)PL_defoutgv; 1254 svf [3] = (SV *)PL_defoutgv;
1013 svf [4] = PL_rs; 1255 svf [4] = PL_rs;
… …
1015 svf [6] = (SV *)GvHV (PL_hintgv); 1257 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook; 1258 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook; 1259 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf)); 1260 assert (9 == sizeof (svf) / sizeof (*svf));
1019 1261
1262 SvRV_set (coro_current, old_current);
1263
1020 load_perl (aTHX_ current); 1264 load_perl (aTHX_ current);
1021 } 1265 }
1022 1266
1023 { 1267 {
1024 int i; 1268 unsigned int i;
1025 1269
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1270 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1271 SvREFCNT_dec (svf [i]);
1028 1272
1029 SvREFCNT_dec (coro->saved_deffh); 1273 SvREFCNT_dec (coro->saved_deffh);
… …
1031 SvREFCNT_dec (coro->invoke_cb); 1275 SvREFCNT_dec (coro->invoke_cb);
1032 SvREFCNT_dec (coro->invoke_av); 1276 SvREFCNT_dec (coro->invoke_av);
1033 } 1277 }
1034} 1278}
1035 1279
1036INLINE void 1280ecb_inline void
1037free_coro_mortal (pTHX) 1281free_coro_mortal (pTHX)
1038{ 1282{
1039 if (expect_true (coro_mortal)) 1283 if (ecb_expect_true (coro_mortal))
1040 { 1284 {
1041 SvREFCNT_dec (coro_mortal); 1285 SvREFCNT_dec ((SV *)coro_mortal);
1042 coro_mortal = 0; 1286 coro_mortal = 0;
1043 } 1287 }
1044} 1288}
1045 1289
1046static int 1290static int
… …
1100 1344
1101 if (PL_curcop != &PL_compiling) 1345 if (PL_curcop != &PL_compiling)
1102 { 1346 {
1103 SV **cb; 1347 SV **cb;
1104 1348
1105 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1106 { 1350 {
1107 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1108 1352
1109 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1110 { 1354 {
… …
1179 1423
1180 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1424 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1181} 1425}
1182 1426
1183/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1427/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1184static void NOINLINE 1428static void ecb_noinline
1185cctx_prepare (pTHX) 1429cctx_prepare (pTHX)
1186{ 1430{
1187 PL_top_env = &PL_start_env; 1431 PL_top_env = &PL_start_env;
1188 1432
1189 if (cctx_current->flags & CC_TRACE) 1433 if (cctx_current->flags & CC_TRACE)
… …
1200 slf_frame.prepare = slf_prepare_set_stacklevel; 1444 slf_frame.prepare = slf_prepare_set_stacklevel;
1201 slf_frame.check = slf_check_set_stacklevel; 1445 slf_frame.check = slf_check_set_stacklevel;
1202} 1446}
1203 1447
1204/* the tail of transfer: execute stuff we can only do after a transfer */ 1448/* the tail of transfer: execute stuff we can only do after a transfer */
1205INLINE void 1449ecb_inline void
1206transfer_tail (pTHX) 1450transfer_tail (pTHX)
1207{ 1451{
1208 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1453}
1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1209} 1465}
1210 1466
1211/* 1467/*
1212 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1213 */ 1469 */
… …
1235 /* somebody or something will hit me for both perl_run and PL_restartop */ 1491 /* somebody or something will hit me for both perl_run and PL_restartop */
1236 PL_restartop = PL_op; 1492 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1493 perl_run (PL_curinterp);
1238 /* 1494 /*
1239 * Unfortunately, there is no way to get at the return values of the 1495 * Unfortunately, there is no way to get at the return values of the
1240 * coro body here, as perl_run destroys these 1496 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1497 * runtime errors here, as this is just a random interpreter, not a thread.
1241 */ 1498 */
1242 1499
1243 /* 1500 /*
1244 * If perl-run returns we assume exit() was being called or the coro 1501 * If perl-run returns we assume exit() was being called or the coro
1245 * fell off the end, which seems to be the only valid (non-bug) 1502 * fell off the end, which seems to be the only valid (non-bug)
1246 * reason for perl_run to return. We try to exit by jumping to the 1503 * reason for perl_run to return. We try to mimic whatever perl is normally
1247 * bootstrap-time "top" top_env, as we cannot restore the "main" 1504 * doing in that case. YMMV.
1248 * coroutine as Coro has no such concept.
1249 * This actually isn't valid with the pthread backend, but OSes requiring
1250 * that backend are too broken to do it in a standards-compliant way.
1251 */ 1505 */
1252 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1253 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1254 } 1507 }
1255} 1508}
1256 1509
1257static coro_cctx * 1510static coro_cctx *
1258cctx_new () 1511cctx_new (void)
1259{ 1512{
1260 coro_cctx *cctx; 1513 coro_cctx *cctx;
1261 1514
1262 ++cctx_count; 1515 ++cctx_count;
1263 New (0, cctx, 1, coro_cctx); 1516 New (0, cctx, 1, coro_cctx);
… …
1269 return cctx; 1522 return cctx;
1270} 1523}
1271 1524
1272/* create a new cctx only suitable as source */ 1525/* create a new cctx only suitable as source */
1273static coro_cctx * 1526static coro_cctx *
1274cctx_new_empty () 1527cctx_new_empty (void)
1275{ 1528{
1276 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1277 1530
1278 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1279 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1280 1533
1281 return cctx; 1534 return cctx;
1282} 1535}
1283 1536
1284/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1285static coro_cctx * 1538static coro_cctx *
1286cctx_new_run () 1539cctx_new_run (void)
1287{ 1540{
1288 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1289 void *stack_start;
1290 size_t stack_size;
1291 1542
1292#if HAVE_MMAP 1543 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1293 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1294 /* mmap supposedly does allocate-on-write for us */
1295 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1296
1297 if (cctx->sptr != (void *)-1)
1298 {
1299 #if CORO_STACKGUARD
1300 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1301 #endif
1302 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1303 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1304 cctx->flags |= CC_MAPPED;
1305 } 1544 {
1306 else
1307#endif
1308 {
1309 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1310 New (0, cctx->sptr, cctx_stacksize, long);
1311
1312 if (!cctx->sptr)
1313 {
1314 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1315 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1316 }
1317
1318 stack_start = cctx->sptr;
1319 stack_size = cctx->ssize;
1320 } 1547 }
1321 1548
1322 #if CORO_USE_VALGRIND
1323 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1324 #endif
1325
1326 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1327 1550
1328 return cctx; 1551 return cctx;
1329} 1552}
1330 1553
1331static void 1554static void
1332cctx_destroy (coro_cctx *cctx) 1555cctx_destroy (coro_cctx *cctx)
1333{ 1556{
1334 if (!cctx) 1557 if (!cctx)
1335 return; 1558 return;
1336 1559
1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1338 1561
1339 --cctx_count; 1562 --cctx_count;
1340 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1341 1564
1342 /* coro_transfer creates new, empty cctx's */ 1565 coro_stack_free (&cctx->stack);
1343 if (cctx->sptr)
1344 {
1345 #if CORO_USE_VALGRIND
1346 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1347 #endif
1348
1349#if HAVE_MMAP
1350 if (cctx->flags & CC_MAPPED)
1351 munmap (cctx->sptr, cctx->ssize);
1352 else
1353#endif
1354 Safefree (cctx->sptr);
1355 }
1356 1566
1357 Safefree (cctx); 1567 Safefree (cctx);
1358} 1568}
1359 1569
1360/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
1361#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1571#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1362 1572
1363static coro_cctx * 1573static coro_cctx *
1364cctx_get (pTHX) 1574cctx_get (pTHX)
1365{ 1575{
1366 while (expect_true (cctx_first)) 1576 while (ecb_expect_true (cctx_first))
1367 { 1577 {
1368 coro_cctx *cctx = cctx_first; 1578 coro_cctx *cctx = cctx_first;
1369 cctx_first = cctx->next; 1579 cctx_first = cctx->next;
1370 --cctx_idle; 1580 --cctx_idle;
1371 1581
1372 if (expect_true (!CCTX_EXPIRED (cctx))) 1582 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1373 return cctx; 1583 return cctx;
1374 1584
1375 cctx_destroy (cctx); 1585 cctx_destroy (cctx);
1376 } 1586 }
1377 1587
… …
1379} 1589}
1380 1590
1381static void 1591static void
1382cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1383{ 1593{
1384 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1385 1595
1386 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1387 if (expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1388 { 1598 {
1389 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
1390 cctx_first = first->next; 1600 cctx_first = first->next;
1391 --cctx_idle; 1601 --cctx_idle;
1392 1602
… …
1403static void 1613static void
1404transfer_check (pTHX_ struct coro *prev, struct coro *next) 1614transfer_check (pTHX_ struct coro *prev, struct coro *next)
1405{ 1615{
1406 /* TODO: throwing up here is considered harmful */ 1616 /* TODO: throwing up here is considered harmful */
1407 1617
1408 if (expect_true (prev != next)) 1618 if (ecb_expect_true (prev != next))
1409 { 1619 {
1410 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1620 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1411 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1621 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1412 1622
1413 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1623 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1414 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1624 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1415 1625
1416#if !PERL_VERSION_ATLEAST (5,10,0) 1626#if !PERL_VERSION_ATLEAST (5,10,0)
1417 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1627 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1418 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1628 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1419#endif 1629#endif
1420 } 1630 }
1421} 1631}
1422 1632
1423/* always use the TRANSFER macro */ 1633/* always use the TRANSFER macro */
1424static void NOINLINE /* noinline so we have a fixed stackframe */ 1634static void ecb_noinline /* noinline so we have a fixed stackframe */
1425transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1635transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1426{ 1636{
1427 dSTACKLEVEL; 1637 dSTACKLEVEL;
1428 1638
1429 /* sometimes transfer is only called to set idle_sp */ 1639 /* sometimes transfer is only called to set idle_sp */
1430 if (expect_false (!prev)) 1640 if (ecb_expect_false (!prev))
1431 { 1641 {
1432 cctx_current->idle_sp = STACKLEVEL; 1642 cctx_current->idle_sp = STACKLEVEL;
1433 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1643 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1434 } 1644 }
1435 else if (expect_true (prev != next)) 1645 else if (ecb_expect_true (prev != next))
1436 { 1646 {
1437 coro_cctx *cctx_prev; 1647 coro_cctx *cctx_prev;
1438 1648
1439 if (expect_false (prev->flags & CF_NEW)) 1649 if (ecb_expect_false (prev->flags & CF_NEW))
1440 { 1650 {
1441 /* create a new empty/source context */ 1651 /* create a new empty/source context */
1442 prev->flags &= ~CF_NEW; 1652 prev->flags &= ~CF_NEW;
1443 prev->flags |= CF_RUNNING; 1653 prev->flags |= CF_RUNNING;
1444 } 1654 }
… …
1447 next->flags |= CF_RUNNING; 1657 next->flags |= CF_RUNNING;
1448 1658
1449 /* first get rid of the old state */ 1659 /* first get rid of the old state */
1450 save_perl (aTHX_ prev); 1660 save_perl (aTHX_ prev);
1451 1661
1452 if (expect_false (next->flags & CF_NEW)) 1662 if (ecb_expect_false (next->flags & CF_NEW))
1453 { 1663 {
1454 /* need to start coroutine */ 1664 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1665 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1666 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1667 init_perl (aTHX_ next);
1458 } 1668 }
1459 else 1669 else
1460 load_perl (aTHX_ next); 1670 load_perl (aTHX_ next);
1461 1671
1462 /* possibly untie and reuse the cctx */ 1672 /* possibly untie and reuse the cctx */
1463 if (expect_true ( 1673 if (ecb_expect_true (
1464 cctx_current->idle_sp == STACKLEVEL 1674 cctx_current->idle_sp == STACKLEVEL
1465 && !(cctx_current->flags & CC_TRACE) 1675 && !(cctx_current->flags & CC_TRACE)
1466 && !force_cctx 1676 && !force_cctx
1467 )) 1677 ))
1468 { 1678 {
1469 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1679 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1470 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1680 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1471 1681
1472 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1682 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1473 /* without this the next cctx_get might destroy the running cctx while still in use */ 1683 /* without this the next cctx_get might destroy the running cctx while still in use */
1474 if (expect_false (CCTX_EXPIRED (cctx_current))) 1684 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1475 if (expect_true (!next->cctx)) 1685 if (ecb_expect_true (!next->cctx))
1476 next->cctx = cctx_get (aTHX); 1686 next->cctx = cctx_get (aTHX);
1477 1687
1478 cctx_put (cctx_current); 1688 cctx_put (cctx_current);
1479 } 1689 }
1480 else 1690 else
1481 prev->cctx = cctx_current; 1691 prev->cctx = cctx_current;
1482 1692
1483 ++next->usecount; 1693 ++next->usecount;
1484 1694
1485 cctx_prev = cctx_current; 1695 cctx_prev = cctx_current;
1486 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1696 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1487 1697
1488 next->cctx = 0; 1698 next->cctx = 0;
1489 1699
1490 if (expect_false (cctx_prev != cctx_current)) 1700 if (ecb_expect_false (cctx_prev != cctx_current))
1491 { 1701 {
1492 cctx_prev->top_env = PL_top_env; 1702 cctx_prev->top_env = PL_top_env;
1493 PL_top_env = cctx_current->top_env; 1703 PL_top_env = cctx_current->top_env;
1494 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1704 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1495 } 1705 }
… …
1501#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1711#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1502#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1712#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1503 1713
1504/** high level stuff ********************************************************/ 1714/** high level stuff ********************************************************/
1505 1715
1716/* this function is actually Coro, not Coro::State, but we call it from here */
1717/* because it is convenient - but it hasn't been declared yet for that reason */
1506static int 1718static void
1719coro_call_on_destroy (pTHX_ struct coro *coro);
1720
1721static void
1507coro_state_destroy (pTHX_ struct coro *coro) 1722coro_state_destroy (pTHX_ struct coro *coro)
1508{ 1723{
1509 if (coro->flags & CF_DESTROYED) 1724 if (coro->flags & CF_ZOMBIE)
1510 return 0; 1725 return;
1511 1726
1512 if (coro->on_destroy && !PL_dirty)
1513 coro->on_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1514 1728
1515 coro->flags |= CF_DESTROYED; 1729 coro->flags |= CF_ZOMBIE;
1516 1730
1517 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1518 { 1732 {
1519 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1520 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1521 --coro_nready; 1735 --coro_nready;
1522 } 1736 }
1523 else 1737 else
1524 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1738 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1739
1740 if (coro->next) coro->next->prev = coro->prev;
1741 if (coro->prev) coro->prev->next = coro->next;
1742 if (coro == coro_first) coro_first = coro->next;
1525 1743
1526 if (coro->mainstack 1744 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1745 && coro->mainstack != main_mainstack
1528 && coro->slot 1746 && coro->slot
1529 && !PL_dirty) 1747 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1748 destroy_perl (aTHX_ coro);
1531 1749
1532 cctx_destroy (coro->cctx); 1750 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1751 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1752 SvREFCNT_dec (coro->args);
1753 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1754 SvREFCNT_dec (CORO_THROW);
1536 1755
1537 if (coro->next) coro->next->prev = coro->prev; 1756 coro_call_on_destroy (aTHX_ coro);
1538 if (coro->prev) coro->prev->next = coro->next;
1539 if (coro == coro_first) coro_first = coro->next;
1540 1757
1541 return 1; 1758 /* more destruction mayhem in coro_state_free */
1542} 1759}
1543 1760
1544static int 1761static int
1545coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1762coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1546{ 1763{
1547 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 struct coro *coro = (struct coro *)mg->mg_ptr;
1548 mg->mg_ptr = 0; 1765 mg->mg_ptr = 0;
1549 1766
1550 coro->hv = 0;
1551
1552 if (--coro->refcnt < 0)
1553 {
1554 coro_state_destroy (aTHX_ coro); 1767 coro_state_destroy (aTHX_ coro);
1768 SvREFCNT_dec (coro->on_destroy);
1769 SvREFCNT_dec (coro->status);
1770
1555 Safefree (coro); 1771 Safefree (coro);
1556 }
1557 1772
1558 return 0; 1773 return 0;
1559} 1774}
1560 1775
1561static int 1776static int ecb_cold
1562coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1777coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1563{ 1778{
1564 struct coro *coro = (struct coro *)mg->mg_ptr; 1779 /* called when perl clones the current process the slow way (windows process emulation) */
1565 1780 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1566 ++coro->refcnt; 1781 mg->mg_ptr = 0;
1782 mg->mg_virtual = 0;
1567 1783
1568 return 0; 1784 return 0;
1569} 1785}
1570 1786
1571static MGVTBL coro_state_vtbl = { 1787static MGVTBL coro_state_vtbl = {
… …
1594 1810
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1811 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1812 TRANSFER (ta, 1);
1597} 1813}
1598 1814
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1815/** Coro ********************************************************************/
1623 1816
1624INLINE void 1817ecb_inline void
1625coro_enq (pTHX_ struct coro *coro) 1818coro_enq (pTHX_ struct coro *coro)
1626{ 1819{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1820 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1821
1629 SvREFCNT_inc_NN (coro->hv); 1822 SvREFCNT_inc_NN (coro->hv);
1630 1823
1631 coro->next_ready = 0; 1824 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1825 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro; 1826 ready [1] = coro;
1634} 1827}
1635 1828
1636INLINE struct coro * 1829ecb_inline struct coro *
1637coro_deq (pTHX) 1830coro_deq (pTHX)
1638{ 1831{
1639 int prio; 1832 int prio;
1640 1833
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1834 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1835 {
1643 struct coro **ready = coro_ready [prio]; 1836 struct coro **ready = coro_ready [prio];
1644 1837
1645 if (ready [0]) 1838 if (ready [0])
1646 { 1839 {
… …
1651 } 1844 }
1652 1845
1653 return 0; 1846 return 0;
1654} 1847}
1655 1848
1849static void
1850invoke_sv_ready_hook_helper (void)
1851{
1852 dTHX;
1853 dSP;
1854
1855 ENTER;
1856 SAVETMPS;
1857
1858 PUSHMARK (SP);
1859 PUTBACK;
1860 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1861
1862 FREETMPS;
1863 LEAVE;
1864}
1865
1656static int 1866static int
1657api_ready (pTHX_ SV *coro_sv) 1867api_ready (pTHX_ SV *coro_sv)
1658{ 1868{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1869 struct coro *coro = SvSTATE (coro_sv);
1664 1870
1665 if (coro->flags & CF_READY) 1871 if (coro->flags & CF_READY)
1666 return 0; 1872 return 0;
1667 1873
1668 coro->flags |= CF_READY; 1874 coro->flags |= CF_READY;
1669 1875
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1876 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1877
1676 if (sv_hook) 1878 if (!coro_nready++)
1677 { 1879 if (coroapi.readyhook)
1678 dSP; 1880 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1881
1694 return 1; 1882 return 1;
1695} 1883}
1696 1884
1697static int 1885static int
… …
1699{ 1887{
1700 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1888 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1701} 1889}
1702 1890
1703/* expects to own a reference to next->hv */ 1891/* expects to own a reference to next->hv */
1704INLINE void 1892ecb_inline void
1705prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1893prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1706{ 1894{
1707 SV *prev_sv = SvRV (coro_current); 1895 SV *prev_sv = SvRV (coro_current);
1708 1896
1709 ta->prev = SvSTATE_hv (prev_sv); 1897 ta->prev = SvSTATE_hv (prev_sv);
… …
1722{ 1910{
1723 for (;;) 1911 for (;;)
1724 { 1912 {
1725 struct coro *next = coro_deq (aTHX); 1913 struct coro *next = coro_deq (aTHX);
1726 1914
1727 if (expect_true (next)) 1915 if (ecb_expect_true (next))
1728 { 1916 {
1729 /* cannot transfer to destroyed coros, skip and look for next */ 1917 /* cannot transfer to destroyed coros, skip and look for next */
1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1918 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1919 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1732 else 1920 else
1733 { 1921 {
1734 next->flags &= ~CF_READY; 1922 next->flags &= ~CF_READY;
1735 --coro_nready; 1923 --coro_nready;
… …
1742 { 1930 {
1743 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1746 { 1934 {
1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1954
1747 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1748 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1957 --coro_nready;
1750 } 1958 }
1751 else 1959 else
1752 { 1960 {
1961 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1962 dSP;
1754 1963
1755 ENTER; 1964 ENTER;
1756 SAVETMPS; 1965 SAVETMPS;
1757 1966
… …
1764 } 1973 }
1765 } 1974 }
1766 } 1975 }
1767} 1976}
1768 1977
1769INLINE void 1978ecb_inline void
1770prepare_cede (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede (pTHX_ struct coro_transfer_args *ta)
1771{ 1980{
1772 api_ready (aTHX_ coro_current); 1981 api_ready (aTHX_ coro_current);
1773 prepare_schedule (aTHX_ ta); 1982 prepare_schedule (aTHX_ ta);
1774} 1983}
1775 1984
1776INLINE void 1985ecb_inline void
1777prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1986prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1778{ 1987{
1779 SV *prev = SvRV (coro_current); 1988 SV *prev = SvRV (coro_current);
1780 1989
1781 if (coro_nready) 1990 if (coro_nready)
… …
1811{ 2020{
1812 struct coro_transfer_args ta; 2021 struct coro_transfer_args ta;
1813 2022
1814 prepare_cede (aTHX_ &ta); 2023 prepare_cede (aTHX_ &ta);
1815 2024
1816 if (expect_true (ta.prev != ta.next)) 2025 if (ecb_expect_true (ta.prev != ta.next))
1817 { 2026 {
1818 TRANSFER (ta, 1); 2027 TRANSFER (ta, 1);
1819 return 1; 2028 return 1;
1820 } 2029 }
1821 else 2030 else
… …
1864 coro->slot->runops = RUNOPS_DEFAULT; 2073 coro->slot->runops = RUNOPS_DEFAULT;
1865 } 2074 }
1866} 2075}
1867 2076
1868static void 2077static void
2078coro_push_av (pTHX_ AV *av, I32 gimme_v)
2079{
2080 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2081 {
2082 dSP;
2083
2084 if (gimme_v == G_SCALAR)
2085 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2086 else
2087 {
2088 int i;
2089 EXTEND (SP, AvFILLp (av) + 1);
2090
2091 for (i = 0; i <= AvFILLp (av); ++i)
2092 PUSHs (AvARRAY (av)[i]);
2093 }
2094
2095 PUTBACK;
2096 }
2097}
2098
2099static void
2100coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2101{
2102 if (!coro->on_destroy)
2103 coro->on_destroy = newAV ();
2104
2105 av_push (coro->on_destroy, cb);
2106}
2107
2108static void
2109slf_destroy_join (pTHX_ struct CoroSLF *frame)
2110{
2111 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2112}
2113
2114static int
2115slf_check_join (pTHX_ struct CoroSLF *frame)
2116{
2117 struct coro *coro = (struct coro *)frame->data;
2118
2119 if (!coro->status)
2120 return 1;
2121
2122 frame->destroy = 0;
2123
2124 coro_push_av (aTHX_ coro->status, GIMME_V);
2125
2126 SvREFCNT_dec ((SV *)coro->hv);
2127
2128 return 0;
2129}
2130
2131static void
2132slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2133{
2134 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2135
2136 if (items > 1)
2137 croak ("join called with too many arguments");
2138
2139 if (coro->status)
2140 frame->prepare = prepare_nop;
2141 else
2142 {
2143 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2144 frame->prepare = prepare_schedule;
2145 }
2146
2147 frame->check = slf_check_join;
2148 frame->destroy = slf_destroy_join;
2149 frame->data = (void *)coro;
2150 SvREFCNT_inc (coro->hv);
2151}
2152
2153static void
1869coro_call_on_destroy (pTHX_ struct coro *coro) 2154coro_call_on_destroy (pTHX_ struct coro *coro)
1870{ 2155{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2156 AV *od = coro->on_destroy;
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873 2157
1874 if (on_destroyp) 2158 if (!od)
1875 { 2159 return;
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1877 2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
1878 while (AvFILLp (on_destroy) >= 0) 2164 while (AvFILLp (od) >= 0)
2165 {
2166 SV *cb = sv_2mortal (av_pop (od));
2167
2168 /* coro hv's (and only hv's at the moment) are supported as well */
2169 if (SvSTATEhv_p (aTHX_ cb))
2170 api_ready (aTHX_ cb);
2171 else
1879 { 2172 {
1880 dSP; /* don't disturb outer sp */ 2173 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy);
1882
1883 PUSHMARK (SP); 2174 PUSHMARK (SP);
1884 2175
1885 if (statusp) 2176 if (coro->status)
1886 { 2177 {
1887 int i; 2178 PUTBACK;
1888 AV *status = (AV *)SvRV (*statusp); 2179 coro_push_av (aTHX_ coro->status, G_ARRAY);
1889 EXTEND (SP, AvFILLp (status) + 1); 2180 SPAGAIN;
1890
1891 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]);
1893 } 2181 }
1894 2182
1895 PUTBACK; 2183 PUTBACK;
1896 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2184 call_sv (cb, G_VOID | G_DISCARD);
1897 } 2185 }
1898 } 2186 }
1899} 2187}
1900 2188
1901static void 2189static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1903{ 2191{
2192 AV *av;
2193
2194 if (coro->status)
2195 {
2196 av = coro->status;
2197 av_clear (av);
2198 }
2199 else
2200 av = coro->status = newAV ();
2201
2202 /* items are actually not so common, so optimise for this case */
2203 if (items)
2204 {
1904 int i; 2205 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV ();
1907 2206
1908 av_extend (av, items - 1); 2207 av_extend (av, items - 1);
2208
1909 for (i = 0; i < items; ++i) 2209 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 2210 av_push (av, SvREFCNT_inc_NN (arg [i]));
2211 }
2212}
1911 2213
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2214static void
1913 2215slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2216{
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2217 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager); 2218 api_ready (aTHX_ sv_manager);
1916 2219
1917 frame->prepare = prepare_schedule; 2220 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat; 2221 frame->check = slf_check_repeat;
1919 2222
1920 /* as a minor optimisation, we could unwind all stacks here */ 2223 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */ 2224 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/ 2225 /*coro_unwind_stacks (aTHX);*/
2226}
2227
2228static void
2229slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2230{
2231 HV *coro_hv = (HV *)SvRV (coro_current);
2232
2233 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2234 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2235}
2236
2237static void
2238slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2239{
2240 HV *coro_hv;
2241 struct coro *coro;
2242
2243 if (items <= 0)
2244 croak ("Coro::cancel called without coro object,");
2245
2246 coro = SvSTATE (arg [0]);
2247 coro_hv = coro->hv;
2248
2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2250
2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2252 {
2253 /* coro currently busy cancelling something, so just notify it */
2254 coro->slf_frame.data = (void *)coro;
2255
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 else if (coro_hv == (HV *)SvRV (coro_current))
2260 {
2261 /* cancelling the current coro is allowed, and equals terminate */
2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2263 }
2264 else
2265 {
2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2270
2271 /* otherwise we cancel directly, purely for speed reasons
2272 * unfortunately, this requires some magic trickery, as
2273 * somebody else could cancel us, so we have to fight the cancellation.
2274 * this is ugly, and hopefully fully worth the extra speed.
2275 * besides, I can't get the slow-but-safe version working...
2276 */
2277 slf_frame.data = 0;
2278 self->flags |= CF_NOCANCEL;
2279 coro_state_destroy (aTHX_ coro);
2280 self->flags &= ~CF_NOCANCEL;
2281
2282 if (slf_frame.data)
2283 {
2284 /* while we were busy we have been cancelled, so terminate */
2285 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2286 }
2287 else
2288 {
2289 frame->prepare = prepare_nop;
2290 frame->check = slf_check_nop;
2291 }
2292 }
2293}
2294
2295static int
2296slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2297{
2298 frame->prepare = 0;
2299 coro_unwind_stacks (aTHX);
2300
2301 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2302
2303 return 1;
2304}
2305
2306static int
2307safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2308{
2309 if (coro->cctx)
2310 croak ("coro inside C callback, unable to cancel at this time, caught");
2311
2312 if (coro->flags & CF_NEW)
2313 {
2314 coro_set_status (aTHX_ coro, arg, items);
2315 coro_state_destroy (aTHX_ coro);
2316 }
2317 else
2318 {
2319 if (!coro->slf_frame.prepare)
2320 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2321
2322 slf_destroy (aTHX_ coro);
2323
2324 coro_set_status (aTHX_ coro, arg, items);
2325 coro->slf_frame.prepare = prepare_nop;
2326 coro->slf_frame.check = slf_check_safe_cancel;
2327
2328 api_ready (aTHX_ (SV *)coro->hv);
2329 }
2330
2331 return 1;
1923} 2332}
1924 2333
1925/*****************************************************************************/ 2334/*****************************************************************************/
1926/* async pool handler */ 2335/* async pool handler */
1927 2336
… …
1958slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2367slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1959{ 2368{
1960 HV *hv = (HV *)SvRV (coro_current); 2369 HV *hv = (HV *)SvRV (coro_current);
1961 struct coro *coro = SvSTATE_hv ((SV *)hv); 2370 struct coro *coro = SvSTATE_hv ((SV *)hv);
1962 2371
1963 if (expect_true (coro->saved_deffh)) 2372 if (ecb_expect_true (coro->saved_deffh))
1964 { 2373 {
1965 /* subsequent iteration */ 2374 /* subsequent iteration */
1966 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2375 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1967 coro->saved_deffh = 0; 2376 coro->saved_deffh = 0;
1968 2377
1969 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2378 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1970 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2379 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1971 { 2380 {
1972 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2381 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1973 coro->invoke_av = newAV (); 2382 return;
1974
1975 frame->prepare = prepare_nop;
1976 } 2383 }
1977 else 2384 else
1978 { 2385 {
1979 av_clear (GvAV (PL_defgv)); 2386 av_clear (GvAV (PL_defgv));
1980 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2005 2412
2006static void 2413static void
2007coro_rouse_callback (pTHX_ CV *cv) 2414coro_rouse_callback (pTHX_ CV *cv)
2008{ 2415{
2009 dXSARGS; 2416 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2417 SV *data = (SV *)S_GENSUB_ARG;
2011 2418
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2419 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2420 {
2014 /* first call, set args */ 2421 /* first call, set args */
2015 SV *coro = SvRV (data); 2422 SV *coro = SvRV (data);
… …
2030 2437
2031static int 2438static int
2032slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2033{ 2440{
2034 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
2035 2442
2036 if (CORO_THROW) 2443 if (CORO_THROW)
2037 return 0; 2444 return 0;
2038 2445
2039 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2040 return 1; 2447 return 1;
… …
2076 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2077 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2078 } 2485 }
2079 2486
2080 if (!SvROK (cb) 2487 if (!SvROK (cb)
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2491
2085 { 2492 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2494 SV *data = (SV *)S_GENSUB_ARG;
2088 2495
2089 frame->data = (void *)data; 2496 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2497 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2498 frame->check = slf_check_rouse_wait;
2092 } 2499 }
… …
2096coro_new_rouse_cb (pTHX) 2503coro_new_rouse_cb (pTHX)
2097{ 2504{
2098 HV *hv = (HV *)SvRV (coro_current); 2505 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2506 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2507 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2508 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2509
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2510 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2511 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2512
2106 SvREFCNT_dec (coro->rouse_cb); 2513 SvREFCNT_dec (coro->rouse_cb);
… …
2203static void 2610static void
2204slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2611slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2205{ 2612{
2206 frame->prepare = prepare_cede_notself; 2613 frame->prepare = prepare_cede_notself;
2207 frame->check = slf_check_nop; 2614 frame->check = slf_check_nop;
2615}
2616
2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2618static void
2619slf_destroy (pTHX_ struct coro *coro)
2620{
2621 struct CoroSLF frame = coro->slf_frame;
2622
2623 /*
2624 * The on_destroy below most likely is from an SLF call.
2625 * Since by definition the SLF call will not finish when we destroy
2626 * the coro, we will have to force-finish it here, otherwise
2627 * cleanup functions cannot call SLF functions.
2628 */
2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2208} 2634}
2209 2635
2210/* 2636/*
2211 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2212 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2219 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2645 I32 checkmark; /* mark SP to see how many elements check has pushed */
2220 2646
2221 /* set up the slf frame, unless it has already been set-up */ 2647 /* set up the slf frame, unless it has already been set-up */
2222 /* the latter happens when a new coro has been started */ 2648 /* the latter happens when a new coro has been started */
2223 /* or when a new cctx was attached to an existing coroutine */ 2649 /* or when a new cctx was attached to an existing coroutine */
2224 if (expect_true (!slf_frame.prepare)) 2650 if (ecb_expect_true (!slf_frame.prepare))
2225 { 2651 {
2226 /* first iteration */ 2652 /* first iteration */
2227 dSP; 2653 dSP;
2228 SV **arg = PL_stack_base + TOPMARK + 1; 2654 SV **arg = PL_stack_base + TOPMARK + 1;
2229 int items = SP - arg; /* args without function object */ 2655 int items = SP - arg; /* args without function object */
… …
2270 while (slf_frame.check (aTHX_ &slf_frame)); 2696 while (slf_frame.check (aTHX_ &slf_frame));
2271 2697
2272 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2698 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2273 2699
2274 /* exception handling */ 2700 /* exception handling */
2275 if (expect_false (CORO_THROW)) 2701 if (ecb_expect_false (CORO_THROW))
2276 { 2702 {
2277 SV *exception = sv_2mortal (CORO_THROW); 2703 SV *exception = sv_2mortal (CORO_THROW);
2278 2704
2279 CORO_THROW = 0; 2705 CORO_THROW = 0;
2280 sv_setsv (ERRSV, exception); 2706 sv_setsv (ERRSV, exception);
2281 croak (0); 2707 croak (0);
2282 } 2708 }
2283 2709
2284 /* return value handling - mostly like entersub */ 2710 /* return value handling - mostly like entersub */
2285 /* make sure we put something on the stack in scalar context */ 2711 /* make sure we put something on the stack in scalar context */
2286 if (GIMME_V == G_SCALAR) 2712 if (GIMME_V == G_SCALAR
2713 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2287 { 2714 {
2288 dSP; 2715 dSP;
2289 SV **bot = PL_stack_base + checkmark; 2716 SV **bot = PL_stack_base + checkmark;
2290 2717
2291 if (sp == bot) /* too few, push undef */ 2718 if (sp == bot) /* too few, push undef */
2292 bot [1] = &PL_sv_undef; 2719 bot [1] = &PL_sv_undef;
2293 else if (sp != bot + 1) /* too many, take last one */ 2720 else /* too many, take last one */
2294 bot [1] = *sp; 2721 bot [1] = *sp;
2295 2722
2296 SP = bot + 1; 2723 SP = bot + 1;
2297 2724
2298 PUTBACK; 2725 PUTBACK;
… …
2331 if (PL_op->op_flags & OPf_STACKED) 2758 if (PL_op->op_flags & OPf_STACKED)
2332 { 2759 {
2333 if (items > slf_arga) 2760 if (items > slf_arga)
2334 { 2761 {
2335 slf_arga = items; 2762 slf_arga = items;
2336 free (slf_argv); 2763 Safefree (slf_argv);
2337 slf_argv = malloc (slf_arga * sizeof (SV *)); 2764 New (0, slf_argv, slf_arga, SV *);
2338 } 2765 }
2339 2766
2340 slf_argc = items; 2767 slf_argc = items;
2341 2768
2342 for (i = 0; i < items; ++i) 2769 for (i = 0; i < items; ++i)
… …
2405{ 2832{
2406 PerlIOBuf base; 2833 PerlIOBuf base;
2407 NV next, every; 2834 NV next, every;
2408} PerlIOCede; 2835} PerlIOCede;
2409 2836
2410static IV 2837static IV ecb_cold
2411PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2838PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2412{ 2839{
2413 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2414 2841
2415 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2842 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2416 self->next = nvtime () + self->every; 2843 self->next = nvtime () + self->every;
2417 2844
2418 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2845 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2419} 2846}
2420 2847
2421static SV * 2848static SV * ecb_cold
2422PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2849PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2423{ 2850{
2424 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2425 2852
2426 return newSVnv (self->every); 2853 return newSVnv (self->every);
… …
2538 SvREFCNT_dec (cb); 2965 SvREFCNT_dec (cb);
2539 } 2966 }
2540} 2967}
2541 2968
2542static void 2969static void
2543coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2544{ 2971{
2545 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2972 /* call $sem->adjust (0) to possibly wake up some other waiters */
2546 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2973 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2547} 2974}
2548 2975
2549static int 2976static int
2550slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2977slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2551{ 2978{
2552 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2553 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2981 SV *coro_hv = SvRV (coro_current);
2982
2983 frame->destroy = 0;
2554 2984
2555 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2556 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2557 return 0; 2991 return 0;
2992 }
2558 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2559 { 2994 {
2560 SvSTATE_current->on_destroy = 0;
2561
2562 if (acquire) 2995 if (acquire)
2563 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2564 else 2997 else
2565 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2566 2999
… …
2570 { 3003 {
2571 int i; 3004 int i;
2572 /* if we were woken up but can't down, we look through the whole */ 3005 /* if we were woken up but can't down, we look through the whole */
2573 /* waiters list and only add us if we aren't in there already */ 3006 /* waiters list and only add us if we aren't in there already */
2574 /* this avoids some degenerate memory usage cases */ 3007 /* this avoids some degenerate memory usage cases */
2575 3008 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2576 for (i = 1; i <= AvFILLp (av); ++i)
2577 if (AvARRAY (av)[i] == SvRV (coro_current)) 3009 if (AvARRAY (av)[i] == coro_hv)
2578 return 1; 3010 return 1;
2579 3011
2580 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3012 av_push (av, SvREFCNT_inc (coro_hv));
2581 return 1; 3013 return 1;
2582 } 3014 }
2583} 3015}
2584 3016
2585static int 3017static int
… …
2608 { 3040 {
2609 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3041 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2610 3042
2611 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3043 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2612 frame->prepare = prepare_schedule; 3044 frame->prepare = prepare_schedule;
2613
2614 /* to avoid race conditions when a woken-up coro gets terminated */ 3045 /* to avoid race conditions when a woken-up coro gets terminated */
2615 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3046 /* we arrange for a temporary on_destroy that calls adjust (0) */
2616 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3047 frame->destroy = coro_semaphore_destroy;
2617 } 3048 }
2618} 3049}
2619 3050
2620static void 3051static void
2621slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3052slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2629{ 3060{
2630 if (items >= 2) 3061 if (items >= 2)
2631 { 3062 {
2632 /* callback form */ 3063 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3065 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 3066
2636 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3067 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 3068
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 3069 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 3070 coro_semaphore_adjust (aTHX_ av, 0);
2640 3071
2641 frame->prepare = prepare_nop; 3072 frame->prepare = prepare_nop;
… …
2665 AvARRAY (av)[0] = AvARRAY (av)[1]; 3096 AvARRAY (av)[0] = AvARRAY (av)[1];
2666 AvARRAY (av)[1] = cb; 3097 AvARRAY (av)[1] = cb;
2667 3098
2668 cb = av_shift (av); 3099 cb = av_shift (av);
2669 3100
3101 if (SvTYPE (cb) == SVt_PVCV)
3102 {
3103 dSP;
3104 PUSHMARK (SP);
3105 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3106 PUTBACK;
3107 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3108 }
3109 else
3110 {
2670 api_ready (aTHX_ cb); 3111 api_ready (aTHX_ cb);
2671 sv_setiv (cb, 0); /* signal waiter */ 3112 sv_setiv (cb, 0); /* signal waiter */
3113 }
3114
2672 SvREFCNT_dec (cb); 3115 SvREFCNT_dec (cb);
2673 3116
2674 --count; 3117 --count;
2675 } 3118 }
2676} 3119}
… …
2685static void 3128static void
2686slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3129slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2687{ 3130{
2688 AV *av = (AV *)SvRV (arg [0]); 3131 AV *av = (AV *)SvRV (arg [0]);
2689 3132
3133 if (items >= 2)
3134 {
3135 SV *cb_cv = s_get_cv_croak (arg [1]);
3136 av_push (av, SvREFCNT_inc_NN (cb_cv));
3137
2690 if (SvIVX (AvARRAY (av)[0])) 3138 if (SvIVX (AvARRAY (av)[0]))
3139 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3140
3141 frame->prepare = prepare_nop;
3142 frame->check = slf_check_nop;
3143 }
3144 else if (SvIVX (AvARRAY (av)[0]))
2691 { 3145 {
2692 SvIVX (AvARRAY (av)[0]) = 0; 3146 SvIVX (AvARRAY (av)[0]) = 0;
2693 frame->prepare = prepare_nop; 3147 frame->prepare = prepare_nop;
2694 frame->check = slf_check_nop; 3148 frame->check = slf_check_nop;
2695 } 3149 }
2696 else 3150 else
2697 { 3151 {
2698 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3152 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2699 3153
2700 av_push (av, waiter); 3154 av_push (av, waiter);
2701 3155
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3156 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2703 frame->prepare = prepare_schedule; 3157 frame->prepare = prepare_schedule;
… …
2721 3175
2722static void 3176static void
2723coro_aio_callback (pTHX_ CV *cv) 3177coro_aio_callback (pTHX_ CV *cv)
2724{ 3178{
2725 dXSARGS; 3179 dXSARGS;
2726 AV *state = (AV *)GENSUB_ARG; 3180 AV *state = (AV *)S_GENSUB_ARG;
2727 SV *coro = av_pop (state); 3181 SV *coro = av_pop (state);
2728 SV *data_sv = newSV (sizeof (struct io_state)); 3182 SV *data_sv = newSV (sizeof (struct io_state));
2729 3183
2730 av_extend (state, items - 1); 3184 av_extend (state, items - 1);
2731 3185
… …
2767 /* it quickly returns */ 3221 /* it quickly returns */
2768 if (CORO_THROW) 3222 if (CORO_THROW)
2769 return 0; 3223 return 0;
2770 3224
2771 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
2772 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2773 return 1; 3227 return 1;
2774 3228
2775 /* restore status */ 3229 /* restore status */
2776 { 3230 {
2777 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
2816 dSP; 3270 dSP;
2817 3271
2818 static SV *prio_cv; 3272 static SV *prio_cv;
2819 static SV *prio_sv; 3273 static SV *prio_sv;
2820 3274
2821 if (expect_false (!prio_cv)) 3275 if (ecb_expect_false (!prio_cv))
2822 { 3276 {
2823 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3277 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2824 prio_sv = newSViv (0); 3278 prio_sv = newSViv (0);
2825 } 3279 }
2826 3280
… …
2845 3299
2846 for (i = 0; i < items; ++i) 3300 for (i = 0; i < items; ++i)
2847 PUSHs (arg [i]); 3301 PUSHs (arg [i]);
2848 3302
2849 /* now push the callback closure */ 3303 /* now push the callback closure */
2850 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3304 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2851 3305
2852 /* now call the AIO function - we assume our request is uncancelable */ 3306 /* now call the AIO function - we assume our request is uncancelable */
2853 PUTBACK; 3307 PUTBACK;
2854 call_sv ((SV *)req, G_VOID | G_DISCARD); 3308 call_sv ((SV *)req, G_VOID | G_DISCARD);
2855 } 3309 }
2856 3310
2857 /* now that the requets is going, we loop toll we have a result */ 3311 /* now that the request is going, we loop till we have a result */
2858 frame->data = (void *)state; 3312 frame->data = (void *)state;
2859 frame->prepare = prepare_schedule; 3313 frame->prepare = prepare_schedule;
2860 frame->check = slf_check_aio_req; 3314 frame->check = slf_check_aio_req;
2861} 3315}
2862 3316
… …
2874 3328
2875#if CORO_CLONE 3329#if CORO_CLONE
2876# include "clone.c" 3330# include "clone.c"
2877#endif 3331#endif
2878 3332
3333/*****************************************************************************/
3334
3335static SV *
3336coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3337{
3338 SV *coro_sv;
3339 struct coro *coro;
3340 MAGIC *mg;
3341 HV *hv;
3342 SV *cb;
3343 int i;
3344
3345 if (argc > 0)
3346 {
3347 cb = s_get_cv_croak (argv [0]);
3348
3349 if (!is_coro)
3350 {
3351 if (CvISXSUB (cb))
3352 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3353
3354 if (!CvROOT (cb))
3355 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3356 }
3357 }
3358
3359 Newz (0, coro, 1, struct coro);
3360 coro->args = newAV ();
3361 coro->flags = CF_NEW;
3362
3363 if (coro_first) coro_first->prev = coro;
3364 coro->next = coro_first;
3365 coro_first = coro;
3366
3367 coro->hv = hv = newHV ();
3368 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3369 mg->mg_flags |= MGf_DUP;
3370 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3371
3372 if (argc > 0)
3373 {
3374 av_extend (coro->args, argc + is_coro - 1);
3375
3376 if (is_coro)
3377 {
3378 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3379 cb = (SV *)cv_coro_run;
3380 }
3381
3382 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3383
3384 for (i = 1; i < argc; i++)
3385 av_push (coro->args, newSVsv (argv [i]));
3386 }
3387
3388 return coro_sv;
3389}
3390
3391#ifndef __cplusplus
3392ecb_cold XS(boot_Coro__State);
3393#endif
3394
3395#if CORO_JIT
3396
3397static void ecb_noinline ecb_cold
3398pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3399{
3400 dSP;
3401 AV *av = newAV ();
3402
3403 av_store (av, 3, newSVuv (d));
3404 av_store (av, 2, newSVuv (c));
3405 av_store (av, 1, newSVuv (b));
3406 av_store (av, 0, newSVuv (a));
3407
3408 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3409
3410 PUTBACK;
3411}
3412
3413static void ecb_noinline ecb_cold
3414jit_init (pTHX)
3415{
3416 dSP;
3417 SV *load, *save;
3418 char *map_base;
3419 char *load_ptr, *save_ptr;
3420 STRLEN load_len, save_len, map_len;
3421 int count;
3422
3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3424
3425 PUSHMARK (SP);
3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3427 #include "state.h"
3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3429 SPAGAIN;
3430
3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
3433
3434 map_len = load_len + save_len + 16;
3435
3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3437
3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3439
3440 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len);
3442
3443 map_base += (load_len + 15) & ~15;
3444
3445 save_perl_slots = (load_save_perl_slots_type)map_base;
3446 memcpy (map_base, save_ptr, save_len);
3447
3448 /* we are good citizens and try to make the page read-only, so the evil evil */
3449 /* hackers might have it a bit more difficult */
3450 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3451
3452 PUTBACK;
3453 eval_pv ("undef &Coro::State::_jit", 1);
3454}
3455
3456#endif
3457
2879MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3458MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2880 3459
2881PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
2882 3461
2883BOOT: 3462BOOT:
2884{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
2885#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
2886# if CORO_PTHREAD 3467# if CORO_PTHREAD
2887 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
2888# endif 3469# endif
2889#endif 3470#endif
2890 BOOT_PAGESIZE; 3471 /* perl defines these to check for existance first, but why it doesn't */
3472 /* just create them one at init time is not clear to me, except for */
3473 /* programs trying to delete them, but... */
3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3475 DEFSV;
3476 ERRSV;
2891 3477
2892 cctx_current = cctx_new_empty (); 3478 cctx_current = cctx_new_empty ();
2893 3479
2894 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2895 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2935 coroapi.prepare_nop = prepare_nop; 3521 coroapi.prepare_nop = prepare_nop;
2936 coroapi.prepare_schedule = prepare_schedule; 3522 coroapi.prepare_schedule = prepare_schedule;
2937 coroapi.prepare_cede = prepare_cede; 3523 coroapi.prepare_cede = prepare_cede;
2938 coroapi.prepare_cede_notself = prepare_cede_notself; 3524 coroapi.prepare_cede_notself = prepare_cede_notself;
2939 3525
2940 { 3526 time_init (aTHX);
2941 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2942 3527
2943 if (!svp) croak ("Time::HiRes is required");
2944 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2945
2946 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2947 }
2948
2949 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3528 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3529#if CORO_JIT
3530 PUTBACK;
3531 jit_init (aTHX);
3532 SPAGAIN;
3533#endif
2950} 3534}
2951 3535
2952SV * 3536SV *
2953new (char *klass, ...) 3537new (SV *klass, ...)
2954 ALIAS: 3538 ALIAS:
2955 Coro::new = 1 3539 Coro::new = 1
2956 CODE: 3540 CODE:
2957{ 3541 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2958 struct coro *coro; 3542 OUTPUT:
2959 MAGIC *mg;
2960 HV *hv;
2961 CV *cb;
2962 int i;
2963
2964 if (items > 1)
2965 {
2966 cb = coro_sv_2cv (aTHX_ ST (1));
2967
2968 if (!ix)
2969 {
2970 if (CvISXSUB (cb))
2971 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2972
2973 if (!CvROOT (cb))
2974 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2975 }
2976 }
2977
2978 Newz (0, coro, 1, struct coro);
2979 coro->args = newAV ();
2980 coro->flags = CF_NEW;
2981
2982 if (coro_first) coro_first->prev = coro;
2983 coro->next = coro_first;
2984 coro_first = coro;
2985
2986 coro->hv = hv = newHV ();
2987 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2988 mg->mg_flags |= MGf_DUP;
2989 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2990
2991 if (items > 1)
2992 {
2993 av_extend (coro->args, items - 1 + ix - 1);
2994
2995 if (ix)
2996 {
2997 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2998 cb = cv_coro_run;
2999 }
3000
3001 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3002
3003 for (i = 2; i < items; i++)
3004 av_push (coro->args, newSVsv (ST (i)));
3005 }
3006}
3007 OUTPUT:
3008 RETVAL 3543 RETVAL
3009 3544
3010void 3545void
3011transfer (...) 3546transfer (...)
3012 PROTOTYPE: $$ 3547 PROTOTYPE: $$
3013 CODE: 3548 CODE:
3014 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3015
3016bool
3017_destroy (SV *coro_sv)
3018 CODE:
3019 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3020 OUTPUT:
3021 RETVAL
3022
3023void
3024_exit (int code)
3025 PROTOTYPE: $
3026 CODE:
3027 _exit (code);
3028 3550
3029SV * 3551SV *
3030clone (Coro::State coro) 3552clone (Coro::State coro)
3031 CODE: 3553 CODE:
3032{ 3554{
… …
3087void 3609void
3088list () 3610list ()
3089 PROTOTYPE: 3611 PROTOTYPE:
3090 PPCODE: 3612 PPCODE:
3091{ 3613{
3092 struct coro *coro; 3614 struct coro *coro;
3093 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
3094 if (coro->hv) 3616 if (coro->hv)
3095 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3096} 3618}
3097 3619
… …
3102 CODE: 3624 CODE:
3103{ 3625{
3104 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3626 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3105 { 3627 {
3106 struct coro *current = SvSTATE_current; 3628 struct coro *current = SvSTATE_current;
3629 struct CoroSLF slf_save;
3107 3630
3108 if (current != coro) 3631 if (current != coro)
3109 { 3632 {
3110 PUTBACK; 3633 PUTBACK;
3111 save_perl (aTHX_ current); 3634 save_perl (aTHX_ current);
3112 load_perl (aTHX_ coro); 3635 load_perl (aTHX_ coro);
3636 /* the coro is most likely in an active SLF call.
3637 * while not strictly required (the code we execute is
3638 * not allowed to call any SLF functions), it's cleaner
3639 * to reinitialise the slf_frame and restore it later.
3640 * This might one day allow us to actually do SLF calls
3641 * from code executed here.
3642 */
3643 slf_save = slf_frame;
3644 slf_frame.prepare = 0;
3113 SPAGAIN; 3645 SPAGAIN;
3114 } 3646 }
3115 3647
3116 PUSHSTACK; 3648 PUSHSTACK;
3117 3649
… …
3127 SPAGAIN; 3659 SPAGAIN;
3128 3660
3129 if (current != coro) 3661 if (current != coro)
3130 { 3662 {
3131 PUTBACK; 3663 PUTBACK;
3664 slf_frame = slf_save;
3132 save_perl (aTHX_ coro); 3665 save_perl (aTHX_ coro);
3133 load_perl (aTHX_ current); 3666 load_perl (aTHX_ current);
3134 SPAGAIN; 3667 SPAGAIN;
3135 } 3668 }
3136 } 3669 }
… …
3141 PROTOTYPE: $ 3674 PROTOTYPE: $
3142 ALIAS: 3675 ALIAS:
3143 is_ready = CF_READY 3676 is_ready = CF_READY
3144 is_running = CF_RUNNING 3677 is_running = CF_RUNNING
3145 is_new = CF_NEW 3678 is_new = CF_NEW
3146 is_destroyed = CF_DESTROYED 3679 is_destroyed = CF_ZOMBIE
3680 is_zombie = CF_ZOMBIE
3147 is_suspended = CF_SUSPENDED 3681 is_suspended = CF_SUSPENDED
3148 CODE: 3682 CODE:
3149 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
3150 OUTPUT: 3684 OUTPUT:
3151 RETVAL 3685 RETVAL
3152 3686
3153void 3687void
3154throw (Coro::State self, SV *throw = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
3155 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
3156 CODE: 3690 CODE:
3157{ 3691{
3692 struct coro *coro = SvSTATE (self);
3158 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
3159 SV **throwp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3160 SvREFCNT_dec (*throwp); 3695 SvREFCNT_dec (*exceptionp);
3161 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3696 SvGETMAGIC (exception);
3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
3162} 3700}
3163 3701
3164void 3702void
3165api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3166 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
3221 3759
3222void 3760void
3223cancel (Coro::State self) 3761cancel (Coro::State self)
3224 CODE: 3762 CODE:
3225 coro_state_destroy (aTHX_ self); 3763 coro_state_destroy (aTHX_ self);
3226 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3764
3765SV *
3766enable_times (int enabled = enable_times)
3767 CODE:
3768{
3769 RETVAL = boolSV (enable_times);
3770
3771 if (enabled != enable_times)
3772 {
3773 enable_times = enabled;
3774
3775 coro_times_update ();
3776 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3777 }
3778}
3779 OUTPUT:
3780 RETVAL
3781
3782void
3783times (Coro::State self)
3784 PPCODE:
3785{
3786 struct coro *current = SvSTATE (coro_current);
3787
3788 if (ecb_expect_false (current == self))
3789 {
3790 coro_times_update ();
3791 coro_times_add (SvSTATE (coro_current));
3792 }
3793
3794 EXTEND (SP, 2);
3795 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3796 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3797
3798 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current));
3800}
3801
3802void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3804 CODE:
3805{
3806 struct coro *current = SvSTATE_current;
3807
3808 if (current == coro)
3809 SWAP_SVS (current);
3810
3811 if (!coro->swap_sv)
3812 coro->swap_sv = newAV ();
3813
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3816
3817 if (current == coro)
3818 SWAP_SVS (current);
3819}
3227 3820
3228 3821
3229MODULE = Coro::State PACKAGE = Coro 3822MODULE = Coro::State PACKAGE = Coro
3230 3823
3231BOOT: 3824BOOT:
3232{ 3825{
3233 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3234 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3235 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3236 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3237 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3238 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3239 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3831 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3240 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3832 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3241 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3833 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3242 3834
3243 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3244 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3836 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3245 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3837 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3246 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3247 3839
3248 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3249 3841
3250 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3251 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3252 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3253 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3845 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3254 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3846 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3255 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3847 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3256 3848
3257 { 3849 {
3258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3850 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3259 3851
3260 coroapi.schedule = api_schedule; 3852 coroapi.schedule = api_schedule;
… …
3270 sv_setiv (sv, (IV)&coroapi); 3862 sv_setiv (sv, (IV)&coroapi);
3271 SvREADONLY_on (sv); 3863 SvREADONLY_on (sv);
3272 } 3864 }
3273} 3865}
3274 3866
3867SV *
3868async (...)
3869 PROTOTYPE: &@
3870 CODE:
3871 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3872 api_ready (aTHX_ RETVAL);
3873 OUTPUT:
3874 RETVAL
3875
3876void
3877_destroy (Coro::State coro)
3878 CODE:
3879 /* used by the manager thread */
3880 coro_state_destroy (aTHX_ coro);
3881
3882void
3883on_destroy (Coro::State coro, SV *cb)
3884 CODE:
3885 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3886
3887void
3888join (...)
3889 CODE:
3890 CORO_EXECUTE_SLF_XS (slf_init_join);
3891
3275void 3892void
3276terminate (...) 3893terminate (...)
3277 CODE: 3894 CODE:
3278 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3895 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3896
3897void
3898cancel (...)
3899 CODE:
3900 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3901
3902int
3903safe_cancel (Coro::State self, ...)
3904 C_ARGS: aTHX_ self, &ST (1), items - 1
3279 3905
3280void 3906void
3281schedule (...) 3907schedule (...)
3282 CODE: 3908 CODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3909 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3312void 3938void
3313_set_readyhook (SV *hook) 3939_set_readyhook (SV *hook)
3314 PROTOTYPE: $ 3940 PROTOTYPE: $
3315 CODE: 3941 CODE:
3316 SvREFCNT_dec (coro_readyhook); 3942 SvREFCNT_dec (coro_readyhook);
3943 SvGETMAGIC (hook);
3944 if (SvOK (hook))
3945 {
3317 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3946 coro_readyhook = newSVsv (hook);
3947 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3948 }
3949 else
3950 {
3951 coro_readyhook = 0;
3952 CORO_READYHOOK = 0;
3953 }
3318 3954
3319int 3955int
3320prio (Coro::State coro, int newprio = 0) 3956prio (Coro::State coro, int newprio = 0)
3321 PROTOTYPE: $;$ 3957 PROTOTYPE: $;$
3322 ALIAS: 3958 ALIAS:
… …
3328 if (items > 1) 3964 if (items > 1)
3329 { 3965 {
3330 if (ix) 3966 if (ix)
3331 newprio = coro->prio - newprio; 3967 newprio = coro->prio - newprio;
3332 3968
3333 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3969 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3334 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3970 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3335 3971
3336 coro->prio = newprio; 3972 coro->prio = newprio;
3337 } 3973 }
3338} 3974}
3339 OUTPUT: 3975 OUTPUT:
… …
3386 for (i = 1; i < items; ++i) 4022 for (i = 1; i < items; ++i)
3387 av_push (av, SvREFCNT_inc_NN (ST (i))); 4023 av_push (av, SvREFCNT_inc_NN (ST (i)));
3388 4024
3389 if ((SV *)hv == &PL_sv_undef) 4025 if ((SV *)hv == &PL_sv_undef)
3390 { 4026 {
3391 PUSHMARK (SP); 4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3392 EXTEND (SP, 2);
3393 PUSHs (sv_Coro);
3394 PUSHs ((SV *)cv_pool_handler);
3395 PUTBACK;
3396 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3397 SPAGAIN;
3398
3399 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv);
3400 } 4030 }
3401 4031
3402 { 4032 {
3403 struct coro *coro = SvSTATE_hv (hv); 4033 struct coro *coro = SvSTATE_hv (hv);
3404 4034
… …
3436 on_leave = 1 4066 on_leave = 1
3437 PROTOTYPE: & 4067 PROTOTYPE: &
3438 CODE: 4068 CODE:
3439{ 4069{
3440 struct coro *coro = SvSTATE_current; 4070 struct coro *coro = SvSTATE_current;
3441 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3442 4072
3443 block = (SV *)coro_sv_2cv (aTHX_ block); 4073 block = s_get_cv_croak (block);
3444 4074
3445 if (!*avp) 4075 if (!*avp)
3446 *avp = newAV (); 4076 *avp = newAV ();
3447 4077
3448 av_push (*avp, SvREFCNT_inc (block)); 4078 av_push (*avp, SvREFCNT_inc (block));
… …
3465MODULE = Coro::State PACKAGE = Coro::Semaphore 4095MODULE = Coro::State PACKAGE = Coro::Semaphore
3466 4096
3467SV * 4097SV *
3468new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
3469 CODE: 4099 CODE:
4100{
4101 int semcnt = 1;
4102
4103 if (count)
4104 {
4105 SvGETMAGIC (count);
4106
4107 if (SvOK (count))
4108 semcnt = SvIV (count);
4109 }
4110
3470 RETVAL = sv_bless ( 4111 RETVAL = sv_bless (
3471 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4112 coro_waitarray_new (aTHX_ semcnt),
3472 GvSTASH (CvGV (cv)) 4113 GvSTASH (CvGV (cv))
3473 ); 4114 );
4115}
3474 OUTPUT: 4116 OUTPUT:
3475 RETVAL 4117 RETVAL
3476 4118
3477# helper for Coro::Channel and others 4119# helper for Coro::Channel and others
3478SV * 4120SV *
… …
3524 XSRETURN_NO; 4166 XSRETURN_NO;
3525} 4167}
3526 4168
3527void 4169void
3528waiters (SV *self) 4170waiters (SV *self)
3529 PPCODE: 4171 PPCODE:
3530{ 4172{
3531 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
3532 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
3533 4175
3534 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
3543} 4185}
3544 4186
3545MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4187MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3546 4188
3547void 4189void
3548_may_delete (SV *sem, int count, int extra_refs) 4190_may_delete (SV *sem, int count, unsigned int extra_refs)
3549 PPCODE: 4191 PPCODE:
3550{ 4192{
3551 AV *av = (AV *)SvRV (sem); 4193 AV *av = (AV *)SvRV (sem);
3552 4194
3553 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3554 && AvFILLp (av) == 0 /* no waiters, just count */ 4196 && AvFILLp (av) == 0 /* no waiters, just count */
3555 && SvIV (AvARRAY (av)[0]) == count) 4197 && SvIV (AvARRAY (av)[0]) == count)
3556 XSRETURN_YES; 4198 XSRETURN_YES;
… …
3577 4219
3578void 4220void
3579broadcast (SV *self) 4221broadcast (SV *self)
3580 CODE: 4222 CODE:
3581{ 4223{
3582 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
3583 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
3584} 4226}
3585 4227
3586void 4228void
3587send (SV *self) 4229send (SV *self)
… …
3595 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3596} 4238}
3597 4239
3598IV 4240IV
3599awaited (SV *self) 4241awaited (SV *self)
3600 CODE: 4242 CODE:
3601 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3602 OUTPUT: 4244 OUTPUT:
3603 RETVAL 4245 RETVAL
3604 4246
3605 4247
… …
3610 4252
3611void 4253void
3612_schedule (...) 4254_schedule (...)
3613 CODE: 4255 CODE:
3614{ 4256{
3615 static int incede; 4257 static int incede;
3616 4258
3617 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
3618 4260
3619 ++incede; 4261 ++incede;
3620 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
3636 4278
3637void 4279void
3638_register (char *target, char *proto, SV *req) 4280_register (char *target, char *proto, SV *req)
3639 CODE: 4281 CODE:
3640{ 4282{
3641 CV *req_cv = coro_sv_2cv (aTHX_ req); 4283 SV *req_cv = s_get_cv_croak (req);
3642 /* newXSproto doesn't return the CV on 5.8 */ 4284 /* newXSproto doesn't return the CV on 5.8 */
3643 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4285 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3644 sv_setpv ((SV *)slf_cv, proto); 4286 sv_setpv ((SV *)slf_cv, proto);
3645 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4287 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3646} 4288}
3647 4289
4290MODULE = Coro::State PACKAGE = Coro::Select
4291
4292void
4293patch_pp_sselect ()
4294 CODE:
4295 if (!coro_old_pp_sselect)
4296 {
4297 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4298 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4299 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4300 }
4301
4302void
4303unpatch_pp_sselect ()
4304 CODE:
4305 if (coro_old_pp_sselect)
4306 {
4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4308 coro_old_pp_sselect = 0;
4309 }
4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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