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.436 by root, Tue Nov 5 14:38:46 2013 UTC

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

Diff Legend

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