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

Diff Legend

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