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.311 by root, Thu Nov 20 01:12:08 2008 UTC vs.
Revision 1.440 by root, Sat Feb 22 14:12:45 2014 UTC

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

Diff Legend

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