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.314 by root, Thu Nov 20 03:24:39 2008 UTC vs.
Revision 1.429 by root, Fri Dec 7 14:21:09 2012 UTC

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

Diff Legend

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