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

Diff Legend

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