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.315 by root, Thu Nov 20 05:25:17 2008 UTC vs.
Revision 1.447 by root, Tue Oct 14 21:53:32 2014 UTC

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

Diff Legend

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