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.340 by root, Mon Dec 15 00:30:40 2008 UTC vs.
Revision 1.431 by root, Fri Feb 8 22:29:18 2013 UTC

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

Diff Legend

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