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.313 by root, Thu Nov 20 03:22:59 2008 UTC vs.
Revision 1.433 by root, Thu May 9 05:40:14 2013 UTC

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

Diff Legend

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