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.358 by root, Mon Jun 29 04:30:25 2009 UTC vs.
Revision 1.442 by root, Tue Mar 4 06:13:24 2014 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
18# undef setjmp 56# undef setjmp
19# undef longjmp 57# undef longjmp
20# undef _exit 58# undef _exit
21# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
22#else 60#else
23# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
24#endif 62#endif
25 63
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
55 66
56#define PERL_VERSION_ATLEAST(a,b,c) \ 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 68# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 69#endif
122 70
123/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
136#endif 84#endif
137 85
138#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
139 87
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 88#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
157 90
158#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
159# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 103# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 104# endif
172#endif 105#endif
173 106
174static 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]);
175 109
176/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
179 114
180static U32 cctx_gen; 115static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
200static SV *sv_pool_size; 135static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 136static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 137static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 138static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 139static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 140
207/* Coro::AnyEvent */ 141/* Coro::AnyEvent */
208static SV *sv_activity; 142static SV *sv_activity;
209 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
210static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
212 152
213enum { 153enum
154{
214 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
215 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
216 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
217 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
218 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
223typedef struct coro_cctx 164typedef struct coro_cctx
224{ 165{
225 struct coro_cctx *next; 166 struct coro_cctx *next;
226 167
227 /* the stack */ 168 /* the stack */
228 void *sptr; 169 struct coro_stack stack;
229 size_t ssize;
230 170
231 /* cpu state */ 171 /* cpu state */
232 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
233 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
234 JMPENV *top_env; 176 JMPENV *top_env;
235 coro_context cctx; 177 coro_context cctx;
236 178
237 U32 gen; 179 U32 gen;
238#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
239 int valgrind_id; 181 int valgrind_id;
240#endif 182#endif
241 unsigned char flags; 183 unsigned char flags;
242} coro_cctx; 184} coro_cctx;
243 185
244coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
245 187
246/*****************************************************************************/ 188/*****************************************************************************/
247 189
190static MGVTBL coro_state_vtbl;
191
248enum { 192enum
193{
249 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
254}; 200};
255 201
256/* 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 */
257typedef struct 203typedef struct
258{ 204{
259 SV *defsv;
260 AV *defav;
261 SV *errsv;
262 SV *irsgv;
263 HV *hinthv;
264#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
265# include "state.h" 206 #include "state.h"
266#undef VAR
267} perl_slots; 207} perl_slots;
268 208
209/* how many context stack entries do we need for perl_slots */
269#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))
270 211
271/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
272struct coro { 213struct coro
214{
273 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
274 coro_cctx *cctx; 216 coro_cctx *cctx;
275 217
276 /* ready queue */ 218 /* ready queue */
277 struct coro *next_ready; 219 struct coro *next_ready;
… …
279 /* state data */ 221 /* state data */
280 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
281 AV *mainstack; 223 AV *mainstack;
282 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
283 225
284 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro);
290 230
291 /* statistics */ 231 /* statistics */
292 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
293 233
294 /* coro process data */ 234 /* coro process data */
295 int prio; 235 int prio;
296 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
297 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 */
298 240
299 /* async_pool */ 241 /* async_pool */
300 SV *saved_deffh; 242 SV *saved_deffh;
301 SV *invoke_cb; 243 SV *invoke_cb;
302 AV *invoke_av; 244 AV *invoke_av;
303 245
304 /* on_enter/on_leave */ 246 /* on_enter/on_leave */
305 AV *on_enter; 247 AV *on_enter;
306 AV *on_leave; 248 AV *on_leave;
307 249
250 /* swap_sv */
251 AV *swap_sv;
252
253 /* times */
254 coro_ts t_cpu, t_real;
255
308 /* linked list */ 256 /* linked list */
309 struct coro *next, *prev; 257 struct coro *next, *prev;
310}; 258};
311 259
312typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
314 262
315/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
319 267
320/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
321 269
322#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
328 276
329/* for Coro.pm */ 277/* for Coro.pm */
330static SV *coro_current; 278static SV *coro_current;
331static SV *coro_readyhook; 279static SV *coro_readyhook;
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
334static struct coro *coro_first; 282static struct coro *coro_first;
335#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
336 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
337/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
338 381
339static SV * 382static SV * ecb_noinline
340coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
341{ 384{
342#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
343 /* 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 */
344 get_sv (name, create); 387 get_sv (name, create);
345#endif 388#endif
346 return get_sv (name, create); 389 return get_sv (name, create);
347} 390}
348 391
349static AV * 392static AV * ecb_noinline
350coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
351{ 394{
352#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_av (name, create); 397 get_av (name, create);
355#endif 398#endif
356 return get_av (name, create); 399 return get_av (name, create);
357} 400}
358 401
359static HV * 402static HV * ecb_noinline
360coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
361{ 404{
362#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
363 /* 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 */
364 get_hv (name, create); 407 get_hv (name, create);
365#endif 408#endif
366 return get_hv (name, create); 409 return get_hv (name, create);
367} 410}
368 411
369/* may croak */ 412ecb_inline void
370INLINE CV * 413coro_times_update (void)
371coro_sv_2cv (pTHX_ SV *sv)
372{ 414{
373 HV *st; 415#ifdef coro_clock_gettime
374 GV *gvp; 416 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 417
377 if (!cv) 418 ts.tv_sec = ts.tv_nsec = 0;
378 croak ("code reference expected"); 419 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
420 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
379 421
380 return cv; 422 ts.tv_sec = ts.tv_nsec = 0;
423 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
424 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
425#else
426 dTHX;
427 UV tv[2];
428
429 u2time (aTHX_ tv);
430 time_real [0] = tv [0];
431 time_real [1] = tv [1] * 1000;
432#endif
433}
434
435ecb_inline void
436coro_times_add (struct coro *c)
437{
438 c->t_real [1] += time_real [1];
439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
440 c->t_real [0] += time_real [0];
441
442 c->t_cpu [1] += time_cpu [1];
443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
444 c->t_cpu [0] += time_cpu [0];
445}
446
447ecb_inline void
448coro_times_sub (struct coro *c)
449{
450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
451 c->t_real [1] -= time_real [1];
452 c->t_real [0] -= time_real [0];
453
454 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
455 c->t_cpu [1] -= time_cpu [1];
456 c->t_cpu [0] -= time_cpu [0];
381} 457}
382 458
383/*****************************************************************************/ 459/*****************************************************************************/
384/* magic glue */ 460/* magic glue */
385 461
386#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 464
389#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
392 : mg_find (sv, type)) 468 : mg_find (sv, type))
393 469
394#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
397 : 0) 473 : 0)
398 474
399#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
400#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
401 477
402INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
403SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
404{ 495{
405 HV *stash;
406 MAGIC *mg; 496 MAGIC *mg;
407 497
408 if (SvROK (coro)) 498 if (SvROK (coro))
409 coro = SvRV (coro); 499 coro = SvRV (coro);
410 500
411 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
412 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
413 504
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
424} 506}
425 507
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427 509
… …
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431 513
432/*****************************************************************************/ 514/*****************************************************************************/
433/* padlist management and caching */ 515/* padlist management and caching */
434 516
435static AV * 517ecb_inline PADLIST *
436coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
437{ 519{
438 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
439 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
440 524
441 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. */
442 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
443#if PERL_VERSION_ATLEAST (5,10,0)
444 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
445#else
446 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
447#endif 554#endif
448 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
449 --AvFILLp (padlist);
450 555
451 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
452 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
453 560
454 return newpadlist; 561 return newpadlist;
455} 562}
456 563
457static void 564ecb_inline void
458free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
459{ 566{
460 /* may be during global destruction */ 567 /* may be during global destruction */
461 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
462 { 569 {
463 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
464 571
465 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
466 { 573 {
467 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
468 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
469 I32 j = AvFILLp (av);
470 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
471 while (j >= 0) 581 while (j >= 0)
472 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
473 583
474 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
475 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
476 } 587 }
477 588
478 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
479 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
480 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
481 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
482 } 599 }
483} 600}
484 601
485static int 602static int
486coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
487{ 604{
488 AV *padlist; 605 PADLIST *padlist;
489 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;
490 608
491 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
493 return; 611 return 0;
494 612
495 /* casting is fun. */ 613 while (len--)
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
498
499 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
500 615
501 return 0; 616 return 0;
502} 617}
503 618
504static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
505 0, 0, 0, 0, 620 0, 0, 0, 0,
506 coro_cv_free 621 coro_cv_free
507}; 622};
508 623
509/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
510static void 625ecb_inline void
511get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
512{ 627{
513 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
514 AV *av; 629 size_t *lenp;
515 630
516 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
517 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
518 else 633 else
519 { 634 {
520#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
521 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
522 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
528 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
529#endif 644#endif
530 } 645 }
531} 646}
532 647
533static void 648ecb_inline void
534put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
535{ 650{
536 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
537 AV *av;
538 652
539 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
540 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);
541 663
542 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
543
544 if (expect_false (AvFILLp (av) >= AvMAX (av)))
545 av_extend (av, AvFILLp (av) + 1);
546
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 665}
549 666
550/** 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))
551 720
552static void 721static void
553on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
554 723
555static void 724static void
… …
558 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
559 c->slot = 0; 728 c->slot = 0;
560 729
561 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
562 731
563 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
564 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
565 GvSV (PL_errgv) = slot->errsv; 734#else
566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
568
569 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
570 # include "state.h" 736 #include "state.h"
571 #undef VAR 737#endif
572 738
573 { 739 {
574 dSP; 740 dSP;
575 741
576 CV *cv; 742 CV *cv;
577 743
578 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
579 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
580 { 746 {
581 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
582 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
583 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
584 } 750 }
585 751
586 PUTBACK; 752 PUTBACK;
587 } 753 }
588 754
589 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 756 CORO_THROW = c->except;
591 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
592 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
593 { 767 {
594 int i; 768 int i;
595 769
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 772 }
773
774 SWAP_SVS (c);
599} 775}
600 776
601static void 777static void
602save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
603{ 779{
780 SWAP_SVS (c);
781
604 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
605 { 783 {
606 int i; 784 int i;
607 785
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
788 }
789
790 times_valid = 0;
791
792 if (ecb_expect_false (enable_times))
793 {
794 coro_times_update (); times_valid = 1;
795 coro_times_add (c);
610 } 796 }
611 797
612 c->except = CORO_THROW; 798 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 799 c->slf_frame = slf_frame;
614 800
… …
625 811
626 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
627 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
628 for (;;) 814 for (;;)
629 { 815 {
630 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
631 { 817 {
632 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
633 819
634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
635 { 821 {
636 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
637 823
638 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
639 { 825 {
640 EXTEND (SP, 3); 826 EXTEND (SP, 3);
641 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
642 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
643 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
646 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
647 } 833 }
648 } 834 }
649 } 835 }
650 836
651 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
652 break; 838 break;
653 839
654 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
655 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
656 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
658 844
659 PUTBACK; 845 PUTBACK;
660 } 846 }
661 847
662 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 850 {
668 int i; 851 unsigned int i;
852
669 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 854 CXINC;
671 } 855
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
673 858
674 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
675 860
676 { 861 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
678 863
679 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
680 slot->defsv = DEFSV; 865 save_perl_slots (slot);
681 slot->errsv = ERRSV; 866#else
682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
684
685 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
686 # include "state.h" 868 #include "state.h"
687 #undef VAR 869#endif
688 } 870 }
689} 871}
690 872
691/* 873/*
692 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
698# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
699#else 881#else
700static void 882static void
701coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
702{ 884{
703 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() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 889
708 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
723#endif 905#endif
724 906
725 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
726 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
727 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
728 913
729 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
730 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
731 PL_savestack_max = 24; 916 PL_savestack_max = 24;
732 917
… …
760 } 945 }
761 946
762 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
763 Safefree (PL_markstack); 948 Safefree (PL_markstack);
764 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
765 Safefree (PL_savestack); 953 Safefree (PL_savestack);
766#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
767 Safefree (PL_retstack); 955 Safefree (PL_retstack);
768#endif 956#endif
769} 957}
… …
815#endif 1003#endif
816 1004
817/* 1005/*
818 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
819 * 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
820 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
821 * readback here. 1009 * we just provide our own readback here.
822 */ 1010 */
823static int 1011static int ecb_cold
824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
825{ 1013{
826 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
827 1015
828 if (*s == '_') 1016 if (*s == '_')
829 { 1017 {
830 SV **svp = 0; 1018 SV **svp = 0;
831 1019
832 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
833 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
834 1022
835 if (svp) 1023 if (svp)
836 { 1024 {
837 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);
838 return 0; 1035 return 0;
839 } 1036 }
840 } 1037 }
841 1038
842 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
843} 1040}
844 1041
845static int 1042static int ecb_cold
846coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
847{ 1044{
848 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
849 1046
850 if (*s == '_') 1047 if (*s == '_')
… …
864 } 1061 }
865 1062
866 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
867} 1064}
868 1065
869static int 1066static int ecb_cold
870coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
871{ 1068{
872 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
873 1070
874 if (*s == '_') 1071 if (*s == '_')
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1104slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1105{
909 return 1; 1106 return 1;
910} 1107}
911 1108
912static UNOP coro_setup_op; 1109static UNOP init_perl_op;
913 1110
914static 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 */
915coro_setup (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
916{ 1113{
917 /* 1114 /*
918 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
919 */ 1116 */
920 coro_init_stacks (aTHX); 1117 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1124 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1125 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1126 PL_curpm = 0;
930 PL_curpad = 0; 1127 PL_curpad = 0;
931 PL_localizing = 0; 1128 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1129 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1130#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1131 PL_parser = 0;
936#endif 1132#endif
937 PL_hints = 0; 1133 PL_hints = 0;
938 1134
939 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
942 1138
943 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
944 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
945 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
946 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);
947 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
967 /* 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
968 * 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.
969 */ 1165 */
970 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 */
971 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;
972 1169
973 /* 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 */
974 coro_setup_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
977 /* 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 */
978 1175
979 PL_op = (OP *)&coro_setup_op; 1176 PL_op = (OP *)&init_perl_op;
980 1177
981 /* copy throw, in case it was set before coro_setup */ 1178 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1180
1181 SWAP_SVS (coro);
1182
1183 if (ecb_expect_false (enable_times))
1184 {
1185 coro_times_update ();
1186 coro_times_sub (coro);
1187 }
983} 1188}
984 1189
985static void 1190static void
986coro_unwind_stacks (pTHX) 1191coro_unwind_stacks (pTHX)
987{ 1192{
… …
1002 dounwind (-1); 1207 dounwind (-1);
1003 } 1208 }
1004} 1209}
1005 1210
1006static void 1211static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
1008{ 1213{
1009 SV *svf [9]; 1214 SV *svf [9];
1010 1215
1011 { 1216 {
1217 SV *old_current = SvRV (coro_current);
1012 struct coro *current = SvSTATE_current; 1218 struct coro *current = SvSTATE (old_current);
1013 1219
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015 1221
1016 save_perl (aTHX_ current); 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
1017 load_perl (aTHX_ coro); 1227 load_perl (aTHX_ coro);
1018 1228
1019 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
1230
1231 /* restore swapped sv's */
1232 SWAP_SVS (coro);
1233
1020 coro_destruct_stacks (aTHX); 1234 coro_destruct_stacks (aTHX);
1021 1235
1022 // now save some sv's to be free'd later 1236 /* now save some sv's to be free'd later */
1023 svf [0] = GvSV (PL_defgv); 1237 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1238 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1239 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv; 1240 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs; 1241 svf [4] = PL_rs;
… …
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1243 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1244 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1245 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1246 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1247
1248 SvRV_set (coro_current, old_current);
1249
1034 load_perl (aTHX_ current); 1250 load_perl (aTHX_ current);
1035 } 1251 }
1036 1252
1037 { 1253 {
1038 int i; 1254 unsigned int i;
1039 1255
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1256 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1257 SvREFCNT_dec (svf [i]);
1042 1258
1043 SvREFCNT_dec (coro->saved_deffh); 1259 SvREFCNT_dec (coro->saved_deffh);
… …
1045 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1046 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1047 } 1263 }
1048} 1264}
1049 1265
1050INLINE void 1266ecb_inline void
1051free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1052{ 1268{
1053 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1054 { 1270 {
1055 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1056 coro_mortal = 0; 1272 coro_mortal = 0;
1057 } 1273 }
1058} 1274}
1059 1275
1060static int 1276static int
… …
1193 1409
1194 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 */
1195} 1411}
1196 1412
1197/* 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 */
1198static void NOINLINE 1414static void ecb_noinline
1199cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1200{ 1416{
1201 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1202 1418
1203 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1214 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1215 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1216} 1432}
1217 1433
1218/* 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 */
1219INLINE void 1435ecb_inline void
1220transfer_tail (pTHX) 1436transfer_tail (pTHX)
1221{ 1437{
1222 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);
1223} 1451}
1224 1452
1225/* 1453/*
1226 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1227 */ 1455 */
… …
1249 /* 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 */
1250 PL_restartop = PL_op; 1478 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1479 perl_run (PL_curinterp);
1252 /* 1480 /*
1253 * 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
1254 * 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.
1255 */ 1484 */
1256 1485
1257 /* 1486 /*
1258 * 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
1259 * 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)
1260 * 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
1261 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * doing in that case. YMMV.
1262 * coroutine as Coro has no such concept.
1263 * This actually isn't valid with the pthread backend, but OSes requiring
1264 * that backend are too broken to do it in a standards-compliant way.
1265 */ 1491 */
1266 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1268 } 1493 }
1269} 1494}
1270 1495
1271static coro_cctx * 1496static coro_cctx *
1272cctx_new () 1497cctx_new (void)
1273{ 1498{
1274 coro_cctx *cctx; 1499 coro_cctx *cctx;
1275 1500
1276 ++cctx_count; 1501 ++cctx_count;
1277 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1283 return cctx; 1508 return cctx;
1284} 1509}
1285 1510
1286/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1287static coro_cctx * 1512static coro_cctx *
1288cctx_new_empty () 1513cctx_new_empty (void)
1289{ 1514{
1290 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1291 1516
1292 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1293 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1294 1519
1295 return cctx; 1520 return cctx;
1296} 1521}
1297 1522
1298/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1299static coro_cctx * 1524static coro_cctx *
1300cctx_new_run () 1525cctx_new_run (void)
1301{ 1526{
1302 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1303 void *stack_start;
1304 size_t stack_size;
1305 1528
1306#if HAVE_MMAP 1529 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1307 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1308 /* mmap supposedly does allocate-on-write for us */
1309 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1310
1311 if (cctx->sptr != (void *)-1)
1312 {
1313 #if CORO_STACKGUARD
1314 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1315 #endif
1316 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1317 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1318 cctx->flags |= CC_MAPPED;
1319 } 1530 {
1320 else
1321#endif
1322 {
1323 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1324 New (0, cctx->sptr, cctx_stacksize, long);
1325
1326 if (!cctx->sptr)
1327 {
1328 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1329 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1330 }
1331
1332 stack_start = cctx->sptr;
1333 stack_size = cctx->ssize;
1334 } 1533 }
1335 1534
1336 #if CORO_USE_VALGRIND
1337 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1338 #endif
1339
1340 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);
1341 1536
1342 return cctx; 1537 return cctx;
1343} 1538}
1344 1539
1345static void 1540static void
1346cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1347{ 1542{
1348 if (!cctx) 1543 if (!cctx)
1349 return; 1544 return;
1350 1545
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1547
1353 --cctx_count; 1548 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1355 1550
1356 /* coro_transfer creates new, empty cctx's */ 1551 coro_stack_free (&cctx->stack);
1357 if (cctx->sptr)
1358 {
1359 #if CORO_USE_VALGRIND
1360 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1361 #endif
1362
1363#if HAVE_MMAP
1364 if (cctx->flags & CC_MAPPED)
1365 munmap (cctx->sptr, cctx->ssize);
1366 else
1367#endif
1368 Safefree (cctx->sptr);
1369 }
1370 1552
1371 Safefree (cctx); 1553 Safefree (cctx);
1372} 1554}
1373 1555
1374/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1375#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))
1376 1558
1377static coro_cctx * 1559static coro_cctx *
1378cctx_get (pTHX) 1560cctx_get (pTHX)
1379{ 1561{
1380 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1381 { 1563 {
1382 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1383 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1384 --cctx_idle; 1566 --cctx_idle;
1385 1567
1386 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1387 return cctx; 1569 return cctx;
1388 1570
1389 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1390 } 1572 }
1391 1573
… …
1393} 1575}
1394 1576
1395static void 1577static void
1396cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1397{ 1579{
1398 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));
1399 1581
1400 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1401 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1402 { 1584 {
1403 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1404 cctx_first = first->next; 1586 cctx_first = first->next;
1405 --cctx_idle; 1587 --cctx_idle;
1406 1588
… …
1417static void 1599static void
1418transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1419{ 1601{
1420 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1421 1603
1422 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1423 { 1605 {
1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1426 1608
1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1429 1611
1430#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1431 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1432 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,");
1433#endif 1615#endif
1434 } 1616 }
1435} 1617}
1436 1618
1437/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1438static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1439transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1440{ 1622{
1441 dSTACKLEVEL; 1623 dSTACKLEVEL;
1442 1624
1443 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1444 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1445 { 1627 {
1446 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1447 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 */
1448 } 1630 }
1449 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1450 { 1632 {
1451 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1452 1634
1453 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1454 { 1636 {
1455 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1456 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1457 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1458 } 1640 }
… …
1461 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1462 1644
1463 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1464 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1465 1647
1466 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1467 { 1649 {
1468 /* need to start coroutine */ 1650 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1652 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1653 init_perl (aTHX_ next);
1472 } 1654 }
1473 else 1655 else
1474 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1475 1657
1476 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1477 if (expect_true ( 1659 if (ecb_expect_true (
1478 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1479 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1480 && !force_cctx 1662 && !force_cctx
1481 )) 1663 ))
1482 { 1664 {
1483 /* 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 */
1484 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));
1485 1667
1486 /* 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. */
1487 /* 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 */
1488 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1489 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1490 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1491 1673
1492 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1493 } 1675 }
1494 else 1676 else
1495 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1496 1678
1497 ++next->usecount; 1679 ++next->usecount;
1498 1680
1499 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1500 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1501 1683
1502 next->cctx = 0; 1684 next->cctx = 0;
1503 1685
1504 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1505 { 1687 {
1506 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1507 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1508 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1509 } 1691 }
… …
1515#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))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1699
1518/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1519 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 */
1520static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1709{
1523 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1524 return 0; 1711 return;
1525 1712
1526 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1528 1714
1529 coro->flags |= CF_DESTROYED; 1715 coro->flags |= CF_ZOMBIE;
1530 1716
1531 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1532 { 1718 {
1533 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1534 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1535 --coro_nready; 1721 --coro_nready;
1536 } 1722 }
1537 else 1723 else
1538 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1539 1729
1540 if (coro->mainstack 1730 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1542 && coro->slot 1732 && coro->slot
1543 && !PL_dirty) 1733 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1545 1735
1546 cctx_destroy (coro->cctx); 1736 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1739 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1550 1741
1551 if (coro->next) coro->next->prev = coro->prev; 1742 coro_call_on_destroy (aTHX_ coro);
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554 1743
1555 return 1; 1744 /* more destruction mayhem in coro_state_free */
1556} 1745}
1557 1746
1558static int 1747static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1749{
1561 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1562 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1563 1752
1564 coro->hv = 0;
1565
1566 if (--coro->refcnt < 0)
1567 {
1568 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1569 Safefree (coro); 1757 Safefree (coro);
1570 }
1571 1758
1572 return 0; 1759 return 0;
1573} 1760}
1574 1761
1575static int 1762static int ecb_cold
1576coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1577{ 1764{
1578 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1579 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1580 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1581 1769
1582 return 0; 1770 return 0;
1583} 1771}
1584 1772
1585static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1608 1796
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1797 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1611} 1799}
1612 1800
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1637 1802
1638INLINE void 1803ecb_inline void
1639coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1640{ 1805{
1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1642 1807
1643 SvREFCNT_inc_NN (coro->hv); 1808 SvREFCNT_inc_NN (coro->hv);
… …
1645 coro->next_ready = 0; 1810 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro; 1812 ready [1] = coro;
1648} 1813}
1649 1814
1650INLINE struct coro * 1815ecb_inline struct coro *
1651coro_deq (pTHX) 1816coro_deq (pTHX)
1652{ 1817{
1653 int prio; 1818 int prio;
1654 1819
1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1665 } 1830 }
1666 1831
1667 return 0; 1832 return 0;
1668} 1833}
1669 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;
1850}
1851
1670static int 1852static int
1671api_ready (pTHX_ SV *coro_sv) 1853api_ready (pTHX_ SV *coro_sv)
1672{ 1854{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1855 struct coro *coro = SvSTATE (coro_sv);
1678 1856
1679 if (coro->flags & CF_READY) 1857 if (coro->flags & CF_READY)
1680 return 0; 1858 return 0;
1681 1859
1682 coro->flags |= CF_READY; 1860 coro->flags |= CF_READY;
1683 1861
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1862 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1863
1690 if (sv_hook) 1864 if (!coro_nready++)
1691 { 1865 if (coroapi.readyhook)
1692 dSP; 1866 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1867
1708 return 1; 1868 return 1;
1709} 1869}
1710 1870
1711static int 1871static int
… …
1713{ 1873{
1714 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1715} 1875}
1716 1876
1717/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1718INLINE void 1878ecb_inline void
1719prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1720{ 1880{
1721 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1722 1882
1723 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1736{ 1896{
1737 for (;;) 1897 for (;;)
1738 { 1898 {
1739 struct coro *next = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1740 1900
1741 if (expect_true (next)) 1901 if (ecb_expect_true (next))
1742 { 1902 {
1743 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1745 SvREFCNT_dec (next->hv); /* 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 */
1746 else 1906 else
1747 { 1907 {
1748 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1749 --coro_nready; 1909 --coro_nready;
… …
1756 { 1916 {
1757 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1760 { 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
1761 ++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 */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1943 --coro_nready;
1764 } 1944 }
1765 else 1945 else
1766 { 1946 {
1947 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1948 dSP;
1768 1949
1769 ENTER; 1950 ENTER;
1770 SAVETMPS; 1951 SAVETMPS;
1771 1952
… …
1778 } 1959 }
1779 } 1960 }
1780 } 1961 }
1781} 1962}
1782 1963
1783INLINE void 1964ecb_inline void
1784prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1785{ 1966{
1786 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1787 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1788} 1969}
1789 1970
1790INLINE void 1971ecb_inline void
1791prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1792{ 1973{
1793 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1794 1975
1795 if (coro_nready) 1976 if (coro_nready)
… …
1825{ 2006{
1826 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1827 2008
1828 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1829 2010
1830 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1831 { 2012 {
1832 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1833 return 1; 2014 return 1;
1834 } 2015 }
1835 else 2016 else
… …
1878 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
1879 } 2060 }
1880} 2061}
1881 2062
1882static 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
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2141{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2143
1888 if (on_destroyp) 2144 if (!od)
1889 { 2145 return;
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1891 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
1892 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
1893 { 2158 {
1894 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy);
1896
1897 PUSHMARK (SP); 2160 PUSHMARK (SP);
1898 2161
1899 if (statusp) 2162 if (coro->status)
1900 { 2163 {
1901 int i; 2164 PUTBACK;
1902 AV *status = (AV *)SvRV (*statusp); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
1903 EXTEND (SP, AvFILLp (status) + 1); 2166 SPAGAIN;
1904
1905 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]);
1907 } 2167 }
1908 2168
1909 PUTBACK; 2169 PUTBACK;
1910 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
1911 } 2171 }
1912 } 2172 }
1913} 2173}
1914 2174
1915static void 2175static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1917{ 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 {
1918 int i; 2191 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV ();
1921 2192
1922 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2194
1923 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2197 }
2198}
1925 2199
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
1927 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
1928 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 */
1929 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
1930 2205
1931 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
1933 2208
1934 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed.
2258 * besides, I can't get the slow-but-safe version working...
2259 */
2260 slf_frame.data = 0;
2261 self->flags |= CF_NOCANCEL;
2262 coro_state_destroy (aTHX_ coro);
2263 self->flags &= ~CF_NOCANCEL;
2264
2265 if (slf_frame.data)
2266 {
2267 /* while we were busy we have been cancelled, so terminate */
2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2269 }
2270 else
2271 {
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 }
2276}
2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
1937} 2315}
1938 2316
1939/*****************************************************************************/ 2317/*****************************************************************************/
1940/* async pool handler */ 2318/* async pool handler */
1941 2319
… …
1972slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1973{ 2351{
1974 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
1975 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
1976 2354
1977 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
1978 { 2356 {
1979 /* subsequent iteration */ 2357 /* subsequent iteration */
1980 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1981 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
1982 2360
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 { 2363 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1987 coro->invoke_av = newAV (); 2365 return;
1988
1989 frame->prepare = prepare_nop;
1990 } 2366 }
1991 else 2367 else
1992 { 2368 {
1993 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2019 2395
2020static void 2396static void
2021coro_rouse_callback (pTHX_ CV *cv) 2397coro_rouse_callback (pTHX_ CV *cv)
2022{ 2398{
2023 dXSARGS; 2399 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2400 SV *data = (SV *)S_GENSUB_ARG;
2025 2401
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2402 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2403 {
2028 /* first call, set args */ 2404 /* first call, set args */
2029 SV *coro = SvRV (data); 2405 SV *coro = SvRV (data);
… …
2044 2420
2045static int 2421static int
2046slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2047{ 2423{
2048 SV *data = (SV *)frame->data; 2424 SV *data = (SV *)frame->data;
2049 2425
2050 if (CORO_THROW) 2426 if (CORO_THROW)
2051 return 0; 2427 return 0;
2052 2428
2053 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2429 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2054 return 1; 2430 return 1;
… …
2090 cb = sv_2mortal (coro->rouse_cb); 2466 cb = sv_2mortal (coro->rouse_cb);
2091 coro->rouse_cb = 0; 2467 coro->rouse_cb = 0;
2092 } 2468 }
2093 2469
2094 if (!SvROK (cb) 2470 if (!SvROK (cb)
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2471 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2473 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2474
2099 { 2475 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2477 SV *data = (SV *)S_GENSUB_ARG;
2102 2478
2103 frame->data = (void *)data; 2479 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2480 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2481 frame->check = slf_check_rouse_wait;
2106 } 2482 }
… …
2110coro_new_rouse_cb (pTHX) 2486coro_new_rouse_cb (pTHX)
2111{ 2487{
2112 HV *hv = (HV *)SvRV (coro_current); 2488 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2489 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2490 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2491 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2492
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2493 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2494 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2495
2120 SvREFCNT_dec (coro->rouse_cb); 2496 SvREFCNT_dec (coro->rouse_cb);
… …
2217static void 2593static void
2218slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{ 2595{
2220 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2221 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 struct CoroSLF frame = coro->slf_frame;
2605
2606 /*
2607 * The on_destroy below most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions.
2611 */
2612 coro->slf_frame.prepare = 0;
2613
2614 /* this callback is reserved for slf functions needing to do cleanup */
2615 if (frame.destroy && frame.prepare && !PL_dirty)
2616 frame.destroy (aTHX_ &frame);
2222} 2617}
2223 2618
2224/* 2619/*
2225 * these not obviously related functions are all rolled into one 2620 * these not obviously related functions are all rolled into one
2226 * function to increase chances that they all will call transfer with the same 2621 * function to increase chances that they all will call transfer with the same
… …
2233 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2628 I32 checkmark; /* mark SP to see how many elements check has pushed */
2234 2629
2235 /* set up the slf frame, unless it has already been set-up */ 2630 /* set up the slf frame, unless it has already been set-up */
2236 /* the latter happens when a new coro has been started */ 2631 /* the latter happens when a new coro has been started */
2237 /* or when a new cctx was attached to an existing coroutine */ 2632 /* or when a new cctx was attached to an existing coroutine */
2238 if (expect_true (!slf_frame.prepare)) 2633 if (ecb_expect_true (!slf_frame.prepare))
2239 { 2634 {
2240 /* first iteration */ 2635 /* first iteration */
2241 dSP; 2636 dSP;
2242 SV **arg = PL_stack_base + TOPMARK + 1; 2637 SV **arg = PL_stack_base + TOPMARK + 1;
2243 int items = SP - arg; /* args without function object */ 2638 int items = SP - arg; /* args without function object */
… …
2284 while (slf_frame.check (aTHX_ &slf_frame)); 2679 while (slf_frame.check (aTHX_ &slf_frame));
2285 2680
2286 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2681 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2287 2682
2288 /* exception handling */ 2683 /* exception handling */
2289 if (expect_false (CORO_THROW)) 2684 if (ecb_expect_false (CORO_THROW))
2290 { 2685 {
2291 SV *exception = sv_2mortal (CORO_THROW); 2686 SV *exception = sv_2mortal (CORO_THROW);
2292 2687
2293 CORO_THROW = 0; 2688 CORO_THROW = 0;
2294 sv_setsv (ERRSV, exception); 2689 sv_setsv (ERRSV, exception);
2295 croak (0); 2690 croak (0);
2296 } 2691 }
2297 2692
2298 /* return value handling - mostly like entersub */ 2693 /* return value handling - mostly like entersub */
2299 /* make sure we put something on the stack in scalar context */ 2694 /* make sure we put something on the stack in scalar context */
2300 if (GIMME_V == G_SCALAR) 2695 if (GIMME_V == G_SCALAR
2696 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2301 { 2697 {
2302 dSP; 2698 dSP;
2303 SV **bot = PL_stack_base + checkmark; 2699 SV **bot = PL_stack_base + checkmark;
2304 2700
2305 if (sp == bot) /* too few, push undef */ 2701 if (sp == bot) /* too few, push undef */
2306 bot [1] = &PL_sv_undef; 2702 bot [1] = &PL_sv_undef;
2307 else if (sp != bot + 1) /* too many, take last one */ 2703 else /* too many, take last one */
2308 bot [1] = *sp; 2704 bot [1] = *sp;
2309 2705
2310 SP = bot + 1; 2706 SP = bot + 1;
2311 2707
2312 PUTBACK; 2708 PUTBACK;
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2741 if (PL_op->op_flags & OPf_STACKED)
2346 { 2742 {
2347 if (items > slf_arga) 2743 if (items > slf_arga)
2348 { 2744 {
2349 slf_arga = items; 2745 slf_arga = items;
2350 free (slf_argv); 2746 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2747 New (0, slf_argv, slf_arga, SV *);
2352 } 2748 }
2353 2749
2354 slf_argc = items; 2750 slf_argc = items;
2355 2751
2356 for (i = 0; i < items; ++i) 2752 for (i = 0; i < items; ++i)
… …
2419{ 2815{
2420 PerlIOBuf base; 2816 PerlIOBuf base;
2421 NV next, every; 2817 NV next, every;
2422} PerlIOCede; 2818} PerlIOCede;
2423 2819
2424static IV 2820static IV ecb_cold
2425PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2821PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2426{ 2822{
2427 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2823 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2428 2824
2429 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2825 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2430 self->next = nvtime () + self->every; 2826 self->next = nvtime () + self->every;
2431 2827
2432 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2828 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2433} 2829}
2434 2830
2435static SV * 2831static SV * ecb_cold
2436PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2832PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2437{ 2833{
2438 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2834 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2439 2835
2440 return newSVnv (self->every); 2836 return newSVnv (self->every);
… …
2552 SvREFCNT_dec (cb); 2948 SvREFCNT_dec (cb);
2553 } 2949 }
2554} 2950}
2555 2951
2556static void 2952static void
2557coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2953coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2558{ 2954{
2559 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2955 /* call $sem->adjust (0) to possibly wake up some other waiters */
2560 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2956 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2561} 2957}
2562 2958
2563static int 2959static int
2564slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2960slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2565{ 2961{
2566 AV *av = (AV *)frame->data; 2962 AV *av = (AV *)frame->data;
2567 SV *count_sv = AvARRAY (av)[0]; 2963 SV *count_sv = AvARRAY (av)[0];
2964 SV *coro_hv = SvRV (coro_current);
2965
2966 frame->destroy = 0;
2568 2967
2569 /* if we are about to throw, don't actually acquire the lock, just throw */ 2968 /* if we are about to throw, don't actually acquire the lock, just throw */
2570 if (CORO_THROW) 2969 if (ecb_expect_false (CORO_THROW))
2970 {
2971 /* we still might be responsible for the semaphore, so wake up others */
2972 coro_semaphore_adjust (aTHX_ av, 0);
2973
2571 return 0; 2974 return 0;
2975 }
2572 else if (SvIVX (count_sv) > 0) 2976 else if (SvIVX (count_sv) > 0)
2573 { 2977 {
2574 SvSTATE_current->on_destroy = 0;
2575
2576 if (acquire) 2978 if (acquire)
2577 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2979 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2578 else 2980 else
2579 coro_semaphore_adjust (aTHX_ av, 0); 2981 coro_semaphore_adjust (aTHX_ av, 0);
2580 2982
… …
2584 { 2986 {
2585 int i; 2987 int i;
2586 /* if we were woken up but can't down, we look through the whole */ 2988 /* if we were woken up but can't down, we look through the whole */
2587 /* waiters list and only add us if we aren't in there already */ 2989 /* waiters list and only add us if we aren't in there already */
2588 /* this avoids some degenerate memory usage cases */ 2990 /* this avoids some degenerate memory usage cases */
2589 2991 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2590 for (i = 1; i <= AvFILLp (av); ++i)
2591 if (AvARRAY (av)[i] == SvRV (coro_current)) 2992 if (AvARRAY (av)[i] == coro_hv)
2592 return 1; 2993 return 1;
2593 2994
2594 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2995 av_push (av, SvREFCNT_inc (coro_hv));
2595 return 1; 2996 return 1;
2596 } 2997 }
2597} 2998}
2598 2999
2599static int 3000static int
… …
2622 { 3023 {
2623 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3024 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2624 3025
2625 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3026 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2626 frame->prepare = prepare_schedule; 3027 frame->prepare = prepare_schedule;
2627
2628 /* to avoid race conditions when a woken-up coro gets terminated */ 3028 /* to avoid race conditions when a woken-up coro gets terminated */
2629 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3029 /* we arrange for a temporary on_destroy that calls adjust (0) */
2630 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3030 frame->destroy = coro_semaphore_destroy;
2631 } 3031 }
2632} 3032}
2633 3033
2634static void 3034static void
2635slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3035slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2643{ 3043{
2644 if (items >= 2) 3044 if (items >= 2)
2645 { 3045 {
2646 /* callback form */ 3046 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 3047 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3048 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 3049
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3050 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 3051
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 3052 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 3053 coro_semaphore_adjust (aTHX_ av, 0);
… …
2713{ 3113{
2714 AV *av = (AV *)SvRV (arg [0]); 3114 AV *av = (AV *)SvRV (arg [0]);
2715 3115
2716 if (items >= 2) 3116 if (items >= 2)
2717 { 3117 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3118 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3119 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 3120
2721 if (SvIVX (AvARRAY (av)[0])) 3121 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3122 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 3123
2724 frame->prepare = prepare_nop; 3124 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 3125 frame->check = slf_check_nop;
2726 } 3126 }
2727 else if (SvIVX (AvARRAY (av)[0])) 3127 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 3158
2759static void 3159static void
2760coro_aio_callback (pTHX_ CV *cv) 3160coro_aio_callback (pTHX_ CV *cv)
2761{ 3161{
2762 dXSARGS; 3162 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 3163 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 3164 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 3165 SV *data_sv = newSV (sizeof (struct io_state));
2766 3166
2767 av_extend (state, items - 1); 3167 av_extend (state, items - 1);
2768 3168
… …
2804 /* it quickly returns */ 3204 /* it quickly returns */
2805 if (CORO_THROW) 3205 if (CORO_THROW)
2806 return 0; 3206 return 0;
2807 3207
2808 /* one element that is an RV? repeat! */ 3208 /* one element that is an RV? repeat! */
2809 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3209 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2810 return 1; 3210 return 1;
2811 3211
2812 /* restore status */ 3212 /* restore status */
2813 { 3213 {
2814 SV *data_sv = av_pop (state); 3214 SV *data_sv = av_pop (state);
… …
2853 dSP; 3253 dSP;
2854 3254
2855 static SV *prio_cv; 3255 static SV *prio_cv;
2856 static SV *prio_sv; 3256 static SV *prio_sv;
2857 3257
2858 if (expect_false (!prio_cv)) 3258 if (ecb_expect_false (!prio_cv))
2859 { 3259 {
2860 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3260 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2861 prio_sv = newSViv (0); 3261 prio_sv = newSViv (0);
2862 } 3262 }
2863 3263
… …
2882 3282
2883 for (i = 0; i < items; ++i) 3283 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3284 PUSHs (arg [i]);
2885 3285
2886 /* now push the callback closure */ 3286 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3287 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3288
2889 /* now call the AIO function - we assume our request is uncancelable */ 3289 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3290 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3291 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3292 }
2893 3293
2894 /* now that the requets is going, we loop toll we have a result */ 3294 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3295 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3296 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3297 frame->check = slf_check_aio_req;
2898} 3298}
2899 3299
… …
2909 3309
2910/*****************************************************************************/ 3310/*****************************************************************************/
2911 3311
2912#if CORO_CLONE 3312#if CORO_CLONE
2913# include "clone.c" 3313# include "clone.c"
3314#endif
3315
3316/*****************************************************************************/
3317
3318static SV *
3319coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3320{
3321 SV *coro_sv;
3322 struct coro *coro;
3323 MAGIC *mg;
3324 HV *hv;
3325 SV *cb;
3326 int i;
3327
3328 if (argc > 0)
3329 {
3330 cb = s_get_cv_croak (argv [0]);
3331
3332 if (!is_coro)
3333 {
3334 if (CvISXSUB (cb))
3335 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3336
3337 if (!CvROOT (cb))
3338 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3339 }
3340 }
3341
3342 Newz (0, coro, 1, struct coro);
3343 coro->args = newAV ();
3344 coro->flags = CF_NEW;
3345
3346 if (coro_first) coro_first->prev = coro;
3347 coro->next = coro_first;
3348 coro_first = coro;
3349
3350 coro->hv = hv = newHV ();
3351 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3352 mg->mg_flags |= MGf_DUP;
3353 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3354
3355 if (argc > 0)
3356 {
3357 av_extend (coro->args, argc + is_coro - 1);
3358
3359 if (is_coro)
3360 {
3361 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3362 cb = (SV *)cv_coro_run;
3363 }
3364
3365 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3366
3367 for (i = 1; i < argc; i++)
3368 av_push (coro->args, newSVsv (argv [i]));
3369 }
3370
3371 return coro_sv;
3372}
3373
3374#ifndef __cplusplus
3375ecb_cold XS(boot_Coro__State);
3376#endif
3377
3378#if CORO_JIT
3379
3380static void ecb_noinline ecb_cold
3381pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3382{
3383 dSP;
3384 AV *av = newAV ();
3385
3386 av_store (av, 3, newSVuv (d));
3387 av_store (av, 2, newSVuv (c));
3388 av_store (av, 1, newSVuv (b));
3389 av_store (av, 0, newSVuv (a));
3390
3391 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3392
3393 PUTBACK;
3394}
3395
3396static void ecb_noinline ecb_cold
3397jit_init (pTHX)
3398{
3399 dSP;
3400 SV *load, *save;
3401 char *map_base;
3402 char *load_ptr, *save_ptr;
3403 STRLEN load_len, save_len, map_len;
3404 int count;
3405
3406 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3407
3408 PUSHMARK (SP);
3409 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3410 #include "state.h"
3411 count = call_pv ("Coro::State::_jit", G_ARRAY);
3412 SPAGAIN;
3413
3414 save = POPs; save_ptr = SvPVbyte (save, save_len);
3415 load = POPs; load_ptr = SvPVbyte (load, load_len);
3416
3417 map_len = load_len + save_len + 16;
3418
3419 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3420
3421 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3422
3423 load_perl_slots = (load_save_perl_slots_type)map_base;
3424 memcpy (map_base, load_ptr, load_len);
3425
3426 map_base += (load_len + 15) & ~15;
3427
3428 save_perl_slots = (load_save_perl_slots_type)map_base;
3429 memcpy (map_base, save_ptr, save_len);
3430
3431 /* we are good citizens and try to make the page read-only, so the evil evil */
3432 /* hackers might have it a bit more difficult */
3433 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3434
3435 PUTBACK;
3436 eval_pv ("undef &Coro::State::_jit", 1);
3437}
3438
2914#endif 3439#endif
2915 3440
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3441MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3442
2918PROTOTYPES: DISABLE 3443PROTOTYPES: DISABLE
… …
2922#ifdef USE_ITHREADS 3447#ifdef USE_ITHREADS
2923# if CORO_PTHREAD 3448# if CORO_PTHREAD
2924 coro_thx = PERL_GET_CONTEXT; 3449 coro_thx = PERL_GET_CONTEXT;
2925# endif 3450# endif
2926#endif 3451#endif
2927 BOOT_PAGESIZE; 3452 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV;
3457 ERRSV;
2928 3458
2929 cctx_current = cctx_new_empty (); 3459 cctx_current = cctx_new_empty ();
2930 3460
2931 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3461 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2932 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3462 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2972 coroapi.prepare_nop = prepare_nop; 3502 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3503 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3504 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3505 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3506
2977 { 3507 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3508
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3509 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3510#if CORO_JIT
3511 PUTBACK;
3512 jit_init (aTHX);
3513 SPAGAIN;
3514#endif
2987} 3515}
2988 3516
2989SV * 3517SV *
2990new (char *klass, ...) 3518new (SV *klass, ...)
2991 ALIAS: 3519 ALIAS:
2992 Coro::new = 1 3520 Coro::new = 1
2993 CODE: 3521 CODE:
2994{ 3522 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3523 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3524 RETVAL
3046 3525
3047void 3526void
3048transfer (...) 3527transfer (...)
3049 PROTOTYPE: $$ 3528 PROTOTYPE: $$
3050 CODE: 3529 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3530 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3052
3053bool
3054_destroy (SV *coro_sv)
3055 CODE:
3056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3057 OUTPUT:
3058 RETVAL
3059
3060void
3061_exit (int code)
3062 PROTOTYPE: $
3063 CODE:
3064 _exit (code);
3065 3531
3066SV * 3532SV *
3067clone (Coro::State coro) 3533clone (Coro::State coro)
3068 CODE: 3534 CODE:
3069{ 3535{
… …
3124void 3590void
3125list () 3591list ()
3126 PROTOTYPE: 3592 PROTOTYPE:
3127 PPCODE: 3593 PPCODE:
3128{ 3594{
3129 struct coro *coro; 3595 struct coro *coro;
3130 for (coro = coro_first; coro; coro = coro->next) 3596 for (coro = coro_first; coro; coro = coro->next)
3131 if (coro->hv) 3597 if (coro->hv)
3132 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3598 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3133} 3599}
3134 3600
… …
3139 CODE: 3605 CODE:
3140{ 3606{
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3607 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3142 { 3608 {
3143 struct coro *current = SvSTATE_current; 3609 struct coro *current = SvSTATE_current;
3610 struct CoroSLF slf_save;
3144 3611
3145 if (current != coro) 3612 if (current != coro)
3146 { 3613 {
3147 PUTBACK; 3614 PUTBACK;
3148 save_perl (aTHX_ current); 3615 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3616 load_perl (aTHX_ coro);
3617 /* the coro is most likely in an active SLF call.
3618 * while not strictly required (the code we execute is
3619 * not allowed to call any SLF functions), it's cleaner
3620 * to reinitialise the slf_frame and restore it later.
3621 * This might one day allow us to actually do SLF calls
3622 * from code executed here.
3623 */
3624 slf_save = slf_frame;
3625 slf_frame.prepare = 0;
3150 SPAGAIN; 3626 SPAGAIN;
3151 } 3627 }
3152 3628
3153 PUSHSTACK; 3629 PUSHSTACK;
3154 3630
… …
3164 SPAGAIN; 3640 SPAGAIN;
3165 3641
3166 if (current != coro) 3642 if (current != coro)
3167 { 3643 {
3168 PUTBACK; 3644 PUTBACK;
3645 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3646 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3647 load_perl (aTHX_ current);
3171 SPAGAIN; 3648 SPAGAIN;
3172 } 3649 }
3173 } 3650 }
… …
3178 PROTOTYPE: $ 3655 PROTOTYPE: $
3179 ALIAS: 3656 ALIAS:
3180 is_ready = CF_READY 3657 is_ready = CF_READY
3181 is_running = CF_RUNNING 3658 is_running = CF_RUNNING
3182 is_new = CF_NEW 3659 is_new = CF_NEW
3183 is_destroyed = CF_DESTROYED 3660 is_destroyed = CF_ZOMBIE
3661 is_zombie = CF_ZOMBIE
3184 is_suspended = CF_SUSPENDED 3662 is_suspended = CF_SUSPENDED
3185 CODE: 3663 CODE:
3186 RETVAL = boolSV (coro->flags & ix); 3664 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3665 OUTPUT:
3188 RETVAL 3666 RETVAL
3189 3667
3190void 3668void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3669throw (SV *self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3670 PROTOTYPE: $;$
3193 CODE: 3671 CODE:
3194{ 3672{
3673 struct coro *coro = SvSTATE (self);
3195 struct coro *current = SvSTATE_current; 3674 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3675 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3197 SvREFCNT_dec (*throwp); 3676 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3677 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3678 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3679
3680 api_ready (aTHX_ self);
3200} 3681}
3201 3682
3202void 3683void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3684api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3685 PROTOTYPE: $;$
… …
3259 3740
3260void 3741void
3261cancel (Coro::State self) 3742cancel (Coro::State self)
3262 CODE: 3743 CODE:
3263 coro_state_destroy (aTHX_ self); 3744 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3745
3746SV *
3747enable_times (int enabled = enable_times)
3748 CODE:
3749{
3750 RETVAL = boolSV (enable_times);
3751
3752 if (enabled != enable_times)
3753 {
3754 enable_times = enabled;
3755
3756 coro_times_update ();
3757 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3758 }
3759}
3760 OUTPUT:
3761 RETVAL
3762
3763void
3764times (Coro::State self)
3765 PPCODE:
3766{
3767 struct coro *current = SvSTATE (coro_current);
3768
3769 if (ecb_expect_false (current == self))
3770 {
3771 coro_times_update ();
3772 coro_times_add (SvSTATE (coro_current));
3773 }
3774
3775 EXTEND (SP, 2);
3776 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3777 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3778
3779 if (ecb_expect_false (current == self))
3780 coro_times_sub (SvSTATE (coro_current));
3781}
3782
3783void
3784swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3785 CODE:
3786{
3787 struct coro *current = SvSTATE_current;
3788
3789 if (current == coro)
3790 SWAP_SVS (current);
3791
3792 if (!coro->swap_sv)
3793 coro->swap_sv = newAV ();
3794
3795 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3796 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3797
3798 if (current == coro)
3799 SWAP_SVS (current);
3800}
3265 3801
3266 3802
3267MODULE = Coro::State PACKAGE = Coro 3803MODULE = Coro::State PACKAGE = Coro
3268 3804
3269BOOT: 3805BOOT:
3270{ 3806{
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3807 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3808 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3809 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3810 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3811 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3812 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3813 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3814 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3815
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3816 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3817 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3818 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3819 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3820
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3821 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3822
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3823 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3824 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3308 sv_setiv (sv, (IV)&coroapi); 3843 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3844 SvREADONLY_on (sv);
3310 } 3845 }
3311} 3846}
3312 3847
3848SV *
3849async (...)
3850 PROTOTYPE: &@
3851 CODE:
3852 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3853 api_ready (aTHX_ RETVAL);
3854 OUTPUT:
3855 RETVAL
3856
3857void
3858_destroy (Coro::State coro)
3859 CODE:
3860 /* used by the manager thread */
3861 coro_state_destroy (aTHX_ coro);
3862
3863void
3864on_destroy (Coro::State coro, SV *cb)
3865 CODE:
3866 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3867
3868void
3869join (...)
3870 CODE:
3871 CORO_EXECUTE_SLF_XS (slf_init_join);
3872
3313void 3873void
3314terminate (...) 3874terminate (...)
3315 CODE: 3875 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3876 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3877
3878void
3879cancel (...)
3880 CODE:
3881 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3882
3883int
3884safe_cancel (Coro::State self, ...)
3885 C_ARGS: aTHX_ self, &ST (1), items - 1
3317 3886
3318void 3887void
3319schedule (...) 3888schedule (...)
3320 CODE: 3889 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3890 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3351_set_readyhook (SV *hook) 3920_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3921 PROTOTYPE: $
3353 CODE: 3922 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3923 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3924 SvGETMAGIC (hook);
3925 if (SvOK (hook))
3926 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3927 coro_readyhook = newSVsv (hook);
3928 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3929 }
3930 else
3931 {
3932 coro_readyhook = 0;
3933 CORO_READYHOOK = 0;
3934 }
3357 3935
3358int 3936int
3359prio (Coro::State coro, int newprio = 0) 3937prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3938 PROTOTYPE: $;$
3361 ALIAS: 3939 ALIAS:
… …
3367 if (items > 1) 3945 if (items > 1)
3368 { 3946 {
3369 if (ix) 3947 if (ix)
3370 newprio = coro->prio - newprio; 3948 newprio = coro->prio - newprio;
3371 3949
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3950 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3951 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3952
3375 coro->prio = newprio; 3953 coro->prio = newprio;
3376 } 3954 }
3377} 3955}
3378 OUTPUT: 3956 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 4003 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 4004 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 4005
3428 if ((SV *)hv == &PL_sv_undef) 4006 if ((SV *)hv == &PL_sv_undef)
3429 { 4007 {
3430 PUSHMARK (SP); 4008 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4009 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4010 SvREFCNT_dec (sv);
3439 } 4011 }
3440 4012
3441 { 4013 {
3442 struct coro *coro = SvSTATE_hv (hv); 4014 struct coro *coro = SvSTATE_hv (hv);
3443 4015
… …
3475 on_leave = 1 4047 on_leave = 1
3476 PROTOTYPE: & 4048 PROTOTYPE: &
3477 CODE: 4049 CODE:
3478{ 4050{
3479 struct coro *coro = SvSTATE_current; 4051 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4052 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 4053
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 4054 block = s_get_cv_croak (block);
3483 4055
3484 if (!*avp) 4056 if (!*avp)
3485 *avp = newAV (); 4057 *avp = newAV ();
3486 4058
3487 av_push (*avp, SvREFCNT_inc (block)); 4059 av_push (*avp, SvREFCNT_inc (block));
… …
3505 4077
3506SV * 4078SV *
3507new (SV *klass, SV *count = 0) 4079new (SV *klass, SV *count = 0)
3508 CODE: 4080 CODE:
3509{ 4081{
3510 int semcnt = 1; 4082 int semcnt = 1;
3511 4083
3512 if (count) 4084 if (count)
3513 { 4085 {
3514 SvGETMAGIC (count); 4086 SvGETMAGIC (count);
3515 4087
… …
3575 XSRETURN_NO; 4147 XSRETURN_NO;
3576} 4148}
3577 4149
3578void 4150void
3579waiters (SV *self) 4151waiters (SV *self)
3580 PPCODE: 4152 PPCODE:
3581{ 4153{
3582 AV *av = (AV *)SvRV (self); 4154 AV *av = (AV *)SvRV (self);
3583 int wcount = AvFILLp (av) + 1 - 1; 4155 int wcount = AvFILLp (av) + 1 - 1;
3584 4156
3585 if (GIMME_V == G_SCALAR) 4157 if (GIMME_V == G_SCALAR)
… …
3594} 4166}
3595 4167
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4168MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597 4169
3598void 4170void
3599_may_delete (SV *sem, int count, int extra_refs) 4171_may_delete (SV *sem, int count, unsigned int extra_refs)
3600 PPCODE: 4172 PPCODE:
3601{ 4173{
3602 AV *av = (AV *)SvRV (sem); 4174 AV *av = (AV *)SvRV (sem);
3603 4175
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4176 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */ 4177 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count) 4178 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES; 4179 XSRETURN_YES;
… …
3628 4200
3629void 4201void
3630broadcast (SV *self) 4202broadcast (SV *self)
3631 CODE: 4203 CODE:
3632{ 4204{
3633 AV *av = (AV *)SvRV (self); 4205 AV *av = (AV *)SvRV (self);
3634 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4206 coro_signal_wake (aTHX_ av, AvFILLp (av));
3635} 4207}
3636 4208
3637void 4209void
3638send (SV *self) 4210send (SV *self)
… …
3646 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4218 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3647} 4219}
3648 4220
3649IV 4221IV
3650awaited (SV *self) 4222awaited (SV *self)
3651 CODE: 4223 CODE:
3652 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4224 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3653 OUTPUT: 4225 OUTPUT:
3654 RETVAL 4226 RETVAL
3655 4227
3656 4228
… …
3661 4233
3662void 4234void
3663_schedule (...) 4235_schedule (...)
3664 CODE: 4236 CODE:
3665{ 4237{
3666 static int incede; 4238 static int incede;
3667 4239
3668 api_cede_notself (aTHX); 4240 api_cede_notself (aTHX);
3669 4241
3670 ++incede; 4242 ++incede;
3671 while (coro_nready >= incede && api_cede (aTHX)) 4243 while (coro_nready >= incede && api_cede (aTHX))
… …
3687 4259
3688void 4260void
3689_register (char *target, char *proto, SV *req) 4261_register (char *target, char *proto, SV *req)
3690 CODE: 4262 CODE:
3691{ 4263{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 4264 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 4265 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4266 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 4267 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4268 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 4269}
3698 4270
4271MODULE = Coro::State PACKAGE = Coro::Select
4272
4273void
4274patch_pp_sselect ()
4275 CODE:
4276 if (!coro_old_pp_sselect)
4277 {
4278 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4279 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4280 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4281 }
4282
4283void
4284unpatch_pp_sselect ()
4285 CODE:
4286 if (coro_old_pp_sselect)
4287 {
4288 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4289 coro_old_pp_sselect = 0;
4290 }
4291
4292MODULE = Coro::State PACKAGE = Coro::Util
4293
4294void
4295_exit (int code)
4296 CODE:
4297 _exit (code);
4298
4299NV
4300time ()
4301 CODE:
4302 RETVAL = nvtime (aTHX);
4303 OUTPUT:
4304 RETVAL
4305
4306NV
4307gettimeofday ()
4308 PPCODE:
4309{
4310 UV tv [2];
4311 u2time (aTHX_ tv);
4312 EXTEND (SP, 2);
4313 PUSHs (sv_2mortal (newSVuv (tv [0])));
4314 PUSHs (sv_2mortal (newSVuv (tv [1])));
4315}
4316

Diff Legend

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