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.343 by root, Mon Dec 15 16:41:43 2008 UTC vs.
Revision 1.442 by root, Tue Mar 4 06:13:24 2014 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
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
18# undef setjmp 56# undef setjmp
19# undef longjmp 57# undef longjmp
20# undef _exit 58# undef _exit
21# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
22#else 60#else
23# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
24#endif 62#endif
25 63
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 */ 64/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
55 66
56#define PERL_VERSION_ATLEAST(a,b,c) \ 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 68# 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 69#endif
122 70
123/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
136#endif 84#endif
137 85
138#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
139 87
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" 88#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
157 90
158#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
159# if CORO_PTHREAD 92# if CORO_PTHREAD
160static void *coro_thx; 93static void *coro_thx;
161# endif 94# endif
162#endif 95#endif
163 96
97#ifdef __linux
98# include <time.h> /* for timespec */
99# include <syscall.h> /* for SYS_* */
100# ifdef SYS_clock_gettime
101# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
102# define CORO_CLOCK_MONOTONIC 1
103# define CORO_CLOCK_THREAD_CPUTIME_ID 3
104# endif
105#endif
106
164static double (*nvtime)(); /* so why doesn't it take void? */ 107static double (*nvtime)(); /* so why doesn't it take void? */
108static void (*u2time)(pTHX_ UV ret[2]);
165 109
166/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
169 114
170static U32 cctx_gen; 115static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 135static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 136static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 137static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 138static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 139static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 140
197/* Coro::AnyEvent */ 141/* Coro::AnyEvent */
198static SV *sv_activity; 142static SV *sv_activity;
199 143
144/* enable processtime/realtime profiling */
145static char enable_times;
146typedef U32 coro_ts[2];
147static coro_ts time_real, time_cpu;
148static char times_valid;
149
200static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
202 152
203enum { 153enum
154{
204 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 164typedef struct coro_cctx
214{ 165{
215 struct coro_cctx *next; 166 struct coro_cctx *next;
216 167
217 /* the stack */ 168 /* the stack */
218 void *sptr; 169 struct coro_stack stack;
219 size_t ssize;
220 170
221 /* cpu state */ 171 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
224 JMPENV *top_env; 176 JMPENV *top_env;
225 coro_context cctx; 177 coro_context cctx;
226 178
227 U32 gen; 179 U32 gen;
228#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
229 int valgrind_id; 181 int valgrind_id;
230#endif 182#endif
231 unsigned char flags; 183 unsigned char flags;
232} coro_cctx; 184} coro_cctx;
233 185
234coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
235 187
236/*****************************************************************************/ 188/*****************************************************************************/
237 189
190static MGVTBL coro_state_vtbl;
191
238enum { 192enum
193{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 200};
245 201
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 203typedef struct
248{ 204{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
255# include "state.h" 206 #include "state.h"
256#undef VAR
257} perl_slots; 207} perl_slots;
258 208
209/* 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)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 211
261/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
262struct coro { 213struct coro
214{
263 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 216 coro_cctx *cctx;
217
218 /* ready queue */
219 struct coro *next_ready;
265 220
266 /* state data */ 221 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 223 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
270 225
271 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
272 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
273 int refcnt; /* coroutines are refcounted, yes */
274 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
275 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
276 void (*on_destroy)(pTHX_ struct coro *coro);
277 230
278 /* statistics */ 231 /* statistics */
279 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
280 233
281 /* coro process data */ 234 /* coro process data */
282 int prio; 235 int prio;
283 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
284 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
285 240
286 /* async_pool */ 241 /* async_pool */
287 SV *saved_deffh; 242 SV *saved_deffh;
288 SV *invoke_cb; 243 SV *invoke_cb;
289 AV *invoke_av; 244 AV *invoke_av;
290 245
291 /* on_enter/on_leave */ 246 /* on_enter/on_leave */
292 AV *on_enter; 247 AV *on_enter;
293 AV *on_leave; 248 AV *on_leave;
294 249
250 /* swap_sv */
251 AV *swap_sv;
252
253 /* times */
254 coro_ts t_cpu, t_real;
255
295 /* linked list */ 256 /* linked list */
296 struct coro *next, *prev; 257 struct coro *next, *prev;
297}; 258};
298 259
299typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
300typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
301 262
302/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
303/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
304/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
306 267
307/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
308 269
309#define PRIO_MAX 3 270#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 271#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 272#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 273#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 274#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 275#define CORO_PRIO_MIN -4
315 276
316/* for Coro.pm */ 277/* for Coro.pm */
317static SV *coro_current; 278static SV *coro_current;
318static SV *coro_readyhook; 279static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
321static struct coro *coro_first; 282static struct coro *coro_first;
322#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
323 284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
307
308/** Coro::Select ************************************************************/
309
310static OP *(*coro_old_pp_sselect) (pTHX);
311static SV *coro_select_select;
312
313/* horrible hack, but if it works... */
314static OP *
315coro_pp_sselect (pTHX)
316{
317 dSP;
318 PUSHMARK (SP - 4); /* fake argument list */
319 XPUSHs (coro_select_select);
320 PUTBACK;
321
322 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
323 PL_op->op_flags |= OPf_STACKED;
324 PL_op->op_private = 0;
325 return PL_ppaddr [OP_ENTERSUB](aTHX);
326}
327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332ecb_inline void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342ecb_inline double
343coro_nvtime (void)
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351ecb_inline void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360ecb_inline void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
379
324/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
325 381
326static SV * 382static SV * ecb_noinline
327coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
328{ 384{
329#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
330 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
331 get_sv (name, create); 387 get_sv (name, create);
332#endif 388#endif
333 return get_sv (name, create); 389 return get_sv (name, create);
334} 390}
335 391
336static AV * 392static AV * ecb_noinline
337coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
338{ 394{
339#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
340 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
341 get_av (name, create); 397 get_av (name, create);
342#endif 398#endif
343 return get_av (name, create); 399 return get_av (name, create);
344} 400}
345 401
346static HV * 402static HV * ecb_noinline
347coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
348{ 404{
349#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
350 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
351 get_hv (name, create); 407 get_hv (name, create);
352#endif 408#endif
353 return get_hv (name, create); 409 return get_hv (name, create);
354} 410}
355 411
356/* may croak */ 412ecb_inline void
357INLINE CV * 413coro_times_update (void)
358coro_sv_2cv (pTHX_ SV *sv)
359{ 414{
360 HV *st; 415#ifdef coro_clock_gettime
361 GV *gvp; 416 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 417
364 if (!cv) 418 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 419 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
420 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 421
367 return cv; 422 ts.tv_sec = ts.tv_nsec = 0;
423 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
424 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
425#else
426 dTHX;
427 UV tv[2];
428
429 u2time (aTHX_ tv);
430 time_real [0] = tv [0];
431 time_real [1] = tv [1] * 1000;
432#endif
433}
434
435ecb_inline void
436coro_times_add (struct coro *c)
437{
438 c->t_real [1] += time_real [1];
439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
440 c->t_real [0] += time_real [0];
441
442 c->t_cpu [1] += time_cpu [1];
443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
444 c->t_cpu [0] += time_cpu [0];
445}
446
447ecb_inline void
448coro_times_sub (struct coro *c)
449{
450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
451 c->t_real [1] -= time_real [1];
452 c->t_real [0] -= time_real [0];
453
454 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
455 c->t_cpu [1] -= time_cpu [1];
456 c->t_cpu [0] -= time_cpu [0];
368} 457}
369 458
370/*****************************************************************************/ 459/*****************************************************************************/
371/* magic glue */ 460/* magic glue */
372 461
373#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
374#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
375 464
376#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
377 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
378 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
379 : mg_find (sv, type)) 468 : mg_find (sv, type))
380 469
381#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
382 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
383 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
384 : 0) 473 : 0)
385 474
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
388 477
389INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
390SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
391{ 495{
392 HV *stash;
393 MAGIC *mg; 496 MAGIC *mg;
394 497
395 if (SvROK (coro)) 498 if (SvROK (coro))
396 coro = SvRV (coro); 499 coro = SvRV (coro);
397 500
398 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
399 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
400 504
401 stash = SvSTASH (coro);
402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
403 {
404 /* very slow, but rare, check */
405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
406 croak ("Coro::State object required");
407 }
408
409 mg = CORO_MAGIC_state (coro);
410 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
411} 506}
412 507
413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
414 509
… …
417#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
418 513
419/*****************************************************************************/ 514/*****************************************************************************/
420/* padlist management and caching */ 515/* padlist management and caching */
421 516
422static AV * 517ecb_inline PADLIST *
423coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
424{ 519{
425 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
426 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
427 524
428 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
429 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
430#if PERL_VERSION_ATLEAST (5,10,0)
431 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
432#else
433 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
434#endif 554#endif
435 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
436 --AvFILLp (padlist);
437 555
438 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
439 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
440 560
441 return newpadlist; 561 return newpadlist;
442} 562}
443 563
444static void 564ecb_inline void
445free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
446{ 566{
447 /* may be during global destruction */ 567 /* may be during global destruction */
448 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
449 { 569 {
450 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
451 571
452 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
453 { 573 {
454 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
455 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
456 I32 j = AvFILLp (av);
457 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
458 while (j >= 0) 581 while (j >= 0)
459 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
460 583
461 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
462 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
463 } 587 }
464 588
465 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
466 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
467 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
468 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
469 } 599 }
470} 600}
471 601
472static int 602static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 604{
475 AV *padlist; 605 PADLIST *padlist;
476 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
477 608
478 /* casting is fun. */ 609 /* perl manages to free our internal AV and _then_ call us */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 610 if (IN_DESTRUCT)
611 return 0;
612
613 while (len--)
480 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
481
482 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
483 615
484 return 0; 616 return 0;
485} 617}
486 618
487static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
488 0, 0, 0, 0, 620 0, 0, 0, 0,
489 coro_cv_free 621 coro_cv_free
490}; 622};
491 623
492/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
493static void 625ecb_inline void
494get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
495{ 627{
496 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
497 AV *av; 629 size_t *lenp;
498 630
499 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
500 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
501 else 633 else
502 { 634 {
503#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
504 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
505 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
511 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
512#endif 644#endif
513 } 645 }
514} 646}
515 647
516static void 648ecb_inline void
517put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
518{ 650{
519 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
520 AV *av;
521 652
522 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
523 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
524 663
525 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
526
527 if (expect_false (AvFILLp (av) >= AvMAX (av)))
528 av_extend (av, AvFILLp (av) + 1);
529
530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
531} 665}
532 666
533/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
707/* swap sv heads, at least logically */
708static void
709swap_svs (pTHX_ Coro__State c)
710{
711 int i;
712
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715}
716
717#define SWAP_SVS(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro))
534 720
535static void 721static void
536on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
537 723
538static void 724static void
… …
541 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
542 c->slot = 0; 728 c->slot = 0;
543 729
544 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
545 731
546 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
547 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
548 GvSV (PL_errgv) = slot->errsv; 734#else
549 GvSV (irsgv) = slot->irsgv;
550 GvHV (PL_hintgv) = slot->hinthv;
551
552 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
553 # include "state.h" 736 #include "state.h"
554 #undef VAR 737#endif
555 738
556 { 739 {
557 dSP; 740 dSP;
558 741
559 CV *cv; 742 CV *cv;
560 743
561 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
562 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
563 { 746 {
564 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
565 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
566 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
567 } 750 }
568 751
569 PUTBACK; 752 PUTBACK;
570 } 753 }
571 754
572 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 756 CORO_THROW = c->except;
574 757
758 if (ecb_expect_false (enable_times))
759 {
760 if (ecb_expect_false (!times_valid))
761 coro_times_update ();
762
763 coro_times_sub (c);
764 }
765
575 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
576 { 767 {
577 int i; 768 int i;
578 769
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 } 772 }
773
774 SWAP_SVS (c);
582} 775}
583 776
584static void 777static void
585save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
586{ 779{
780 SWAP_SVS (c);
781
587 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
588 { 783 {
589 int i; 784 int i;
590 785
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
788 }
789
790 times_valid = 0;
791
792 if (ecb_expect_false (enable_times))
793 {
794 coro_times_update (); times_valid = 1;
795 coro_times_add (c);
593 } 796 }
594 797
595 c->except = CORO_THROW; 798 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 799 c->slf_frame = slf_frame;
597 800
… …
608 811
609 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
610 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
611 for (;;) 814 for (;;)
612 { 815 {
613 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
614 { 817 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
616 819
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 821 {
619 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
620 823
621 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
622 { 825 {
623 EXTEND (SP, 3); 826 EXTEND (SP, 3);
624 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
625 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
626 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
629 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
630 } 833 }
631 } 834 }
632 } 835 }
633 836
634 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
635 break; 838 break;
636 839
637 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
638 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
639 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
641 844
642 PUTBACK; 845 PUTBACK;
643 } 846 }
644 847
645 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
646 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
647 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC;
650 { 850 {
651 int i; 851 unsigned int i;
852
652 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
653 CXINC; 854 CXINC;
654 } 855
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
656 858
657 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
658 860
659 { 861 {
660 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
661 863
662 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
663 slot->defsv = DEFSV; 865 save_perl_slots (slot);
664 slot->errsv = ERRSV; 866#else
665 slot->irsgv = GvSV (irsgv);
666 slot->hinthv = GvHV (PL_hintgv);
667
668 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
669 # include "state.h" 868 #include "state.h"
670 #undef VAR 869#endif
671 } 870 }
672} 871}
673 872
674/* 873/*
675 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
681# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
682#else 881#else
683static void 882static void
684coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
685{ 884{
686 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
687 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
688 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
689 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
690 889
691 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
706#endif 905#endif
707 906
708 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
709 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
710 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
711 913
712 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
713 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
714 PL_savestack_max = 24; 916 PL_savestack_max = 24;
715 917
… …
743 } 945 }
744 946
745 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
746 Safefree (PL_markstack); 948 Safefree (PL_markstack);
747 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
748 Safefree (PL_savestack); 953 Safefree (PL_savestack);
749#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
750 Safefree (PL_retstack); 955 Safefree (PL_retstack);
751#endif 956#endif
752} 957}
… …
798#endif 1003#endif
799 1004
800/* 1005/*
801 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
802 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
803 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
804 * readback here. 1009 * we just provide our own readback here.
805 */ 1010 */
806static int 1011static int ecb_cold
807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
808{ 1013{
809 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
810 1015
811 if (*s == '_') 1016 if (*s == '_')
812 { 1017 {
813 SV **svp = 0; 1018 SV **svp = 0;
814 1019
815 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
816 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
817 1022
818 if (svp) 1023 if (svp)
819 { 1024 {
820 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
821 return 0; 1035 return 0;
822 } 1036 }
823 } 1037 }
824 1038
825 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
826} 1040}
827 1041
828static int 1042static int ecb_cold
829coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
830{ 1044{
831 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
832 1046
833 if (*s == '_') 1047 if (*s == '_')
… …
847 } 1061 }
848 1062
849 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
850} 1064}
851 1065
852static int 1066static int ecb_cold
853coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
854{ 1068{
855 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
856 1070
857 if (*s == '_') 1071 if (*s == '_')
… …
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 1104slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 1105{
892 return 1; 1106 return 1;
893} 1107}
894 1108
895static UNOP coro_setup_op; 1109static UNOP init_perl_op;
896 1110
897static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
898coro_setup (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
899{ 1113{
900 /* 1114 /*
901 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
902 */ 1116 */
903 coro_init_stacks (aTHX); 1117 coro_init_stacks (aTHX);
… …
910 PL_comppad_name_fill = 0; 1124 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0; 1125 PL_comppad_name_floor = 0;
912 PL_curpm = 0; 1126 PL_curpm = 0;
913 PL_curpad = 0; 1127 PL_curpad = 0;
914 PL_localizing = 0; 1128 PL_localizing = 0;
915 PL_dirty = 0;
916 PL_restartop = 0; 1129 PL_restartop = 0;
917#if PERL_VERSION_ATLEAST (5,10,0) 1130#if PERL_VERSION_ATLEAST (5,10,0)
918 PL_parser = 0; 1131 PL_parser = 0;
919#endif 1132#endif
920 PL_hints = 0; 1133 PL_hints = 0;
921 1134
922 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
923 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
924 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
925 1138
926 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
927 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
928 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
929 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
930 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
950 /* this newly created coroutine might be run on an existing cctx which most 1163 /* this newly created coroutine might be run on an existing cctx which most
951 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1164 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
952 */ 1165 */
953 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1166 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
954 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1167 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1168 slf_frame.destroy = 0;
955 1169
956 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1170 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
957 coro_setup_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
960 /* no flags etc. required, as an init function won't be called */ 1174 /* no flags etc. required, as an init function won't be called */
961 1175
962 PL_op = (OP *)&coro_setup_op; 1176 PL_op = (OP *)&init_perl_op;
963 1177
964 /* copy throw, in case it was set before coro_setup */ 1178 /* copy throw, in case it was set before init_perl */
965 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1180
1181 SWAP_SVS (coro);
1182
1183 if (ecb_expect_false (enable_times))
1184 {
1185 coro_times_update ();
1186 coro_times_sub (coro);
1187 }
966} 1188}
967 1189
968static void 1190static void
969coro_unwind_stacks (pTHX) 1191coro_unwind_stacks (pTHX)
970{ 1192{
… …
985 dounwind (-1); 1207 dounwind (-1);
986 } 1208 }
987} 1209}
988 1210
989static void 1211static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
991{ 1213{
1214 SV *svf [9];
1215
1216 {
1217 SV *old_current = SvRV (coro_current);
1218 struct coro *current = SvSTATE (old_current);
1219
1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1221
1222 save_perl (aTHX_ current);
1223
1224 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv);
1226
1227 load_perl (aTHX_ coro);
1228
992 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
993 1230
994 SvREFCNT_dec (GvSV (PL_defgv)); 1231 /* restore swapped sv's */
995 SvREFCNT_dec (GvAV (PL_defgv)); 1232 SWAP_SVS (coro);
996 SvREFCNT_dec (GvSV (PL_errgv));
997 SvREFCNT_dec (PL_defoutgv);
998 SvREFCNT_dec (PL_rs);
999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
1001 1233
1002 SvREFCNT_dec (PL_diehook); 1234 coro_destruct_stacks (aTHX);
1003 SvREFCNT_dec (PL_warnhook); 1235
1236 /* now save some sv's to be free'd later */
1237 svf [0] = GvSV (PL_defgv);
1238 svf [1] = (SV *)GvAV (PL_defgv);
1239 svf [2] = GvSV (PL_errgv);
1240 svf [3] = (SV *)PL_defoutgv;
1241 svf [4] = PL_rs;
1242 svf [5] = GvSV (irsgv);
1243 svf [6] = (SV *)GvHV (PL_hintgv);
1244 svf [7] = PL_diehook;
1245 svf [8] = PL_warnhook;
1246 assert (9 == sizeof (svf) / sizeof (*svf));
1247
1248 SvRV_set (coro_current, old_current);
1249
1250 load_perl (aTHX_ current);
1004 1251 }
1252
1253 {
1254 unsigned int i;
1255
1256 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1257 SvREFCNT_dec (svf [i]);
1258
1005 SvREFCNT_dec (coro->saved_deffh); 1259 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1260 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1009 1263 }
1010 coro_destruct_stacks (aTHX);
1011} 1264}
1012 1265
1013INLINE void 1266ecb_inline void
1014free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1015{ 1268{
1016 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1017 { 1270 {
1018 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1019 coro_mortal = 0; 1272 coro_mortal = 0;
1020 } 1273 }
1021} 1274}
1022 1275
1023static int 1276static int
… …
1156 1409
1157 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1410 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1158} 1411}
1159 1412
1160/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1413/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1161static void NOINLINE 1414static void ecb_noinline
1162cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1163{ 1416{
1164 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1165 1418
1166 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1177 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1178 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1179} 1432}
1180 1433
1181/* the tail of transfer: execute stuff we can only do after a transfer */ 1434/* the tail of transfer: execute stuff we can only do after a transfer */
1182INLINE void 1435ecb_inline void
1183transfer_tail (pTHX) 1436transfer_tail (pTHX)
1184{ 1437{
1185 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1439}
1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1186} 1451}
1187 1452
1188/* 1453/*
1189 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1190 */ 1455 */
… …
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1477 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1478 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1479 perl_run (PL_curinterp);
1215 /* 1480 /*
1216 * Unfortunately, there is no way to get at the return values of the 1481 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1482 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1483 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1484 */
1219 1485
1220 /* 1486 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1222 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1223 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1224 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * doing in that case. YMMV.
1225 * coroutine as Coro has no such concept.
1226 * This actually isn't valid with the pthread backend, but OSes requiring
1227 * that backend are too broken to do it in a standards-compliant way.
1228 */ 1491 */
1229 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1230 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1231 } 1493 }
1232} 1494}
1233 1495
1234static coro_cctx * 1496static coro_cctx *
1235cctx_new () 1497cctx_new (void)
1236{ 1498{
1237 coro_cctx *cctx; 1499 coro_cctx *cctx;
1238 1500
1239 ++cctx_count; 1501 ++cctx_count;
1240 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1246 return cctx; 1508 return cctx;
1247} 1509}
1248 1510
1249/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1250static coro_cctx * 1512static coro_cctx *
1251cctx_new_empty () 1513cctx_new_empty (void)
1252{ 1514{
1253 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1254 1516
1255 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1256 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1257 1519
1258 return cctx; 1520 return cctx;
1259} 1521}
1260 1522
1261/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1262static coro_cctx * 1524static coro_cctx *
1263cctx_new_run () 1525cctx_new_run (void)
1264{ 1526{
1265 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1266 void *stack_start;
1267 size_t stack_size;
1268 1528
1269#if HAVE_MMAP 1529 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1270 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1271 /* mmap supposedly does allocate-on-write for us */
1272 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1273
1274 if (cctx->sptr != (void *)-1)
1275 {
1276 #if CORO_STACKGUARD
1277 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1278 #endif
1279 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1280 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1281 cctx->flags |= CC_MAPPED;
1282 } 1530 {
1283 else
1284#endif
1285 {
1286 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1287 New (0, cctx->sptr, cctx_stacksize, long);
1288
1289 if (!cctx->sptr)
1290 {
1291 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1292 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1293 }
1294
1295 stack_start = cctx->sptr;
1296 stack_size = cctx->ssize;
1297 } 1533 }
1298 1534
1299 #if CORO_USE_VALGRIND
1300 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1301 #endif
1302
1303 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1304 1536
1305 return cctx; 1537 return cctx;
1306} 1538}
1307 1539
1308static void 1540static void
1309cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1310{ 1542{
1311 if (!cctx) 1543 if (!cctx)
1312 return; 1544 return;
1313 1545
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1315 1547
1316 --cctx_count; 1548 --cctx_count;
1317 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1318 1550
1319 /* coro_transfer creates new, empty cctx's */ 1551 coro_stack_free (&cctx->stack);
1320 if (cctx->sptr)
1321 {
1322 #if CORO_USE_VALGRIND
1323 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1324 #endif
1325
1326#if HAVE_MMAP
1327 if (cctx->flags & CC_MAPPED)
1328 munmap (cctx->sptr, cctx->ssize);
1329 else
1330#endif
1331 Safefree (cctx->sptr);
1332 }
1333 1552
1334 Safefree (cctx); 1553 Safefree (cctx);
1335} 1554}
1336 1555
1337/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1338#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1557#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1339 1558
1340static coro_cctx * 1559static coro_cctx *
1341cctx_get (pTHX) 1560cctx_get (pTHX)
1342{ 1561{
1343 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1344 { 1563 {
1345 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1346 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1347 --cctx_idle; 1566 --cctx_idle;
1348 1567
1349 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1350 return cctx; 1569 return cctx;
1351 1570
1352 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1353 } 1572 }
1354 1573
… …
1356} 1575}
1357 1576
1358static void 1577static void
1359cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1360{ 1579{
1361 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1362 1581
1363 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1364 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1365 { 1584 {
1366 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1367 cctx_first = first->next; 1586 cctx_first = first->next;
1368 --cctx_idle; 1587 --cctx_idle;
1369 1588
… …
1380static void 1599static void
1381transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1382{ 1601{
1383 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1384 1603
1385 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1386 { 1605 {
1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1388 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1389 1608
1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1391 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1392 1611
1393#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1394 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1395 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1614 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1396#endif 1615#endif
1397 } 1616 }
1398} 1617}
1399 1618
1400/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1401static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1403{ 1622{
1404 dSTACKLEVEL; 1623 dSTACKLEVEL;
1405 1624
1406 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1407 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1408 { 1627 {
1409 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1410 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1629 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1411 } 1630 }
1412 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1413 { 1632 {
1414 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1415 1634
1416 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1417 { 1636 {
1418 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1419 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1420 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1421 } 1640 }
… …
1424 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1425 1644
1426 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1427 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1428 1647
1429 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1430 { 1649 {
1431 /* need to start coroutine */ 1650 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1652 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1653 init_perl (aTHX_ next);
1435 } 1654 }
1436 else 1655 else
1437 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1438 1657
1439 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1440 if (expect_true ( 1659 if (ecb_expect_true (
1441 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1442 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1443 && !force_cctx 1662 && !force_cctx
1444 )) 1663 ))
1445 { 1664 {
1446 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1665 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1447 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1666 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1448 1667
1449 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1668 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1450 /* without this the next cctx_get might destroy the running cctx while still in use */ 1669 /* without this the next cctx_get might destroy the running cctx while still in use */
1451 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1452 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1453 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1454 1673
1455 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1456 } 1675 }
1457 else 1676 else
1458 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1459 1678
1460 ++next->usecount; 1679 ++next->usecount;
1461 1680
1462 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1464 1683
1465 next->cctx = 0; 1684 next->cctx = 0;
1466 1685
1467 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1468 { 1687 {
1469 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1470 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1472 } 1691 }
… …
1478#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1697#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1479#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1480 1699
1481/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1482 1701
1702/* this function is actually Coro, not Coro::State, but we call it from here */
1703/* because it is convenient - but it hasn't been declared yet for that reason */
1483static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1484coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1485{ 1709{
1486 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1487 return 0; 1711 return;
1488 1712
1489 if (coro->on_destroy)
1490 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1491 1714
1492 coro->flags |= CF_DESTROYED; 1715 coro->flags |= CF_ZOMBIE;
1493 1716
1494 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1495 { 1718 {
1496 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1497 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1498 --coro_nready; 1721 --coro_nready;
1499 } 1722 }
1500 else 1723 else
1501 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1502 1729
1503 if (coro->mainstack 1730 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1505 && coro->slot 1732 && coro->slot
1506 && !PL_dirty) 1733 && !PL_dirty)
1507 {
1508 struct coro *current = SvSTATE_current;
1509
1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1511
1512 save_perl (aTHX_ current);
1513 load_perl (aTHX_ coro);
1514
1515 coro_destruct_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1735
1522 cctx_destroy (coro->cctx); 1736 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1739 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1526 1741
1527 if (coro->next) coro->next->prev = coro->prev; 1742 coro_call_on_destroy (aTHX_ coro);
1528 if (coro->prev) coro->prev->next = coro->next;
1529 if (coro == coro_first) coro_first = coro->next;
1530 1743
1531 return 1; 1744 /* more destruction mayhem in coro_state_free */
1532} 1745}
1533 1746
1534static int 1747static int
1535coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1536{ 1749{
1537 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1538 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1539 1752
1540 coro->hv = 0;
1541
1542 if (--coro->refcnt < 0)
1543 {
1544 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1545 Safefree (coro); 1757 Safefree (coro);
1546 }
1547 1758
1548 return 0; 1759 return 0;
1549} 1760}
1550 1761
1551static int 1762static int ecb_cold
1552coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1553{ 1764{
1554 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1555 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1556 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1557 1769
1558 return 0; 1770 return 0;
1559} 1771}
1560 1772
1561static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1584 1796
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1797 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1587} 1799}
1588 1800
1589/*****************************************************************************/
1590/* gensub: simple closure generation utility */
1591
1592#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1593
1594/* create a closure from XS, returns a code reference */
1595/* the arg can be accessed via GENSUB_ARG from the callback */
1596/* the callback must use dXSARGS/XSRETURN */
1597static SV *
1598gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1599{
1600 CV *cv = (CV *)newSV (0);
1601
1602 sv_upgrade ((SV *)cv, SVt_PVCV);
1603
1604 CvANON_on (cv);
1605 CvISXSUB_on (cv);
1606 CvXSUB (cv) = xsub;
1607 GENSUB_ARG = arg;
1608
1609 return newRV_noinc ((SV *)cv);
1610}
1611
1612/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1613 1802
1614INLINE void 1803ecb_inline void
1615coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1616{ 1805{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1807
1620INLINE SV * 1808 SvREFCNT_inc_NN (coro->hv);
1809
1810 coro->next_ready = 0;
1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1812 ready [1] = coro;
1813}
1814
1815ecb_inline struct coro *
1621coro_deq (pTHX) 1816coro_deq (pTHX)
1622{ 1817{
1623 int prio; 1818 int prio;
1624 1819
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1821 {
1627 return av_shift (coro_ready [prio]); 1822 struct coro **ready = coro_ready [prio];
1823
1824 if (ready [0])
1825 {
1826 struct coro *coro = ready [0];
1827 ready [0] = coro->next_ready;
1828 return coro;
1829 }
1830 }
1628 1831
1629 return 0; 1832 return 0;
1833}
1834
1835static void
1836invoke_sv_ready_hook_helper (void)
1837{
1838 dTHX;
1839 dSP;
1840
1841 ENTER;
1842 SAVETMPS;
1843
1844 PUSHMARK (SP);
1845 PUTBACK;
1846 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1847
1848 FREETMPS;
1849 LEAVE;
1630} 1850}
1631 1851
1632static int 1852static int
1633api_ready (pTHX_ SV *coro_sv) 1853api_ready (pTHX_ SV *coro_sv)
1634{ 1854{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1855 struct coro *coro = SvSTATE (coro_sv);
1640 1856
1641 if (coro->flags & CF_READY) 1857 if (coro->flags & CF_READY)
1642 return 0; 1858 return 0;
1643 1859
1644 coro->flags |= CF_READY; 1860 coro->flags |= CF_READY;
1645 1861
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1862 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1863
1652 if (sv_hook) 1864 if (!coro_nready++)
1653 { 1865 if (coroapi.readyhook)
1654 dSP; 1866 coroapi.readyhook ();
1655
1656 ENTER;
1657 SAVETMPS;
1658
1659 PUSHMARK (SP);
1660 PUTBACK;
1661 call_sv (sv_hook, G_VOID | G_DISCARD);
1662
1663 FREETMPS;
1664 LEAVE;
1665 }
1666
1667 if (xs_hook)
1668 xs_hook ();
1669 1867
1670 return 1; 1868 return 1;
1671} 1869}
1672 1870
1673static int 1871static int
… …
1675{ 1873{
1676 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1677} 1875}
1678 1876
1679/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1680INLINE void 1878ecb_inline void
1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1682{ 1880{
1683 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1684 1882
1685 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1696static void 1894static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1895prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1896{
1699 for (;;) 1897 for (;;)
1700 { 1898 {
1701 SV *next_sv = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1702 1900
1703 if (expect_true (next_sv)) 1901 if (ecb_expect_true (next))
1704 { 1902 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1905 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1906 else
1711 { 1907 {
1712 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1713 --coro_nready; 1909 --coro_nready;
1714 1910
… …
1720 { 1916 {
1721 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1724 { 1920 {
1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1940
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 1943 --coro_nready;
1728 } 1944 }
1729 else 1945 else
1730 { 1946 {
1947 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 1948 dSP;
1732 1949
1733 ENTER; 1950 ENTER;
1734 SAVETMPS; 1951 SAVETMPS;
1735 1952
… …
1742 } 1959 }
1743 } 1960 }
1744 } 1961 }
1745} 1962}
1746 1963
1747INLINE void 1964ecb_inline void
1748prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1749{ 1966{
1750 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1751 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1752} 1969}
1753 1970
1754INLINE void 1971ecb_inline void
1755prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1756{ 1973{
1757 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1758 1975
1759 if (coro_nready) 1976 if (coro_nready)
… …
1789{ 2006{
1790 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1791 2008
1792 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1793 2010
1794 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1795 { 2012 {
1796 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1797 return 1; 2014 return 1;
1798 } 2015 }
1799 else 2016 else
… …
1842 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
1843 } 2060 }
1844} 2061}
1845 2062
1846static void 2063static void
2064coro_push_av (pTHX_ AV *av, I32 gimme_v)
2065{
2066 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2067 {
2068 dSP;
2069
2070 if (gimme_v == G_SCALAR)
2071 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2072 else
2073 {
2074 int i;
2075 EXTEND (SP, AvFILLp (av) + 1);
2076
2077 for (i = 0; i <= AvFILLp (av); ++i)
2078 PUSHs (AvARRAY (av)[i]);
2079 }
2080
2081 PUTBACK;
2082 }
2083}
2084
2085static void
2086coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2087{
2088 if (!coro->on_destroy)
2089 coro->on_destroy = newAV ();
2090
2091 av_push (coro->on_destroy, cb);
2092}
2093
2094static void
2095slf_destroy_join (pTHX_ struct CoroSLF *frame)
2096{
2097 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2098}
2099
2100static int
2101slf_check_join (pTHX_ struct CoroSLF *frame)
2102{
2103 struct coro *coro = (struct coro *)frame->data;
2104
2105 if (!coro->status)
2106 return 1;
2107
2108 frame->destroy = 0;
2109
2110 coro_push_av (aTHX_ coro->status, GIMME_V);
2111
2112 SvREFCNT_dec ((SV *)coro->hv);
2113
2114 return 0;
2115}
2116
2117static void
2118slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{
2120 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2121
2122 if (items > 1)
2123 croak ("join called with too many arguments");
2124
2125 if (coro->status)
2126 frame->prepare = prepare_nop;
2127 else
2128 {
2129 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2130 frame->prepare = prepare_schedule;
2131 }
2132
2133 frame->check = slf_check_join;
2134 frame->destroy = slf_destroy_join;
2135 frame->data = (void *)coro;
2136 SvREFCNT_inc (coro->hv);
2137}
2138
2139static void
1847coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
1848{ 2141{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851 2143
1852 if (on_destroyp) 2144 if (!od)
1853 { 2145 return;
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1855 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
1856 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
1857 { 2158 {
1858 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy);
1860
1861 PUSHMARK (SP); 2160 PUSHMARK (SP);
1862 2161
1863 if (statusp) 2162 if (coro->status)
1864 { 2163 {
1865 int i; 2164 PUTBACK;
1866 AV *status = (AV *)SvRV (*statusp); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
1867 EXTEND (SP, AvFILLp (status) + 1); 2166 SPAGAIN;
1868
1869 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]);
1871 } 2167 }
1872 2168
1873 PUTBACK; 2169 PUTBACK;
1874 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
1875 } 2171 }
1876 } 2172 }
1877} 2173}
1878 2174
1879static void 2175static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1881{ 2177{
2178 AV *av;
2179
2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
2187
2188 /* items are actually not so common, so optimise for this case */
2189 if (items)
2190 {
1882 int i; 2191 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV ();
1885 2192
1886 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2194
1887 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2197 }
2198}
1889 2199
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
1891 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2203 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
1894 2205
1895 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
1897 2208
1898 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
1899 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
1900 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed.
2258 * besides, I can't get the slow-but-safe version working...
2259 */
2260 slf_frame.data = 0;
2261 self->flags |= CF_NOCANCEL;
2262 coro_state_destroy (aTHX_ coro);
2263 self->flags &= ~CF_NOCANCEL;
2264
2265 if (slf_frame.data)
2266 {
2267 /* while we were busy we have been cancelled, so terminate */
2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2269 }
2270 else
2271 {
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 }
2276}
2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
1901} 2315}
1902 2316
1903/*****************************************************************************/ 2317/*****************************************************************************/
1904/* async pool handler */ 2318/* async pool handler */
1905 2319
… …
1936slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1937{ 2351{
1938 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
1939 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
1940 2354
1941 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
1942 { 2356 {
1943 /* subsequent iteration */ 2357 /* subsequent iteration */
1944 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1945 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
1946 2360
1947 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1948 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1949 { 2363 {
1950 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1951 coro->invoke_av = newAV (); 2365 return;
1952
1953 frame->prepare = prepare_nop;
1954 } 2366 }
1955 else 2367 else
1956 { 2368 {
1957 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
1958 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1983 2395
1984static void 2396static void
1985coro_rouse_callback (pTHX_ CV *cv) 2397coro_rouse_callback (pTHX_ CV *cv)
1986{ 2398{
1987 dXSARGS; 2399 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2400 SV *data = (SV *)S_GENSUB_ARG;
1989 2401
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2402 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2403 {
1992 /* first call, set args */ 2404 /* first call, set args */
2405 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2406 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2407
1996 SvRV_set (data, (SV *)av); 2408 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2409
2000 /* better take a full copy of the arguments */ 2410 /* better take a full copy of the arguments */
2001 while (items--) 2411 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2412 av_store (av, items, newSVsv (ST (items)));
2413
2414 api_ready (aTHX_ coro);
2415 SvREFCNT_dec (coro);
2003 } 2416 }
2004 2417
2005 XSRETURN_EMPTY; 2418 XSRETURN_EMPTY;
2006} 2419}
2007 2420
2008static int 2421static int
2009slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2010{ 2423{
2011 SV *data = (SV *)frame->data; 2424 SV *data = (SV *)frame->data;
2012 2425
2013 if (CORO_THROW) 2426 if (CORO_THROW)
2014 return 0; 2427 return 0;
2015 2428
2016 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2429 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2017 return 1; 2430 return 1;
… …
2024 2437
2025 EXTEND (SP, AvFILLp (av) + 1); 2438 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2439 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2440 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2441
2029 /* we have stolen the elements, so ste length to zero and free */ 2442 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2443 AvFILLp (av) = -1;
2031 av_undef (av); 2444 av_undef (av);
2032 2445
2033 PUTBACK; 2446 PUTBACK;
2034 } 2447 }
… …
2053 cb = sv_2mortal (coro->rouse_cb); 2466 cb = sv_2mortal (coro->rouse_cb);
2054 coro->rouse_cb = 0; 2467 coro->rouse_cb = 0;
2055 } 2468 }
2056 2469
2057 if (!SvROK (cb) 2470 if (!SvROK (cb)
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2471 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2473 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2474
2062 { 2475 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2477 SV *data = (SV *)S_GENSUB_ARG;
2065 2478
2066 frame->data = (void *)data; 2479 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2480 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2481 frame->check = slf_check_rouse_wait;
2069 } 2482 }
… …
2073coro_new_rouse_cb (pTHX) 2486coro_new_rouse_cb (pTHX)
2074{ 2487{
2075 HV *hv = (HV *)SvRV (coro_current); 2488 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2489 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2490 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2491 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2492
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2493 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2494 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2495
2083 SvREFCNT_dec (coro->rouse_cb); 2496 SvREFCNT_dec (coro->rouse_cb);
… …
2180static void 2593static void
2181slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{ 2595{
2183 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2184 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 struct CoroSLF frame = coro->slf_frame;
2605
2606 /*
2607 * The on_destroy below most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions.
2611 */
2612 coro->slf_frame.prepare = 0;
2613
2614 /* this callback is reserved for slf functions needing to do cleanup */
2615 if (frame.destroy && frame.prepare && !PL_dirty)
2616 frame.destroy (aTHX_ &frame);
2185} 2617}
2186 2618
2187/* 2619/*
2188 * these not obviously related functions are all rolled into one 2620 * these not obviously related functions are all rolled into one
2189 * function to increase chances that they all will call transfer with the same 2621 * function to increase chances that they all will call transfer with the same
… …
2196 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2628 I32 checkmark; /* mark SP to see how many elements check has pushed */
2197 2629
2198 /* set up the slf frame, unless it has already been set-up */ 2630 /* set up the slf frame, unless it has already been set-up */
2199 /* the latter happens when a new coro has been started */ 2631 /* the latter happens when a new coro has been started */
2200 /* or when a new cctx was attached to an existing coroutine */ 2632 /* or when a new cctx was attached to an existing coroutine */
2201 if (expect_true (!slf_frame.prepare)) 2633 if (ecb_expect_true (!slf_frame.prepare))
2202 { 2634 {
2203 /* first iteration */ 2635 /* first iteration */
2204 dSP; 2636 dSP;
2205 SV **arg = PL_stack_base + TOPMARK + 1; 2637 SV **arg = PL_stack_base + TOPMARK + 1;
2206 int items = SP - arg; /* args without function object */ 2638 int items = SP - arg; /* args without function object */
… …
2247 while (slf_frame.check (aTHX_ &slf_frame)); 2679 while (slf_frame.check (aTHX_ &slf_frame));
2248 2680
2249 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2681 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2250 2682
2251 /* exception handling */ 2683 /* exception handling */
2252 if (expect_false (CORO_THROW)) 2684 if (ecb_expect_false (CORO_THROW))
2253 { 2685 {
2254 SV *exception = sv_2mortal (CORO_THROW); 2686 SV *exception = sv_2mortal (CORO_THROW);
2255 2687
2256 CORO_THROW = 0; 2688 CORO_THROW = 0;
2257 sv_setsv (ERRSV, exception); 2689 sv_setsv (ERRSV, exception);
2258 croak (0); 2690 croak (0);
2259 } 2691 }
2260 2692
2261 /* return value handling - mostly like entersub */ 2693 /* return value handling - mostly like entersub */
2262 /* make sure we put something on the stack in scalar context */ 2694 /* make sure we put something on the stack in scalar context */
2263 if (GIMME_V == G_SCALAR) 2695 if (GIMME_V == G_SCALAR
2696 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2264 { 2697 {
2265 dSP; 2698 dSP;
2266 SV **bot = PL_stack_base + checkmark; 2699 SV **bot = PL_stack_base + checkmark;
2267 2700
2268 if (sp == bot) /* too few, push undef */ 2701 if (sp == bot) /* too few, push undef */
2269 bot [1] = &PL_sv_undef; 2702 bot [1] = &PL_sv_undef;
2270 else if (sp != bot + 1) /* too many, take last one */ 2703 else /* too many, take last one */
2271 bot [1] = *sp; 2704 bot [1] = *sp;
2272 2705
2273 SP = bot + 1; 2706 SP = bot + 1;
2274 2707
2275 PUTBACK; 2708 PUTBACK;
… …
2308 if (PL_op->op_flags & OPf_STACKED) 2741 if (PL_op->op_flags & OPf_STACKED)
2309 { 2742 {
2310 if (items > slf_arga) 2743 if (items > slf_arga)
2311 { 2744 {
2312 slf_arga = items; 2745 slf_arga = items;
2313 free (slf_argv); 2746 Safefree (slf_argv);
2314 slf_argv = malloc (slf_arga * sizeof (SV *)); 2747 New (0, slf_argv, slf_arga, SV *);
2315 } 2748 }
2316 2749
2317 slf_argc = items; 2750 slf_argc = items;
2318 2751
2319 for (i = 0; i < items; ++i) 2752 for (i = 0; i < items; ++i)
… …
2382{ 2815{
2383 PerlIOBuf base; 2816 PerlIOBuf base;
2384 NV next, every; 2817 NV next, every;
2385} PerlIOCede; 2818} PerlIOCede;
2386 2819
2387static IV 2820static IV ecb_cold
2388PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2821PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2389{ 2822{
2390 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2823 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2391 2824
2392 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2825 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2393 self->next = nvtime () + self->every; 2826 self->next = nvtime () + self->every;
2394 2827
2395 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2828 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2396} 2829}
2397 2830
2398static SV * 2831static SV * ecb_cold
2399PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2832PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2400{ 2833{
2401 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2834 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2402 2835
2403 return newSVnv (self->every); 2836 return newSVnv (self->every);
… …
2454/* Coro::Semaphore & Coro::Signal */ 2887/* Coro::Semaphore & Coro::Signal */
2455 2888
2456static SV * 2889static SV *
2457coro_waitarray_new (pTHX_ int count) 2890coro_waitarray_new (pTHX_ int count)
2458{ 2891{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2892 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 2893 AV *av = newAV ();
2461 SV **ary; 2894 SV **ary;
2462 2895
2463 /* unfortunately, building manually saves memory */ 2896 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 2897 Newx (ary, 2, SV *);
… …
2515 SvREFCNT_dec (cb); 2948 SvREFCNT_dec (cb);
2516 } 2949 }
2517} 2950}
2518 2951
2519static void 2952static void
2520coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2953coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2521{ 2954{
2522 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2955 /* call $sem->adjust (0) to possibly wake up some other waiters */
2523 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2956 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2524} 2957}
2525 2958
2526static int 2959static int
2527slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2960slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2528{ 2961{
2529 AV *av = (AV *)frame->data; 2962 AV *av = (AV *)frame->data;
2530 SV *count_sv = AvARRAY (av)[0]; 2963 SV *count_sv = AvARRAY (av)[0];
2964 SV *coro_hv = SvRV (coro_current);
2965
2966 frame->destroy = 0;
2531 2967
2532 /* if we are about to throw, don't actually acquire the lock, just throw */ 2968 /* if we are about to throw, don't actually acquire the lock, just throw */
2533 if (CORO_THROW) 2969 if (ecb_expect_false (CORO_THROW))
2970 {
2971 /* we still might be responsible for the semaphore, so wake up others */
2972 coro_semaphore_adjust (aTHX_ av, 0);
2973
2534 return 0; 2974 return 0;
2975 }
2535 else if (SvIVX (count_sv) > 0) 2976 else if (SvIVX (count_sv) > 0)
2536 { 2977 {
2537 SvSTATE_current->on_destroy = 0;
2538
2539 if (acquire) 2978 if (acquire)
2540 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2979 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2541 else 2980 else
2542 coro_semaphore_adjust (aTHX_ av, 0); 2981 coro_semaphore_adjust (aTHX_ av, 0);
2543 2982
… …
2547 { 2986 {
2548 int i; 2987 int i;
2549 /* if we were woken up but can't down, we look through the whole */ 2988 /* if we were woken up but can't down, we look through the whole */
2550 /* waiters list and only add us if we aren't in there already */ 2989 /* waiters list and only add us if we aren't in there already */
2551 /* this avoids some degenerate memory usage cases */ 2990 /* this avoids some degenerate memory usage cases */
2552 2991 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2553 for (i = 1; i <= AvFILLp (av); ++i)
2554 if (AvARRAY (av)[i] == SvRV (coro_current)) 2992 if (AvARRAY (av)[i] == coro_hv)
2555 return 1; 2993 return 1;
2556 2994
2557 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2995 av_push (av, SvREFCNT_inc (coro_hv));
2558 return 1; 2996 return 1;
2559 } 2997 }
2560} 2998}
2561 2999
2562static int 3000static int
… …
2585 { 3023 {
2586 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3024 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2587 3025
2588 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3026 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2589 frame->prepare = prepare_schedule; 3027 frame->prepare = prepare_schedule;
2590
2591 /* to avoid race conditions when a woken-up coro gets terminated */ 3028 /* to avoid race conditions when a woken-up coro gets terminated */
2592 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3029 /* we arrange for a temporary on_destroy that calls adjust (0) */
2593 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3030 frame->destroy = coro_semaphore_destroy;
2594 } 3031 }
2595} 3032}
2596 3033
2597static void 3034static void
2598slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3035slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2606{ 3043{
2607 if (items >= 2) 3044 if (items >= 2)
2608 { 3045 {
2609 /* callback form */ 3046 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 3047 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3048 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 3049
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3050 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 3051
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 3052 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 3053 coro_semaphore_adjust (aTHX_ av, 0);
2617 3054
2618 frame->prepare = prepare_nop; 3055 frame->prepare = prepare_nop;
… …
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 3079 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 3080 AvARRAY (av)[1] = cb;
2644 3081
2645 cb = av_shift (av); 3082 cb = av_shift (av);
2646 3083
3084 if (SvTYPE (cb) == SVt_PVCV)
3085 {
3086 dSP;
3087 PUSHMARK (SP);
3088 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3089 PUTBACK;
3090 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3091 }
3092 else
3093 {
2647 api_ready (aTHX_ cb); 3094 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 3095 sv_setiv (cb, 0); /* signal waiter */
3096 }
3097
2649 SvREFCNT_dec (cb); 3098 SvREFCNT_dec (cb);
2650 3099
2651 --count; 3100 --count;
2652 } 3101 }
2653} 3102}
… …
2662static void 3111static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3112slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 3113{
2665 AV *av = (AV *)SvRV (arg [0]); 3114 AV *av = (AV *)SvRV (arg [0]);
2666 3115
3116 if (items >= 2)
3117 {
3118 SV *cb_cv = s_get_cv_croak (arg [1]);
3119 av_push (av, SvREFCNT_inc_NN (cb_cv));
3120
2667 if (SvIVX (AvARRAY (av)[0])) 3121 if (SvIVX (AvARRAY (av)[0]))
3122 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3123
3124 frame->prepare = prepare_nop;
3125 frame->check = slf_check_nop;
3126 }
3127 else if (SvIVX (AvARRAY (av)[0]))
2668 { 3128 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 3129 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 3130 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 3131 frame->check = slf_check_nop;
2672 } 3132 }
2673 else 3133 else
2674 { 3134 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3135 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 3136
2677 av_push (av, waiter); 3137 av_push (av, waiter);
2678 3138
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3139 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 3140 frame->prepare = prepare_schedule;
… …
2698 3158
2699static void 3159static void
2700coro_aio_callback (pTHX_ CV *cv) 3160coro_aio_callback (pTHX_ CV *cv)
2701{ 3161{
2702 dXSARGS; 3162 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 3163 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 3164 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 3165 SV *data_sv = newSV (sizeof (struct io_state));
2706 3166
2707 av_extend (state, items - 1); 3167 av_extend (state, items - 1);
2708 3168
… …
2744 /* it quickly returns */ 3204 /* it quickly returns */
2745 if (CORO_THROW) 3205 if (CORO_THROW)
2746 return 0; 3206 return 0;
2747 3207
2748 /* one element that is an RV? repeat! */ 3208 /* one element that is an RV? repeat! */
2749 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3209 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2750 return 1; 3210 return 1;
2751 3211
2752 /* restore status */ 3212 /* restore status */
2753 { 3213 {
2754 SV *data_sv = av_pop (state); 3214 SV *data_sv = av_pop (state);
… …
2793 dSP; 3253 dSP;
2794 3254
2795 static SV *prio_cv; 3255 static SV *prio_cv;
2796 static SV *prio_sv; 3256 static SV *prio_sv;
2797 3257
2798 if (expect_false (!prio_cv)) 3258 if (ecb_expect_false (!prio_cv))
2799 { 3259 {
2800 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3260 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2801 prio_sv = newSViv (0); 3261 prio_sv = newSViv (0);
2802 } 3262 }
2803 3263
… …
2822 3282
2823 for (i = 0; i < items; ++i) 3283 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 3284 PUSHs (arg [i]);
2825 3285
2826 /* now push the callback closure */ 3286 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3287 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 3288
2829 /* now call the AIO function - we assume our request is uncancelable */ 3289 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 3290 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 3291 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 3292 }
2833 3293
2834 /* now that the requets is going, we loop toll we have a result */ 3294 /* now that the request is going, we loop till we have a result */
2835 frame->data = (void *)state; 3295 frame->data = (void *)state;
2836 frame->prepare = prepare_schedule; 3296 frame->prepare = prepare_schedule;
2837 frame->check = slf_check_aio_req; 3297 frame->check = slf_check_aio_req;
2838} 3298}
2839 3299
… …
2849 3309
2850/*****************************************************************************/ 3310/*****************************************************************************/
2851 3311
2852#if CORO_CLONE 3312#if CORO_CLONE
2853# include "clone.c" 3313# include "clone.c"
3314#endif
3315
3316/*****************************************************************************/
3317
3318static SV *
3319coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3320{
3321 SV *coro_sv;
3322 struct coro *coro;
3323 MAGIC *mg;
3324 HV *hv;
3325 SV *cb;
3326 int i;
3327
3328 if (argc > 0)
3329 {
3330 cb = s_get_cv_croak (argv [0]);
3331
3332 if (!is_coro)
3333 {
3334 if (CvISXSUB (cb))
3335 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3336
3337 if (!CvROOT (cb))
3338 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3339 }
3340 }
3341
3342 Newz (0, coro, 1, struct coro);
3343 coro->args = newAV ();
3344 coro->flags = CF_NEW;
3345
3346 if (coro_first) coro_first->prev = coro;
3347 coro->next = coro_first;
3348 coro_first = coro;
3349
3350 coro->hv = hv = newHV ();
3351 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3352 mg->mg_flags |= MGf_DUP;
3353 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3354
3355 if (argc > 0)
3356 {
3357 av_extend (coro->args, argc + is_coro - 1);
3358
3359 if (is_coro)
3360 {
3361 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3362 cb = (SV *)cv_coro_run;
3363 }
3364
3365 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3366
3367 for (i = 1; i < argc; i++)
3368 av_push (coro->args, newSVsv (argv [i]));
3369 }
3370
3371 return coro_sv;
3372}
3373
3374#ifndef __cplusplus
3375ecb_cold XS(boot_Coro__State);
3376#endif
3377
3378#if CORO_JIT
3379
3380static void ecb_noinline ecb_cold
3381pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3382{
3383 dSP;
3384 AV *av = newAV ();
3385
3386 av_store (av, 3, newSVuv (d));
3387 av_store (av, 2, newSVuv (c));
3388 av_store (av, 1, newSVuv (b));
3389 av_store (av, 0, newSVuv (a));
3390
3391 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3392
3393 PUTBACK;
3394}
3395
3396static void ecb_noinline ecb_cold
3397jit_init (pTHX)
3398{
3399 dSP;
3400 SV *load, *save;
3401 char *map_base;
3402 char *load_ptr, *save_ptr;
3403 STRLEN load_len, save_len, map_len;
3404 int count;
3405
3406 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3407
3408 PUSHMARK (SP);
3409 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3410 #include "state.h"
3411 count = call_pv ("Coro::State::_jit", G_ARRAY);
3412 SPAGAIN;
3413
3414 save = POPs; save_ptr = SvPVbyte (save, save_len);
3415 load = POPs; load_ptr = SvPVbyte (load, load_len);
3416
3417 map_len = load_len + save_len + 16;
3418
3419 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3420
3421 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3422
3423 load_perl_slots = (load_save_perl_slots_type)map_base;
3424 memcpy (map_base, load_ptr, load_len);
3425
3426 map_base += (load_len + 15) & ~15;
3427
3428 save_perl_slots = (load_save_perl_slots_type)map_base;
3429 memcpy (map_base, save_ptr, save_len);
3430
3431 /* we are good citizens and try to make the page read-only, so the evil evil */
3432 /* hackers might have it a bit more difficult */
3433 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3434
3435 PUTBACK;
3436 eval_pv ("undef &Coro::State::_jit", 1);
3437}
3438
2854#endif 3439#endif
2855 3440
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3441MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 3442
2858PROTOTYPES: DISABLE 3443PROTOTYPES: DISABLE
… …
2862#ifdef USE_ITHREADS 3447#ifdef USE_ITHREADS
2863# if CORO_PTHREAD 3448# if CORO_PTHREAD
2864 coro_thx = PERL_GET_CONTEXT; 3449 coro_thx = PERL_GET_CONTEXT;
2865# endif 3450# endif
2866#endif 3451#endif
2867 BOOT_PAGESIZE; 3452 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV;
3457 ERRSV;
2868 3458
2869 cctx_current = cctx_new_empty (); 3459 cctx_current = cctx_new_empty ();
2870 3460
2871 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3461 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2872 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3462 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2912 coroapi.prepare_nop = prepare_nop; 3502 coroapi.prepare_nop = prepare_nop;
2913 coroapi.prepare_schedule = prepare_schedule; 3503 coroapi.prepare_schedule = prepare_schedule;
2914 coroapi.prepare_cede = prepare_cede; 3504 coroapi.prepare_cede = prepare_cede;
2915 coroapi.prepare_cede_notself = prepare_cede_notself; 3505 coroapi.prepare_cede_notself = prepare_cede_notself;
2916 3506
2917 { 3507 time_init (aTHX);
2918 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2919 3508
2920 if (!svp) croak ("Time::HiRes is required");
2921 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2922
2923 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2924 }
2925
2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3509 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3510#if CORO_JIT
3511 PUTBACK;
3512 jit_init (aTHX);
3513 SPAGAIN;
3514#endif
2927} 3515}
2928 3516
2929SV * 3517SV *
2930new (char *klass, ...) 3518new (SV *klass, ...)
2931 ALIAS: 3519 ALIAS:
2932 Coro::new = 1 3520 Coro::new = 1
2933 CODE: 3521 CODE:
2934{ 3522 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3523 OUTPUT:
2936 MAGIC *mg;
2937 HV *hv;
2938 CV *cb;
2939 int i;
2940
2941 if (items > 1)
2942 {
2943 cb = coro_sv_2cv (aTHX_ ST (1));
2944
2945 if (!ix)
2946 {
2947 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2949
2950 if (!CvROOT (cb))
2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2953 }
2954
2955 Newz (0, coro, 1, struct coro);
2956 coro->args = newAV ();
2957 coro->flags = CF_NEW;
2958
2959 if (coro_first) coro_first->prev = coro;
2960 coro->next = coro_first;
2961 coro_first = coro;
2962
2963 coro->hv = hv = newHV ();
2964 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2965 mg->mg_flags |= MGf_DUP;
2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2967
2968 if (items > 1)
2969 {
2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2980 for (i = 2; i < items; i++)
2981 av_push (coro->args, newSVsv (ST (i)));
2982 }
2983}
2984 OUTPUT:
2985 RETVAL 3524 RETVAL
2986 3525
2987void 3526void
2988transfer (...) 3527transfer (...)
2989 PROTOTYPE: $$ 3528 PROTOTYPE: $$
2990 CODE: 3529 CODE:
2991 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3530 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2992
2993bool
2994_destroy (SV *coro_sv)
2995 CODE:
2996 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2997 OUTPUT:
2998 RETVAL
2999
3000void
3001_exit (int code)
3002 PROTOTYPE: $
3003 CODE:
3004 _exit (code);
3005 3531
3006SV * 3532SV *
3007clone (Coro::State coro) 3533clone (Coro::State coro)
3008 CODE: 3534 CODE:
3009{ 3535{
… …
3064void 3590void
3065list () 3591list ()
3066 PROTOTYPE: 3592 PROTOTYPE:
3067 PPCODE: 3593 PPCODE:
3068{ 3594{
3069 struct coro *coro; 3595 struct coro *coro;
3070 for (coro = coro_first; coro; coro = coro->next) 3596 for (coro = coro_first; coro; coro = coro->next)
3071 if (coro->hv) 3597 if (coro->hv)
3072 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3598 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3073} 3599}
3074 3600
… …
3079 CODE: 3605 CODE:
3080{ 3606{
3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3607 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3082 { 3608 {
3083 struct coro *current = SvSTATE_current; 3609 struct coro *current = SvSTATE_current;
3610 struct CoroSLF slf_save;
3084 3611
3085 if (current != coro) 3612 if (current != coro)
3086 { 3613 {
3087 PUTBACK; 3614 PUTBACK;
3088 save_perl (aTHX_ current); 3615 save_perl (aTHX_ current);
3089 load_perl (aTHX_ coro); 3616 load_perl (aTHX_ coro);
3617 /* the coro is most likely in an active SLF call.
3618 * while not strictly required (the code we execute is
3619 * not allowed to call any SLF functions), it's cleaner
3620 * to reinitialise the slf_frame and restore it later.
3621 * This might one day allow us to actually do SLF calls
3622 * from code executed here.
3623 */
3624 slf_save = slf_frame;
3625 slf_frame.prepare = 0;
3090 SPAGAIN; 3626 SPAGAIN;
3091 } 3627 }
3092 3628
3093 PUSHSTACK; 3629 PUSHSTACK;
3094 3630
… …
3104 SPAGAIN; 3640 SPAGAIN;
3105 3641
3106 if (current != coro) 3642 if (current != coro)
3107 { 3643 {
3108 PUTBACK; 3644 PUTBACK;
3645 slf_frame = slf_save;
3109 save_perl (aTHX_ coro); 3646 save_perl (aTHX_ coro);
3110 load_perl (aTHX_ current); 3647 load_perl (aTHX_ current);
3111 SPAGAIN; 3648 SPAGAIN;
3112 } 3649 }
3113 } 3650 }
… …
3118 PROTOTYPE: $ 3655 PROTOTYPE: $
3119 ALIAS: 3656 ALIAS:
3120 is_ready = CF_READY 3657 is_ready = CF_READY
3121 is_running = CF_RUNNING 3658 is_running = CF_RUNNING
3122 is_new = CF_NEW 3659 is_new = CF_NEW
3123 is_destroyed = CF_DESTROYED 3660 is_destroyed = CF_ZOMBIE
3661 is_zombie = CF_ZOMBIE
3124 is_suspended = CF_SUSPENDED 3662 is_suspended = CF_SUSPENDED
3125 CODE: 3663 CODE:
3126 RETVAL = boolSV (coro->flags & ix); 3664 RETVAL = boolSV (coro->flags & ix);
3127 OUTPUT: 3665 OUTPUT:
3128 RETVAL 3666 RETVAL
3129 3667
3130void 3668void
3131throw (Coro::State self, SV *throw = &PL_sv_undef) 3669throw (SV *self, SV *exception = &PL_sv_undef)
3132 PROTOTYPE: $;$ 3670 PROTOTYPE: $;$
3133 CODE: 3671 CODE:
3134{ 3672{
3673 struct coro *coro = SvSTATE (self);
3135 struct coro *current = SvSTATE_current; 3674 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3675 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3137 SvREFCNT_dec (*throwp); 3676 SvREFCNT_dec (*exceptionp);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3677 SvGETMAGIC (exception);
3678 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3679
3680 api_ready (aTHX_ self);
3139} 3681}
3140 3682
3141void 3683void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3684api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3143 PROTOTYPE: $;$ 3685 PROTOTYPE: $;$
… …
3198 3740
3199void 3741void
3200cancel (Coro::State self) 3742cancel (Coro::State self)
3201 CODE: 3743 CODE:
3202 coro_state_destroy (aTHX_ self); 3744 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3745
3746SV *
3747enable_times (int enabled = enable_times)
3748 CODE:
3749{
3750 RETVAL = boolSV (enable_times);
3751
3752 if (enabled != enable_times)
3753 {
3754 enable_times = enabled;
3755
3756 coro_times_update ();
3757 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3758 }
3759}
3760 OUTPUT:
3761 RETVAL
3762
3763void
3764times (Coro::State self)
3765 PPCODE:
3766{
3767 struct coro *current = SvSTATE (coro_current);
3768
3769 if (ecb_expect_false (current == self))
3770 {
3771 coro_times_update ();
3772 coro_times_add (SvSTATE (coro_current));
3773 }
3774
3775 EXTEND (SP, 2);
3776 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3777 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3778
3779 if (ecb_expect_false (current == self))
3780 coro_times_sub (SvSTATE (coro_current));
3781}
3782
3783void
3784swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3785 CODE:
3786{
3787 struct coro *current = SvSTATE_current;
3788
3789 if (current == coro)
3790 SWAP_SVS (current);
3791
3792 if (!coro->swap_sv)
3793 coro->swap_sv = newAV ();
3794
3795 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3796 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3797
3798 if (current == coro)
3799 SWAP_SVS (current);
3800}
3204 3801
3205 3802
3206MODULE = Coro::State PACKAGE = Coro 3803MODULE = Coro::State PACKAGE = Coro
3207 3804
3208BOOT: 3805BOOT:
3209{ 3806{
3210 int i;
3211
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3807 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3808 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3809 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3810 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3217 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3811 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3218 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3812 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3219 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3813 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3814 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221 3815
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3816 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3817 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3818 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3819 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3226 3820
3227 coro_stash = gv_stashpv ("Coro", TRUE); 3821 coro_stash = gv_stashpv ("Coro", TRUE);
3228 3822
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3823 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3824 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3825 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3826 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3827 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3828 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3235
3236 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3237 coro_ready[i] = newAV ();
3238 3829
3239 { 3830 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3831 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 3832
3242 coroapi.schedule = api_schedule; 3833 coroapi.schedule = api_schedule;
… …
3252 sv_setiv (sv, (IV)&coroapi); 3843 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 3844 SvREADONLY_on (sv);
3254 } 3845 }
3255} 3846}
3256 3847
3848SV *
3849async (...)
3850 PROTOTYPE: &@
3851 CODE:
3852 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3853 api_ready (aTHX_ RETVAL);
3854 OUTPUT:
3855 RETVAL
3856
3857void
3858_destroy (Coro::State coro)
3859 CODE:
3860 /* used by the manager thread */
3861 coro_state_destroy (aTHX_ coro);
3862
3863void
3864on_destroy (Coro::State coro, SV *cb)
3865 CODE:
3866 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3867
3868void
3869join (...)
3870 CODE:
3871 CORO_EXECUTE_SLF_XS (slf_init_join);
3872
3257void 3873void
3258terminate (...) 3874terminate (...)
3259 CODE: 3875 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3876 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3877
3878void
3879cancel (...)
3880 CODE:
3881 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3882
3883int
3884safe_cancel (Coro::State self, ...)
3885 C_ARGS: aTHX_ self, &ST (1), items - 1
3261 3886
3262void 3887void
3263schedule (...) 3888schedule (...)
3264 CODE: 3889 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3890 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3294void 3919void
3295_set_readyhook (SV *hook) 3920_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 3921 PROTOTYPE: $
3297 CODE: 3922 CODE:
3298 SvREFCNT_dec (coro_readyhook); 3923 SvREFCNT_dec (coro_readyhook);
3924 SvGETMAGIC (hook);
3925 if (SvOK (hook))
3926 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3927 coro_readyhook = newSVsv (hook);
3928 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3929 }
3930 else
3931 {
3932 coro_readyhook = 0;
3933 CORO_READYHOOK = 0;
3934 }
3300 3935
3301int 3936int
3302prio (Coro::State coro, int newprio = 0) 3937prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 3938 PROTOTYPE: $;$
3304 ALIAS: 3939 ALIAS:
… …
3310 if (items > 1) 3945 if (items > 1)
3311 { 3946 {
3312 if (ix) 3947 if (ix)
3313 newprio = coro->prio - newprio; 3948 newprio = coro->prio - newprio;
3314 3949
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3950 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3951 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 3952
3318 coro->prio = newprio; 3953 coro->prio = newprio;
3319 } 3954 }
3320} 3955}
3321 OUTPUT: 3956 OUTPUT:
… …
3336 RETVAL = coro_nready; 3971 RETVAL = coro_nready;
3337 OUTPUT: 3972 OUTPUT:
3338 RETVAL 3973 RETVAL
3339 3974
3340void 3975void
3976suspend (Coro::State self)
3977 PROTOTYPE: $
3978 CODE:
3979 self->flags |= CF_SUSPENDED;
3980
3981void
3982resume (Coro::State self)
3983 PROTOTYPE: $
3984 CODE:
3985 self->flags &= ~CF_SUSPENDED;
3986
3987void
3341_pool_handler (...) 3988_pool_handler (...)
3342 CODE: 3989 CODE:
3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3990 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3344 3991
3345void 3992void
… …
3356 for (i = 1; i < items; ++i) 4003 for (i = 1; i < items; ++i)
3357 av_push (av, SvREFCNT_inc_NN (ST (i))); 4004 av_push (av, SvREFCNT_inc_NN (ST (i)));
3358 4005
3359 if ((SV *)hv == &PL_sv_undef) 4006 if ((SV *)hv == &PL_sv_undef)
3360 { 4007 {
3361 PUSHMARK (SP); 4008 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3362 EXTEND (SP, 2);
3363 PUSHs (sv_Coro);
3364 PUSHs ((SV *)cv_pool_handler);
3365 PUTBACK;
3366 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3367 SPAGAIN;
3368
3369 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4009 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4010 SvREFCNT_dec (sv);
3370 } 4011 }
3371 4012
3372 { 4013 {
3373 struct coro *coro = SvSTATE_hv (hv); 4014 struct coro *coro = SvSTATE_hv (hv);
3374 4015
… …
3406 on_leave = 1 4047 on_leave = 1
3407 PROTOTYPE: & 4048 PROTOTYPE: &
3408 CODE: 4049 CODE:
3409{ 4050{
3410 struct coro *coro = SvSTATE_current; 4051 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4052 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412 4053
3413 block = (SV *)coro_sv_2cv (aTHX_ block); 4054 block = s_get_cv_croak (block);
3414 4055
3415 if (!*avp) 4056 if (!*avp)
3416 *avp = newAV (); 4057 *avp = newAV ();
3417 4058
3418 av_push (*avp, SvREFCNT_inc (block)); 4059 av_push (*avp, SvREFCNT_inc (block));
3419 4060
3420 if (!ix) 4061 if (!ix)
3421 on_enterleave_call (aTHX_ block); 4062 on_enterleave_call (aTHX_ block);
3422 4063
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4064 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3424 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 4065 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3425 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4066 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3426} 4067}
3427 4068
3428 4069
3429MODULE = Coro::State PACKAGE = PerlIO::cede 4070MODULE = Coro::State PACKAGE = PerlIO::cede
3430 4071
… …
3435MODULE = Coro::State PACKAGE = Coro::Semaphore 4076MODULE = Coro::State PACKAGE = Coro::Semaphore
3436 4077
3437SV * 4078SV *
3438new (SV *klass, SV *count = 0) 4079new (SV *klass, SV *count = 0)
3439 CODE: 4080 CODE:
4081{
4082 int semcnt = 1;
4083
4084 if (count)
4085 {
4086 SvGETMAGIC (count);
4087
4088 if (SvOK (count))
4089 semcnt = SvIV (count);
4090 }
4091
3440 RETVAL = sv_bless ( 4092 RETVAL = sv_bless (
3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4093 coro_waitarray_new (aTHX_ semcnt),
3442 GvSTASH (CvGV (cv)) 4094 GvSTASH (CvGV (cv))
3443 ); 4095 );
4096}
3444 OUTPUT: 4097 OUTPUT:
3445 RETVAL 4098 RETVAL
3446 4099
3447# helper for Coro::Channel and others 4100# helper for Coro::Channel and others
3448SV * 4101SV *
… …
3494 XSRETURN_NO; 4147 XSRETURN_NO;
3495} 4148}
3496 4149
3497void 4150void
3498waiters (SV *self) 4151waiters (SV *self)
3499 PPCODE: 4152 PPCODE:
3500{ 4153{
3501 AV *av = (AV *)SvRV (self); 4154 AV *av = (AV *)SvRV (self);
3502 int wcount = AvFILLp (av) + 1 - 1; 4155 int wcount = AvFILLp (av) + 1 - 1;
3503 4156
3504 if (GIMME_V == G_SCALAR) 4157 if (GIMME_V == G_SCALAR)
… …
3510 for (i = 1; i <= wcount; ++i) 4163 for (i = 1; i <= wcount; ++i)
3511 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4164 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3512 } 4165 }
3513} 4166}
3514 4167
4168MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4169
4170void
4171_may_delete (SV *sem, int count, unsigned int extra_refs)
4172 PPCODE:
4173{
4174 AV *av = (AV *)SvRV (sem);
4175
4176 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4177 && AvFILLp (av) == 0 /* no waiters, just count */
4178 && SvIV (AvARRAY (av)[0]) == count)
4179 XSRETURN_YES;
4180
4181 XSRETURN_NO;
4182}
4183
3515MODULE = Coro::State PACKAGE = Coro::Signal 4184MODULE = Coro::State PACKAGE = Coro::Signal
3516 4185
3517SV * 4186SV *
3518new (SV *klass) 4187new (SV *klass)
3519 CODE: 4188 CODE:
… …
3531 4200
3532void 4201void
3533broadcast (SV *self) 4202broadcast (SV *self)
3534 CODE: 4203 CODE:
3535{ 4204{
3536 AV *av = (AV *)SvRV (self); 4205 AV *av = (AV *)SvRV (self);
3537 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4206 coro_signal_wake (aTHX_ av, AvFILLp (av));
3538} 4207}
3539 4208
3540void 4209void
3541send (SV *self) 4210send (SV *self)
… …
3549 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4218 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3550} 4219}
3551 4220
3552IV 4221IV
3553awaited (SV *self) 4222awaited (SV *self)
3554 CODE: 4223 CODE:
3555 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4224 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3556 OUTPUT: 4225 OUTPUT:
3557 RETVAL 4226 RETVAL
3558 4227
3559 4228
… …
3564 4233
3565void 4234void
3566_schedule (...) 4235_schedule (...)
3567 CODE: 4236 CODE:
3568{ 4237{
3569 static int incede; 4238 static int incede;
3570 4239
3571 api_cede_notself (aTHX); 4240 api_cede_notself (aTHX);
3572 4241
3573 ++incede; 4242 ++incede;
3574 while (coro_nready >= incede && api_cede (aTHX)) 4243 while (coro_nready >= incede && api_cede (aTHX))
… …
3590 4259
3591void 4260void
3592_register (char *target, char *proto, SV *req) 4261_register (char *target, char *proto, SV *req)
3593 CODE: 4262 CODE:
3594{ 4263{
3595 CV *req_cv = coro_sv_2cv (aTHX_ req); 4264 SV *req_cv = s_get_cv_croak (req);
3596 /* newXSproto doesn't return the CV on 5.8 */ 4265 /* newXSproto doesn't return the CV on 5.8 */
3597 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4266 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3598 sv_setpv ((SV *)slf_cv, proto); 4267 sv_setpv ((SV *)slf_cv, proto);
3599 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4268 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3600} 4269}
3601 4270
4271MODULE = Coro::State PACKAGE = Coro::Select
4272
4273void
4274patch_pp_sselect ()
4275 CODE:
4276 if (!coro_old_pp_sselect)
4277 {
4278 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4279 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4280 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4281 }
4282
4283void
4284unpatch_pp_sselect ()
4285 CODE:
4286 if (coro_old_pp_sselect)
4287 {
4288 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4289 coro_old_pp_sselect = 0;
4290 }
4291
4292MODULE = Coro::State PACKAGE = Coro::Util
4293
4294void
4295_exit (int code)
4296 CODE:
4297 _exit (code);
4298
4299NV
4300time ()
4301 CODE:
4302 RETVAL = nvtime (aTHX);
4303 OUTPUT:
4304 RETVAL
4305
4306NV
4307gettimeofday ()
4308 PPCODE:
4309{
4310 UV tv [2];
4311 u2time (aTHX_ tv);
4312 EXTEND (SP, 2);
4313 PUSHs (sv_2mortal (newSVuv (tv [0])));
4314 PUSHs (sv_2mortal (newSVuv (tv [1])));
4315}
4316

Diff Legend

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