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.345 by root, Wed Dec 17 04:57:07 2008 UTC vs.
Revision 1.468 by root, Sat Oct 29 19:12:46 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;
236
237 /* ready queue */
238 struct coro *next_ready;
265 239
266 /* state data */ 240 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 242 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
270 244
271 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
272 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
273 int refcnt; /* coroutines are refcounted, yes */
274 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
275 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
276 void (*on_destroy)(pTHX_ struct coro *coro);
277 249
278 /* statistics */ 250 /* statistics */
279 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
280 252
281 /* coro process data */ 253 /* coro process data */
282 int prio; 254 int prio;
283 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
284 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 */
285 259
286 /* async_pool */ 260 /* async_pool */
287 SV *saved_deffh; 261 SV *saved_deffh;
288 SV *invoke_cb; 262 SV *invoke_cb;
289 AV *invoke_av; 263 AV *invoke_av;
290 264
291 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
292 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
293 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;
294 274
295 /* linked list */ 275 /* linked list */
296 struct coro *next, *prev; 276 struct coro *next, *prev;
297}; 277};
298 278
299typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
300typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
301 281
302/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
303/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
304/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
306 286
307/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
308 288
309#define PRIO_MAX 3 289#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 290#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 291#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 292#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 293#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 294#define CORO_PRIO_MIN -4
315 295
316/* for Coro.pm */ 296/* for Coro.pm */
317static SV *coro_current; 297static SV *coro_current;
318static SV *coro_readyhook; 298static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
321static struct coro *coro_first; 301static struct coro *coro_first;
322#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
323 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
324/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
325 400
326static SV * 401static SV * ecb_noinline
327coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
328{ 403{
329#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
330 /* 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 */
331 get_sv (name, create); 406 get_sv (name, create);
332#endif 407#endif
333 return get_sv (name, create); 408 return get_sv (name, create);
334} 409}
335 410
336static AV * 411static AV * ecb_noinline
337coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
338{ 413{
339#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
340 /* 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 */
341 get_av (name, create); 416 get_av (name, create);
342#endif 417#endif
343 return get_av (name, create); 418 return get_av (name, create);
344} 419}
345 420
346static HV * 421static HV * ecb_noinline
347coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
348{ 423{
349#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
350 /* 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 */
351 get_hv (name, create); 426 get_hv (name, create);
352#endif 427#endif
353 return get_hv (name, create); 428 return get_hv (name, create);
354} 429}
355 430
356/* may croak */ 431ecb_inline void
357INLINE CV * 432coro_times_update (void)
358coro_sv_2cv (pTHX_ SV *sv)
359{ 433{
360 HV *st; 434#ifdef coro_clock_gettime
361 GV *gvp; 435 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 436
364 if (!cv) 437 ts.tv_sec = ts.tv_nsec = 0;
365 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;
366 440
367 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];
368} 476}
369 477
370/*****************************************************************************/ 478/*****************************************************************************/
371/* magic glue */ 479/* magic glue */
372 480
373#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
374#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
375 483
376#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
377 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
378 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
379 : mg_find (sv, type)) 487 : mg_find (sv, type))
380 488
381#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
382 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
383 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
384 : 0) 492 : 0)
385 493
386#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)
387#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)
388 496
389INLINE struct coro * 497ecb_inline MAGIC *
390SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
391{ 499{
392 HV *stash;
393 MAGIC *mg; 500 MAGIC *mg;
394 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
395 if (SvROK (coro)) 517 if (SvROK (coro_sv))
396 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
397 519
398 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
399 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
400 523
401 stash = SvSTASH (coro);
402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
403 {
404 /* very slow, but rare, check */
405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
406 croak ("Coro::State object required");
407 }
408
409 mg = CORO_MAGIC_state (coro);
410 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
411} 525}
412 526
413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
414 528
… …
417#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
418 532
419/*****************************************************************************/ 533/*****************************************************************************/
420/* padlist management and caching */ 534/* padlist management and caching */
421 535
422static AV * 536ecb_inline PADLIST *
423coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
424{ 538{
425 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
426 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
427 544
428 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. */
429 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
430#if PERL_VERSION_ATLEAST (5,10,0)
431 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
432#else
433 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
434#endif 574#endif
435 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
436 --AvFILLp (padlist);
437 575
438 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
439 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;
440 584
441 return newpadlist; 585 return newpadlist;
442} 586}
443 587
444static void 588ecb_inline void
445free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
446{ 590{
447 /* may be during global destruction */ 591 /* may be during global destruction */
448 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
449 { 593 {
450 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
451 595
452 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
453 { 597 {
454 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
455 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
456 I32 j = AvFILLp (av);
457 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
458 while (j >= 0) 605 while (j >= 0)
459 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
460 607
461 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
462 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
463 } 611 }
464 612
465 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
466 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
467 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
468 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
469 } 623 }
470} 624}
471 625
472static int 626static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 628{
475 AV *padlist; 629 PADLIST *padlist;
476 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;
477 632
478 /* casting is fun. */ 633 /* perl manages to free our internal AV and _then_ call us */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 634 if (IN_DESTRUCT)
635 return 0;
636
637 while (len--)
480 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
481
482 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
483 639
484 return 0; 640 return 0;
485} 641}
486 642
487static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
488 0, 0, 0, 0, 644 0, 0, 0, 0,
489 coro_cv_free 645 coro_cv_free
490}; 646};
491 647
492/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
493static void 649ecb_inline void
494get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
495{ 651{
496 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
497 AV *av; 653 size_t *lenp;
498 654
499 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
500 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
501 else 657 else
502 { 658 {
503#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
504 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
505 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
511 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
512#endif 668#endif
513 } 669 }
514} 670}
515 671
516static void 672ecb_inline void
517put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
518{ 674{
519 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
520 AV *av;
521 676
522 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
523 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);
524 687
525 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
526
527 if (expect_false (AvFILLp (av) >= AvMAX (av)))
528 av_extend (av, AvFILLp (av) + 1);
529
530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
531} 689}
532 690
533/** 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))
534 761
535static void 762static void
536on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
537 764
538static void 765static void
… …
541 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
542 c->slot = 0; 769 c->slot = 0;
543 770
544 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
545 772
546 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
547 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
548 GvSV (PL_errgv) = slot->errsv; 775#else
549 GvSV (irsgv) = slot->irsgv;
550 GvHV (PL_hintgv) = slot->hinthv;
551
552 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
553 # include "state.h" 777 #include "state.h"
554 #undef VAR 778#endif
555 779
556 { 780 {
557 dSP; 781 dSP;
558 782
559 CV *cv; 783 CV *cv;
560 784
561 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
562 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
563 { 787 {
564 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
565 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
566 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
567 } 791 }
568 792
569 PUTBACK; 793 PUTBACK;
570 } 794 }
571 795
572 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 797 CORO_THROW = c->except;
574 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
575 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
576 { 808 {
577 int i; 809 int i;
578 810
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 } 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);
582} 824}
583 825
584static void 826static void
585save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
586{ 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
587 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
588 { 840 {
589 int i; 841 int i;
590 842
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 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);
593 } 853 }
594 854
595 c->except = CORO_THROW; 855 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 856 c->slf_frame = slf_frame;
597 857
… …
608 868
609 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
610 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
611 for (;;) 871 for (;;)
612 { 872 {
613 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
614 { 874 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
616 876
617 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))
618 { 878 {
619 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
620 880
621 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
622 { 882 {
623 EXTEND (SP, 3); 883 EXTEND (SP, 3);
624 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
625 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
626 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
… …
629 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
630 } 890 }
631 } 891 }
632 } 892 }
633 893
634 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
635 break; 895 break;
636 896
637 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
638 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
639 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
641 901
642 PUTBACK; 902 PUTBACK;
643 } 903 }
644 904
645 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
646 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
647 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC;
650 { 907 {
651 int i; 908 unsigned int i;
909
652 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
653 CXINC; 911 CXINC;
654 } 912
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
656 915
657 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
658 917
659 { 918 {
660 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
661 920
662 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
663 slot->defsv = DEFSV; 922 save_perl_slots (slot);
664 slot->errsv = ERRSV; 923#else
665 slot->irsgv = GvSV (irsgv);
666 slot->hinthv = GvHV (PL_hintgv);
667
668 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
669 # include "state.h" 925 #include "state.h"
670 #undef VAR 926#endif
671 } 927 }
672} 928}
673 929
674/* 930/*
675 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
681# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
682#else 938#else
683static void 939static void
684coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
685{ 941{
686 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() */
687 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
688 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
689 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
690 946
691 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
706#endif 962#endif
707 963
708 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
709 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
710 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
711 970
712 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
713 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
714 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
715 979
716#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
717 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
718 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
719 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
743 } 1007 }
744 1008
745 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
746 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
747 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
748 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
749#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
750 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
751#endif 1018#endif
752} 1019}
… …
782 } 1049 }
783 1050
784 return rss; 1051 return rss;
785} 1052}
786 1053
787/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
788
789static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
790static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
791static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
792 1055
793/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
794#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
795#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
796 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
797 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
798#endif 1061#endif
799 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
800/* 1091/*
801 * This overrides the default magic get method of %SIG elements. 1092 * This overrides the default magic get method of %SIG elements.
802 * 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
803 * 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),
804 * readback here. 1095 * we just provide our own readback here.
805 */ 1096 */
806static int 1097static int ecb_cold
807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
808{ 1099{
809 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;
810 1103
811 if (*s == '_') 1104 SV *ssv;
812 {
813 SV **svp = 0;
814 1105
815 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
816 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
817
818 if (svp) 1106 if (!*svp)
819 { 1107 ssv = &PL_sv_undef;
820 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
821 return 0; 1109 ssv = sv_2mortal (newRV_inc (*svp));
822 } 1110 else
823 } 1111 ssv = *svp;
824 1112
825 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1113 sv_setsv (sv, ssv);
1114 return 0;
826} 1115}
827 1116
828static int 1117static int ecb_cold
829coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
830{ 1119{
831 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;
832 1123
833 if (*s == '_')
834 {
835 SV **svp = 0;
836
837 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
838 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
839
840 if (svp)
841 {
842 SV *old = *svp; 1124 SV *old = *svp;
843 *svp = 0; 1125 *svp = 0;
844 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
845 return 0; 1127 return 0;
846 }
847 }
848
849 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
850} 1128}
851 1129
852static int 1130static int ecb_cold
853coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
854{ 1132{
855 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;
856 1136
857 if (*s == '_')
858 {
859 SV **svp = 0;
860
861 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
862 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
863
864 if (svp)
865 {
866 SV *old = *svp; 1137 SV *old = *svp;
867 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
868 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
869 return 0; 1140 return 0;
870 }
871 }
872
873 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
874} 1141}
875 1142
876static void 1143static void
877prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
878{ 1145{
… …
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 1158{
892 return 1; 1159 return 1;
893} 1160}
894 1161
895static UNOP coro_setup_op; 1162/** coroutine stack handling ************************************************/
896 1163
897static 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 */
898coro_setup (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
899{ 1168{
900 /* 1169 /*
901 * emulate part of the perl startup here. 1170 * emulate part of the perl startup here.
902 */ 1171 */
903 coro_init_stacks (aTHX); 1172 coro_init_stacks (aTHX);
… …
910 PL_comppad_name_fill = 0; 1179 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0; 1180 PL_comppad_name_floor = 0;
912 PL_curpm = 0; 1181 PL_curpm = 0;
913 PL_curpad = 0; 1182 PL_curpad = 0;
914 PL_localizing = 0; 1183 PL_localizing = 0;
915 PL_dirty = 0;
916 PL_restartop = 0; 1184 PL_restartop = 0;
917#if PERL_VERSION_ATLEAST (5,10,0) 1185#if PERL_VERSION_ATLEAST (5,10,0)
918 PL_parser = 0; 1186 PL_parser = 0;
919#endif 1187#endif
920 PL_hints = 0; 1188 PL_hints = 0;
921 1189
922 /* recreate the die/warn hooks */ 1190 /* recreate the die/warn hooks */
923 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1191 PL_diehook = SvREFCNT_inc (rv_diehook);
924 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1192 PL_warnhook = SvREFCNT_inc (rv_warnhook);
925 1193
926 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
927 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
928 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
929 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);
930 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
931 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
932 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
933 1204
934 { 1205 {
935 dSP; 1206 dSP;
… …
950 /* 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
951 * 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.
952 */ 1223 */
953 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 */
954 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;
955 1227
956 /* 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 */
957 coro_setup_op.op_next = PL_op; 1229 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1230 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1231 init_perl_op.op_ppaddr = pp_slf;
960 /* 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 */
961 1233
962 PL_op = (OP *)&coro_setup_op; 1234 PL_op = (OP *)&init_perl_op;
963 1235
964 /* copy throw, in case it was set before coro_setup */ 1236 /* copy throw, in case it was set before init_perl */
965 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 }
966} 1246}
967 1247
968static void 1248static void
969coro_unwind_stacks (pTHX) 1249coro_unwind_stacks (pTHX)
970{ 1250{
… …
985 dounwind (-1); 1265 dounwind (-1);
986 } 1266 }
987} 1267}
988 1268
989static void 1269static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1270destroy_perl (pTHX_ struct coro *coro)
991{ 1271{
1272 SV *svf [9];
1273
1274 {
1275 SV *old_current = SvRV (coro_current);
1276 struct coro *current = SvSTATE (old_current);
1277
1278 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1279
1280 save_perl (aTHX_ current);
1281
1282 /* this will cause transfer_check to croak on block*/
1283 SvRV_set (coro_current, (SV *)coro->hv);
1284
1285 load_perl (aTHX_ coro);
1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
992 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
993 1291
994 SvREFCNT_dec (GvSV (PL_defgv)); 1292 coro_destruct_stacks (aTHX);
995 SvREFCNT_dec (GvAV (PL_defgv));
996 SvREFCNT_dec (GvSV (PL_errgv));
997 SvREFCNT_dec (PL_defoutgv);
998 SvREFCNT_dec (PL_rs);
999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
1001 1293
1002 SvREFCNT_dec (PL_diehook); 1294 /* now save some sv's to be free'd later */
1003 SvREFCNT_dec (PL_warnhook); 1295 svf [0] = GvSV (PL_defgv);
1296 svf [1] = (SV *)GvAV (PL_defgv);
1297 svf [2] = GvSV (PL_errgv);
1298 svf [3] = (SV *)PL_defoutgv;
1299 svf [4] = PL_rs;
1300 svf [5] = GvSV (irsgv);
1301 svf [6] = (SV *)GvHV (PL_hintgv);
1302 svf [7] = PL_diehook;
1303 svf [8] = PL_warnhook;
1304 assert (9 == sizeof (svf) / sizeof (*svf));
1305
1306 SvRV_set (coro_current, old_current);
1307
1308 load_perl (aTHX_ current);
1004 1309 }
1310
1311 {
1312 unsigned int i;
1313
1314 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1315 SvREFCNT_dec (svf [i]);
1316
1005 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1009 1321 SvREFCNT_dec (coro->on_enter_xs);
1010 coro_destruct_stacks (aTHX); 1322 SvREFCNT_dec (coro->on_leave_xs);
1323 }
1011} 1324}
1012 1325
1013INLINE void 1326ecb_inline void
1014free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1015{ 1328{
1016 if (expect_true (coro_mortal)) 1329 if (ecb_expect_true (coro_mortal))
1017 { 1330 {
1018 SvREFCNT_dec (coro_mortal); 1331 SvREFCNT_dec ((SV *)coro_mortal);
1019 coro_mortal = 0; 1332 coro_mortal = 0;
1020 } 1333 }
1021} 1334}
1022 1335
1023static int 1336static int
… …
1077 1390
1078 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1079 { 1392 {
1080 SV **cb; 1393 SV **cb;
1081 1394
1082 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1083 { 1396 {
1084 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1085 1398
1086 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1087 { 1400 {
… …
1156 1469
1157 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 */
1158} 1471}
1159 1472
1160/* 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 */
1161static void NOINLINE 1474static void ecb_noinline
1162cctx_prepare (pTHX) 1475cctx_prepare (pTHX)
1163{ 1476{
1164 PL_top_env = &PL_start_env; 1477 PL_top_env = &PL_start_env;
1165 1478
1166 if (cctx_current->flags & CC_TRACE) 1479 if (cctx_current->flags & CC_TRACE)
… …
1177 slf_frame.prepare = slf_prepare_set_stacklevel; 1490 slf_frame.prepare = slf_prepare_set_stacklevel;
1178 slf_frame.check = slf_check_set_stacklevel; 1491 slf_frame.check = slf_check_set_stacklevel;
1179} 1492}
1180 1493
1181/* 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 */
1182INLINE void 1495ecb_inline void
1183transfer_tail (pTHX) 1496transfer_tail (pTHX)
1184{ 1497{
1185 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);
1186} 1511}
1187 1512
1188/* 1513/*
1189 * this is a _very_ stripped down perl interpreter ;) 1514 * this is a _very_ stripped down perl interpreter ;)
1190 */ 1515 */
… …
1212 /* 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 */
1213 PL_restartop = PL_op; 1538 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1539 perl_run (PL_curinterp);
1215 /* 1540 /*
1216 * 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
1217 * 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.
1218 */ 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;
1219 1552
1220 /* 1553 /*
1221 * 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
1222 * 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)
1223 * 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
1224 * bootstrap-time "top" top_env, as we cannot restore the "main" 1557 * doing in that case. YMMV.
1225 * coroutine as Coro has no such concept.
1226 * This actually isn't valid with the pthread backend, but OSes requiring
1227 * that backend are too broken to do it in a standards-compliant way.
1228 */ 1558 */
1229 PL_top_env = main_top_env; 1559 perlish_exit (aTHX);
1230 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1231 } 1560 }
1232} 1561}
1233 1562
1234static coro_cctx * 1563static coro_cctx *
1235cctx_new () 1564cctx_new (void)
1236{ 1565{
1237 coro_cctx *cctx; 1566 coro_cctx *cctx;
1238 1567
1239 ++cctx_count; 1568 ++cctx_count;
1240 New (0, cctx, 1, coro_cctx); 1569 New (0, cctx, 1, coro_cctx);
… …
1246 return cctx; 1575 return cctx;
1247} 1576}
1248 1577
1249/* create a new cctx only suitable as source */ 1578/* create a new cctx only suitable as source */
1250static coro_cctx * 1579static coro_cctx *
1251cctx_new_empty () 1580cctx_new_empty (void)
1252{ 1581{
1253 coro_cctx *cctx = cctx_new (); 1582 coro_cctx *cctx = cctx_new ();
1254 1583
1255 cctx->sptr = 0; 1584 cctx->stack.sptr = 0;
1256 coro_create (&cctx->cctx, 0, 0, 0, 0); 1585 coro_create (&cctx->cctx, 0, 0, 0, 0);
1257 1586
1258 return cctx; 1587 return cctx;
1259} 1588}
1260 1589
1261/* create a new cctx suitable as destination/running a perl interpreter */ 1590/* create a new cctx suitable as destination/running a perl interpreter */
1262static coro_cctx * 1591static coro_cctx *
1263cctx_new_run () 1592cctx_new_run (void)
1264{ 1593{
1265 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1266 void *stack_start;
1267 size_t stack_size;
1268 1595
1269#if HAVE_MMAP 1596 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1270 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1271 /* mmap supposedly does allocate-on-write for us */
1272 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1273
1274 if (cctx->sptr != (void *)-1)
1275 {
1276 #if CORO_STACKGUARD
1277 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1278 #endif
1279 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1280 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1281 cctx->flags |= CC_MAPPED;
1282 } 1597 {
1283 else
1284#endif
1285 {
1286 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1287 New (0, cctx->sptr, cctx_stacksize, long);
1288
1289 if (!cctx->sptr)
1290 {
1291 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1598 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1292 _exit (EXIT_FAILURE); 1599 _exit (EXIT_FAILURE);
1293 }
1294
1295 stack_start = cctx->sptr;
1296 stack_size = cctx->ssize;
1297 } 1600 }
1298 1601
1299 #if CORO_USE_VALGRIND
1300 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1301 #endif
1302
1303 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);
1304 1603
1305 return cctx; 1604 return cctx;
1306} 1605}
1307 1606
1308static void 1607static void
1309cctx_destroy (coro_cctx *cctx) 1608cctx_destroy (coro_cctx *cctx)
1310{ 1609{
1311 if (!cctx) 1610 if (!cctx)
1312 return; 1611 return;
1313 1612
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1613 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1315 1614
1316 --cctx_count; 1615 --cctx_count;
1317 coro_destroy (&cctx->cctx); 1616 coro_destroy (&cctx->cctx);
1318 1617
1319 /* coro_transfer creates new, empty cctx's */ 1618 coro_stack_free (&cctx->stack);
1320 if (cctx->sptr)
1321 {
1322 #if CORO_USE_VALGRIND
1323 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1324 #endif
1325
1326#if HAVE_MMAP
1327 if (cctx->flags & CC_MAPPED)
1328 munmap (cctx->sptr, cctx->ssize);
1329 else
1330#endif
1331 Safefree (cctx->sptr);
1332 }
1333 1619
1334 Safefree (cctx); 1620 Safefree (cctx);
1335} 1621}
1336 1622
1337/* wether this cctx should be destructed */ 1623/* wether this cctx should be destructed */
1338#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))
1339 1625
1340static coro_cctx * 1626static coro_cctx *
1341cctx_get (pTHX) 1627cctx_get (pTHX)
1342{ 1628{
1343 while (expect_true (cctx_first)) 1629 while (ecb_expect_true (cctx_first))
1344 { 1630 {
1345 coro_cctx *cctx = cctx_first; 1631 coro_cctx *cctx = cctx_first;
1346 cctx_first = cctx->next; 1632 cctx_first = cctx->next;
1347 --cctx_idle; 1633 --cctx_idle;
1348 1634
1349 if (expect_true (!CCTX_EXPIRED (cctx))) 1635 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1350 return cctx; 1636 return cctx;
1351 1637
1352 cctx_destroy (cctx); 1638 cctx_destroy (cctx);
1353 } 1639 }
1354 1640
… …
1356} 1642}
1357 1643
1358static void 1644static void
1359cctx_put (coro_cctx *cctx) 1645cctx_put (coro_cctx *cctx)
1360{ 1646{
1361 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));
1362 1648
1363 /* free another cctx if overlimit */ 1649 /* free another cctx if overlimit */
1364 if (expect_false (cctx_idle >= cctx_max_idle)) 1650 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1365 { 1651 {
1366 coro_cctx *first = cctx_first; 1652 coro_cctx *first = cctx_first;
1367 cctx_first = first->next; 1653 cctx_first = first->next;
1368 --cctx_idle; 1654 --cctx_idle;
1369 1655
… …
1380static void 1666static void
1381transfer_check (pTHX_ struct coro *prev, struct coro *next) 1667transfer_check (pTHX_ struct coro *prev, struct coro *next)
1382{ 1668{
1383 /* TODO: throwing up here is considered harmful */ 1669 /* TODO: throwing up here is considered harmful */
1384 1670
1385 if (expect_true (prev != next)) 1671 if (ecb_expect_true (prev != next))
1386 { 1672 {
1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1673 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1388 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,");
1389 1675
1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1676 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1391 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,");
1392 1678
1393#if !PERL_VERSION_ATLEAST (5,10,0) 1679#if !PERL_VERSION_ATLEAST (5,10,0)
1394 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1680 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1395 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,");
1396#endif 1682#endif
1397 } 1683 }
1398} 1684}
1399 1685
1400/* always use the TRANSFER macro */ 1686/* always use the TRANSFER macro */
1401static void NOINLINE /* noinline so we have a fixed stackframe */ 1687static void ecb_noinline /* noinline so we have a fixed stackframe */
1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1688transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1403{ 1689{
1404 dSTACKLEVEL; 1690 dSTACKLEVEL;
1405 1691
1406 /* sometimes transfer is only called to set idle_sp */ 1692 /* sometimes transfer is only called to set idle_sp */
1407 if (expect_false (!prev)) 1693 if (ecb_expect_false (!prev))
1408 { 1694 {
1409 cctx_current->idle_sp = STACKLEVEL; 1695 cctx_current->idle_sp = STACKLEVEL;
1410 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 */
1411 } 1697 }
1412 else if (expect_true (prev != next)) 1698 else if (ecb_expect_true (prev != next))
1413 { 1699 {
1414 coro_cctx *cctx_prev; 1700 coro_cctx *cctx_prev;
1415 1701
1416 if (expect_false (prev->flags & CF_NEW)) 1702 if (ecb_expect_false (prev->flags & CF_NEW))
1417 { 1703 {
1418 /* create a new empty/source context */ 1704 /* create a new empty/source context */
1419 prev->flags &= ~CF_NEW; 1705 prev->flags &= ~CF_NEW;
1420 prev->flags |= CF_RUNNING; 1706 prev->flags |= CF_RUNNING;
1421 } 1707 }
… …
1424 next->flags |= CF_RUNNING; 1710 next->flags |= CF_RUNNING;
1425 1711
1426 /* first get rid of the old state */ 1712 /* first get rid of the old state */
1427 save_perl (aTHX_ prev); 1713 save_perl (aTHX_ prev);
1428 1714
1429 if (expect_false (next->flags & CF_NEW)) 1715 if (ecb_expect_false (next->flags & CF_NEW))
1430 { 1716 {
1431 /* need to start coroutine */ 1717 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1718 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1719 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1720 init_perl (aTHX_ next);
1435 } 1721 }
1436 else 1722 else
1437 load_perl (aTHX_ next); 1723 load_perl (aTHX_ next);
1438 1724
1439 /* possibly untie and reuse the cctx */ 1725 /* possibly untie and reuse the cctx */
1440 if (expect_true ( 1726 if (ecb_expect_true (
1441 cctx_current->idle_sp == STACKLEVEL 1727 cctx_current->idle_sp == STACKLEVEL
1442 && !(cctx_current->flags & CC_TRACE) 1728 && !(cctx_current->flags & CC_TRACE)
1443 && !force_cctx 1729 && !force_cctx
1444 )) 1730 ))
1445 { 1731 {
1446 /* 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 */
1447 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));
1448 1734
1449 /* 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. */
1450 /* 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 */
1451 if (expect_false (CCTX_EXPIRED (cctx_current))) 1737 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1452 if (expect_true (!next->cctx)) 1738 if (ecb_expect_true (!next->cctx))
1453 next->cctx = cctx_get (aTHX); 1739 next->cctx = cctx_get (aTHX);
1454 1740
1455 cctx_put (cctx_current); 1741 cctx_put (cctx_current);
1456 } 1742 }
1457 else 1743 else
1458 prev->cctx = cctx_current; 1744 prev->cctx = cctx_current;
1459 1745
1460 ++next->usecount; 1746 ++next->usecount;
1461 1747
1462 cctx_prev = cctx_current; 1748 cctx_prev = cctx_current;
1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1749 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1464 1750
1465 next->cctx = 0; 1751 next->cctx = 0;
1466 1752
1467 if (expect_false (cctx_prev != cctx_current)) 1753 if (ecb_expect_false (cctx_prev != cctx_current))
1468 { 1754 {
1469 cctx_prev->top_env = PL_top_env; 1755 cctx_prev->top_env = PL_top_env;
1470 PL_top_env = cctx_current->top_env; 1756 PL_top_env = cctx_current->top_env;
1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1757 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1472 } 1758 }
… …
1478#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))
1479#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1765#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1480 1766
1481/** high level stuff ********************************************************/ 1767/** high level stuff ********************************************************/
1482 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 */
1483static int 1771static void
1772coro_call_on_destroy (pTHX_ struct coro *coro);
1773
1774static void
1484coro_state_destroy (pTHX_ struct coro *coro) 1775coro_state_destroy (pTHX_ struct coro *coro)
1485{ 1776{
1486 if (coro->flags & CF_DESTROYED) 1777 if (coro->flags & CF_ZOMBIE)
1487 return 0; 1778 return;
1488 1779
1489 if (coro->on_destroy && !PL_dirty)
1490 coro->on_destroy (aTHX_ coro); 1780 slf_destroy (aTHX_ coro);
1491 1781
1492 coro->flags |= CF_DESTROYED; 1782 coro->flags |= CF_ZOMBIE;
1493 1783
1494 if (coro->flags & CF_READY) 1784 if (coro->flags & CF_READY)
1495 { 1785 {
1496 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1786 /* reduce nready, as destroying a ready coro effectively unreadies it */
1497 /* alternative: look through all ready queues and remove the coro */ 1787 /* alternative: look through all ready queues and remove the coro */
1498 --coro_nready; 1788 --coro_nready;
1499 } 1789 }
1500 else 1790 else
1501 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;
1502 1796
1503 if (coro->mainstack 1797 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1798 && coro->mainstack != main_mainstack
1505 && coro->slot 1799 && coro->slot
1506 && !PL_dirty) 1800 && !PL_dirty)
1507 {
1508 struct coro *current = SvSTATE_current;
1509
1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1511
1512 save_perl (aTHX_ current);
1513 load_perl (aTHX_ coro);
1514
1515 coro_destruct_perl (aTHX_ coro); 1801 destroy_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1802
1522 cctx_destroy (coro->cctx); 1803 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1804 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1805 SvREFCNT_dec (coro->args);
1806 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1807 SvREFCNT_dec (CORO_THROW);
1526 1808
1527 if (coro->next) coro->next->prev = coro->prev; 1809 coro_call_on_destroy (aTHX_ coro);
1528 if (coro->prev) coro->prev->next = coro->next;
1529 if (coro == coro_first) coro_first = coro->next;
1530 1810
1531 return 1; 1811 /* more destruction mayhem in coro_state_free */
1532} 1812}
1533 1813
1534static int 1814static int
1535coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1815coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1536{ 1816{
1537 struct coro *coro = (struct coro *)mg->mg_ptr; 1817 struct coro *coro = (struct coro *)mg->mg_ptr;
1538 mg->mg_ptr = 0; 1818 mg->mg_ptr = 0;
1539 1819
1540 coro->hv = 0;
1541
1542 if (--coro->refcnt < 0)
1543 {
1544 coro_state_destroy (aTHX_ coro); 1820 coro_state_destroy (aTHX_ coro);
1821 SvREFCNT_dec (coro->on_destroy);
1822 SvREFCNT_dec (coro->status);
1823
1545 Safefree (coro); 1824 Safefree (coro);
1546 }
1547 1825
1548 return 0; 1826 return 0;
1549} 1827}
1550 1828
1551static int 1829static int ecb_cold
1552coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1830coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1553{ 1831{
1554 struct coro *coro = (struct coro *)mg->mg_ptr; 1832 /* called when perl clones the current process the slow way (windows process emulation) */
1555 1833 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1556 ++coro->refcnt; 1834 mg->mg_ptr = 0;
1835 mg->mg_virtual = 0;
1557 1836
1558 return 0; 1837 return 0;
1559} 1838}
1560 1839
1561static MGVTBL coro_state_vtbl = { 1840static MGVTBL coro_state_vtbl = {
… …
1584 1863
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1864 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1865 TRANSFER (ta, 1);
1587} 1866}
1588 1867
1589/*****************************************************************************/
1590/* gensub: simple closure generation utility */
1591
1592#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1593
1594/* create a closure from XS, returns a code reference */
1595/* the arg can be accessed via GENSUB_ARG from the callback */
1596/* the callback must use dXSARGS/XSRETURN */
1597static SV *
1598gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1599{
1600 CV *cv = (CV *)newSV (0);
1601
1602 sv_upgrade ((SV *)cv, SVt_PVCV);
1603
1604 CvANON_on (cv);
1605 CvISXSUB_on (cv);
1606 CvXSUB (cv) = xsub;
1607 GENSUB_ARG = arg;
1608
1609 return newRV_noinc ((SV *)cv);
1610}
1611
1612/** Coro ********************************************************************/ 1868/** Coro ********************************************************************/
1613 1869
1614INLINE void 1870ecb_inline void
1615coro_enq (pTHX_ struct coro *coro) 1871coro_enq (pTHX_ struct coro *coro)
1616{ 1872{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1873 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1874
1620INLINE SV * 1875 SvREFCNT_inc_NN (coro->hv);
1876
1877 coro->next_ready = 0;
1878 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1879 ready [1] = coro;
1880}
1881
1882ecb_inline struct coro *
1621coro_deq (pTHX) 1883coro_deq (pTHX)
1622{ 1884{
1623 int prio; 1885 int prio;
1624 1886
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1887 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1888 {
1627 return av_shift (coro_ready [prio]); 1889 struct coro **ready = coro_ready [prio];
1890
1891 if (ready [0])
1892 {
1893 struct coro *coro = ready [0];
1894 ready [0] = coro->next_ready;
1895 return coro;
1896 }
1897 }
1628 1898
1629 return 0; 1899 return 0;
1900}
1901
1902static void
1903invoke_sv_ready_hook_helper (void)
1904{
1905 dTHX;
1906 dSP;
1907
1908 ENTER;
1909 SAVETMPS;
1910
1911 PUSHMARK (SP);
1912 PUTBACK;
1913 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1914
1915 FREETMPS;
1916 LEAVE;
1630} 1917}
1631 1918
1632static int 1919static int
1633api_ready (pTHX_ SV *coro_sv) 1920api_ready (pTHX_ SV *coro_sv)
1634{ 1921{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1922 struct coro *coro = SvSTATE (coro_sv);
1640 1923
1641 if (coro->flags & CF_READY) 1924 if (coro->flags & CF_READY)
1642 return 0; 1925 return 0;
1643 1926
1644 coro->flags |= CF_READY; 1927 coro->flags |= CF_READY;
1645 1928
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1929 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1930
1652 if (sv_hook) 1931 if (!coro_nready++)
1653 { 1932 if (coroapi.readyhook)
1654 dSP; 1933 coroapi.readyhook ();
1655
1656 ENTER;
1657 SAVETMPS;
1658
1659 PUSHMARK (SP);
1660 PUTBACK;
1661 call_sv (sv_hook, G_VOID | G_DISCARD);
1662
1663 FREETMPS;
1664 LEAVE;
1665 }
1666
1667 if (xs_hook)
1668 xs_hook ();
1669 1934
1670 return 1; 1935 return 1;
1671} 1936}
1672 1937
1673static int 1938static int
… …
1675{ 1940{
1676 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1941 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1677} 1942}
1678 1943
1679/* expects to own a reference to next->hv */ 1944/* expects to own a reference to next->hv */
1680INLINE void 1945ecb_inline void
1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1946prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1682{ 1947{
1683 SV *prev_sv = SvRV (coro_current); 1948 SV *prev_sv = SvRV (coro_current);
1684 1949
1685 ta->prev = SvSTATE_hv (prev_sv); 1950 ta->prev = SvSTATE_hv (prev_sv);
… …
1696static void 1961static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1962prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1963{
1699 for (;;) 1964 for (;;)
1700 { 1965 {
1701 SV *next_sv = coro_deq (aTHX); 1966 struct coro *next = coro_deq (aTHX);
1702 1967
1703 if (expect_true (next_sv)) 1968 if (ecb_expect_true (next))
1704 { 1969 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1970 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1971 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1972 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1973 else
1711 { 1974 {
1712 next->flags &= ~CF_READY; 1975 next->flags &= ~CF_READY;
1713 --coro_nready; 1976 --coro_nready;
1714 1977
… …
1720 { 1983 {
1721 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1724 { 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
1725 ++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 */
1726 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 2010 --coro_nready;
1728 } 2011 }
1729 else 2012 else
1730 { 2013 {
2014 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 2015 dSP;
1732 2016
1733 ENTER; 2017 ENTER;
1734 SAVETMPS; 2018 SAVETMPS;
1735 2019
… …
1742 } 2026 }
1743 } 2027 }
1744 } 2028 }
1745} 2029}
1746 2030
1747INLINE void 2031ecb_inline void
1748prepare_cede (pTHX_ struct coro_transfer_args *ta) 2032prepare_cede (pTHX_ struct coro_transfer_args *ta)
1749{ 2033{
1750 api_ready (aTHX_ coro_current); 2034 api_ready (aTHX_ coro_current);
1751 prepare_schedule (aTHX_ ta); 2035 prepare_schedule (aTHX_ ta);
1752} 2036}
1753 2037
1754INLINE void 2038ecb_inline void
1755prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2039prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1756{ 2040{
1757 SV *prev = SvRV (coro_current); 2041 SV *prev = SvRV (coro_current);
1758 2042
1759 if (coro_nready) 2043 if (coro_nready)
… …
1789{ 2073{
1790 struct coro_transfer_args ta; 2074 struct coro_transfer_args ta;
1791 2075
1792 prepare_cede (aTHX_ &ta); 2076 prepare_cede (aTHX_ &ta);
1793 2077
1794 if (expect_true (ta.prev != ta.next)) 2078 if (ecb_expect_true (ta.prev != ta.next))
1795 { 2079 {
1796 TRANSFER (ta, 1); 2080 TRANSFER (ta, 1);
1797 return 1; 2081 return 1;
1798 } 2082 }
1799 else 2083 else
… …
1842 coro->slot->runops = RUNOPS_DEFAULT; 2126 coro->slot->runops = RUNOPS_DEFAULT;
1843 } 2127 }
1844} 2128}
1845 2129
1846static 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
1847coro_call_on_destroy (pTHX_ struct coro *coro) 2207coro_call_on_destroy (pTHX_ struct coro *coro)
1848{ 2208{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2209 AV *od = coro->on_destroy;
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851 2210
1852 if (on_destroyp) 2211 if (!od)
1853 { 2212 return;
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1855 2213
2214 coro->on_destroy = 0;
2215 sv_2mortal ((SV *)od);
2216
1856 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
1857 { 2225 {
1858 dSP; /* don't disturb outer sp */ 2226 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy);
1860
1861 PUSHMARK (SP); 2227 PUSHMARK (SP);
1862 2228
1863 if (statusp) 2229 if (coro->status)
1864 { 2230 {
1865 int i; 2231 PUTBACK;
1866 AV *status = (AV *)SvRV (*statusp); 2232 coro_push_av (aTHX_ coro->status, G_ARRAY);
1867 EXTEND (SP, AvFILLp (status) + 1); 2233 SPAGAIN;
1868
1869 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]);
1871 } 2234 }
1872 2235
1873 PUTBACK; 2236 PUTBACK;
1874 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2237 call_sv (cb, G_VOID | G_DISCARD);
1875 } 2238 }
1876 } 2239 }
1877} 2240}
1878 2241
1879static void 2242static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2243coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1881{ 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 {
1882 int i; 2258 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV ();
1885 2259
1886 av_extend (av, items - 1); 2260 av_extend (av, items - 1);
2261
1887 for (i = 0; i < items; ++i) 2262 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2263 av_push (av, SvREFCNT_inc_NN (arg [i]));
2264 }
2265}
1889 2266
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2267static void
1891 2268slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2269{
1892 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 */
1893 api_ready (aTHX_ sv_manager); 2271 api_ready (aTHX_ sv_manager);
1894 2272
1895 frame->prepare = prepare_schedule; 2273 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat; 2274 frame->check = slf_check_repeat;
1897 2275
1898 /* as a minor optimisation, we could unwind all stacks here */ 2276 /* as a minor optimisation, we could unwind all stacks here */
1899 /* 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 */
1900 /*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;
1901} 2385}
1902 2386
1903/*****************************************************************************/ 2387/*****************************************************************************/
1904/* async pool handler */ 2388/* async pool handler */
1905 2389
… …
1936slf_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)
1937{ 2421{
1938 HV *hv = (HV *)SvRV (coro_current); 2422 HV *hv = (HV *)SvRV (coro_current);
1939 struct coro *coro = SvSTATE_hv ((SV *)hv); 2423 struct coro *coro = SvSTATE_hv ((SV *)hv);
1940 2424
1941 if (expect_true (coro->saved_deffh)) 2425 if (ecb_expect_true (coro->saved_deffh))
1942 { 2426 {
1943 /* subsequent iteration */ 2427 /* subsequent iteration */
1944 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2428 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1945 coro->saved_deffh = 0; 2429 coro->saved_deffh = 0;
1946 2430
1947 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2431 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1948 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2432 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1949 { 2433 {
1950 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2434 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1951 coro->invoke_av = newAV (); 2435 return;
1952
1953 frame->prepare = prepare_nop;
1954 } 2436 }
1955 else 2437 else
1956 { 2438 {
1957 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
1958 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);
1959 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
1960 coro->prio = 0; 2449 coro->prio = 0;
1961 2450
1962 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1963 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
1964 2453
1965 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
1966 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
1967 } 2456 }
… …
1983 2472
1984static void 2473static void
1985coro_rouse_callback (pTHX_ CV *cv) 2474coro_rouse_callback (pTHX_ CV *cv)
1986{ 2475{
1987 dXSARGS; 2476 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2477 SV *data = (SV *)S_GENSUB_ARG;
1989 2478
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2479 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2480 {
1992 /* first call, set args */ 2481 /* first call, set args */
2482 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2483 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2484
1996 SvRV_set (data, (SV *)av); 2485 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2486
2000 /* better take a full copy of the arguments */ 2487 /* better take a full copy of the arguments */
2001 while (items--) 2488 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2489 av_store (av, items, newSVsv (ST (items)));
2490
2491 api_ready (aTHX_ coro);
2492 SvREFCNT_dec (coro);
2003 } 2493 }
2004 2494
2005 XSRETURN_EMPTY; 2495 XSRETURN_EMPTY;
2006} 2496}
2007 2497
2008static int 2498static int
2009slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2499slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2010{ 2500{
2011 SV *data = (SV *)frame->data; 2501 SV *data = (SV *)frame->data;
2012 2502
2013 if (CORO_THROW) 2503 if (CORO_THROW)
2014 return 0; 2504 return 0;
2015 2505
2016 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2506 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2017 return 1; 2507 return 1;
… …
2024 2514
2025 EXTEND (SP, AvFILLp (av) + 1); 2515 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2516 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2517 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2518
2029 /* we have stolen the elements, so ste length to zero and free */ 2519 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2520 AvFILLp (av) = -1;
2031 av_undef (av); 2521 av_undef (av);
2032 2522
2033 PUTBACK; 2523 PUTBACK;
2034 } 2524 }
… …
2053 cb = sv_2mortal (coro->rouse_cb); 2543 cb = sv_2mortal (coro->rouse_cb);
2054 coro->rouse_cb = 0; 2544 coro->rouse_cb = 0;
2055 } 2545 }
2056 2546
2057 if (!SvROK (cb) 2547 if (!SvROK (cb)
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2548 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2549 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2550 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2551
2062 { 2552 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2553 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2554 SV *data = (SV *)S_GENSUB_ARG;
2065 2555
2066 frame->data = (void *)data; 2556 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2557 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2558 frame->check = slf_check_rouse_wait;
2069 } 2559 }
… …
2073coro_new_rouse_cb (pTHX) 2563coro_new_rouse_cb (pTHX)
2074{ 2564{
2075 HV *hv = (HV *)SvRV (coro_current); 2565 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2566 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2567 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2568 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2569
2080 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);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2571 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2572
2083 SvREFCNT_dec (coro->rouse_cb); 2573 SvREFCNT_dec (coro->rouse_cb);
… …
2180static void 2670static void
2181slf_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)
2182{ 2672{
2183 frame->prepare = prepare_cede_notself; 2673 frame->prepare = prepare_cede_notself;
2184 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);
2185} 2694}
2186 2695
2187/* 2696/*
2188 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2189 * 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
… …
2196 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 */
2197 2706
2198 /* 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 */
2199 /* the latter happens when a new coro has been started */ 2708 /* the latter happens when a new coro has been started */
2200 /* or when a new cctx was attached to an existing coroutine */ 2709 /* or when a new cctx was attached to an existing coroutine */
2201 if (expect_true (!slf_frame.prepare)) 2710 if (ecb_expect_true (!slf_frame.prepare))
2202 { 2711 {
2203 /* first iteration */ 2712 /* first iteration */
2204 dSP; 2713 dSP;
2205 SV **arg = PL_stack_base + TOPMARK + 1; 2714 SV **arg = PL_stack_base + TOPMARK + 1;
2206 int items = SP - arg; /* args without function object */ 2715 int items = SP - arg; /* args without function object */
… …
2247 while (slf_frame.check (aTHX_ &slf_frame)); 2756 while (slf_frame.check (aTHX_ &slf_frame));
2248 2757
2249 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 */
2250 2759
2251 /* exception handling */ 2760 /* exception handling */
2252 if (expect_false (CORO_THROW)) 2761 if (ecb_expect_false (CORO_THROW))
2253 { 2762 {
2254 SV *exception = sv_2mortal (CORO_THROW); 2763 SV *exception = sv_2mortal (CORO_THROW);
2255 2764
2256 CORO_THROW = 0; 2765 CORO_THROW = 0;
2257 sv_setsv (ERRSV, exception); 2766 sv_setsv (ERRSV, exception);
2258 croak (0); 2767 croak (0);
2259 } 2768 }
2260 2769
2261 /* return value handling - mostly like entersub */ 2770 /* return value handling - mostly like entersub */
2262 /* make sure we put something on the stack in scalar context */ 2771 /* make sure we put something on the stack in scalar context */
2263 if (GIMME_V == G_SCALAR) 2772 if (GIMME_V == G_SCALAR
2773 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2264 { 2774 {
2265 dSP; 2775 dSP;
2266 SV **bot = PL_stack_base + checkmark; 2776 SV **bot = PL_stack_base + checkmark;
2267 2777
2268 if (sp == bot) /* too few, push undef */ 2778 if (sp == bot) /* too few, push undef */
2269 bot [1] = &PL_sv_undef; 2779 bot [1] = &PL_sv_undef;
2270 else if (sp != bot + 1) /* too many, take last one */ 2780 else /* too many, take last one */
2271 bot [1] = *sp; 2781 bot [1] = *sp;
2272 2782
2273 SP = bot + 1; 2783 SP = bot + 1;
2274 2784
2275 PUTBACK; 2785 PUTBACK;
… …
2308 if (PL_op->op_flags & OPf_STACKED) 2818 if (PL_op->op_flags & OPf_STACKED)
2309 { 2819 {
2310 if (items > slf_arga) 2820 if (items > slf_arga)
2311 { 2821 {
2312 slf_arga = items; 2822 slf_arga = items;
2313 free (slf_argv); 2823 Safefree (slf_argv);
2314 slf_argv = malloc (slf_arga * sizeof (SV *)); 2824 New (0, slf_argv, slf_arga, SV *);
2315 } 2825 }
2316 2826
2317 slf_argc = items; 2827 slf_argc = items;
2318 2828
2319 for (i = 0; i < items; ++i) 2829 for (i = 0; i < items; ++i)
… …
2373{ 2883{
2374 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);
2375 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2376} 2886}
2377 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
2378/*****************************************************************************/ 2980/*****************************************************************************/
2379/* PerlIO::cede */ 2981/* PerlIO::cede */
2380 2982
2381typedef struct 2983typedef struct
2382{ 2984{
2383 PerlIOBuf base; 2985 PerlIOBuf base;
2384 NV next, every; 2986 NV next, every;
2385} PerlIOCede; 2987} PerlIOCede;
2386 2988
2387static IV 2989static IV ecb_cold
2388PerlIOCede_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)
2389{ 2991{
2390 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2391 2993
2392 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2994 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2393 self->next = nvtime () + self->every; 2995 self->next = nvtime () + self->every;
2394 2996
2395 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2997 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2396} 2998}
2397 2999
2398static SV * 3000static SV * ecb_cold
2399PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3001PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2400{ 3002{
2401 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2402 3004
2403 return newSVnv (self->every); 3005 return newSVnv (self->every);
… …
2454/* Coro::Semaphore & Coro::Signal */ 3056/* Coro::Semaphore & Coro::Signal */
2455 3057
2456static SV * 3058static SV *
2457coro_waitarray_new (pTHX_ int count) 3059coro_waitarray_new (pTHX_ int count)
2458{ 3060{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3061 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 3062 AV *av = newAV ();
2461 SV **ary; 3063 SV **ary;
2462 3064
2463 /* unfortunately, building manually saves memory */ 3065 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 3066 Newx (ary, 2, SV *);
… …
2510 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2511 PUTBACK; 3113 PUTBACK;
2512 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2513 } 3115 }
2514 3116
2515 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2516 } 3118 }
2517} 3119}
2518 3120
2519static void 3121static void
2520coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2521{ 3123{
2522 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3124 /* call $sem->adjust (0) to possibly wake up some other waiters */
2523 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3125 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2524} 3126}
2525 3127
2526static int 3128static int
2527slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3129slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2528{ 3130{
2529 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2530 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;
2531 3136
2532 /* 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 */
2533 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
2534 return 0; 3143 return 0;
3144 }
2535 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2536 { 3146 {
2537 SvSTATE_current->on_destroy = 0;
2538
2539 if (acquire) 3147 if (acquire)
2540 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2541 else 3149 else
2542 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2543 3151
… …
2547 { 3155 {
2548 int i; 3156 int i;
2549 /* 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 */
2550 /* 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 */
2551 /* this avoids some degenerate memory usage cases */ 3159 /* this avoids some degenerate memory usage cases */
2552 3160 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2553 for (i = 1; i <= AvFILLp (av); ++i)
2554 if (AvARRAY (av)[i] == SvRV (coro_current)) 3161 if (AvARRAY (av)[i] == coro_hv)
2555 return 1; 3162 return 1;
2556 3163
2557 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3164 av_push (av, SvREFCNT_inc (coro_hv));
2558 return 1; 3165 return 1;
2559 } 3166 }
2560} 3167}
2561 3168
2562static int 3169static int
… …
2585 { 3192 {
2586 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3193 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2587 3194
2588 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3195 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2589 frame->prepare = prepare_schedule; 3196 frame->prepare = prepare_schedule;
2590
2591 /* to avoid race conditions when a woken-up coro gets terminated */ 3197 /* to avoid race conditions when a woken-up coro gets terminated */
2592 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3198 /* we arrange for a temporary on_destroy that calls adjust (0) */
2593 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3199 frame->destroy = coro_semaphore_destroy;
2594 } 3200 }
2595} 3201}
2596 3202
2597static void 3203static void
2598slf_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)
… …
2606{ 3212{
2607 if (items >= 2) 3213 if (items >= 2)
2608 { 3214 {
2609 /* callback form */ 3215 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 3216 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3217 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 3218
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3219 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 3220
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 3221 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 3222 coro_semaphore_adjust (aTHX_ av, 0);
2617 3223
2618 frame->prepare = prepare_nop; 3224 frame->prepare = prepare_nop;
… …
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 3248 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 3249 AvARRAY (av)[1] = cb;
2644 3250
2645 cb = av_shift (av); 3251 cb = av_shift (av);
2646 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 {
2647 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
3265 }
3266
2649 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
2650 3268
2651 --count; 3269 --count;
2652 } 3270 }
2653} 3271}
2654 3272
… …
2662static void 3280static void
2663slf_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)
2664{ 3282{
2665 AV *av = (AV *)SvRV (arg [0]); 3283 AV *av = (AV *)SvRV (arg [0]);
2666 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
2667 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]))
2668 { 3297 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 3298 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 3299 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 3300 frame->check = slf_check_nop;
2672 } 3301 }
2673 else 3302 else
2674 { 3303 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3304 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 3305
2677 av_push (av, waiter); 3306 av_push (av, waiter);
2678 3307
2679 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 */
2680 frame->prepare = prepare_schedule; 3309 frame->prepare = prepare_schedule;
… …
2698 3327
2699static void 3328static void
2700coro_aio_callback (pTHX_ CV *cv) 3329coro_aio_callback (pTHX_ CV *cv)
2701{ 3330{
2702 dXSARGS; 3331 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 3332 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 3333 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 3334 SV *data_sv = newSV (sizeof (struct io_state));
2706 3335
2707 av_extend (state, items - 1); 3336 av_extend (state, items - 1);
2708 3337
… …
2728 } 3357 }
2729 3358
2730 av_push (state, data_sv); 3359 av_push (state, data_sv);
2731 3360
2732 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
2733 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
2734 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
2735} 3364}
2736 3365
2737static int 3366static int
2738slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2739{ 3368{
… …
2744 /* it quickly returns */ 3373 /* it quickly returns */
2745 if (CORO_THROW) 3374 if (CORO_THROW)
2746 return 0; 3375 return 0;
2747 3376
2748 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
2749 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2750 return 1; 3379 return 1;
2751 3380
2752 /* restore status */ 3381 /* restore status */
2753 { 3382 {
2754 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
… …
2757 errno = data->errorno; 3386 errno = data->errorno;
2758 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
2759 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
2760 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
2761 3390
2762 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
2763 } 3392 }
2764 3393
2765 /* push result values */ 3394 /* push result values */
2766 { 3395 {
2767 dSP; 3396 dSP;
… …
2793 dSP; 3422 dSP;
2794 3423
2795 static SV *prio_cv; 3424 static SV *prio_cv;
2796 static SV *prio_sv; 3425 static SV *prio_sv;
2797 3426
2798 if (expect_false (!prio_cv)) 3427 if (ecb_expect_false (!prio_cv))
2799 { 3428 {
2800 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3429 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2801 prio_sv = newSViv (0); 3430 prio_sv = newSViv (0);
2802 } 3431 }
2803 3432
… …
2822 3451
2823 for (i = 0; i < items; ++i) 3452 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 3453 PUSHs (arg [i]);
2825 3454
2826 /* now push the callback closure */ 3455 /* now push the callback closure */
2827 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))));
2828 3457
2829 /* now call the AIO function - we assume our request is uncancelable */ 3458 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 3459 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 3460 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 3461 }
2833 3462
2834 /* 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 */
2835 frame->data = (void *)state; 3464 frame->data = (void *)state;
2836 frame->prepare = prepare_schedule; 3465 frame->prepare = prepare_schedule;
2837 frame->check = slf_check_aio_req; 3466 frame->check = slf_check_aio_req;
2838} 3467}
2839 3468
… …
2851 3480
2852#if CORO_CLONE 3481#if CORO_CLONE
2853# include "clone.c" 3482# include "clone.c"
2854#endif 3483#endif
2855 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 if (map_base == (char *)MAP_FAILED)
3591 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3592
3593 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3594
3595 load_perl_slots = (load_save_perl_slots_type)map_base;
3596 memcpy (map_base, load_ptr, load_len);
3597
3598 map_base += (load_len + 15) & ~15;
3599
3600 save_perl_slots = (load_save_perl_slots_type)map_base;
3601 memcpy (map_base, save_ptr, save_len);
3602
3603 /* we are good citizens and try to make the page read-only, so the evil evil */
3604 /* hackers might have it a bit more difficult */
3605 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3606
3607 PUTBACK;
3608 eval_pv ("undef &Coro::State::_jit", 1);
3609}
3610
3611#endif
3612
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3613MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 3614
2858PROTOTYPES: DISABLE 3615PROTOTYPES: DISABLE
2859 3616
2860BOOT: 3617BOOT:
2861{ 3618{
3619#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3620#include "state.h"
2862#ifdef USE_ITHREADS 3621#ifdef USE_ITHREADS
2863# if CORO_PTHREAD 3622# if CORO_PTHREAD
2864 coro_thx = PERL_GET_CONTEXT; 3623 coro_thx = PERL_GET_CONTEXT;
2865# endif 3624# endif
2866#endif 3625#endif
2867 BOOT_PAGESIZE; 3626 /* perl defines these to check for existance first, but why it doesn't */
3627 /* just create them one at init time is not clear to me, except for */
3628 /* programs trying to delete them, but... */
3629 /* anyway, we declare this as invalid and make sure they are initialised here */
3630 DEFSV;
3631 ERRSV;
2868 3632
2869 cctx_current = cctx_new_empty (); 3633 cctx_current = cctx_new_empty ();
2870 3634
2871 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3635 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2872 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3636 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2873 3637
2874 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3638 {
2875 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3639 /*
2876 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3640 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3641 * by coro_sig_vtbl in hash values.
3642 */
3643 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3644
3645 /* this only works if perl doesn't have a vtbl for %SIG */
3646 assert (!mg->mg_virtual);
3647
3648 /*
3649 * The irony is that the perl API itself asserts that mg_virtual
3650 * must be non-const, yet perl5porters insisted on marking their
3651 * vtbls as read-only, just to thwart perl modules from patching
3652 * them.
3653 */
3654 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3655 mg->mg_flags |= MGf_COPY;
3656
3657 coro_sigelem_vtbl = PL_vtbl_sigelem;
3658 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3659 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3660 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3661 }
2877 3662
2878 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2879 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3663 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2880 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3664 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2881 3665
2882 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3666 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2883 3667
… …
2912 coroapi.prepare_nop = prepare_nop; 3696 coroapi.prepare_nop = prepare_nop;
2913 coroapi.prepare_schedule = prepare_schedule; 3697 coroapi.prepare_schedule = prepare_schedule;
2914 coroapi.prepare_cede = prepare_cede; 3698 coroapi.prepare_cede = prepare_cede;
2915 coroapi.prepare_cede_notself = prepare_cede_notself; 3699 coroapi.prepare_cede_notself = prepare_cede_notself;
2916 3700
2917 { 3701 time_init (aTHX);
2918 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2919 3702
2920 if (!svp) croak ("Time::HiRes is required");
2921 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2922
2923 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2924 }
2925
2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3703 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3704#if CORO_JIT
3705 PUTBACK;
3706 jit_init (aTHX);
3707 SPAGAIN;
3708#endif
2927} 3709}
2928 3710
2929SV * 3711SV *
2930new (char *klass, ...) 3712new (SV *klass, ...)
2931 ALIAS: 3713 ALIAS:
2932 Coro::new = 1 3714 Coro::new = 1
2933 CODE: 3715 CODE:
2934{ 3716 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3717 OUTPUT:
2936 MAGIC *mg;
2937 HV *hv;
2938 CV *cb;
2939 int i;
2940
2941 if (items > 1)
2942 {
2943 cb = coro_sv_2cv (aTHX_ ST (1));
2944
2945 if (!ix)
2946 {
2947 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2949
2950 if (!CvROOT (cb))
2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2953 }
2954
2955 Newz (0, coro, 1, struct coro);
2956 coro->args = newAV ();
2957 coro->flags = CF_NEW;
2958
2959 if (coro_first) coro_first->prev = coro;
2960 coro->next = coro_first;
2961 coro_first = coro;
2962
2963 coro->hv = hv = newHV ();
2964 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2965 mg->mg_flags |= MGf_DUP;
2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2967
2968 if (items > 1)
2969 {
2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2980 for (i = 2; i < items; i++)
2981 av_push (coro->args, newSVsv (ST (i)));
2982 }
2983}
2984 OUTPUT:
2985 RETVAL 3718 RETVAL
2986 3719
2987void 3720void
2988transfer (...) 3721transfer (...)
2989 PROTOTYPE: $$ 3722 PROTOTYPE: $$
2990 CODE: 3723 CODE:
2991 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3724 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2992
2993bool
2994_destroy (SV *coro_sv)
2995 CODE:
2996 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2997 OUTPUT:
2998 RETVAL
2999
3000void
3001_exit (int code)
3002 PROTOTYPE: $
3003 CODE:
3004 _exit (code);
3005 3725
3006SV * 3726SV *
3007clone (Coro::State coro) 3727clone (Coro::State coro)
3008 CODE: 3728 CODE:
3009{ 3729{
… …
3064void 3784void
3065list () 3785list ()
3066 PROTOTYPE: 3786 PROTOTYPE:
3067 PPCODE: 3787 PPCODE:
3068{ 3788{
3069 struct coro *coro; 3789 struct coro *coro;
3070 for (coro = coro_first; coro; coro = coro->next) 3790 for (coro = coro_first; coro; coro = coro->next)
3071 if (coro->hv) 3791 if (coro->hv)
3072 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3792 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3073} 3793}
3074 3794
… …
3079 CODE: 3799 CODE:
3080{ 3800{
3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3801 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3082 { 3802 {
3083 struct coro *current = SvSTATE_current; 3803 struct coro *current = SvSTATE_current;
3804 struct CoroSLF slf_save;
3084 3805
3085 if (current != coro) 3806 if (current != coro)
3086 { 3807 {
3087 PUTBACK; 3808 PUTBACK;
3088 save_perl (aTHX_ current); 3809 save_perl (aTHX_ current);
3089 load_perl (aTHX_ coro); 3810 load_perl (aTHX_ coro);
3811 /* the coro is most likely in an active SLF call.
3812 * while not strictly required (the code we execute is
3813 * not allowed to call any SLF functions), it's cleaner
3814 * to reinitialise the slf_frame and restore it later.
3815 * This might one day allow us to actually do SLF calls
3816 * from code executed here.
3817 */
3818 slf_save = slf_frame;
3819 slf_frame.prepare = 0;
3090 SPAGAIN; 3820 SPAGAIN;
3091 } 3821 }
3092 3822
3093 PUSHSTACK; 3823 PUSHSTACK;
3094 3824
… …
3104 SPAGAIN; 3834 SPAGAIN;
3105 3835
3106 if (current != coro) 3836 if (current != coro)
3107 { 3837 {
3108 PUTBACK; 3838 PUTBACK;
3839 slf_frame = slf_save;
3109 save_perl (aTHX_ coro); 3840 save_perl (aTHX_ coro);
3110 load_perl (aTHX_ current); 3841 load_perl (aTHX_ current);
3111 SPAGAIN; 3842 SPAGAIN;
3112 } 3843 }
3113 } 3844 }
… …
3118 PROTOTYPE: $ 3849 PROTOTYPE: $
3119 ALIAS: 3850 ALIAS:
3120 is_ready = CF_READY 3851 is_ready = CF_READY
3121 is_running = CF_RUNNING 3852 is_running = CF_RUNNING
3122 is_new = CF_NEW 3853 is_new = CF_NEW
3123 is_destroyed = CF_DESTROYED 3854 is_destroyed = CF_ZOMBIE
3855 is_zombie = CF_ZOMBIE
3124 is_suspended = CF_SUSPENDED 3856 is_suspended = CF_SUSPENDED
3125 CODE: 3857 CODE:
3126 RETVAL = boolSV (coro->flags & ix); 3858 RETVAL = boolSV (coro->flags & ix);
3127 OUTPUT: 3859 OUTPUT:
3128 RETVAL 3860 RETVAL
3129 3861
3130void 3862void
3131throw (Coro::State self, SV *throw = &PL_sv_undef) 3863throw (SV *self, SV *exception = &PL_sv_undef)
3132 PROTOTYPE: $;$ 3864 PROTOTYPE: $;$
3133 CODE: 3865 CODE:
3134{ 3866{
3867 struct coro *coro = SvSTATE (self);
3135 struct coro *current = SvSTATE_current; 3868 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3869 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3137 SvREFCNT_dec (*throwp); 3870 SvREFCNT_dec (*exceptionp);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3871 SvGETMAGIC (exception);
3872 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3873
3874 api_ready (aTHX_ self);
3139} 3875}
3140 3876
3141void 3877void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3878api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3143 PROTOTYPE: $;$ 3879 PROTOTYPE: $;$
… …
3198 3934
3199void 3935void
3200cancel (Coro::State self) 3936cancel (Coro::State self)
3201 CODE: 3937 CODE:
3202 coro_state_destroy (aTHX_ self); 3938 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3939
3940SV *
3941enable_times (int enabled = enable_times)
3942 CODE:
3943{
3944 RETVAL = boolSV (enable_times);
3945
3946 if (enabled != enable_times)
3947 {
3948 enable_times = enabled;
3949
3950 coro_times_update ();
3951 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3952 }
3953}
3954 OUTPUT:
3955 RETVAL
3956
3957void
3958times (Coro::State self)
3959 PPCODE:
3960{
3961 struct coro *current = SvSTATE (coro_current);
3962
3963 if (ecb_expect_false (current == self))
3964 {
3965 coro_times_update ();
3966 coro_times_add (SvSTATE (coro_current));
3967 }
3968
3969 EXTEND (SP, 2);
3970 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3971 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3972
3973 if (ecb_expect_false (current == self))
3974 coro_times_sub (SvSTATE (coro_current));
3975}
3976
3977void
3978swap_sv (Coro::State coro, SV *sva, SV *svb)
3979 CODE:
3980{
3981 struct coro *current = SvSTATE_current;
3982 AV *swap_sv;
3983 int i;
3984
3985 sva = SvRV (sva);
3986 svb = SvRV (svb);
3987
3988 if (current == coro)
3989 SWAP_SVS_LEAVE (current);
3990
3991 if (!coro->swap_sv)
3992 coro->swap_sv = newAV ();
3993
3994 swap_sv = coro->swap_sv;
3995
3996 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3997 {
3998 SV *a = AvARRAY (swap_sv)[i ];
3999 SV *b = AvARRAY (swap_sv)[i + 1];
4000
4001 if (a == sva && b == svb)
4002 {
4003 SvREFCNT_dec_NN (a);
4004 SvREFCNT_dec_NN (b);
4005
4006 for (; i <= AvFILLp (swap_sv) - 2; i++)
4007 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4008
4009 AvFILLp (swap_sv) -= 2;
4010
4011 goto removed;
4012 }
4013 }
4014
4015 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4016 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4017
4018 removed:
4019
4020 if (current == coro)
4021 SWAP_SVS_ENTER (current);
4022}
3204 4023
3205 4024
3206MODULE = Coro::State PACKAGE = Coro 4025MODULE = Coro::State PACKAGE = Coro
3207 4026
3208BOOT: 4027BOOT:
3209{ 4028{
3210 int i; 4029 if (SVt_LAST > 32)
4030 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3211 4031
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4032 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4033 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4034 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4035 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3217 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4036 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3218 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4037 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3219 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4038 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4039 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221 4040
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4041 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4042 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4043 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4044 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3226 4045
3227 coro_stash = gv_stashpv ("Coro", TRUE); 4046 coro_stash = gv_stashpv ("Coro", TRUE);
3228 4047
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4048 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4049 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4050 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4051 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4052 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4053 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3235
3236 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3237 coro_ready[i] = newAV ();
3238 4054
3239 { 4055 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4056 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 4057
3242 coroapi.schedule = api_schedule; 4058 coroapi.schedule = api_schedule;
… …
3246 coroapi.ready = api_ready; 4062 coroapi.ready = api_ready;
3247 coroapi.is_ready = api_is_ready; 4063 coroapi.is_ready = api_is_ready;
3248 coroapi.nready = coro_nready; 4064 coroapi.nready = coro_nready;
3249 coroapi.current = coro_current; 4065 coroapi.current = coro_current;
3250 4066
4067 coroapi.enterleave_hook = api_enterleave_hook;
4068 coroapi.enterleave_unhook = api_enterleave_unhook;
4069 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4070
3251 /*GCoroAPI = &coroapi;*/ 4071 /*GCoroAPI = &coroapi;*/
3252 sv_setiv (sv, (IV)&coroapi); 4072 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 4073 SvREADONLY_on (sv);
3254 } 4074 }
3255} 4075}
3256 4076
4077SV *
4078async (...)
4079 PROTOTYPE: &@
4080 CODE:
4081 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4082 api_ready (aTHX_ RETVAL);
4083 OUTPUT:
4084 RETVAL
4085
4086void
4087_destroy (Coro::State coro)
4088 CODE:
4089 /* used by the manager thread */
4090 coro_state_destroy (aTHX_ coro);
4091
4092void
4093on_destroy (Coro::State coro, SV *cb)
4094 CODE:
4095 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4096
4097void
4098join (...)
4099 CODE:
4100 CORO_EXECUTE_SLF_XS (slf_init_join);
4101
3257void 4102void
3258terminate (...) 4103terminate (...)
3259 CODE: 4104 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4105 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3261 4106
3262void 4107void
4108cancel (...)
4109 CODE:
4110 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4111
4112int
4113safe_cancel (Coro::State self, ...)
4114 C_ARGS: aTHX_ self, &ST (1), items - 1
4115
4116void
3263schedule (...) 4117schedule (...)
3264 CODE: 4118 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4119 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3266 4120
3267void 4121void
… …
3286 4140
3287void 4141void
3288_set_current (SV *current) 4142_set_current (SV *current)
3289 PROTOTYPE: $ 4143 PROTOTYPE: $
3290 CODE: 4144 CODE:
3291 SvREFCNT_dec (SvRV (coro_current)); 4145 SvREFCNT_dec_NN (SvRV (coro_current));
3292 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4146 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3293 4147
3294void 4148void
3295_set_readyhook (SV *hook) 4149_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 4150 PROTOTYPE: $
3297 CODE: 4151 CODE:
3298 SvREFCNT_dec (coro_readyhook); 4152 SvREFCNT_dec (coro_readyhook);
4153 SvGETMAGIC (hook);
4154 if (SvOK (hook))
4155 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4156 coro_readyhook = newSVsv (hook);
4157 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4158 }
4159 else
4160 {
4161 coro_readyhook = 0;
4162 CORO_READYHOOK = 0;
4163 }
3300 4164
3301int 4165int
3302prio (Coro::State coro, int newprio = 0) 4166prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 4167 PROTOTYPE: $;$
3304 ALIAS: 4168 ALIAS:
… …
3310 if (items > 1) 4174 if (items > 1)
3311 { 4175 {
3312 if (ix) 4176 if (ix)
3313 newprio = coro->prio - newprio; 4177 newprio = coro->prio - newprio;
3314 4178
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4179 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4180 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 4181
3318 coro->prio = newprio; 4182 coro->prio = newprio;
3319 } 4183 }
3320} 4184}
3321 OUTPUT: 4185 OUTPUT:
… …
3368 for (i = 1; i < items; ++i) 4232 for (i = 1; i < items; ++i)
3369 av_push (av, SvREFCNT_inc_NN (ST (i))); 4233 av_push (av, SvREFCNT_inc_NN (ST (i)));
3370 4234
3371 if ((SV *)hv == &PL_sv_undef) 4235 if ((SV *)hv == &PL_sv_undef)
3372 { 4236 {
3373 PUSHMARK (SP); 4237 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3374 EXTEND (SP, 2);
3375 PUSHs (sv_Coro);
3376 PUSHs ((SV *)cv_pool_handler);
3377 PUTBACK;
3378 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3379 SPAGAIN;
3380
3381 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4238 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4239 SvREFCNT_dec_NN (sv);
3382 } 4240 }
3383 4241
3384 { 4242 {
3385 struct coro *coro = SvSTATE_hv (hv); 4243 struct coro *coro = SvSTATE_hv (hv);
3386 4244
… …
3393 api_ready (aTHX_ (SV *)hv); 4251 api_ready (aTHX_ (SV *)hv);
3394 4252
3395 if (GIMME_V != G_VOID) 4253 if (GIMME_V != G_VOID)
3396 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4254 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3397 else 4255 else
3398 SvREFCNT_dec (hv); 4256 SvREFCNT_dec_NN (hv);
3399} 4257}
3400 4258
3401SV * 4259SV *
3402rouse_cb () 4260rouse_cb ()
3403 PROTOTYPE: 4261 PROTOTYPE:
… …
3418 on_leave = 1 4276 on_leave = 1
3419 PROTOTYPE: & 4277 PROTOTYPE: &
3420 CODE: 4278 CODE:
3421{ 4279{
3422 struct coro *coro = SvSTATE_current; 4280 struct coro *coro = SvSTATE_current;
3423 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4281 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3424 4282
3425 block = (SV *)coro_sv_2cv (aTHX_ block); 4283 block = s_get_cv_croak (block);
3426 4284
3427 if (!*avp) 4285 if (!*avp)
3428 *avp = newAV (); 4286 *avp = newAV ();
3429 4287
3430 av_push (*avp, SvREFCNT_inc (block)); 4288 av_push (*avp, SvREFCNT_inc (block));
3431 4289
3432 if (!ix) 4290 if (!ix)
3433 on_enterleave_call (aTHX_ block); 4291 on_enterleave_call (aTHX_ block);
3434 4292
3435 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4293 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3436 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 4294 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3437 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4295 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3438} 4296}
3439 4297
3440 4298
3441MODULE = Coro::State PACKAGE = PerlIO::cede 4299MODULE = Coro::State PACKAGE = PerlIO::cede
3442 4300
… …
3447MODULE = Coro::State PACKAGE = Coro::Semaphore 4305MODULE = Coro::State PACKAGE = Coro::Semaphore
3448 4306
3449SV * 4307SV *
3450new (SV *klass, SV *count = 0) 4308new (SV *klass, SV *count = 0)
3451 CODE: 4309 CODE:
4310{
4311 int semcnt = 1;
4312
4313 if (count)
4314 {
4315 SvGETMAGIC (count);
4316
4317 if (SvOK (count))
4318 semcnt = SvIV (count);
4319 }
4320
3452 RETVAL = sv_bless ( 4321 RETVAL = sv_bless (
3453 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4322 coro_waitarray_new (aTHX_ semcnt),
3454 GvSTASH (CvGV (cv)) 4323 GvSTASH (CvGV (cv))
3455 ); 4324 );
4325}
3456 OUTPUT: 4326 OUTPUT:
3457 RETVAL 4327 RETVAL
3458 4328
3459# helper for Coro::Channel and others 4329# helper for Coro::Channel and others
3460SV * 4330SV *
… …
3470 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4340 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3471 OUTPUT: 4341 OUTPUT:
3472 RETVAL 4342 RETVAL
3473 4343
3474void 4344void
3475up (SV *self, int adjust = 1) 4345up (SV *self)
3476 ALIAS:
3477 adjust = 1
3478 CODE: 4346 CODE:
4347 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4348
4349void
4350adjust (SV *self, int adjust)
4351 CODE:
3479 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4352 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3480 4353
3481void 4354void
3482down (...) 4355down (...)
3483 CODE: 4356 CODE:
3484 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4357 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3506 XSRETURN_NO; 4379 XSRETURN_NO;
3507} 4380}
3508 4381
3509void 4382void
3510waiters (SV *self) 4383waiters (SV *self)
3511 PPCODE: 4384 PPCODE:
3512{ 4385{
3513 AV *av = (AV *)SvRV (self); 4386 AV *av = (AV *)SvRV (self);
3514 int wcount = AvFILLp (av) + 1 - 1; 4387 int wcount = AvFILLp (av) + 1 - 1;
3515 4388
3516 if (GIMME_V == G_SCALAR) 4389 if (GIMME_V == G_SCALAR)
… …
3525} 4398}
3526 4399
3527MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4400MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3528 4401
3529void 4402void
3530_may_delete (SV *sem, int count, int extra_refs) 4403_may_delete (SV *sem, int count, unsigned int extra_refs)
3531 PPCODE: 4404 PPCODE:
3532{ 4405{
3533 AV *av = (AV *)SvRV (sem); 4406 AV *av = (AV *)SvRV (sem);
3534 4407
3535 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4408 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3536 && AvFILLp (av) == 0 /* no waiters, just count */ 4409 && AvFILLp (av) == 0 /* no waiters, just count */
3537 && SvIV (AvARRAY (av)[0]) == count) 4410 && SvIV (AvARRAY (av)[0]) == count)
3538 XSRETURN_YES; 4411 XSRETURN_YES;
… …
3559 4432
3560void 4433void
3561broadcast (SV *self) 4434broadcast (SV *self)
3562 CODE: 4435 CODE:
3563{ 4436{
3564 AV *av = (AV *)SvRV (self); 4437 AV *av = (AV *)SvRV (self);
3565 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4438 coro_signal_wake (aTHX_ av, AvFILLp (av));
3566} 4439}
3567 4440
3568void 4441void
3569send (SV *self) 4442send (SV *self)
… …
3577 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4450 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3578} 4451}
3579 4452
3580IV 4453IV
3581awaited (SV *self) 4454awaited (SV *self)
3582 CODE: 4455 CODE:
3583 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4456 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3584 OUTPUT: 4457 OUTPUT:
3585 RETVAL 4458 RETVAL
3586 4459
3587 4460
… …
3592 4465
3593void 4466void
3594_schedule (...) 4467_schedule (...)
3595 CODE: 4468 CODE:
3596{ 4469{
3597 static int incede; 4470 static int incede;
3598 4471
3599 api_cede_notself (aTHX); 4472 api_cede_notself (aTHX);
3600 4473
3601 ++incede; 4474 ++incede;
3602 while (coro_nready >= incede && api_cede (aTHX)) 4475 while (coro_nready >= incede && api_cede (aTHX))
… …
3618 4491
3619void 4492void
3620_register (char *target, char *proto, SV *req) 4493_register (char *target, char *proto, SV *req)
3621 CODE: 4494 CODE:
3622{ 4495{
3623 CV *req_cv = coro_sv_2cv (aTHX_ req); 4496 SV *req_cv = s_get_cv_croak (req);
3624 /* newXSproto doesn't return the CV on 5.8 */ 4497 /* newXSproto doesn't return the CV on 5.8 */
3625 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4498 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3626 sv_setpv ((SV *)slf_cv, proto); 4499 sv_setpv ((SV *)slf_cv, proto);
3627 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4500 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3628} 4501}
3629 4502
4503MODULE = Coro::State PACKAGE = Coro::Select
4504
4505void
4506patch_pp_sselect ()
4507 CODE:
4508 if (!coro_old_pp_sselect)
4509 {
4510 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4511 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4512 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4513 }
4514
4515void
4516unpatch_pp_sselect ()
4517 CODE:
4518 if (coro_old_pp_sselect)
4519 {
4520 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4521 coro_old_pp_sselect = 0;
4522 }
4523
4524MODULE = Coro::State PACKAGE = Coro::Util
4525
4526void
4527_exit (int code)
4528 CODE:
4529 _exit (code);
4530
4531NV
4532time ()
4533 CODE:
4534 RETVAL = nvtime (aTHX);
4535 OUTPUT:
4536 RETVAL
4537
4538NV
4539gettimeofday ()
4540 PPCODE:
4541{
4542 UV tv [2];
4543 u2time (aTHX_ tv);
4544 EXTEND (SP, 2);
4545 PUSHs (sv_2mortal (newSVuv (tv [0])));
4546 PUSHs (sv_2mortal (newSVuv (tv [1])));
4547}
4548

Diff Legend

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