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.349 by root, Wed Jun 10 00:47:24 2009 UTC vs.
Revision 1.454 by root, Tue Jul 7 00:38:03 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
35#ifndef SVs_PADSTALE
36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
18# undef setjmp 70# undef setjmp
19# undef longjmp 71# undef longjmp
20# undef _exit 72# undef _exit
21# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
22#else 74#else
23# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
24#endif 76#endif
25 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
55 80
56#define PERL_VERSION_ATLEAST(a,b,c) \ 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 82# 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 83#endif
122 84
123/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
136#endif 98#endif
137 99
138#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
139 101
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
155#include "CoroAPI.h" 102#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
157 104
158#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
164static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
165 123
166/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
169 128
170static U32 cctx_gen; 129static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 149static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 150static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 151static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 152static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 153static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 154
197/* Coro::AnyEvent */ 155/* Coro::AnyEvent */
198static SV *sv_activity; 156static SV *sv_activity;
199 157
158/* enable processtime/realtime profiling */
159static char enable_times;
160typedef U32 coro_ts[2];
161static coro_ts time_real, time_cpu;
162static char times_valid;
163
200static struct coro_cctx *cctx_first; 164static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 165static int cctx_count, cctx_idle;
202 166
203enum { 167enum
168{
204 CC_MAPPED = 0x01, 169 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 170 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 171 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 172 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 173 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 178typedef struct coro_cctx
214{ 179{
215 struct coro_cctx *next; 180 struct coro_cctx *next;
216 181
217 /* the stack */ 182 /* the stack */
218 void *sptr; 183 struct coro_stack stack;
219 size_t ssize;
220 184
221 /* cpu state */ 185 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
189#endif
224 JMPENV *top_env; 190 JMPENV *top_env;
225 coro_context cctx; 191 coro_context cctx;
226 192
227 U32 gen; 193 U32 gen;
228#if CORO_USE_VALGRIND 194#if CORO_USE_VALGRIND
229 int valgrind_id; 195 int valgrind_id;
230#endif 196#endif
231 unsigned char flags; 197 unsigned char flags;
232} coro_cctx; 198} coro_cctx;
233 199
234coro_cctx *cctx_current; /* the currently running cctx */ 200static coro_cctx *cctx_current; /* the currently running cctx */
235 201
236/*****************************************************************************/ 202/*****************************************************************************/
237 203
204static MGVTBL coro_state_vtbl;
205
238enum { 206enum
207{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 208 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 209 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 210 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 211 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 212 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
213 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 214};
245 215
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 217typedef struct
248{ 218{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 219 #define VARx(name,expr,type) type name;
255# include "state.h" 220 #include "state.h"
256#undef VAR
257} perl_slots; 221} perl_slots;
258 222
223/* how many context stack entries do we need for perl_slots */
259#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 225
261/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
262struct coro { 227struct coro
228{
263 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 230 coro_cctx *cctx;
265 231
266 /* ready queue */ 232 /* ready queue */
267 struct coro *next_ready; 233 struct coro *next_ready;
… …
269 /* state data */ 235 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 237 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
273 239
274 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 244
281 /* statistics */ 245 /* statistics */
282 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
283 247
284 /* coro process data */ 248 /* coro process data */
285 int prio; 249 int prio;
286 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
287 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
288 254
289 /* async_pool */ 255 /* async_pool */
290 SV *saved_deffh; 256 SV *saved_deffh;
291 SV *invoke_cb; 257 SV *invoke_cb;
292 AV *invoke_av; 258 AV *invoke_av;
293 259
294 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
295 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
296 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
297 269
298 /* linked list */ 270 /* linked list */
299 struct coro *next, *prev; 271 struct coro *next, *prev;
300}; 272};
301 273
302typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
304 276
305/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
309 281
310/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
311 283
312#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
318 290
319/* for Coro.pm */ 291/* for Coro.pm */
320static SV *coro_current; 292static SV *coro_current;
321static SV *coro_readyhook; 293static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
324static struct coro *coro_first; 296static struct coro *coro_first;
325#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
326 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
322/** Coro::Select ************************************************************/
323
324static OP *(*coro_old_pp_sselect) (pTHX);
325static SV *coro_select_select;
326
327/* horrible hack, but if it works... */
328static OP *
329coro_pp_sselect (pTHX)
330{
331 dSP;
332 PUSHMARK (SP - 4); /* fake argument list */
333 XPUSHs (coro_select_select);
334 PUTBACK;
335
336 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
337 PL_op->op_flags |= OPf_STACKED;
338 PL_op->op_private = 0;
339 return PL_ppaddr [OP_ENTERSUB](aTHX);
340}
341
342/** time stuff **************************************************************/
343
344#ifdef HAS_GETTIMEOFDAY
345
346ecb_inline void
347coro_u2time (pTHX_ UV ret[2])
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 ret [0] = tv.tv_sec;
353 ret [1] = tv.tv_usec;
354}
355
356ecb_inline double
357coro_nvtime (void)
358{
359 struct timeval tv;
360 gettimeofday (&tv, 0);
361
362 return tv.tv_sec + tv.tv_usec * 1e-6;
363}
364
365ecb_inline void
366time_init (pTHX)
367{
368 nvtime = coro_nvtime;
369 u2time = coro_u2time;
370}
371
372#else
373
374ecb_inline void
375time_init (pTHX)
376{
377 SV **svp;
378
379 require_pv ("Time/HiRes.pm");
380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385
386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
387
388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
390}
391
392#endif
393
327/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
328 395
329static SV * 396static SV * ecb_noinline
330coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
331{ 398{
332#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_sv (name, create); 401 get_sv (name, create);
335#endif 402#endif
336 return get_sv (name, create); 403 return get_sv (name, create);
337} 404}
338 405
339static AV * 406static AV * ecb_noinline
340coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
341{ 408{
342#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_av (name, create); 411 get_av (name, create);
345#endif 412#endif
346 return get_av (name, create); 413 return get_av (name, create);
347} 414}
348 415
349static HV * 416static HV * ecb_noinline
350coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
351{ 418{
352#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_hv (name, create); 421 get_hv (name, create);
355#endif 422#endif
356 return get_hv (name, create); 423 return get_hv (name, create);
357} 424}
358 425
359/* may croak */ 426ecb_inline void
360INLINE CV * 427coro_times_update (void)
361coro_sv_2cv (pTHX_ SV *sv)
362{ 428{
363 HV *st; 429#ifdef coro_clock_gettime
364 GV *gvp; 430 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 431
367 if (!cv) 432 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 433 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
434 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 435
370 return cv; 436 ts.tv_sec = ts.tv_nsec = 0;
437 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
438 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
439#else
440 dTHX;
441 UV tv[2];
442
443 u2time (aTHX_ tv);
444 time_real [0] = tv [0];
445 time_real [1] = tv [1] * 1000;
446#endif
447}
448
449ecb_inline void
450coro_times_add (struct coro *c)
451{
452 c->t_real [1] += time_real [1];
453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
454 c->t_real [0] += time_real [0];
455
456 c->t_cpu [1] += time_cpu [1];
457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
458 c->t_cpu [0] += time_cpu [0];
459}
460
461ecb_inline void
462coro_times_sub (struct coro *c)
463{
464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
465 c->t_real [1] -= time_real [1];
466 c->t_real [0] -= time_real [0];
467
468 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
469 c->t_cpu [1] -= time_cpu [1];
470 c->t_cpu [0] -= time_cpu [0];
371} 471}
372 472
373/*****************************************************************************/ 473/*****************************************************************************/
374/* magic glue */ 474/* magic glue */
375 475
376#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
378 478
379#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
382 : mg_find (sv, type)) 482 : mg_find (sv, type))
383 483
384#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
387 : 0) 487 : 0)
388 488
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391 491
392INLINE struct coro * 492ecb_inline MAGIC *
393SvSTATE_ (pTHX_ SV *coro) 493SvSTATEhv_p (pTHX_ SV *coro)
394{ 494{
395 HV *stash;
396 MAGIC *mg; 495 MAGIC *mg;
397 496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
508SvSTATE_ (pTHX_ SV *coro_sv)
509{
510 MAGIC *mg;
511
398 if (SvROK (coro)) 512 if (SvROK (coro_sv))
399 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
400 514
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg)
402 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
403 518
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
414} 520}
415 521
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 523
… …
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421 527
422/*****************************************************************************/ 528/*****************************************************************************/
423/* padlist management and caching */ 529/* padlist management and caching */
424 530
425static AV * 531ecb_inline PADLIST *
426coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
427{ 533{
428 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
429 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
430 539
431 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
432 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
433#if PERL_VERSION_ATLEAST (5,10,0)
434 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
435#else
436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
437#endif 569#endif
438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
439 --AvFILLp (padlist);
440 570
441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
442 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
443 579
444 return newpadlist; 580 return newpadlist;
445} 581}
446 582
447static void 583ecb_inline void
448free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
449{ 585{
450 /* may be during global destruction */ 586 /* may be during global destruction */
451 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
452 { 588 {
453 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
454 590
455 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
456 { 592 {
457 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
458 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
459 I32 j = AvFILLp (av);
460 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
461 while (j >= 0) 600 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
463 602
464 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
465 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
466 } 606 }
467 607
468 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
469 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
470 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
471 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
472 } 618 }
473} 619}
474 620
475static int 621static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 623{
478 AV *padlist; 624 PADLIST *padlist;
479 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
480 627
481 /* casting is fun. */ 628 /* perl manages to free our internal AV and _then_ call us */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 629 if (IN_DESTRUCT)
630 return 0;
631
632 while (len--)
483 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
484
485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
486 634
487 return 0; 635 return 0;
488} 636}
489 637
490static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
491 0, 0, 0, 0, 639 0, 0, 0, 0,
492 coro_cv_free 640 coro_cv_free
493}; 641};
494 642
495/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
496static void 644ecb_inline void
497get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
498{ 646{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 648 size_t *lenp;
501 649
502 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
503 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
504 else 652 else
505 { 653 {
506#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
507 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
508 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
515#endif 663#endif
516 } 664 }
517} 665}
518 666
519static void 667ecb_inline void
520put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
521{ 669{
522 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
523 AV *av;
524 671
525 if (expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
527 682
528 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
529
530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
531 av_extend (av, AvFILLp (av) + 1);
532
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 684}
535 685
536/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
687
688ecb_inline void
689swap_sv (SV *a, SV *b)
690{
691 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
692 SV tmp;
693
694 /* swap sv_any */
695 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
696
697 /* swap sv_flags */
698 SvFLAGS (&tmp) = SvFLAGS (a);
699 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
700 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
701
702#if PERL_VERSION_ATLEAST (5,10,0)
703 /* perl 5.10 and later complicates this _quite_ a bit, but it also
704 * is much faster, so no quarrels here. alternatively, we could
705 * sv_upgrade to avoid this.
706 */
707 {
708 /* swap sv_u */
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710
711 /* if SvANY points to the head, we need to adjust the pointers,
712 * as the pointer for a still points to b, and maybe vice versa.
713 */
714 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
716 svany_in_head_set |= 1 << SVt_NV;
717 #endif
718
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
720
721 if (svany_in_head (SvTYPE (a)))
722 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
723
724 if (svany_in_head (SvTYPE (b)))
725 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
726 }
727#endif
728}
729
730/* swap sv heads, at least logically */
731static void
732swap_svs (pTHX_ Coro__State c)
733{
734 int i;
735
736 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
737 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
738}
739
740#define SWAP_SVS(coro) \
741 if (ecb_expect_false ((coro)->swap_sv)) \
742 swap_svs (aTHX_ (coro))
537 743
538static void 744static void
539on_enterleave_call (pTHX_ SV *cb); 745on_enterleave_call (pTHX_ SV *cb);
540 746
541static void 747static void
… …
544 perl_slots *slot = c->slot; 750 perl_slots *slot = c->slot;
545 c->slot = 0; 751 c->slot = 0;
546 752
547 PL_mainstack = c->mainstack; 753 PL_mainstack = c->mainstack;
548 754
549 GvSV (PL_defgv) = slot->defsv; 755#if CORO_JIT
550 GvAV (PL_defgv) = slot->defav; 756 load_perl_slots (slot);
551 GvSV (PL_errgv) = slot->errsv; 757#else
552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
554
555 #define VAR(name,type) PL_ ## name = slot->name; 758 #define VARx(name,expr,type) expr = slot->name;
556 # include "state.h" 759 #include "state.h"
557 #undef VAR 760#endif
558 761
559 { 762 {
560 dSP; 763 dSP;
561 764
562 CV *cv; 765 CV *cv;
563 766
564 /* now do the ugly restore mess */ 767 /* now do the ugly restore mess */
565 while (expect_true (cv = (CV *)POPs)) 768 while (ecb_expect_true (cv = (CV *)POPs))
566 { 769 {
567 put_padlist (aTHX_ cv); /* mark this padlist as available */ 770 put_padlist (aTHX_ cv); /* mark this padlist as available */
568 CvDEPTH (cv) = PTR2IV (POPs); 771 CvDEPTH (cv) = PTR2IV (POPs);
569 CvPADLIST (cv) = (AV *)POPs; 772 CvPADLIST (cv) = (PADLIST *)POPs;
570 } 773 }
571 774
572 PUTBACK; 775 PUTBACK;
573 } 776 }
574 777
575 slf_frame = c->slf_frame; 778 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 779 CORO_THROW = c->except;
577 780
781 if (ecb_expect_false (enable_times))
782 {
783 if (ecb_expect_false (!times_valid))
784 coro_times_update ();
785
786 coro_times_sub (c);
787 }
788
578 if (expect_false (c->on_enter)) 789 if (ecb_expect_false (c->on_enter))
579 { 790 {
580 int i; 791 int i;
581 792
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 793 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 795 }
796
797 if (ecb_expect_false (c->on_enter_xs))
798 {
799 int i;
800
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
802 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
803 }
804
805 SWAP_SVS (c);
585} 806}
586 807
587static void 808static void
588save_perl (pTHX_ Coro__State c) 809save_perl (pTHX_ Coro__State c)
589{ 810{
811 SWAP_SVS (c);
812
813 if (ecb_expect_false (c->on_leave_xs))
814 {
815 int i;
816
817 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
818 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
819 }
820
590 if (expect_false (c->on_leave)) 821 if (ecb_expect_false (c->on_leave))
591 { 822 {
592 int i; 823 int i;
593 824
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 825 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 826 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
827 }
828
829 times_valid = 0;
830
831 if (ecb_expect_false (enable_times))
832 {
833 coro_times_update (); times_valid = 1;
834 coro_times_add (c);
596 } 835 }
597 836
598 c->except = CORO_THROW; 837 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 838 c->slf_frame = slf_frame;
600 839
… …
611 850
612 XPUSHs (Nullsv); 851 XPUSHs (Nullsv);
613 /* this loop was inspired by pp_caller */ 852 /* this loop was inspired by pp_caller */
614 for (;;) 853 for (;;)
615 { 854 {
616 while (expect_true (cxix >= 0)) 855 while (ecb_expect_true (cxix >= 0))
617 { 856 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 857 PERL_CONTEXT *cx = &ccstk[cxix--];
619 858
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 859 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 860 {
622 CV *cv = cx->blk_sub.cv; 861 CV *cv = cx->blk_sub.cv;
623 862
624 if (expect_true (CvDEPTH (cv))) 863 if (ecb_expect_true (CvDEPTH (cv)))
625 { 864 {
626 EXTEND (SP, 3); 865 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 866 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 867 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 868 PUSHs ((SV *)cv);
… …
632 get_padlist (aTHX_ cv); 871 get_padlist (aTHX_ cv);
633 } 872 }
634 } 873 }
635 } 874 }
636 875
637 if (expect_true (top_si->si_type == PERLSI_MAIN)) 876 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
638 break; 877 break;
639 878
640 top_si = top_si->si_prev; 879 top_si = top_si->si_prev;
641 ccstk = top_si->si_cxstack; 880 ccstk = top_si->si_cxstack;
642 cxix = top_si->si_cxix; 881 cxix = top_si->si_cxix;
… …
644 883
645 PUTBACK; 884 PUTBACK;
646 } 885 }
647 886
648 /* allocate some space on the context stack for our purposes */ 887 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 888 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 889 {
654 int i; 890 unsigned int i;
891
655 for (i = 3; i < SLOT_COUNT; ++i) 892 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 893 CXINC;
657 } 894
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 895 cxstack_ix -= SLOT_COUNT; /* undo allocation */
896 }
659 897
660 c->mainstack = PL_mainstack; 898 c->mainstack = PL_mainstack;
661 899
662 { 900 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 901 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
664 902
665 slot->defav = GvAV (PL_defgv); 903#if CORO_JIT
666 slot->defsv = DEFSV; 904 save_perl_slots (slot);
667 slot->errsv = ERRSV; 905#else
668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
670
671 #define VAR(name,type) slot->name = PL_ ## name; 906 #define VARx(name,expr,type) slot->name = expr;
672 # include "state.h" 907 #include "state.h"
673 #undef VAR 908#endif
674 } 909 }
675} 910}
676 911
677/* 912/*
678 * allocate various perl stacks. This is almost an exact copy 913 * allocate various perl stacks. This is almost an exact copy
… …
684# define coro_init_stacks(thx) init_stacks () 919# define coro_init_stacks(thx) init_stacks ()
685#else 920#else
686static void 921static void
687coro_init_stacks (pTHX) 922coro_init_stacks (pTHX)
688{ 923{
689 PL_curstackinfo = new_stackinfo(32, 8); 924 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 925 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 926 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 927 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 928
694 PL_stack_base = AvARRAY(PL_curstack); 929 PL_stack_base = AvARRAY(PL_curstack);
… …
709#endif 944#endif
710 945
711 New(54,PL_scopestack,8,I32); 946 New(54,PL_scopestack,8,I32);
712 PL_scopestack_ix = 0; 947 PL_scopestack_ix = 0;
713 PL_scopestack_max = 8; 948 PL_scopestack_max = 8;
949#if HAS_SCOPESTACK_NAME
950 New(54,PL_scopestack_name,8,const char*);
951#endif
714 952
715 New(54,PL_savestack,24,ANY); 953 New(54,PL_savestack,24,ANY);
716 PL_savestack_ix = 0; 954 PL_savestack_ix = 0;
717 PL_savestack_max = 24; 955 PL_savestack_max = 24;
718 956
… …
746 } 984 }
747 985
748 Safefree (PL_tmps_stack); 986 Safefree (PL_tmps_stack);
749 Safefree (PL_markstack); 987 Safefree (PL_markstack);
750 Safefree (PL_scopestack); 988 Safefree (PL_scopestack);
989#if HAS_SCOPESTACK_NAME
990 Safefree (PL_scopestack_name);
991#endif
751 Safefree (PL_savestack); 992 Safefree (PL_savestack);
752#if !PERL_VERSION_ATLEAST (5,10,0) 993#if !PERL_VERSION_ATLEAST (5,10,0)
753 Safefree (PL_retstack); 994 Safefree (PL_retstack);
754#endif 995#endif
755} 996}
… …
801#endif 1042#endif
802 1043
803/* 1044/*
804 * This overrides the default magic get method of %SIG elements. 1045 * This overrides the default magic get method of %SIG elements.
805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1046 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
806 * and instead of trying to save and restore the hash elements, we just provide 1047 * and instead of trying to save and restore the hash elements (extremely slow),
807 * readback here. 1048 * we just provide our own readback here.
808 */ 1049 */
809static int 1050static int ecb_cold
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1051coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 1052{
812 const char *s = MgPV_nolen_const (mg); 1053 const char *s = MgPV_nolen_const (mg);
813 1054
814 if (*s == '_') 1055 if (*s == '_')
815 { 1056 {
816 SV **svp = 0; 1057 SV **svp = 0;
817 1058
818 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
819 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
820 1061
821 if (svp) 1062 if (svp)
822 { 1063 {
823 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1064 SV *ssv;
1065
1066 if (!*svp)
1067 ssv = &PL_sv_undef;
1068 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1069 ssv = sv_2mortal (newRV_inc (*svp));
1070 else
1071 ssv = *svp;
1072
1073 sv_setsv (sv, ssv);
824 return 0; 1074 return 0;
825 } 1075 }
826 } 1076 }
827 1077
828 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1078 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
829} 1079}
830 1080
831static int 1081static int ecb_cold
832coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1082coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
833{ 1083{
834 const char *s = MgPV_nolen_const (mg); 1084 const char *s = MgPV_nolen_const (mg);
835 1085
836 if (*s == '_') 1086 if (*s == '_')
… …
850 } 1100 }
851 1101
852 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1102 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
853} 1103}
854 1104
855static int 1105static int ecb_cold
856coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1106coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
857{ 1107{
858 const char *s = MgPV_nolen_const (mg); 1108 const char *s = MgPV_nolen_const (mg);
859 1109
860 if (*s == '_') 1110 if (*s == '_')
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1143slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1144{
895 return 1; 1145 return 1;
896} 1146}
897 1147
898static UNOP coro_setup_op; 1148static UNOP init_perl_op;
899 1149
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1150ecb_noinline static void /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 1151init_perl (pTHX_ struct coro *coro)
902{ 1152{
903 /* 1153 /*
904 * emulate part of the perl startup here. 1154 * emulate part of the perl startup here.
905 */ 1155 */
906 coro_init_stacks (aTHX); 1156 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1163 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1164 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1165 PL_curpm = 0;
916 PL_curpad = 0; 1166 PL_curpad = 0;
917 PL_localizing = 0; 1167 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1168 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1169#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1170 PL_parser = 0;
922#endif 1171#endif
923 PL_hints = 0; 1172 PL_hints = 0;
924 1173
925 /* recreate the die/warn hooks */ 1174 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1175 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1176 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1177
929 GvSV (PL_defgv) = newSV (0); 1178 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1179 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1180 GvSV (PL_errgv) = newSV (0);
932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1181 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
933 GvHV (PL_hintgv) = 0; 1182 GvHV (PL_hintgv) = newHV ();
1183#if PERL_VERSION_ATLEAST (5,10,0)
1184 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1185#endif
934 PL_rs = newSVsv (GvSV (irsgv)); 1186 PL_rs = newSVsv (GvSV (irsgv));
935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1187 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
936 1188
937 { 1189 {
938 dSP; 1190 dSP;
… …
953 /* this newly created coroutine might be run on an existing cctx which most 1205 /* this newly created coroutine might be run on an existing cctx which most
954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1206 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
955 */ 1207 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1208 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1209 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1210 slf_frame.destroy = 0;
958 1211
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1212 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
960 coro_setup_op.op_next = PL_op; 1213 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1214 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1215 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1216 /* no flags etc. required, as an init function won't be called */
964 1217
965 PL_op = (OP *)&coro_setup_op; 1218 PL_op = (OP *)&init_perl_op;
966 1219
967 /* copy throw, in case it was set before coro_setup */ 1220 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1221 CORO_THROW = coro->except;
1222
1223 SWAP_SVS (coro);
1224
1225 if (ecb_expect_false (enable_times))
1226 {
1227 coro_times_update ();
1228 coro_times_sub (coro);
1229 }
969} 1230}
970 1231
971static void 1232static void
972coro_unwind_stacks (pTHX) 1233coro_unwind_stacks (pTHX)
973{ 1234{
… …
988 dounwind (-1); 1249 dounwind (-1);
989 } 1250 }
990} 1251}
991 1252
992static void 1253static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1254destroy_perl (pTHX_ struct coro *coro)
994{ 1255{
1256 SV *svf [9];
1257
1258 {
1259 SV *old_current = SvRV (coro_current);
1260 struct coro *current = SvSTATE (old_current);
1261
1262 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1263
1264 save_perl (aTHX_ current);
1265
1266 /* this will cause transfer_check to croak on block*/
1267 SvRV_set (coro_current, (SV *)coro->hv);
1268
1269 load_perl (aTHX_ coro);
1270
995 coro_unwind_stacks (aTHX); 1271 coro_unwind_stacks (aTHX);
996 1272
997 SvREFCNT_dec (GvSV (PL_defgv)); 1273 /* restore swapped sv's */
998 SvREFCNT_dec (GvAV (PL_defgv)); 1274 SWAP_SVS (coro);
999 SvREFCNT_dec (GvSV (PL_errgv));
1000 SvREFCNT_dec (PL_defoutgv);
1001 SvREFCNT_dec (PL_rs);
1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
1004 1275
1005 SvREFCNT_dec (PL_diehook); 1276 coro_destruct_stacks (aTHX);
1006 SvREFCNT_dec (PL_warnhook); 1277
1278 /* now save some sv's to be free'd later */
1279 svf [0] = GvSV (PL_defgv);
1280 svf [1] = (SV *)GvAV (PL_defgv);
1281 svf [2] = GvSV (PL_errgv);
1282 svf [3] = (SV *)PL_defoutgv;
1283 svf [4] = PL_rs;
1284 svf [5] = GvSV (irsgv);
1285 svf [6] = (SV *)GvHV (PL_hintgv);
1286 svf [7] = PL_diehook;
1287 svf [8] = PL_warnhook;
1288 assert (9 == sizeof (svf) / sizeof (*svf));
1289
1290 SvRV_set (coro_current, old_current);
1291
1292 load_perl (aTHX_ current);
1007 1293 }
1294
1295 {
1296 unsigned int i;
1297
1298 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1299 SvREFCNT_dec (svf [i]);
1300
1008 SvREFCNT_dec (coro->saved_deffh); 1301 SvREFCNT_dec (coro->saved_deffh);
1009 SvREFCNT_dec (coro->rouse_cb); 1302 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb); 1303 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av); 1304 SvREFCNT_dec (coro->invoke_av);
1012 1305 SvREFCNT_dec (coro->on_enter_xs);
1013 coro_destruct_stacks (aTHX); 1306 SvREFCNT_dec (coro->on_leave_xs);
1307 }
1014} 1308}
1015 1309
1016INLINE void 1310ecb_inline void
1017free_coro_mortal (pTHX) 1311free_coro_mortal (pTHX)
1018{ 1312{
1019 if (expect_true (coro_mortal)) 1313 if (ecb_expect_true (coro_mortal))
1020 { 1314 {
1021 SvREFCNT_dec (coro_mortal); 1315 SvREFCNT_dec ((SV *)coro_mortal);
1022 coro_mortal = 0; 1316 coro_mortal = 0;
1023 } 1317 }
1024} 1318}
1025 1319
1026static int 1320static int
… …
1080 1374
1081 if (PL_curcop != &PL_compiling) 1375 if (PL_curcop != &PL_compiling)
1082 { 1376 {
1083 SV **cb; 1377 SV **cb;
1084 1378
1085 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1379 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1086 { 1380 {
1087 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1381 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1088 1382
1089 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1383 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1090 { 1384 {
… …
1159 1453
1160 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1454 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1161} 1455}
1162 1456
1163/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1457/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1164static void NOINLINE 1458static void ecb_noinline
1165cctx_prepare (pTHX) 1459cctx_prepare (pTHX)
1166{ 1460{
1167 PL_top_env = &PL_start_env; 1461 PL_top_env = &PL_start_env;
1168 1462
1169 if (cctx_current->flags & CC_TRACE) 1463 if (cctx_current->flags & CC_TRACE)
… …
1180 slf_frame.prepare = slf_prepare_set_stacklevel; 1474 slf_frame.prepare = slf_prepare_set_stacklevel;
1181 slf_frame.check = slf_check_set_stacklevel; 1475 slf_frame.check = slf_check_set_stacklevel;
1182} 1476}
1183 1477
1184/* the tail of transfer: execute stuff we can only do after a transfer */ 1478/* the tail of transfer: execute stuff we can only do after a transfer */
1185INLINE void 1479ecb_inline void
1186transfer_tail (pTHX) 1480transfer_tail (pTHX)
1187{ 1481{
1188 free_coro_mortal (aTHX); 1482 free_coro_mortal (aTHX);
1483}
1484
1485/* try to exit the same way perl's main function would do */
1486/* we do not bother resetting the environment or other things *7
1487/* that are not, uhm, essential */
1488/* this obviously also doesn't work when perl is embedded */
1489static void ecb_noinline ecb_cold
1490perlish_exit (pTHX)
1491{
1492 int exitstatus = perl_destruct (PL_curinterp);
1493 perl_free (PL_curinterp);
1494 exit (exitstatus);
1189} 1495}
1190 1496
1191/* 1497/*
1192 * this is a _very_ stripped down perl interpreter ;) 1498 * this is a _very_ stripped down perl interpreter ;)
1193 */ 1499 */
… …
1215 /* somebody or something will hit me for both perl_run and PL_restartop */ 1521 /* somebody or something will hit me for both perl_run and PL_restartop */
1216 PL_restartop = PL_op; 1522 PL_restartop = PL_op;
1217 perl_run (PL_curinterp); 1523 perl_run (PL_curinterp);
1218 /* 1524 /*
1219 * Unfortunately, there is no way to get at the return values of the 1525 * Unfortunately, there is no way to get at the return values of the
1220 * coro body here, as perl_run destroys these 1526 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1527 * runtime errors here, as this is just a random interpreter, not a thread.
1221 */ 1528 */
1222 1529
1223 /* 1530 /*
1224 * If perl-run returns we assume exit() was being called or the coro 1531 * If perl-run returns we assume exit() was being called or the coro
1225 * fell off the end, which seems to be the only valid (non-bug) 1532 * fell off the end, which seems to be the only valid (non-bug)
1226 * reason for perl_run to return. We try to exit by jumping to the 1533 * reason for perl_run to return. We try to mimic whatever perl is normally
1227 * bootstrap-time "top" top_env, as we cannot restore the "main" 1534 * doing in that case. YMMV.
1228 * coroutine as Coro has no such concept.
1229 * This actually isn't valid with the pthread backend, but OSes requiring
1230 * that backend are too broken to do it in a standards-compliant way.
1231 */ 1535 */
1232 PL_top_env = main_top_env; 1536 perlish_exit (aTHX);
1233 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1234 } 1537 }
1235} 1538}
1236 1539
1237static coro_cctx * 1540static coro_cctx *
1238cctx_new () 1541cctx_new (void)
1239{ 1542{
1240 coro_cctx *cctx; 1543 coro_cctx *cctx;
1241 1544
1242 ++cctx_count; 1545 ++cctx_count;
1243 New (0, cctx, 1, coro_cctx); 1546 New (0, cctx, 1, coro_cctx);
… …
1249 return cctx; 1552 return cctx;
1250} 1553}
1251 1554
1252/* create a new cctx only suitable as source */ 1555/* create a new cctx only suitable as source */
1253static coro_cctx * 1556static coro_cctx *
1254cctx_new_empty () 1557cctx_new_empty (void)
1255{ 1558{
1256 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1257 1560
1258 cctx->sptr = 0; 1561 cctx->stack.sptr = 0;
1259 coro_create (&cctx->cctx, 0, 0, 0, 0); 1562 coro_create (&cctx->cctx, 0, 0, 0, 0);
1260 1563
1261 return cctx; 1564 return cctx;
1262} 1565}
1263 1566
1264/* create a new cctx suitable as destination/running a perl interpreter */ 1567/* create a new cctx suitable as destination/running a perl interpreter */
1265static coro_cctx * 1568static coro_cctx *
1266cctx_new_run () 1569cctx_new_run (void)
1267{ 1570{
1268 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1269 void *stack_start;
1270 size_t stack_size;
1271 1572
1272#if HAVE_MMAP 1573 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1273 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1274 /* mmap supposedly does allocate-on-write for us */
1275 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1276
1277 if (cctx->sptr != (void *)-1)
1278 {
1279 #if CORO_STACKGUARD
1280 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1281 #endif
1282 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1283 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1284 cctx->flags |= CC_MAPPED;
1285 } 1574 {
1286 else
1287#endif
1288 {
1289 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1290 New (0, cctx->sptr, cctx_stacksize, long);
1291
1292 if (!cctx->sptr)
1293 {
1294 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1575 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1295 _exit (EXIT_FAILURE); 1576 _exit (EXIT_FAILURE);
1296 }
1297
1298 stack_start = cctx->sptr;
1299 stack_size = cctx->ssize;
1300 } 1577 }
1301 1578
1302 #if CORO_USE_VALGRIND
1303 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1304 #endif
1305
1306 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1579 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1307 1580
1308 return cctx; 1581 return cctx;
1309} 1582}
1310 1583
1311static void 1584static void
1312cctx_destroy (coro_cctx *cctx) 1585cctx_destroy (coro_cctx *cctx)
1313{ 1586{
1314 if (!cctx) 1587 if (!cctx)
1315 return; 1588 return;
1316 1589
1317 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1590 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1318 1591
1319 --cctx_count; 1592 --cctx_count;
1320 coro_destroy (&cctx->cctx); 1593 coro_destroy (&cctx->cctx);
1321 1594
1322 /* coro_transfer creates new, empty cctx's */ 1595 coro_stack_free (&cctx->stack);
1323 if (cctx->sptr)
1324 {
1325 #if CORO_USE_VALGRIND
1326 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1327 #endif
1328
1329#if HAVE_MMAP
1330 if (cctx->flags & CC_MAPPED)
1331 munmap (cctx->sptr, cctx->ssize);
1332 else
1333#endif
1334 Safefree (cctx->sptr);
1335 }
1336 1596
1337 Safefree (cctx); 1597 Safefree (cctx);
1338} 1598}
1339 1599
1340/* wether this cctx should be destructed */ 1600/* wether this cctx should be destructed */
1341#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1601#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1342 1602
1343static coro_cctx * 1603static coro_cctx *
1344cctx_get (pTHX) 1604cctx_get (pTHX)
1345{ 1605{
1346 while (expect_true (cctx_first)) 1606 while (ecb_expect_true (cctx_first))
1347 { 1607 {
1348 coro_cctx *cctx = cctx_first; 1608 coro_cctx *cctx = cctx_first;
1349 cctx_first = cctx->next; 1609 cctx_first = cctx->next;
1350 --cctx_idle; 1610 --cctx_idle;
1351 1611
1352 if (expect_true (!CCTX_EXPIRED (cctx))) 1612 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1353 return cctx; 1613 return cctx;
1354 1614
1355 cctx_destroy (cctx); 1615 cctx_destroy (cctx);
1356 } 1616 }
1357 1617
… …
1359} 1619}
1360 1620
1361static void 1621static void
1362cctx_put (coro_cctx *cctx) 1622cctx_put (coro_cctx *cctx)
1363{ 1623{
1364 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1624 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1365 1625
1366 /* free another cctx if overlimit */ 1626 /* free another cctx if overlimit */
1367 if (expect_false (cctx_idle >= cctx_max_idle)) 1627 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1368 { 1628 {
1369 coro_cctx *first = cctx_first; 1629 coro_cctx *first = cctx_first;
1370 cctx_first = first->next; 1630 cctx_first = first->next;
1371 --cctx_idle; 1631 --cctx_idle;
1372 1632
… …
1383static void 1643static void
1384transfer_check (pTHX_ struct coro *prev, struct coro *next) 1644transfer_check (pTHX_ struct coro *prev, struct coro *next)
1385{ 1645{
1386 /* TODO: throwing up here is considered harmful */ 1646 /* TODO: throwing up here is considered harmful */
1387 1647
1388 if (expect_true (prev != next)) 1648 if (ecb_expect_true (prev != next))
1389 { 1649 {
1390 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1650 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1391 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1651 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1392 1652
1393 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1653 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1394 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1654 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1395 1655
1396#if !PERL_VERSION_ATLEAST (5,10,0) 1656#if !PERL_VERSION_ATLEAST (5,10,0)
1397 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1657 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1398 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1658 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1399#endif 1659#endif
1400 } 1660 }
1401} 1661}
1402 1662
1403/* always use the TRANSFER macro */ 1663/* always use the TRANSFER macro */
1404static void NOINLINE /* noinline so we have a fixed stackframe */ 1664static void ecb_noinline /* noinline so we have a fixed stackframe */
1405transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1665transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1406{ 1666{
1407 dSTACKLEVEL; 1667 dSTACKLEVEL;
1408 1668
1409 /* sometimes transfer is only called to set idle_sp */ 1669 /* sometimes transfer is only called to set idle_sp */
1410 if (expect_false (!prev)) 1670 if (ecb_expect_false (!prev))
1411 { 1671 {
1412 cctx_current->idle_sp = STACKLEVEL; 1672 cctx_current->idle_sp = STACKLEVEL;
1413 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1673 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1414 } 1674 }
1415 else if (expect_true (prev != next)) 1675 else if (ecb_expect_true (prev != next))
1416 { 1676 {
1417 coro_cctx *cctx_prev; 1677 coro_cctx *cctx_prev;
1418 1678
1419 if (expect_false (prev->flags & CF_NEW)) 1679 if (ecb_expect_false (prev->flags & CF_NEW))
1420 { 1680 {
1421 /* create a new empty/source context */ 1681 /* create a new empty/source context */
1422 prev->flags &= ~CF_NEW; 1682 prev->flags &= ~CF_NEW;
1423 prev->flags |= CF_RUNNING; 1683 prev->flags |= CF_RUNNING;
1424 } 1684 }
… …
1427 next->flags |= CF_RUNNING; 1687 next->flags |= CF_RUNNING;
1428 1688
1429 /* first get rid of the old state */ 1689 /* first get rid of the old state */
1430 save_perl (aTHX_ prev); 1690 save_perl (aTHX_ prev);
1431 1691
1432 if (expect_false (next->flags & CF_NEW)) 1692 if (ecb_expect_false (next->flags & CF_NEW))
1433 { 1693 {
1434 /* need to start coroutine */ 1694 /* need to start coroutine */
1435 next->flags &= ~CF_NEW; 1695 next->flags &= ~CF_NEW;
1436 /* setup coroutine call */ 1696 /* setup coroutine call */
1437 coro_setup (aTHX_ next); 1697 init_perl (aTHX_ next);
1438 } 1698 }
1439 else 1699 else
1440 load_perl (aTHX_ next); 1700 load_perl (aTHX_ next);
1441 1701
1442 /* possibly untie and reuse the cctx */ 1702 /* possibly untie and reuse the cctx */
1443 if (expect_true ( 1703 if (ecb_expect_true (
1444 cctx_current->idle_sp == STACKLEVEL 1704 cctx_current->idle_sp == STACKLEVEL
1445 && !(cctx_current->flags & CC_TRACE) 1705 && !(cctx_current->flags & CC_TRACE)
1446 && !force_cctx 1706 && !force_cctx
1447 )) 1707 ))
1448 { 1708 {
1449 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1709 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1450 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1710 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1451 1711
1452 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1712 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1453 /* without this the next cctx_get might destroy the running cctx while still in use */ 1713 /* without this the next cctx_get might destroy the running cctx while still in use */
1454 if (expect_false (CCTX_EXPIRED (cctx_current))) 1714 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1455 if (expect_true (!next->cctx)) 1715 if (ecb_expect_true (!next->cctx))
1456 next->cctx = cctx_get (aTHX); 1716 next->cctx = cctx_get (aTHX);
1457 1717
1458 cctx_put (cctx_current); 1718 cctx_put (cctx_current);
1459 } 1719 }
1460 else 1720 else
1461 prev->cctx = cctx_current; 1721 prev->cctx = cctx_current;
1462 1722
1463 ++next->usecount; 1723 ++next->usecount;
1464 1724
1465 cctx_prev = cctx_current; 1725 cctx_prev = cctx_current;
1466 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1726 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1467 1727
1468 next->cctx = 0; 1728 next->cctx = 0;
1469 1729
1470 if (expect_false (cctx_prev != cctx_current)) 1730 if (ecb_expect_false (cctx_prev != cctx_current))
1471 { 1731 {
1472 cctx_prev->top_env = PL_top_env; 1732 cctx_prev->top_env = PL_top_env;
1473 PL_top_env = cctx_current->top_env; 1733 PL_top_env = cctx_current->top_env;
1474 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1734 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1475 } 1735 }
… …
1481#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1741#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1482#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1742#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1483 1743
1484/** high level stuff ********************************************************/ 1744/** high level stuff ********************************************************/
1485 1745
1746/* this function is actually Coro, not Coro::State, but we call it from here */
1747/* because it is convenient - but it hasn't been declared yet for that reason */
1486static int 1748static void
1749coro_call_on_destroy (pTHX_ struct coro *coro);
1750
1751static void
1487coro_state_destroy (pTHX_ struct coro *coro) 1752coro_state_destroy (pTHX_ struct coro *coro)
1488{ 1753{
1489 if (coro->flags & CF_DESTROYED) 1754 if (coro->flags & CF_ZOMBIE)
1490 return 0; 1755 return;
1491 1756
1492 if (coro->on_destroy && !PL_dirty)
1493 coro->on_destroy (aTHX_ coro); 1757 slf_destroy (aTHX_ coro);
1494 1758
1495 coro->flags |= CF_DESTROYED; 1759 coro->flags |= CF_ZOMBIE;
1496 1760
1497 if (coro->flags & CF_READY) 1761 if (coro->flags & CF_READY)
1498 { 1762 {
1499 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1763 /* reduce nready, as destroying a ready coro effectively unreadies it */
1500 /* alternative: look through all ready queues and remove the coro */ 1764 /* alternative: look through all ready queues and remove the coro */
1501 --coro_nready; 1765 --coro_nready;
1502 } 1766 }
1503 else 1767 else
1504 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1768 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1769
1770 if (coro->next) coro->next->prev = coro->prev;
1771 if (coro->prev) coro->prev->next = coro->next;
1772 if (coro == coro_first) coro_first = coro->next;
1505 1773
1506 if (coro->mainstack 1774 if (coro->mainstack
1507 && coro->mainstack != main_mainstack 1775 && coro->mainstack != main_mainstack
1508 && coro->slot 1776 && coro->slot
1509 && !PL_dirty) 1777 && !PL_dirty)
1510 {
1511 struct coro *current = SvSTATE_current;
1512
1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1514
1515 save_perl (aTHX_ current);
1516 load_perl (aTHX_ coro);
1517
1518 coro_destruct_perl (aTHX_ coro); 1778 destroy_perl (aTHX_ coro);
1519
1520 load_perl (aTHX_ current);
1521
1522 coro->slot = 0;
1523 }
1524 1779
1525 cctx_destroy (coro->cctx); 1780 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv); 1781 SvREFCNT_dec (coro->startcv);
1527 SvREFCNT_dec (coro->args); 1782 SvREFCNT_dec (coro->args);
1783 SvREFCNT_dec (coro->swap_sv);
1528 SvREFCNT_dec (CORO_THROW); 1784 SvREFCNT_dec (CORO_THROW);
1529 1785
1530 if (coro->next) coro->next->prev = coro->prev; 1786 coro_call_on_destroy (aTHX_ coro);
1531 if (coro->prev) coro->prev->next = coro->next;
1532 if (coro == coro_first) coro_first = coro->next;
1533 1787
1534 return 1; 1788 /* more destruction mayhem in coro_state_free */
1535} 1789}
1536 1790
1537static int 1791static int
1538coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1792coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1539{ 1793{
1540 struct coro *coro = (struct coro *)mg->mg_ptr; 1794 struct coro *coro = (struct coro *)mg->mg_ptr;
1541 mg->mg_ptr = 0; 1795 mg->mg_ptr = 0;
1542 1796
1543 coro->hv = 0;
1544
1545 if (--coro->refcnt < 0)
1546 {
1547 coro_state_destroy (aTHX_ coro); 1797 coro_state_destroy (aTHX_ coro);
1798 SvREFCNT_dec (coro->on_destroy);
1799 SvREFCNT_dec (coro->status);
1800
1548 Safefree (coro); 1801 Safefree (coro);
1549 }
1550 1802
1551 return 0; 1803 return 0;
1552} 1804}
1553 1805
1554static int 1806static int ecb_cold
1555coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1807coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1556{ 1808{
1557 struct coro *coro = (struct coro *)mg->mg_ptr; 1809 /* called when perl clones the current process the slow way (windows process emulation) */
1558 1810 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1559 ++coro->refcnt; 1811 mg->mg_ptr = 0;
1812 mg->mg_virtual = 0;
1560 1813
1561 return 0; 1814 return 0;
1562} 1815}
1563 1816
1564static MGVTBL coro_state_vtbl = { 1817static MGVTBL coro_state_vtbl = {
… …
1587 1840
1588 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1841 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1589 TRANSFER (ta, 1); 1842 TRANSFER (ta, 1);
1590} 1843}
1591 1844
1592/*****************************************************************************/
1593/* gensub: simple closure generation utility */
1594
1595#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1596
1597/* create a closure from XS, returns a code reference */
1598/* the arg can be accessed via GENSUB_ARG from the callback */
1599/* the callback must use dXSARGS/XSRETURN */
1600static SV *
1601gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1602{
1603 CV *cv = (CV *)newSV (0);
1604
1605 sv_upgrade ((SV *)cv, SVt_PVCV);
1606
1607 CvANON_on (cv);
1608 CvISXSUB_on (cv);
1609 CvXSUB (cv) = xsub;
1610 GENSUB_ARG = arg;
1611
1612 return newRV_noinc ((SV *)cv);
1613}
1614
1615/** Coro ********************************************************************/ 1845/** Coro ********************************************************************/
1616 1846
1617INLINE void 1847ecb_inline void
1618coro_enq (pTHX_ struct coro *coro) 1848coro_enq (pTHX_ struct coro *coro)
1619{ 1849{
1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1850 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1621 1851
1622 SvREFCNT_inc_NN (coro->hv); 1852 SvREFCNT_inc_NN (coro->hv);
1623 1853
1624 coro->next_ready = 0; 1854 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1855 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1626 ready [1] = coro; 1856 ready [1] = coro;
1627} 1857}
1628 1858
1629INLINE struct coro * 1859ecb_inline struct coro *
1630coro_deq (pTHX) 1860coro_deq (pTHX)
1631{ 1861{
1632 int prio; 1862 int prio;
1633 1863
1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1864 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1635 { 1865 {
1636 struct coro **ready = coro_ready [prio]; 1866 struct coro **ready = coro_ready [prio];
1637 1867
1638 if (ready [0]) 1868 if (ready [0])
1639 { 1869 {
… …
1644 } 1874 }
1645 1875
1646 return 0; 1876 return 0;
1647} 1877}
1648 1878
1879static void
1880invoke_sv_ready_hook_helper (void)
1881{
1882 dTHX;
1883 dSP;
1884
1885 ENTER;
1886 SAVETMPS;
1887
1888 PUSHMARK (SP);
1889 PUTBACK;
1890 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1891
1892 FREETMPS;
1893 LEAVE;
1894}
1895
1649static int 1896static int
1650api_ready (pTHX_ SV *coro_sv) 1897api_ready (pTHX_ SV *coro_sv)
1651{ 1898{
1652 struct coro *coro;
1653 SV *sv_hook;
1654 void (*xs_hook)(void);
1655
1656 coro = SvSTATE (coro_sv); 1899 struct coro *coro = SvSTATE (coro_sv);
1657 1900
1658 if (coro->flags & CF_READY) 1901 if (coro->flags & CF_READY)
1659 return 0; 1902 return 0;
1660 1903
1661 coro->flags |= CF_READY; 1904 coro->flags |= CF_READY;
1662 1905
1663 sv_hook = coro_nready ? 0 : coro_readyhook;
1664 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1665
1666 coro_enq (aTHX_ coro); 1906 coro_enq (aTHX_ coro);
1667 ++coro_nready;
1668 1907
1669 if (sv_hook) 1908 if (!coro_nready++)
1670 { 1909 if (coroapi.readyhook)
1671 dSP; 1910 coroapi.readyhook ();
1672
1673 ENTER;
1674 SAVETMPS;
1675
1676 PUSHMARK (SP);
1677 PUTBACK;
1678 call_sv (sv_hook, G_VOID | G_DISCARD);
1679
1680 FREETMPS;
1681 LEAVE;
1682 }
1683
1684 if (xs_hook)
1685 xs_hook ();
1686 1911
1687 return 1; 1912 return 1;
1688} 1913}
1689 1914
1690static int 1915static int
… …
1692{ 1917{
1693 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1918 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1694} 1919}
1695 1920
1696/* expects to own a reference to next->hv */ 1921/* expects to own a reference to next->hv */
1697INLINE void 1922ecb_inline void
1698prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1923prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1699{ 1924{
1700 SV *prev_sv = SvRV (coro_current); 1925 SV *prev_sv = SvRV (coro_current);
1701 1926
1702 ta->prev = SvSTATE_hv (prev_sv); 1927 ta->prev = SvSTATE_hv (prev_sv);
… …
1715{ 1940{
1716 for (;;) 1941 for (;;)
1717 { 1942 {
1718 struct coro *next = coro_deq (aTHX); 1943 struct coro *next = coro_deq (aTHX);
1719 1944
1720 if (expect_true (next)) 1945 if (ecb_expect_true (next))
1721 { 1946 {
1722 /* cannot transfer to destroyed coros, skip and look for next */ 1947 /* cannot transfer to destroyed coros, skip and look for next */
1723 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1948 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1724 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1949 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1725 else 1950 else
1726 { 1951 {
1727 next->flags &= ~CF_READY; 1952 next->flags &= ~CF_READY;
1728 --coro_nready; 1953 --coro_nready;
… …
1735 { 1960 {
1736 /* nothing to schedule: call the idle handler */ 1961 /* nothing to schedule: call the idle handler */
1737 if (SvROK (sv_idle) 1962 if (SvROK (sv_idle)
1738 && SvOBJECT (SvRV (sv_idle))) 1963 && SvOBJECT (SvRV (sv_idle)))
1739 { 1964 {
1965 if (SvRV (sv_idle) == SvRV (coro_current))
1966 {
1967 require_pv ("Carp");
1968
1969 {
1970 dSP;
1971
1972 ENTER;
1973 SAVETMPS;
1974
1975 PUSHMARK (SP);
1976 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1977 PUTBACK;
1978 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1979
1980 FREETMPS;
1981 LEAVE;
1982 }
1983 }
1984
1740 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1985 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1741 api_ready (aTHX_ SvRV (sv_idle)); 1986 api_ready (aTHX_ SvRV (sv_idle));
1742 --coro_nready; 1987 --coro_nready;
1743 } 1988 }
1744 else 1989 else
1745 { 1990 {
1991 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1746 dSP; 1992 dSP;
1747 1993
1748 ENTER; 1994 ENTER;
1749 SAVETMPS; 1995 SAVETMPS;
1750 1996
… …
1757 } 2003 }
1758 } 2004 }
1759 } 2005 }
1760} 2006}
1761 2007
1762INLINE void 2008ecb_inline void
1763prepare_cede (pTHX_ struct coro_transfer_args *ta) 2009prepare_cede (pTHX_ struct coro_transfer_args *ta)
1764{ 2010{
1765 api_ready (aTHX_ coro_current); 2011 api_ready (aTHX_ coro_current);
1766 prepare_schedule (aTHX_ ta); 2012 prepare_schedule (aTHX_ ta);
1767} 2013}
1768 2014
1769INLINE void 2015ecb_inline void
1770prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2016prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1771{ 2017{
1772 SV *prev = SvRV (coro_current); 2018 SV *prev = SvRV (coro_current);
1773 2019
1774 if (coro_nready) 2020 if (coro_nready)
… …
1804{ 2050{
1805 struct coro_transfer_args ta; 2051 struct coro_transfer_args ta;
1806 2052
1807 prepare_cede (aTHX_ &ta); 2053 prepare_cede (aTHX_ &ta);
1808 2054
1809 if (expect_true (ta.prev != ta.next)) 2055 if (ecb_expect_true (ta.prev != ta.next))
1810 { 2056 {
1811 TRANSFER (ta, 1); 2057 TRANSFER (ta, 1);
1812 return 1; 2058 return 1;
1813 } 2059 }
1814 else 2060 else
… …
1857 coro->slot->runops = RUNOPS_DEFAULT; 2103 coro->slot->runops = RUNOPS_DEFAULT;
1858 } 2104 }
1859} 2105}
1860 2106
1861static void 2107static void
2108coro_push_av (pTHX_ AV *av, I32 gimme_v)
2109{
2110 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2111 {
2112 dSP;
2113
2114 if (gimme_v == G_SCALAR)
2115 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2116 else
2117 {
2118 int i;
2119 EXTEND (SP, AvFILLp (av) + 1);
2120
2121 for (i = 0; i <= AvFILLp (av); ++i)
2122 PUSHs (AvARRAY (av)[i]);
2123 }
2124
2125 PUTBACK;
2126 }
2127}
2128
2129static void
2130coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2131{
2132 if (!coro->on_destroy)
2133 coro->on_destroy = newAV ();
2134
2135 av_push (coro->on_destroy, cb);
2136}
2137
2138static void
2139slf_destroy_join (pTHX_ struct CoroSLF *frame)
2140{
2141 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2142}
2143
2144static int
2145slf_check_join (pTHX_ struct CoroSLF *frame)
2146{
2147 struct coro *coro = (struct coro *)frame->data;
2148
2149 if (!coro->status)
2150 return 1;
2151
2152 frame->destroy = 0;
2153
2154 coro_push_av (aTHX_ coro->status, GIMME_V);
2155
2156 SvREFCNT_dec ((SV *)coro->hv);
2157
2158 return 0;
2159}
2160
2161static void
2162slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2163{
2164 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2165
2166 if (items > 1)
2167 croak ("join called with too many arguments");
2168
2169 if (coro->status)
2170 frame->prepare = prepare_nop;
2171 else
2172 {
2173 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2174 frame->prepare = prepare_schedule;
2175 }
2176
2177 frame->check = slf_check_join;
2178 frame->destroy = slf_destroy_join;
2179 frame->data = (void *)coro;
2180 SvREFCNT_inc (coro->hv);
2181}
2182
2183static void
1862coro_call_on_destroy (pTHX_ struct coro *coro) 2184coro_call_on_destroy (pTHX_ struct coro *coro)
1863{ 2185{
1864 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2186 AV *od = coro->on_destroy;
1865 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1866 2187
1867 if (on_destroyp) 2188 if (!od)
1868 { 2189 return;
1869 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1870 2190
2191 coro->on_destroy = 0;
2192 sv_2mortal ((SV *)od);
2193
1871 while (AvFILLp (on_destroy) >= 0) 2194 while (AvFILLp (od) >= 0)
2195 {
2196 SV *cb = sv_2mortal (av_pop (od));
2197
2198 /* coro hv's (and only hv's at the moment) are supported as well */
2199 if (SvSTATEhv_p (aTHX_ cb))
2200 api_ready (aTHX_ cb);
2201 else
1872 { 2202 {
1873 dSP; /* don't disturb outer sp */ 2203 dSP; /* don't disturb outer sp */
1874 SV *cb = av_pop (on_destroy);
1875
1876 PUSHMARK (SP); 2204 PUSHMARK (SP);
1877 2205
1878 if (statusp) 2206 if (coro->status)
1879 { 2207 {
1880 int i; 2208 PUTBACK;
1881 AV *status = (AV *)SvRV (*statusp); 2209 coro_push_av (aTHX_ coro->status, G_ARRAY);
1882 EXTEND (SP, AvFILLp (status) + 1); 2210 SPAGAIN;
1883
1884 for (i = 0; i <= AvFILLp (status); ++i)
1885 PUSHs (AvARRAY (status)[i]);
1886 } 2211 }
1887 2212
1888 PUTBACK; 2213 PUTBACK;
1889 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2214 call_sv (cb, G_VOID | G_DISCARD);
1890 } 2215 }
1891 } 2216 }
1892} 2217}
1893 2218
1894static void 2219static void
1895slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2220coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1896{ 2221{
2222 AV *av;
2223
2224 if (coro->status)
2225 {
2226 av = coro->status;
2227 av_clear (av);
2228 }
2229 else
2230 av = coro->status = newAV ();
2231
2232 /* items are actually not so common, so optimise for this case */
2233 if (items)
2234 {
1897 int i; 2235 int i;
1898 HV *hv = (HV *)SvRV (coro_current);
1899 AV *av = newAV ();
1900 2236
1901 av_extend (av, items - 1); 2237 av_extend (av, items - 1);
2238
1902 for (i = 0; i < items; ++i) 2239 for (i = 0; i < items; ++i)
1903 av_push (av, SvREFCNT_inc_NN (arg [i])); 2240 av_push (av, SvREFCNT_inc_NN (arg [i]));
2241 }
2242}
1904 2243
1905 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2244static void
1906 2245slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2246{
1907 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2247 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1908 api_ready (aTHX_ sv_manager); 2248 api_ready (aTHX_ sv_manager);
1909 2249
1910 frame->prepare = prepare_schedule; 2250 frame->prepare = prepare_schedule;
1911 frame->check = slf_check_repeat; 2251 frame->check = slf_check_repeat;
1912 2252
1913 /* as a minor optimisation, we could unwind all stacks here */ 2253 /* as a minor optimisation, we could unwind all stacks here */
1914 /* but that puts extra pressure on pp_slf, and is not worth much */ 2254 /* but that puts extra pressure on pp_slf, and is not worth much */
1915 /*coro_unwind_stacks (aTHX);*/ 2255 /*coro_unwind_stacks (aTHX);*/
2256}
2257
2258static void
2259slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2260{
2261 HV *coro_hv = (HV *)SvRV (coro_current);
2262
2263 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2264 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2265}
2266
2267static void
2268slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2269{
2270 HV *coro_hv;
2271 struct coro *coro;
2272
2273 if (items <= 0)
2274 croak ("Coro::cancel called without coro object,");
2275
2276 coro = SvSTATE (arg [0]);
2277 coro_hv = coro->hv;
2278
2279 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2280
2281 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2282 {
2283 /* coro currently busy cancelling something, so just notify it */
2284 coro->slf_frame.data = (void *)coro;
2285
2286 frame->prepare = prepare_nop;
2287 frame->check = slf_check_nop;
2288 }
2289 else if (coro_hv == (HV *)SvRV (coro_current))
2290 {
2291 /* cancelling the current coro is allowed, and equals terminate */
2292 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2293 }
2294 else
2295 {
2296 struct coro *self = SvSTATE_current;
2297
2298 if (!self)
2299 croak ("Coro::cancel called outside of thread content,");
2300
2301 /* otherwise we cancel directly, purely for speed reasons
2302 * unfortunately, this requires some magic trickery, as
2303 * somebody else could cancel us, so we have to fight the cancellation.
2304 * this is ugly, and hopefully fully worth the extra speed.
2305 * besides, I can't get the slow-but-safe version working...
2306 */
2307 slf_frame.data = 0;
2308 self->flags |= CF_NOCANCEL;
2309 coro_state_destroy (aTHX_ coro);
2310 self->flags &= ~CF_NOCANCEL;
2311
2312 if (slf_frame.data)
2313 {
2314 /* while we were busy we have been cancelled, so terminate */
2315 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2316 }
2317 else
2318 {
2319 frame->prepare = prepare_nop;
2320 frame->check = slf_check_nop;
2321 }
2322 }
2323}
2324
2325static int
2326slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2327{
2328 frame->prepare = 0;
2329 coro_unwind_stacks (aTHX);
2330
2331 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2332
2333 return 1;
2334}
2335
2336static int
2337safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2338{
2339 if (coro->cctx)
2340 croak ("coro inside C callback, unable to cancel at this time, caught");
2341
2342 if (coro->flags & CF_NEW)
2343 {
2344 coro_set_status (aTHX_ coro, arg, items);
2345 coro_state_destroy (aTHX_ coro);
2346 }
2347 else
2348 {
2349 if (!coro->slf_frame.prepare)
2350 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2351
2352 slf_destroy (aTHX_ coro);
2353
2354 coro_set_status (aTHX_ coro, arg, items);
2355 coro->slf_frame.prepare = prepare_nop;
2356 coro->slf_frame.check = slf_check_safe_cancel;
2357
2358 api_ready (aTHX_ (SV *)coro->hv);
2359 }
2360
2361 return 1;
1916} 2362}
1917 2363
1918/*****************************************************************************/ 2364/*****************************************************************************/
1919/* async pool handler */ 2365/* async pool handler */
1920 2366
… …
1951slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2397slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1952{ 2398{
1953 HV *hv = (HV *)SvRV (coro_current); 2399 HV *hv = (HV *)SvRV (coro_current);
1954 struct coro *coro = SvSTATE_hv ((SV *)hv); 2400 struct coro *coro = SvSTATE_hv ((SV *)hv);
1955 2401
1956 if (expect_true (coro->saved_deffh)) 2402 if (ecb_expect_true (coro->saved_deffh))
1957 { 2403 {
1958 /* subsequent iteration */ 2404 /* subsequent iteration */
1959 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2405 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1960 coro->saved_deffh = 0; 2406 coro->saved_deffh = 0;
1961 2407
1962 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2408 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1963 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2409 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1964 { 2410 {
1965 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2411 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1966 coro->invoke_av = newAV (); 2412 return;
1967
1968 frame->prepare = prepare_nop;
1969 } 2413 }
1970 else 2414 else
1971 { 2415 {
1972 av_clear (GvAV (PL_defgv)); 2416 av_clear (GvAV (PL_defgv));
1973 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2417 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1998 2442
1999static void 2443static void
2000coro_rouse_callback (pTHX_ CV *cv) 2444coro_rouse_callback (pTHX_ CV *cv)
2001{ 2445{
2002 dXSARGS; 2446 dXSARGS;
2003 SV *data = (SV *)GENSUB_ARG; 2447 SV *data = (SV *)S_GENSUB_ARG;
2004 2448
2005 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2449 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2006 { 2450 {
2007 /* first call, set args */ 2451 /* first call, set args */
2008 SV *coro = SvRV (data); 2452 SV *coro = SvRV (data);
… …
2023 2467
2024static int 2468static int
2025slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2469slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2026{ 2470{
2027 SV *data = (SV *)frame->data; 2471 SV *data = (SV *)frame->data;
2028 2472
2029 if (CORO_THROW) 2473 if (CORO_THROW)
2030 return 0; 2474 return 0;
2031 2475
2032 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2476 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2033 return 1; 2477 return 1;
… …
2069 cb = sv_2mortal (coro->rouse_cb); 2513 cb = sv_2mortal (coro->rouse_cb);
2070 coro->rouse_cb = 0; 2514 coro->rouse_cb = 0;
2071 } 2515 }
2072 2516
2073 if (!SvROK (cb) 2517 if (!SvROK (cb)
2074 || SvTYPE (SvRV (cb)) != SVt_PVCV 2518 || SvTYPE (SvRV (cb)) != SVt_PVCV
2075 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2519 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2076 croak ("Coro::rouse_wait called with illegal callback argument,"); 2520 croak ("Coro::rouse_wait called with illegal callback argument,");
2077 2521
2078 { 2522 {
2079 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2523 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2080 SV *data = (SV *)GENSUB_ARG; 2524 SV *data = (SV *)S_GENSUB_ARG;
2081 2525
2082 frame->data = (void *)data; 2526 frame->data = (void *)data;
2083 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2527 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2084 frame->check = slf_check_rouse_wait; 2528 frame->check = slf_check_rouse_wait;
2085 } 2529 }
… …
2089coro_new_rouse_cb (pTHX) 2533coro_new_rouse_cb (pTHX)
2090{ 2534{
2091 HV *hv = (HV *)SvRV (coro_current); 2535 HV *hv = (HV *)SvRV (coro_current);
2092 struct coro *coro = SvSTATE_hv (hv); 2536 struct coro *coro = SvSTATE_hv (hv);
2093 SV *data = newRV_inc ((SV *)hv); 2537 SV *data = newRV_inc ((SV *)hv);
2094 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2538 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2095 2539
2096 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2540 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2097 SvREFCNT_dec (data); /* magicext increases the refcount */ 2541 SvREFCNT_dec (data); /* magicext increases the refcount */
2098 2542
2099 SvREFCNT_dec (coro->rouse_cb); 2543 SvREFCNT_dec (coro->rouse_cb);
… …
2196static void 2640static void
2197slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2641slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{ 2642{
2199 frame->prepare = prepare_cede_notself; 2643 frame->prepare = prepare_cede_notself;
2200 frame->check = slf_check_nop; 2644 frame->check = slf_check_nop;
2645}
2646
2647/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2648static void
2649slf_destroy (pTHX_ struct coro *coro)
2650{
2651 struct CoroSLF frame = coro->slf_frame;
2652
2653 /*
2654 * The on_destroy below most likely is from an SLF call.
2655 * Since by definition the SLF call will not finish when we destroy
2656 * the coro, we will have to force-finish it here, otherwise
2657 * cleanup functions cannot call SLF functions.
2658 */
2659 coro->slf_frame.prepare = 0;
2660
2661 /* this callback is reserved for slf functions needing to do cleanup */
2662 if (frame.destroy && frame.prepare && !PL_dirty)
2663 frame.destroy (aTHX_ &frame);
2201} 2664}
2202 2665
2203/* 2666/*
2204 * these not obviously related functions are all rolled into one 2667 * these not obviously related functions are all rolled into one
2205 * function to increase chances that they all will call transfer with the same 2668 * function to increase chances that they all will call transfer with the same
… …
2212 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2675 I32 checkmark; /* mark SP to see how many elements check has pushed */
2213 2676
2214 /* set up the slf frame, unless it has already been set-up */ 2677 /* set up the slf frame, unless it has already been set-up */
2215 /* the latter happens when a new coro has been started */ 2678 /* the latter happens when a new coro has been started */
2216 /* or when a new cctx was attached to an existing coroutine */ 2679 /* or when a new cctx was attached to an existing coroutine */
2217 if (expect_true (!slf_frame.prepare)) 2680 if (ecb_expect_true (!slf_frame.prepare))
2218 { 2681 {
2219 /* first iteration */ 2682 /* first iteration */
2220 dSP; 2683 dSP;
2221 SV **arg = PL_stack_base + TOPMARK + 1; 2684 SV **arg = PL_stack_base + TOPMARK + 1;
2222 int items = SP - arg; /* args without function object */ 2685 int items = SP - arg; /* args without function object */
… …
2263 while (slf_frame.check (aTHX_ &slf_frame)); 2726 while (slf_frame.check (aTHX_ &slf_frame));
2264 2727
2265 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2728 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2266 2729
2267 /* exception handling */ 2730 /* exception handling */
2268 if (expect_false (CORO_THROW)) 2731 if (ecb_expect_false (CORO_THROW))
2269 { 2732 {
2270 SV *exception = sv_2mortal (CORO_THROW); 2733 SV *exception = sv_2mortal (CORO_THROW);
2271 2734
2272 CORO_THROW = 0; 2735 CORO_THROW = 0;
2273 sv_setsv (ERRSV, exception); 2736 sv_setsv (ERRSV, exception);
2274 croak (0); 2737 croak (0);
2275 } 2738 }
2276 2739
2277 /* return value handling - mostly like entersub */ 2740 /* return value handling - mostly like entersub */
2278 /* make sure we put something on the stack in scalar context */ 2741 /* make sure we put something on the stack in scalar context */
2279 if (GIMME_V == G_SCALAR) 2742 if (GIMME_V == G_SCALAR
2743 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2280 { 2744 {
2281 dSP; 2745 dSP;
2282 SV **bot = PL_stack_base + checkmark; 2746 SV **bot = PL_stack_base + checkmark;
2283 2747
2284 if (sp == bot) /* too few, push undef */ 2748 if (sp == bot) /* too few, push undef */
2285 bot [1] = &PL_sv_undef; 2749 bot [1] = &PL_sv_undef;
2286 else if (sp != bot + 1) /* too many, take last one */ 2750 else /* too many, take last one */
2287 bot [1] = *sp; 2751 bot [1] = *sp;
2288 2752
2289 SP = bot + 1; 2753 SP = bot + 1;
2290 2754
2291 PUTBACK; 2755 PUTBACK;
… …
2324 if (PL_op->op_flags & OPf_STACKED) 2788 if (PL_op->op_flags & OPf_STACKED)
2325 { 2789 {
2326 if (items > slf_arga) 2790 if (items > slf_arga)
2327 { 2791 {
2328 slf_arga = items; 2792 slf_arga = items;
2329 free (slf_argv); 2793 Safefree (slf_argv);
2330 slf_argv = malloc (slf_arga * sizeof (SV *)); 2794 New (0, slf_argv, slf_arga, SV *);
2331 } 2795 }
2332 2796
2333 slf_argc = items; 2797 slf_argc = items;
2334 2798
2335 for (i = 0; i < items; ++i) 2799 for (i = 0; i < items; ++i)
… …
2389{ 2853{
2390 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2854 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2391 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2855 on_enterleave_call (aTHX_ sv_2mortal (cb));
2392} 2856}
2393 2857
2858static void
2859enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2860{
2861 if (!hook)
2862 return;
2863
2864 if (!*avp)
2865 {
2866 *avp = newAV ();
2867 AvREAL_off (*avp);
2868 }
2869
2870 av_push (*avp, (SV *)hook);
2871 av_push (*avp, (SV *)arg);
2872}
2873
2874static void
2875enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2876{
2877 AV *av = *avp;
2878 int i;
2879
2880 if (!av)
2881 return;
2882
2883 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2884 if (AvARRAY (av)[i] == (SV *)hook)
2885 {
2886 if (execute)
2887 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2888
2889 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2890 av_pop (av);
2891 av_pop (av);
2892 break;
2893 }
2894
2895 if (AvFILLp (av) >= 0)
2896 {
2897 *avp = 0;
2898 SvREFCNT_dec_NN (av);
2899 }
2900}
2901
2902static void
2903api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2904{
2905 struct coro *coro = SvSTATE (coro_sv);
2906
2907 if (SvSTATE_current == coro)
2908 if (enter)
2909 enter (aTHX_ enter_arg);
2910
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2912 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2913}
2914
2915static void
2916api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2917{
2918 struct coro *coro = SvSTATE (coro_sv);
2919
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2921 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2922}
2923
2924static void
2925savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2926{
2927 struct coro *coro = SvSTATE_current;
2928
2929 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2930}
2931
2932static void
2933savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2934{
2935 struct coro *coro = SvSTATE_current;
2936
2937 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2938}
2939
2940static void
2941api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2942{
2943 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2944
2945 /* this ought to be much cheaper than malloc + a single destructor call */
2946 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2947 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2948}
2949
2394/*****************************************************************************/ 2950/*****************************************************************************/
2395/* PerlIO::cede */ 2951/* PerlIO::cede */
2396 2952
2397typedef struct 2953typedef struct
2398{ 2954{
2399 PerlIOBuf base; 2955 PerlIOBuf base;
2400 NV next, every; 2956 NV next, every;
2401} PerlIOCede; 2957} PerlIOCede;
2402 2958
2403static IV 2959static IV ecb_cold
2404PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2960PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2405{ 2961{
2406 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2962 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2407 2963
2408 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2964 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2409 self->next = nvtime () + self->every; 2965 self->next = nvtime () + self->every;
2410 2966
2411 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2967 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2412} 2968}
2413 2969
2414static SV * 2970static SV * ecb_cold
2415PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2971PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2416{ 2972{
2417 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2973 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2418 2974
2419 return newSVnv (self->every); 2975 return newSVnv (self->every);
… …
2470/* Coro::Semaphore & Coro::Signal */ 3026/* Coro::Semaphore & Coro::Signal */
2471 3027
2472static SV * 3028static SV *
2473coro_waitarray_new (pTHX_ int count) 3029coro_waitarray_new (pTHX_ int count)
2474{ 3030{
2475 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3031 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2476 AV *av = newAV (); 3032 AV *av = newAV ();
2477 SV **ary; 3033 SV **ary;
2478 3034
2479 /* unfortunately, building manually saves memory */ 3035 /* unfortunately, building manually saves memory */
2480 Newx (ary, 2, SV *); 3036 Newx (ary, 2, SV *);
… …
2526 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3082 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2527 PUTBACK; 3083 PUTBACK;
2528 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3084 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2529 } 3085 }
2530 3086
2531 SvREFCNT_dec (cb); 3087 SvREFCNT_dec_NN (cb);
2532 } 3088 }
2533} 3089}
2534 3090
2535static void 3091static void
2536coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3092coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2537{ 3093{
2538 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3094 /* call $sem->adjust (0) to possibly wake up some other waiters */
2539 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3095 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2540} 3096}
2541 3097
2542static int 3098static int
2543slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3099slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2544{ 3100{
2545 AV *av = (AV *)frame->data; 3101 AV *av = (AV *)frame->data;
2546 SV *count_sv = AvARRAY (av)[0]; 3102 SV *count_sv = AvARRAY (av)[0];
3103 SV *coro_hv = SvRV (coro_current);
3104
3105 frame->destroy = 0;
2547 3106
2548 /* if we are about to throw, don't actually acquire the lock, just throw */ 3107 /* if we are about to throw, don't actually acquire the lock, just throw */
2549 if (CORO_THROW) 3108 if (ecb_expect_false (CORO_THROW))
3109 {
3110 /* we still might be responsible for the semaphore, so wake up others */
3111 coro_semaphore_adjust (aTHX_ av, 0);
3112
2550 return 0; 3113 return 0;
3114 }
2551 else if (SvIVX (count_sv) > 0) 3115 else if (SvIVX (count_sv) > 0)
2552 { 3116 {
2553 SvSTATE_current->on_destroy = 0;
2554
2555 if (acquire) 3117 if (acquire)
2556 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3118 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2557 else 3119 else
2558 coro_semaphore_adjust (aTHX_ av, 0); 3120 coro_semaphore_adjust (aTHX_ av, 0);
2559 3121
… …
2563 { 3125 {
2564 int i; 3126 int i;
2565 /* if we were woken up but can't down, we look through the whole */ 3127 /* if we were woken up but can't down, we look through the whole */
2566 /* waiters list and only add us if we aren't in there already */ 3128 /* waiters list and only add us if we aren't in there already */
2567 /* this avoids some degenerate memory usage cases */ 3129 /* this avoids some degenerate memory usage cases */
2568 3130 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2569 for (i = 1; i <= AvFILLp (av); ++i)
2570 if (AvARRAY (av)[i] == SvRV (coro_current)) 3131 if (AvARRAY (av)[i] == coro_hv)
2571 return 1; 3132 return 1;
2572 3133
2573 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3134 av_push (av, SvREFCNT_inc (coro_hv));
2574 return 1; 3135 return 1;
2575 } 3136 }
2576} 3137}
2577 3138
2578static int 3139static int
… …
2601 { 3162 {
2602 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3163 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2603 3164
2604 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3165 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2605 frame->prepare = prepare_schedule; 3166 frame->prepare = prepare_schedule;
2606
2607 /* to avoid race conditions when a woken-up coro gets terminated */ 3167 /* to avoid race conditions when a woken-up coro gets terminated */
2608 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3168 /* we arrange for a temporary on_destroy that calls adjust (0) */
2609 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3169 frame->destroy = coro_semaphore_destroy;
2610 } 3170 }
2611} 3171}
2612 3172
2613static void 3173static void
2614slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3174slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2622{ 3182{
2623 if (items >= 2) 3183 if (items >= 2)
2624 { 3184 {
2625 /* callback form */ 3185 /* callback form */
2626 AV *av = (AV *)SvRV (arg [0]); 3186 AV *av = (AV *)SvRV (arg [0]);
2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3187 SV *cb_cv = s_get_cv_croak (arg [1]);
2628 3188
2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3189 av_push (av, SvREFCNT_inc_NN (cb_cv));
2630 3190
2631 if (SvIVX (AvARRAY (av)[0]) > 0) 3191 if (SvIVX (AvARRAY (av)[0]) > 0)
2632 coro_semaphore_adjust (aTHX_ av, 0); 3192 coro_semaphore_adjust (aTHX_ av, 0);
2633 3193
2634 frame->prepare = prepare_nop; 3194 frame->prepare = prepare_nop;
… …
2658 AvARRAY (av)[0] = AvARRAY (av)[1]; 3218 AvARRAY (av)[0] = AvARRAY (av)[1];
2659 AvARRAY (av)[1] = cb; 3219 AvARRAY (av)[1] = cb;
2660 3220
2661 cb = av_shift (av); 3221 cb = av_shift (av);
2662 3222
3223 if (SvTYPE (cb) == SVt_PVCV)
3224 {
3225 dSP;
3226 PUSHMARK (SP);
3227 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3228 PUTBACK;
3229 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3230 }
3231 else
3232 {
2663 api_ready (aTHX_ cb); 3233 api_ready (aTHX_ cb);
2664 sv_setiv (cb, 0); /* signal waiter */ 3234 sv_setiv (cb, 0); /* signal waiter */
3235 }
3236
2665 SvREFCNT_dec (cb); 3237 SvREFCNT_dec_NN (cb);
2666 3238
2667 --count; 3239 --count;
2668 } 3240 }
2669} 3241}
2670 3242
… …
2678static void 3250static void
2679slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3251slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2680{ 3252{
2681 AV *av = (AV *)SvRV (arg [0]); 3253 AV *av = (AV *)SvRV (arg [0]);
2682 3254
3255 if (items >= 2)
3256 {
3257 SV *cb_cv = s_get_cv_croak (arg [1]);
3258 av_push (av, SvREFCNT_inc_NN (cb_cv));
3259
2683 if (SvIVX (AvARRAY (av)[0])) 3260 if (SvIVX (AvARRAY (av)[0]))
3261 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3262
3263 frame->prepare = prepare_nop;
3264 frame->check = slf_check_nop;
3265 }
3266 else if (SvIVX (AvARRAY (av)[0]))
2684 { 3267 {
2685 SvIVX (AvARRAY (av)[0]) = 0; 3268 SvIVX (AvARRAY (av)[0]) = 0;
2686 frame->prepare = prepare_nop; 3269 frame->prepare = prepare_nop;
2687 frame->check = slf_check_nop; 3270 frame->check = slf_check_nop;
2688 } 3271 }
2689 else 3272 else
2690 { 3273 {
2691 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3274 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2692 3275
2693 av_push (av, waiter); 3276 av_push (av, waiter);
2694 3277
2695 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3278 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2696 frame->prepare = prepare_schedule; 3279 frame->prepare = prepare_schedule;
… …
2714 3297
2715static void 3298static void
2716coro_aio_callback (pTHX_ CV *cv) 3299coro_aio_callback (pTHX_ CV *cv)
2717{ 3300{
2718 dXSARGS; 3301 dXSARGS;
2719 AV *state = (AV *)GENSUB_ARG; 3302 AV *state = (AV *)S_GENSUB_ARG;
2720 SV *coro = av_pop (state); 3303 SV *coro = av_pop (state);
2721 SV *data_sv = newSV (sizeof (struct io_state)); 3304 SV *data_sv = newSV (sizeof (struct io_state));
2722 3305
2723 av_extend (state, items - 1); 3306 av_extend (state, items - 1);
2724 3307
… …
2744 } 3327 }
2745 3328
2746 av_push (state, data_sv); 3329 av_push (state, data_sv);
2747 3330
2748 api_ready (aTHX_ coro); 3331 api_ready (aTHX_ coro);
2749 SvREFCNT_dec (coro); 3332 SvREFCNT_dec_NN (coro);
2750 SvREFCNT_dec ((AV *)state); 3333 SvREFCNT_dec_NN ((AV *)state);
2751} 3334}
2752 3335
2753static int 3336static int
2754slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3337slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2755{ 3338{
… …
2760 /* it quickly returns */ 3343 /* it quickly returns */
2761 if (CORO_THROW) 3344 if (CORO_THROW)
2762 return 0; 3345 return 0;
2763 3346
2764 /* one element that is an RV? repeat! */ 3347 /* one element that is an RV? repeat! */
2765 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3348 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2766 return 1; 3349 return 1;
2767 3350
2768 /* restore status */ 3351 /* restore status */
2769 { 3352 {
2770 SV *data_sv = av_pop (state); 3353 SV *data_sv = av_pop (state);
… …
2773 errno = data->errorno; 3356 errno = data->errorno;
2774 PL_laststype = data->laststype; 3357 PL_laststype = data->laststype;
2775 PL_laststatval = data->laststatval; 3358 PL_laststatval = data->laststatval;
2776 PL_statcache = data->statcache; 3359 PL_statcache = data->statcache;
2777 3360
2778 SvREFCNT_dec (data_sv); 3361 SvREFCNT_dec_NN (data_sv);
2779 } 3362 }
2780 3363
2781 /* push result values */ 3364 /* push result values */
2782 { 3365 {
2783 dSP; 3366 dSP;
… …
2809 dSP; 3392 dSP;
2810 3393
2811 static SV *prio_cv; 3394 static SV *prio_cv;
2812 static SV *prio_sv; 3395 static SV *prio_sv;
2813 3396
2814 if (expect_false (!prio_cv)) 3397 if (ecb_expect_false (!prio_cv))
2815 { 3398 {
2816 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3399 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2817 prio_sv = newSViv (0); 3400 prio_sv = newSViv (0);
2818 } 3401 }
2819 3402
… …
2838 3421
2839 for (i = 0; i < items; ++i) 3422 for (i = 0; i < items; ++i)
2840 PUSHs (arg [i]); 3423 PUSHs (arg [i]);
2841 3424
2842 /* now push the callback closure */ 3425 /* now push the callback closure */
2843 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3426 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2844 3427
2845 /* now call the AIO function - we assume our request is uncancelable */ 3428 /* now call the AIO function - we assume our request is uncancelable */
2846 PUTBACK; 3429 PUTBACK;
2847 call_sv ((SV *)req, G_VOID | G_DISCARD); 3430 call_sv ((SV *)req, G_VOID | G_DISCARD);
2848 } 3431 }
2849 3432
2850 /* now that the requets is going, we loop toll we have a result */ 3433 /* now that the request is going, we loop till we have a result */
2851 frame->data = (void *)state; 3434 frame->data = (void *)state;
2852 frame->prepare = prepare_schedule; 3435 frame->prepare = prepare_schedule;
2853 frame->check = slf_check_aio_req; 3436 frame->check = slf_check_aio_req;
2854} 3437}
2855 3438
… …
2867 3450
2868#if CORO_CLONE 3451#if CORO_CLONE
2869# include "clone.c" 3452# include "clone.c"
2870#endif 3453#endif
2871 3454
3455/*****************************************************************************/
3456
3457static SV *
3458coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3459{
3460 SV *coro_sv;
3461 struct coro *coro;
3462 MAGIC *mg;
3463 HV *hv;
3464 SV *cb;
3465 int i;
3466
3467 if (argc > 0)
3468 {
3469 cb = s_get_cv_croak (argv [0]);
3470
3471 if (!is_coro)
3472 {
3473 if (CvISXSUB (cb))
3474 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3475
3476 if (!CvROOT (cb))
3477 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3478 }
3479 }
3480
3481 Newz (0, coro, 1, struct coro);
3482 coro->args = newAV ();
3483 coro->flags = CF_NEW;
3484
3485 if (coro_first) coro_first->prev = coro;
3486 coro->next = coro_first;
3487 coro_first = coro;
3488
3489 coro->hv = hv = newHV ();
3490 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3491 mg->mg_flags |= MGf_DUP;
3492 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3493
3494 if (argc > 0)
3495 {
3496 av_extend (coro->args, argc + is_coro - 1);
3497
3498 if (is_coro)
3499 {
3500 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3501 cb = (SV *)cv_coro_run;
3502 }
3503
3504 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3505
3506 for (i = 1; i < argc; i++)
3507 av_push (coro->args, newSVsv (argv [i]));
3508 }
3509
3510 return coro_sv;
3511}
3512
3513#ifndef __cplusplus
3514ecb_cold XS(boot_Coro__State);
3515#endif
3516
3517#if CORO_JIT
3518
3519static void ecb_noinline ecb_cold
3520pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3521{
3522 dSP;
3523 AV *av = newAV ();
3524
3525 av_store (av, 3, newSVuv (d));
3526 av_store (av, 2, newSVuv (c));
3527 av_store (av, 1, newSVuv (b));
3528 av_store (av, 0, newSVuv (a));
3529
3530 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3531
3532 PUTBACK;
3533}
3534
3535static void ecb_noinline ecb_cold
3536jit_init (pTHX)
3537{
3538 dSP;
3539 SV *load, *save;
3540 char *map_base;
3541 char *load_ptr, *save_ptr;
3542 STRLEN load_len, save_len, map_len;
3543 int count;
3544
3545 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3546
3547 PUSHMARK (SP);
3548 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3549 #include "state.h"
3550 count = call_pv ("Coro::State::_jit", G_ARRAY);
3551 SPAGAIN;
3552
3553 save = POPs; save_ptr = SvPVbyte (save, save_len);
3554 load = POPs; load_ptr = SvPVbyte (load, load_len);
3555
3556 map_len = load_len + save_len + 16;
3557
3558 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3559
3560 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3561
3562 load_perl_slots = (load_save_perl_slots_type)map_base;
3563 memcpy (map_base, load_ptr, load_len);
3564
3565 map_base += (load_len + 15) & ~15;
3566
3567 save_perl_slots = (load_save_perl_slots_type)map_base;
3568 memcpy (map_base, save_ptr, save_len);
3569
3570 /* we are good citizens and try to make the page read-only, so the evil evil */
3571 /* hackers might have it a bit more difficult */
3572 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3573
3574 PUTBACK;
3575 eval_pv ("undef &Coro::State::_jit", 1);
3576}
3577
3578#endif
3579
2872MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3580MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2873 3581
2874PROTOTYPES: DISABLE 3582PROTOTYPES: DISABLE
2875 3583
2876BOOT: 3584BOOT:
2877{ 3585{
3586#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3587#include "state.h"
2878#ifdef USE_ITHREADS 3588#ifdef USE_ITHREADS
2879# if CORO_PTHREAD 3589# if CORO_PTHREAD
2880 coro_thx = PERL_GET_CONTEXT; 3590 coro_thx = PERL_GET_CONTEXT;
2881# endif 3591# endif
2882#endif 3592#endif
2883 BOOT_PAGESIZE; 3593 /* perl defines these to check for existance first, but why it doesn't */
3594 /* just create them one at init time is not clear to me, except for */
3595 /* programs trying to delete them, but... */
3596 /* anyway, we declare this as invalid and make sure they are initialised here */
3597 DEFSV;
3598 ERRSV;
2884 3599
2885 cctx_current = cctx_new_empty (); 3600 cctx_current = cctx_new_empty ();
2886 3601
2887 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3602 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2888 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3603 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2928 coroapi.prepare_nop = prepare_nop; 3643 coroapi.prepare_nop = prepare_nop;
2929 coroapi.prepare_schedule = prepare_schedule; 3644 coroapi.prepare_schedule = prepare_schedule;
2930 coroapi.prepare_cede = prepare_cede; 3645 coroapi.prepare_cede = prepare_cede;
2931 coroapi.prepare_cede_notself = prepare_cede_notself; 3646 coroapi.prepare_cede_notself = prepare_cede_notself;
2932 3647
2933 { 3648 time_init (aTHX);
2934 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2935 3649
2936 if (!svp) croak ("Time::HiRes is required");
2937 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2938
2939 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2940 }
2941
2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3650 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3651#if CORO_JIT
3652 PUTBACK;
3653 jit_init (aTHX);
3654 SPAGAIN;
3655#endif
2943} 3656}
2944 3657
2945SV * 3658SV *
2946new (char *klass, ...) 3659new (SV *klass, ...)
2947 ALIAS: 3660 ALIAS:
2948 Coro::new = 1 3661 Coro::new = 1
2949 CODE: 3662 CODE:
2950{ 3663 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2951 struct coro *coro; 3664 OUTPUT:
2952 MAGIC *mg;
2953 HV *hv;
2954 CV *cb;
2955 int i;
2956
2957 if (items > 1)
2958 {
2959 cb = coro_sv_2cv (aTHX_ ST (1));
2960
2961 if (!ix)
2962 {
2963 if (CvISXSUB (cb))
2964 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2965
2966 if (!CvROOT (cb))
2967 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2968 }
2969 }
2970
2971 Newz (0, coro, 1, struct coro);
2972 coro->args = newAV ();
2973 coro->flags = CF_NEW;
2974
2975 if (coro_first) coro_first->prev = coro;
2976 coro->next = coro_first;
2977 coro_first = coro;
2978
2979 coro->hv = hv = newHV ();
2980 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2981 mg->mg_flags |= MGf_DUP;
2982 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2983
2984 if (items > 1)
2985 {
2986 av_extend (coro->args, items - 1 + ix - 1);
2987
2988 if (ix)
2989 {
2990 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991 cb = cv_coro_run;
2992 }
2993
2994 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2995
2996 for (i = 2; i < items; i++)
2997 av_push (coro->args, newSVsv (ST (i)));
2998 }
2999}
3000 OUTPUT:
3001 RETVAL 3665 RETVAL
3002 3666
3003void 3667void
3004transfer (...) 3668transfer (...)
3005 PROTOTYPE: $$ 3669 PROTOTYPE: $$
3006 CODE: 3670 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3671 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3008
3009bool
3010_destroy (SV *coro_sv)
3011 CODE:
3012 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3013 OUTPUT:
3014 RETVAL
3015
3016void
3017_exit (int code)
3018 PROTOTYPE: $
3019 CODE:
3020 _exit (code);
3021 3672
3022SV * 3673SV *
3023clone (Coro::State coro) 3674clone (Coro::State coro)
3024 CODE: 3675 CODE:
3025{ 3676{
… …
3080void 3731void
3081list () 3732list ()
3082 PROTOTYPE: 3733 PROTOTYPE:
3083 PPCODE: 3734 PPCODE:
3084{ 3735{
3085 struct coro *coro; 3736 struct coro *coro;
3086 for (coro = coro_first; coro; coro = coro->next) 3737 for (coro = coro_first; coro; coro = coro->next)
3087 if (coro->hv) 3738 if (coro->hv)
3088 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3739 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3089} 3740}
3090 3741
… …
3095 CODE: 3746 CODE:
3096{ 3747{
3097 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3748 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3098 { 3749 {
3099 struct coro *current = SvSTATE_current; 3750 struct coro *current = SvSTATE_current;
3751 struct CoroSLF slf_save;
3100 3752
3101 if (current != coro) 3753 if (current != coro)
3102 { 3754 {
3103 PUTBACK; 3755 PUTBACK;
3104 save_perl (aTHX_ current); 3756 save_perl (aTHX_ current);
3105 load_perl (aTHX_ coro); 3757 load_perl (aTHX_ coro);
3758 /* the coro is most likely in an active SLF call.
3759 * while not strictly required (the code we execute is
3760 * not allowed to call any SLF functions), it's cleaner
3761 * to reinitialise the slf_frame and restore it later.
3762 * This might one day allow us to actually do SLF calls
3763 * from code executed here.
3764 */
3765 slf_save = slf_frame;
3766 slf_frame.prepare = 0;
3106 SPAGAIN; 3767 SPAGAIN;
3107 } 3768 }
3108 3769
3109 PUSHSTACK; 3770 PUSHSTACK;
3110 3771
… …
3120 SPAGAIN; 3781 SPAGAIN;
3121 3782
3122 if (current != coro) 3783 if (current != coro)
3123 { 3784 {
3124 PUTBACK; 3785 PUTBACK;
3786 slf_frame = slf_save;
3125 save_perl (aTHX_ coro); 3787 save_perl (aTHX_ coro);
3126 load_perl (aTHX_ current); 3788 load_perl (aTHX_ current);
3127 SPAGAIN; 3789 SPAGAIN;
3128 } 3790 }
3129 } 3791 }
… …
3134 PROTOTYPE: $ 3796 PROTOTYPE: $
3135 ALIAS: 3797 ALIAS:
3136 is_ready = CF_READY 3798 is_ready = CF_READY
3137 is_running = CF_RUNNING 3799 is_running = CF_RUNNING
3138 is_new = CF_NEW 3800 is_new = CF_NEW
3139 is_destroyed = CF_DESTROYED 3801 is_destroyed = CF_ZOMBIE
3802 is_zombie = CF_ZOMBIE
3140 is_suspended = CF_SUSPENDED 3803 is_suspended = CF_SUSPENDED
3141 CODE: 3804 CODE:
3142 RETVAL = boolSV (coro->flags & ix); 3805 RETVAL = boolSV (coro->flags & ix);
3143 OUTPUT: 3806 OUTPUT:
3144 RETVAL 3807 RETVAL
3145 3808
3146void 3809void
3147throw (Coro::State self, SV *throw = &PL_sv_undef) 3810throw (SV *self, SV *exception = &PL_sv_undef)
3148 PROTOTYPE: $;$ 3811 PROTOTYPE: $;$
3149 CODE: 3812 CODE:
3150{ 3813{
3814 struct coro *coro = SvSTATE (self);
3151 struct coro *current = SvSTATE_current; 3815 struct coro *current = SvSTATE_current;
3152 SV **throwp = self == current ? &CORO_THROW : &self->except; 3816 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3153 SvREFCNT_dec (*throwp); 3817 SvREFCNT_dec (*exceptionp);
3154 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3818 SvGETMAGIC (exception);
3819 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3820
3821 api_ready (aTHX_ self);
3155} 3822}
3156 3823
3157void 3824void
3158api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3825api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3159 PROTOTYPE: $;$ 3826 PROTOTYPE: $;$
… …
3214 3881
3215void 3882void
3216cancel (Coro::State self) 3883cancel (Coro::State self)
3217 CODE: 3884 CODE:
3218 coro_state_destroy (aTHX_ self); 3885 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3886
3887SV *
3888enable_times (int enabled = enable_times)
3889 CODE:
3890{
3891 RETVAL = boolSV (enable_times);
3892
3893 if (enabled != enable_times)
3894 {
3895 enable_times = enabled;
3896
3897 coro_times_update ();
3898 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3899 }
3900}
3901 OUTPUT:
3902 RETVAL
3903
3904void
3905times (Coro::State self)
3906 PPCODE:
3907{
3908 struct coro *current = SvSTATE (coro_current);
3909
3910 if (ecb_expect_false (current == self))
3911 {
3912 coro_times_update ();
3913 coro_times_add (SvSTATE (coro_current));
3914 }
3915
3916 EXTEND (SP, 2);
3917 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3918 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3919
3920 if (ecb_expect_false (current == self))
3921 coro_times_sub (SvSTATE (coro_current));
3922}
3923
3924void
3925swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3926 CODE:
3927{
3928 struct coro *current = SvSTATE_current;
3929
3930 if (current == coro)
3931 SWAP_SVS (current);
3932
3933 if (!coro->swap_sv)
3934 coro->swap_sv = newAV ();
3935
3936 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3937 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3938
3939 if (current == coro)
3940 SWAP_SVS (current);
3941}
3220 3942
3221 3943
3222MODULE = Coro::State PACKAGE = Coro 3944MODULE = Coro::State PACKAGE = Coro
3223 3945
3224BOOT: 3946BOOT:
3225{ 3947{
3948 if (SVt_LAST > 32)
3949 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3950
3226 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3951 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3227 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3952 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3228 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3953 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3229 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3230 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3954 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3231 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3232 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3956 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3233 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3957 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3234 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3958 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3235 3959
3236 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3960 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3237 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3961 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3238 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3962 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3963 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3240 3964
3241 coro_stash = gv_stashpv ("Coro", TRUE); 3965 coro_stash = gv_stashpv ("Coro", TRUE);
3242 3966
3243 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3967 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3244 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3968 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3245 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3969 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3246 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3970 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3247 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3971 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3248 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3972 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3249 3973
3250 { 3974 {
3251 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3975 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3252 3976
3253 coroapi.schedule = api_schedule; 3977 coroapi.schedule = api_schedule;
… …
3257 coroapi.ready = api_ready; 3981 coroapi.ready = api_ready;
3258 coroapi.is_ready = api_is_ready; 3982 coroapi.is_ready = api_is_ready;
3259 coroapi.nready = coro_nready; 3983 coroapi.nready = coro_nready;
3260 coroapi.current = coro_current; 3984 coroapi.current = coro_current;
3261 3985
3986 coroapi.enterleave_hook = api_enterleave_hook;
3987 coroapi.enterleave_unhook = api_enterleave_unhook;
3988 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3989
3262 /*GCoroAPI = &coroapi;*/ 3990 /*GCoroAPI = &coroapi;*/
3263 sv_setiv (sv, (IV)&coroapi); 3991 sv_setiv (sv, (IV)&coroapi);
3264 SvREADONLY_on (sv); 3992 SvREADONLY_on (sv);
3265 } 3993 }
3266} 3994}
3267 3995
3996SV *
3997async (...)
3998 PROTOTYPE: &@
3999 CODE:
4000 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4001 api_ready (aTHX_ RETVAL);
4002 OUTPUT:
4003 RETVAL
4004
4005void
4006_destroy (Coro::State coro)
4007 CODE:
4008 /* used by the manager thread */
4009 coro_state_destroy (aTHX_ coro);
4010
4011void
4012on_destroy (Coro::State coro, SV *cb)
4013 CODE:
4014 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4015
4016void
4017join (...)
4018 CODE:
4019 CORO_EXECUTE_SLF_XS (slf_init_join);
4020
3268void 4021void
3269terminate (...) 4022terminate (...)
3270 CODE: 4023 CODE:
3271 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4024 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3272 4025
3273void 4026void
4027cancel (...)
4028 CODE:
4029 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4030
4031int
4032safe_cancel (Coro::State self, ...)
4033 C_ARGS: aTHX_ self, &ST (1), items - 1
4034
4035void
3274schedule (...) 4036schedule (...)
3275 CODE: 4037 CODE:
3276 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4038 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3277 4039
3278void 4040void
… …
3297 4059
3298void 4060void
3299_set_current (SV *current) 4061_set_current (SV *current)
3300 PROTOTYPE: $ 4062 PROTOTYPE: $
3301 CODE: 4063 CODE:
3302 SvREFCNT_dec (SvRV (coro_current)); 4064 SvREFCNT_dec_NN (SvRV (coro_current));
3303 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4065 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3304 4066
3305void 4067void
3306_set_readyhook (SV *hook) 4068_set_readyhook (SV *hook)
3307 PROTOTYPE: $ 4069 PROTOTYPE: $
3308 CODE: 4070 CODE:
3309 SvREFCNT_dec (coro_readyhook); 4071 SvREFCNT_dec (coro_readyhook);
4072 SvGETMAGIC (hook);
4073 if (SvOK (hook))
4074 {
3310 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4075 coro_readyhook = newSVsv (hook);
4076 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4077 }
4078 else
4079 {
4080 coro_readyhook = 0;
4081 CORO_READYHOOK = 0;
4082 }
3311 4083
3312int 4084int
3313prio (Coro::State coro, int newprio = 0) 4085prio (Coro::State coro, int newprio = 0)
3314 PROTOTYPE: $;$ 4086 PROTOTYPE: $;$
3315 ALIAS: 4087 ALIAS:
… …
3321 if (items > 1) 4093 if (items > 1)
3322 { 4094 {
3323 if (ix) 4095 if (ix)
3324 newprio = coro->prio - newprio; 4096 newprio = coro->prio - newprio;
3325 4097
3326 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4098 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3327 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4099 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3328 4100
3329 coro->prio = newprio; 4101 coro->prio = newprio;
3330 } 4102 }
3331} 4103}
3332 OUTPUT: 4104 OUTPUT:
… …
3379 for (i = 1; i < items; ++i) 4151 for (i = 1; i < items; ++i)
3380 av_push (av, SvREFCNT_inc_NN (ST (i))); 4152 av_push (av, SvREFCNT_inc_NN (ST (i)));
3381 4153
3382 if ((SV *)hv == &PL_sv_undef) 4154 if ((SV *)hv == &PL_sv_undef)
3383 { 4155 {
3384 PUSHMARK (SP); 4156 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3385 EXTEND (SP, 2);
3386 PUSHs (sv_Coro);
3387 PUSHs ((SV *)cv_pool_handler);
3388 PUTBACK;
3389 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3390 SPAGAIN;
3391
3392 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4157 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4158 SvREFCNT_dec_NN (sv);
3393 } 4159 }
3394 4160
3395 { 4161 {
3396 struct coro *coro = SvSTATE_hv (hv); 4162 struct coro *coro = SvSTATE_hv (hv);
3397 4163
… …
3404 api_ready (aTHX_ (SV *)hv); 4170 api_ready (aTHX_ (SV *)hv);
3405 4171
3406 if (GIMME_V != G_VOID) 4172 if (GIMME_V != G_VOID)
3407 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4173 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3408 else 4174 else
3409 SvREFCNT_dec (hv); 4175 SvREFCNT_dec_NN (hv);
3410} 4176}
3411 4177
3412SV * 4178SV *
3413rouse_cb () 4179rouse_cb ()
3414 PROTOTYPE: 4180 PROTOTYPE:
… …
3429 on_leave = 1 4195 on_leave = 1
3430 PROTOTYPE: & 4196 PROTOTYPE: &
3431 CODE: 4197 CODE:
3432{ 4198{
3433 struct coro *coro = SvSTATE_current; 4199 struct coro *coro = SvSTATE_current;
3434 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4200 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3435 4201
3436 block = (SV *)coro_sv_2cv (aTHX_ block); 4202 block = s_get_cv_croak (block);
3437 4203
3438 if (!*avp) 4204 if (!*avp)
3439 *avp = newAV (); 4205 *avp = newAV ();
3440 4206
3441 av_push (*avp, SvREFCNT_inc (block)); 4207 av_push (*avp, SvREFCNT_inc (block));
… …
3458MODULE = Coro::State PACKAGE = Coro::Semaphore 4224MODULE = Coro::State PACKAGE = Coro::Semaphore
3459 4225
3460SV * 4226SV *
3461new (SV *klass, SV *count = 0) 4227new (SV *klass, SV *count = 0)
3462 CODE: 4228 CODE:
4229{
4230 int semcnt = 1;
4231
4232 if (count)
4233 {
4234 SvGETMAGIC (count);
4235
4236 if (SvOK (count))
4237 semcnt = SvIV (count);
4238 }
4239
3463 RETVAL = sv_bless ( 4240 RETVAL = sv_bless (
3464 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4241 coro_waitarray_new (aTHX_ semcnt),
3465 GvSTASH (CvGV (cv)) 4242 GvSTASH (CvGV (cv))
3466 ); 4243 );
4244}
3467 OUTPUT: 4245 OUTPUT:
3468 RETVAL 4246 RETVAL
3469 4247
3470# helper for Coro::Channel and others 4248# helper for Coro::Channel and others
3471SV * 4249SV *
… …
3517 XSRETURN_NO; 4295 XSRETURN_NO;
3518} 4296}
3519 4297
3520void 4298void
3521waiters (SV *self) 4299waiters (SV *self)
3522 PPCODE: 4300 PPCODE:
3523{ 4301{
3524 AV *av = (AV *)SvRV (self); 4302 AV *av = (AV *)SvRV (self);
3525 int wcount = AvFILLp (av) + 1 - 1; 4303 int wcount = AvFILLp (av) + 1 - 1;
3526 4304
3527 if (GIMME_V == G_SCALAR) 4305 if (GIMME_V == G_SCALAR)
… …
3536} 4314}
3537 4315
3538MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4316MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3539 4317
3540void 4318void
3541_may_delete (SV *sem, int count, int extra_refs) 4319_may_delete (SV *sem, int count, unsigned int extra_refs)
3542 PPCODE: 4320 PPCODE:
3543{ 4321{
3544 AV *av = (AV *)SvRV (sem); 4322 AV *av = (AV *)SvRV (sem);
3545 4323
3546 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4324 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3547 && AvFILLp (av) == 0 /* no waiters, just count */ 4325 && AvFILLp (av) == 0 /* no waiters, just count */
3548 && SvIV (AvARRAY (av)[0]) == count) 4326 && SvIV (AvARRAY (av)[0]) == count)
3549 XSRETURN_YES; 4327 XSRETURN_YES;
… …
3570 4348
3571void 4349void
3572broadcast (SV *self) 4350broadcast (SV *self)
3573 CODE: 4351 CODE:
3574{ 4352{
3575 AV *av = (AV *)SvRV (self); 4353 AV *av = (AV *)SvRV (self);
3576 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4354 coro_signal_wake (aTHX_ av, AvFILLp (av));
3577} 4355}
3578 4356
3579void 4357void
3580send (SV *self) 4358send (SV *self)
… …
3588 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4366 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3589} 4367}
3590 4368
3591IV 4369IV
3592awaited (SV *self) 4370awaited (SV *self)
3593 CODE: 4371 CODE:
3594 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4372 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3595 OUTPUT: 4373 OUTPUT:
3596 RETVAL 4374 RETVAL
3597 4375
3598 4376
… …
3603 4381
3604void 4382void
3605_schedule (...) 4383_schedule (...)
3606 CODE: 4384 CODE:
3607{ 4385{
3608 static int incede; 4386 static int incede;
3609 4387
3610 api_cede_notself (aTHX); 4388 api_cede_notself (aTHX);
3611 4389
3612 ++incede; 4390 ++incede;
3613 while (coro_nready >= incede && api_cede (aTHX)) 4391 while (coro_nready >= incede && api_cede (aTHX))
… …
3629 4407
3630void 4408void
3631_register (char *target, char *proto, SV *req) 4409_register (char *target, char *proto, SV *req)
3632 CODE: 4410 CODE:
3633{ 4411{
3634 CV *req_cv = coro_sv_2cv (aTHX_ req); 4412 SV *req_cv = s_get_cv_croak (req);
3635 /* newXSproto doesn't return the CV on 5.8 */ 4413 /* newXSproto doesn't return the CV on 5.8 */
3636 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4414 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3637 sv_setpv ((SV *)slf_cv, proto); 4415 sv_setpv ((SV *)slf_cv, proto);
3638 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4416 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3639} 4417}
3640 4418
4419MODULE = Coro::State PACKAGE = Coro::Select
4420
4421void
4422patch_pp_sselect ()
4423 CODE:
4424 if (!coro_old_pp_sselect)
4425 {
4426 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4427 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4428 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4429 }
4430
4431void
4432unpatch_pp_sselect ()
4433 CODE:
4434 if (coro_old_pp_sselect)
4435 {
4436 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4437 coro_old_pp_sselect = 0;
4438 }
4439
4440MODULE = Coro::State PACKAGE = Coro::Util
4441
4442void
4443_exit (int code)
4444 CODE:
4445 _exit (code);
4446
4447NV
4448time ()
4449 CODE:
4450 RETVAL = nvtime (aTHX);
4451 OUTPUT:
4452 RETVAL
4453
4454NV
4455gettimeofday ()
4456 PPCODE:
4457{
4458 UV tv [2];
4459 u2time (aTHX_ tv);
4460 EXTEND (SP, 2);
4461 PUSHs (sv_2mortal (newSVuv (tv [0])));
4462 PUSHs (sv_2mortal (newSVuv (tv [1])));
4463}
4464

Diff Legend

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