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.438 by root, Mon Nov 18 10:27:53 2013 UTC

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

Diff Legend

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