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.343 by root, Mon Dec 15 16:41:43 2008 UTC vs.
Revision 1.438 by root, Mon Nov 18 10:27:53 2013 UTC

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

Diff Legend

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