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.323 by root, Sat Nov 22 06:03:10 2008 UTC vs.
Revision 1.441 by root, Tue Mar 4 05:07:44 2014 UTC

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

Diff Legend

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