ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

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