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.349 by root, Wed Jun 10 00:47:24 2009 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 2013 UTC

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

Diff Legend

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