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.340 by root, Mon Dec 15 00:30:40 2008 UTC vs.
Revision 1.452 by root, Tue Jun 30 12:42:45 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 */
212 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
213 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 214};
244 215
245/* 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 */
246typedef struct 217typedef struct
247{ 218{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 219 #define VARx(name,expr,type) type name;
254# include "state.h" 220 #include "state.h"
255#undef VAR
256} perl_slots; 221} perl_slots;
257 222
223/* how many context stack entries do we need for perl_slots */
258#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))
259 225
260/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
261struct coro { 227struct coro
228{
262 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 230 coro_cctx *cctx;
231
232 /* ready queue */
233 struct coro *next_ready;
264 234
265 /* state data */ 235 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 237 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
269 239
270 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 244
277 /* statistics */ 245 /* statistics */
278 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
279 247
280 /* coro process data */ 248 /* coro process data */
281 int prio; 249 int prio;
282 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
283 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 */
284 254
285 /* async_pool */ 255 /* async_pool */
286 SV *saved_deffh; 256 SV *saved_deffh;
287 SV *invoke_cb; 257 SV *invoke_cb;
288 AV *invoke_av; 258 AV *invoke_av;
289 259
290 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
291 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
292 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;
293 269
294 /* linked list */ 270 /* linked list */
295 struct coro *next, *prev; 271 struct coro *next, *prev;
296}; 272};
297 273
298typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
299typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
300 276
301/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
302/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
303/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
305 281
306/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
307 283
308#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
314 290
315/* for Coro.pm */ 291/* for Coro.pm */
316static SV *coro_current; 292static SV *coro_current;
317static SV *coro_readyhook; 293static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
320static struct coro *coro_first; 296static struct coro *coro_first;
321#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
322 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
323/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
324 395
325static SV * 396static SV * ecb_noinline
326coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
327{ 398{
328#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
329 /* 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 */
330 get_sv (name, create); 401 get_sv (name, create);
331#endif 402#endif
332 return get_sv (name, create); 403 return get_sv (name, create);
333} 404}
334 405
335static AV * 406static AV * ecb_noinline
336coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
337{ 408{
338#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
339 /* 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 */
340 get_av (name, create); 411 get_av (name, create);
341#endif 412#endif
342 return get_av (name, create); 413 return get_av (name, create);
343} 414}
344 415
345static HV * 416static HV * ecb_noinline
346coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
347{ 418{
348#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
349 /* 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 */
350 get_hv (name, create); 421 get_hv (name, create);
351#endif 422#endif
352 return get_hv (name, create); 423 return get_hv (name, create);
353} 424}
354 425
355/* may croak */ 426ecb_inline void
356INLINE CV * 427coro_times_update (void)
357coro_sv_2cv (pTHX_ SV *sv)
358{ 428{
359 HV *st; 429#ifdef coro_clock_gettime
360 GV *gvp; 430 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 431
363 if (!cv) 432 ts.tv_sec = ts.tv_nsec = 0;
364 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;
365 435
366 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];
367} 471}
368 472
369/*****************************************************************************/ 473/*****************************************************************************/
370/* magic glue */ 474/* magic glue */
371 475
372#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
373#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
374 478
375#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
376 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
377 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
378 : mg_find (sv, type)) 482 : mg_find (sv, type))
379 483
380#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
381 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
382 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
383 : 0) 487 : 0)
384 488
385#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)
386#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)
387 491
388INLINE struct coro * 492ecb_inline MAGIC *
389SvSTATE_ (pTHX_ SV *coro) 493SvSTATEhv_p (pTHX_ SV *coro)
390{ 494{
391 HV *stash;
392 MAGIC *mg; 495 MAGIC *mg;
393 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
394 if (SvROK (coro)) 512 if (SvROK (coro_sv))
395 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
396 514
397 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg)
398 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
399 518
400 stash = SvSTASH (coro);
401 if (expect_false (stash != coro_stash && stash != coro_state_stash))
402 {
403 /* very slow, but rare, check */
404 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
405 croak ("Coro::State object required");
406 }
407
408 mg = CORO_MAGIC_state (coro);
409 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
410} 520}
411 521
412#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
413 523
… …
416#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
417 527
418/*****************************************************************************/ 528/*****************************************************************************/
419/* padlist management and caching */ 529/* padlist management and caching */
420 530
421static AV * 531ecb_inline PADLIST *
422coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
423{ 533{
424 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
425 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
426 539
427 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. */
428 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
429#if PERL_VERSION_ATLEAST (5,10,0)
430 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
431#else
432 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
433#endif 569#endif
434 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
435 --AvFILLp (padlist);
436 570
437 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
438 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;
439 579
440 return newpadlist; 580 return newpadlist;
441} 581}
442 582
443static void 583ecb_inline void
444free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
445{ 585{
446 /* may be during global destruction */ 586 /* may be during global destruction */
447 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
448 { 588 {
449 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
450 590
451 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
452 { 592 {
453 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
454 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
455 I32 j = AvFILLp (av);
456 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
457 while (j >= 0) 600 while (j >= 0)
458 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
459 602
460 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
461 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
462 } 606 }
463 607
464 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
465 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
466 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
467 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
468 } 618 }
469} 619}
470 620
471static int 621static int
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 623{
474 AV *padlist; 624 PADLIST *padlist;
475 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;
476 627
477 /* casting is fun. */ 628 /* perl manages to free our internal AV and _then_ call us */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 629 if (IN_DESTRUCT)
630 return 0;
631
632 while (len--)
479 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
480
481 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
482 634
483 return 0; 635 return 0;
484} 636}
485 637
486static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
487 0, 0, 0, 0, 639 0, 0, 0, 0,
488 coro_cv_free 640 coro_cv_free
489}; 641};
490 642
491/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
492static void 644ecb_inline void
493get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
494{ 646{
495 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
496 AV *av; 648 size_t *lenp;
497 649
498 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
499 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
500 else 652 else
501 { 653 {
502#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
503 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
504 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
510 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
511#endif 663#endif
512 } 664 }
513} 665}
514 666
515static void 667ecb_inline void
516put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
517{ 669{
518 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
519 AV *av;
520 671
521 if (expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
522 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);
523 682
524 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
525
526 if (expect_false (AvFILLp (av) >= AvMAX (av)))
527 av_extend (av, AvFILLp (av) + 1);
528
529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
530} 684}
531 685
532/** 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 #define svany_in_head(type) \
715 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
716
717 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719
720 if (svany_in_head (SvTYPE (b)))
721 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
722 }
723#endif
724}
725
726/* swap sv heads, at least logically */
727static void
728swap_svs (pTHX_ Coro__State c)
729{
730 int i;
731
732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
733 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
734}
735
736#define SWAP_SVS(coro) \
737 if (ecb_expect_false ((coro)->swap_sv)) \
738 swap_svs (aTHX_ (coro))
533 739
534static void 740static void
535on_enterleave_call (pTHX_ SV *cb); 741on_enterleave_call (pTHX_ SV *cb);
536 742
537static void 743static void
… …
540 perl_slots *slot = c->slot; 746 perl_slots *slot = c->slot;
541 c->slot = 0; 747 c->slot = 0;
542 748
543 PL_mainstack = c->mainstack; 749 PL_mainstack = c->mainstack;
544 750
545 GvSV (PL_defgv) = slot->defsv; 751#if CORO_JIT
546 GvAV (PL_defgv) = slot->defav; 752 load_perl_slots (slot);
547 GvSV (PL_errgv) = slot->errsv; 753#else
548 GvSV (irsgv) = slot->irsgv;
549 GvHV (PL_hintgv) = slot->hinthv;
550
551 #define VAR(name,type) PL_ ## name = slot->name; 754 #define VARx(name,expr,type) expr = slot->name;
552 # include "state.h" 755 #include "state.h"
553 #undef VAR 756#endif
554 757
555 { 758 {
556 dSP; 759 dSP;
557 760
558 CV *cv; 761 CV *cv;
559 762
560 /* now do the ugly restore mess */ 763 /* now do the ugly restore mess */
561 while (expect_true (cv = (CV *)POPs)) 764 while (ecb_expect_true (cv = (CV *)POPs))
562 { 765 {
563 put_padlist (aTHX_ cv); /* mark this padlist as available */ 766 put_padlist (aTHX_ cv); /* mark this padlist as available */
564 CvDEPTH (cv) = PTR2IV (POPs); 767 CvDEPTH (cv) = PTR2IV (POPs);
565 CvPADLIST (cv) = (AV *)POPs; 768 CvPADLIST (cv) = (PADLIST *)POPs;
566 } 769 }
567 770
568 PUTBACK; 771 PUTBACK;
569 } 772 }
570 773
571 slf_frame = c->slf_frame; 774 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 775 CORO_THROW = c->except;
573 776
777 if (ecb_expect_false (enable_times))
778 {
779 if (ecb_expect_false (!times_valid))
780 coro_times_update ();
781
782 coro_times_sub (c);
783 }
784
574 if (expect_false (c->on_enter)) 785 if (ecb_expect_false (c->on_enter))
575 { 786 {
576 int i; 787 int i;
577 788
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 } 791 }
792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
801 SWAP_SVS (c);
581} 802}
582 803
583static void 804static void
584save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
585{ 806{
807 SWAP_SVS (c);
808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
816
586 if (expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
587 { 818 {
588 int i; 819 int i;
589 820
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 821 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 822 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
823 }
824
825 times_valid = 0;
826
827 if (ecb_expect_false (enable_times))
828 {
829 coro_times_update (); times_valid = 1;
830 coro_times_add (c);
592 } 831 }
593 832
594 c->except = CORO_THROW; 833 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 834 c->slf_frame = slf_frame;
596 835
… …
607 846
608 XPUSHs (Nullsv); 847 XPUSHs (Nullsv);
609 /* this loop was inspired by pp_caller */ 848 /* this loop was inspired by pp_caller */
610 for (;;) 849 for (;;)
611 { 850 {
612 while (expect_true (cxix >= 0)) 851 while (ecb_expect_true (cxix >= 0))
613 { 852 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 853 PERL_CONTEXT *cx = &ccstk[cxix--];
615 854
616 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 855 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
617 { 856 {
618 CV *cv = cx->blk_sub.cv; 857 CV *cv = cx->blk_sub.cv;
619 858
620 if (expect_true (CvDEPTH (cv))) 859 if (ecb_expect_true (CvDEPTH (cv)))
621 { 860 {
622 EXTEND (SP, 3); 861 EXTEND (SP, 3);
623 PUSHs ((SV *)CvPADLIST (cv)); 862 PUSHs ((SV *)CvPADLIST (cv));
624 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 863 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
625 PUSHs ((SV *)cv); 864 PUSHs ((SV *)cv);
… …
628 get_padlist (aTHX_ cv); 867 get_padlist (aTHX_ cv);
629 } 868 }
630 } 869 }
631 } 870 }
632 871
633 if (expect_true (top_si->si_type == PERLSI_MAIN)) 872 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
634 break; 873 break;
635 874
636 top_si = top_si->si_prev; 875 top_si = top_si->si_prev;
637 ccstk = top_si->si_cxstack; 876 ccstk = top_si->si_cxstack;
638 cxix = top_si->si_cxix; 877 cxix = top_si->si_cxix;
… …
640 879
641 PUTBACK; 880 PUTBACK;
642 } 881 }
643 882
644 /* allocate some space on the context stack for our purposes */ 883 /* allocate some space on the context stack for our purposes */
645 /* we manually unroll here, as usually 2 slots is enough */ 884 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
646 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC;
649 { 885 {
650 int i; 886 unsigned int i;
887
651 for (i = 3; i < SLOT_COUNT; ++i) 888 for (i = 0; i < SLOT_COUNT; ++i)
652 CXINC; 889 CXINC;
653 } 890
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 891 cxstack_ix -= SLOT_COUNT; /* undo allocation */
892 }
655 893
656 c->mainstack = PL_mainstack; 894 c->mainstack = PL_mainstack;
657 895
658 { 896 {
659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 897 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
660 898
661 slot->defav = GvAV (PL_defgv); 899#if CORO_JIT
662 slot->defsv = DEFSV; 900 save_perl_slots (slot);
663 slot->errsv = ERRSV; 901#else
664 slot->irsgv = GvSV (irsgv);
665 slot->hinthv = GvHV (PL_hintgv);
666
667 #define VAR(name,type) slot->name = PL_ ## name; 902 #define VARx(name,expr,type) slot->name = expr;
668 # include "state.h" 903 #include "state.h"
669 #undef VAR 904#endif
670 } 905 }
671} 906}
672 907
673/* 908/*
674 * allocate various perl stacks. This is almost an exact copy 909 * allocate various perl stacks. This is almost an exact copy
… …
680# define coro_init_stacks(thx) init_stacks () 915# define coro_init_stacks(thx) init_stacks ()
681#else 916#else
682static void 917static void
683coro_init_stacks (pTHX) 918coro_init_stacks (pTHX)
684{ 919{
685 PL_curstackinfo = new_stackinfo(32, 8); 920 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
686 PL_curstackinfo->si_type = PERLSI_MAIN; 921 PL_curstackinfo->si_type = PERLSI_MAIN;
687 PL_curstack = PL_curstackinfo->si_stack; 922 PL_curstack = PL_curstackinfo->si_stack;
688 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 923 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
689 924
690 PL_stack_base = AvARRAY(PL_curstack); 925 PL_stack_base = AvARRAY(PL_curstack);
… …
705#endif 940#endif
706 941
707 New(54,PL_scopestack,8,I32); 942 New(54,PL_scopestack,8,I32);
708 PL_scopestack_ix = 0; 943 PL_scopestack_ix = 0;
709 PL_scopestack_max = 8; 944 PL_scopestack_max = 8;
945#if HAS_SCOPESTACK_NAME
946 New(54,PL_scopestack_name,8,const char*);
947#endif
710 948
711 New(54,PL_savestack,24,ANY); 949 New(54,PL_savestack,24,ANY);
712 PL_savestack_ix = 0; 950 PL_savestack_ix = 0;
713 PL_savestack_max = 24; 951 PL_savestack_max = 24;
714 952
… …
742 } 980 }
743 981
744 Safefree (PL_tmps_stack); 982 Safefree (PL_tmps_stack);
745 Safefree (PL_markstack); 983 Safefree (PL_markstack);
746 Safefree (PL_scopestack); 984 Safefree (PL_scopestack);
985#if HAS_SCOPESTACK_NAME
986 Safefree (PL_scopestack_name);
987#endif
747 Safefree (PL_savestack); 988 Safefree (PL_savestack);
748#if !PERL_VERSION_ATLEAST (5,10,0) 989#if !PERL_VERSION_ATLEAST (5,10,0)
749 Safefree (PL_retstack); 990 Safefree (PL_retstack);
750#endif 991#endif
751} 992}
… …
797#endif 1038#endif
798 1039
799/* 1040/*
800 * This overrides the default magic get method of %SIG elements. 1041 * This overrides the default magic get method of %SIG elements.
801 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1042 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
802 * and instead of trying to save and restore the hash elements, we just provide 1043 * and instead of trying to save and restore the hash elements (extremely slow),
803 * readback here. 1044 * we just provide our own readback here.
804 */ 1045 */
805static int 1046static int ecb_cold
806coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1047coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
807{ 1048{
808 const char *s = MgPV_nolen_const (mg); 1049 const char *s = MgPV_nolen_const (mg);
809 1050
810 if (*s == '_') 1051 if (*s == '_')
811 { 1052 {
812 SV **svp = 0; 1053 SV **svp = 0;
813 1054
814 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 1057
817 if (svp) 1058 if (svp)
818 { 1059 {
819 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp));
1066 else
1067 ssv = *svp;
1068
1069 sv_setsv (sv, ssv);
820 return 0; 1070 return 0;
821 } 1071 }
822 } 1072 }
823 1073
824 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
825} 1075}
826 1076
827static int 1077static int ecb_cold
828coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
829{ 1079{
830 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
831 1081
832 if (*s == '_') 1082 if (*s == '_')
… …
846 } 1096 }
847 1097
848 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1098 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
849} 1099}
850 1100
851static int 1101static int ecb_cold
852coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1102coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
853{ 1103{
854 const char *s = MgPV_nolen_const (mg); 1104 const char *s = MgPV_nolen_const (mg);
855 1105
856 if (*s == '_') 1106 if (*s == '_')
… …
889slf_check_repeat (pTHX_ struct CoroSLF *frame) 1139slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{ 1140{
891 return 1; 1141 return 1;
892} 1142}
893 1143
894static UNOP coro_setup_op; 1144static UNOP init_perl_op;
895 1145
896static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1146ecb_noinline static void /* noinline to keep it out of the transfer fast path */
897coro_setup (pTHX_ struct coro *coro) 1147init_perl (pTHX_ struct coro *coro)
898{ 1148{
899 /* 1149 /*
900 * emulate part of the perl startup here. 1150 * emulate part of the perl startup here.
901 */ 1151 */
902 coro_init_stacks (aTHX); 1152 coro_init_stacks (aTHX);
… …
909 PL_comppad_name_fill = 0; 1159 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0; 1160 PL_comppad_name_floor = 0;
911 PL_curpm = 0; 1161 PL_curpm = 0;
912 PL_curpad = 0; 1162 PL_curpad = 0;
913 PL_localizing = 0; 1163 PL_localizing = 0;
914 PL_dirty = 0;
915 PL_restartop = 0; 1164 PL_restartop = 0;
916#if PERL_VERSION_ATLEAST (5,10,0) 1165#if PERL_VERSION_ATLEAST (5,10,0)
917 PL_parser = 0; 1166 PL_parser = 0;
918#endif 1167#endif
919 PL_hints = 0; 1168 PL_hints = 0;
920 1169
921 /* recreate the die/warn hooks */ 1170 /* recreate the die/warn hooks */
922 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1171 PL_diehook = SvREFCNT_inc (rv_diehook);
923 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1172 PL_warnhook = SvREFCNT_inc (rv_warnhook);
924 1173
925 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
926 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
927 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
928 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
929 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
930 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
931 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
932 1184
933 { 1185 {
934 dSP; 1186 dSP;
… …
949 /* this newly created coroutine might be run on an existing cctx which most 1201 /* this newly created coroutine might be run on an existing cctx which most
950 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1202 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
951 */ 1203 */
952 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1204 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
953 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1205 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1206 slf_frame.destroy = 0;
954 1207
955 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1208 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
956 coro_setup_op.op_next = PL_op; 1209 init_perl_op.op_next = PL_op;
957 coro_setup_op.op_type = OP_ENTERSUB; 1210 init_perl_op.op_type = OP_ENTERSUB;
958 coro_setup_op.op_ppaddr = pp_slf; 1211 init_perl_op.op_ppaddr = pp_slf;
959 /* no flags etc. required, as an init function won't be called */ 1212 /* no flags etc. required, as an init function won't be called */
960 1213
961 PL_op = (OP *)&coro_setup_op; 1214 PL_op = (OP *)&init_perl_op;
962 1215
963 /* copy throw, in case it was set before coro_setup */ 1216 /* copy throw, in case it was set before init_perl */
964 CORO_THROW = coro->except; 1217 CORO_THROW = coro->except;
1218
1219 SWAP_SVS (coro);
1220
1221 if (ecb_expect_false (enable_times))
1222 {
1223 coro_times_update ();
1224 coro_times_sub (coro);
1225 }
965} 1226}
966 1227
967static void 1228static void
968coro_unwind_stacks (pTHX) 1229coro_unwind_stacks (pTHX)
969{ 1230{
… …
984 dounwind (-1); 1245 dounwind (-1);
985 } 1246 }
986} 1247}
987 1248
988static void 1249static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1250destroy_perl (pTHX_ struct coro *coro)
990{ 1251{
1252 SV *svf [9];
1253
1254 {
1255 SV *old_current = SvRV (coro_current);
1256 struct coro *current = SvSTATE (old_current);
1257
1258 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1259
1260 save_perl (aTHX_ current);
1261
1262 /* this will cause transfer_check to croak on block*/
1263 SvRV_set (coro_current, (SV *)coro->hv);
1264
1265 load_perl (aTHX_ coro);
1266
991 coro_unwind_stacks (aTHX); 1267 coro_unwind_stacks (aTHX);
992 1268
993 SvREFCNT_dec (GvSV (PL_defgv)); 1269 /* restore swapped sv's */
994 SvREFCNT_dec (GvAV (PL_defgv)); 1270 SWAP_SVS (coro);
995 SvREFCNT_dec (GvSV (PL_errgv));
996 SvREFCNT_dec (PL_defoutgv);
997 SvREFCNT_dec (PL_rs);
998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
1000 1271
1001 SvREFCNT_dec (PL_diehook); 1272 coro_destruct_stacks (aTHX);
1002 SvREFCNT_dec (PL_warnhook); 1273
1274 /* now save some sv's to be free'd later */
1275 svf [0] = GvSV (PL_defgv);
1276 svf [1] = (SV *)GvAV (PL_defgv);
1277 svf [2] = GvSV (PL_errgv);
1278 svf [3] = (SV *)PL_defoutgv;
1279 svf [4] = PL_rs;
1280 svf [5] = GvSV (irsgv);
1281 svf [6] = (SV *)GvHV (PL_hintgv);
1282 svf [7] = PL_diehook;
1283 svf [8] = PL_warnhook;
1284 assert (9 == sizeof (svf) / sizeof (*svf));
1285
1286 SvRV_set (coro_current, old_current);
1287
1288 load_perl (aTHX_ current);
1003 1289 }
1290
1291 {
1292 unsigned int i;
1293
1294 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1295 SvREFCNT_dec (svf [i]);
1296
1004 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
1008 1301 SvREFCNT_dec (coro->on_enter_xs);
1009 coro_destruct_stacks (aTHX); 1302 SvREFCNT_dec (coro->on_leave_xs);
1303 }
1010} 1304}
1011 1305
1012INLINE void 1306ecb_inline void
1013free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1014{ 1308{
1015 if (expect_true (coro_mortal)) 1309 if (ecb_expect_true (coro_mortal))
1016 { 1310 {
1017 SvREFCNT_dec (coro_mortal); 1311 SvREFCNT_dec ((SV *)coro_mortal);
1018 coro_mortal = 0; 1312 coro_mortal = 0;
1019 } 1313 }
1020} 1314}
1021 1315
1022static int 1316static int
… …
1076 1370
1077 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1078 { 1372 {
1079 SV **cb; 1373 SV **cb;
1080 1374
1081 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1082 { 1376 {
1083 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1084 1378
1085 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1086 { 1380 {
… …
1155 1449
1156 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1450 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1157} 1451}
1158 1452
1159/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1453/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1160static void NOINLINE 1454static void ecb_noinline
1161cctx_prepare (pTHX) 1455cctx_prepare (pTHX)
1162{ 1456{
1163 PL_top_env = &PL_start_env; 1457 PL_top_env = &PL_start_env;
1164 1458
1165 if (cctx_current->flags & CC_TRACE) 1459 if (cctx_current->flags & CC_TRACE)
… …
1176 slf_frame.prepare = slf_prepare_set_stacklevel; 1470 slf_frame.prepare = slf_prepare_set_stacklevel;
1177 slf_frame.check = slf_check_set_stacklevel; 1471 slf_frame.check = slf_check_set_stacklevel;
1178} 1472}
1179 1473
1180/* the tail of transfer: execute stuff we can only do after a transfer */ 1474/* the tail of transfer: execute stuff we can only do after a transfer */
1181INLINE void 1475ecb_inline void
1182transfer_tail (pTHX) 1476transfer_tail (pTHX)
1183{ 1477{
1184 free_coro_mortal (aTHX); 1478 free_coro_mortal (aTHX);
1479}
1480
1481/* try to exit the same way perl's main function would do */
1482/* we do not bother resetting the environment or other things *7
1483/* that are not, uhm, essential */
1484/* this obviously also doesn't work when perl is embedded */
1485static void ecb_noinline ecb_cold
1486perlish_exit (pTHX)
1487{
1488 int exitstatus = perl_destruct (PL_curinterp);
1489 perl_free (PL_curinterp);
1490 exit (exitstatus);
1185} 1491}
1186 1492
1187/* 1493/*
1188 * this is a _very_ stripped down perl interpreter ;) 1494 * this is a _very_ stripped down perl interpreter ;)
1189 */ 1495 */
… …
1211 /* somebody or something will hit me for both perl_run and PL_restartop */ 1517 /* somebody or something will hit me for both perl_run and PL_restartop */
1212 PL_restartop = PL_op; 1518 PL_restartop = PL_op;
1213 perl_run (PL_curinterp); 1519 perl_run (PL_curinterp);
1214 /* 1520 /*
1215 * Unfortunately, there is no way to get at the return values of the 1521 * Unfortunately, there is no way to get at the return values of the
1216 * coro body here, as perl_run destroys these 1522 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1523 * runtime errors here, as this is just a random interpreter, not a thread.
1217 */ 1524 */
1218 1525
1219 /* 1526 /*
1220 * If perl-run returns we assume exit() was being called or the coro 1527 * If perl-run returns we assume exit() was being called or the coro
1221 * fell off the end, which seems to be the only valid (non-bug) 1528 * fell off the end, which seems to be the only valid (non-bug)
1222 * reason for perl_run to return. We try to exit by jumping to the 1529 * reason for perl_run to return. We try to mimic whatever perl is normally
1223 * bootstrap-time "top" top_env, as we cannot restore the "main" 1530 * doing in that case. YMMV.
1224 * coroutine as Coro has no such concept.
1225 * This actually isn't valid with the pthread backend, but OSes requiring
1226 * that backend are too broken to do it in a standards-compliant way.
1227 */ 1531 */
1228 PL_top_env = main_top_env; 1532 perlish_exit (aTHX);
1229 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1230 } 1533 }
1231} 1534}
1232 1535
1233static coro_cctx * 1536static coro_cctx *
1234cctx_new () 1537cctx_new (void)
1235{ 1538{
1236 coro_cctx *cctx; 1539 coro_cctx *cctx;
1237 1540
1238 ++cctx_count; 1541 ++cctx_count;
1239 New (0, cctx, 1, coro_cctx); 1542 New (0, cctx, 1, coro_cctx);
… …
1245 return cctx; 1548 return cctx;
1246} 1549}
1247 1550
1248/* create a new cctx only suitable as source */ 1551/* create a new cctx only suitable as source */
1249static coro_cctx * 1552static coro_cctx *
1250cctx_new_empty () 1553cctx_new_empty (void)
1251{ 1554{
1252 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1253 1556
1254 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1255 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1256 1559
1257 return cctx; 1560 return cctx;
1258} 1561}
1259 1562
1260/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1261static coro_cctx * 1564static coro_cctx *
1262cctx_new_run () 1565cctx_new_run (void)
1263{ 1566{
1264 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1265 void *stack_start;
1266 size_t stack_size;
1267 1568
1268#if HAVE_MMAP 1569 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1269 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1270 /* mmap supposedly does allocate-on-write for us */
1271 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1272
1273 if (cctx->sptr != (void *)-1)
1274 {
1275 #if CORO_STACKGUARD
1276 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1277 #endif
1278 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1279 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1280 cctx->flags |= CC_MAPPED;
1281 } 1570 {
1282 else
1283#endif
1284 {
1285 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1286 New (0, cctx->sptr, cctx_stacksize, long);
1287
1288 if (!cctx->sptr)
1289 {
1290 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1291 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1292 }
1293
1294 stack_start = cctx->sptr;
1295 stack_size = cctx->ssize;
1296 } 1573 }
1297 1574
1298 #if CORO_USE_VALGRIND
1299 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1300 #endif
1301
1302 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1303 1576
1304 return cctx; 1577 return cctx;
1305} 1578}
1306 1579
1307static void 1580static void
1308cctx_destroy (coro_cctx *cctx) 1581cctx_destroy (coro_cctx *cctx)
1309{ 1582{
1310 if (!cctx) 1583 if (!cctx)
1311 return; 1584 return;
1312 1585
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1314 1587
1315 --cctx_count; 1588 --cctx_count;
1316 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1317 1590
1318 /* coro_transfer creates new, empty cctx's */ 1591 coro_stack_free (&cctx->stack);
1319 if (cctx->sptr)
1320 {
1321 #if CORO_USE_VALGRIND
1322 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1323 #endif
1324
1325#if HAVE_MMAP
1326 if (cctx->flags & CC_MAPPED)
1327 munmap (cctx->sptr, cctx->ssize);
1328 else
1329#endif
1330 Safefree (cctx->sptr);
1331 }
1332 1592
1333 Safefree (cctx); 1593 Safefree (cctx);
1334} 1594}
1335 1595
1336/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1337#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1597#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1338 1598
1339static coro_cctx * 1599static coro_cctx *
1340cctx_get (pTHX) 1600cctx_get (pTHX)
1341{ 1601{
1342 while (expect_true (cctx_first)) 1602 while (ecb_expect_true (cctx_first))
1343 { 1603 {
1344 coro_cctx *cctx = cctx_first; 1604 coro_cctx *cctx = cctx_first;
1345 cctx_first = cctx->next; 1605 cctx_first = cctx->next;
1346 --cctx_idle; 1606 --cctx_idle;
1347 1607
1348 if (expect_true (!CCTX_EXPIRED (cctx))) 1608 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1349 return cctx; 1609 return cctx;
1350 1610
1351 cctx_destroy (cctx); 1611 cctx_destroy (cctx);
1352 } 1612 }
1353 1613
… …
1355} 1615}
1356 1616
1357static void 1617static void
1358cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1359{ 1619{
1360 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1361 1621
1362 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1363 if (expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1364 { 1624 {
1365 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1366 cctx_first = first->next; 1626 cctx_first = first->next;
1367 --cctx_idle; 1627 --cctx_idle;
1368 1628
… …
1379static void 1639static void
1380transfer_check (pTHX_ struct coro *prev, struct coro *next) 1640transfer_check (pTHX_ struct coro *prev, struct coro *next)
1381{ 1641{
1382 /* TODO: throwing up here is considered harmful */ 1642 /* TODO: throwing up here is considered harmful */
1383 1643
1384 if (expect_true (prev != next)) 1644 if (ecb_expect_true (prev != next))
1385 { 1645 {
1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1646 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1387 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1647 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1388 1648
1389 if (expect_false (next->flags & CF_RUNNING)) 1649 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1391
1392 if (expect_false (next->flags & CF_DESTROYED))
1393 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1650 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1394 1651
1395#if !PERL_VERSION_ATLEAST (5,10,0) 1652#if !PERL_VERSION_ATLEAST (5,10,0)
1396 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1653 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1397 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1654 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1398#endif 1655#endif
1399 } 1656 }
1400} 1657}
1401 1658
1402/* always use the TRANSFER macro */ 1659/* always use the TRANSFER macro */
1403static void NOINLINE /* noinline so we have a fixed stackframe */ 1660static void ecb_noinline /* noinline so we have a fixed stackframe */
1404transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1661transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1405{ 1662{
1406 dSTACKLEVEL; 1663 dSTACKLEVEL;
1407 1664
1408 /* sometimes transfer is only called to set idle_sp */ 1665 /* sometimes transfer is only called to set idle_sp */
1409 if (expect_false (!prev)) 1666 if (ecb_expect_false (!prev))
1410 { 1667 {
1411 cctx_current->idle_sp = STACKLEVEL; 1668 cctx_current->idle_sp = STACKLEVEL;
1412 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1669 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1413 } 1670 }
1414 else if (expect_true (prev != next)) 1671 else if (ecb_expect_true (prev != next))
1415 { 1672 {
1416 coro_cctx *cctx_prev; 1673 coro_cctx *cctx_prev;
1417 1674
1418 if (expect_false (prev->flags & CF_NEW)) 1675 if (ecb_expect_false (prev->flags & CF_NEW))
1419 { 1676 {
1420 /* create a new empty/source context */ 1677 /* create a new empty/source context */
1421 prev->flags &= ~CF_NEW; 1678 prev->flags &= ~CF_NEW;
1422 prev->flags |= CF_RUNNING; 1679 prev->flags |= CF_RUNNING;
1423 } 1680 }
… …
1426 next->flags |= CF_RUNNING; 1683 next->flags |= CF_RUNNING;
1427 1684
1428 /* first get rid of the old state */ 1685 /* first get rid of the old state */
1429 save_perl (aTHX_ prev); 1686 save_perl (aTHX_ prev);
1430 1687
1431 if (expect_false (next->flags & CF_NEW)) 1688 if (ecb_expect_false (next->flags & CF_NEW))
1432 { 1689 {
1433 /* need to start coroutine */ 1690 /* need to start coroutine */
1434 next->flags &= ~CF_NEW; 1691 next->flags &= ~CF_NEW;
1435 /* setup coroutine call */ 1692 /* setup coroutine call */
1436 coro_setup (aTHX_ next); 1693 init_perl (aTHX_ next);
1437 } 1694 }
1438 else 1695 else
1439 load_perl (aTHX_ next); 1696 load_perl (aTHX_ next);
1440 1697
1441 /* possibly untie and reuse the cctx */ 1698 /* possibly untie and reuse the cctx */
1442 if (expect_true ( 1699 if (ecb_expect_true (
1443 cctx_current->idle_sp == STACKLEVEL 1700 cctx_current->idle_sp == STACKLEVEL
1444 && !(cctx_current->flags & CC_TRACE) 1701 && !(cctx_current->flags & CC_TRACE)
1445 && !force_cctx 1702 && !force_cctx
1446 )) 1703 ))
1447 { 1704 {
1448 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1705 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1449 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1706 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1450 1707
1451 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1708 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1452 /* without this the next cctx_get might destroy the running cctx while still in use */ 1709 /* without this the next cctx_get might destroy the running cctx while still in use */
1453 if (expect_false (CCTX_EXPIRED (cctx_current))) 1710 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1454 if (expect_true (!next->cctx)) 1711 if (ecb_expect_true (!next->cctx))
1455 next->cctx = cctx_get (aTHX); 1712 next->cctx = cctx_get (aTHX);
1456 1713
1457 cctx_put (cctx_current); 1714 cctx_put (cctx_current);
1458 } 1715 }
1459 else 1716 else
1460 prev->cctx = cctx_current; 1717 prev->cctx = cctx_current;
1461 1718
1462 ++next->usecount; 1719 ++next->usecount;
1463 1720
1464 cctx_prev = cctx_current; 1721 cctx_prev = cctx_current;
1465 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1722 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1466 1723
1467 next->cctx = 0; 1724 next->cctx = 0;
1468 1725
1469 if (expect_false (cctx_prev != cctx_current)) 1726 if (ecb_expect_false (cctx_prev != cctx_current))
1470 { 1727 {
1471 cctx_prev->top_env = PL_top_env; 1728 cctx_prev->top_env = PL_top_env;
1472 PL_top_env = cctx_current->top_env; 1729 PL_top_env = cctx_current->top_env;
1473 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1730 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1474 } 1731 }
… …
1480#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1737#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1481#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1738#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1482 1739
1483/** high level stuff ********************************************************/ 1740/** high level stuff ********************************************************/
1484 1741
1742/* this function is actually Coro, not Coro::State, but we call it from here */
1743/* because it is convenient - but it hasn't been declared yet for that reason */
1485static int 1744static void
1745coro_call_on_destroy (pTHX_ struct coro *coro);
1746
1747static void
1486coro_state_destroy (pTHX_ struct coro *coro) 1748coro_state_destroy (pTHX_ struct coro *coro)
1487{ 1749{
1488 if (coro->flags & CF_DESTROYED) 1750 if (coro->flags & CF_ZOMBIE)
1489 return 0; 1751 return;
1490 1752
1491 if (coro->on_destroy)
1492 coro->on_destroy (aTHX_ coro); 1753 slf_destroy (aTHX_ coro);
1493 1754
1494 coro->flags |= CF_DESTROYED; 1755 coro->flags |= CF_ZOMBIE;
1495 1756
1496 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1497 { 1758 {
1498 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1759 /* reduce nready, as destroying a ready coro effectively unreadies it */
1499 /* alternative: look through all ready queues and remove the coro */ 1760 /* alternative: look through all ready queues and remove the coro */
1500 --coro_nready; 1761 --coro_nready;
1501 } 1762 }
1502 else 1763 else
1503 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1764 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1765
1766 if (coro->next) coro->next->prev = coro->prev;
1767 if (coro->prev) coro->prev->next = coro->next;
1768 if (coro == coro_first) coro_first = coro->next;
1504 1769
1505 if (coro->mainstack 1770 if (coro->mainstack
1506 && coro->mainstack != main_mainstack 1771 && coro->mainstack != main_mainstack
1507 && coro->slot 1772 && coro->slot
1508 && !PL_dirty) 1773 && !PL_dirty)
1509 {
1510 struct coro *current = SvSTATE_current;
1511
1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1513
1514 save_perl (aTHX_ current);
1515 load_perl (aTHX_ coro);
1516
1517 coro_destruct_perl (aTHX_ coro); 1774 destroy_perl (aTHX_ coro);
1518
1519 load_perl (aTHX_ current);
1520
1521 coro->slot = 0;
1522 }
1523 1775
1524 cctx_destroy (coro->cctx); 1776 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv); 1777 SvREFCNT_dec (coro->startcv);
1526 SvREFCNT_dec (coro->args); 1778 SvREFCNT_dec (coro->args);
1779 SvREFCNT_dec (coro->swap_sv);
1527 SvREFCNT_dec (CORO_THROW); 1780 SvREFCNT_dec (CORO_THROW);
1528 1781
1529 if (coro->next) coro->next->prev = coro->prev; 1782 coro_call_on_destroy (aTHX_ coro);
1530 if (coro->prev) coro->prev->next = coro->next;
1531 if (coro == coro_first) coro_first = coro->next;
1532 1783
1533 return 1; 1784 /* more destruction mayhem in coro_state_free */
1534} 1785}
1535 1786
1536static int 1787static int
1537coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1788coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1538{ 1789{
1539 struct coro *coro = (struct coro *)mg->mg_ptr; 1790 struct coro *coro = (struct coro *)mg->mg_ptr;
1540 mg->mg_ptr = 0; 1791 mg->mg_ptr = 0;
1541 1792
1542 coro->hv = 0;
1543
1544 if (--coro->refcnt < 0)
1545 {
1546 coro_state_destroy (aTHX_ coro); 1793 coro_state_destroy (aTHX_ coro);
1794 SvREFCNT_dec (coro->on_destroy);
1795 SvREFCNT_dec (coro->status);
1796
1547 Safefree (coro); 1797 Safefree (coro);
1548 }
1549 1798
1550 return 0; 1799 return 0;
1551} 1800}
1552 1801
1553static int 1802static int ecb_cold
1554coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1803coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1555{ 1804{
1556 struct coro *coro = (struct coro *)mg->mg_ptr; 1805 /* called when perl clones the current process the slow way (windows process emulation) */
1557 1806 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1558 ++coro->refcnt; 1807 mg->mg_ptr = 0;
1808 mg->mg_virtual = 0;
1559 1809
1560 return 0; 1810 return 0;
1561} 1811}
1562 1812
1563static MGVTBL coro_state_vtbl = { 1813static MGVTBL coro_state_vtbl = {
… …
1586 1836
1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1837 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1588 TRANSFER (ta, 1); 1838 TRANSFER (ta, 1);
1589} 1839}
1590 1840
1591/*****************************************************************************/
1592/* gensub: simple closure generation utility */
1593
1594#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1595
1596/* create a closure from XS, returns a code reference */
1597/* the arg can be accessed via GENSUB_ARG from the callback */
1598/* the callback must use dXSARGS/XSRETURN */
1599static SV *
1600gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1601{
1602 CV *cv = (CV *)newSV (0);
1603
1604 sv_upgrade ((SV *)cv, SVt_PVCV);
1605
1606 CvANON_on (cv);
1607 CvISXSUB_on (cv);
1608 CvXSUB (cv) = xsub;
1609 GENSUB_ARG = arg;
1610
1611 return newRV_noinc ((SV *)cv);
1612}
1613
1614/** Coro ********************************************************************/ 1841/** Coro ********************************************************************/
1615 1842
1616INLINE void 1843ecb_inline void
1617coro_enq (pTHX_ struct coro *coro) 1844coro_enq (pTHX_ struct coro *coro)
1618{ 1845{
1619 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1846 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1620}
1621 1847
1622INLINE SV * 1848 SvREFCNT_inc_NN (coro->hv);
1849
1850 coro->next_ready = 0;
1851 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1852 ready [1] = coro;
1853}
1854
1855ecb_inline struct coro *
1623coro_deq (pTHX) 1856coro_deq (pTHX)
1624{ 1857{
1625 int prio; 1858 int prio;
1626 1859
1627 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1860 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1628 if (AvFILLp (coro_ready [prio]) >= 0) 1861 {
1629 return av_shift (coro_ready [prio]); 1862 struct coro **ready = coro_ready [prio];
1863
1864 if (ready [0])
1865 {
1866 struct coro *coro = ready [0];
1867 ready [0] = coro->next_ready;
1868 return coro;
1869 }
1870 }
1630 1871
1631 return 0; 1872 return 0;
1873}
1874
1875static void
1876invoke_sv_ready_hook_helper (void)
1877{
1878 dTHX;
1879 dSP;
1880
1881 ENTER;
1882 SAVETMPS;
1883
1884 PUSHMARK (SP);
1885 PUTBACK;
1886 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1887
1888 FREETMPS;
1889 LEAVE;
1632} 1890}
1633 1891
1634static int 1892static int
1635api_ready (pTHX_ SV *coro_sv) 1893api_ready (pTHX_ SV *coro_sv)
1636{ 1894{
1637 struct coro *coro;
1638 SV *sv_hook;
1639 void (*xs_hook)(void);
1640
1641 coro = SvSTATE (coro_sv); 1895 struct coro *coro = SvSTATE (coro_sv);
1642 1896
1643 if (coro->flags & CF_READY) 1897 if (coro->flags & CF_READY)
1644 return 0; 1898 return 0;
1645 1899
1646 coro->flags |= CF_READY; 1900 coro->flags |= CF_READY;
1647 1901
1648 sv_hook = coro_nready ? 0 : coro_readyhook;
1649 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1650
1651 coro_enq (aTHX_ coro); 1902 coro_enq (aTHX_ coro);
1652 ++coro_nready;
1653 1903
1654 if (sv_hook) 1904 if (!coro_nready++)
1655 { 1905 if (coroapi.readyhook)
1656 dSP; 1906 coroapi.readyhook ();
1657
1658 ENTER;
1659 SAVETMPS;
1660
1661 PUSHMARK (SP);
1662 PUTBACK;
1663 call_sv (sv_hook, G_VOID | G_DISCARD);
1664
1665 FREETMPS;
1666 LEAVE;
1667 }
1668
1669 if (xs_hook)
1670 xs_hook ();
1671 1907
1672 return 1; 1908 return 1;
1673} 1909}
1674 1910
1675static int 1911static int
… …
1677{ 1913{
1678 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1914 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1679} 1915}
1680 1916
1681/* expects to own a reference to next->hv */ 1917/* expects to own a reference to next->hv */
1682INLINE void 1918ecb_inline void
1683prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1919prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1684{ 1920{
1685 SV *prev_sv = SvRV (coro_current); 1921 SV *prev_sv = SvRV (coro_current);
1686 1922
1687 ta->prev = SvSTATE_hv (prev_sv); 1923 ta->prev = SvSTATE_hv (prev_sv);
… …
1698static void 1934static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1935prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{ 1936{
1701 for (;;) 1937 for (;;)
1702 { 1938 {
1703 SV *next_sv = coro_deq (aTHX); 1939 struct coro *next = coro_deq (aTHX);
1704 1940
1705 if (expect_true (next_sv)) 1941 if (ecb_expect_true (next))
1706 { 1942 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */ 1943 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED)) 1944 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1945 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1712 else 1946 else
1713 { 1947 {
1714 next->flags &= ~CF_READY; 1948 next->flags &= ~CF_READY;
1715 --coro_nready; 1949 --coro_nready;
1716 1950
… …
1722 { 1956 {
1723 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1726 { 1960 {
1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1980
1727 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1728 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready; 1983 --coro_nready;
1730 } 1984 }
1731 else 1985 else
1732 { 1986 {
1987 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1733 dSP; 1988 dSP;
1734 1989
1735 ENTER; 1990 ENTER;
1736 SAVETMPS; 1991 SAVETMPS;
1737 1992
… …
1744 } 1999 }
1745 } 2000 }
1746 } 2001 }
1747} 2002}
1748 2003
1749INLINE void 2004ecb_inline void
1750prepare_cede (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede (pTHX_ struct coro_transfer_args *ta)
1751{ 2006{
1752 api_ready (aTHX_ coro_current); 2007 api_ready (aTHX_ coro_current);
1753 prepare_schedule (aTHX_ ta); 2008 prepare_schedule (aTHX_ ta);
1754} 2009}
1755 2010
1756INLINE void 2011ecb_inline void
1757prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2012prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1758{ 2013{
1759 SV *prev = SvRV (coro_current); 2014 SV *prev = SvRV (coro_current);
1760 2015
1761 if (coro_nready) 2016 if (coro_nready)
… …
1791{ 2046{
1792 struct coro_transfer_args ta; 2047 struct coro_transfer_args ta;
1793 2048
1794 prepare_cede (aTHX_ &ta); 2049 prepare_cede (aTHX_ &ta);
1795 2050
1796 if (expect_true (ta.prev != ta.next)) 2051 if (ecb_expect_true (ta.prev != ta.next))
1797 { 2052 {
1798 TRANSFER (ta, 1); 2053 TRANSFER (ta, 1);
1799 return 1; 2054 return 1;
1800 } 2055 }
1801 else 2056 else
… …
1844 coro->slot->runops = RUNOPS_DEFAULT; 2099 coro->slot->runops = RUNOPS_DEFAULT;
1845 } 2100 }
1846} 2101}
1847 2102
1848static void 2103static void
2104coro_push_av (pTHX_ AV *av, I32 gimme_v)
2105{
2106 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2107 {
2108 dSP;
2109
2110 if (gimme_v == G_SCALAR)
2111 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2112 else
2113 {
2114 int i;
2115 EXTEND (SP, AvFILLp (av) + 1);
2116
2117 for (i = 0; i <= AvFILLp (av); ++i)
2118 PUSHs (AvARRAY (av)[i]);
2119 }
2120
2121 PUTBACK;
2122 }
2123}
2124
2125static void
2126coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2127{
2128 if (!coro->on_destroy)
2129 coro->on_destroy = newAV ();
2130
2131 av_push (coro->on_destroy, cb);
2132}
2133
2134static void
2135slf_destroy_join (pTHX_ struct CoroSLF *frame)
2136{
2137 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2138}
2139
2140static int
2141slf_check_join (pTHX_ struct CoroSLF *frame)
2142{
2143 struct coro *coro = (struct coro *)frame->data;
2144
2145 if (!coro->status)
2146 return 1;
2147
2148 frame->destroy = 0;
2149
2150 coro_push_av (aTHX_ coro->status, GIMME_V);
2151
2152 SvREFCNT_dec ((SV *)coro->hv);
2153
2154 return 0;
2155}
2156
2157static void
2158slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2159{
2160 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2161
2162 if (items > 1)
2163 croak ("join called with too many arguments");
2164
2165 if (coro->status)
2166 frame->prepare = prepare_nop;
2167 else
2168 {
2169 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2170 frame->prepare = prepare_schedule;
2171 }
2172
2173 frame->check = slf_check_join;
2174 frame->destroy = slf_destroy_join;
2175 frame->data = (void *)coro;
2176 SvREFCNT_inc (coro->hv);
2177}
2178
2179static void
1849coro_call_on_destroy (pTHX_ struct coro *coro) 2180coro_call_on_destroy (pTHX_ struct coro *coro)
1850{ 2181{
1851 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2182 AV *od = coro->on_destroy;
1852 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1853 2183
1854 if (on_destroyp) 2184 if (!od)
1855 { 2185 return;
1856 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1857 2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2189
1858 while (AvFILLp (on_destroy) >= 0) 2190 while (AvFILLp (od) >= 0)
2191 {
2192 SV *cb = sv_2mortal (av_pop (od));
2193
2194 /* coro hv's (and only hv's at the moment) are supported as well */
2195 if (SvSTATEhv_p (aTHX_ cb))
2196 api_ready (aTHX_ cb);
2197 else
1859 { 2198 {
1860 dSP; /* don't disturb outer sp */ 2199 dSP; /* don't disturb outer sp */
1861 SV *cb = av_pop (on_destroy);
1862
1863 PUSHMARK (SP); 2200 PUSHMARK (SP);
1864 2201
1865 if (statusp) 2202 if (coro->status)
1866 { 2203 {
1867 int i; 2204 PUTBACK;
1868 AV *status = (AV *)SvRV (*statusp); 2205 coro_push_av (aTHX_ coro->status, G_ARRAY);
1869 EXTEND (SP, AvFILLp (status) + 1); 2206 SPAGAIN;
1870
1871 for (i = 0; i <= AvFILLp (status); ++i)
1872 PUSHs (AvARRAY (status)[i]);
1873 } 2207 }
1874 2208
1875 PUTBACK; 2209 PUTBACK;
1876 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2210 call_sv (cb, G_VOID | G_DISCARD);
1877 } 2211 }
1878 } 2212 }
1879} 2213}
1880 2214
1881static void 2215static void
1882slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2216coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1883{ 2217{
2218 AV *av;
2219
2220 if (coro->status)
2221 {
2222 av = coro->status;
2223 av_clear (av);
2224 }
2225 else
2226 av = coro->status = newAV ();
2227
2228 /* items are actually not so common, so optimise for this case */
2229 if (items)
2230 {
1884 int i; 2231 int i;
1885 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV ();
1887 2232
1888 av_extend (av, items - 1); 2233 av_extend (av, items - 1);
2234
1889 for (i = 0; i < items; ++i) 2235 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i])); 2236 av_push (av, SvREFCNT_inc_NN (arg [i]));
2237 }
2238}
1891 2239
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2240static void
1893 2241slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2242{
1894 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2243 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1895 api_ready (aTHX_ sv_manager); 2244 api_ready (aTHX_ sv_manager);
1896 2245
1897 frame->prepare = prepare_schedule; 2246 frame->prepare = prepare_schedule;
1898 frame->check = slf_check_repeat; 2247 frame->check = slf_check_repeat;
1899 2248
1900 /* as a minor optimisation, we could unwind all stacks here */ 2249 /* as a minor optimisation, we could unwind all stacks here */
1901 /* but that puts extra pressure on pp_slf, and is not worth much */ 2250 /* but that puts extra pressure on pp_slf, and is not worth much */
1902 /*coro_unwind_stacks (aTHX);*/ 2251 /*coro_unwind_stacks (aTHX);*/
2252}
2253
2254static void
2255slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2256{
2257 HV *coro_hv = (HV *)SvRV (coro_current);
2258
2259 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2260 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2261}
2262
2263static void
2264slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2265{
2266 HV *coro_hv;
2267 struct coro *coro;
2268
2269 if (items <= 0)
2270 croak ("Coro::cancel called without coro object,");
2271
2272 coro = SvSTATE (arg [0]);
2273 coro_hv = coro->hv;
2274
2275 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2276
2277 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2278 {
2279 /* coro currently busy cancelling something, so just notify it */
2280 coro->slf_frame.data = (void *)coro;
2281
2282 frame->prepare = prepare_nop;
2283 frame->check = slf_check_nop;
2284 }
2285 else if (coro_hv == (HV *)SvRV (coro_current))
2286 {
2287 /* cancelling the current coro is allowed, and equals terminate */
2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2289 }
2290 else
2291 {
2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2296
2297 /* otherwise we cancel directly, purely for speed reasons
2298 * unfortunately, this requires some magic trickery, as
2299 * somebody else could cancel us, so we have to fight the cancellation.
2300 * this is ugly, and hopefully fully worth the extra speed.
2301 * besides, I can't get the slow-but-safe version working...
2302 */
2303 slf_frame.data = 0;
2304 self->flags |= CF_NOCANCEL;
2305 coro_state_destroy (aTHX_ coro);
2306 self->flags &= ~CF_NOCANCEL;
2307
2308 if (slf_frame.data)
2309 {
2310 /* while we were busy we have been cancelled, so terminate */
2311 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2312 }
2313 else
2314 {
2315 frame->prepare = prepare_nop;
2316 frame->check = slf_check_nop;
2317 }
2318 }
2319}
2320
2321static int
2322slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2323{
2324 frame->prepare = 0;
2325 coro_unwind_stacks (aTHX);
2326
2327 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2328
2329 return 1;
2330}
2331
2332static int
2333safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2334{
2335 if (coro->cctx)
2336 croak ("coro inside C callback, unable to cancel at this time, caught");
2337
2338 if (coro->flags & CF_NEW)
2339 {
2340 coro_set_status (aTHX_ coro, arg, items);
2341 coro_state_destroy (aTHX_ coro);
2342 }
2343 else
2344 {
2345 if (!coro->slf_frame.prepare)
2346 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2347
2348 slf_destroy (aTHX_ coro);
2349
2350 coro_set_status (aTHX_ coro, arg, items);
2351 coro->slf_frame.prepare = prepare_nop;
2352 coro->slf_frame.check = slf_check_safe_cancel;
2353
2354 api_ready (aTHX_ (SV *)coro->hv);
2355 }
2356
2357 return 1;
1903} 2358}
1904 2359
1905/*****************************************************************************/ 2360/*****************************************************************************/
1906/* async pool handler */ 2361/* async pool handler */
1907 2362
… …
1938slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2393slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1939{ 2394{
1940 HV *hv = (HV *)SvRV (coro_current); 2395 HV *hv = (HV *)SvRV (coro_current);
1941 struct coro *coro = SvSTATE_hv ((SV *)hv); 2396 struct coro *coro = SvSTATE_hv ((SV *)hv);
1942 2397
1943 if (expect_true (coro->saved_deffh)) 2398 if (ecb_expect_true (coro->saved_deffh))
1944 { 2399 {
1945 /* subsequent iteration */ 2400 /* subsequent iteration */
1946 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2401 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1947 coro->saved_deffh = 0; 2402 coro->saved_deffh = 0;
1948 2403
1949 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2404 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1950 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2405 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1951 { 2406 {
1952 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2407 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1953 coro->invoke_av = newAV (); 2408 return;
1954
1955 frame->prepare = prepare_nop;
1956 } 2409 }
1957 else 2410 else
1958 { 2411 {
1959 av_clear (GvAV (PL_defgv)); 2412 av_clear (GvAV (PL_defgv));
1960 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2413 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1985 2438
1986static void 2439static void
1987coro_rouse_callback (pTHX_ CV *cv) 2440coro_rouse_callback (pTHX_ CV *cv)
1988{ 2441{
1989 dXSARGS; 2442 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2443 SV *data = (SV *)S_GENSUB_ARG;
1991 2444
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2445 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2446 {
1994 /* first call, set args */ 2447 /* first call, set args */
2448 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2449 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2450
1998 SvRV_set (data, (SV *)av); 2451 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2452
2002 /* better take a full copy of the arguments */ 2453 /* better take a full copy of the arguments */
2003 while (items--) 2454 while (items--)
2004 av_store (av, items, newSVsv (ST (items))); 2455 av_store (av, items, newSVsv (ST (items)));
2456
2457 api_ready (aTHX_ coro);
2458 SvREFCNT_dec (coro);
2005 } 2459 }
2006 2460
2007 XSRETURN_EMPTY; 2461 XSRETURN_EMPTY;
2008} 2462}
2009 2463
2010static int 2464static int
2011slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2465slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2012{ 2466{
2013 SV *data = (SV *)frame->data; 2467 SV *data = (SV *)frame->data;
2014 2468
2015 if (CORO_THROW) 2469 if (CORO_THROW)
2016 return 0; 2470 return 0;
2017 2471
2018 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2472 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2019 return 1; 2473 return 1;
… …
2026 2480
2027 EXTEND (SP, AvFILLp (av) + 1); 2481 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2482 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2483 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2484
2031 /* we have stolen the elements, so ste length to zero and free */ 2485 /* we have stolen the elements, so set length to zero and free */
2032 AvFILLp (av) = -1; 2486 AvFILLp (av) = -1;
2033 av_undef (av); 2487 av_undef (av);
2034 2488
2035 PUTBACK; 2489 PUTBACK;
2036 } 2490 }
… …
2055 cb = sv_2mortal (coro->rouse_cb); 2509 cb = sv_2mortal (coro->rouse_cb);
2056 coro->rouse_cb = 0; 2510 coro->rouse_cb = 0;
2057 } 2511 }
2058 2512
2059 if (!SvROK (cb) 2513 if (!SvROK (cb)
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2514 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2515 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2516 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2517
2064 { 2518 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2520 SV *data = (SV *)S_GENSUB_ARG;
2067 2521
2068 frame->data = (void *)data; 2522 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2523 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2524 frame->check = slf_check_rouse_wait;
2071 } 2525 }
… …
2075coro_new_rouse_cb (pTHX) 2529coro_new_rouse_cb (pTHX)
2076{ 2530{
2077 HV *hv = (HV *)SvRV (coro_current); 2531 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2532 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2533 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2534 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2535
2082 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2536 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2537 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2538
2085 SvREFCNT_dec (coro->rouse_cb); 2539 SvREFCNT_dec (coro->rouse_cb);
… …
2182static void 2636static void
2183slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2637slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{ 2638{
2185 frame->prepare = prepare_cede_notself; 2639 frame->prepare = prepare_cede_notself;
2186 frame->check = slf_check_nop; 2640 frame->check = slf_check_nop;
2641}
2642
2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2644static void
2645slf_destroy (pTHX_ struct coro *coro)
2646{
2647 struct CoroSLF frame = coro->slf_frame;
2648
2649 /*
2650 * The on_destroy below most likely is from an SLF call.
2651 * Since by definition the SLF call will not finish when we destroy
2652 * the coro, we will have to force-finish it here, otherwise
2653 * cleanup functions cannot call SLF functions.
2654 */
2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2187} 2660}
2188 2661
2189/* 2662/*
2190 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2191 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
… …
2198 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2671 I32 checkmark; /* mark SP to see how many elements check has pushed */
2199 2672
2200 /* set up the slf frame, unless it has already been set-up */ 2673 /* set up the slf frame, unless it has already been set-up */
2201 /* the latter happens when a new coro has been started */ 2674 /* the latter happens when a new coro has been started */
2202 /* or when a new cctx was attached to an existing coroutine */ 2675 /* or when a new cctx was attached to an existing coroutine */
2203 if (expect_true (!slf_frame.prepare)) 2676 if (ecb_expect_true (!slf_frame.prepare))
2204 { 2677 {
2205 /* first iteration */ 2678 /* first iteration */
2206 dSP; 2679 dSP;
2207 SV **arg = PL_stack_base + TOPMARK + 1; 2680 SV **arg = PL_stack_base + TOPMARK + 1;
2208 int items = SP - arg; /* args without function object */ 2681 int items = SP - arg; /* args without function object */
… …
2249 while (slf_frame.check (aTHX_ &slf_frame)); 2722 while (slf_frame.check (aTHX_ &slf_frame));
2250 2723
2251 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2724 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2252 2725
2253 /* exception handling */ 2726 /* exception handling */
2254 if (expect_false (CORO_THROW)) 2727 if (ecb_expect_false (CORO_THROW))
2255 { 2728 {
2256 SV *exception = sv_2mortal (CORO_THROW); 2729 SV *exception = sv_2mortal (CORO_THROW);
2257 2730
2258 CORO_THROW = 0; 2731 CORO_THROW = 0;
2259 sv_setsv (ERRSV, exception); 2732 sv_setsv (ERRSV, exception);
2260 croak (0); 2733 croak (0);
2261 } 2734 }
2262 2735
2263 /* return value handling - mostly like entersub */ 2736 /* return value handling - mostly like entersub */
2264 /* make sure we put something on the stack in scalar context */ 2737 /* make sure we put something on the stack in scalar context */
2265 if (GIMME_V == G_SCALAR) 2738 if (GIMME_V == G_SCALAR
2739 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2266 { 2740 {
2267 dSP; 2741 dSP;
2268 SV **bot = PL_stack_base + checkmark; 2742 SV **bot = PL_stack_base + checkmark;
2269 2743
2270 if (sp == bot) /* too few, push undef */ 2744 if (sp == bot) /* too few, push undef */
2271 bot [1] = &PL_sv_undef; 2745 bot [1] = &PL_sv_undef;
2272 else if (sp != bot + 1) /* too many, take last one */ 2746 else /* too many, take last one */
2273 bot [1] = *sp; 2747 bot [1] = *sp;
2274 2748
2275 SP = bot + 1; 2749 SP = bot + 1;
2276 2750
2277 PUTBACK; 2751 PUTBACK;
… …
2310 if (PL_op->op_flags & OPf_STACKED) 2784 if (PL_op->op_flags & OPf_STACKED)
2311 { 2785 {
2312 if (items > slf_arga) 2786 if (items > slf_arga)
2313 { 2787 {
2314 slf_arga = items; 2788 slf_arga = items;
2315 free (slf_argv); 2789 Safefree (slf_argv);
2316 slf_argv = malloc (slf_arga * sizeof (SV *)); 2790 New (0, slf_argv, slf_arga, SV *);
2317 } 2791 }
2318 2792
2319 slf_argc = items; 2793 slf_argc = items;
2320 2794
2321 for (i = 0; i < items; ++i) 2795 for (i = 0; i < items; ++i)
… …
2375{ 2849{
2376 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2377 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2378} 2852}
2379 2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX_ enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2944}
2945
2380/*****************************************************************************/ 2946/*****************************************************************************/
2381/* PerlIO::cede */ 2947/* PerlIO::cede */
2382 2948
2383typedef struct 2949typedef struct
2384{ 2950{
2385 PerlIOBuf base; 2951 PerlIOBuf base;
2386 NV next, every; 2952 NV next, every;
2387} PerlIOCede; 2953} PerlIOCede;
2388 2954
2389static IV 2955static IV ecb_cold
2390PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2956PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2391{ 2957{
2392 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2958 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2393 2959
2394 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2960 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2395 self->next = nvtime () + self->every; 2961 self->next = nvtime () + self->every;
2396 2962
2397 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2963 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2398} 2964}
2399 2965
2400static SV * 2966static SV * ecb_cold
2401PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2967PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2402{ 2968{
2403 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2969 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2404 2970
2405 return newSVnv (self->every); 2971 return newSVnv (self->every);
… …
2456/* Coro::Semaphore & Coro::Signal */ 3022/* Coro::Semaphore & Coro::Signal */
2457 3023
2458static SV * 3024static SV *
2459coro_waitarray_new (pTHX_ int count) 3025coro_waitarray_new (pTHX_ int count)
2460{ 3026{
2461 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3027 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2462 AV *av = newAV (); 3028 AV *av = newAV ();
2463 SV **ary; 3029 SV **ary;
2464 3030
2465 /* unfortunately, building manually saves memory */ 3031 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 3032 Newx (ary, 2, SV *);
… …
2512 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2513 PUTBACK; 3079 PUTBACK;
2514 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2515 } 3081 }
2516 3082
2517 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2518 } 3084 }
2519} 3085}
2520 3086
2521static void 3087static void
2522coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2523{ 3089{
2524 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3090 /* call $sem->adjust (0) to possibly wake up some other waiters */
2525 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3091 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2526} 3092}
2527 3093
2528static int 3094static int
2529slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3095slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2530{ 3096{
2531 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2532 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
3099 SV *coro_hv = SvRV (coro_current);
3100
3101 frame->destroy = 0;
2533 3102
2534 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2535 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2536 return 0; 3109 return 0;
3110 }
2537 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2538 { 3112 {
2539 SvSTATE_current->on_destroy = 0;
2540
2541 if (acquire) 3113 if (acquire)
2542 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2543 else 3115 else
2544 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2545 3117
… …
2549 { 3121 {
2550 int i; 3122 int i;
2551 /* if we were woken up but can't down, we look through the whole */ 3123 /* if we were woken up but can't down, we look through the whole */
2552 /* waiters list and only add us if we aren't in there already */ 3124 /* waiters list and only add us if we aren't in there already */
2553 /* this avoids some degenerate memory usage cases */ 3125 /* this avoids some degenerate memory usage cases */
2554 3126 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2555 for (i = 1; i <= AvFILLp (av); ++i)
2556 if (AvARRAY (av)[i] == SvRV (coro_current)) 3127 if (AvARRAY (av)[i] == coro_hv)
2557 return 1; 3128 return 1;
2558 3129
2559 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3130 av_push (av, SvREFCNT_inc (coro_hv));
2560 return 1; 3131 return 1;
2561 } 3132 }
2562} 3133}
2563 3134
2564static int 3135static int
… …
2587 { 3158 {
2588 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3159 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2589 3160
2590 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3161 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2591 frame->prepare = prepare_schedule; 3162 frame->prepare = prepare_schedule;
2592
2593 /* to avoid race conditions when a woken-up coro gets terminated */ 3163 /* to avoid race conditions when a woken-up coro gets terminated */
2594 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3164 /* we arrange for a temporary on_destroy that calls adjust (0) */
2595 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3165 frame->destroy = coro_semaphore_destroy;
2596 } 3166 }
2597} 3167}
2598 3168
2599static void 3169static void
2600slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3170slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2608{ 3178{
2609 if (items >= 2) 3179 if (items >= 2)
2610 { 3180 {
2611 /* callback form */ 3181 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 3182 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3183 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 3184
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3185 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 3186
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 3187 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 3188 coro_semaphore_adjust (aTHX_ av, 0);
2619 3189
2620 frame->prepare = prepare_nop; 3190 frame->prepare = prepare_nop;
… …
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 3214 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 3215 AvARRAY (av)[1] = cb;
2646 3216
2647 cb = av_shift (av); 3217 cb = av_shift (av);
2648 3218
3219 if (SvTYPE (cb) == SVt_PVCV)
3220 {
3221 dSP;
3222 PUSHMARK (SP);
3223 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3224 PUTBACK;
3225 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3226 }
3227 else
3228 {
2649 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3231 }
3232
2651 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
2652 3234
2653 --count; 3235 --count;
2654 } 3236 }
2655} 3237}
2656 3238
… …
2664static void 3246static void
2665slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3247slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2666{ 3248{
2667 AV *av = (AV *)SvRV (arg [0]); 3249 AV *av = (AV *)SvRV (arg [0]);
2668 3250
3251 if (items >= 2)
3252 {
3253 SV *cb_cv = s_get_cv_croak (arg [1]);
3254 av_push (av, SvREFCNT_inc_NN (cb_cv));
3255
2669 if (SvIVX (AvARRAY (av)[0])) 3256 if (SvIVX (AvARRAY (av)[0]))
3257 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3258
3259 frame->prepare = prepare_nop;
3260 frame->check = slf_check_nop;
3261 }
3262 else if (SvIVX (AvARRAY (av)[0]))
2670 { 3263 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 3264 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 3265 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 3266 frame->check = slf_check_nop;
2674 } 3267 }
2675 else 3268 else
2676 { 3269 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3270 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 3271
2679 av_push (av, waiter); 3272 av_push (av, waiter);
2680 3273
2681 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3274 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2682 frame->prepare = prepare_schedule; 3275 frame->prepare = prepare_schedule;
… …
2700 3293
2701static void 3294static void
2702coro_aio_callback (pTHX_ CV *cv) 3295coro_aio_callback (pTHX_ CV *cv)
2703{ 3296{
2704 dXSARGS; 3297 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 3298 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 3299 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 3300 SV *data_sv = newSV (sizeof (struct io_state));
2708 3301
2709 av_extend (state, items - 1); 3302 av_extend (state, items - 1);
2710 3303
… …
2730 } 3323 }
2731 3324
2732 av_push (state, data_sv); 3325 av_push (state, data_sv);
2733 3326
2734 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
2735 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
2736 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
2737} 3330}
2738 3331
2739static int 3332static int
2740slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2741{ 3334{
… …
2746 /* it quickly returns */ 3339 /* it quickly returns */
2747 if (CORO_THROW) 3340 if (CORO_THROW)
2748 return 0; 3341 return 0;
2749 3342
2750 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
2751 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2752 return 1; 3345 return 1;
2753 3346
2754 /* restore status */ 3347 /* restore status */
2755 { 3348 {
2756 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
… …
2759 errno = data->errorno; 3352 errno = data->errorno;
2760 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
2761 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
2762 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
2763 3356
2764 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
2765 } 3358 }
2766 3359
2767 /* push result values */ 3360 /* push result values */
2768 { 3361 {
2769 dSP; 3362 dSP;
… …
2795 dSP; 3388 dSP;
2796 3389
2797 static SV *prio_cv; 3390 static SV *prio_cv;
2798 static SV *prio_sv; 3391 static SV *prio_sv;
2799 3392
2800 if (expect_false (!prio_cv)) 3393 if (ecb_expect_false (!prio_cv))
2801 { 3394 {
2802 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3395 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2803 prio_sv = newSViv (0); 3396 prio_sv = newSViv (0);
2804 } 3397 }
2805 3398
… …
2824 3417
2825 for (i = 0; i < items; ++i) 3418 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 3419 PUSHs (arg [i]);
2827 3420
2828 /* now push the callback closure */ 3421 /* now push the callback closure */
2829 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3422 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2830 3423
2831 /* now call the AIO function - we assume our request is uncancelable */ 3424 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 3425 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 3426 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 3427 }
2835 3428
2836 /* now that the requets is going, we loop toll we have a result */ 3429 /* now that the request is going, we loop till we have a result */
2837 frame->data = (void *)state; 3430 frame->data = (void *)state;
2838 frame->prepare = prepare_schedule; 3431 frame->prepare = prepare_schedule;
2839 frame->check = slf_check_aio_req; 3432 frame->check = slf_check_aio_req;
2840} 3433}
2841 3434
… …
2853 3446
2854#if CORO_CLONE 3447#if CORO_CLONE
2855# include "clone.c" 3448# include "clone.c"
2856#endif 3449#endif
2857 3450
3451/*****************************************************************************/
3452
3453static SV *
3454coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3455{
3456 SV *coro_sv;
3457 struct coro *coro;
3458 MAGIC *mg;
3459 HV *hv;
3460 SV *cb;
3461 int i;
3462
3463 if (argc > 0)
3464 {
3465 cb = s_get_cv_croak (argv [0]);
3466
3467 if (!is_coro)
3468 {
3469 if (CvISXSUB (cb))
3470 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3471
3472 if (!CvROOT (cb))
3473 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3474 }
3475 }
3476
3477 Newz (0, coro, 1, struct coro);
3478 coro->args = newAV ();
3479 coro->flags = CF_NEW;
3480
3481 if (coro_first) coro_first->prev = coro;
3482 coro->next = coro_first;
3483 coro_first = coro;
3484
3485 coro->hv = hv = newHV ();
3486 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3487 mg->mg_flags |= MGf_DUP;
3488 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3489
3490 if (argc > 0)
3491 {
3492 av_extend (coro->args, argc + is_coro - 1);
3493
3494 if (is_coro)
3495 {
3496 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3497 cb = (SV *)cv_coro_run;
3498 }
3499
3500 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3501
3502 for (i = 1; i < argc; i++)
3503 av_push (coro->args, newSVsv (argv [i]));
3504 }
3505
3506 return coro_sv;
3507}
3508
3509#ifndef __cplusplus
3510ecb_cold XS(boot_Coro__State);
3511#endif
3512
3513#if CORO_JIT
3514
3515static void ecb_noinline ecb_cold
3516pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3517{
3518 dSP;
3519 AV *av = newAV ();
3520
3521 av_store (av, 3, newSVuv (d));
3522 av_store (av, 2, newSVuv (c));
3523 av_store (av, 1, newSVuv (b));
3524 av_store (av, 0, newSVuv (a));
3525
3526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3527
3528 PUTBACK;
3529}
3530
3531static void ecb_noinline ecb_cold
3532jit_init (pTHX)
3533{
3534 dSP;
3535 SV *load, *save;
3536 char *map_base;
3537 char *load_ptr, *save_ptr;
3538 STRLEN load_len, save_len, map_len;
3539 int count;
3540
3541 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3542
3543 PUSHMARK (SP);
3544 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3545 #include "state.h"
3546 count = call_pv ("Coro::State::_jit", G_ARRAY);
3547 SPAGAIN;
3548
3549 save = POPs; save_ptr = SvPVbyte (save, save_len);
3550 load = POPs; load_ptr = SvPVbyte (load, load_len);
3551
3552 map_len = load_len + save_len + 16;
3553
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557
3558 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len);
3560
3561 map_base += (load_len + 15) & ~15;
3562
3563 save_perl_slots = (load_save_perl_slots_type)map_base;
3564 memcpy (map_base, save_ptr, save_len);
3565
3566 /* we are good citizens and try to make the page read-only, so the evil evil */
3567 /* hackers might have it a bit more difficult */
3568 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3569
3570 PUTBACK;
3571 eval_pv ("undef &Coro::State::_jit", 1);
3572}
3573
3574#endif
3575
2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3576MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2859 3577
2860PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
2861 3579
2862BOOT: 3580BOOT:
2863{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
2864#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
2865# if CORO_PTHREAD 3585# if CORO_PTHREAD
2866 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
2867# endif 3587# endif
2868#endif 3588#endif
2869 BOOT_PAGESIZE; 3589 /* perl defines these to check for existance first, but why it doesn't */
3590 /* just create them one at init time is not clear to me, except for */
3591 /* programs trying to delete them, but... */
3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3593 DEFSV;
3594 ERRSV;
2870 3595
2871 cctx_current = cctx_new_empty (); 3596 cctx_current = cctx_new_empty ();
2872 3597
2873 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2874 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2914 coroapi.prepare_nop = prepare_nop; 3639 coroapi.prepare_nop = prepare_nop;
2915 coroapi.prepare_schedule = prepare_schedule; 3640 coroapi.prepare_schedule = prepare_schedule;
2916 coroapi.prepare_cede = prepare_cede; 3641 coroapi.prepare_cede = prepare_cede;
2917 coroapi.prepare_cede_notself = prepare_cede_notself; 3642 coroapi.prepare_cede_notself = prepare_cede_notself;
2918 3643
2919 { 3644 time_init (aTHX);
2920 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2921 3645
2922 if (!svp) croak ("Time::HiRes is required");
2923 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2924
2925 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2926 }
2927
2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3646 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3647#if CORO_JIT
3648 PUTBACK;
3649 jit_init (aTHX);
3650 SPAGAIN;
3651#endif
2929} 3652}
2930 3653
2931SV * 3654SV *
2932new (char *klass, ...) 3655new (SV *klass, ...)
2933 ALIAS: 3656 ALIAS:
2934 Coro::new = 1 3657 Coro::new = 1
2935 CODE: 3658 CODE:
2936{ 3659 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2937 struct coro *coro; 3660 OUTPUT:
2938 MAGIC *mg;
2939 HV *hv;
2940 CV *cb;
2941 int i;
2942
2943 if (items > 1)
2944 {
2945 cb = coro_sv_2cv (aTHX_ ST (1));
2946
2947 if (!ix)
2948 {
2949 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2951
2952 if (!CvROOT (cb))
2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2955 }
2956
2957 Newz (0, coro, 1, struct coro);
2958 coro->args = newAV ();
2959 coro->flags = CF_NEW;
2960
2961 if (coro_first) coro_first->prev = coro;
2962 coro->next = coro_first;
2963 coro_first = coro;
2964
2965 coro->hv = hv = newHV ();
2966 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2967 mg->mg_flags |= MGf_DUP;
2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2969
2970 if (items > 1)
2971 {
2972 av_extend (coro->args, items - 1 + ix - 1);
2973
2974 if (ix)
2975 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run;
2978 }
2979
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981
2982 for (i = 2; i < items; i++)
2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2985}
2986 OUTPUT:
2987 RETVAL 3661 RETVAL
2988 3662
2989void 3663void
2990transfer (...) 3664transfer (...)
2991 PROTOTYPE: $$ 3665 PROTOTYPE: $$
2992 CODE: 3666 CODE:
2993 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2994
2995bool
2996_destroy (SV *coro_sv)
2997 CODE:
2998 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2999 OUTPUT:
3000 RETVAL
3001
3002void
3003_exit (int code)
3004 PROTOTYPE: $
3005 CODE:
3006 _exit (code);
3007 3668
3008SV * 3669SV *
3009clone (Coro::State coro) 3670clone (Coro::State coro)
3010 CODE: 3671 CODE:
3011{ 3672{
… …
3066void 3727void
3067list () 3728list ()
3068 PROTOTYPE: 3729 PROTOTYPE:
3069 PPCODE: 3730 PPCODE:
3070{ 3731{
3071 struct coro *coro; 3732 struct coro *coro;
3072 for (coro = coro_first; coro; coro = coro->next) 3733 for (coro = coro_first; coro; coro = coro->next)
3073 if (coro->hv) 3734 if (coro->hv)
3074 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3735 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3075} 3736}
3076 3737
… …
3081 CODE: 3742 CODE:
3082{ 3743{
3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3744 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3084 { 3745 {
3085 struct coro *current = SvSTATE_current; 3746 struct coro *current = SvSTATE_current;
3747 struct CoroSLF slf_save;
3086 3748
3087 if (current != coro) 3749 if (current != coro)
3088 { 3750 {
3089 PUTBACK; 3751 PUTBACK;
3090 save_perl (aTHX_ current); 3752 save_perl (aTHX_ current);
3091 load_perl (aTHX_ coro); 3753 load_perl (aTHX_ coro);
3754 /* the coro is most likely in an active SLF call.
3755 * while not strictly required (the code we execute is
3756 * not allowed to call any SLF functions), it's cleaner
3757 * to reinitialise the slf_frame and restore it later.
3758 * This might one day allow us to actually do SLF calls
3759 * from code executed here.
3760 */
3761 slf_save = slf_frame;
3762 slf_frame.prepare = 0;
3092 SPAGAIN; 3763 SPAGAIN;
3093 } 3764 }
3094 3765
3095 PUSHSTACK; 3766 PUSHSTACK;
3096 3767
… …
3100 if (ix) 3771 if (ix)
3101 eval_sv (coderef, 0); 3772 eval_sv (coderef, 0);
3102 else 3773 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3774 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3775
3776 POPSTACK;
3105 SPAGAIN; 3777 SPAGAIN;
3106 POPSTACK;
3107 3778
3108 if (current != coro) 3779 if (current != coro)
3109 { 3780 {
3110 PUTBACK; 3781 PUTBACK;
3782 slf_frame = slf_save;
3111 save_perl (aTHX_ coro); 3783 save_perl (aTHX_ coro);
3112 load_perl (aTHX_ current); 3784 load_perl (aTHX_ current);
3113 SPAGAIN; 3785 SPAGAIN;
3114 } 3786 }
3115 } 3787 }
… …
3120 PROTOTYPE: $ 3792 PROTOTYPE: $
3121 ALIAS: 3793 ALIAS:
3122 is_ready = CF_READY 3794 is_ready = CF_READY
3123 is_running = CF_RUNNING 3795 is_running = CF_RUNNING
3124 is_new = CF_NEW 3796 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3797 is_destroyed = CF_ZOMBIE
3798 is_zombie = CF_ZOMBIE
3799 is_suspended = CF_SUSPENDED
3126 CODE: 3800 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3801 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3802 OUTPUT:
3129 RETVAL 3803 RETVAL
3130 3804
3131void 3805void
3132throw (Coro::State self, SV *throw = &PL_sv_undef) 3806throw (SV *self, SV *exception = &PL_sv_undef)
3133 PROTOTYPE: $;$ 3807 PROTOTYPE: $;$
3134 CODE: 3808 CODE:
3135{ 3809{
3810 struct coro *coro = SvSTATE (self);
3136 struct coro *current = SvSTATE_current; 3811 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3812 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3138 SvREFCNT_dec (*throwp); 3813 SvREFCNT_dec (*exceptionp);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3814 SvGETMAGIC (exception);
3815 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3816
3817 api_ready (aTHX_ self);
3140} 3818}
3141 3819
3142void 3820void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3821api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3144 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
… …
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3873 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3874
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3875 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3876 }
3199 3877
3878void
3879cancel (Coro::State self)
3880 CODE:
3881 coro_state_destroy (aTHX_ self);
3882
3883SV *
3884enable_times (int enabled = enable_times)
3885 CODE:
3886{
3887 RETVAL = boolSV (enable_times);
3888
3889 if (enabled != enable_times)
3890 {
3891 enable_times = enabled;
3892
3893 coro_times_update ();
3894 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3895 }
3896}
3897 OUTPUT:
3898 RETVAL
3899
3900void
3901times (Coro::State self)
3902 PPCODE:
3903{
3904 struct coro *current = SvSTATE (coro_current);
3905
3906 if (ecb_expect_false (current == self))
3907 {
3908 coro_times_update ();
3909 coro_times_add (SvSTATE (coro_current));
3910 }
3911
3912 EXTEND (SP, 2);
3913 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3914 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3915
3916 if (ecb_expect_false (current == self))
3917 coro_times_sub (SvSTATE (coro_current));
3918}
3919
3920void
3921swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3922 CODE:
3923{
3924 struct coro *current = SvSTATE_current;
3925
3926 if (current == coro)
3927 SWAP_SVS (current);
3928
3929 if (!coro->swap_sv)
3930 coro->swap_sv = newAV ();
3931
3932 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3933 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3934
3935 if (current == coro)
3936 SWAP_SVS (current);
3937}
3938
3200 3939
3201MODULE = Coro::State PACKAGE = Coro 3940MODULE = Coro::State PACKAGE = Coro
3202 3941
3203BOOT: 3942BOOT:
3204{ 3943{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3946 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3947 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3212 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3948 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3213 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3949 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3214 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3950 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3951 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216 3952
3217 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3953 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3954 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3955 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3220 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3956 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3221 3957
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3958 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3959
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3960 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3961 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3962 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3963 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3964 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3965 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3230
3231 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3232 coro_ready[i] = newAV ();
3233 3966
3234 { 3967 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3968 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3969
3237 coroapi.schedule = api_schedule; 3970 coroapi.schedule = api_schedule;
… …
3241 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3242 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3243 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3244 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3245 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3246 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3247 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3248 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3249 } 3986 }
3250} 3987}
3251 3988
3989SV *
3990async (...)
3991 PROTOTYPE: &@
3992 CODE:
3993 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3994 api_ready (aTHX_ RETVAL);
3995 OUTPUT:
3996 RETVAL
3997
3998void
3999_destroy (Coro::State coro)
4000 CODE:
4001 /* used by the manager thread */
4002 coro_state_destroy (aTHX_ coro);
4003
4004void
4005on_destroy (Coro::State coro, SV *cb)
4006 CODE:
4007 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4008
4009void
4010join (...)
4011 CODE:
4012 CORO_EXECUTE_SLF_XS (slf_init_join);
4013
3252void 4014void
3253terminate (...) 4015terminate (...)
3254 CODE: 4016 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4017 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256 4018
3257void 4019void
4020cancel (...)
4021 CODE:
4022 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4023
4024int
4025safe_cancel (Coro::State self, ...)
4026 C_ARGS: aTHX_ self, &ST (1), items - 1
4027
4028void
3258schedule (...) 4029schedule (...)
3259 CODE: 4030 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4031 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3261 4032
3262void 4033void
… …
3278cede_notself (...) 4049cede_notself (...)
3279 CODE: 4050 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4051 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281 4052
3282void 4053void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
3287
3288void
3289_set_current (SV *current) 4054_set_current (SV *current)
3290 PROTOTYPE: $ 4055 PROTOTYPE: $
3291 CODE: 4056 CODE:
3292 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3293 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3294 4059
3295void 4060void
3296_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 4062 PROTOTYPE: $
3298 CODE: 4063 CODE:
3299 SvREFCNT_dec (coro_readyhook); 4064 SvREFCNT_dec (coro_readyhook);
4065 SvGETMAGIC (hook);
4066 if (SvOK (hook))
4067 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4068 coro_readyhook = newSVsv (hook);
4069 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4070 }
4071 else
4072 {
4073 coro_readyhook = 0;
4074 CORO_READYHOOK = 0;
4075 }
3301 4076
3302int 4077int
3303prio (Coro::State coro, int newprio = 0) 4078prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 4079 PROTOTYPE: $;$
3305 ALIAS: 4080 ALIAS:
… …
3311 if (items > 1) 4086 if (items > 1)
3312 { 4087 {
3313 if (ix) 4088 if (ix)
3314 newprio = coro->prio - newprio; 4089 newprio = coro->prio - newprio;
3315 4090
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4091 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4092 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 4093
3319 coro->prio = newprio; 4094 coro->prio = newprio;
3320 } 4095 }
3321} 4096}
3322 OUTPUT: 4097 OUTPUT:
… …
3337 RETVAL = coro_nready; 4112 RETVAL = coro_nready;
3338 OUTPUT: 4113 OUTPUT:
3339 RETVAL 4114 RETVAL
3340 4115
3341void 4116void
4117suspend (Coro::State self)
4118 PROTOTYPE: $
4119 CODE:
4120 self->flags |= CF_SUSPENDED;
4121
4122void
4123resume (Coro::State self)
4124 PROTOTYPE: $
4125 CODE:
4126 self->flags &= ~CF_SUSPENDED;
4127
4128void
3342_pool_handler (...) 4129_pool_handler (...)
3343 CODE: 4130 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4131 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3345 4132
3346void 4133void
… …
3357 for (i = 1; i < items; ++i) 4144 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i))); 4145 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359 4146
3360 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3361 { 4148 {
3362 PUSHMARK (SP); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3363 EXTEND (SP, 2);
3364 PUSHs (sv_Coro);
3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4151 SvREFCNT_dec_NN (sv);
3371 } 4152 }
3372 4153
3373 { 4154 {
3374 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3375 4156
… …
3382 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3383 4164
3384 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3385 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3386 else 4167 else
3387 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3388} 4169}
3389 4170
3390SV * 4171SV *
3391rouse_cb () 4172rouse_cb ()
3392 PROTOTYPE: 4173 PROTOTYPE:
… …
3407 on_leave = 1 4188 on_leave = 1
3408 PROTOTYPE: & 4189 PROTOTYPE: &
3409 CODE: 4190 CODE:
3410{ 4191{
3411 struct coro *coro = SvSTATE_current; 4192 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4193 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 4194
3414 block = (SV *)coro_sv_2cv (aTHX_ block); 4195 block = s_get_cv_croak (block);
3415 4196
3416 if (!*avp) 4197 if (!*avp)
3417 *avp = newAV (); 4198 *avp = newAV ();
3418 4199
3419 av_push (*avp, SvREFCNT_inc (block)); 4200 av_push (*avp, SvREFCNT_inc (block));
3420 4201
3421 if (!ix) 4202 if (!ix)
3422 on_enterleave_call (aTHX_ block); 4203 on_enterleave_call (aTHX_ block);
3423 4204
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4205 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 4206 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4207 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 4208}
3428 4209
3429 4210
3430MODULE = Coro::State PACKAGE = PerlIO::cede 4211MODULE = Coro::State PACKAGE = PerlIO::cede
3431 4212
… …
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 4217MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 4218
3438SV * 4219SV *
3439new (SV *klass, SV *count = 0) 4220new (SV *klass, SV *count = 0)
3440 CODE: 4221 CODE:
4222{
4223 int semcnt = 1;
4224
4225 if (count)
4226 {
4227 SvGETMAGIC (count);
4228
4229 if (SvOK (count))
4230 semcnt = SvIV (count);
4231 }
4232
3441 RETVAL = sv_bless ( 4233 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4234 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 4235 GvSTASH (CvGV (cv))
3444 ); 4236 );
4237}
3445 OUTPUT: 4238 OUTPUT:
3446 RETVAL 4239 RETVAL
3447 4240
3448# helper for Coro::Channel 4241# helper for Coro::Channel and others
3449SV * 4242SV *
3450_alloc (int count) 4243_alloc (int count)
3451 CODE: 4244 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 4245 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 4246 OUTPUT:
… …
3495 XSRETURN_NO; 4288 XSRETURN_NO;
3496} 4289}
3497 4290
3498void 4291void
3499waiters (SV *self) 4292waiters (SV *self)
3500 PPCODE: 4293 PPCODE:
3501{ 4294{
3502 AV *av = (AV *)SvRV (self); 4295 AV *av = (AV *)SvRV (self);
3503 int wcount = AvFILLp (av) + 1 - 1; 4296 int wcount = AvFILLp (av) + 1 - 1;
3504 4297
3505 if (GIMME_V == G_SCALAR) 4298 if (GIMME_V == G_SCALAR)
… …
3511 for (i = 1; i <= wcount; ++i) 4304 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4305 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 4306 }
3514} 4307}
3515 4308
4309MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4310
4311void
4312_may_delete (SV *sem, int count, unsigned int extra_refs)
4313 PPCODE:
4314{
4315 AV *av = (AV *)SvRV (sem);
4316
4317 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4318 && AvFILLp (av) == 0 /* no waiters, just count */
4319 && SvIV (AvARRAY (av)[0]) == count)
4320 XSRETURN_YES;
4321
4322 XSRETURN_NO;
4323}
4324
3516MODULE = Coro::State PACKAGE = Coro::Signal 4325MODULE = Coro::State PACKAGE = Coro::Signal
3517 4326
3518SV * 4327SV *
3519new (SV *klass) 4328new (SV *klass)
3520 CODE: 4329 CODE:
… …
3532 4341
3533void 4342void
3534broadcast (SV *self) 4343broadcast (SV *self)
3535 CODE: 4344 CODE:
3536{ 4345{
3537 AV *av = (AV *)SvRV (self); 4346 AV *av = (AV *)SvRV (self);
3538 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4347 coro_signal_wake (aTHX_ av, AvFILLp (av));
3539} 4348}
3540 4349
3541void 4350void
3542send (SV *self) 4351send (SV *self)
… …
3550 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4359 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3551} 4360}
3552 4361
3553IV 4362IV
3554awaited (SV *self) 4363awaited (SV *self)
3555 CODE: 4364 CODE:
3556 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4365 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3557 OUTPUT: 4366 OUTPUT:
3558 RETVAL 4367 RETVAL
3559 4368
3560 4369
… …
3565 4374
3566void 4375void
3567_schedule (...) 4376_schedule (...)
3568 CODE: 4377 CODE:
3569{ 4378{
3570 static int incede; 4379 static int incede;
3571 4380
3572 api_cede_notself (aTHX); 4381 api_cede_notself (aTHX);
3573 4382
3574 ++incede; 4383 ++incede;
3575 while (coro_nready >= incede && api_cede (aTHX)) 4384 while (coro_nready >= incede && api_cede (aTHX))
… …
3591 4400
3592void 4401void
3593_register (char *target, char *proto, SV *req) 4402_register (char *target, char *proto, SV *req)
3594 CODE: 4403 CODE:
3595{ 4404{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 4405 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 4406 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4407 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 4408 sv_setpv ((SV *)slf_cv, proto);
3600 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4409 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3601} 4410}
3602 4411
4412MODULE = Coro::State PACKAGE = Coro::Select
4413
4414void
4415patch_pp_sselect ()
4416 CODE:
4417 if (!coro_old_pp_sselect)
4418 {
4419 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4420 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4421 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4422 }
4423
4424void
4425unpatch_pp_sselect ()
4426 CODE:
4427 if (coro_old_pp_sselect)
4428 {
4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4430 coro_old_pp_sselect = 0;
4431 }
4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

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