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.329 by root, Tue Nov 25 20:48:41 2008 UTC vs.
Revision 1.444 by root, Thu May 1 08:09:18 2014 UTC

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

Diff Legend

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