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.321 by root, Sat Nov 22 02:09:54 2008 UTC vs.
Revision 1.465 by root, Sat Jun 25 19:04:04 2016 UTC

1#define CORO_CLONE 1 //D 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 */
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
6#define PERL_EXT 9#define PERL_EXT
… …
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "patchlevel.h" 16#include "schmorp.h"
14 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
15#include <stdio.h> 23#include <stdio.h>
16#include <errno.h> 24#include <errno.h>
17#include <assert.h> 25#include <assert.h>
18 26
19#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
20# undef setjmp 70# undef setjmp
21# undef longjmp 71# undef longjmp
22# undef _exit 72# undef _exit
23# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
24#else 74#else
25# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
26#endif 76#endif
27 77
28#ifdef HAVE_MMAP
29# include <unistd.h>
30# include <sys/mman.h>
31# ifndef MAP_ANONYMOUS
32# ifdef MAP_ANON
33# define MAP_ANONYMOUS MAP_ANON
34# else
35# undef HAVE_MMAP
36# endif
37# endif
38# include <limits.h>
39# ifndef PAGESIZE
40# define PAGESIZE pagesize
41# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
42static long pagesize;
43# else
44# define BOOT_PAGESIZE (void)0
45# endif
46#else
47# define PAGESIZE 0
48# define BOOT_PAGESIZE (void)0
49#endif
50
51#if CORO_USE_VALGRIND
52# include <valgrind/valgrind.h>
53#endif
54
55/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
56static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
57 80
58#define PERL_VERSION_ATLEAST(a,b,c) \ 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
59 (PERL_REVISION > (a) \ 82# define HAS_SCOPESTACK_NAME 1
60 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \
62 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
63
64#if !PERL_VERSION_ATLEAST (5,6,0)
65# ifndef PL_ppaddr
66# define PL_ppaddr ppaddr
67# endif
68# ifndef call_sv
69# define call_sv perl_call_sv
70# endif
71# ifndef get_sv
72# define get_sv perl_get_sv
73# endif
74# ifndef get_cv
75# define get_cv perl_get_cv
76# endif
77# ifndef IS_PADGV
78# define IS_PADGV(v) 0
79# endif
80# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0
82# endif
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
90/* 5.10.0 */
91#ifndef SvREFCNT_inc_NN
92# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
93#endif
94
95/* 5.8.8 */
96#ifndef GV_NOTQUAL
97# define GV_NOTQUAL 0
98#endif
99#ifndef newSV
100# define newSV(l) NEWSV(0,l)
101#endif
102#ifndef CvISXSUB_on
103# define CvISXSUB_on(cv) (void)cv
104#endif
105#ifndef CvISXSUB
106# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
107#endif
108#ifndef Newx
109# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
110#endif
111
112/* 5.8.7 */
113#ifndef SvRV_set
114# define SvRV_set(s,v) SvRV(s) = (v)
115#endif
116
117#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
118# undef CORO_STACKGUARD
119#endif
120
121#ifndef CORO_STACKGUARD
122# define CORO_STACKGUARD 0
123#endif 83#endif
124 84
125/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
126#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
127# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135#else 95#else
136# define dSTACKLEVEL volatile void *stacklevel 96# define dSTACKLEVEL volatile void *stacklevel
137# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
138#endif 98#endif
139 99
140#define IN_DESTRUCT (PL_main_cv == Nullcv) 100#define IN_DESTRUCT PL_dirty
141
142#if __GNUC__ >= 3
143# define attribute(x) __attribute__(x)
144# define expect(expr,value) __builtin_expect ((expr),(value))
145# define INLINE static inline
146#else
147# define attribute(x)
148# define expect(expr,value) (expr)
149# define INLINE static
150#endif
151
152#define expect_false(expr) expect ((expr) != 0, 0)
153#define expect_true(expr) expect ((expr) != 0, 1)
154
155#define NOINLINE attribute ((noinline))
156 101
157#include "CoroAPI.h" 102#include "CoroAPI.h"
158#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
159 104
160#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
161# if CORO_PTHREAD 106# if CORO_PTHREAD
162static void *coro_thx; 107static void *coro_thx;
163# endif 108# endif
164#endif 109#endif
165 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
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
166static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
128static void (*u2time)(pTHX_ UV ret[2]);
167 129
168/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
169#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
170static OP *pp_slf (pTHX); 132static OP *pp_slf (pTHX);
133static void slf_destroy (pTHX_ struct coro *coro);
171 134
172static U32 cctx_gen; 135static U32 cctx_gen;
173static size_t cctx_stacksize = CORO_STACKSIZE; 136static size_t cctx_stacksize = CORO_STACKSIZE;
174static struct CoroAPI coroapi; 137static struct CoroAPI coroapi;
175static AV *main_mainstack; /* used to differentiate between $main and others */ 138static AV *main_mainstack; /* used to differentiate between $main and others */
… …
177static HV *coro_state_stash, *coro_stash; 140static HV *coro_state_stash, *coro_stash;
178static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 141static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
179 142
180static AV *av_destroy; /* destruction queue */ 143static AV *av_destroy; /* destruction queue */
181static SV *sv_manager; /* the manager coro */ 144static SV *sv_manager; /* the manager coro */
145static SV *sv_idle; /* $Coro::idle */
182 146
183static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
184static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
185static SV *rv_diehook; 149static SV *rv_diehook;
186static SV *rv_warnhook; 150static SV *rv_warnhook;
187static HV *hv_sig; /* %SIG */
188 151
189/* async_pool helper stuff */ 152/* async_pool helper stuff */
190static SV *sv_pool_rss; 153static SV *sv_pool_rss;
191static SV *sv_pool_size; 154static SV *sv_pool_size;
192static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
193static AV *av_async_pool; /* idle pool */ 156static AV *av_async_pool; /* idle pool */
194static SV *sv_Coro; /* class string */ 157static SV *sv_Coro; /* class string */
195static CV *cv_pool_handler; 158static CV *cv_pool_handler;
196static CV *cv_coro_state_new;
197 159
198/* Coro::AnyEvent */ 160/* Coro::AnyEvent */
199static SV *sv_activity; 161static SV *sv_activity;
200 162
163/* enable processtime/realtime profiling */
164static char enable_times;
165typedef U32 coro_ts[2];
166static coro_ts time_real, time_cpu;
167static char times_valid;
168
201static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
202static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
203 171
204enum { 172enum
173{
205 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
206 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
207 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
208 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
209 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
214typedef struct coro_cctx 183typedef struct coro_cctx
215{ 184{
216 struct coro_cctx *next; 185 struct coro_cctx *next;
217 186
218 /* the stack */ 187 /* the stack */
219 void *sptr; 188 struct coro_stack stack;
220 size_t ssize;
221 189
222 /* cpu state */ 190 /* cpu state */
223 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
192#ifndef NDEBUG
224 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
194#endif
225 JMPENV *top_env; 195 JMPENV *top_env;
226 coro_context cctx; 196 coro_context cctx;
227 197
228 U32 gen; 198 U32 gen;
229#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
230 int valgrind_id; 200 int valgrind_id;
231#endif 201#endif
232 unsigned char flags; 202 unsigned char flags;
233} coro_cctx; 203} coro_cctx;
234 204
205static coro_cctx *cctx_current; /* the currently running cctx */
206
207/*****************************************************************************/
208
209static MGVTBL coro_state_vtbl;
210
235enum { 211enum
212{
236 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
237 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
238 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
239 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
217 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
240}; 219};
241 220
242/* the structure where most of the perl state is stored, overlaid on the cxstack */ 221/* the structure where most of the perl state is stored, overlaid on the cxstack */
243typedef struct 222typedef struct
244{ 223{
245 SV *defsv;
246 AV *defav;
247 SV *errsv;
248 SV *irsgv;
249#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
250# include "state.h" 225 #include "state.h"
251#undef VAR
252} perl_slots; 226} perl_slots;
253 227
228/* how many context stack entries do we need for perl_slots */
254#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
255 230
256/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
257struct coro { 232struct coro
233{
258 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
259 coro_cctx *cctx; 235 coro_cctx *cctx;
236
237 /* ready queue */
238 struct coro *next_ready;
260 239
261 /* state data */ 240 /* state data */
262 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
263 AV *mainstack; 242 AV *mainstack;
264 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
265 244
266 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
267 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
268 int refcnt; /* coroutines are refcounted, yes */
269 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
270 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
271 void (*on_destroy)(pTHX_ struct coro *coro);
272 249
273 /* statistics */ 250 /* statistics */
274 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
275 252
276 /* coro process data */ 253 /* coro process data */
277 int prio; 254 int prio;
278 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
279 SV *rouse_cb; 256 SV *rouse_cb; /* last rouse callback */
257 AV *on_destroy; /* callbacks or coros to notify on destroy */
258 AV *status; /* the exit status list */
280 259
281 /* async_pool */ 260 /* async_pool */
282 SV *saved_deffh; 261 SV *saved_deffh;
283 SV *invoke_cb; 262 SV *invoke_cb;
284 AV *invoke_av; 263 AV *invoke_av;
285 264
265 /* on_enter/on_leave */
266 AV *on_enter; AV *on_enter_xs;
267 AV *on_leave; AV *on_leave_xs;
268
269 /* swap_sv */
270 AV *swap_sv;
271
272 /* times */
273 coro_ts t_cpu, t_real;
274
286 /* linked list */ 275 /* linked list */
287 struct coro *next, *prev; 276 struct coro *next, *prev;
288}; 277};
289 278
290typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
291typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
292 281
293/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
294/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
295/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
296static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
297 286
298/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
299 288
300#define PRIO_MAX 3 289#define CORO_PRIO_MAX 3
301#define PRIO_HIGH 1 290#define CORO_PRIO_HIGH 1
302#define PRIO_NORMAL 0 291#define CORO_PRIO_NORMAL 0
303#define PRIO_LOW -1 292#define CORO_PRIO_LOW -1
304#define PRIO_IDLE -3 293#define CORO_PRIO_IDLE -3
305#define PRIO_MIN -4 294#define CORO_PRIO_MIN -4
306 295
307/* for Coro.pm */ 296/* for Coro.pm */
308static SV *coro_current; 297static SV *coro_current;
309static SV *coro_readyhook; 298static SV *coro_readyhook;
310static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
311static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
312static struct coro *coro_first; 301static struct coro *coro_first;
313#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
314 303
304/** JIT *********************************************************************/
305
306#if CORO_JIT
307 /* APPLE doesn't have mmap though */
308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
309 #ifndef CORO_JIT_TYPE
310 #if ECB_AMD64 && CORO_JIT_UNIXY
311 #define CORO_JIT_TYPE "amd64-unix"
312 #elif __i386 && CORO_JIT_UNIXY
313 #define CORO_JIT_TYPE "x86-unix"
314 #endif
315 #endif
316#endif
317
318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
319 #undef CORO_JIT
320#endif
321
322#if CORO_JIT
323 typedef void (*load_save_perl_slots_type)(perl_slots *);
324 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
325#endif
326
327/** Coro::Select ************************************************************/
328
329static OP *(*coro_old_pp_sselect) (pTHX);
330static SV *coro_select_select;
331
332/* horrible hack, but if it works... */
333static OP *
334coro_pp_sselect (pTHX)
335{
336 dSP;
337 PUSHMARK (SP - 4); /* fake argument list */
338 XPUSHs (coro_select_select);
339 PUTBACK;
340
341 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
342 PL_op->op_flags |= OPf_STACKED;
343 PL_op->op_private = 0;
344 return PL_ppaddr [OP_ENTERSUB](aTHX);
345}
346
347/** time stuff **************************************************************/
348
349#ifdef HAS_GETTIMEOFDAY
350
351ecb_inline void
352coro_u2time (pTHX_ UV ret[2])
353{
354 struct timeval tv;
355 gettimeofday (&tv, 0);
356
357 ret [0] = tv.tv_sec;
358 ret [1] = tv.tv_usec;
359}
360
361ecb_inline double
362coro_nvtime (void)
363{
364 struct timeval tv;
365 gettimeofday (&tv, 0);
366
367 return tv.tv_sec + tv.tv_usec * 1e-6;
368}
369
370ecb_inline void
371time_init (pTHX)
372{
373 nvtime = coro_nvtime;
374 u2time = coro_u2time;
375}
376
377#else
378
379ecb_inline void
380time_init (pTHX)
381{
382 SV **svp;
383
384 require_pv ("Time/HiRes.pm");
385
386 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
387
388 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
389 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
390
391 nvtime = INT2PTR (double (*)(), SvIV (*svp));
392
393 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
394 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
395}
396
397#endif
398
315/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
316 400
317static SV * 401static SV * ecb_noinline
318coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
319{ 403{
320#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
321 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
322 get_sv (name, create); 406 get_sv (name, create);
323#endif 407#endif
324 return get_sv (name, create); 408 return get_sv (name, create);
325} 409}
326 410
327static AV * 411static AV * ecb_noinline
328coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
329{ 413{
330#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
331 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
332 get_av (name, create); 416 get_av (name, create);
333#endif 417#endif
334 return get_av (name, create); 418 return get_av (name, create);
335} 419}
336 420
337static HV * 421static HV * ecb_noinline
338coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
339{ 423{
340#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
341 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
342 get_hv (name, create); 426 get_hv (name, create);
343#endif 427#endif
344 return get_hv (name, create); 428 return get_hv (name, create);
345} 429}
346 430
347/* may croak */ 431ecb_inline void
348INLINE CV * 432coro_times_update (void)
349coro_sv_2cv (pTHX_ SV *sv)
350{ 433{
351 HV *st; 434#ifdef coro_clock_gettime
352 GV *gvp; 435 struct timespec ts;
353 return sv_2cv (sv, &st, &gvp, 0);
354}
355 436
356static AV * 437 ts.tv_sec = ts.tv_nsec = 0;
438 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
439 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
440
441 ts.tv_sec = ts.tv_nsec = 0;
442 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
443 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
444#else
445 dTHX;
446 UV tv[2];
447
448 u2time (aTHX_ tv);
449 time_real [0] = tv [0];
450 time_real [1] = tv [1] * 1000;
451#endif
452}
453
454ecb_inline void
455coro_times_add (struct coro *c)
456{
457 c->t_real [1] += time_real [1];
458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
459 c->t_real [0] += time_real [0];
460
461 c->t_cpu [1] += time_cpu [1];
462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
463 c->t_cpu [0] += time_cpu [0];
464}
465
466ecb_inline void
467coro_times_sub (struct coro *c)
468{
469 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
470 c->t_real [1] -= time_real [1];
471 c->t_real [0] -= time_real [0];
472
473 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
474 c->t_cpu [1] -= time_cpu [1];
475 c->t_cpu [0] -= time_cpu [0];
476}
477
478/*****************************************************************************/
479/* magic glue */
480
481#define CORO_MAGIC_type_cv 26
482#define CORO_MAGIC_type_state PERL_MAGIC_ext
483
484#define CORO_MAGIC_NN(sv, type) \
485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
486 ? SvMAGIC (sv) \
487 : mg_find (sv, type))
488
489#define CORO_MAGIC(sv, type) \
490 (ecb_expect_true (SvMAGIC (sv)) \
491 ? CORO_MAGIC_NN (sv, type) \
492 : 0)
493
494#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
496
497ecb_inline MAGIC *
498SvSTATEhv_p (pTHX_ SV *coro)
499{
500 MAGIC *mg;
501
502 if (ecb_expect_true (
503 SvTYPE (coro) == SVt_PVHV
504 && (mg = CORO_MAGIC_state (coro))
505 && mg->mg_virtual == &coro_state_vtbl
506 ))
507 return mg;
508
509 return 0;
510}
511
512ecb_inline struct coro *
513SvSTATE_ (pTHX_ SV *coro_sv)
514{
515 MAGIC *mg;
516
517 if (SvROK (coro_sv))
518 coro_sv = SvRV (coro_sv);
519
520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
522 croak ("Coro::State object required");
523
524 return (struct coro *)mg->mg_ptr;
525}
526
527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
528
529/* faster than SvSTATE, but expects a coroutine hv */
530#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
532
533/*****************************************************************************/
534/* padlist management and caching */
535
536ecb_inline PADLIST *
357coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
358{ 538{
359 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
360 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
361 544
362 newpadlist = newAV (); 545#if NEWPADAPI
546
547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off);
561#else
562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif
564
565 newpad = PadlistARRAY (padlist)[off];
566 PadlistMAX (padlist) = off - 1;
567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
363 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
364#if PERL_VERSION_ATLEAST (5,10,0)
365 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
366#else
367 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
368#endif 574#endif
369 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
370 --AvFILLp (padlist);
371 575
372 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 576 /* Already extended to 2 elements by newPADLIST. */
373 av_store (newpadlist, 1, (SV *)newpad); 577 PadlistMAX (newpadlist) = 1;
578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
583 PadlistARRAY (newpadlist)[1] = newpad;
374 584
375 return newpadlist; 585 return newpadlist;
376} 586}
377 587
378static void 588ecb_inline void
379free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
380{ 590{
381 /* may be during global destruction */ 591 /* may be during global destruction */
382 if (SvREFCNT (padlist)) 592 if (!IN_DESTRUCT)
383 { 593 {
384 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
385 while (i >= 0) 595
596 while (i > 0) /* special-case index 0 */
386 { 597 {
387 SV **svp = av_fetch (padlist, i--, FALSE); 598 /* we try to be extra-careful here */
599 PAD *pad = PadlistARRAY (padlist)[i--];
600
388 if (svp) 601 if (pad)
389 { 602 {
390 SV *sv; 603 I32 j = PadMAX (pad);
391 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 604
605 while (j >= 0)
392 SvREFCNT_dec (sv); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
393 607
608 PadMAX (pad) = -1;
394 SvREFCNT_dec (*svp); 609 SvREFCNT_dec (pad);
395 } 610 }
396 } 611 }
397 612
613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
398 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
399 } 623 }
400} 624}
401 625
402static int 626static int
403coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
404{ 628{
405 AV *padlist; 629 PADLIST *padlist;
406 AV *av = (AV *)mg->mg_obj; 630 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
631 size_t len = *(size_t *)mg->mg_ptr;
407 632
408 /* casting is fun. */ 633 /* perl manages to free our internal AV and _then_ call us */
409 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 634 if (IN_DESTRUCT)
635 return 0;
636
637 while (len--)
410 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
411
412 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
413 639
414 return 0; 640 return 0;
415} 641}
416
417#define CORO_MAGIC_type_cv 26
418#define CORO_MAGIC_type_state PERL_MAGIC_ext
419 642
420static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
421 0, 0, 0, 0, 644 0, 0, 0, 0,
422 coro_cv_free 645 coro_cv_free
423}; 646};
424 647
425#define CORO_MAGIC_NN(sv, type) \
426 (expect_true (SvMAGIC (sv)->mg_type == type) \
427 ? SvMAGIC (sv) \
428 : mg_find (sv, type))
429
430#define CORO_MAGIC(sv, type) \
431 (expect_true (SvMAGIC (sv)) \
432 ? CORO_MAGIC_NN (sv, type) \
433 : 0)
434
435#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
436#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
437
438INLINE struct coro *
439SvSTATE_ (pTHX_ SV *coro)
440{
441 HV *stash;
442 MAGIC *mg;
443
444 if (SvROK (coro))
445 coro = SvRV (coro);
446
447 if (expect_false (SvTYPE (coro) != SVt_PVHV))
448 croak ("Coro::State object required");
449
450 stash = SvSTASH (coro);
451 if (expect_false (stash != coro_stash && stash != coro_state_stash))
452 {
453 /* very slow, but rare, check */
454 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
455 croak ("Coro::State object required");
456 }
457
458 mg = CORO_MAGIC_state (coro);
459 return (struct coro *)mg->mg_ptr;
460}
461
462#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
463
464/* faster than SvSTATE, but expects a coroutine hv */
465#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
466#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
467
468/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
469static void 649ecb_inline void
470get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
471{ 651{
472 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
473 AV *av; 653 size_t *lenp;
474 654
475 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
476 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
477 else 657 else
478 { 658 {
479#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
480 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
481 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
487 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
488#endif 668#endif
489 } 669 }
490} 670}
491 671
492static void 672ecb_inline void
493put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
494{ 674{
495 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
496 AV *av;
497 676
498 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
499 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 679 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
680 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
681 mg->mg_len = 1; /* so mg_free frees mg_ptr */
682 }
683 else
684 Renew (mg->mg_ptr,
685 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
686 char);
500 687
501 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
502
503 if (expect_false (AvFILLp (av) >= AvMAX (av)))
504 av_extend (av, AvMAX (av) + 1);
505
506 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
507} 689}
508 690
509/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
692
693ecb_inline void
694swap_sv (SV *a, SV *b)
695{
696 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
697 SV tmp;
698
699 /* swap sv_any */
700 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
701
702 /* swap sv_flags */
703 SvFLAGS (&tmp) = SvFLAGS (a);
704 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
705 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
706
707#if PERL_VERSION_ATLEAST (5,10,0)
708 /* perl 5.10 and later complicates this _quite_ a bit, but it also
709 * is much faster, so no quarrels here. alternatively, we could
710 * sv_upgrade to avoid this.
711 */
712 {
713 /* swap sv_u */
714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
715
716 /* if SvANY points to the head, we need to adjust the pointers,
717 * as the pointer for a still points to b, and maybe vice versa.
718 */
719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
725
726 if (svany_in_head (SvTYPE (a)))
727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
728
729 if (svany_in_head (SvTYPE (b)))
730 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
731 }
732#endif
733}
734
735/* swap sv heads, at least logically */
736static void
737swap_svs_enter (pTHX_ Coro__State c)
738{
739 int i;
740
741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
743}
744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
754#define SWAP_SVS_ENTER(coro) \
755 if (ecb_expect_false ((coro)->swap_sv)) \
756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
761
762static void
763on_enterleave_call (pTHX_ SV *cb);
510 764
511static void 765static void
512load_perl (pTHX_ Coro__State c) 766load_perl (pTHX_ Coro__State c)
513{ 767{
514 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
515 c->slot = 0; 769 c->slot = 0;
516 770
517 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
518 772
519 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
520 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
521 GvSV (PL_errgv) = slot->errsv; 775#else
522 GvSV (irsgv) = slot->irsgv;
523
524 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
525 # include "state.h" 777 #include "state.h"
526 #undef VAR 778#endif
527 779
528 { 780 {
529 dSP; 781 dSP;
530 782
531 CV *cv; 783 CV *cv;
532 784
533 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
534 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
535 { 787 {
536 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
537 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
538 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
539 } 791 }
540 792
541 PUTBACK; 793 PUTBACK;
542 } 794 }
543 795
544 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
545 CORO_THROW = c->except; 797 CORO_THROW = c->except;
798
799 if (ecb_expect_false (enable_times))
800 {
801 if (ecb_expect_false (!times_valid))
802 coro_times_update ();
803
804 coro_times_sub (c);
805 }
806
807 if (ecb_expect_false (c->on_enter))
808 {
809 int i;
810
811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
813 }
814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
823 SWAP_SVS_ENTER (c);
546} 824}
547 825
548static void 826static void
549save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
550{ 828{
829 SWAP_SVS_LEAVE (c);
830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
838
839 if (ecb_expect_false (c->on_leave))
840 {
841 int i;
842
843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
845 }
846
847 times_valid = 0;
848
849 if (ecb_expect_false (enable_times))
850 {
851 coro_times_update (); times_valid = 1;
852 coro_times_add (c);
853 }
854
551 c->except = CORO_THROW; 855 c->except = CORO_THROW;
552 c->slf_frame = slf_frame; 856 c->slf_frame = slf_frame;
553 857
554 { 858 {
555 dSP; 859 dSP;
… …
564 868
565 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
566 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
567 for (;;) 871 for (;;)
568 { 872 {
569 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
570 { 874 {
571 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
572 876
573 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 877 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
574 { 878 {
575 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
576 880
577 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
578 { 882 {
579 EXTEND (SP, 3); 883 EXTEND (SP, 3);
580 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
581 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
582 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
… …
585 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
586 } 890 }
587 } 891 }
588 } 892 }
589 893
590 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
591 break; 895 break;
592 896
593 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
594 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
595 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
597 901
598 PUTBACK; 902 PUTBACK;
599 } 903 }
600 904
601 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
602 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
603 if (SLOT_COUNT >= 1) CXINC;
604 if (SLOT_COUNT >= 2) CXINC;
605 if (SLOT_COUNT >= 3) CXINC;
606 { 907 {
607 int i; 908 unsigned int i;
909
608 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
609 CXINC; 911 CXINC;
610 } 912
611 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
612 915
613 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
614 917
615 { 918 {
616 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
617 920
618 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
619 slot->defsv = DEFSV; 922 save_perl_slots (slot);
620 slot->errsv = ERRSV; 923#else
621 slot->irsgv = GvSV (irsgv);
622
623 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
624 # include "state.h" 925 #include "state.h"
625 #undef VAR 926#endif
626 } 927 }
627} 928}
628 929
629/* 930/*
630 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
636# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
637#else 938#else
638static void 939static void
639coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
640{ 941{
641 PL_curstackinfo = new_stackinfo(32, 8); 942 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
642 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
643 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
644 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
645 946
646 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
661#endif 962#endif
662 963
663 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
664 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
665 PL_scopestack_max = 8; 966 PL_scopestack_max = 8;
967#if HAS_SCOPESTACK_NAME
968 New(54,PL_scopestack_name,8,const char*);
969#endif
666 970
667 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
668 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
669 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
670 979
671#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
672 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
673 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
674 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
698 } 1007 }
699 1008
700 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
701 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
702 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
703 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
704#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
705 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
706#endif 1018#endif
707} 1019}
… …
737 } 1049 }
738 1050
739 return rss; 1051 return rss;
740} 1052}
741 1053
742/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
743
744static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
745static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
746static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
747 1055
748/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
749#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
750#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
751 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
752 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
753#endif 1061#endif
754 1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1070 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1071 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1072 return 1;
1073}
1074
1075/* perl does not have a %SIG vtbl, we provide one so we can override */
1076/* the cwvtblagic for %SIG members */
1077static const MGVTBL coro_sig_vtbl = {
1078 0, 0, 0, 0, 0,
1079 coro_sig_copy
1080};
1081
755/* 1082/*
756 * This overrides the default magic get method of %SIG elements. 1083 * This overrides the default magic get method of %SIG elements.
757 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1084 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
758 * and instead of tryign to save and restore the hash elements, we just provide 1085 * and instead of trying to save and restore the hash elements (extremely slow),
759 * readback here. 1086 * we just provide our own readback here.
760 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
761 * not expecting this to actually change the hook. This is a potential problem
762 * when a schedule happens then, but we ignore this.
763 */ 1087 */
764static int 1088static int ecb_cold
765coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1089coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
766{ 1090{
767 const char *s = MgPV_nolen_const (mg); 1091 const char *s = MgPV_nolen_const (mg);
768 1092
769 if (*s == '_') 1093 if (*s == '_')
770 { 1094 {
771 SV **svp = 0; 1095 SV **svp = 0;
772 1096
773 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1097 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
774 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1098 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
775 1099
776 if (svp) 1100 if (svp)
777 { 1101 {
778 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1102 SV *ssv;
1103
1104 if (!*svp)
1105 ssv = &PL_sv_undef;
1106 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1107 ssv = sv_2mortal (newRV_inc (*svp));
1108 else
1109 ssv = *svp;
1110
1111 sv_setsv (sv, ssv);
779 return 0; 1112 return 0;
780 } 1113 }
781 } 1114 }
782 1115
783 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1116 return PL_vtbl_sigelem.svt_get ? PL_vtbl_sigelem.svt_get (aTHX_ sv, mg) : 0;
784} 1117}
785 1118
786static int 1119static int ecb_cold
787coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1120coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
788{ 1121{
789 const char *s = MgPV_nolen_const (mg); 1122 const char *s = MgPV_nolen_const (mg);
790 1123
791 if (*s == '_') 1124 if (*s == '_')
… …
802 SvREFCNT_dec (old); 1135 SvREFCNT_dec (old);
803 return 0; 1136 return 0;
804 } 1137 }
805 } 1138 }
806 1139
807 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1140 return PL_vtbl_sigelem.svt_clear ? PL_vtbl_sigelem.svt_clear (aTHX_ sv, mg) : 0;
808} 1141}
809 1142
810static int 1143static int ecb_cold
811coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1144coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
812{ 1145{
813 const char *s = MgPV_nolen_const (mg); 1146 const char *s = MgPV_nolen_const (mg);
814 1147
815 if (*s == '_') 1148 if (*s == '_')
… …
820 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1153 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
821 1154
822 if (svp) 1155 if (svp)
823 { 1156 {
824 SV *old = *svp; 1157 SV *old = *svp;
825 *svp = newSVsv (sv); 1158 *svp = SvOK (sv) ? newSVsv (sv) : 0;
826 SvREFCNT_dec (old); 1159 SvREFCNT_dec (old);
827 return 0; 1160 return 0;
828 } 1161 }
829 } 1162 }
830 1163
831 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 1164 return PL_vtbl_sigelem.svt_set ? PL_vtbl_sigelem.svt_set (aTHX_ sv, mg) : 0;
832} 1165}
833 1166
834static void 1167static void
835prepare_nop (pTHX_ struct coro_transfer_args *ta) 1168prepare_nop (pTHX_ struct coro_transfer_args *ta)
836{ 1169{
… …
848slf_check_repeat (pTHX_ struct CoroSLF *frame) 1181slf_check_repeat (pTHX_ struct CoroSLF *frame)
849{ 1182{
850 return 1; 1183 return 1;
851} 1184}
852 1185
853static UNOP coro_setup_op; 1186/** coroutine stack handling ************************************************/
854 1187
855static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1188static UNOP init_perl_op;
1189
1190ecb_noinline static void /* noinline to keep it out of the transfer fast path */
856coro_setup (pTHX_ struct coro *coro) 1191init_perl (pTHX_ struct coro *coro)
857{ 1192{
858 /* 1193 /*
859 * emulate part of the perl startup here. 1194 * emulate part of the perl startup here.
860 */ 1195 */
861 coro_init_stacks (aTHX); 1196 coro_init_stacks (aTHX);
862 1197
863 PL_runops = RUNOPS_DEFAULT; 1198 PL_runops = RUNOPS_DEFAULT;
864 PL_curcop = &PL_compiling; 1199 PL_curcop = &PL_compiling;
865 PL_in_eval = EVAL_NULL; 1200 PL_in_eval = EVAL_NULL;
866 PL_comppad = 0; 1201 PL_comppad = 0;
1202 PL_comppad_name = 0;
1203 PL_comppad_name_fill = 0;
1204 PL_comppad_name_floor = 0;
867 PL_curpm = 0; 1205 PL_curpm = 0;
868 PL_curpad = 0; 1206 PL_curpad = 0;
869 PL_localizing = 0; 1207 PL_localizing = 0;
870 PL_dirty = 0;
871 PL_restartop = 0; 1208 PL_restartop = 0;
872#if PERL_VERSION_ATLEAST (5,10,0) 1209#if PERL_VERSION_ATLEAST (5,10,0)
873 PL_parser = 0; 1210 PL_parser = 0;
874#endif 1211#endif
1212 PL_hints = 0;
875 1213
876 /* recreate the die/warn hooks */ 1214 /* recreate the die/warn hooks */
877 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1215 PL_diehook = SvREFCNT_inc (rv_diehook);
878 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1216 PL_warnhook = SvREFCNT_inc (rv_warnhook);
879 1217
880 GvSV (PL_defgv) = newSV (0); 1218 GvSV (PL_defgv) = newSV (0);
881 GvAV (PL_defgv) = coro->args; coro->args = 0; 1219 GvAV (PL_defgv) = coro->args; coro->args = 0;
882 GvSV (PL_errgv) = newSV (0); 1220 GvSV (PL_errgv) = newSV (0);
883 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1221 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1222 GvHV (PL_hintgv) = newHV ();
1223#if PERL_VERSION_ATLEAST (5,10,0)
1224 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1225#endif
884 PL_rs = newSVsv (GvSV (irsgv)); 1226 PL_rs = newSVsv (GvSV (irsgv));
885 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1227 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
886 1228
887 { 1229 {
888 dSP; 1230 dSP;
… …
903 /* this newly created coroutine might be run on an existing cctx which most 1245 /* this newly created coroutine might be run on an existing cctx which most
904 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1246 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
905 */ 1247 */
906 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1248 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
907 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1249 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1250 slf_frame.destroy = 0;
908 1251
909 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1252 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
910 coro_setup_op.op_next = PL_op; 1253 init_perl_op.op_next = PL_op;
911 coro_setup_op.op_type = OP_ENTERSUB; 1254 init_perl_op.op_type = OP_ENTERSUB;
912 coro_setup_op.op_ppaddr = pp_slf; 1255 init_perl_op.op_ppaddr = pp_slf;
913 /* no flags etc. required, as an init function won't be called */ 1256 /* no flags etc. required, as an init function won't be called */
914 1257
915 PL_op = (OP *)&coro_setup_op; 1258 PL_op = (OP *)&init_perl_op;
916 1259
917 /* copy throw, in case it was set before coro_setup */ 1260 /* copy throw, in case it was set before init_perl */
918 CORO_THROW = coro->except; 1261 CORO_THROW = coro->except;
919}
920 1262
1263 SWAP_SVS_ENTER (coro);
1264
1265 if (ecb_expect_false (enable_times))
1266 {
1267 coro_times_update ();
1268 coro_times_sub (coro);
1269 }
1270}
1271
921static void 1272static void
922coro_destruct (pTHX_ struct coro *coro) 1273coro_unwind_stacks (pTHX)
923{ 1274{
924 if (!IN_DESTRUCT) 1275 if (!IN_DESTRUCT)
925 { 1276 {
926 /* restore all saved variables and stuff */ 1277 /* restore all saved variables and stuff */
927 LEAVE_SCOPE (0); 1278 LEAVE_SCOPE (0);
… …
935 POPSTACK_TO (PL_mainstack); 1286 POPSTACK_TO (PL_mainstack);
936 1287
937 /* unwind main stack */ 1288 /* unwind main stack */
938 dounwind (-1); 1289 dounwind (-1);
939 } 1290 }
1291}
940 1292
941 SvREFCNT_dec (GvSV (PL_defgv)); 1293static void
942 SvREFCNT_dec (GvAV (PL_defgv)); 1294destroy_perl (pTHX_ struct coro *coro)
943 SvREFCNT_dec (GvSV (PL_errgv)); 1295{
944 SvREFCNT_dec (PL_defoutgv); 1296 SV *svf [9];
945 SvREFCNT_dec (PL_rs);
946 SvREFCNT_dec (GvSV (irsgv));
947 1297
948 SvREFCNT_dec (PL_diehook);
949 SvREFCNT_dec (PL_warnhook);
950 1298 {
1299 SV *old_current = SvRV (coro_current);
1300 struct coro *current = SvSTATE (old_current);
1301
1302 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1303
1304 save_perl (aTHX_ current);
1305
1306 /* this will cause transfer_check to croak on block*/
1307 SvRV_set (coro_current, (SV *)coro->hv);
1308
1309 load_perl (aTHX_ coro);
1310
1311 /* restore swapped sv's */
1312 SWAP_SVS_LEAVE (coro);
1313
1314 coro_unwind_stacks (aTHX);
1315
1316 coro_destruct_stacks (aTHX);
1317
1318 /* now save some sv's to be free'd later */
1319 svf [0] = GvSV (PL_defgv);
1320 svf [1] = (SV *)GvAV (PL_defgv);
1321 svf [2] = GvSV (PL_errgv);
1322 svf [3] = (SV *)PL_defoutgv;
1323 svf [4] = PL_rs;
1324 svf [5] = GvSV (irsgv);
1325 svf [6] = (SV *)GvHV (PL_hintgv);
1326 svf [7] = PL_diehook;
1327 svf [8] = PL_warnhook;
1328 assert (9 == sizeof (svf) / sizeof (*svf));
1329
1330 SvRV_set (coro_current, old_current);
1331
1332 load_perl (aTHX_ current);
1333 }
1334
1335 {
1336 unsigned int i;
1337
1338 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1339 SvREFCNT_dec (svf [i]);
1340
951 SvREFCNT_dec (coro->saved_deffh); 1341 SvREFCNT_dec (coro->saved_deffh);
952 SvREFCNT_dec (coro->rouse_cb); 1342 SvREFCNT_dec (coro->rouse_cb);
953 SvREFCNT_dec (coro->invoke_cb); 1343 SvREFCNT_dec (coro->invoke_cb);
954 SvREFCNT_dec (coro->invoke_av); 1344 SvREFCNT_dec (coro->invoke_av);
955 1345 SvREFCNT_dec (coro->on_enter_xs);
956 coro_destruct_stacks (aTHX); 1346 SvREFCNT_dec (coro->on_leave_xs);
1347 }
957} 1348}
958 1349
959INLINE void 1350ecb_inline void
960free_coro_mortal (pTHX) 1351free_coro_mortal (pTHX)
961{ 1352{
962 if (expect_true (coro_mortal)) 1353 if (ecb_expect_true (coro_mortal))
963 { 1354 {
964 SvREFCNT_dec (coro_mortal); 1355 SvREFCNT_dec ((SV *)coro_mortal);
965 coro_mortal = 0; 1356 coro_mortal = 0;
966 } 1357 }
967} 1358}
968 1359
969static int 1360static int
970runops_trace (pTHX) 1361runops_trace (pTHX)
971{ 1362{
972 COP *oldcop = 0; 1363 COP *oldcop = 0;
973 int oldcxix = -2; 1364 int oldcxix = -2;
974 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
975 coro_cctx *cctx = coro->cctx;
976 1365
977 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1366 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
978 { 1367 {
979 PERL_ASYNC_CHECK (); 1368 PERL_ASYNC_CHECK ();
980 1369
981 if (cctx->flags & CC_TRACE_ALL) 1370 if (cctx_current->flags & CC_TRACE_ALL)
982 { 1371 {
983 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1372 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
984 { 1373 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1374 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 SV **bot, **top; 1375 SV **bot, **top;
987 AV *av = newAV (); /* return values */ 1376 AV *av = newAV (); /* return values */
988 SV **cb; 1377 SV **cb;
… …
1025 1414
1026 if (PL_curcop != &PL_compiling) 1415 if (PL_curcop != &PL_compiling)
1027 { 1416 {
1028 SV **cb; 1417 SV **cb;
1029 1418
1030 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1419 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1031 { 1420 {
1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1421 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1033 1422
1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1423 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1035 { 1424 {
… …
1058 } 1447 }
1059 1448
1060 oldcxix = cxstack_ix; 1449 oldcxix = cxstack_ix;
1061 } 1450 }
1062 1451
1063 if (cctx->flags & CC_TRACE_LINE) 1452 if (cctx_current->flags & CC_TRACE_LINE)
1064 { 1453 {
1065 dSP; 1454 dSP;
1066 1455
1067 PL_runops = RUNOPS_DEFAULT; 1456 PL_runops = RUNOPS_DEFAULT;
1068 ENTER; 1457 ENTER;
… …
1087 1476
1088 TAINT_NOT; 1477 TAINT_NOT;
1089 return 0; 1478 return 0;
1090} 1479}
1091 1480
1092static struct coro_cctx *cctx_ssl_cctx;
1093static struct CoroSLF cctx_ssl_frame; 1481static struct CoroSLF cctx_ssl_frame;
1094 1482
1095static void 1483static void
1096slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1484slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1097{ 1485{
1098 ta->prev = (struct coro *)cctx_ssl_cctx;
1099 ta->next = 0; 1486 ta->prev = 0;
1100} 1487}
1101 1488
1102static int 1489static int
1103slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1490slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1104{ 1491{
… …
1106 1493
1107 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1494 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1108} 1495}
1109 1496
1110/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1497/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1111static void NOINLINE 1498static void ecb_noinline
1112cctx_prepare (pTHX_ coro_cctx *cctx) 1499cctx_prepare (pTHX)
1113{ 1500{
1114 PL_top_env = &PL_start_env; 1501 PL_top_env = &PL_start_env;
1115 1502
1116 if (cctx->flags & CC_TRACE) 1503 if (cctx_current->flags & CC_TRACE)
1117 PL_runops = runops_trace; 1504 PL_runops = runops_trace;
1118 1505
1119 /* we already must be executing an SLF op, there is no other valid way 1506 /* we already must be executing an SLF op, there is no other valid way
1120 * that can lead to creation of a new cctx */ 1507 * that can lead to creation of a new cctx */
1121 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1508 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1122 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1509 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1123 1510
1124 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1511 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1125 cctx_ssl_cctx = cctx;
1126 cctx_ssl_frame = slf_frame; 1512 cctx_ssl_frame = slf_frame;
1127 1513
1128 slf_frame.prepare = slf_prepare_set_stacklevel; 1514 slf_frame.prepare = slf_prepare_set_stacklevel;
1129 slf_frame.check = slf_check_set_stacklevel; 1515 slf_frame.check = slf_check_set_stacklevel;
1130} 1516}
1131 1517
1132/* the tail of transfer: execute stuff we can only do after a transfer */ 1518/* the tail of transfer: execute stuff we can only do after a transfer */
1133INLINE void 1519ecb_inline void
1134transfer_tail (pTHX) 1520transfer_tail (pTHX)
1135{ 1521{
1136 free_coro_mortal (aTHX); 1522 free_coro_mortal (aTHX);
1523}
1524
1525/* try to exit the same way perl's main function would do */
1526/* we do not bother resetting the environment or other things *7
1527/* that are not, uhm, essential */
1528/* this obviously also doesn't work when perl is embedded */
1529static void ecb_noinline ecb_cold
1530perlish_exit (pTHX)
1531{
1532 int exitstatus = perl_destruct (PL_curinterp);
1533 perl_free (PL_curinterp);
1534 exit (exitstatus);
1137} 1535}
1138 1536
1139/* 1537/*
1140 * this is a _very_ stripped down perl interpreter ;) 1538 * this is a _very_ stripped down perl interpreter ;)
1141 */ 1539 */
… …
1153 /* normally we would need to skip the entersub here */ 1551 /* normally we would need to skip the entersub here */
1154 /* not doing so will re-execute it, which is exactly what we want */ 1552 /* not doing so will re-execute it, which is exactly what we want */
1155 /* PL_nop = PL_nop->op_next */ 1553 /* PL_nop = PL_nop->op_next */
1156 1554
1157 /* inject a fake subroutine call to cctx_init */ 1555 /* inject a fake subroutine call to cctx_init */
1158 cctx_prepare (aTHX_ (coro_cctx *)arg); 1556 cctx_prepare (aTHX);
1159 1557
1160 /* cctx_run is the alternative tail of transfer() */ 1558 /* cctx_run is the alternative tail of transfer() */
1161 transfer_tail (aTHX); 1559 transfer_tail (aTHX);
1162 1560
1163 /* somebody or something will hit me for both perl_run and PL_restartop */ 1561 /* somebody or something will hit me for both perl_run and PL_restartop */
1164 PL_restartop = PL_op; 1562 PL_restartop = PL_op;
1165 perl_run (PL_curinterp); 1563 perl_run (PL_curinterp);
1166 /* 1564 /*
1167 * Unfortunately, there is no way to get at the return values of the 1565 * Unfortunately, there is no way to get at the return values of the
1168 * coro body here, as perl_run destroys these 1566 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1567 * runtime errors here, as this is just a random interpreter, not a thread.
1169 */ 1568 */
1569
1570 /*
1571 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1572 * requires PL_scopestack_ix, so do it here if required.
1573 */
1574 if (!PL_scopestack_ix)
1575 ENTER;
1170 1576
1171 /* 1577 /*
1172 * If perl-run returns we assume exit() was being called or the coro 1578 * If perl-run returns we assume exit() was being called or the coro
1173 * fell off the end, which seems to be the only valid (non-bug) 1579 * fell off the end, which seems to be the only valid (non-bug)
1174 * reason for perl_run to return. We try to exit by jumping to the 1580 * reason for perl_run to return. We try to mimic whatever perl is normally
1175 * bootstrap-time "top" top_env, as we cannot restore the "main" 1581 * doing in that case. YMMV.
1176 * coroutine as Coro has no such concept
1177 */ 1582 */
1178 PL_top_env = main_top_env; 1583 perlish_exit (aTHX);
1179 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1180 } 1584 }
1181} 1585}
1182 1586
1183static coro_cctx * 1587static coro_cctx *
1184cctx_new () 1588cctx_new (void)
1185{ 1589{
1186 coro_cctx *cctx; 1590 coro_cctx *cctx;
1187 1591
1188 ++cctx_count; 1592 ++cctx_count;
1189 New (0, cctx, 1, coro_cctx); 1593 New (0, cctx, 1, coro_cctx);
… …
1195 return cctx; 1599 return cctx;
1196} 1600}
1197 1601
1198/* create a new cctx only suitable as source */ 1602/* create a new cctx only suitable as source */
1199static coro_cctx * 1603static coro_cctx *
1200cctx_new_empty () 1604cctx_new_empty (void)
1201{ 1605{
1202 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1203 1607
1204 cctx->sptr = 0; 1608 cctx->stack.sptr = 0;
1205 coro_create (&cctx->cctx, 0, 0, 0, 0); 1609 coro_create (&cctx->cctx, 0, 0, 0, 0);
1206 1610
1207 return cctx; 1611 return cctx;
1208} 1612}
1209 1613
1210/* create a new cctx suitable as destination/running a perl interpreter */ 1614/* create a new cctx suitable as destination/running a perl interpreter */
1211static coro_cctx * 1615static coro_cctx *
1212cctx_new_run () 1616cctx_new_run (void)
1213{ 1617{
1214 coro_cctx *cctx = cctx_new (); 1618 coro_cctx *cctx = cctx_new ();
1215 void *stack_start;
1216 size_t stack_size;
1217 1619
1218#if HAVE_MMAP 1620 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1219 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1220 /* mmap supposedly does allocate-on-write for us */
1221 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1222
1223 if (cctx->sptr != (void *)-1)
1224 {
1225 #if CORO_STACKGUARD
1226 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1227 #endif
1228 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1229 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1230 cctx->flags |= CC_MAPPED;
1231 } 1621 {
1232 else
1233#endif
1234 {
1235 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1236 New (0, cctx->sptr, cctx_stacksize, long);
1237
1238 if (!cctx->sptr)
1239 {
1240 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1622 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1241 _exit (EXIT_FAILURE); 1623 _exit (EXIT_FAILURE);
1242 }
1243
1244 stack_start = cctx->sptr;
1245 stack_size = cctx->ssize;
1246 } 1624 }
1247 1625
1248 #if CORO_USE_VALGRIND
1249 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1250 #endif
1251
1252 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1626 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1253 1627
1254 return cctx; 1628 return cctx;
1255} 1629}
1256 1630
1257static void 1631static void
1258cctx_destroy (coro_cctx *cctx) 1632cctx_destroy (coro_cctx *cctx)
1259{ 1633{
1260 if (!cctx) 1634 if (!cctx)
1261 return; 1635 return;
1262 1636
1637 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1638
1263 --cctx_count; 1639 --cctx_count;
1264 coro_destroy (&cctx->cctx); 1640 coro_destroy (&cctx->cctx);
1265 1641
1266 /* coro_transfer creates new, empty cctx's */ 1642 coro_stack_free (&cctx->stack);
1267 if (cctx->sptr)
1268 {
1269 #if CORO_USE_VALGRIND
1270 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1271 #endif
1272
1273#if HAVE_MMAP
1274 if (cctx->flags & CC_MAPPED)
1275 munmap (cctx->sptr, cctx->ssize);
1276 else
1277#endif
1278 Safefree (cctx->sptr);
1279 }
1280 1643
1281 Safefree (cctx); 1644 Safefree (cctx);
1282} 1645}
1283 1646
1284/* wether this cctx should be destructed */ 1647/* wether this cctx should be destructed */
1285#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1648#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1286 1649
1287static coro_cctx * 1650static coro_cctx *
1288cctx_get (pTHX) 1651cctx_get (pTHX)
1289{ 1652{
1290 while (expect_true (cctx_first)) 1653 while (ecb_expect_true (cctx_first))
1291 { 1654 {
1292 coro_cctx *cctx = cctx_first; 1655 coro_cctx *cctx = cctx_first;
1293 cctx_first = cctx->next; 1656 cctx_first = cctx->next;
1294 --cctx_idle; 1657 --cctx_idle;
1295 1658
1296 if (expect_true (!CCTX_EXPIRED (cctx))) 1659 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1297 return cctx; 1660 return cctx;
1298 1661
1299 cctx_destroy (cctx); 1662 cctx_destroy (cctx);
1300 } 1663 }
1301 1664
… …
1303} 1666}
1304 1667
1305static void 1668static void
1306cctx_put (coro_cctx *cctx) 1669cctx_put (coro_cctx *cctx)
1307{ 1670{
1308 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1671 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1309 1672
1310 /* free another cctx if overlimit */ 1673 /* free another cctx if overlimit */
1311 if (expect_false (cctx_idle >= cctx_max_idle)) 1674 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1312 { 1675 {
1313 coro_cctx *first = cctx_first; 1676 coro_cctx *first = cctx_first;
1314 cctx_first = first->next; 1677 cctx_first = first->next;
1315 --cctx_idle; 1678 --cctx_idle;
1316 1679
… …
1327static void 1690static void
1328transfer_check (pTHX_ struct coro *prev, struct coro *next) 1691transfer_check (pTHX_ struct coro *prev, struct coro *next)
1329{ 1692{
1330 /* TODO: throwing up here is considered harmful */ 1693 /* TODO: throwing up here is considered harmful */
1331 1694
1332 if (expect_true (prev != next)) 1695 if (ecb_expect_true (prev != next))
1333 { 1696 {
1334 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1697 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1335 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1698 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1336 1699
1337 if (expect_false (next->flags & CF_RUNNING)) 1700 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1338 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1339
1340 if (expect_false (next->flags & CF_DESTROYED))
1341 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1701 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1342 1702
1343#if !PERL_VERSION_ATLEAST (5,10,0) 1703#if !PERL_VERSION_ATLEAST (5,10,0)
1344 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1704 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1345 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1705 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1346#endif 1706#endif
1347 } 1707 }
1348} 1708}
1349 1709
1350/* always use the TRANSFER macro */ 1710/* always use the TRANSFER macro */
1351static void NOINLINE /* noinline so we have a fixed stackframe */ 1711static void ecb_noinline /* noinline so we have a fixed stackframe */
1352transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1712transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1353{ 1713{
1354 dSTACKLEVEL; 1714 dSTACKLEVEL;
1355 1715
1356 /* sometimes transfer is only called to set idle_sp */ 1716 /* sometimes transfer is only called to set idle_sp */
1357 if (expect_false (!next)) 1717 if (ecb_expect_false (!prev))
1358 { 1718 {
1359 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1719 cctx_current->idle_sp = STACKLEVEL;
1360 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1720 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1361 } 1721 }
1362 else if (expect_true (prev != next)) 1722 else if (ecb_expect_true (prev != next))
1363 { 1723 {
1364 coro_cctx *prev__cctx; 1724 coro_cctx *cctx_prev;
1365 1725
1366 if (expect_false (prev->flags & CF_NEW)) 1726 if (ecb_expect_false (prev->flags & CF_NEW))
1367 { 1727 {
1368 /* create a new empty/source context */ 1728 /* create a new empty/source context */
1369 prev->cctx = cctx_new_empty ();
1370 prev->flags &= ~CF_NEW; 1729 prev->flags &= ~CF_NEW;
1371 prev->flags |= CF_RUNNING; 1730 prev->flags |= CF_RUNNING;
1372 } 1731 }
1373 1732
1374 prev->flags &= ~CF_RUNNING; 1733 prev->flags &= ~CF_RUNNING;
1375 next->flags |= CF_RUNNING; 1734 next->flags |= CF_RUNNING;
1376 1735
1377 /* first get rid of the old state */ 1736 /* first get rid of the old state */
1378 save_perl (aTHX_ prev); 1737 save_perl (aTHX_ prev);
1379 1738
1380 if (expect_false (next->flags & CF_NEW)) 1739 if (ecb_expect_false (next->flags & CF_NEW))
1381 { 1740 {
1382 /* need to start coroutine */ 1741 /* need to start coroutine */
1383 next->flags &= ~CF_NEW; 1742 next->flags &= ~CF_NEW;
1384 /* setup coroutine call */ 1743 /* setup coroutine call */
1385 coro_setup (aTHX_ next); 1744 init_perl (aTHX_ next);
1386 } 1745 }
1387 else 1746 else
1388 load_perl (aTHX_ next); 1747 load_perl (aTHX_ next);
1389 1748
1390 prev__cctx = prev->cctx;
1391
1392 /* possibly untie and reuse the cctx */ 1749 /* possibly untie and reuse the cctx */
1393 if (expect_true ( 1750 if (ecb_expect_true (
1394 prev__cctx->idle_sp == STACKLEVEL 1751 cctx_current->idle_sp == STACKLEVEL
1395 && !(prev__cctx->flags & CC_TRACE) 1752 && !(cctx_current->flags & CC_TRACE)
1396 && !force_cctx 1753 && !force_cctx
1397 )) 1754 ))
1398 { 1755 {
1399 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1756 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1400 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1757 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1401 1758
1402 prev->cctx = 0;
1403
1404 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1759 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1405 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1760 /* without this the next cctx_get might destroy the running cctx while still in use */
1406 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1761 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1407 if (!next->cctx) 1762 if (ecb_expect_true (!next->cctx))
1408 next->cctx = cctx_get (aTHX); 1763 next->cctx = cctx_get (aTHX);
1409 1764
1410 cctx_put (prev__cctx); 1765 cctx_put (cctx_current);
1411 } 1766 }
1767 else
1768 prev->cctx = cctx_current;
1412 1769
1413 ++next->usecount; 1770 ++next->usecount;
1414 1771
1415 if (expect_true (!next->cctx)) 1772 cctx_prev = cctx_current;
1416 next->cctx = cctx_get (aTHX); 1773 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1417 1774
1418 if (expect_false (prev__cctx != next->cctx)) 1775 next->cctx = 0;
1776
1777 if (ecb_expect_false (cctx_prev != cctx_current))
1419 { 1778 {
1420 prev__cctx->top_env = PL_top_env; 1779 cctx_prev->top_env = PL_top_env;
1421 PL_top_env = next->cctx->top_env; 1780 PL_top_env = cctx_current->top_env;
1422 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1781 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1423 } 1782 }
1424 1783
1425 transfer_tail (aTHX); 1784 transfer_tail (aTHX);
1426 } 1785 }
1427} 1786}
… …
1429#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1788#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1430#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1789#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1431 1790
1432/** high level stuff ********************************************************/ 1791/** high level stuff ********************************************************/
1433 1792
1793/* this function is actually Coro, not Coro::State, but we call it from here */
1794/* because it is convenient - but it hasn't been declared yet for that reason */
1434static int 1795static void
1796coro_call_on_destroy (pTHX_ struct coro *coro);
1797
1798static void
1435coro_state_destroy (pTHX_ struct coro *coro) 1799coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1800{
1437 if (coro->flags & CF_DESTROYED) 1801 if (coro->flags & CF_ZOMBIE)
1438 return 0; 1802 return;
1439 1803
1440 if (coro->on_destroy)
1441 coro->on_destroy (aTHX_ coro); 1804 slf_destroy (aTHX_ coro);
1442 1805
1443 coro->flags |= CF_DESTROYED; 1806 coro->flags |= CF_ZOMBIE;
1444 1807
1445 if (coro->flags & CF_READY) 1808 if (coro->flags & CF_READY)
1446 { 1809 {
1447 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1810 /* reduce nready, as destroying a ready coro effectively unreadies it */
1448 /* alternative: look through all ready queues and remove the coro */ 1811 /* alternative: look through all ready queues and remove the coro */
1449 --coro_nready; 1812 --coro_nready;
1450 } 1813 }
1451 else 1814 else
1452 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1815 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1453 1816
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1817 if (coro->next) coro->next->prev = coro->prev;
1455 { 1818 if (coro->prev) coro->prev->next = coro->next;
1456 struct coro temp; 1819 if (coro == coro_first) coro_first = coro->next;
1457 1820
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1821 if (coro->mainstack
1459 1822 && coro->mainstack != main_mainstack
1460 save_perl (aTHX_ &temp); 1823 && coro->slot
1824 && !PL_dirty)
1461 load_perl (aTHX_ coro); 1825 destroy_perl (aTHX_ coro);
1462
1463 coro_destruct (aTHX_ coro);
1464
1465 load_perl (aTHX_ &temp);
1466
1467 coro->slot = 0;
1468 }
1469 1826
1470 cctx_destroy (coro->cctx); 1827 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1828 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1829 SvREFCNT_dec (coro->args);
1830 SvREFCNT_dec (coro->swap_sv);
1473 SvREFCNT_dec (CORO_THROW); 1831 SvREFCNT_dec (CORO_THROW);
1474 1832
1475 if (coro->next) coro->next->prev = coro->prev; 1833 coro_call_on_destroy (aTHX_ coro);
1476 if (coro->prev) coro->prev->next = coro->next;
1477 if (coro == coro_first) coro_first = coro->next;
1478 1834
1479 return 1; 1835 /* more destruction mayhem in coro_state_free */
1480} 1836}
1481 1837
1482static int 1838static int
1483coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1839coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1484{ 1840{
1485 struct coro *coro = (struct coro *)mg->mg_ptr; 1841 struct coro *coro = (struct coro *)mg->mg_ptr;
1486 mg->mg_ptr = 0; 1842 mg->mg_ptr = 0;
1487 1843
1488 coro->hv = 0;
1489
1490 if (--coro->refcnt < 0)
1491 {
1492 coro_state_destroy (aTHX_ coro); 1844 coro_state_destroy (aTHX_ coro);
1845 SvREFCNT_dec (coro->on_destroy);
1846 SvREFCNT_dec (coro->status);
1847
1493 Safefree (coro); 1848 Safefree (coro);
1494 }
1495 1849
1496 return 0; 1850 return 0;
1497} 1851}
1498 1852
1499static int 1853static int ecb_cold
1500coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1854coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1501{ 1855{
1502 struct coro *coro = (struct coro *)mg->mg_ptr; 1856 /* called when perl clones the current process the slow way (windows process emulation) */
1503 1857 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1504 ++coro->refcnt; 1858 mg->mg_ptr = 0;
1859 mg->mg_virtual = 0;
1505 1860
1506 return 0; 1861 return 0;
1507} 1862}
1508 1863
1509static MGVTBL coro_state_vtbl = { 1864static MGVTBL coro_state_vtbl = {
… …
1532 1887
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1888 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1889 TRANSFER (ta, 1);
1535} 1890}
1536 1891
1537/*****************************************************************************/
1538/* gensub: simple closure generation utility */
1539
1540#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1541
1542/* create a closure from XS, returns a code reference */
1543/* the arg can be accessed via GENSUB_ARG from the callback */
1544/* the callback must use dXSARGS/XSRETURN */
1545static SV *
1546gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1547{
1548 CV *cv = (CV *)newSV (0);
1549
1550 sv_upgrade ((SV *)cv, SVt_PVCV);
1551
1552 CvANON_on (cv);
1553 CvISXSUB_on (cv);
1554 CvXSUB (cv) = xsub;
1555 GENSUB_ARG = arg;
1556
1557 return newRV_noinc ((SV *)cv);
1558}
1559
1560/** Coro ********************************************************************/ 1892/** Coro ********************************************************************/
1561 1893
1562INLINE void 1894ecb_inline void
1563coro_enq (pTHX_ struct coro *coro) 1895coro_enq (pTHX_ struct coro *coro)
1564{ 1896{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1897 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1898
1568INLINE SV * 1899 SvREFCNT_inc_NN (coro->hv);
1900
1901 coro->next_ready = 0;
1902 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1903 ready [1] = coro;
1904}
1905
1906ecb_inline struct coro *
1569coro_deq (pTHX) 1907coro_deq (pTHX)
1570{ 1908{
1571 int prio; 1909 int prio;
1572 1910
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1911 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1912 {
1575 return av_shift (coro_ready [prio]); 1913 struct coro **ready = coro_ready [prio];
1914
1915 if (ready [0])
1916 {
1917 struct coro *coro = ready [0];
1918 ready [0] = coro->next_ready;
1919 return coro;
1920 }
1921 }
1576 1922
1577 return 0; 1923 return 0;
1924}
1925
1926static void
1927invoke_sv_ready_hook_helper (void)
1928{
1929 dTHX;
1930 dSP;
1931
1932 ENTER;
1933 SAVETMPS;
1934
1935 PUSHMARK (SP);
1936 PUTBACK;
1937 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1578} 1941}
1579 1942
1580static int 1943static int
1581api_ready (pTHX_ SV *coro_sv) 1944api_ready (pTHX_ SV *coro_sv)
1582{ 1945{
1583 struct coro *coro;
1584 SV *sv_hook;
1585 void (*xs_hook)(void);
1586
1587 if (SvROK (coro_sv))
1588 coro_sv = SvRV (coro_sv);
1589
1590 coro = SvSTATE (coro_sv); 1946 struct coro *coro = SvSTATE (coro_sv);
1591 1947
1592 if (coro->flags & CF_READY) 1948 if (coro->flags & CF_READY)
1593 return 0; 1949 return 0;
1594 1950
1595 coro->flags |= CF_READY; 1951 coro->flags |= CF_READY;
1596 1952
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1953 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1954
1603 if (sv_hook) 1955 if (!coro_nready++)
1604 { 1956 if (coroapi.readyhook)
1605 dSP; 1957 coroapi.readyhook ();
1606
1607 ENTER;
1608 SAVETMPS;
1609
1610 PUSHMARK (SP);
1611 PUTBACK;
1612 call_sv (sv_hook, G_VOID | G_DISCARD);
1613
1614 FREETMPS;
1615 LEAVE;
1616 }
1617
1618 if (xs_hook)
1619 xs_hook ();
1620 1958
1621 return 1; 1959 return 1;
1622} 1960}
1623 1961
1624static int 1962static int
… …
1626{ 1964{
1627 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1965 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1628} 1966}
1629 1967
1630/* expects to own a reference to next->hv */ 1968/* expects to own a reference to next->hv */
1631INLINE void 1969ecb_inline void
1632prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1970prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1633{ 1971{
1634 SV *prev_sv = SvRV (coro_current); 1972 SV *prev_sv = SvRV (coro_current);
1635 1973
1636 ta->prev = SvSTATE_hv (prev_sv); 1974 ta->prev = SvSTATE_hv (prev_sv);
… …
1647static void 1985static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1986prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1987{
1650 for (;;) 1988 for (;;)
1651 { 1989 {
1652 SV *next_sv = coro_deq (aTHX); 1990 struct coro *next = coro_deq (aTHX);
1653 1991
1654 if (expect_true (next_sv)) 1992 if (ecb_expect_true (next))
1655 { 1993 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1994 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1995 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1996 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1997 else
1662 { 1998 {
1663 next->flags &= ~CF_READY; 1999 next->flags &= ~CF_READY;
1664 --coro_nready; 2000 --coro_nready;
1665 2001
… …
1668 } 2004 }
1669 } 2005 }
1670 else 2006 else
1671 { 2007 {
1672 /* nothing to schedule: call the idle handler */ 2008 /* nothing to schedule: call the idle handler */
2009 if (SvROK (sv_idle)
2010 && SvOBJECT (SvRV (sv_idle)))
2011 {
2012 if (SvRV (sv_idle) == SvRV (coro_current))
2013 {
2014 require_pv ("Carp");
2015
2016 {
2017 dSP;
2018
2019 ENTER;
2020 SAVETMPS;
2021
2022 PUSHMARK (SP);
2023 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2024 PUTBACK;
2025 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2026
2027 FREETMPS;
2028 LEAVE;
2029 }
2030 }
2031
2032 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
2033 api_ready (aTHX_ SvRV (sv_idle));
2034 --coro_nready;
2035 }
2036 else
2037 {
2038 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1673 dSP; 2039 dSP;
1674 2040
1675 ENTER; 2041 ENTER;
1676 SAVETMPS; 2042 SAVETMPS;
1677 2043
1678 PUSHMARK (SP); 2044 PUSHMARK (SP);
1679 PUTBACK; 2045 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 2046 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 2047
1682 FREETMPS; 2048 FREETMPS;
1683 LEAVE; 2049 LEAVE;
2050 }
1684 } 2051 }
1685 } 2052 }
1686} 2053}
1687 2054
1688INLINE void 2055ecb_inline void
1689prepare_cede (pTHX_ struct coro_transfer_args *ta) 2056prepare_cede (pTHX_ struct coro_transfer_args *ta)
1690{ 2057{
1691 api_ready (aTHX_ coro_current); 2058 api_ready (aTHX_ coro_current);
1692 prepare_schedule (aTHX_ ta); 2059 prepare_schedule (aTHX_ ta);
1693} 2060}
1694 2061
1695INLINE void 2062ecb_inline void
1696prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1697{ 2064{
1698 SV *prev = SvRV (coro_current); 2065 SV *prev = SvRV (coro_current);
1699 2066
1700 if (coro_nready) 2067 if (coro_nready)
… …
1730{ 2097{
1731 struct coro_transfer_args ta; 2098 struct coro_transfer_args ta;
1732 2099
1733 prepare_cede (aTHX_ &ta); 2100 prepare_cede (aTHX_ &ta);
1734 2101
1735 if (expect_true (ta.prev != ta.next)) 2102 if (ecb_expect_true (ta.prev != ta.next))
1736 { 2103 {
1737 TRANSFER (ta, 1); 2104 TRANSFER (ta, 1);
1738 return 1; 2105 return 1;
1739 } 2106 }
1740 else 2107 else
… …
1759static void 2126static void
1760api_trace (pTHX_ SV *coro_sv, int flags) 2127api_trace (pTHX_ SV *coro_sv, int flags)
1761{ 2128{
1762 struct coro *coro = SvSTATE (coro_sv); 2129 struct coro *coro = SvSTATE (coro_sv);
1763 2130
2131 if (coro->flags & CF_RUNNING)
2132 croak ("cannot enable tracing on a running coroutine, caught");
2133
1764 if (flags & CC_TRACE) 2134 if (flags & CC_TRACE)
1765 { 2135 {
1766 if (!coro->cctx) 2136 if (!coro->cctx)
1767 coro->cctx = cctx_new_run (); 2137 coro->cctx = cctx_new_run ();
1768 else if (!(coro->cctx->flags & CC_TRACE)) 2138 else if (!(coro->cctx->flags & CC_TRACE))
1769 croak ("cannot enable tracing on coroutine with custom stack,"); 2139 croak ("cannot enable tracing on coroutine with custom stack, caught");
1770 2140
1771 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2141 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1772 } 2142 }
1773 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2143 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1774 { 2144 {
… …
1780 coro->slot->runops = RUNOPS_DEFAULT; 2150 coro->slot->runops = RUNOPS_DEFAULT;
1781 } 2151 }
1782} 2152}
1783 2153
1784static void 2154static void
2155coro_push_av (pTHX_ AV *av, I32 gimme_v)
2156{
2157 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2158 {
2159 dSP;
2160
2161 if (gimme_v == G_SCALAR)
2162 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2163 else
2164 {
2165 int i;
2166 EXTEND (SP, AvFILLp (av) + 1);
2167
2168 for (i = 0; i <= AvFILLp (av); ++i)
2169 PUSHs (AvARRAY (av)[i]);
2170 }
2171
2172 PUTBACK;
2173 }
2174}
2175
2176static void
2177coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2178{
2179 if (!coro->on_destroy)
2180 coro->on_destroy = newAV ();
2181
2182 av_push (coro->on_destroy, cb);
2183}
2184
2185static void
2186slf_destroy_join (pTHX_ struct CoroSLF *frame)
2187{
2188 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2189}
2190
2191static int
2192slf_check_join (pTHX_ struct CoroSLF *frame)
2193{
2194 struct coro *coro = (struct coro *)frame->data;
2195
2196 if (!coro->status)
2197 return 1;
2198
2199 frame->destroy = 0;
2200
2201 coro_push_av (aTHX_ coro->status, GIMME_V);
2202
2203 SvREFCNT_dec ((SV *)coro->hv);
2204
2205 return 0;
2206}
2207
2208static void
2209slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2210{
2211 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2212
2213 if (items > 1)
2214 croak ("join called with too many arguments");
2215
2216 if (coro->status)
2217 frame->prepare = prepare_nop;
2218 else
2219 {
2220 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2221 frame->prepare = prepare_schedule;
2222 }
2223
2224 frame->check = slf_check_join;
2225 frame->destroy = slf_destroy_join;
2226 frame->data = (void *)coro;
2227 SvREFCNT_inc (coro->hv);
2228}
2229
2230static void
1785coro_call_on_destroy (pTHX_ struct coro *coro) 2231coro_call_on_destroy (pTHX_ struct coro *coro)
1786{ 2232{
1787 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2233 AV *od = coro->on_destroy;
1788 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1789 2234
1790 if (on_destroyp) 2235 if (!od)
1791 { 2236 return;
1792 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1793 2237
2238 coro->on_destroy = 0;
2239 sv_2mortal ((SV *)od);
2240
1794 while (AvFILLp (on_destroy) >= 0) 2241 while (AvFILLp (od) >= 0)
2242 {
2243 SV *cb = sv_2mortal (av_pop (od));
2244
2245 /* coro hv's (and only hv's at the moment) are supported as well */
2246 if (SvSTATEhv_p (aTHX_ cb))
2247 api_ready (aTHX_ cb);
2248 else
1795 { 2249 {
1796 dSP; /* don't disturb outer sp */ 2250 dSP; /* don't disturb outer sp */
1797 SV *cb = av_pop (on_destroy);
1798
1799 PUSHMARK (SP); 2251 PUSHMARK (SP);
1800 2252
1801 if (statusp) 2253 if (coro->status)
1802 { 2254 {
1803 int i; 2255 PUTBACK;
1804 AV *status = (AV *)SvRV (*statusp); 2256 coro_push_av (aTHX_ coro->status, G_ARRAY);
1805 EXTEND (SP, AvFILLp (status) + 1); 2257 SPAGAIN;
1806
1807 for (i = 0; i <= AvFILLp (status); ++i)
1808 PUSHs (AvARRAY (status)[i]);
1809 } 2258 }
1810 2259
1811 PUTBACK; 2260 PUTBACK;
1812 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2261 call_sv (cb, G_VOID | G_DISCARD);
1813 } 2262 }
1814 } 2263 }
1815} 2264}
1816 2265
1817static void 2266static void
1818slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2267coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1819{ 2268{
2269 AV *av;
2270
2271 if (coro->status)
2272 {
2273 av = coro->status;
2274 av_clear (av);
2275 }
2276 else
2277 av = coro->status = newAV ();
2278
2279 /* items are actually not so common, so optimise for this case */
2280 if (items)
2281 {
1820 int i; 2282 int i;
1821 HV *hv = (HV *)SvRV (coro_current);
1822 AV *av = newAV ();
1823 2283
1824 av_extend (av, items - 1); 2284 av_extend (av, items - 1);
2285
1825 for (i = 0; i < items; ++i) 2286 for (i = 0; i < items; ++i)
1826 av_push (av, SvREFCNT_inc_NN (arg [i])); 2287 av_push (av, SvREFCNT_inc_NN (arg [i]));
2288 }
2289}
1827 2290
1828 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2291static void
1829 2292slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2293{
1830 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2294 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1831 api_ready (aTHX_ sv_manager); 2295 api_ready (aTHX_ sv_manager);
1832 2296
1833 frame->prepare = prepare_schedule; 2297 frame->prepare = prepare_schedule;
1834 frame->check = slf_check_repeat; 2298 frame->check = slf_check_repeat;
2299
2300 /* as a minor optimisation, we could unwind all stacks here */
2301 /* but that puts extra pressure on pp_slf, and is not worth much */
2302 /*coro_unwind_stacks (aTHX);*/
2303}
2304
2305static void
2306slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2307{
2308 HV *coro_hv = (HV *)SvRV (coro_current);
2309
2310 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2311 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2312}
2313
2314static void
2315slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2316{
2317 HV *coro_hv;
2318 struct coro *coro;
2319
2320 if (items <= 0)
2321 croak ("Coro::cancel called without coro object,");
2322
2323 coro = SvSTATE (arg [0]);
2324 coro_hv = coro->hv;
2325
2326 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2327
2328 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2329 {
2330 /* coro currently busy cancelling something, so just notify it */
2331 coro->slf_frame.data = (void *)coro;
2332
2333 frame->prepare = prepare_nop;
2334 frame->check = slf_check_nop;
2335 }
2336 else if (coro_hv == (HV *)SvRV (coro_current))
2337 {
2338 /* cancelling the current coro is allowed, and equals terminate */
2339 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2340 }
2341 else
2342 {
2343 struct coro *self = SvSTATE_current;
2344
2345 if (!self)
2346 croak ("Coro::cancel called outside of thread content,");
2347
2348 /* otherwise we cancel directly, purely for speed reasons
2349 * unfortunately, this requires some magic trickery, as
2350 * somebody else could cancel us, so we have to fight the cancellation.
2351 * this is ugly, and hopefully fully worth the extra speed.
2352 * besides, I can't get the slow-but-safe version working...
2353 */
2354 slf_frame.data = 0;
2355 self->flags |= CF_NOCANCEL;
2356 coro_state_destroy (aTHX_ coro);
2357 self->flags &= ~CF_NOCANCEL;
2358
2359 if (slf_frame.data)
2360 {
2361 /* while we were busy we have been cancelled, so terminate */
2362 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2363 }
2364 else
2365 {
2366 frame->prepare = prepare_nop;
2367 frame->check = slf_check_nop;
2368 }
2369 }
2370}
2371
2372static int
2373slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2374{
2375 frame->prepare = 0;
2376 coro_unwind_stacks (aTHX);
2377
2378 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2379
2380 return 1;
2381}
2382
2383static int
2384safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2385{
2386 if (coro->cctx)
2387 croak ("coro inside C callback, unable to cancel at this time, caught");
2388
2389 if (coro->flags & CF_NEW)
2390 {
2391 coro_set_status (aTHX_ coro, arg, items);
2392 coro_state_destroy (aTHX_ coro);
2393 }
2394 else
2395 {
2396 if (!coro->slf_frame.prepare)
2397 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2398
2399 slf_destroy (aTHX_ coro);
2400
2401 coro_set_status (aTHX_ coro, arg, items);
2402 coro->slf_frame.prepare = prepare_nop;
2403 coro->slf_frame.check = slf_check_safe_cancel;
2404
2405 api_ready (aTHX_ (SV *)coro->hv);
2406 }
2407
2408 return 1;
1835} 2409}
1836 2410
1837/*****************************************************************************/ 2411/*****************************************************************************/
1838/* async pool handler */ 2412/* async pool handler */
1839 2413
… …
1870slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2444slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1871{ 2445{
1872 HV *hv = (HV *)SvRV (coro_current); 2446 HV *hv = (HV *)SvRV (coro_current);
1873 struct coro *coro = SvSTATE_hv ((SV *)hv); 2447 struct coro *coro = SvSTATE_hv ((SV *)hv);
1874 2448
1875 if (expect_true (coro->saved_deffh)) 2449 if (ecb_expect_true (coro->saved_deffh))
1876 { 2450 {
1877 /* subsequent iteration */ 2451 /* subsequent iteration */
1878 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2452 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1879 coro->saved_deffh = 0; 2453 coro->saved_deffh = 0;
1880 2454
1881 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2455 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1882 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2456 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1883 { 2457 {
1884 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2458 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1885 coro->invoke_av = newAV (); 2459 return;
1886
1887 frame->prepare = prepare_nop;
1888 } 2460 }
1889 else 2461 else
1890 { 2462 {
1891 av_clear (GvAV (PL_defgv)); 2463 av_clear (GvAV (PL_defgv));
1892 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2464 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1893 2465
2466 if (ecb_expect_false (coro->swap_sv))
2467 {
2468 swap_svs_leave (coro);
2469 SvREFCNT_dec_NN (coro->swap_sv);
2470 coro->swap_sv = 0;
2471 }
2472
1894 coro->prio = 0; 2473 coro->prio = 0;
1895 2474
1896 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2475 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1897 api_trace (aTHX_ coro_current, 0); 2476 api_trace (aTHX_ coro_current, 0);
1898 2477
1899 frame->prepare = prepare_schedule; 2478 frame->prepare = prepare_schedule;
1900 av_push (av_async_pool, SvREFCNT_inc (hv)); 2479 av_push (av_async_pool, SvREFCNT_inc (hv));
1901 } 2480 }
… …
1917 2496
1918static void 2497static void
1919coro_rouse_callback (pTHX_ CV *cv) 2498coro_rouse_callback (pTHX_ CV *cv)
1920{ 2499{
1921 dXSARGS; 2500 dXSARGS;
1922 SV *data = (SV *)GENSUB_ARG; 2501 SV *data = (SV *)S_GENSUB_ARG;
1923 2502
1924 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2503 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1925 { 2504 {
1926 /* first call, set args */ 2505 /* first call, set args */
2506 SV *coro = SvRV (data);
1927 AV *av = newAV (); 2507 AV *av = newAV ();
1928 SV *coro = SvRV (data);
1929 2508
1930 SvRV_set (data, (SV *)av); 2509 SvRV_set (data, (SV *)av);
1931 api_ready (aTHX_ coro);
1932 SvREFCNT_dec (coro);
1933 2510
1934 /* better take a full copy of the arguments */ 2511 /* better take a full copy of the arguments */
1935 while (items--) 2512 while (items--)
1936 av_store (av, items, newSVsv (ST (items))); 2513 av_store (av, items, newSVsv (ST (items)));
2514
2515 api_ready (aTHX_ coro);
2516 SvREFCNT_dec (coro);
1937 } 2517 }
1938 2518
1939 XSRETURN_EMPTY; 2519 XSRETURN_EMPTY;
1940} 2520}
1941 2521
1942static int 2522static int
1943slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2523slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1944{ 2524{
1945 SV *data = (SV *)frame->data; 2525 SV *data = (SV *)frame->data;
1946 2526
1947 if (CORO_THROW) 2527 if (CORO_THROW)
1948 return 0; 2528 return 0;
1949 2529
1950 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2530 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1951 return 1; 2531 return 1;
… …
1958 2538
1959 EXTEND (SP, AvFILLp (av) + 1); 2539 EXTEND (SP, AvFILLp (av) + 1);
1960 for (i = 0; i <= AvFILLp (av); ++i) 2540 for (i = 0; i <= AvFILLp (av); ++i)
1961 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2541 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1962 2542
1963 /* we have stolen the elements, so ste length to zero and free */ 2543 /* we have stolen the elements, so set length to zero and free */
1964 AvFILLp (av) = -1; 2544 AvFILLp (av) = -1;
1965 av_undef (av); 2545 av_undef (av);
1966 2546
1967 PUTBACK; 2547 PUTBACK;
1968 } 2548 }
… …
1987 cb = sv_2mortal (coro->rouse_cb); 2567 cb = sv_2mortal (coro->rouse_cb);
1988 coro->rouse_cb = 0; 2568 coro->rouse_cb = 0;
1989 } 2569 }
1990 2570
1991 if (!SvROK (cb) 2571 if (!SvROK (cb)
1992 || SvTYPE (SvRV (cb)) != SVt_PVCV 2572 || SvTYPE (SvRV (cb)) != SVt_PVCV
1993 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2573 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1994 croak ("Coro::rouse_wait called with illegal callback argument,"); 2574 croak ("Coro::rouse_wait called with illegal callback argument,");
1995 2575
1996 { 2576 {
1997 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2577 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1998 SV *data = (SV *)GENSUB_ARG; 2578 SV *data = (SV *)S_GENSUB_ARG;
1999 2579
2000 frame->data = (void *)data; 2580 frame->data = (void *)data;
2001 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2581 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2002 frame->check = slf_check_rouse_wait; 2582 frame->check = slf_check_rouse_wait;
2003 } 2583 }
… …
2007coro_new_rouse_cb (pTHX) 2587coro_new_rouse_cb (pTHX)
2008{ 2588{
2009 HV *hv = (HV *)SvRV (coro_current); 2589 HV *hv = (HV *)SvRV (coro_current);
2010 struct coro *coro = SvSTATE_hv (hv); 2590 struct coro *coro = SvSTATE_hv (hv);
2011 SV *data = newRV_inc ((SV *)hv); 2591 SV *data = newRV_inc ((SV *)hv);
2012 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2592 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2013 2593
2014 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2594 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2015 SvREFCNT_dec (data); /* magicext increases the refcount */ 2595 SvREFCNT_dec (data); /* magicext increases the refcount */
2016 2596
2017 SvREFCNT_dec (coro->rouse_cb); 2597 SvREFCNT_dec (coro->rouse_cb);
… …
2114static void 2694static void
2115slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2695slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2116{ 2696{
2117 frame->prepare = prepare_cede_notself; 2697 frame->prepare = prepare_cede_notself;
2118 frame->check = slf_check_nop; 2698 frame->check = slf_check_nop;
2699}
2700
2701/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2702static void
2703slf_destroy (pTHX_ struct coro *coro)
2704{
2705 struct CoroSLF frame = coro->slf_frame;
2706
2707 /*
2708 * The on_destroy below most likely is from an SLF call.
2709 * Since by definition the SLF call will not finish when we destroy
2710 * the coro, we will have to force-finish it here, otherwise
2711 * cleanup functions cannot call SLF functions.
2712 */
2713 coro->slf_frame.prepare = 0;
2714
2715 /* this callback is reserved for slf functions needing to do cleanup */
2716 if (frame.destroy && frame.prepare && !PL_dirty)
2717 frame.destroy (aTHX_ &frame);
2119} 2718}
2120 2719
2121/* 2720/*
2122 * these not obviously related functions are all rolled into one 2721 * these not obviously related functions are all rolled into one
2123 * function to increase chances that they all will call transfer with the same 2722 * function to increase chances that they all will call transfer with the same
… …
2130 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2729 I32 checkmark; /* mark SP to see how many elements check has pushed */
2131 2730
2132 /* set up the slf frame, unless it has already been set-up */ 2731 /* set up the slf frame, unless it has already been set-up */
2133 /* the latter happens when a new coro has been started */ 2732 /* the latter happens when a new coro has been started */
2134 /* or when a new cctx was attached to an existing coroutine */ 2733 /* or when a new cctx was attached to an existing coroutine */
2135 if (expect_true (!slf_frame.prepare)) 2734 if (ecb_expect_true (!slf_frame.prepare))
2136 { 2735 {
2137 /* first iteration */ 2736 /* first iteration */
2138 dSP; 2737 dSP;
2139 SV **arg = PL_stack_base + TOPMARK + 1; 2738 SV **arg = PL_stack_base + TOPMARK + 1;
2140 int items = SP - arg; /* args without function object */ 2739 int items = SP - arg; /* args without function object */
… …
2181 while (slf_frame.check (aTHX_ &slf_frame)); 2780 while (slf_frame.check (aTHX_ &slf_frame));
2182 2781
2183 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2782 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2184 2783
2185 /* exception handling */ 2784 /* exception handling */
2186 if (expect_false (CORO_THROW)) 2785 if (ecb_expect_false (CORO_THROW))
2187 { 2786 {
2188 SV *exception = sv_2mortal (CORO_THROW); 2787 SV *exception = sv_2mortal (CORO_THROW);
2189 2788
2190 CORO_THROW = 0; 2789 CORO_THROW = 0;
2191 sv_setsv (ERRSV, exception); 2790 sv_setsv (ERRSV, exception);
2192 croak (0); 2791 croak (0);
2193 } 2792 }
2194 2793
2195 /* return value handling - mostly like entersub */ 2794 /* return value handling - mostly like entersub */
2196 /* make sure we put something on the stack in scalar context */ 2795 /* make sure we put something on the stack in scalar context */
2197 if (GIMME_V == G_SCALAR) 2796 if (GIMME_V == G_SCALAR
2797 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2198 { 2798 {
2199 dSP; 2799 dSP;
2200 SV **bot = PL_stack_base + checkmark; 2800 SV **bot = PL_stack_base + checkmark;
2201 2801
2202 if (sp == bot) /* too few, push undef */ 2802 if (sp == bot) /* too few, push undef */
2203 bot [1] = &PL_sv_undef; 2803 bot [1] = &PL_sv_undef;
2204 else if (sp != bot + 1) /* too many, take last one */ 2804 else /* too many, take last one */
2205 bot [1] = *sp; 2805 bot [1] = *sp;
2206 2806
2207 SP = bot + 1; 2807 SP = bot + 1;
2208 2808
2209 PUTBACK; 2809 PUTBACK;
… …
2242 if (PL_op->op_flags & OPf_STACKED) 2842 if (PL_op->op_flags & OPf_STACKED)
2243 { 2843 {
2244 if (items > slf_arga) 2844 if (items > slf_arga)
2245 { 2845 {
2246 slf_arga = items; 2846 slf_arga = items;
2247 free (slf_argv); 2847 Safefree (slf_argv);
2248 slf_argv = malloc (slf_arga * sizeof (SV *)); 2848 New (0, slf_argv, slf_arga, SV *);
2249 } 2849 }
2250 2850
2251 slf_argc = items; 2851 slf_argc = items;
2252 2852
2253 for (i = 0; i < items; ++i) 2853 for (i = 0; i < items; ++i)
… …
2258 2858
2259 PL_op->op_ppaddr = pp_slf; 2859 PL_op->op_ppaddr = pp_slf;
2260 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2860 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2261 2861
2262 PL_op = (OP *)&slf_restore; 2862 PL_op = (OP *)&slf_restore;
2863}
2864
2865/*****************************************************************************/
2866/* dynamic wind */
2867
2868static void
2869on_enterleave_call (pTHX_ SV *cb)
2870{
2871 dSP;
2872
2873 PUSHSTACK;
2874
2875 PUSHMARK (SP);
2876 PUTBACK;
2877 call_sv (cb, G_VOID | G_DISCARD);
2878 SPAGAIN;
2879
2880 POPSTACK;
2881}
2882
2883static SV *
2884coro_avp_pop_and_free (pTHX_ AV **avp)
2885{
2886 AV *av = *avp;
2887 SV *res = av_pop (av);
2888
2889 if (AvFILLp (av) < 0)
2890 {
2891 *avp = 0;
2892 SvREFCNT_dec (av);
2893 }
2894
2895 return res;
2896}
2897
2898static void
2899coro_pop_on_enter (pTHX_ void *coro)
2900{
2901 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2902 SvREFCNT_dec (cb);
2903}
2904
2905static void
2906coro_pop_on_leave (pTHX_ void *coro)
2907{
2908 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2909 on_enterleave_call (aTHX_ sv_2mortal (cb));
2910}
2911
2912static void
2913enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2914{
2915 if (!hook)
2916 return;
2917
2918 if (!*avp)
2919 {
2920 *avp = newAV ();
2921 AvREAL_off (*avp);
2922 }
2923
2924 av_push (*avp, (SV *)hook);
2925 av_push (*avp, (SV *)arg);
2926}
2927
2928static void
2929enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2930{
2931 AV *av = *avp;
2932 int i;
2933
2934 if (!av)
2935 return;
2936
2937 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2938 if (AvARRAY (av)[i] == (SV *)hook)
2939 {
2940 if (execute)
2941 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2942
2943 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2944 av_pop (av);
2945 av_pop (av);
2946 break;
2947 }
2948
2949 if (AvFILLp (av) >= 0)
2950 {
2951 *avp = 0;
2952 SvREFCNT_dec_NN (av);
2953 }
2954}
2955
2956static void
2957api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 if (SvSTATE_current == coro)
2962 if (enter)
2963 enter (aTHX_ enter_arg);
2964
2965 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2966 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2967}
2968
2969static void
2970api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2971{
2972 struct coro *coro = SvSTATE (coro_sv);
2973
2974 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2975 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2976}
2977
2978static void
2979savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2980{
2981 struct coro *coro = SvSTATE_current;
2982
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2984}
2985
2986static void
2987savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2992}
2993
2994static void
2995api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2996{
2997 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2998
2999 /* this ought to be much cheaper than malloc + a single destructor call */
3000 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3001 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2263} 3002}
2264 3003
2265/*****************************************************************************/ 3004/*****************************************************************************/
2266/* PerlIO::cede */ 3005/* PerlIO::cede */
2267 3006
… …
2269{ 3008{
2270 PerlIOBuf base; 3009 PerlIOBuf base;
2271 NV next, every; 3010 NV next, every;
2272} PerlIOCede; 3011} PerlIOCede;
2273 3012
2274static IV 3013static IV ecb_cold
2275PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3014PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2276{ 3015{
2277 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3016 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2278 3017
2279 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3018 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2280 self->next = nvtime () + self->every; 3019 self->next = nvtime () + self->every;
2281 3020
2282 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3021 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2283} 3022}
2284 3023
2285static SV * 3024static SV * ecb_cold
2286PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3025PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2287{ 3026{
2288 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3027 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2289 3028
2290 return newSVnv (self->every); 3029 return newSVnv (self->every);
… …
2341/* Coro::Semaphore & Coro::Signal */ 3080/* Coro::Semaphore & Coro::Signal */
2342 3081
2343static SV * 3082static SV *
2344coro_waitarray_new (pTHX_ int count) 3083coro_waitarray_new (pTHX_ int count)
2345{ 3084{
2346 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3085 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2347 AV *av = newAV (); 3086 AV *av = newAV ();
2348 SV **ary; 3087 SV **ary;
2349 3088
2350 /* unfortunately, building manually saves memory */ 3089 /* unfortunately, building manually saves memory */
2351 Newx (ary, 2, SV *); 3090 Newx (ary, 2, SV *);
2352 AvALLOC (av) = ary; 3091 AvALLOC (av) = ary;
3092#if PERL_VERSION_ATLEAST (5,10,0)
2353 /*AvARRAY (av) = ary;*/ 3093 AvARRAY (av) = ary;
3094#else
2354 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 3095 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
3096 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
3097 SvPVX ((SV *)av) = (char *)ary;
3098#endif
2355 AvMAX (av) = 1; 3099 AvMAX (av) = 1;
2356 AvFILLp (av) = 0; 3100 AvFILLp (av) = 0;
2357 ary [0] = newSViv (count); 3101 ary [0] = newSViv (count);
2358 3102
2359 return newRV_noinc ((SV *)av); 3103 return newRV_noinc ((SV *)av);
… …
2392 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2393 PUTBACK; 3137 PUTBACK;
2394 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3138 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2395 } 3139 }
2396 3140
2397 SvREFCNT_dec (cb); 3141 SvREFCNT_dec_NN (cb);
2398 } 3142 }
2399} 3143}
2400 3144
2401static void 3145static void
2402coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3146coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2403{ 3147{
2404 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3148 /* call $sem->adjust (0) to possibly wake up some other waiters */
2405 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3149 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2406} 3150}
2407 3151
2408static int 3152static int
2409slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3153slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2410{ 3154{
2411 AV *av = (AV *)frame->data; 3155 AV *av = (AV *)frame->data;
2412 SV *count_sv = AvARRAY (av)[0]; 3156 SV *count_sv = AvARRAY (av)[0];
3157 SV *coro_hv = SvRV (coro_current);
3158
3159 frame->destroy = 0;
2413 3160
2414 /* if we are about to throw, don't actually acquire the lock, just throw */ 3161 /* if we are about to throw, don't actually acquire the lock, just throw */
2415 if (CORO_THROW) 3162 if (ecb_expect_false (CORO_THROW))
3163 {
3164 /* we still might be responsible for the semaphore, so wake up others */
3165 coro_semaphore_adjust (aTHX_ av, 0);
3166
2416 return 0; 3167 return 0;
3168 }
2417 else if (SvIVX (count_sv) > 0) 3169 else if (SvIVX (count_sv) > 0)
2418 { 3170 {
2419 SvSTATE_current->on_destroy = 0;
2420
2421 if (acquire) 3171 if (acquire)
2422 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3172 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2423 else 3173 else
2424 coro_semaphore_adjust (aTHX_ av, 0); 3174 coro_semaphore_adjust (aTHX_ av, 0);
2425 3175
… …
2429 { 3179 {
2430 int i; 3180 int i;
2431 /* if we were woken up but can't down, we look through the whole */ 3181 /* if we were woken up but can't down, we look through the whole */
2432 /* waiters list and only add us if we aren't in there already */ 3182 /* waiters list and only add us if we aren't in there already */
2433 /* this avoids some degenerate memory usage cases */ 3183 /* this avoids some degenerate memory usage cases */
2434 3184 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2435 for (i = 1; i <= AvFILLp (av); ++i)
2436 if (AvARRAY (av)[i] == SvRV (coro_current)) 3185 if (AvARRAY (av)[i] == coro_hv)
2437 return 1; 3186 return 1;
2438 3187
2439 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3188 av_push (av, SvREFCNT_inc (coro_hv));
2440 return 1; 3189 return 1;
2441 } 3190 }
2442} 3191}
2443 3192
2444static int 3193static int
… …
2467 { 3216 {
2468 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3217 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2469 3218
2470 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3219 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2471 frame->prepare = prepare_schedule; 3220 frame->prepare = prepare_schedule;
2472
2473 /* to avoid race conditions when a woken-up coro gets terminated */ 3221 /* to avoid race conditions when a woken-up coro gets terminated */
2474 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3222 /* we arrange for a temporary on_destroy that calls adjust (0) */
2475 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3223 frame->destroy = coro_semaphore_destroy;
2476 } 3224 }
2477} 3225}
2478 3226
2479static void 3227static void
2480slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3228slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2488{ 3236{
2489 if (items >= 2) 3237 if (items >= 2)
2490 { 3238 {
2491 /* callback form */ 3239 /* callback form */
2492 AV *av = (AV *)SvRV (arg [0]); 3240 AV *av = (AV *)SvRV (arg [0]);
2493 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3241 SV *cb_cv = s_get_cv_croak (arg [1]);
2494 3242
2495 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3243 av_push (av, SvREFCNT_inc_NN (cb_cv));
2496 3244
2497 if (SvIVX (AvARRAY (av)[0]) > 0) 3245 if (SvIVX (AvARRAY (av)[0]) > 0)
2498 coro_semaphore_adjust (aTHX_ av, 0); 3246 coro_semaphore_adjust (aTHX_ av, 0);
2499 3247
2500 frame->prepare = prepare_nop; 3248 frame->prepare = prepare_nop;
… …
2524 AvARRAY (av)[0] = AvARRAY (av)[1]; 3272 AvARRAY (av)[0] = AvARRAY (av)[1];
2525 AvARRAY (av)[1] = cb; 3273 AvARRAY (av)[1] = cb;
2526 3274
2527 cb = av_shift (av); 3275 cb = av_shift (av);
2528 3276
3277 if (SvTYPE (cb) == SVt_PVCV)
3278 {
3279 dSP;
3280 PUSHMARK (SP);
3281 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3282 PUTBACK;
3283 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3284 }
3285 else
3286 {
2529 api_ready (aTHX_ cb); 3287 api_ready (aTHX_ cb);
2530 sv_setiv (cb, 0); /* signal waiter */ 3288 sv_setiv (cb, 0); /* signal waiter */
3289 }
3290
2531 SvREFCNT_dec (cb); 3291 SvREFCNT_dec_NN (cb);
2532 3292
2533 --count; 3293 --count;
2534 } 3294 }
2535} 3295}
2536 3296
… …
2544static void 3304static void
2545slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3305slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2546{ 3306{
2547 AV *av = (AV *)SvRV (arg [0]); 3307 AV *av = (AV *)SvRV (arg [0]);
2548 3308
3309 if (items >= 2)
3310 {
3311 SV *cb_cv = s_get_cv_croak (arg [1]);
3312 av_push (av, SvREFCNT_inc_NN (cb_cv));
3313
2549 if (SvIVX (AvARRAY (av)[0])) 3314 if (SvIVX (AvARRAY (av)[0]))
3315 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3316
3317 frame->prepare = prepare_nop;
3318 frame->check = slf_check_nop;
3319 }
3320 else if (SvIVX (AvARRAY (av)[0]))
2550 { 3321 {
2551 SvIVX (AvARRAY (av)[0]) = 0; 3322 SvIVX (AvARRAY (av)[0]) = 0;
2552 frame->prepare = prepare_nop; 3323 frame->prepare = prepare_nop;
2553 frame->check = slf_check_nop; 3324 frame->check = slf_check_nop;
2554 } 3325 }
2555 else 3326 else
2556 { 3327 {
2557 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3328 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2558 3329
2559 av_push (av, waiter); 3330 av_push (av, waiter);
2560 3331
2561 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3332 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2562 frame->prepare = prepare_schedule; 3333 frame->prepare = prepare_schedule;
… …
2580 3351
2581static void 3352static void
2582coro_aio_callback (pTHX_ CV *cv) 3353coro_aio_callback (pTHX_ CV *cv)
2583{ 3354{
2584 dXSARGS; 3355 dXSARGS;
2585 AV *state = (AV *)GENSUB_ARG; 3356 AV *state = (AV *)S_GENSUB_ARG;
2586 SV *coro = av_pop (state); 3357 SV *coro = av_pop (state);
2587 SV *data_sv = newSV (sizeof (struct io_state)); 3358 SV *data_sv = newSV (sizeof (struct io_state));
2588 3359
2589 av_extend (state, items - 1); 3360 av_extend (state, items - 1);
2590 3361
… …
2610 } 3381 }
2611 3382
2612 av_push (state, data_sv); 3383 av_push (state, data_sv);
2613 3384
2614 api_ready (aTHX_ coro); 3385 api_ready (aTHX_ coro);
2615 SvREFCNT_dec (coro); 3386 SvREFCNT_dec_NN (coro);
2616 SvREFCNT_dec ((AV *)state); 3387 SvREFCNT_dec_NN ((AV *)state);
2617} 3388}
2618 3389
2619static int 3390static int
2620slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3391slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2621{ 3392{
… …
2626 /* it quickly returns */ 3397 /* it quickly returns */
2627 if (CORO_THROW) 3398 if (CORO_THROW)
2628 return 0; 3399 return 0;
2629 3400
2630 /* one element that is an RV? repeat! */ 3401 /* one element that is an RV? repeat! */
2631 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3402 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2632 return 1; 3403 return 1;
2633 3404
2634 /* restore status */ 3405 /* restore status */
2635 { 3406 {
2636 SV *data_sv = av_pop (state); 3407 SV *data_sv = av_pop (state);
… …
2639 errno = data->errorno; 3410 errno = data->errorno;
2640 PL_laststype = data->laststype; 3411 PL_laststype = data->laststype;
2641 PL_laststatval = data->laststatval; 3412 PL_laststatval = data->laststatval;
2642 PL_statcache = data->statcache; 3413 PL_statcache = data->statcache;
2643 3414
2644 SvREFCNT_dec (data_sv); 3415 SvREFCNT_dec_NN (data_sv);
2645 } 3416 }
2646 3417
2647 /* push result values */ 3418 /* push result values */
2648 { 3419 {
2649 dSP; 3420 dSP;
… …
2675 dSP; 3446 dSP;
2676 3447
2677 static SV *prio_cv; 3448 static SV *prio_cv;
2678 static SV *prio_sv; 3449 static SV *prio_sv;
2679 3450
2680 if (expect_false (!prio_cv)) 3451 if (ecb_expect_false (!prio_cv))
2681 { 3452 {
2682 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3453 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2683 prio_sv = newSViv (0); 3454 prio_sv = newSViv (0);
2684 } 3455 }
2685 3456
… …
2704 3475
2705 for (i = 0; i < items; ++i) 3476 for (i = 0; i < items; ++i)
2706 PUSHs (arg [i]); 3477 PUSHs (arg [i]);
2707 3478
2708 /* now push the callback closure */ 3479 /* now push the callback closure */
2709 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3480 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2710 3481
2711 /* now call the AIO function - we assume our request is uncancelable */ 3482 /* now call the AIO function - we assume our request is uncancelable */
2712 PUTBACK; 3483 PUTBACK;
2713 call_sv ((SV *)req, G_VOID | G_DISCARD); 3484 call_sv ((SV *)req, G_VOID | G_DISCARD);
2714 } 3485 }
2715 3486
2716 /* now that the requets is going, we loop toll we have a result */ 3487 /* now that the request is going, we loop till we have a result */
2717 frame->data = (void *)state; 3488 frame->data = (void *)state;
2718 frame->prepare = prepare_schedule; 3489 frame->prepare = prepare_schedule;
2719 frame->check = slf_check_aio_req; 3490 frame->check = slf_check_aio_req;
2720} 3491}
2721 3492
… …
2733 3504
2734#if CORO_CLONE 3505#if CORO_CLONE
2735# include "clone.c" 3506# include "clone.c"
2736#endif 3507#endif
2737 3508
3509/*****************************************************************************/
3510
3511static SV *
3512coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3513{
3514 SV *coro_sv;
3515 struct coro *coro;
3516 MAGIC *mg;
3517 HV *hv;
3518 SV *cb;
3519 int i;
3520
3521 if (argc > 0)
3522 {
3523 cb = s_get_cv_croak (argv [0]);
3524
3525 if (!is_coro)
3526 {
3527 if (CvISXSUB (cb))
3528 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3529
3530 if (!CvROOT (cb))
3531 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3532 }
3533 }
3534
3535 Newz (0, coro, 1, struct coro);
3536 coro->args = newAV ();
3537 coro->flags = CF_NEW;
3538
3539 if (coro_first) coro_first->prev = coro;
3540 coro->next = coro_first;
3541 coro_first = coro;
3542
3543 coro->hv = hv = newHV ();
3544 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3545 mg->mg_flags |= MGf_DUP;
3546 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3547
3548 if (argc > 0)
3549 {
3550 av_extend (coro->args, argc + is_coro - 1);
3551
3552 if (is_coro)
3553 {
3554 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3555 cb = (SV *)cv_coro_run;
3556 }
3557
3558 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3559
3560 for (i = 1; i < argc; i++)
3561 av_push (coro->args, newSVsv (argv [i]));
3562 }
3563
3564 return coro_sv;
3565}
3566
3567#ifndef __cplusplus
3568ecb_cold XS(boot_Coro__State);
3569#endif
3570
3571#if CORO_JIT
3572
3573static void ecb_noinline ecb_cold
3574pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3575{
3576 dSP;
3577 AV *av = newAV ();
3578
3579 av_store (av, 3, newSVuv (d));
3580 av_store (av, 2, newSVuv (c));
3581 av_store (av, 1, newSVuv (b));
3582 av_store (av, 0, newSVuv (a));
3583
3584 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3585
3586 PUTBACK;
3587}
3588
3589static void ecb_noinline ecb_cold
3590jit_init (pTHX)
3591{
3592 dSP;
3593 SV *load, *save;
3594 char *map_base;
3595 char *load_ptr, *save_ptr;
3596 STRLEN load_len, save_len, map_len;
3597 int count;
3598
3599 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3600
3601 PUSHMARK (SP);
3602 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3603 #include "state.h"
3604 count = call_pv ("Coro::State::_jit", G_ARRAY);
3605 SPAGAIN;
3606
3607 save = POPs; save_ptr = SvPVbyte (save, save_len);
3608 load = POPs; load_ptr = SvPVbyte (load, load_len);
3609
3610 map_len = load_len + save_len + 16;
3611
3612 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3613
3614 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3615
3616 load_perl_slots = (load_save_perl_slots_type)map_base;
3617 memcpy (map_base, load_ptr, load_len);
3618
3619 map_base += (load_len + 15) & ~15;
3620
3621 save_perl_slots = (load_save_perl_slots_type)map_base;
3622 memcpy (map_base, save_ptr, save_len);
3623
3624 /* we are good citizens and try to make the page read-only, so the evil evil */
3625 /* hackers might have it a bit more difficult */
3626 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3627
3628 PUTBACK;
3629 eval_pv ("undef &Coro::State::_jit", 1);
3630}
3631
3632#endif
3633
2738MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3634MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2739 3635
2740PROTOTYPES: DISABLE 3636PROTOTYPES: DISABLE
2741 3637
2742BOOT: 3638BOOT:
2743{ 3639{
3640#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3641#include "state.h"
2744#ifdef USE_ITHREADS 3642#ifdef USE_ITHREADS
2745# if CORO_PTHREAD 3643# if CORO_PTHREAD
2746 coro_thx = PERL_GET_CONTEXT; 3644 coro_thx = PERL_GET_CONTEXT;
2747# endif 3645# endif
2748#endif 3646#endif
2749 BOOT_PAGESIZE; 3647 /* perl defines these to check for existance first, but why it doesn't */
3648 /* just create them one at init time is not clear to me, except for */
3649 /* programs trying to delete them, but... */
3650 /* anyway, we declare this as invalid and make sure they are initialised here */
3651 DEFSV;
3652 ERRSV;
3653
3654 cctx_current = cctx_new_empty ();
2750 3655
2751 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3656 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2752 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3657 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2753 3658
2754 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3659 {
2755 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3660 /*
2756 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3661 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3662 * by coro_sig_vtbl in hash values.
3663 */
3664 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3665
3666 /* this only works if perl doesn't have a vtbl for %SIG */
3667 assert (!mg->mg_virtual);
3668
3669 /*
3670 * The irony is that the perl API itself asserts that mg_virtual
3671 * must be non-const, yet perl5porters insisted on marking their
3672 * vtbls as read-only, just to thwart perl modules from patching
3673 * them.
3674 */
3675 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3676 mg->mg_flags |= MGf_COPY;
3677
3678 coro_sigelem_vtbl = PL_vtbl_sigelem;
3679 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3680 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3681 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3682 }
2757 3683
2758 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2759 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3684 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2760 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3685 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2761 3686
2762 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3687 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2763 3688
… …
2792 coroapi.prepare_nop = prepare_nop; 3717 coroapi.prepare_nop = prepare_nop;
2793 coroapi.prepare_schedule = prepare_schedule; 3718 coroapi.prepare_schedule = prepare_schedule;
2794 coroapi.prepare_cede = prepare_cede; 3719 coroapi.prepare_cede = prepare_cede;
2795 coroapi.prepare_cede_notself = prepare_cede_notself; 3720 coroapi.prepare_cede_notself = prepare_cede_notself;
2796 3721
2797 { 3722 time_init (aTHX);
2798 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2799 3723
2800 if (!svp) croak ("Time::HiRes is required");
2801 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2802
2803 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2804 }
2805
2806 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3724 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3725#if CORO_JIT
3726 PUTBACK;
3727 jit_init (aTHX);
3728 SPAGAIN;
3729#endif
2807} 3730}
2808 3731
2809SV * 3732SV *
2810new (char *klass, ...) 3733new (SV *klass, ...)
2811 ALIAS: 3734 ALIAS:
2812 Coro::new = 1 3735 Coro::new = 1
2813 CODE: 3736 CODE:
2814{ 3737 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2815 struct coro *coro; 3738 OUTPUT:
2816 MAGIC *mg;
2817 HV *hv;
2818 CV *cb;
2819 int i;
2820
2821 if (items > 1)
2822 {
2823 cb = coro_sv_2cv (aTHX_ ST (1));
2824
2825 if (!ix)
2826 {
2827 if (CvISXSUB (cb))
2828 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2829
2830 if (!CvROOT (cb))
2831 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2832 }
2833 }
2834
2835 Newz (0, coro, 1, struct coro);
2836 coro->args = newAV ();
2837 coro->flags = CF_NEW;
2838
2839 if (coro_first) coro_first->prev = coro;
2840 coro->next = coro_first;
2841 coro_first = coro;
2842
2843 coro->hv = hv = newHV ();
2844 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2845 mg->mg_flags |= MGf_DUP;
2846 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2847
2848 if (items > 1)
2849 {
2850 av_extend (coro->args, items - 1 + ix - 1);
2851
2852 if (ix)
2853 {
2854 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2855 cb = cv_coro_run;
2856 }
2857
2858 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2859
2860 for (i = 2; i < items; i++)
2861 av_push (coro->args, newSVsv (ST (i)));
2862 }
2863}
2864 OUTPUT:
2865 RETVAL 3739 RETVAL
2866 3740
2867void 3741void
2868transfer (...) 3742transfer (...)
2869 PROTOTYPE: $$ 3743 PROTOTYPE: $$
2870 CODE: 3744 CODE:
2871 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3745 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2872 3746
2873bool
2874_destroy (SV *coro_sv)
2875 CODE:
2876 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2877 OUTPUT:
2878 RETVAL
2879
2880void
2881_exit (int code)
2882 PROTOTYPE: $
2883 CODE:
2884 _exit (code);
2885
2886#if CORO_CLONE
2887
2888SV * 3747SV *
2889clone (Coro::State coro) 3748clone (Coro::State coro)
2890 CODE: 3749 CODE:
2891{ 3750{
3751#if CORO_CLONE
2892 struct coro *ncoro = coro_clone (coro); 3752 struct coro *ncoro = coro_clone (aTHX_ coro);
2893 MAGIC *mg; 3753 MAGIC *mg;
2894 /* TODO: too much duplication */ 3754 /* TODO: too much duplication */
2895 ncoro->hv = newHV (); 3755 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3756 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP; 3757 mg->mg_flags |= MGf_DUP;
2898 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv)); 3758 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3759#else
3760 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3761#endif
2899} 3762}
2900 OUTPUT: 3763 OUTPUT:
2901 RETVAL 3764 RETVAL
2902
2903#endif
2904 3765
2905int 3766int
2906cctx_stacksize (int new_stacksize = 0) 3767cctx_stacksize (int new_stacksize = 0)
2907 PROTOTYPE: ;$ 3768 PROTOTYPE: ;$
2908 CODE: 3769 CODE:
… …
2944void 3805void
2945list () 3806list ()
2946 PROTOTYPE: 3807 PROTOTYPE:
2947 PPCODE: 3808 PPCODE:
2948{ 3809{
2949 struct coro *coro; 3810 struct coro *coro;
2950 for (coro = coro_first; coro; coro = coro->next) 3811 for (coro = coro_first; coro; coro = coro->next)
2951 if (coro->hv) 3812 if (coro->hv)
2952 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3813 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2953} 3814}
2954 3815
… …
2958 eval = 1 3819 eval = 1
2959 CODE: 3820 CODE:
2960{ 3821{
2961 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3822 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2962 { 3823 {
2963 struct coro temp; 3824 struct coro *current = SvSTATE_current;
3825 struct CoroSLF slf_save;
2964 3826
2965 if (!(coro->flags & CF_RUNNING)) 3827 if (current != coro)
2966 { 3828 {
2967 PUTBACK; 3829 PUTBACK;
2968 save_perl (aTHX_ &temp); 3830 save_perl (aTHX_ current);
2969 load_perl (aTHX_ coro); 3831 load_perl (aTHX_ coro);
3832 /* the coro is most likely in an active SLF call.
3833 * while not strictly required (the code we execute is
3834 * not allowed to call any SLF functions), it's cleaner
3835 * to reinitialise the slf_frame and restore it later.
3836 * This might one day allow us to actually do SLF calls
3837 * from code executed here.
3838 */
3839 slf_save = slf_frame;
3840 slf_frame.prepare = 0;
3841 SPAGAIN;
2970 } 3842 }
2971 3843
2972 {
2973 dSP;
2974 ENTER;
2975 SAVETMPS;
2976 PUTBACK;
2977 PUSHSTACK; 3844 PUSHSTACK;
3845
2978 PUSHMARK (SP); 3846 PUSHMARK (SP);
3847 PUTBACK;
2979 3848
2980 if (ix) 3849 if (ix)
2981 eval_sv (coderef, 0); 3850 eval_sv (coderef, 0);
2982 else 3851 else
2983 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3852 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2984 3853
2985 POPSTACK; 3854 POPSTACK;
2986 SPAGAIN; 3855 SPAGAIN;
2987 FREETMPS;
2988 LEAVE;
2989 PUTBACK;
2990 }
2991 3856
2992 if (!(coro->flags & CF_RUNNING)) 3857 if (current != coro)
2993 { 3858 {
3859 PUTBACK;
3860 slf_frame = slf_save;
2994 save_perl (aTHX_ coro); 3861 save_perl (aTHX_ coro);
2995 load_perl (aTHX_ &temp); 3862 load_perl (aTHX_ current);
2996 SPAGAIN; 3863 SPAGAIN;
2997 } 3864 }
2998 } 3865 }
2999} 3866}
3000 3867
… …
3003 PROTOTYPE: $ 3870 PROTOTYPE: $
3004 ALIAS: 3871 ALIAS:
3005 is_ready = CF_READY 3872 is_ready = CF_READY
3006 is_running = CF_RUNNING 3873 is_running = CF_RUNNING
3007 is_new = CF_NEW 3874 is_new = CF_NEW
3008 is_destroyed = CF_DESTROYED 3875 is_destroyed = CF_ZOMBIE
3876 is_zombie = CF_ZOMBIE
3877 is_suspended = CF_SUSPENDED
3009 CODE: 3878 CODE:
3010 RETVAL = boolSV (coro->flags & ix); 3879 RETVAL = boolSV (coro->flags & ix);
3011 OUTPUT: 3880 OUTPUT:
3012 RETVAL 3881 RETVAL
3013 3882
3014void 3883void
3015throw (Coro::State self, SV *throw = &PL_sv_undef) 3884throw (SV *self, SV *exception = &PL_sv_undef)
3016 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
3017 CODE: 3886 CODE:
3018{ 3887{
3888 struct coro *coro = SvSTATE (self);
3019 struct coro *current = SvSTATE_current; 3889 struct coro *current = SvSTATE_current;
3020 SV **throwp = self == current ? &CORO_THROW : &self->except; 3890 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3021 SvREFCNT_dec (*throwp); 3891 SvREFCNT_dec (*exceptionp);
3022 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3892 SvGETMAGIC (exception);
3893 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3894
3895 api_ready (aTHX_ self);
3023} 3896}
3024 3897
3025void 3898void
3026api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3899api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3027 PROTOTYPE: $;$ 3900 PROTOTYPE: $;$
… …
3029 3902
3030SV * 3903SV *
3031has_cctx (Coro::State coro) 3904has_cctx (Coro::State coro)
3032 PROTOTYPE: $ 3905 PROTOTYPE: $
3033 CODE: 3906 CODE:
3034 RETVAL = boolSV (!!coro->cctx); 3907 /* maybe manage the running flag differently */
3908 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3035 OUTPUT: 3909 OUTPUT:
3036 RETVAL 3910 RETVAL
3037 3911
3038int 3912int
3039is_traced (Coro::State coro) 3913is_traced (Coro::State coro)
… …
3059 3933
3060void 3934void
3061force_cctx () 3935force_cctx ()
3062 PROTOTYPE: 3936 PROTOTYPE:
3063 CODE: 3937 CODE:
3064 SvSTATE_current->cctx->idle_sp = 0; 3938 cctx_current->idle_sp = 0;
3065 3939
3066void 3940void
3067swap_defsv (Coro::State self) 3941swap_defsv (Coro::State self)
3068 PROTOTYPE: $ 3942 PROTOTYPE: $
3069 ALIAS: 3943 ALIAS:
… …
3077 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3951 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3078 3952
3079 SV *tmp = *src; *src = *dst; *dst = tmp; 3953 SV *tmp = *src; *src = *dst; *dst = tmp;
3080 } 3954 }
3081 3955
3956void
3957cancel (Coro::State self)
3958 CODE:
3959 coro_state_destroy (aTHX_ self);
3960
3961SV *
3962enable_times (int enabled = enable_times)
3963 CODE:
3964{
3965 RETVAL = boolSV (enable_times);
3966
3967 if (enabled != enable_times)
3968 {
3969 enable_times = enabled;
3970
3971 coro_times_update ();
3972 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3973 }
3974}
3975 OUTPUT:
3976 RETVAL
3977
3978void
3979times (Coro::State self)
3980 PPCODE:
3981{
3982 struct coro *current = SvSTATE (coro_current);
3983
3984 if (ecb_expect_false (current == self))
3985 {
3986 coro_times_update ();
3987 coro_times_add (SvSTATE (coro_current));
3988 }
3989
3990 EXTEND (SP, 2);
3991 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3992 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3993
3994 if (ecb_expect_false (current == self))
3995 coro_times_sub (SvSTATE (coro_current));
3996}
3997
3998void
3999swap_sv (Coro::State coro, SV *sva, SV *svb)
4000 CODE:
4001{
4002 struct coro *current = SvSTATE_current;
4003 AV *swap_sv;
4004 int i;
4005
4006 sva = SvRV (sva);
4007 svb = SvRV (svb);
4008
4009 if (current == coro)
4010 SWAP_SVS_LEAVE (current);
4011
4012 if (!coro->swap_sv)
4013 coro->swap_sv = newAV ();
4014
4015 swap_sv = coro->swap_sv;
4016
4017 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4018 {
4019 SV *a = AvARRAY (swap_sv)[i ];
4020 SV *b = AvARRAY (swap_sv)[i + 1];
4021
4022 if (a == sva && b == svb)
4023 {
4024 SvREFCNT_dec_NN (a);
4025 SvREFCNT_dec_NN (b);
4026
4027 for (; i <= AvFILLp (swap_sv) - 2; i++)
4028 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4029
4030 AvFILLp (swap_sv) -= 2;
4031
4032 goto removed;
4033 }
4034 }
4035
4036 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4037 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4038
4039 removed:
4040
4041 if (current == coro)
4042 SWAP_SVS_ENTER (current);
4043}
4044
3082 4045
3083MODULE = Coro::State PACKAGE = Coro 4046MODULE = Coro::State PACKAGE = Coro
3084 4047
3085BOOT: 4048BOOT:
3086{ 4049{
3087 int i; 4050 if (SVt_LAST > 32)
4051 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3088 4052
3089 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4053 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3090 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4054 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3091 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 4055 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3092 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3093 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4056 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3094 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4057 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3095 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4058 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3096 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4059 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
4060 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3097 4061
3098 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4062 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3099 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4063 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3100 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4064 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3101 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4065 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3102 4066
3103 coro_stash = gv_stashpv ("Coro", TRUE); 4067 coro_stash = gv_stashpv ("Coro", TRUE);
3104 4068
3105 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4069 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3106 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4070 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3107 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4071 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3108 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4072 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3109 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4073 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3110 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4074 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3111
3112 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3113 coro_ready[i] = newAV ();
3114 4075
3115 { 4076 {
3116 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4077 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3117 4078
3118 coroapi.schedule = api_schedule; 4079 coroapi.schedule = api_schedule;
… …
3122 coroapi.ready = api_ready; 4083 coroapi.ready = api_ready;
3123 coroapi.is_ready = api_is_ready; 4084 coroapi.is_ready = api_is_ready;
3124 coroapi.nready = coro_nready; 4085 coroapi.nready = coro_nready;
3125 coroapi.current = coro_current; 4086 coroapi.current = coro_current;
3126 4087
4088 coroapi.enterleave_hook = api_enterleave_hook;
4089 coroapi.enterleave_unhook = api_enterleave_unhook;
4090 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4091
3127 /*GCoroAPI = &coroapi;*/ 4092 /*GCoroAPI = &coroapi;*/
3128 sv_setiv (sv, (IV)&coroapi); 4093 sv_setiv (sv, (IV)&coroapi);
3129 SvREADONLY_on (sv); 4094 SvREADONLY_on (sv);
3130 } 4095 }
3131} 4096}
3132 4097
4098SV *
4099async (...)
4100 PROTOTYPE: &@
4101 CODE:
4102 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4103 api_ready (aTHX_ RETVAL);
4104 OUTPUT:
4105 RETVAL
4106
4107void
4108_destroy (Coro::State coro)
4109 CODE:
4110 /* used by the manager thread */
4111 coro_state_destroy (aTHX_ coro);
4112
4113void
4114on_destroy (Coro::State coro, SV *cb)
4115 CODE:
4116 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4117
4118void
4119join (...)
4120 CODE:
4121 CORO_EXECUTE_SLF_XS (slf_init_join);
4122
3133void 4123void
3134terminate (...) 4124terminate (...)
3135 CODE: 4125 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4126 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3137 4127
3138void 4128void
4129cancel (...)
4130 CODE:
4131 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4132
4133int
4134safe_cancel (Coro::State self, ...)
4135 C_ARGS: aTHX_ self, &ST (1), items - 1
4136
4137void
3139schedule (...) 4138schedule (...)
3140 CODE: 4139 CODE:
3141 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4140 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3142 4141
3143void 4142void
… …
3159cede_notself (...) 4158cede_notself (...)
3160 CODE: 4159 CODE:
3161 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4160 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3162 4161
3163void 4162void
3164_cancel (Coro::State self)
3165 CODE:
3166 coro_state_destroy (aTHX_ self);
3167 coro_call_on_destroy (aTHX_ self);
3168
3169void
3170_set_current (SV *current) 4163_set_current (SV *current)
3171 PROTOTYPE: $ 4164 PROTOTYPE: $
3172 CODE: 4165 CODE:
3173 SvREFCNT_dec (SvRV (coro_current)); 4166 SvREFCNT_dec_NN (SvRV (coro_current));
3174 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4167 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3175 4168
3176void 4169void
3177_set_readyhook (SV *hook) 4170_set_readyhook (SV *hook)
3178 PROTOTYPE: $ 4171 PROTOTYPE: $
3179 CODE: 4172 CODE:
3180 SvREFCNT_dec (coro_readyhook); 4173 SvREFCNT_dec (coro_readyhook);
4174 SvGETMAGIC (hook);
4175 if (SvOK (hook))
4176 {
3181 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4177 coro_readyhook = newSVsv (hook);
4178 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4179 }
4180 else
4181 {
4182 coro_readyhook = 0;
4183 CORO_READYHOOK = 0;
4184 }
3182 4185
3183int 4186int
3184prio (Coro::State coro, int newprio = 0) 4187prio (Coro::State coro, int newprio = 0)
3185 PROTOTYPE: $;$ 4188 PROTOTYPE: $;$
3186 ALIAS: 4189 ALIAS:
… …
3192 if (items > 1) 4195 if (items > 1)
3193 { 4196 {
3194 if (ix) 4197 if (ix)
3195 newprio = coro->prio - newprio; 4198 newprio = coro->prio - newprio;
3196 4199
3197 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4200 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3198 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4201 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3199 4202
3200 coro->prio = newprio; 4203 coro->prio = newprio;
3201 } 4204 }
3202} 4205}
3203 OUTPUT: 4206 OUTPUT:
… …
3218 RETVAL = coro_nready; 4221 RETVAL = coro_nready;
3219 OUTPUT: 4222 OUTPUT:
3220 RETVAL 4223 RETVAL
3221 4224
3222void 4225void
4226suspend (Coro::State self)
4227 PROTOTYPE: $
4228 CODE:
4229 self->flags |= CF_SUSPENDED;
4230
4231void
4232resume (Coro::State self)
4233 PROTOTYPE: $
4234 CODE:
4235 self->flags &= ~CF_SUSPENDED;
4236
4237void
3223_pool_handler (...) 4238_pool_handler (...)
3224 CODE: 4239 CODE:
3225 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4240 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3226 4241
3227void 4242void
… …
3238 for (i = 1; i < items; ++i) 4253 for (i = 1; i < items; ++i)
3239 av_push (av, SvREFCNT_inc_NN (ST (i))); 4254 av_push (av, SvREFCNT_inc_NN (ST (i)));
3240 4255
3241 if ((SV *)hv == &PL_sv_undef) 4256 if ((SV *)hv == &PL_sv_undef)
3242 { 4257 {
3243 PUSHMARK (SP); 4258 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3244 EXTEND (SP, 2);
3245 PUSHs (sv_Coro);
3246 PUSHs ((SV *)cv_pool_handler);
3247 PUTBACK;
3248 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3249 SPAGAIN;
3250
3251 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4259 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4260 SvREFCNT_dec_NN (sv);
3252 } 4261 }
3253 4262
3254 { 4263 {
3255 struct coro *coro = SvSTATE_hv (hv); 4264 struct coro *coro = SvSTATE_hv (hv);
3256 4265
… …
3263 api_ready (aTHX_ (SV *)hv); 4272 api_ready (aTHX_ (SV *)hv);
3264 4273
3265 if (GIMME_V != G_VOID) 4274 if (GIMME_V != G_VOID)
3266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4275 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3267 else 4276 else
3268 SvREFCNT_dec (hv); 4277 SvREFCNT_dec_NN (hv);
3269} 4278}
3270 4279
3271SV * 4280SV *
3272rouse_cb () 4281rouse_cb ()
3273 PROTOTYPE: 4282 PROTOTYPE:
… …
3280rouse_wait (...) 4289rouse_wait (...)
3281 PROTOTYPE: ;$ 4290 PROTOTYPE: ;$
3282 PPCODE: 4291 PPCODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4292 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3284 4293
4294void
4295on_enter (SV *block)
4296 ALIAS:
4297 on_leave = 1
4298 PROTOTYPE: &
4299 CODE:
4300{
4301 struct coro *coro = SvSTATE_current;
4302 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4303
4304 block = s_get_cv_croak (block);
4305
4306 if (!*avp)
4307 *avp = newAV ();
4308
4309 av_push (*avp, SvREFCNT_inc (block));
4310
4311 if (!ix)
4312 on_enterleave_call (aTHX_ block);
4313
4314 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4315 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4316 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4317}
4318
3285 4319
3286MODULE = Coro::State PACKAGE = PerlIO::cede 4320MODULE = Coro::State PACKAGE = PerlIO::cede
3287 4321
3288BOOT: 4322BOOT:
3289 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4323 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3292MODULE = Coro::State PACKAGE = Coro::Semaphore 4326MODULE = Coro::State PACKAGE = Coro::Semaphore
3293 4327
3294SV * 4328SV *
3295new (SV *klass, SV *count = 0) 4329new (SV *klass, SV *count = 0)
3296 CODE: 4330 CODE:
4331{
4332 int semcnt = 1;
4333
4334 if (count)
4335 {
4336 SvGETMAGIC (count);
4337
4338 if (SvOK (count))
4339 semcnt = SvIV (count);
4340 }
4341
3297 RETVAL = sv_bless ( 4342 RETVAL = sv_bless (
3298 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4343 coro_waitarray_new (aTHX_ semcnt),
3299 GvSTASH (CvGV (cv)) 4344 GvSTASH (CvGV (cv))
3300 ); 4345 );
4346}
3301 OUTPUT: 4347 OUTPUT:
3302 RETVAL 4348 RETVAL
3303 4349
3304# helper for Coro::Channel 4350# helper for Coro::Channel and others
3305SV * 4351SV *
3306_alloc (int count) 4352_alloc (int count)
3307 CODE: 4353 CODE:
3308 RETVAL = coro_waitarray_new (aTHX_ count); 4354 RETVAL = coro_waitarray_new (aTHX_ count);
3309 OUTPUT: 4355 OUTPUT:
… …
3315 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4361 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3316 OUTPUT: 4362 OUTPUT:
3317 RETVAL 4363 RETVAL
3318 4364
3319void 4365void
3320up (SV *self, int adjust = 1) 4366up (SV *self)
3321 ALIAS:
3322 adjust = 1
3323 CODE: 4367 CODE:
4368 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4369
4370void
4371adjust (SV *self, int adjust)
4372 CODE:
3324 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4373 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3325 4374
3326void 4375void
3327down (...) 4376down (...)
3328 CODE: 4377 CODE:
3329 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4378 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3351 XSRETURN_NO; 4400 XSRETURN_NO;
3352} 4401}
3353 4402
3354void 4403void
3355waiters (SV *self) 4404waiters (SV *self)
3356 PPCODE: 4405 PPCODE:
3357{ 4406{
3358 AV *av = (AV *)SvRV (self); 4407 AV *av = (AV *)SvRV (self);
3359 int wcount = AvFILLp (av) + 1 - 1; 4408 int wcount = AvFILLp (av) + 1 - 1;
3360 4409
3361 if (GIMME_V == G_SCALAR) 4410 if (GIMME_V == G_SCALAR)
… …
3367 for (i = 1; i <= wcount; ++i) 4416 for (i = 1; i <= wcount; ++i)
3368 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4417 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3369 } 4418 }
3370} 4419}
3371 4420
4421MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4422
4423void
4424_may_delete (SV *sem, int count, unsigned int extra_refs)
4425 PPCODE:
4426{
4427 AV *av = (AV *)SvRV (sem);
4428
4429 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4430 && AvFILLp (av) == 0 /* no waiters, just count */
4431 && SvIV (AvARRAY (av)[0]) == count)
4432 XSRETURN_YES;
4433
4434 XSRETURN_NO;
4435}
4436
3372MODULE = Coro::State PACKAGE = Coro::Signal 4437MODULE = Coro::State PACKAGE = Coro::Signal
3373 4438
3374SV * 4439SV *
3375new (SV *klass) 4440new (SV *klass)
3376 CODE: 4441 CODE:
… …
3388 4453
3389void 4454void
3390broadcast (SV *self) 4455broadcast (SV *self)
3391 CODE: 4456 CODE:
3392{ 4457{
3393 AV *av = (AV *)SvRV (self); 4458 AV *av = (AV *)SvRV (self);
3394 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4459 coro_signal_wake (aTHX_ av, AvFILLp (av));
3395} 4460}
3396 4461
3397void 4462void
3398send (SV *self) 4463send (SV *self)
… …
3406 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4471 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3407} 4472}
3408 4473
3409IV 4474IV
3410awaited (SV *self) 4475awaited (SV *self)
3411 CODE: 4476 CODE:
3412 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4477 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3413 OUTPUT: 4478 OUTPUT:
3414 RETVAL 4479 RETVAL
3415 4480
3416 4481
… …
3421 4486
3422void 4487void
3423_schedule (...) 4488_schedule (...)
3424 CODE: 4489 CODE:
3425{ 4490{
3426 static int incede; 4491 static int incede;
3427 4492
3428 api_cede_notself (aTHX); 4493 api_cede_notself (aTHX);
3429 4494
3430 ++incede; 4495 ++incede;
3431 while (coro_nready >= incede && api_cede (aTHX)) 4496 while (coro_nready >= incede && api_cede (aTHX))
… …
3447 4512
3448void 4513void
3449_register (char *target, char *proto, SV *req) 4514_register (char *target, char *proto, SV *req)
3450 CODE: 4515 CODE:
3451{ 4516{
3452 CV *req_cv = coro_sv_2cv (aTHX_ req); 4517 SV *req_cv = s_get_cv_croak (req);
3453 /* newXSproto doesn't return the CV on 5.8 */ 4518 /* newXSproto doesn't return the CV on 5.8 */
3454 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4519 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3455 sv_setpv ((SV *)slf_cv, proto); 4520 sv_setpv ((SV *)slf_cv, proto);
3456 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4521 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3457} 4522}
3458 4523
4524MODULE = Coro::State PACKAGE = Coro::Select
4525
4526void
4527patch_pp_sselect ()
4528 CODE:
4529 if (!coro_old_pp_sselect)
4530 {
4531 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4532 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4533 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4534 }
4535
4536void
4537unpatch_pp_sselect ()
4538 CODE:
4539 if (coro_old_pp_sselect)
4540 {
4541 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4542 coro_old_pp_sselect = 0;
4543 }
4544
4545MODULE = Coro::State PACKAGE = Coro::Util
4546
4547void
4548_exit (int code)
4549 CODE:
4550 _exit (code);
4551
4552NV
4553time ()
4554 CODE:
4555 RETVAL = nvtime (aTHX);
4556 OUTPUT:
4557 RETVAL
4558
4559NV
4560gettimeofday ()
4561 PPCODE:
4562{
4563 UV tv [2];
4564 u2time (aTHX_ tv);
4565 EXTEND (SP, 2);
4566 PUSHs (sv_2mortal (newSVuv (tv [0])));
4567 PUSHs (sv_2mortal (newSVuv (tv [1])));
4568}
4569

Diff Legend

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