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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.322 by root, Sat Nov 22 05:13:34 2008 UTC vs.
Revision 1.467 by root, Sun Jun 26 21:46:03 2016 UTC

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

Diff Legend

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