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.353 by root, Mon Jun 22 11:25:53 2009 UTC vs.
Revision 1.466 by root, Sat Jun 25 19:22:33 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
… …
135# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
136#endif 98#endif
137 99
138#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
139 101
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 102#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
157 104
158#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
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 */
… …
181 146
182static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
183static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
184static SV *rv_diehook; 149static SV *rv_diehook;
185static SV *rv_warnhook; 150static SV *rv_warnhook;
186static HV *hv_sig; /* %SIG */
187 151
188/* async_pool helper stuff */ 152/* async_pool helper stuff */
189static SV *sv_pool_rss; 153static SV *sv_pool_rss;
190static SV *sv_pool_size; 154static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 156static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 157static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 158static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 159
197/* Coro::AnyEvent */ 160/* Coro::AnyEvent */
198static SV *sv_activity; 161static SV *sv_activity;
199 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
200static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
202 171
203enum { 172enum
173{
204 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 183typedef struct coro_cctx
214{ 184{
215 struct coro_cctx *next; 185 struct coro_cctx *next;
216 186
217 /* the stack */ 187 /* the stack */
218 void *sptr; 188 struct coro_stack stack;
219 size_t ssize;
220 189
221 /* cpu state */ 190 /* cpu state */
222 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
223 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
224 JMPENV *top_env; 195 JMPENV *top_env;
225 coro_context cctx; 196 coro_context cctx;
226 197
227 U32 gen; 198 U32 gen;
228#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
229 int valgrind_id; 200 int valgrind_id;
230#endif 201#endif
231 unsigned char flags; 202 unsigned char flags;
232} coro_cctx; 203} coro_cctx;
233 204
234coro_cctx *cctx_current; /* the currently running cctx */ 205static coro_cctx *cctx_current; /* the currently running cctx */
235 206
236/*****************************************************************************/ 207/*****************************************************************************/
237 208
209static MGVTBL coro_state_vtbl;
210
238enum { 211enum
212{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 217 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 219};
245 220
246/* 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 */
247typedef struct 222typedef struct
248{ 223{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
255# include "state.h" 225 #include "state.h"
256#undef VAR
257} perl_slots; 226} perl_slots;
258 227
228/* how many context stack entries do we need for perl_slots */
259#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 230
261/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
262struct coro { 232struct coro
233{
263 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 235 coro_cctx *cctx;
265 236
266 /* ready queue */ 237 /* ready queue */
267 struct coro *next_ready; 238 struct coro *next_ready;
… …
269 /* state data */ 240 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 242 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
273 244
274 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 249
281 /* statistics */ 250 /* statistics */
282 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
283 252
284 /* coro process data */ 253 /* coro process data */
285 int prio; 254 int prio;
286 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
287 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 */
288 259
289 /* async_pool */ 260 /* async_pool */
290 SV *saved_deffh; 261 SV *saved_deffh;
291 SV *invoke_cb; 262 SV *invoke_cb;
292 AV *invoke_av; 263 AV *invoke_av;
293 264
294 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
295 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
296 AV *on_leave; 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;
297 274
298 /* linked list */ 275 /* linked list */
299 struct coro *next, *prev; 276 struct coro *next, *prev;
300}; 277};
301 278
302typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
304 281
305/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
309 286
310/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
311 288
312#define PRIO_MAX 3 289#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 290#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 291#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 292#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 293#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 294#define CORO_PRIO_MIN -4
318 295
319/* for Coro.pm */ 296/* for Coro.pm */
320static SV *coro_current; 297static SV *coro_current;
321static SV *coro_readyhook; 298static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
324static struct coro *coro_first; 301static struct coro *coro_first;
325#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
326 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
327/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
328 400
329static SV * 401static SV * ecb_noinline
330coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
331{ 403{
332#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_sv (name, create); 406 get_sv (name, create);
335#endif 407#endif
336 return get_sv (name, create); 408 return get_sv (name, create);
337} 409}
338 410
339static AV * 411static AV * ecb_noinline
340coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
341{ 413{
342#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
343 /* 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 */
344 get_av (name, create); 416 get_av (name, create);
345#endif 417#endif
346 return get_av (name, create); 418 return get_av (name, create);
347} 419}
348 420
349static HV * 421static HV * ecb_noinline
350coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
351{ 423{
352#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_hv (name, create); 426 get_hv (name, create);
355#endif 427#endif
356 return get_hv (name, create); 428 return get_hv (name, create);
357} 429}
358 430
359/* may croak */ 431ecb_inline void
360INLINE CV * 432coro_times_update (void)
361coro_sv_2cv (pTHX_ SV *sv)
362{ 433{
363 HV *st; 434#ifdef coro_clock_gettime
364 GV *gvp; 435 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 436
367 if (!cv) 437 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 438 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
439 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 440
370 return cv; 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];
371} 476}
372 477
373/*****************************************************************************/ 478/*****************************************************************************/
374/* magic glue */ 479/* magic glue */
375 480
376#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
378 483
379#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
382 : mg_find (sv, type)) 487 : mg_find (sv, type))
383 488
384#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
387 : 0) 492 : 0)
388 493
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 494#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391 496
392INLINE struct coro * 497ecb_inline MAGIC *
393SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
394{ 499{
395 HV *stash;
396 MAGIC *mg; 500 MAGIC *mg;
397 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
398 if (SvROK (coro)) 517 if (SvROK (coro_sv))
399 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
400 519
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
402 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
403 523
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
414} 525}
415 526
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 528
… …
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421 532
422/*****************************************************************************/ 533/*****************************************************************************/
423/* padlist management and caching */ 534/* padlist management and caching */
424 535
425static AV * 536ecb_inline PADLIST *
426coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
427{ 538{
428 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
429 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
430 544
431 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. */
432 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
433#if PERL_VERSION_ATLEAST (5,10,0)
434 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
435#else
436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
437#endif 574#endif
438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
439 --AvFILLp (padlist);
440 575
441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
442 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;
443 584
444 return newpadlist; 585 return newpadlist;
445} 586}
446 587
447static void 588ecb_inline void
448free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
449{ 590{
450 /* may be during global destruction */ 591 /* may be during global destruction */
451 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
452 { 593 {
453 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
454 595
455 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
456 { 597 {
457 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
458 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
459 I32 j = AvFILLp (av);
460 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
461 while (j >= 0) 605 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
463 607
464 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
465 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
466 } 611 }
467 612
468 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
469 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
470 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
471 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
472 } 623 }
473} 624}
474 625
475static int 626static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 628{
478 AV *padlist; 629 PADLIST *padlist;
479 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;
480 632
481 /* casting is fun. */ 633 /* perl manages to free our internal AV and _then_ call us */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 634 if (IN_DESTRUCT)
635 return 0;
636
637 while (len--)
483 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
484
485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
486 639
487 return 0; 640 return 0;
488} 641}
489 642
490static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
491 0, 0, 0, 0, 644 0, 0, 0, 0,
492 coro_cv_free 645 coro_cv_free
493}; 646};
494 647
495/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
496static void 649ecb_inline void
497get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
498{ 651{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 653 size_t *lenp;
501 654
502 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
503 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
504 else 657 else
505 { 658 {
506#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
507 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
508 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
515#endif 668#endif
516 } 669 }
517} 670}
518 671
519static void 672ecb_inline void
520put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
521{ 674{
522 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
523 AV *av;
524 676
525 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
526 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);
527 687
528 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
529
530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
531 av_extend (av, AvFILLp (av) + 1);
532
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 689}
535 690
536/** 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))
537 761
538static void 762static void
539on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
540 764
541static void 765static void
… …
544 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
545 c->slot = 0; 769 c->slot = 0;
546 770
547 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
548 772
549 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
550 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
551 GvSV (PL_errgv) = slot->errsv; 775#else
552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
554
555 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
556 # include "state.h" 777 #include "state.h"
557 #undef VAR 778#endif
558 779
559 { 780 {
560 dSP; 781 dSP;
561 782
562 CV *cv; 783 CV *cv;
563 784
564 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
565 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
566 { 787 {
567 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
568 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
569 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
570 } 791 }
571 792
572 PUTBACK; 793 PUTBACK;
573 } 794 }
574 795
575 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 797 CORO_THROW = c->except;
577 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
578 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
579 { 808 {
580 int i; 809 int i;
581 810
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 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);
585} 824}
586 825
587static void 826static void
588save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
589{ 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
590 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
591 { 840 {
592 int i; 841 int i;
593 842
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[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);
596 } 853 }
597 854
598 c->except = CORO_THROW; 855 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 856 c->slf_frame = slf_frame;
600 857
… …
611 868
612 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
613 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
614 for (;;) 871 for (;;)
615 { 872 {
616 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
617 { 874 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
619 876
620 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))
621 { 878 {
622 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
623 880
624 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
625 { 882 {
626 EXTEND (SP, 3); 883 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
… …
632 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
633 } 890 }
634 } 891 }
635 } 892 }
636 893
637 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
638 break; 895 break;
639 896
640 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
641 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
642 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
644 901
645 PUTBACK; 902 PUTBACK;
646 } 903 }
647 904
648 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 907 {
654 int i; 908 unsigned int i;
909
655 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 911 CXINC;
657 } 912
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
659 915
660 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
661 917
662 { 918 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
664 920
665 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
666 slot->defsv = DEFSV; 922 save_perl_slots (slot);
667 slot->errsv = ERRSV; 923#else
668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
670
671 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
672 # include "state.h" 925 #include "state.h"
673 #undef VAR 926#endif
674 } 927 }
675} 928}
676 929
677/* 930/*
678 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
684# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
685#else 938#else
686static void 939static void
687coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
688{ 941{
689 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() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 946
694 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
709#endif 962#endif
710 963
711 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
712 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
713 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
714 970
715 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
716 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
717 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
718 979
719#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
720 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
721 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
722 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
746 } 1007 }
747 1008
748 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
749 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
750 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
751 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
752#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
753 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
754#endif 1018#endif
755} 1019}
… …
785 } 1049 }
786 1050
787 return rss; 1051 return rss;
788} 1052}
789 1053
790/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
791
792static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
793static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
794static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
795 1055
796/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
797#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
798#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
799 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
800 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
801#endif 1061#endif
802 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
803/* 1091/*
804 * This overrides the default magic get method of %SIG elements. 1092 * This overrides the default magic get method of %SIG elements.
805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1093 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
806 * and instead of trying to save and restore the hash elements, we just provide 1094 * and instead of trying to save and restore the hash elements (extremely slow),
807 * readback here. 1095 * we just provide our own readback here.
808 */ 1096 */
809static int 1097static int ecb_cold
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 1099{
812 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;
813 1103
814 if (*s == '_') 1104 SV *ssv;
815 {
816 SV **svp = 0;
817 1105
818 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
819 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
820
821 if (svp) 1106 if (!*svp)
822 { 1107 ssv = &PL_sv_undef;
823 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
824 return 0; 1109 ssv = sv_2mortal (newRV_inc (*svp));
825 } 1110 else
826 } 1111 ssv = *svp;
827 1112
828 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1113 sv_setsv (sv, ssv);
1114 return 0;
829} 1115}
830 1116
831static int 1117static int ecb_cold
832coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
833{ 1119{
834 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;
835 1123
836 if (*s == '_')
837 {
838 SV **svp = 0;
839
840 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
841 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
842
843 if (svp)
844 {
845 SV *old = *svp; 1124 SV *old = *svp;
846 *svp = 0; 1125 *svp = 0;
847 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
848 return 0; 1127 return 0;
849 }
850 }
851
852 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
853} 1128}
854 1129
855static int 1130static int ecb_cold
856coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
857{ 1132{
858 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;
859 1136
860 if (*s == '_')
861 {
862 SV **svp = 0;
863
864 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
866
867 if (svp)
868 {
869 SV *old = *svp; 1137 SV *old = *svp;
870 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
871 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
872 return 0; 1140 return 0;
873 }
874 }
875
876 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
877} 1141}
878 1142
879static void 1143static void
880prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
881{ 1145{
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1158{
895 return 1; 1159 return 1;
896} 1160}
897 1161
898static UNOP coro_setup_op; 1162/** coroutine stack handling ************************************************/
899 1163
900static 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 */
901coro_setup (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
902{ 1168{
903 /* 1169 /*
904 * emulate part of the perl startup here. 1170 * emulate part of the perl startup here.
905 */ 1171 */
906 coro_init_stacks (aTHX); 1172 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1179 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1180 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1181 PL_curpm = 0;
916 PL_curpad = 0; 1182 PL_curpad = 0;
917 PL_localizing = 0; 1183 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1184 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1185#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1186 PL_parser = 0;
922#endif 1187#endif
923 PL_hints = 0; 1188 PL_hints = 0;
924 1189
925 /* recreate the die/warn hooks */ 1190 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1191 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1192 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1193
929 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
932 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);
933 GvHV (PL_hintgv) = 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
934 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
936 1204
937 { 1205 {
938 dSP; 1206 dSP;
… …
953 /* 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
954 * 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.
955 */ 1223 */
956 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 */
957 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;
958 1227
959 /* 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 */
960 coro_setup_op.op_next = PL_op; 1229 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1230 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1231 init_perl_op.op_ppaddr = pp_slf;
963 /* 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 */
964 1233
965 PL_op = (OP *)&coro_setup_op; 1234 PL_op = (OP *)&init_perl_op;
966 1235
967 /* copy throw, in case it was set before coro_setup */ 1236 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
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 }
969} 1246}
970 1247
971static void 1248static void
972coro_unwind_stacks (pTHX) 1249coro_unwind_stacks (pTHX)
973{ 1250{
… …
988 dounwind (-1); 1265 dounwind (-1);
989 } 1266 }
990} 1267}
991 1268
992static void 1269static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1270destroy_perl (pTHX_ struct coro *coro)
994{ 1271{
995 SV *svf [9]; 1272 SV *svf [9];
996 1273
997 { 1274 {
1275 SV *old_current = SvRV (coro_current);
998 struct coro *current = SvSTATE_current; 1276 struct coro *current = SvSTATE (old_current);
999 1277
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1278 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001 1279
1002 save_perl (aTHX_ current); 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
1003 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1004 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1005 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1291
1006 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1007 1293
1008 // now save some sv's to be free'd later 1294 /* now save some sv's to be free'd later */
1009 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1296 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv); 1297 svf [2] = GvSV (PL_errgv);
1012 svf [3] = (SV *)PL_defoutgv; 1298 svf [3] = (SV *)PL_defoutgv;
1013 svf [4] = PL_rs; 1299 svf [4] = PL_rs;
… …
1015 svf [6] = (SV *)GvHV (PL_hintgv); 1301 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook; 1302 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook; 1303 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf)); 1304 assert (9 == sizeof (svf) / sizeof (*svf));
1019 1305
1306 SvRV_set (coro_current, old_current);
1307
1020 load_perl (aTHX_ current); 1308 load_perl (aTHX_ current);
1021 } 1309 }
1022 1310
1023 { 1311 {
1024 int i; 1312 unsigned int i;
1025 1313
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1314 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1315 SvREFCNT_dec (svf [i]);
1028 1316
1029 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1030 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1031 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1032 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1033 } 1323 }
1034} 1324}
1035 1325
1036INLINE void 1326ecb_inline void
1037free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1038{ 1328{
1039 if (expect_true (coro_mortal)) 1329 if (ecb_expect_true (coro_mortal))
1040 { 1330 {
1041 SvREFCNT_dec (coro_mortal); 1331 SvREFCNT_dec ((SV *)coro_mortal);
1042 coro_mortal = 0; 1332 coro_mortal = 0;
1043 } 1333 }
1044} 1334}
1045 1335
1046static int 1336static int
… …
1100 1390
1101 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1102 { 1392 {
1103 SV **cb; 1393 SV **cb;
1104 1394
1105 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1106 { 1396 {
1107 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1108 1398
1109 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1110 { 1400 {
… …
1179 1469
1180 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 */
1181} 1471}
1182 1472
1183/* 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 */
1184static void NOINLINE 1474static void ecb_noinline
1185cctx_prepare (pTHX) 1475cctx_prepare (pTHX)
1186{ 1476{
1187 PL_top_env = &PL_start_env; 1477 PL_top_env = &PL_start_env;
1188 1478
1189 if (cctx_current->flags & CC_TRACE) 1479 if (cctx_current->flags & CC_TRACE)
… …
1200 slf_frame.prepare = slf_prepare_set_stacklevel; 1490 slf_frame.prepare = slf_prepare_set_stacklevel;
1201 slf_frame.check = slf_check_set_stacklevel; 1491 slf_frame.check = slf_check_set_stacklevel;
1202} 1492}
1203 1493
1204/* 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 */
1205INLINE void 1495ecb_inline void
1206transfer_tail (pTHX) 1496transfer_tail (pTHX)
1207{ 1497{
1208 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);
1209} 1511}
1210 1512
1211/* 1513/*
1212 * this is a _very_ stripped down perl interpreter ;) 1514 * this is a _very_ stripped down perl interpreter ;)
1213 */ 1515 */
… …
1235 /* 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 */
1236 PL_restartop = PL_op; 1538 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1539 perl_run (PL_curinterp);
1238 /* 1540 /*
1239 * 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
1240 * 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.
1241 */ 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;
1242 1552
1243 /* 1553 /*
1244 * 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
1245 * 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)
1246 * 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
1247 * bootstrap-time "top" top_env, as we cannot restore the "main" 1557 * doing in that case. YMMV.
1248 * coroutine as Coro has no such concept.
1249 * This actually isn't valid with the pthread backend, but OSes requiring
1250 * that backend are too broken to do it in a standards-compliant way.
1251 */ 1558 */
1252 PL_top_env = main_top_env; 1559 perlish_exit (aTHX);
1253 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1254 } 1560 }
1255} 1561}
1256 1562
1257static coro_cctx * 1563static coro_cctx *
1258cctx_new () 1564cctx_new (void)
1259{ 1565{
1260 coro_cctx *cctx; 1566 coro_cctx *cctx;
1261 1567
1262 ++cctx_count; 1568 ++cctx_count;
1263 New (0, cctx, 1, coro_cctx); 1569 New (0, cctx, 1, coro_cctx);
… …
1269 return cctx; 1575 return cctx;
1270} 1576}
1271 1577
1272/* create a new cctx only suitable as source */ 1578/* create a new cctx only suitable as source */
1273static coro_cctx * 1579static coro_cctx *
1274cctx_new_empty () 1580cctx_new_empty (void)
1275{ 1581{
1276 coro_cctx *cctx = cctx_new (); 1582 coro_cctx *cctx = cctx_new ();
1277 1583
1278 cctx->sptr = 0; 1584 cctx->stack.sptr = 0;
1279 coro_create (&cctx->cctx, 0, 0, 0, 0); 1585 coro_create (&cctx->cctx, 0, 0, 0, 0);
1280 1586
1281 return cctx; 1587 return cctx;
1282} 1588}
1283 1589
1284/* create a new cctx suitable as destination/running a perl interpreter */ 1590/* create a new cctx suitable as destination/running a perl interpreter */
1285static coro_cctx * 1591static coro_cctx *
1286cctx_new_run () 1592cctx_new_run (void)
1287{ 1593{
1288 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1289 void *stack_start;
1290 size_t stack_size;
1291 1595
1292#if HAVE_MMAP 1596 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1293 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1294 /* mmap supposedly does allocate-on-write for us */
1295 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1296
1297 if (cctx->sptr != (void *)-1)
1298 {
1299 #if CORO_STACKGUARD
1300 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1301 #endif
1302 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1303 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1304 cctx->flags |= CC_MAPPED;
1305 } 1597 {
1306 else
1307#endif
1308 {
1309 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1310 New (0, cctx->sptr, cctx_stacksize, long);
1311
1312 if (!cctx->sptr)
1313 {
1314 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1598 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1315 _exit (EXIT_FAILURE); 1599 _exit (EXIT_FAILURE);
1316 }
1317
1318 stack_start = cctx->sptr;
1319 stack_size = cctx->ssize;
1320 } 1600 }
1321 1601
1322 #if CORO_USE_VALGRIND
1323 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1324 #endif
1325
1326 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);
1327 1603
1328 return cctx; 1604 return cctx;
1329} 1605}
1330 1606
1331static void 1607static void
1332cctx_destroy (coro_cctx *cctx) 1608cctx_destroy (coro_cctx *cctx)
1333{ 1609{
1334 if (!cctx) 1610 if (!cctx)
1335 return; 1611 return;
1336 1612
1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1613 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1338 1614
1339 --cctx_count; 1615 --cctx_count;
1340 coro_destroy (&cctx->cctx); 1616 coro_destroy (&cctx->cctx);
1341 1617
1342 /* coro_transfer creates new, empty cctx's */ 1618 coro_stack_free (&cctx->stack);
1343 if (cctx->sptr)
1344 {
1345 #if CORO_USE_VALGRIND
1346 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1347 #endif
1348
1349#if HAVE_MMAP
1350 if (cctx->flags & CC_MAPPED)
1351 munmap (cctx->sptr, cctx->ssize);
1352 else
1353#endif
1354 Safefree (cctx->sptr);
1355 }
1356 1619
1357 Safefree (cctx); 1620 Safefree (cctx);
1358} 1621}
1359 1622
1360/* wether this cctx should be destructed */ 1623/* wether this cctx should be destructed */
1361#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))
1362 1625
1363static coro_cctx * 1626static coro_cctx *
1364cctx_get (pTHX) 1627cctx_get (pTHX)
1365{ 1628{
1366 while (expect_true (cctx_first)) 1629 while (ecb_expect_true (cctx_first))
1367 { 1630 {
1368 coro_cctx *cctx = cctx_first; 1631 coro_cctx *cctx = cctx_first;
1369 cctx_first = cctx->next; 1632 cctx_first = cctx->next;
1370 --cctx_idle; 1633 --cctx_idle;
1371 1634
1372 if (expect_true (!CCTX_EXPIRED (cctx))) 1635 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1373 return cctx; 1636 return cctx;
1374 1637
1375 cctx_destroy (cctx); 1638 cctx_destroy (cctx);
1376 } 1639 }
1377 1640
… …
1379} 1642}
1380 1643
1381static void 1644static void
1382cctx_put (coro_cctx *cctx) 1645cctx_put (coro_cctx *cctx)
1383{ 1646{
1384 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));
1385 1648
1386 /* free another cctx if overlimit */ 1649 /* free another cctx if overlimit */
1387 if (expect_false (cctx_idle >= cctx_max_idle)) 1650 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1388 { 1651 {
1389 coro_cctx *first = cctx_first; 1652 coro_cctx *first = cctx_first;
1390 cctx_first = first->next; 1653 cctx_first = first->next;
1391 --cctx_idle; 1654 --cctx_idle;
1392 1655
… …
1403static void 1666static void
1404transfer_check (pTHX_ struct coro *prev, struct coro *next) 1667transfer_check (pTHX_ struct coro *prev, struct coro *next)
1405{ 1668{
1406 /* TODO: throwing up here is considered harmful */ 1669 /* TODO: throwing up here is considered harmful */
1407 1670
1408 if (expect_true (prev != next)) 1671 if (ecb_expect_true (prev != next))
1409 { 1672 {
1410 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1673 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1411 croak ("Coro::State::transfer called with a blocked 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,");
1412 1675
1413 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1676 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1414 croak ("Coro::State::transfer called with running, destroyed or suspended 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,");
1415 1678
1416#if !PERL_VERSION_ATLEAST (5,10,0) 1679#if !PERL_VERSION_ATLEAST (5,10,0)
1417 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1680 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1418 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,");
1419#endif 1682#endif
1420 } 1683 }
1421} 1684}
1422 1685
1423/* always use the TRANSFER macro */ 1686/* always use the TRANSFER macro */
1424static void NOINLINE /* noinline so we have a fixed stackframe */ 1687static void ecb_noinline /* noinline so we have a fixed stackframe */
1425transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1688transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1426{ 1689{
1427 dSTACKLEVEL; 1690 dSTACKLEVEL;
1428 1691
1429 /* sometimes transfer is only called to set idle_sp */ 1692 /* sometimes transfer is only called to set idle_sp */
1430 if (expect_false (!prev)) 1693 if (ecb_expect_false (!prev))
1431 { 1694 {
1432 cctx_current->idle_sp = STACKLEVEL; 1695 cctx_current->idle_sp = STACKLEVEL;
1433 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 */
1434 } 1697 }
1435 else if (expect_true (prev != next)) 1698 else if (ecb_expect_true (prev != next))
1436 { 1699 {
1437 coro_cctx *cctx_prev; 1700 coro_cctx *cctx_prev;
1438 1701
1439 if (expect_false (prev->flags & CF_NEW)) 1702 if (ecb_expect_false (prev->flags & CF_NEW))
1440 { 1703 {
1441 /* create a new empty/source context */ 1704 /* create a new empty/source context */
1442 prev->flags &= ~CF_NEW; 1705 prev->flags &= ~CF_NEW;
1443 prev->flags |= CF_RUNNING; 1706 prev->flags |= CF_RUNNING;
1444 } 1707 }
… …
1447 next->flags |= CF_RUNNING; 1710 next->flags |= CF_RUNNING;
1448 1711
1449 /* first get rid of the old state */ 1712 /* first get rid of the old state */
1450 save_perl (aTHX_ prev); 1713 save_perl (aTHX_ prev);
1451 1714
1452 if (expect_false (next->flags & CF_NEW)) 1715 if (ecb_expect_false (next->flags & CF_NEW))
1453 { 1716 {
1454 /* need to start coroutine */ 1717 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1718 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1719 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1720 init_perl (aTHX_ next);
1458 } 1721 }
1459 else 1722 else
1460 load_perl (aTHX_ next); 1723 load_perl (aTHX_ next);
1461 1724
1462 /* possibly untie and reuse the cctx */ 1725 /* possibly untie and reuse the cctx */
1463 if (expect_true ( 1726 if (ecb_expect_true (
1464 cctx_current->idle_sp == STACKLEVEL 1727 cctx_current->idle_sp == STACKLEVEL
1465 && !(cctx_current->flags & CC_TRACE) 1728 && !(cctx_current->flags & CC_TRACE)
1466 && !force_cctx 1729 && !force_cctx
1467 )) 1730 ))
1468 { 1731 {
1469 /* 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 */
1470 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));
1471 1734
1472 /* 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. */
1473 /* without this the next cctx_get might destroy the running cctx while still in use */ 1736 /* without this the next cctx_get might destroy the running cctx while still in use */
1474 if (expect_false (CCTX_EXPIRED (cctx_current))) 1737 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1475 if (expect_true (!next->cctx)) 1738 if (ecb_expect_true (!next->cctx))
1476 next->cctx = cctx_get (aTHX); 1739 next->cctx = cctx_get (aTHX);
1477 1740
1478 cctx_put (cctx_current); 1741 cctx_put (cctx_current);
1479 } 1742 }
1480 else 1743 else
1481 prev->cctx = cctx_current; 1744 prev->cctx = cctx_current;
1482 1745
1483 ++next->usecount; 1746 ++next->usecount;
1484 1747
1485 cctx_prev = cctx_current; 1748 cctx_prev = cctx_current;
1486 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1749 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1487 1750
1488 next->cctx = 0; 1751 next->cctx = 0;
1489 1752
1490 if (expect_false (cctx_prev != cctx_current)) 1753 if (ecb_expect_false (cctx_prev != cctx_current))
1491 { 1754 {
1492 cctx_prev->top_env = PL_top_env; 1755 cctx_prev->top_env = PL_top_env;
1493 PL_top_env = cctx_current->top_env; 1756 PL_top_env = cctx_current->top_env;
1494 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1757 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1495 } 1758 }
… …
1501#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))
1502#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1765#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1503 1766
1504/** high level stuff ********************************************************/ 1767/** high level stuff ********************************************************/
1505 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 */
1506static int 1771static void
1772coro_call_on_destroy (pTHX_ struct coro *coro);
1773
1774static void
1507coro_state_destroy (pTHX_ struct coro *coro) 1775coro_state_destroy (pTHX_ struct coro *coro)
1508{ 1776{
1509 if (coro->flags & CF_DESTROYED) 1777 if (coro->flags & CF_ZOMBIE)
1510 return 0; 1778 return;
1511 1779
1512 if (coro->on_destroy && !PL_dirty)
1513 coro->on_destroy (aTHX_ coro); 1780 slf_destroy (aTHX_ coro);
1514 1781
1515 coro->flags |= CF_DESTROYED; 1782 coro->flags |= CF_ZOMBIE;
1516 1783
1517 if (coro->flags & CF_READY) 1784 if (coro->flags & CF_READY)
1518 { 1785 {
1519 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1786 /* reduce nready, as destroying a ready coro effectively unreadies it */
1520 /* alternative: look through all ready queues and remove the coro */ 1787 /* alternative: look through all ready queues and remove the coro */
1521 --coro_nready; 1788 --coro_nready;
1522 } 1789 }
1523 else 1790 else
1524 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 */
1792
1793 if (coro->next) coro->next->prev = coro->prev;
1794 if (coro->prev) coro->prev->next = coro->next;
1795 if (coro == coro_first) coro_first = coro->next;
1525 1796
1526 if (coro->mainstack 1797 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1798 && coro->mainstack != main_mainstack
1528 && coro->slot 1799 && coro->slot
1529 && !PL_dirty) 1800 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1801 destroy_perl (aTHX_ coro);
1531 1802
1532 cctx_destroy (coro->cctx); 1803 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1804 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1805 SvREFCNT_dec (coro->args);
1806 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1807 SvREFCNT_dec (CORO_THROW);
1536 1808
1537 if (coro->next) coro->next->prev = coro->prev; 1809 coro_call_on_destroy (aTHX_ coro);
1538 if (coro->prev) coro->prev->next = coro->next;
1539 if (coro == coro_first) coro_first = coro->next;
1540 1810
1541 return 1; 1811 /* more destruction mayhem in coro_state_free */
1542} 1812}
1543 1813
1544static int 1814static int
1545coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1815coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1546{ 1816{
1547 struct coro *coro = (struct coro *)mg->mg_ptr; 1817 struct coro *coro = (struct coro *)mg->mg_ptr;
1548 mg->mg_ptr = 0; 1818 mg->mg_ptr = 0;
1549 1819
1550 coro->hv = 0;
1551
1552 if (--coro->refcnt < 0)
1553 {
1554 coro_state_destroy (aTHX_ coro); 1820 coro_state_destroy (aTHX_ coro);
1821 SvREFCNT_dec (coro->on_destroy);
1822 SvREFCNT_dec (coro->status);
1823
1555 Safefree (coro); 1824 Safefree (coro);
1556 }
1557 1825
1558 return 0; 1826 return 0;
1559} 1827}
1560 1828
1561static int 1829static int ecb_cold
1562coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1830coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1563{ 1831{
1564 struct coro *coro = (struct coro *)mg->mg_ptr; 1832 /* called when perl clones the current process the slow way (windows process emulation) */
1565 1833 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1566 ++coro->refcnt; 1834 mg->mg_ptr = 0;
1835 mg->mg_virtual = 0;
1567 1836
1568 return 0; 1837 return 0;
1569} 1838}
1570 1839
1571static MGVTBL coro_state_vtbl = { 1840static MGVTBL coro_state_vtbl = {
… …
1594 1863
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1864 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1865 TRANSFER (ta, 1);
1597} 1866}
1598 1867
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1868/** Coro ********************************************************************/
1623 1869
1624INLINE void 1870ecb_inline void
1625coro_enq (pTHX_ struct coro *coro) 1871coro_enq (pTHX_ struct coro *coro)
1626{ 1872{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1873 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1874
1629 SvREFCNT_inc_NN (coro->hv); 1875 SvREFCNT_inc_NN (coro->hv);
1630 1876
1631 coro->next_ready = 0; 1877 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1878 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro; 1879 ready [1] = coro;
1634} 1880}
1635 1881
1636INLINE struct coro * 1882ecb_inline struct coro *
1637coro_deq (pTHX) 1883coro_deq (pTHX)
1638{ 1884{
1639 int prio; 1885 int prio;
1640 1886
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1887 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1888 {
1643 struct coro **ready = coro_ready [prio]; 1889 struct coro **ready = coro_ready [prio];
1644 1890
1645 if (ready [0]) 1891 if (ready [0])
1646 { 1892 {
… …
1651 } 1897 }
1652 1898
1653 return 0; 1899 return 0;
1654} 1900}
1655 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;
1917}
1918
1656static int 1919static int
1657api_ready (pTHX_ SV *coro_sv) 1920api_ready (pTHX_ SV *coro_sv)
1658{ 1921{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1922 struct coro *coro = SvSTATE (coro_sv);
1664 1923
1665 if (coro->flags & CF_READY) 1924 if (coro->flags & CF_READY)
1666 return 0; 1925 return 0;
1667 1926
1668 coro->flags |= CF_READY; 1927 coro->flags |= CF_READY;
1669 1928
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1929 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1930
1676 if (sv_hook) 1931 if (!coro_nready++)
1677 { 1932 if (coroapi.readyhook)
1678 dSP; 1933 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1934
1694 return 1; 1935 return 1;
1695} 1936}
1696 1937
1697static int 1938static int
… …
1699{ 1940{
1700 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1941 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1701} 1942}
1702 1943
1703/* expects to own a reference to next->hv */ 1944/* expects to own a reference to next->hv */
1704INLINE void 1945ecb_inline void
1705prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1946prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1706{ 1947{
1707 SV *prev_sv = SvRV (coro_current); 1948 SV *prev_sv = SvRV (coro_current);
1708 1949
1709 ta->prev = SvSTATE_hv (prev_sv); 1950 ta->prev = SvSTATE_hv (prev_sv);
… …
1722{ 1963{
1723 for (;;) 1964 for (;;)
1724 { 1965 {
1725 struct coro *next = coro_deq (aTHX); 1966 struct coro *next = coro_deq (aTHX);
1726 1967
1727 if (expect_true (next)) 1968 if (ecb_expect_true (next))
1728 { 1969 {
1729 /* cannot transfer to destroyed coros, skip and look for next */ 1970 /* cannot transfer to destroyed coros, skip and look for next */
1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1971 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1731 SvREFCNT_dec (next->hv); /* 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 */
1732 else 1973 else
1733 { 1974 {
1734 next->flags &= ~CF_READY; 1975 next->flags &= ~CF_READY;
1735 --coro_nready; 1976 --coro_nready;
… …
1742 { 1983 {
1743 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1746 { 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
1747 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2008 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1748 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 2010 --coro_nready;
1750 } 2011 }
1751 else 2012 else
1752 { 2013 {
2014 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 2015 dSP;
1754 2016
1755 ENTER; 2017 ENTER;
1756 SAVETMPS; 2018 SAVETMPS;
1757 2019
… …
1764 } 2026 }
1765 } 2027 }
1766 } 2028 }
1767} 2029}
1768 2030
1769INLINE void 2031ecb_inline void
1770prepare_cede (pTHX_ struct coro_transfer_args *ta) 2032prepare_cede (pTHX_ struct coro_transfer_args *ta)
1771{ 2033{
1772 api_ready (aTHX_ coro_current); 2034 api_ready (aTHX_ coro_current);
1773 prepare_schedule (aTHX_ ta); 2035 prepare_schedule (aTHX_ ta);
1774} 2036}
1775 2037
1776INLINE void 2038ecb_inline void
1777prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2039prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1778{ 2040{
1779 SV *prev = SvRV (coro_current); 2041 SV *prev = SvRV (coro_current);
1780 2042
1781 if (coro_nready) 2043 if (coro_nready)
… …
1811{ 2073{
1812 struct coro_transfer_args ta; 2074 struct coro_transfer_args ta;
1813 2075
1814 prepare_cede (aTHX_ &ta); 2076 prepare_cede (aTHX_ &ta);
1815 2077
1816 if (expect_true (ta.prev != ta.next)) 2078 if (ecb_expect_true (ta.prev != ta.next))
1817 { 2079 {
1818 TRANSFER (ta, 1); 2080 TRANSFER (ta, 1);
1819 return 1; 2081 return 1;
1820 } 2082 }
1821 else 2083 else
… …
1864 coro->slot->runops = RUNOPS_DEFAULT; 2126 coro->slot->runops = RUNOPS_DEFAULT;
1865 } 2127 }
1866} 2128}
1867 2129
1868static 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
1869coro_call_on_destroy (pTHX_ struct coro *coro) 2207coro_call_on_destroy (pTHX_ struct coro *coro)
1870{ 2208{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2209 AV *od = coro->on_destroy;
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873 2210
1874 if (on_destroyp) 2211 if (!od)
1875 { 2212 return;
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1877 2213
2214 coro->on_destroy = 0;
2215 sv_2mortal ((SV *)od);
2216
1878 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
1879 { 2225 {
1880 dSP; /* don't disturb outer sp */ 2226 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy);
1882
1883 PUSHMARK (SP); 2227 PUSHMARK (SP);
1884 2228
1885 if (statusp) 2229 if (coro->status)
1886 { 2230 {
1887 int i; 2231 PUTBACK;
1888 AV *status = (AV *)SvRV (*statusp); 2232 coro_push_av (aTHX_ coro->status, G_ARRAY);
1889 EXTEND (SP, AvFILLp (status) + 1); 2233 SPAGAIN;
1890
1891 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]);
1893 } 2234 }
1894 2235
1895 PUTBACK; 2236 PUTBACK;
1896 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2237 call_sv (cb, G_VOID | G_DISCARD);
1897 } 2238 }
1898 } 2239 }
1899} 2240}
1900 2241
1901static void 2242static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2243coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1903{ 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 {
1904 int i; 2258 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV ();
1907 2259
1908 av_extend (av, items - 1); 2260 av_extend (av, items - 1);
2261
1909 for (i = 0; i < items; ++i) 2262 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 2263 av_push (av, SvREFCNT_inc_NN (arg [i]));
2264 }
2265}
1911 2266
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2267static void
1913 2268slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2269{
1914 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 */
1915 api_ready (aTHX_ sv_manager); 2271 api_ready (aTHX_ sv_manager);
1916 2272
1917 frame->prepare = prepare_schedule; 2273 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat; 2274 frame->check = slf_check_repeat;
1919 2275
1920 /* as a minor optimisation, we could unwind all stacks here */ 2276 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */ 2277 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/ 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;
1923} 2385}
1924 2386
1925/*****************************************************************************/ 2387/*****************************************************************************/
1926/* async pool handler */ 2388/* async pool handler */
1927 2389
… …
1958slf_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)
1959{ 2421{
1960 HV *hv = (HV *)SvRV (coro_current); 2422 HV *hv = (HV *)SvRV (coro_current);
1961 struct coro *coro = SvSTATE_hv ((SV *)hv); 2423 struct coro *coro = SvSTATE_hv ((SV *)hv);
1962 2424
1963 if (expect_true (coro->saved_deffh)) 2425 if (ecb_expect_true (coro->saved_deffh))
1964 { 2426 {
1965 /* subsequent iteration */ 2427 /* subsequent iteration */
1966 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2428 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1967 coro->saved_deffh = 0; 2429 coro->saved_deffh = 0;
1968 2430
1969 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2431 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1970 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2432 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1971 { 2433 {
1972 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2434 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1973 coro->invoke_av = newAV (); 2435 return;
1974
1975 frame->prepare = prepare_nop;
1976 } 2436 }
1977 else 2437 else
1978 { 2438 {
1979 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
1980 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);
1981 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
1982 coro->prio = 0; 2449 coro->prio = 0;
1983 2450
1984 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1985 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
1986 2453
1987 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
1988 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
1989 } 2456 }
… …
2005 2472
2006static void 2473static void
2007coro_rouse_callback (pTHX_ CV *cv) 2474coro_rouse_callback (pTHX_ CV *cv)
2008{ 2475{
2009 dXSARGS; 2476 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2477 SV *data = (SV *)S_GENSUB_ARG;
2011 2478
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2479 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2480 {
2014 /* first call, set args */ 2481 /* first call, set args */
2015 SV *coro = SvRV (data); 2482 SV *coro = SvRV (data);
… …
2030 2497
2031static int 2498static int
2032slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2499slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2033{ 2500{
2034 SV *data = (SV *)frame->data; 2501 SV *data = (SV *)frame->data;
2035 2502
2036 if (CORO_THROW) 2503 if (CORO_THROW)
2037 return 0; 2504 return 0;
2038 2505
2039 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2506 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2040 return 1; 2507 return 1;
… …
2076 cb = sv_2mortal (coro->rouse_cb); 2543 cb = sv_2mortal (coro->rouse_cb);
2077 coro->rouse_cb = 0; 2544 coro->rouse_cb = 0;
2078 } 2545 }
2079 2546
2080 if (!SvROK (cb) 2547 if (!SvROK (cb)
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2548 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2549 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2550 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2551
2085 { 2552 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2553 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2554 SV *data = (SV *)S_GENSUB_ARG;
2088 2555
2089 frame->data = (void *)data; 2556 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2557 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2558 frame->check = slf_check_rouse_wait;
2092 } 2559 }
… …
2096coro_new_rouse_cb (pTHX) 2563coro_new_rouse_cb (pTHX)
2097{ 2564{
2098 HV *hv = (HV *)SvRV (coro_current); 2565 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2566 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2567 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2568 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2569
2103 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);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2571 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2572
2106 SvREFCNT_dec (coro->rouse_cb); 2573 SvREFCNT_dec (coro->rouse_cb);
… …
2203static void 2670static void
2204slf_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)
2205{ 2672{
2206 frame->prepare = prepare_cede_notself; 2673 frame->prepare = prepare_cede_notself;
2207 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);
2208} 2694}
2209 2695
2210/* 2696/*
2211 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2212 * 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
… …
2219 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 */
2220 2706
2221 /* 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 */
2222 /* the latter happens when a new coro has been started */ 2708 /* the latter happens when a new coro has been started */
2223 /* or when a new cctx was attached to an existing coroutine */ 2709 /* or when a new cctx was attached to an existing coroutine */
2224 if (expect_true (!slf_frame.prepare)) 2710 if (ecb_expect_true (!slf_frame.prepare))
2225 { 2711 {
2226 /* first iteration */ 2712 /* first iteration */
2227 dSP; 2713 dSP;
2228 SV **arg = PL_stack_base + TOPMARK + 1; 2714 SV **arg = PL_stack_base + TOPMARK + 1;
2229 int items = SP - arg; /* args without function object */ 2715 int items = SP - arg; /* args without function object */
… …
2270 while (slf_frame.check (aTHX_ &slf_frame)); 2756 while (slf_frame.check (aTHX_ &slf_frame));
2271 2757
2272 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 */
2273 2759
2274 /* exception handling */ 2760 /* exception handling */
2275 if (expect_false (CORO_THROW)) 2761 if (ecb_expect_false (CORO_THROW))
2276 { 2762 {
2277 SV *exception = sv_2mortal (CORO_THROW); 2763 SV *exception = sv_2mortal (CORO_THROW);
2278 2764
2279 CORO_THROW = 0; 2765 CORO_THROW = 0;
2280 sv_setsv (ERRSV, exception); 2766 sv_setsv (ERRSV, exception);
2281 croak (0); 2767 croak (0);
2282 } 2768 }
2283 2769
2284 /* return value handling - mostly like entersub */ 2770 /* return value handling - mostly like entersub */
2285 /* make sure we put something on the stack in scalar context */ 2771 /* make sure we put something on the stack in scalar context */
2286 if (GIMME_V == G_SCALAR) 2772 if (GIMME_V == G_SCALAR
2773 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2287 { 2774 {
2288 dSP; 2775 dSP;
2289 SV **bot = PL_stack_base + checkmark; 2776 SV **bot = PL_stack_base + checkmark;
2290 2777
2291 if (sp == bot) /* too few, push undef */ 2778 if (sp == bot) /* too few, push undef */
2292 bot [1] = &PL_sv_undef; 2779 bot [1] = &PL_sv_undef;
2293 else if (sp != bot + 1) /* too many, take last one */ 2780 else /* too many, take last one */
2294 bot [1] = *sp; 2781 bot [1] = *sp;
2295 2782
2296 SP = bot + 1; 2783 SP = bot + 1;
2297 2784
2298 PUTBACK; 2785 PUTBACK;
… …
2331 if (PL_op->op_flags & OPf_STACKED) 2818 if (PL_op->op_flags & OPf_STACKED)
2332 { 2819 {
2333 if (items > slf_arga) 2820 if (items > slf_arga)
2334 { 2821 {
2335 slf_arga = items; 2822 slf_arga = items;
2336 free (slf_argv); 2823 Safefree (slf_argv);
2337 slf_argv = malloc (slf_arga * sizeof (SV *)); 2824 New (0, slf_argv, slf_arga, SV *);
2338 } 2825 }
2339 2826
2340 slf_argc = items; 2827 slf_argc = items;
2341 2828
2342 for (i = 0; i < items; ++i) 2829 for (i = 0; i < items; ++i)
… …
2396{ 2883{
2397 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2884 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2398 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2399} 2886}
2400 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);
2978}
2979
2401/*****************************************************************************/ 2980/*****************************************************************************/
2402/* PerlIO::cede */ 2981/* PerlIO::cede */
2403 2982
2404typedef struct 2983typedef struct
2405{ 2984{
2406 PerlIOBuf base; 2985 PerlIOBuf base;
2407 NV next, every; 2986 NV next, every;
2408} PerlIOCede; 2987} PerlIOCede;
2409 2988
2410static IV 2989static IV ecb_cold
2411PerlIOCede_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)
2412{ 2991{
2413 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2414 2993
2415 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2994 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2416 self->next = nvtime () + self->every; 2995 self->next = nvtime () + self->every;
2417 2996
2418 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2997 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2419} 2998}
2420 2999
2421static SV * 3000static SV * ecb_cold
2422PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3001PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2423{ 3002{
2424 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2425 3004
2426 return newSVnv (self->every); 3005 return newSVnv (self->every);
… …
2533 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2534 PUTBACK; 3113 PUTBACK;
2535 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2536 } 3115 }
2537 3116
2538 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2539 } 3118 }
2540} 3119}
2541 3120
2542static void 3121static void
2543coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2544{ 3123{
2545 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3124 /* call $sem->adjust (0) to possibly wake up some other waiters */
2546 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3125 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2547} 3126}
2548 3127
2549static int 3128static int
2550slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3129slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2551{ 3130{
2552 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2553 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;
2554 3136
2555 /* 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 */
2556 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
2557 return 0; 3143 return 0;
3144 }
2558 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2559 { 3146 {
2560 SvSTATE_current->on_destroy = 0;
2561
2562 if (acquire) 3147 if (acquire)
2563 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2564 else 3149 else
2565 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2566 3151
… …
2570 { 3155 {
2571 int i; 3156 int i;
2572 /* 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 */
2573 /* 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 */
2574 /* this avoids some degenerate memory usage cases */ 3159 /* this avoids some degenerate memory usage cases */
2575 3160 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2576 for (i = 1; i <= AvFILLp (av); ++i)
2577 if (AvARRAY (av)[i] == SvRV (coro_current)) 3161 if (AvARRAY (av)[i] == coro_hv)
2578 return 1; 3162 return 1;
2579 3163
2580 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3164 av_push (av, SvREFCNT_inc (coro_hv));
2581 return 1; 3165 return 1;
2582 } 3166 }
2583} 3167}
2584 3168
2585static int 3169static int
… …
2608 { 3192 {
2609 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3193 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2610 3194
2611 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3195 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2612 frame->prepare = prepare_schedule; 3196 frame->prepare = prepare_schedule;
2613
2614 /* to avoid race conditions when a woken-up coro gets terminated */ 3197 /* to avoid race conditions when a woken-up coro gets terminated */
2615 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3198 /* we arrange for a temporary on_destroy that calls adjust (0) */
2616 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3199 frame->destroy = coro_semaphore_destroy;
2617 } 3200 }
2618} 3201}
2619 3202
2620static void 3203static void
2621slf_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)
… …
2629{ 3212{
2630 if (items >= 2) 3213 if (items >= 2)
2631 { 3214 {
2632 /* callback form */ 3215 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 3216 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3217 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 3218
2636 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3219 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 3220
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 3221 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 3222 coro_semaphore_adjust (aTHX_ av, 0);
2640 3223
2641 frame->prepare = prepare_nop; 3224 frame->prepare = prepare_nop;
… …
2665 AvARRAY (av)[0] = AvARRAY (av)[1]; 3248 AvARRAY (av)[0] = AvARRAY (av)[1];
2666 AvARRAY (av)[1] = cb; 3249 AvARRAY (av)[1] = cb;
2667 3250
2668 cb = av_shift (av); 3251 cb = av_shift (av);
2669 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 {
2670 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
2671 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
3265 }
3266
2672 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
2673 3268
2674 --count; 3269 --count;
2675 } 3270 }
2676} 3271}
2677 3272
… …
2685static void 3280static void
2686slf_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)
2687{ 3282{
2688 AV *av = (AV *)SvRV (arg [0]); 3283 AV *av = (AV *)SvRV (arg [0]);
2689 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
2690 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]))
2691 { 3297 {
2692 SvIVX (AvARRAY (av)[0]) = 0; 3298 SvIVX (AvARRAY (av)[0]) = 0;
2693 frame->prepare = prepare_nop; 3299 frame->prepare = prepare_nop;
2694 frame->check = slf_check_nop; 3300 frame->check = slf_check_nop;
2695 } 3301 }
2696 else 3302 else
2697 { 3303 {
2698 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3304 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2699 3305
2700 av_push (av, waiter); 3306 av_push (av, waiter);
2701 3307
2702 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 */
2703 frame->prepare = prepare_schedule; 3309 frame->prepare = prepare_schedule;
… …
2721 3327
2722static void 3328static void
2723coro_aio_callback (pTHX_ CV *cv) 3329coro_aio_callback (pTHX_ CV *cv)
2724{ 3330{
2725 dXSARGS; 3331 dXSARGS;
2726 AV *state = (AV *)GENSUB_ARG; 3332 AV *state = (AV *)S_GENSUB_ARG;
2727 SV *coro = av_pop (state); 3333 SV *coro = av_pop (state);
2728 SV *data_sv = newSV (sizeof (struct io_state)); 3334 SV *data_sv = newSV (sizeof (struct io_state));
2729 3335
2730 av_extend (state, items - 1); 3336 av_extend (state, items - 1);
2731 3337
… …
2751 } 3357 }
2752 3358
2753 av_push (state, data_sv); 3359 av_push (state, data_sv);
2754 3360
2755 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
2756 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
2757 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
2758} 3364}
2759 3365
2760static int 3366static int
2761slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2762{ 3368{
… …
2767 /* it quickly returns */ 3373 /* it quickly returns */
2768 if (CORO_THROW) 3374 if (CORO_THROW)
2769 return 0; 3375 return 0;
2770 3376
2771 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
2772 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2773 return 1; 3379 return 1;
2774 3380
2775 /* restore status */ 3381 /* restore status */
2776 { 3382 {
2777 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
… …
2780 errno = data->errorno; 3386 errno = data->errorno;
2781 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
2782 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
2783 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
2784 3390
2785 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
2786 } 3392 }
2787 3393
2788 /* push result values */ 3394 /* push result values */
2789 { 3395 {
2790 dSP; 3396 dSP;
… …
2816 dSP; 3422 dSP;
2817 3423
2818 static SV *prio_cv; 3424 static SV *prio_cv;
2819 static SV *prio_sv; 3425 static SV *prio_sv;
2820 3426
2821 if (expect_false (!prio_cv)) 3427 if (ecb_expect_false (!prio_cv))
2822 { 3428 {
2823 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3429 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2824 prio_sv = newSViv (0); 3430 prio_sv = newSViv (0);
2825 } 3431 }
2826 3432
… …
2845 3451
2846 for (i = 0; i < items; ++i) 3452 for (i = 0; i < items; ++i)
2847 PUSHs (arg [i]); 3453 PUSHs (arg [i]);
2848 3454
2849 /* now push the callback closure */ 3455 /* now push the callback closure */
2850 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))));
2851 3457
2852 /* now call the AIO function - we assume our request is uncancelable */ 3458 /* now call the AIO function - we assume our request is uncancelable */
2853 PUTBACK; 3459 PUTBACK;
2854 call_sv ((SV *)req, G_VOID | G_DISCARD); 3460 call_sv ((SV *)req, G_VOID | G_DISCARD);
2855 } 3461 }
2856 3462
2857 /* 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 */
2858 frame->data = (void *)state; 3464 frame->data = (void *)state;
2859 frame->prepare = prepare_schedule; 3465 frame->prepare = prepare_schedule;
2860 frame->check = slf_check_aio_req; 3466 frame->check = slf_check_aio_req;
2861} 3467}
2862 3468
… …
2874 3480
2875#if CORO_CLONE 3481#if CORO_CLONE
2876# include "clone.c" 3482# include "clone.c"
2877#endif 3483#endif
2878 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
2879MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3610MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2880 3611
2881PROTOTYPES: DISABLE 3612PROTOTYPES: DISABLE
2882 3613
2883BOOT: 3614BOOT:
2884{ 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"
2885#ifdef USE_ITHREADS 3618#ifdef USE_ITHREADS
2886# if CORO_PTHREAD 3619# if CORO_PTHREAD
2887 coro_thx = PERL_GET_CONTEXT; 3620 coro_thx = PERL_GET_CONTEXT;
2888# endif 3621# endif
2889#endif 3622#endif
2890 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;
2891 3629
2892 cctx_current = cctx_new_empty (); 3630 cctx_current = cctx_new_empty ();
2893 3631
2894 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3632 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2895 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3633 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2896 3634
2897 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3635 {
2898 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3636 /*
2899 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 }
2900 3659
2901 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2902 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));
2903 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));
2904 3662
2905 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3663 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2906 3664
… …
2935 coroapi.prepare_nop = prepare_nop; 3693 coroapi.prepare_nop = prepare_nop;
2936 coroapi.prepare_schedule = prepare_schedule; 3694 coroapi.prepare_schedule = prepare_schedule;
2937 coroapi.prepare_cede = prepare_cede; 3695 coroapi.prepare_cede = prepare_cede;
2938 coroapi.prepare_cede_notself = prepare_cede_notself; 3696 coroapi.prepare_cede_notself = prepare_cede_notself;
2939 3697
2940 { 3698 time_init (aTHX);
2941 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2942 3699
2943 if (!svp) croak ("Time::HiRes is required");
2944 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2945
2946 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2947 }
2948
2949 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
2950} 3706}
2951 3707
2952SV * 3708SV *
2953new (char *klass, ...) 3709new (SV *klass, ...)
2954 ALIAS: 3710 ALIAS:
2955 Coro::new = 1 3711 Coro::new = 1
2956 CODE: 3712 CODE:
2957{ 3713 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2958 struct coro *coro; 3714 OUTPUT:
2959 MAGIC *mg;
2960 HV *hv;
2961 CV *cb;
2962 int i;
2963
2964 if (items > 1)
2965 {
2966 cb = coro_sv_2cv (aTHX_ ST (1));
2967
2968 if (!ix)
2969 {
2970 if (CvISXSUB (cb))
2971 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2972
2973 if (!CvROOT (cb))
2974 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2975 }
2976 }
2977
2978 Newz (0, coro, 1, struct coro);
2979 coro->args = newAV ();
2980 coro->flags = CF_NEW;
2981
2982 if (coro_first) coro_first->prev = coro;
2983 coro->next = coro_first;
2984 coro_first = coro;
2985
2986 coro->hv = hv = newHV ();
2987 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2988 mg->mg_flags |= MGf_DUP;
2989 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2990
2991 if (items > 1)
2992 {
2993 av_extend (coro->args, items - 1 + ix - 1);
2994
2995 if (ix)
2996 {
2997 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2998 cb = cv_coro_run;
2999 }
3000
3001 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3002
3003 for (i = 2; i < items; i++)
3004 av_push (coro->args, newSVsv (ST (i)));
3005 }
3006}
3007 OUTPUT:
3008 RETVAL 3715 RETVAL
3009 3716
3010void 3717void
3011transfer (...) 3718transfer (...)
3012 PROTOTYPE: $$ 3719 PROTOTYPE: $$
3013 CODE: 3720 CODE:
3014 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3721 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3015
3016bool
3017_destroy (SV *coro_sv)
3018 CODE:
3019 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3020 OUTPUT:
3021 RETVAL
3022
3023void
3024_exit (int code)
3025 PROTOTYPE: $
3026 CODE:
3027 _exit (code);
3028 3722
3029SV * 3723SV *
3030clone (Coro::State coro) 3724clone (Coro::State coro)
3031 CODE: 3725 CODE:
3032{ 3726{
… …
3087void 3781void
3088list () 3782list ()
3089 PROTOTYPE: 3783 PROTOTYPE:
3090 PPCODE: 3784 PPCODE:
3091{ 3785{
3092 struct coro *coro; 3786 struct coro *coro;
3093 for (coro = coro_first; coro; coro = coro->next) 3787 for (coro = coro_first; coro; coro = coro->next)
3094 if (coro->hv) 3788 if (coro->hv)
3095 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3789 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3096} 3790}
3097 3791
… …
3102 CODE: 3796 CODE:
3103{ 3797{
3104 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3798 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3105 { 3799 {
3106 struct coro *current = SvSTATE_current; 3800 struct coro *current = SvSTATE_current;
3801 struct CoroSLF slf_save;
3107 3802
3108 if (current != coro) 3803 if (current != coro)
3109 { 3804 {
3110 PUTBACK; 3805 PUTBACK;
3111 save_perl (aTHX_ current); 3806 save_perl (aTHX_ current);
3112 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;
3113 SPAGAIN; 3817 SPAGAIN;
3114 } 3818 }
3115 3819
3116 PUSHSTACK; 3820 PUSHSTACK;
3117 3821
… …
3127 SPAGAIN; 3831 SPAGAIN;
3128 3832
3129 if (current != coro) 3833 if (current != coro)
3130 { 3834 {
3131 PUTBACK; 3835 PUTBACK;
3836 slf_frame = slf_save;
3132 save_perl (aTHX_ coro); 3837 save_perl (aTHX_ coro);
3133 load_perl (aTHX_ current); 3838 load_perl (aTHX_ current);
3134 SPAGAIN; 3839 SPAGAIN;
3135 } 3840 }
3136 } 3841 }
… …
3141 PROTOTYPE: $ 3846 PROTOTYPE: $
3142 ALIAS: 3847 ALIAS:
3143 is_ready = CF_READY 3848 is_ready = CF_READY
3144 is_running = CF_RUNNING 3849 is_running = CF_RUNNING
3145 is_new = CF_NEW 3850 is_new = CF_NEW
3146 is_destroyed = CF_DESTROYED 3851 is_destroyed = CF_ZOMBIE
3852 is_zombie = CF_ZOMBIE
3147 is_suspended = CF_SUSPENDED 3853 is_suspended = CF_SUSPENDED
3148 CODE: 3854 CODE:
3149 RETVAL = boolSV (coro->flags & ix); 3855 RETVAL = boolSV (coro->flags & ix);
3150 OUTPUT: 3856 OUTPUT:
3151 RETVAL 3857 RETVAL
3152 3858
3153void 3859void
3154throw (Coro::State self, SV *throw = &PL_sv_undef) 3860throw (SV *self, SV *exception = &PL_sv_undef)
3155 PROTOTYPE: $;$ 3861 PROTOTYPE: $;$
3156 CODE: 3862 CODE:
3157{ 3863{
3864 struct coro *coro = SvSTATE (self);
3158 struct coro *current = SvSTATE_current; 3865 struct coro *current = SvSTATE_current;
3159 SV **throwp = self == current ? &CORO_THROW : &self->except; 3866 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3160 SvREFCNT_dec (*throwp); 3867 SvREFCNT_dec (*exceptionp);
3161 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3868 SvGETMAGIC (exception);
3869 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3870
3871 api_ready (aTHX_ self);
3162} 3872}
3163 3873
3164void 3874void
3165api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3875api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3166 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
… …
3221 3931
3222void 3932void
3223cancel (Coro::State self) 3933cancel (Coro::State self)
3224 CODE: 3934 CODE:
3225 coro_state_destroy (aTHX_ self); 3935 coro_state_destroy (aTHX_ self);
3226 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 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}
3227 4020
3228 4021
3229MODULE = Coro::State PACKAGE = Coro 4022MODULE = Coro::State PACKAGE = Coro
3230 4023
3231BOOT: 4024BOOT:
3232{ 4025{
4026 if (SVt_LAST > 32)
4027 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4028
3233 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4029 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3234 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4030 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3235 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4031 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3236 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3237 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);
3238 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4033 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3239 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4034 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3240 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4035 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3241 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4036 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3242 4037
3243 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);
3244 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4039 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3245 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);
3246 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 */
3247 4042
3248 coro_stash = gv_stashpv ("Coro", TRUE); 4043 coro_stash = gv_stashpv ("Coro", TRUE);
3249 4044
3250 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4045 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3251 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4046 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3252 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4047 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3253 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4048 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3254 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4049 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3255 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4050 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3256 4051
3257 { 4052 {
3258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4053 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3259 4054
3260 coroapi.schedule = api_schedule; 4055 coroapi.schedule = api_schedule;
… …
3264 coroapi.ready = api_ready; 4059 coroapi.ready = api_ready;
3265 coroapi.is_ready = api_is_ready; 4060 coroapi.is_ready = api_is_ready;
3266 coroapi.nready = coro_nready; 4061 coroapi.nready = coro_nready;
3267 coroapi.current = coro_current; 4062 coroapi.current = coro_current;
3268 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
3269 /*GCoroAPI = &coroapi;*/ 4068 /*GCoroAPI = &coroapi;*/
3270 sv_setiv (sv, (IV)&coroapi); 4069 sv_setiv (sv, (IV)&coroapi);
3271 SvREADONLY_on (sv); 4070 SvREADONLY_on (sv);
3272 } 4071 }
3273} 4072}
3274 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
3275void 4099void
3276terminate (...) 4100terminate (...)
3277 CODE: 4101 CODE:
3278 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4102 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3279 4103
3280void 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
3281schedule (...) 4114schedule (...)
3282 CODE: 4115 CODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4116 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3284 4117
3285void 4118void
… …
3304 4137
3305void 4138void
3306_set_current (SV *current) 4139_set_current (SV *current)
3307 PROTOTYPE: $ 4140 PROTOTYPE: $
3308 CODE: 4141 CODE:
3309 SvREFCNT_dec (SvRV (coro_current)); 4142 SvREFCNT_dec_NN (SvRV (coro_current));
3310 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4143 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3311 4144
3312void 4145void
3313_set_readyhook (SV *hook) 4146_set_readyhook (SV *hook)
3314 PROTOTYPE: $ 4147 PROTOTYPE: $
3315 CODE: 4148 CODE:
3316 SvREFCNT_dec (coro_readyhook); 4149 SvREFCNT_dec (coro_readyhook);
4150 SvGETMAGIC (hook);
4151 if (SvOK (hook))
4152 {
3317 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 }
3318 4161
3319int 4162int
3320prio (Coro::State coro, int newprio = 0) 4163prio (Coro::State coro, int newprio = 0)
3321 PROTOTYPE: $;$ 4164 PROTOTYPE: $;$
3322 ALIAS: 4165 ALIAS:
… …
3328 if (items > 1) 4171 if (items > 1)
3329 { 4172 {
3330 if (ix) 4173 if (ix)
3331 newprio = coro->prio - newprio; 4174 newprio = coro->prio - newprio;
3332 4175
3333 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4176 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3334 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4177 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3335 4178
3336 coro->prio = newprio; 4179 coro->prio = newprio;
3337 } 4180 }
3338} 4181}
3339 OUTPUT: 4182 OUTPUT:
… …
3386 for (i = 1; i < items; ++i) 4229 for (i = 1; i < items; ++i)
3387 av_push (av, SvREFCNT_inc_NN (ST (i))); 4230 av_push (av, SvREFCNT_inc_NN (ST (i)));
3388 4231
3389 if ((SV *)hv == &PL_sv_undef) 4232 if ((SV *)hv == &PL_sv_undef)
3390 { 4233 {
3391 PUSHMARK (SP); 4234 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3392 EXTEND (SP, 2);
3393 PUSHs (sv_Coro);
3394 PUSHs ((SV *)cv_pool_handler);
3395 PUTBACK;
3396 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3397 SPAGAIN;
3398
3399 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4235 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4236 SvREFCNT_dec_NN (sv);
3400 } 4237 }
3401 4238
3402 { 4239 {
3403 struct coro *coro = SvSTATE_hv (hv); 4240 struct coro *coro = SvSTATE_hv (hv);
3404 4241
… …
3411 api_ready (aTHX_ (SV *)hv); 4248 api_ready (aTHX_ (SV *)hv);
3412 4249
3413 if (GIMME_V != G_VOID) 4250 if (GIMME_V != G_VOID)
3414 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4251 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3415 else 4252 else
3416 SvREFCNT_dec (hv); 4253 SvREFCNT_dec_NN (hv);
3417} 4254}
3418 4255
3419SV * 4256SV *
3420rouse_cb () 4257rouse_cb ()
3421 PROTOTYPE: 4258 PROTOTYPE:
… …
3436 on_leave = 1 4273 on_leave = 1
3437 PROTOTYPE: & 4274 PROTOTYPE: &
3438 CODE: 4275 CODE:
3439{ 4276{
3440 struct coro *coro = SvSTATE_current; 4277 struct coro *coro = SvSTATE_current;
3441 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4278 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3442 4279
3443 block = (SV *)coro_sv_2cv (aTHX_ block); 4280 block = s_get_cv_croak (block);
3444 4281
3445 if (!*avp) 4282 if (!*avp)
3446 *avp = newAV (); 4283 *avp = newAV ();
3447 4284
3448 av_push (*avp, SvREFCNT_inc (block)); 4285 av_push (*avp, SvREFCNT_inc (block));
… …
3465MODULE = Coro::State PACKAGE = Coro::Semaphore 4302MODULE = Coro::State PACKAGE = Coro::Semaphore
3466 4303
3467SV * 4304SV *
3468new (SV *klass, SV *count = 0) 4305new (SV *klass, SV *count = 0)
3469 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
3470 RETVAL = sv_bless ( 4318 RETVAL = sv_bless (
3471 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4319 coro_waitarray_new (aTHX_ semcnt),
3472 GvSTASH (CvGV (cv)) 4320 GvSTASH (CvGV (cv))
3473 ); 4321 );
4322}
3474 OUTPUT: 4323 OUTPUT:
3475 RETVAL 4324 RETVAL
3476 4325
3477# helper for Coro::Channel and others 4326# helper for Coro::Channel and others
3478SV * 4327SV *
… …
3488 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4337 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3489 OUTPUT: 4338 OUTPUT:
3490 RETVAL 4339 RETVAL
3491 4340
3492void 4341void
3493up (SV *self, int adjust = 1) 4342up (SV *self)
3494 ALIAS:
3495 adjust = 1
3496 CODE: 4343 CODE:
4344 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4345
4346void
4347adjust (SV *self, int adjust)
4348 CODE:
3497 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4349 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3498 4350
3499void 4351void
3500down (...) 4352down (...)
3501 CODE: 4353 CODE:
3502 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4354 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3524 XSRETURN_NO; 4376 XSRETURN_NO;
3525} 4377}
3526 4378
3527void 4379void
3528waiters (SV *self) 4380waiters (SV *self)
3529 PPCODE: 4381 PPCODE:
3530{ 4382{
3531 AV *av = (AV *)SvRV (self); 4383 AV *av = (AV *)SvRV (self);
3532 int wcount = AvFILLp (av) + 1 - 1; 4384 int wcount = AvFILLp (av) + 1 - 1;
3533 4385
3534 if (GIMME_V == G_SCALAR) 4386 if (GIMME_V == G_SCALAR)
… …
3543} 4395}
3544 4396
3545MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4397MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3546 4398
3547void 4399void
3548_may_delete (SV *sem, int count, int extra_refs) 4400_may_delete (SV *sem, int count, unsigned int extra_refs)
3549 PPCODE: 4401 PPCODE:
3550{ 4402{
3551 AV *av = (AV *)SvRV (sem); 4403 AV *av = (AV *)SvRV (sem);
3552 4404
3553 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4405 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3554 && AvFILLp (av) == 0 /* no waiters, just count */ 4406 && AvFILLp (av) == 0 /* no waiters, just count */
3555 && SvIV (AvARRAY (av)[0]) == count) 4407 && SvIV (AvARRAY (av)[0]) == count)
3556 XSRETURN_YES; 4408 XSRETURN_YES;
… …
3577 4429
3578void 4430void
3579broadcast (SV *self) 4431broadcast (SV *self)
3580 CODE: 4432 CODE:
3581{ 4433{
3582 AV *av = (AV *)SvRV (self); 4434 AV *av = (AV *)SvRV (self);
3583 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4435 coro_signal_wake (aTHX_ av, AvFILLp (av));
3584} 4436}
3585 4437
3586void 4438void
3587send (SV *self) 4439send (SV *self)
… …
3595 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4447 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3596} 4448}
3597 4449
3598IV 4450IV
3599awaited (SV *self) 4451awaited (SV *self)
3600 CODE: 4452 CODE:
3601 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4453 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3602 OUTPUT: 4454 OUTPUT:
3603 RETVAL 4455 RETVAL
3604 4456
3605 4457
… …
3610 4462
3611void 4463void
3612_schedule (...) 4464_schedule (...)
3613 CODE: 4465 CODE:
3614{ 4466{
3615 static int incede; 4467 static int incede;
3616 4468
3617 api_cede_notself (aTHX); 4469 api_cede_notself (aTHX);
3618 4470
3619 ++incede; 4471 ++incede;
3620 while (coro_nready >= incede && api_cede (aTHX)) 4472 while (coro_nready >= incede && api_cede (aTHX))
… …
3636 4488
3637void 4489void
3638_register (char *target, char *proto, SV *req) 4490_register (char *target, char *proto, SV *req)
3639 CODE: 4491 CODE:
3640{ 4492{
3641 CV *req_cv = coro_sv_2cv (aTHX_ req); 4493 SV *req_cv = s_get_cv_croak (req);
3642 /* newXSproto doesn't return the CV on 5.8 */ 4494 /* newXSproto doesn't return the CV on 5.8 */
3643 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4495 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3644 sv_setpv ((SV *)slf_cv, proto); 4496 sv_setpv ((SV *)slf_cv, proto);
3645 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);
3646} 4498}
3647 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