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.342 by root, Mon Dec 15 16:22:34 2008 UTC vs.
Revision 1.433 by root, Thu May 9 05:40:14 2013 UTC

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

Diff Legend

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