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.342 by root, Mon Dec 15 16:22:34 2008 UTC vs.
Revision 1.464 by root, Wed Jun 22 22:53:49 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 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1070 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1071 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1072 return 1;
1073}
1074
1075/* perl does not have a %SIG vtbl, we provide one so we can override */
1076/* the cwvtblagic for %SIG members */
1077static const MGVTBL coro_sig_vtbl = {
1078 0, 0, 0, 0, 0,
1079 coro_sig_copy
1080};
1081
800/* 1082/*
801 * This overrides the default magic get method of %SIG elements. 1083 * 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 1084 * 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 1085 * and instead of trying to save and restore the hash elements (extremely slow),
804 * readback here. 1086 * we just provide our own readback here.
805 */ 1087 */
806static int 1088static int ecb_cold
807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1089coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
808{ 1090{
809 const char *s = MgPV_nolen_const (mg); 1091 const char *s = MgPV_nolen_const (mg);
810 1092
811 if (*s == '_') 1093 if (*s == '_')
812 { 1094 {
813 SV **svp = 0; 1095 SV **svp = 0;
814 1096
815 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1097 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
816 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1098 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
817 1099
818 if (svp) 1100 if (svp)
819 { 1101 {
820 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1102 SV *ssv;
1103
1104 if (!*svp)
1105 ssv = &PL_sv_undef;
1106 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1107 ssv = sv_2mortal (newRV_inc (*svp));
1108 else
1109 ssv = *svp;
1110
1111 sv_setsv (sv, ssv);
821 return 0; 1112 return 0;
822 } 1113 }
823 } 1114 }
824 1115
825 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1116 return PL_vtbl_sigelem.svt_get ? PL_vtbl_sigelem.svt_get (aTHX_ sv, mg) : 0;
826} 1117}
827 1118
828static int 1119static int ecb_cold
829coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1120coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
830{ 1121{
831 const char *s = MgPV_nolen_const (mg); 1122 const char *s = MgPV_nolen_const (mg);
832 1123
833 if (*s == '_') 1124 if (*s == '_')
… …
844 SvREFCNT_dec (old); 1135 SvREFCNT_dec (old);
845 return 0; 1136 return 0;
846 } 1137 }
847 } 1138 }
848 1139
849 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1140 return PL_vtbl_sigelem.svt_clear ? PL_vtbl_sigelem.svt_clear (aTHX_ sv, mg) : 0;
850} 1141}
851 1142
852static int 1143static int ecb_cold
853coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1144coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
854{ 1145{
855 const char *s = MgPV_nolen_const (mg); 1146 const char *s = MgPV_nolen_const (mg);
856 1147
857 if (*s == '_') 1148 if (*s == '_')
… …
868 SvREFCNT_dec (old); 1159 SvREFCNT_dec (old);
869 return 0; 1160 return 0;
870 } 1161 }
871 } 1162 }
872 1163
873 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 1164 return PL_vtbl_sigelem.svt_set ? PL_vtbl_sigelem.svt_set (aTHX_ sv, mg) : 0;
874} 1165}
875 1166
876static void 1167static void
877prepare_nop (pTHX_ struct coro_transfer_args *ta) 1168prepare_nop (pTHX_ struct coro_transfer_args *ta)
878{ 1169{
… …
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 1181slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 1182{
892 return 1; 1183 return 1;
893} 1184}
894 1185
895static UNOP coro_setup_op; 1186/** coroutine stack handling ************************************************/
896 1187
897static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1188static UNOP init_perl_op;
1189
1190ecb_noinline static void /* noinline to keep it out of the transfer fast path */
898coro_setup (pTHX_ struct coro *coro) 1191init_perl (pTHX_ struct coro *coro)
899{ 1192{
900 /* 1193 /*
901 * emulate part of the perl startup here. 1194 * emulate part of the perl startup here.
902 */ 1195 */
903 coro_init_stacks (aTHX); 1196 coro_init_stacks (aTHX);
… …
910 PL_comppad_name_fill = 0; 1203 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0; 1204 PL_comppad_name_floor = 0;
912 PL_curpm = 0; 1205 PL_curpm = 0;
913 PL_curpad = 0; 1206 PL_curpad = 0;
914 PL_localizing = 0; 1207 PL_localizing = 0;
915 PL_dirty = 0;
916 PL_restartop = 0; 1208 PL_restartop = 0;
917#if PERL_VERSION_ATLEAST (5,10,0) 1209#if PERL_VERSION_ATLEAST (5,10,0)
918 PL_parser = 0; 1210 PL_parser = 0;
919#endif 1211#endif
920 PL_hints = 0; 1212 PL_hints = 0;
921 1213
922 /* recreate the die/warn hooks */ 1214 /* recreate the die/warn hooks */
923 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1215 PL_diehook = SvREFCNT_inc (rv_diehook);
924 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1216 PL_warnhook = SvREFCNT_inc (rv_warnhook);
925 1217
926 GvSV (PL_defgv) = newSV (0); 1218 GvSV (PL_defgv) = newSV (0);
927 GvAV (PL_defgv) = coro->args; coro->args = 0; 1219 GvAV (PL_defgv) = coro->args; coro->args = 0;
928 GvSV (PL_errgv) = newSV (0); 1220 GvSV (PL_errgv) = newSV (0);
929 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1221 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
930 GvHV (PL_hintgv) = 0; 1222 GvHV (PL_hintgv) = newHV ();
1223#if PERL_VERSION_ATLEAST (5,10,0)
1224 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1225#endif
931 PL_rs = newSVsv (GvSV (irsgv)); 1226 PL_rs = newSVsv (GvSV (irsgv));
932 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1227 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
933 1228
934 { 1229 {
935 dSP; 1230 dSP;
… …
950 /* this newly created coroutine might be run on an existing cctx which most 1245 /* this newly created coroutine might be run on an existing cctx which most
951 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1246 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
952 */ 1247 */
953 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1248 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
954 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1249 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1250 slf_frame.destroy = 0;
955 1251
956 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1252 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
957 coro_setup_op.op_next = PL_op; 1253 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1254 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1255 init_perl_op.op_ppaddr = pp_slf;
960 /* no flags etc. required, as an init function won't be called */ 1256 /* no flags etc. required, as an init function won't be called */
961 1257
962 PL_op = (OP *)&coro_setup_op; 1258 PL_op = (OP *)&init_perl_op;
963 1259
964 /* copy throw, in case it was set before coro_setup */ 1260 /* copy throw, in case it was set before init_perl */
965 CORO_THROW = coro->except; 1261 CORO_THROW = coro->except;
1262
1263 SWAP_SVS_ENTER (coro);
1264
1265 if (ecb_expect_false (enable_times))
1266 {
1267 coro_times_update ();
1268 coro_times_sub (coro);
1269 }
966} 1270}
967 1271
968static void 1272static void
969coro_unwind_stacks (pTHX) 1273coro_unwind_stacks (pTHX)
970{ 1274{
… …
985 dounwind (-1); 1289 dounwind (-1);
986 } 1290 }
987} 1291}
988 1292
989static void 1293static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1294destroy_perl (pTHX_ struct coro *coro)
991{ 1295{
1296 SV *svf [9];
1297
1298 {
1299 SV *old_current = SvRV (coro_current);
1300 struct coro *current = SvSTATE (old_current);
1301
1302 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1303
1304 save_perl (aTHX_ current);
1305
1306 /* this will cause transfer_check to croak on block*/
1307 SvRV_set (coro_current, (SV *)coro->hv);
1308
1309 load_perl (aTHX_ coro);
1310
1311 /* restore swapped sv's */
1312 SWAP_SVS_LEAVE (coro);
1313
992 coro_unwind_stacks (aTHX); 1314 coro_unwind_stacks (aTHX);
993 1315
994 SvREFCNT_dec (GvSV (PL_defgv)); 1316 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 1317
1002 SvREFCNT_dec (PL_diehook); 1318 /* now save some sv's to be free'd later */
1003 SvREFCNT_dec (PL_warnhook); 1319 svf [0] = GvSV (PL_defgv);
1320 svf [1] = (SV *)GvAV (PL_defgv);
1321 svf [2] = GvSV (PL_errgv);
1322 svf [3] = (SV *)PL_defoutgv;
1323 svf [4] = PL_rs;
1324 svf [5] = GvSV (irsgv);
1325 svf [6] = (SV *)GvHV (PL_hintgv);
1326 svf [7] = PL_diehook;
1327 svf [8] = PL_warnhook;
1328 assert (9 == sizeof (svf) / sizeof (*svf));
1329
1330 SvRV_set (coro_current, old_current);
1331
1332 load_perl (aTHX_ current);
1004 1333 }
1334
1335 {
1336 unsigned int i;
1337
1338 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1339 SvREFCNT_dec (svf [i]);
1340
1005 SvREFCNT_dec (coro->saved_deffh); 1341 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1342 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1343 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1344 SvREFCNT_dec (coro->invoke_av);
1009 1345 SvREFCNT_dec (coro->on_enter_xs);
1010 coro_destruct_stacks (aTHX); 1346 SvREFCNT_dec (coro->on_leave_xs);
1347 }
1011} 1348}
1012 1349
1013INLINE void 1350ecb_inline void
1014free_coro_mortal (pTHX) 1351free_coro_mortal (pTHX)
1015{ 1352{
1016 if (expect_true (coro_mortal)) 1353 if (ecb_expect_true (coro_mortal))
1017 { 1354 {
1018 SvREFCNT_dec (coro_mortal); 1355 SvREFCNT_dec ((SV *)coro_mortal);
1019 coro_mortal = 0; 1356 coro_mortal = 0;
1020 } 1357 }
1021} 1358}
1022 1359
1023static int 1360static int
… …
1077 1414
1078 if (PL_curcop != &PL_compiling) 1415 if (PL_curcop != &PL_compiling)
1079 { 1416 {
1080 SV **cb; 1417 SV **cb;
1081 1418
1082 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1419 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1083 { 1420 {
1084 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1421 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1085 1422
1086 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1423 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1087 { 1424 {
… …
1156 1493
1157 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1494 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1158} 1495}
1159 1496
1160/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1497/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1161static void NOINLINE 1498static void ecb_noinline
1162cctx_prepare (pTHX) 1499cctx_prepare (pTHX)
1163{ 1500{
1164 PL_top_env = &PL_start_env; 1501 PL_top_env = &PL_start_env;
1165 1502
1166 if (cctx_current->flags & CC_TRACE) 1503 if (cctx_current->flags & CC_TRACE)
… …
1177 slf_frame.prepare = slf_prepare_set_stacklevel; 1514 slf_frame.prepare = slf_prepare_set_stacklevel;
1178 slf_frame.check = slf_check_set_stacklevel; 1515 slf_frame.check = slf_check_set_stacklevel;
1179} 1516}
1180 1517
1181/* the tail of transfer: execute stuff we can only do after a transfer */ 1518/* the tail of transfer: execute stuff we can only do after a transfer */
1182INLINE void 1519ecb_inline void
1183transfer_tail (pTHX) 1520transfer_tail (pTHX)
1184{ 1521{
1185 free_coro_mortal (aTHX); 1522 free_coro_mortal (aTHX);
1523}
1524
1525/* try to exit the same way perl's main function would do */
1526/* we do not bother resetting the environment or other things *7
1527/* that are not, uhm, essential */
1528/* this obviously also doesn't work when perl is embedded */
1529static void ecb_noinline ecb_cold
1530perlish_exit (pTHX)
1531{
1532 int exitstatus = perl_destruct (PL_curinterp);
1533 perl_free (PL_curinterp);
1534 exit (exitstatus);
1186} 1535}
1187 1536
1188/* 1537/*
1189 * this is a _very_ stripped down perl interpreter ;) 1538 * this is a _very_ stripped down perl interpreter ;)
1190 */ 1539 */
… …
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1561 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1562 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1563 perl_run (PL_curinterp);
1215 /* 1564 /*
1216 * Unfortunately, there is no way to get at the return values of the 1565 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1566 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1567 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1568 */
1569
1570 /*
1571 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1572 * requires PL_scopestack_ix, so do it here if required.
1573 */
1574 if (!PL_scopestack_ix)
1575 ENTER;
1219 1576
1220 /* 1577 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1578 * If perl-run returns we assume exit() was being called or the coro
1222 * fell off the end, which seems to be the only valid (non-bug) 1579 * fell off the end, which seems to be the only valid (non-bug)
1223 * reason for perl_run to return. We try to exit by jumping to the 1580 * reason for perl_run to return. We try to mimic whatever perl is normally
1224 * bootstrap-time "top" top_env, as we cannot restore the "main" 1581 * 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 */ 1582 */
1229 PL_top_env = main_top_env; 1583 perlish_exit (aTHX);
1230 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1231 } 1584 }
1232} 1585}
1233 1586
1234static coro_cctx * 1587static coro_cctx *
1235cctx_new () 1588cctx_new (void)
1236{ 1589{
1237 coro_cctx *cctx; 1590 coro_cctx *cctx;
1238 1591
1239 ++cctx_count; 1592 ++cctx_count;
1240 New (0, cctx, 1, coro_cctx); 1593 New (0, cctx, 1, coro_cctx);
… …
1246 return cctx; 1599 return cctx;
1247} 1600}
1248 1601
1249/* create a new cctx only suitable as source */ 1602/* create a new cctx only suitable as source */
1250static coro_cctx * 1603static coro_cctx *
1251cctx_new_empty () 1604cctx_new_empty (void)
1252{ 1605{
1253 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1254 1607
1255 cctx->sptr = 0; 1608 cctx->stack.sptr = 0;
1256 coro_create (&cctx->cctx, 0, 0, 0, 0); 1609 coro_create (&cctx->cctx, 0, 0, 0, 0);
1257 1610
1258 return cctx; 1611 return cctx;
1259} 1612}
1260 1613
1261/* create a new cctx suitable as destination/running a perl interpreter */ 1614/* create a new cctx suitable as destination/running a perl interpreter */
1262static coro_cctx * 1615static coro_cctx *
1263cctx_new_run () 1616cctx_new_run (void)
1264{ 1617{
1265 coro_cctx *cctx = cctx_new (); 1618 coro_cctx *cctx = cctx_new ();
1266 void *stack_start;
1267 size_t stack_size;
1268 1619
1269#if HAVE_MMAP 1620 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 } 1621 {
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."); 1622 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1292 _exit (EXIT_FAILURE); 1623 _exit (EXIT_FAILURE);
1293 }
1294
1295 stack_start = cctx->sptr;
1296 stack_size = cctx->ssize;
1297 } 1624 }
1298 1625
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); 1626 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1304 1627
1305 return cctx; 1628 return cctx;
1306} 1629}
1307 1630
1308static void 1631static void
1309cctx_destroy (coro_cctx *cctx) 1632cctx_destroy (coro_cctx *cctx)
1310{ 1633{
1311 if (!cctx) 1634 if (!cctx)
1312 return; 1635 return;
1313 1636
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1637 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1315 1638
1316 --cctx_count; 1639 --cctx_count;
1317 coro_destroy (&cctx->cctx); 1640 coro_destroy (&cctx->cctx);
1318 1641
1319 /* coro_transfer creates new, empty cctx's */ 1642 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 1643
1334 Safefree (cctx); 1644 Safefree (cctx);
1335} 1645}
1336 1646
1337/* wether this cctx should be destructed */ 1647/* wether this cctx should be destructed */
1338#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1648#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1339 1649
1340static coro_cctx * 1650static coro_cctx *
1341cctx_get (pTHX) 1651cctx_get (pTHX)
1342{ 1652{
1343 while (expect_true (cctx_first)) 1653 while (ecb_expect_true (cctx_first))
1344 { 1654 {
1345 coro_cctx *cctx = cctx_first; 1655 coro_cctx *cctx = cctx_first;
1346 cctx_first = cctx->next; 1656 cctx_first = cctx->next;
1347 --cctx_idle; 1657 --cctx_idle;
1348 1658
1349 if (expect_true (!CCTX_EXPIRED (cctx))) 1659 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1350 return cctx; 1660 return cctx;
1351 1661
1352 cctx_destroy (cctx); 1662 cctx_destroy (cctx);
1353 } 1663 }
1354 1664
… …
1356} 1666}
1357 1667
1358static void 1668static void
1359cctx_put (coro_cctx *cctx) 1669cctx_put (coro_cctx *cctx)
1360{ 1670{
1361 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1671 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1362 1672
1363 /* free another cctx if overlimit */ 1673 /* free another cctx if overlimit */
1364 if (expect_false (cctx_idle >= cctx_max_idle)) 1674 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1365 { 1675 {
1366 coro_cctx *first = cctx_first; 1676 coro_cctx *first = cctx_first;
1367 cctx_first = first->next; 1677 cctx_first = first->next;
1368 --cctx_idle; 1678 --cctx_idle;
1369 1679
… …
1380static void 1690static void
1381transfer_check (pTHX_ struct coro *prev, struct coro *next) 1691transfer_check (pTHX_ struct coro *prev, struct coro *next)
1382{ 1692{
1383 /* TODO: throwing up here is considered harmful */ 1693 /* TODO: throwing up here is considered harmful */
1384 1694
1385 if (expect_true (prev != next)) 1695 if (ecb_expect_true (prev != next))
1386 { 1696 {
1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1697 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,"); 1698 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1389 1699
1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1700 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,"); 1701 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1392 1702
1393#if !PERL_VERSION_ATLEAST (5,10,0) 1703#if !PERL_VERSION_ATLEAST (5,10,0)
1394 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1704 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,"); 1705 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1396#endif 1706#endif
1397 } 1707 }
1398} 1708}
1399 1709
1400/* always use the TRANSFER macro */ 1710/* always use the TRANSFER macro */
1401static void NOINLINE /* noinline so we have a fixed stackframe */ 1711static void ecb_noinline /* noinline so we have a fixed stackframe */
1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1712transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1403{ 1713{
1404 dSTACKLEVEL; 1714 dSTACKLEVEL;
1405 1715
1406 /* sometimes transfer is only called to set idle_sp */ 1716 /* sometimes transfer is only called to set idle_sp */
1407 if (expect_false (!prev)) 1717 if (ecb_expect_false (!prev))
1408 { 1718 {
1409 cctx_current->idle_sp = STACKLEVEL; 1719 cctx_current->idle_sp = STACKLEVEL;
1410 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1720 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1411 } 1721 }
1412 else if (expect_true (prev != next)) 1722 else if (ecb_expect_true (prev != next))
1413 { 1723 {
1414 coro_cctx *cctx_prev; 1724 coro_cctx *cctx_prev;
1415 1725
1416 if (expect_false (prev->flags & CF_NEW)) 1726 if (ecb_expect_false (prev->flags & CF_NEW))
1417 { 1727 {
1418 /* create a new empty/source context */ 1728 /* create a new empty/source context */
1419 prev->flags &= ~CF_NEW; 1729 prev->flags &= ~CF_NEW;
1420 prev->flags |= CF_RUNNING; 1730 prev->flags |= CF_RUNNING;
1421 } 1731 }
… …
1424 next->flags |= CF_RUNNING; 1734 next->flags |= CF_RUNNING;
1425 1735
1426 /* first get rid of the old state */ 1736 /* first get rid of the old state */
1427 save_perl (aTHX_ prev); 1737 save_perl (aTHX_ prev);
1428 1738
1429 if (expect_false (next->flags & CF_NEW)) 1739 if (ecb_expect_false (next->flags & CF_NEW))
1430 { 1740 {
1431 /* need to start coroutine */ 1741 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1742 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1743 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1744 init_perl (aTHX_ next);
1435 } 1745 }
1436 else 1746 else
1437 load_perl (aTHX_ next); 1747 load_perl (aTHX_ next);
1438 1748
1439 /* possibly untie and reuse the cctx */ 1749 /* possibly untie and reuse the cctx */
1440 if (expect_true ( 1750 if (ecb_expect_true (
1441 cctx_current->idle_sp == STACKLEVEL 1751 cctx_current->idle_sp == STACKLEVEL
1442 && !(cctx_current->flags & CC_TRACE) 1752 && !(cctx_current->flags & CC_TRACE)
1443 && !force_cctx 1753 && !force_cctx
1444 )) 1754 ))
1445 { 1755 {
1446 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1756 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1447 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1757 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1448 1758
1449 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1759 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1450 /* without this the next cctx_get might destroy the running cctx while still in use */ 1760 /* without this the next cctx_get might destroy the running cctx while still in use */
1451 if (expect_false (CCTX_EXPIRED (cctx_current))) 1761 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1452 if (expect_true (!next->cctx)) 1762 if (ecb_expect_true (!next->cctx))
1453 next->cctx = cctx_get (aTHX); 1763 next->cctx = cctx_get (aTHX);
1454 1764
1455 cctx_put (cctx_current); 1765 cctx_put (cctx_current);
1456 } 1766 }
1457 else 1767 else
1458 prev->cctx = cctx_current; 1768 prev->cctx = cctx_current;
1459 1769
1460 ++next->usecount; 1770 ++next->usecount;
1461 1771
1462 cctx_prev = cctx_current; 1772 cctx_prev = cctx_current;
1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1773 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1464 1774
1465 next->cctx = 0; 1775 next->cctx = 0;
1466 1776
1467 if (expect_false (cctx_prev != cctx_current)) 1777 if (ecb_expect_false (cctx_prev != cctx_current))
1468 { 1778 {
1469 cctx_prev->top_env = PL_top_env; 1779 cctx_prev->top_env = PL_top_env;
1470 PL_top_env = cctx_current->top_env; 1780 PL_top_env = cctx_current->top_env;
1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1781 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1472 } 1782 }
… …
1478#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1788#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1479#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1789#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1480 1790
1481/** high level stuff ********************************************************/ 1791/** high level stuff ********************************************************/
1482 1792
1793/* this function is actually Coro, not Coro::State, but we call it from here */
1794/* because it is convenient - but it hasn't been declared yet for that reason */
1483static int 1795static void
1796coro_call_on_destroy (pTHX_ struct coro *coro);
1797
1798static void
1484coro_state_destroy (pTHX_ struct coro *coro) 1799coro_state_destroy (pTHX_ struct coro *coro)
1485{ 1800{
1486 if (coro->flags & CF_DESTROYED) 1801 if (coro->flags & CF_ZOMBIE)
1487 return 0; 1802 return;
1488 1803
1489 if (coro->on_destroy)
1490 coro->on_destroy (aTHX_ coro); 1804 slf_destroy (aTHX_ coro);
1491 1805
1492 coro->flags |= CF_DESTROYED; 1806 coro->flags |= CF_ZOMBIE;
1493 1807
1494 if (coro->flags & CF_READY) 1808 if (coro->flags & CF_READY)
1495 { 1809 {
1496 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1810 /* reduce nready, as destroying a ready coro effectively unreadies it */
1497 /* alternative: look through all ready queues and remove the coro */ 1811 /* alternative: look through all ready queues and remove the coro */
1498 --coro_nready; 1812 --coro_nready;
1499 } 1813 }
1500 else 1814 else
1501 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1815 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1816
1817 if (coro->next) coro->next->prev = coro->prev;
1818 if (coro->prev) coro->prev->next = coro->next;
1819 if (coro == coro_first) coro_first = coro->next;
1502 1820
1503 if (coro->mainstack 1821 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1822 && coro->mainstack != main_mainstack
1505 && coro->slot 1823 && coro->slot
1506 && !PL_dirty) 1824 && !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); 1825 destroy_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1826
1522 cctx_destroy (coro->cctx); 1827 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1828 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1829 SvREFCNT_dec (coro->args);
1830 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1831 SvREFCNT_dec (CORO_THROW);
1526 1832
1527 if (coro->next) coro->next->prev = coro->prev; 1833 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 1834
1531 return 1; 1835 /* more destruction mayhem in coro_state_free */
1532} 1836}
1533 1837
1534static int 1838static int
1535coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1839coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1536{ 1840{
1537 struct coro *coro = (struct coro *)mg->mg_ptr; 1841 struct coro *coro = (struct coro *)mg->mg_ptr;
1538 mg->mg_ptr = 0; 1842 mg->mg_ptr = 0;
1539 1843
1540 coro->hv = 0;
1541
1542 if (--coro->refcnt < 0)
1543 {
1544 coro_state_destroy (aTHX_ coro); 1844 coro_state_destroy (aTHX_ coro);
1845 SvREFCNT_dec (coro->on_destroy);
1846 SvREFCNT_dec (coro->status);
1847
1545 Safefree (coro); 1848 Safefree (coro);
1546 }
1547 1849
1548 return 0; 1850 return 0;
1549} 1851}
1550 1852
1551static int 1853static int ecb_cold
1552coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1854coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1553{ 1855{
1554 struct coro *coro = (struct coro *)mg->mg_ptr; 1856 /* called when perl clones the current process the slow way (windows process emulation) */
1555 1857 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1556 ++coro->refcnt; 1858 mg->mg_ptr = 0;
1859 mg->mg_virtual = 0;
1557 1860
1558 return 0; 1861 return 0;
1559} 1862}
1560 1863
1561static MGVTBL coro_state_vtbl = { 1864static MGVTBL coro_state_vtbl = {
… …
1584 1887
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1888 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1889 TRANSFER (ta, 1);
1587} 1890}
1588 1891
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 ********************************************************************/ 1892/** Coro ********************************************************************/
1613 1893
1614INLINE void 1894ecb_inline void
1615coro_enq (pTHX_ struct coro *coro) 1895coro_enq (pTHX_ struct coro *coro)
1616{ 1896{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1897 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1898
1620INLINE SV * 1899 SvREFCNT_inc_NN (coro->hv);
1900
1901 coro->next_ready = 0;
1902 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1903 ready [1] = coro;
1904}
1905
1906ecb_inline struct coro *
1621coro_deq (pTHX) 1907coro_deq (pTHX)
1622{ 1908{
1623 int prio; 1909 int prio;
1624 1910
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1911 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1912 {
1627 return av_shift (coro_ready [prio]); 1913 struct coro **ready = coro_ready [prio];
1914
1915 if (ready [0])
1916 {
1917 struct coro *coro = ready [0];
1918 ready [0] = coro->next_ready;
1919 return coro;
1920 }
1921 }
1628 1922
1629 return 0; 1923 return 0;
1924}
1925
1926static void
1927invoke_sv_ready_hook_helper (void)
1928{
1929 dTHX;
1930 dSP;
1931
1932 ENTER;
1933 SAVETMPS;
1934
1935 PUSHMARK (SP);
1936 PUTBACK;
1937 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1630} 1941}
1631 1942
1632static int 1943static int
1633api_ready (pTHX_ SV *coro_sv) 1944api_ready (pTHX_ SV *coro_sv)
1634{ 1945{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1946 struct coro *coro = SvSTATE (coro_sv);
1640 1947
1641 if (coro->flags & CF_READY) 1948 if (coro->flags & CF_READY)
1642 return 0; 1949 return 0;
1643 1950
1644 coro->flags |= CF_READY; 1951 coro->flags |= CF_READY;
1645 1952
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1953 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1954
1652 if (sv_hook) 1955 if (!coro_nready++)
1653 { 1956 if (coroapi.readyhook)
1654 dSP; 1957 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 1958
1670 return 1; 1959 return 1;
1671} 1960}
1672 1961
1673static int 1962static int
… …
1675{ 1964{
1676 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1965 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1677} 1966}
1678 1967
1679/* expects to own a reference to next->hv */ 1968/* expects to own a reference to next->hv */
1680INLINE void 1969ecb_inline void
1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1970prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1682{ 1971{
1683 SV *prev_sv = SvRV (coro_current); 1972 SV *prev_sv = SvRV (coro_current);
1684 1973
1685 ta->prev = SvSTATE_hv (prev_sv); 1974 ta->prev = SvSTATE_hv (prev_sv);
… …
1696static void 1985static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1986prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1987{
1699 for (;;) 1988 for (;;)
1700 { 1989 {
1701 SV *next_sv = coro_deq (aTHX); 1990 struct coro *next = coro_deq (aTHX);
1702 1991
1703 if (expect_true (next_sv)) 1992 if (ecb_expect_true (next))
1704 { 1993 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1994 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1995 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 */ 1996 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1997 else
1711 { 1998 {
1712 next->flags &= ~CF_READY; 1999 next->flags &= ~CF_READY;
1713 --coro_nready; 2000 --coro_nready;
1714 2001
… …
1720 { 2007 {
1721 /* nothing to schedule: call the idle handler */ 2008 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 2009 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 2010 && SvOBJECT (SvRV (sv_idle)))
1724 { 2011 {
2012 if (SvRV (sv_idle) == SvRV (coro_current))
2013 {
2014 require_pv ("Carp");
2015
2016 {
2017 dSP;
2018
2019 ENTER;
2020 SAVETMPS;
2021
2022 PUSHMARK (SP);
2023 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2024 PUTBACK;
2025 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2026
2027 FREETMPS;
2028 LEAVE;
2029 }
2030 }
2031
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2032 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle)); 2033 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 2034 --coro_nready;
1728 } 2035 }
1729 else 2036 else
1730 { 2037 {
2038 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 2039 dSP;
1732 2040
1733 ENTER; 2041 ENTER;
1734 SAVETMPS; 2042 SAVETMPS;
1735 2043
… …
1742 } 2050 }
1743 } 2051 }
1744 } 2052 }
1745} 2053}
1746 2054
1747INLINE void 2055ecb_inline void
1748prepare_cede (pTHX_ struct coro_transfer_args *ta) 2056prepare_cede (pTHX_ struct coro_transfer_args *ta)
1749{ 2057{
1750 api_ready (aTHX_ coro_current); 2058 api_ready (aTHX_ coro_current);
1751 prepare_schedule (aTHX_ ta); 2059 prepare_schedule (aTHX_ ta);
1752} 2060}
1753 2061
1754INLINE void 2062ecb_inline void
1755prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1756{ 2064{
1757 SV *prev = SvRV (coro_current); 2065 SV *prev = SvRV (coro_current);
1758 2066
1759 if (coro_nready) 2067 if (coro_nready)
… …
1789{ 2097{
1790 struct coro_transfer_args ta; 2098 struct coro_transfer_args ta;
1791 2099
1792 prepare_cede (aTHX_ &ta); 2100 prepare_cede (aTHX_ &ta);
1793 2101
1794 if (expect_true (ta.prev != ta.next)) 2102 if (ecb_expect_true (ta.prev != ta.next))
1795 { 2103 {
1796 TRANSFER (ta, 1); 2104 TRANSFER (ta, 1);
1797 return 1; 2105 return 1;
1798 } 2106 }
1799 else 2107 else
… …
1842 coro->slot->runops = RUNOPS_DEFAULT; 2150 coro->slot->runops = RUNOPS_DEFAULT;
1843 } 2151 }
1844} 2152}
1845 2153
1846static void 2154static void
2155coro_push_av (pTHX_ AV *av, I32 gimme_v)
2156{
2157 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2158 {
2159 dSP;
2160
2161 if (gimme_v == G_SCALAR)
2162 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2163 else
2164 {
2165 int i;
2166 EXTEND (SP, AvFILLp (av) + 1);
2167
2168 for (i = 0; i <= AvFILLp (av); ++i)
2169 PUSHs (AvARRAY (av)[i]);
2170 }
2171
2172 PUTBACK;
2173 }
2174}
2175
2176static void
2177coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2178{
2179 if (!coro->on_destroy)
2180 coro->on_destroy = newAV ();
2181
2182 av_push (coro->on_destroy, cb);
2183}
2184
2185static void
2186slf_destroy_join (pTHX_ struct CoroSLF *frame)
2187{
2188 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2189}
2190
2191static int
2192slf_check_join (pTHX_ struct CoroSLF *frame)
2193{
2194 struct coro *coro = (struct coro *)frame->data;
2195
2196 if (!coro->status)
2197 return 1;
2198
2199 frame->destroy = 0;
2200
2201 coro_push_av (aTHX_ coro->status, GIMME_V);
2202
2203 SvREFCNT_dec ((SV *)coro->hv);
2204
2205 return 0;
2206}
2207
2208static void
2209slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2210{
2211 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2212
2213 if (items > 1)
2214 croak ("join called with too many arguments");
2215
2216 if (coro->status)
2217 frame->prepare = prepare_nop;
2218 else
2219 {
2220 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2221 frame->prepare = prepare_schedule;
2222 }
2223
2224 frame->check = slf_check_join;
2225 frame->destroy = slf_destroy_join;
2226 frame->data = (void *)coro;
2227 SvREFCNT_inc (coro->hv);
2228}
2229
2230static void
1847coro_call_on_destroy (pTHX_ struct coro *coro) 2231coro_call_on_destroy (pTHX_ struct coro *coro)
1848{ 2232{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2233 AV *od = coro->on_destroy;
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851 2234
1852 if (on_destroyp) 2235 if (!od)
1853 { 2236 return;
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1855 2237
2238 coro->on_destroy = 0;
2239 sv_2mortal ((SV *)od);
2240
1856 while (AvFILLp (on_destroy) >= 0) 2241 while (AvFILLp (od) >= 0)
2242 {
2243 SV *cb = sv_2mortal (av_pop (od));
2244
2245 /* coro hv's (and only hv's at the moment) are supported as well */
2246 if (SvSTATEhv_p (aTHX_ cb))
2247 api_ready (aTHX_ cb);
2248 else
1857 { 2249 {
1858 dSP; /* don't disturb outer sp */ 2250 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy);
1860
1861 PUSHMARK (SP); 2251 PUSHMARK (SP);
1862 2252
1863 if (statusp) 2253 if (coro->status)
1864 { 2254 {
1865 int i; 2255 PUTBACK;
1866 AV *status = (AV *)SvRV (*statusp); 2256 coro_push_av (aTHX_ coro->status, G_ARRAY);
1867 EXTEND (SP, AvFILLp (status) + 1); 2257 SPAGAIN;
1868
1869 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]);
1871 } 2258 }
1872 2259
1873 PUTBACK; 2260 PUTBACK;
1874 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2261 call_sv (cb, G_VOID | G_DISCARD);
1875 } 2262 }
1876 } 2263 }
1877} 2264}
1878 2265
1879static void 2266static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2267coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1881{ 2268{
2269 AV *av;
2270
2271 if (coro->status)
2272 {
2273 av = coro->status;
2274 av_clear (av);
2275 }
2276 else
2277 av = coro->status = newAV ();
2278
2279 /* items are actually not so common, so optimise for this case */
2280 if (items)
2281 {
1882 int i; 2282 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV ();
1885 2283
1886 av_extend (av, items - 1); 2284 av_extend (av, items - 1);
2285
1887 for (i = 0; i < items; ++i) 2286 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2287 av_push (av, SvREFCNT_inc_NN (arg [i]));
2288 }
2289}
1889 2290
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2291static void
1891 2292slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2293{
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2294 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 2295 api_ready (aTHX_ sv_manager);
1894 2296
1895 frame->prepare = prepare_schedule; 2297 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat; 2298 frame->check = slf_check_repeat;
1897 2299
1898 /* as a minor optimisation, we could unwind all stacks here */ 2300 /* as a minor optimisation, we could unwind all stacks here */
1899 /* but that puts extra pressure on pp_slf, and is not worth much */ 2301 /* but that puts extra pressure on pp_slf, and is not worth much */
1900 /*coro_unwind_stacks (aTHX);*/ 2302 /*coro_unwind_stacks (aTHX);*/
2303}
2304
2305static void
2306slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2307{
2308 HV *coro_hv = (HV *)SvRV (coro_current);
2309
2310 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2311 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2312}
2313
2314static void
2315slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2316{
2317 HV *coro_hv;
2318 struct coro *coro;
2319
2320 if (items <= 0)
2321 croak ("Coro::cancel called without coro object,");
2322
2323 coro = SvSTATE (arg [0]);
2324 coro_hv = coro->hv;
2325
2326 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2327
2328 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2329 {
2330 /* coro currently busy cancelling something, so just notify it */
2331 coro->slf_frame.data = (void *)coro;
2332
2333 frame->prepare = prepare_nop;
2334 frame->check = slf_check_nop;
2335 }
2336 else if (coro_hv == (HV *)SvRV (coro_current))
2337 {
2338 /* cancelling the current coro is allowed, and equals terminate */
2339 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2340 }
2341 else
2342 {
2343 struct coro *self = SvSTATE_current;
2344
2345 if (!self)
2346 croak ("Coro::cancel called outside of thread content,");
2347
2348 /* otherwise we cancel directly, purely for speed reasons
2349 * unfortunately, this requires some magic trickery, as
2350 * somebody else could cancel us, so we have to fight the cancellation.
2351 * this is ugly, and hopefully fully worth the extra speed.
2352 * besides, I can't get the slow-but-safe version working...
2353 */
2354 slf_frame.data = 0;
2355 self->flags |= CF_NOCANCEL;
2356 coro_state_destroy (aTHX_ coro);
2357 self->flags &= ~CF_NOCANCEL;
2358
2359 if (slf_frame.data)
2360 {
2361 /* while we were busy we have been cancelled, so terminate */
2362 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2363 }
2364 else
2365 {
2366 frame->prepare = prepare_nop;
2367 frame->check = slf_check_nop;
2368 }
2369 }
2370}
2371
2372static int
2373slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2374{
2375 frame->prepare = 0;
2376 coro_unwind_stacks (aTHX);
2377
2378 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2379
2380 return 1;
2381}
2382
2383static int
2384safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2385{
2386 if (coro->cctx)
2387 croak ("coro inside C callback, unable to cancel at this time, caught");
2388
2389 if (coro->flags & CF_NEW)
2390 {
2391 coro_set_status (aTHX_ coro, arg, items);
2392 coro_state_destroy (aTHX_ coro);
2393 }
2394 else
2395 {
2396 if (!coro->slf_frame.prepare)
2397 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2398
2399 slf_destroy (aTHX_ coro);
2400
2401 coro_set_status (aTHX_ coro, arg, items);
2402 coro->slf_frame.prepare = prepare_nop;
2403 coro->slf_frame.check = slf_check_safe_cancel;
2404
2405 api_ready (aTHX_ (SV *)coro->hv);
2406 }
2407
2408 return 1;
1901} 2409}
1902 2410
1903/*****************************************************************************/ 2411/*****************************************************************************/
1904/* async pool handler */ 2412/* async pool handler */
1905 2413
… …
1936slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2444slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1937{ 2445{
1938 HV *hv = (HV *)SvRV (coro_current); 2446 HV *hv = (HV *)SvRV (coro_current);
1939 struct coro *coro = SvSTATE_hv ((SV *)hv); 2447 struct coro *coro = SvSTATE_hv ((SV *)hv);
1940 2448
1941 if (expect_true (coro->saved_deffh)) 2449 if (ecb_expect_true (coro->saved_deffh))
1942 { 2450 {
1943 /* subsequent iteration */ 2451 /* subsequent iteration */
1944 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2452 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1945 coro->saved_deffh = 0; 2453 coro->saved_deffh = 0;
1946 2454
1947 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2455 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1948 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2456 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1949 { 2457 {
1950 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2458 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1951 coro->invoke_av = newAV (); 2459 return;
1952
1953 frame->prepare = prepare_nop;
1954 } 2460 }
1955 else 2461 else
1956 { 2462 {
1957 av_clear (GvAV (PL_defgv)); 2463 av_clear (GvAV (PL_defgv));
1958 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2464 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1959 2465
2466 if (ecb_expect_false (coro->swap_sv))
2467 {
2468 swap_svs_leave (coro);
2469 SvREFCNT_dec_NN (coro->swap_sv);
2470 coro->swap_sv = 0;
2471 }
2472
1960 coro->prio = 0; 2473 coro->prio = 0;
1961 2474
1962 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2475 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1963 api_trace (aTHX_ coro_current, 0); 2476 api_trace (aTHX_ coro_current, 0);
1964 2477
1965 frame->prepare = prepare_schedule; 2478 frame->prepare = prepare_schedule;
1966 av_push (av_async_pool, SvREFCNT_inc (hv)); 2479 av_push (av_async_pool, SvREFCNT_inc (hv));
1967 } 2480 }
… …
1983 2496
1984static void 2497static void
1985coro_rouse_callback (pTHX_ CV *cv) 2498coro_rouse_callback (pTHX_ CV *cv)
1986{ 2499{
1987 dXSARGS; 2500 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2501 SV *data = (SV *)S_GENSUB_ARG;
1989 2502
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2503 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2504 {
1992 /* first call, set args */ 2505 /* first call, set args */
2506 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2507 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2508
1996 SvRV_set (data, (SV *)av); 2509 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2510
2000 /* better take a full copy of the arguments */ 2511 /* better take a full copy of the arguments */
2001 while (items--) 2512 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2513 av_store (av, items, newSVsv (ST (items)));
2514
2515 api_ready (aTHX_ coro);
2516 SvREFCNT_dec (coro);
2003 } 2517 }
2004 2518
2005 XSRETURN_EMPTY; 2519 XSRETURN_EMPTY;
2006} 2520}
2007 2521
2008static int 2522static int
2009slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2523slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2010{ 2524{
2011 SV *data = (SV *)frame->data; 2525 SV *data = (SV *)frame->data;
2012 2526
2013 if (CORO_THROW) 2527 if (CORO_THROW)
2014 return 0; 2528 return 0;
2015 2529
2016 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2530 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2017 return 1; 2531 return 1;
… …
2024 2538
2025 EXTEND (SP, AvFILLp (av) + 1); 2539 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2540 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2541 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2542
2029 /* we have stolen the elements, so ste length to zero and free */ 2543 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2544 AvFILLp (av) = -1;
2031 av_undef (av); 2545 av_undef (av);
2032 2546
2033 PUTBACK; 2547 PUTBACK;
2034 } 2548 }
… …
2053 cb = sv_2mortal (coro->rouse_cb); 2567 cb = sv_2mortal (coro->rouse_cb);
2054 coro->rouse_cb = 0; 2568 coro->rouse_cb = 0;
2055 } 2569 }
2056 2570
2057 if (!SvROK (cb) 2571 if (!SvROK (cb)
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2572 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2573 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2574 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2575
2062 { 2576 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2577 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2578 SV *data = (SV *)S_GENSUB_ARG;
2065 2579
2066 frame->data = (void *)data; 2580 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2581 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2582 frame->check = slf_check_rouse_wait;
2069 } 2583 }
… …
2073coro_new_rouse_cb (pTHX) 2587coro_new_rouse_cb (pTHX)
2074{ 2588{
2075 HV *hv = (HV *)SvRV (coro_current); 2589 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2590 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2591 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2592 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2593
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2594 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2595 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2596
2083 SvREFCNT_dec (coro->rouse_cb); 2597 SvREFCNT_dec (coro->rouse_cb);
… …
2180static void 2694static void
2181slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2695slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{ 2696{
2183 frame->prepare = prepare_cede_notself; 2697 frame->prepare = prepare_cede_notself;
2184 frame->check = slf_check_nop; 2698 frame->check = slf_check_nop;
2699}
2700
2701/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2702static void
2703slf_destroy (pTHX_ struct coro *coro)
2704{
2705 struct CoroSLF frame = coro->slf_frame;
2706
2707 /*
2708 * The on_destroy below most likely is from an SLF call.
2709 * Since by definition the SLF call will not finish when we destroy
2710 * the coro, we will have to force-finish it here, otherwise
2711 * cleanup functions cannot call SLF functions.
2712 */
2713 coro->slf_frame.prepare = 0;
2714
2715 /* this callback is reserved for slf functions needing to do cleanup */
2716 if (frame.destroy && frame.prepare && !PL_dirty)
2717 frame.destroy (aTHX_ &frame);
2185} 2718}
2186 2719
2187/* 2720/*
2188 * these not obviously related functions are all rolled into one 2721 * these not obviously related functions are all rolled into one
2189 * function to increase chances that they all will call transfer with the same 2722 * function to increase chances that they all will call transfer with the same
… …
2196 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2729 I32 checkmark; /* mark SP to see how many elements check has pushed */
2197 2730
2198 /* set up the slf frame, unless it has already been set-up */ 2731 /* set up the slf frame, unless it has already been set-up */
2199 /* the latter happens when a new coro has been started */ 2732 /* the latter happens when a new coro has been started */
2200 /* or when a new cctx was attached to an existing coroutine */ 2733 /* or when a new cctx was attached to an existing coroutine */
2201 if (expect_true (!slf_frame.prepare)) 2734 if (ecb_expect_true (!slf_frame.prepare))
2202 { 2735 {
2203 /* first iteration */ 2736 /* first iteration */
2204 dSP; 2737 dSP;
2205 SV **arg = PL_stack_base + TOPMARK + 1; 2738 SV **arg = PL_stack_base + TOPMARK + 1;
2206 int items = SP - arg; /* args without function object */ 2739 int items = SP - arg; /* args without function object */
… …
2247 while (slf_frame.check (aTHX_ &slf_frame)); 2780 while (slf_frame.check (aTHX_ &slf_frame));
2248 2781
2249 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2782 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2250 2783
2251 /* exception handling */ 2784 /* exception handling */
2252 if (expect_false (CORO_THROW)) 2785 if (ecb_expect_false (CORO_THROW))
2253 { 2786 {
2254 SV *exception = sv_2mortal (CORO_THROW); 2787 SV *exception = sv_2mortal (CORO_THROW);
2255 2788
2256 CORO_THROW = 0; 2789 CORO_THROW = 0;
2257 sv_setsv (ERRSV, exception); 2790 sv_setsv (ERRSV, exception);
2258 croak (0); 2791 croak (0);
2259 } 2792 }
2260 2793
2261 /* return value handling - mostly like entersub */ 2794 /* return value handling - mostly like entersub */
2262 /* make sure we put something on the stack in scalar context */ 2795 /* make sure we put something on the stack in scalar context */
2263 if (GIMME_V == G_SCALAR) 2796 if (GIMME_V == G_SCALAR
2797 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2264 { 2798 {
2265 dSP; 2799 dSP;
2266 SV **bot = PL_stack_base + checkmark; 2800 SV **bot = PL_stack_base + checkmark;
2267 2801
2268 if (sp == bot) /* too few, push undef */ 2802 if (sp == bot) /* too few, push undef */
2269 bot [1] = &PL_sv_undef; 2803 bot [1] = &PL_sv_undef;
2270 else if (sp != bot + 1) /* too many, take last one */ 2804 else /* too many, take last one */
2271 bot [1] = *sp; 2805 bot [1] = *sp;
2272 2806
2273 SP = bot + 1; 2807 SP = bot + 1;
2274 2808
2275 PUTBACK; 2809 PUTBACK;
… …
2308 if (PL_op->op_flags & OPf_STACKED) 2842 if (PL_op->op_flags & OPf_STACKED)
2309 { 2843 {
2310 if (items > slf_arga) 2844 if (items > slf_arga)
2311 { 2845 {
2312 slf_arga = items; 2846 slf_arga = items;
2313 free (slf_argv); 2847 Safefree (slf_argv);
2314 slf_argv = malloc (slf_arga * sizeof (SV *)); 2848 New (0, slf_argv, slf_arga, SV *);
2315 } 2849 }
2316 2850
2317 slf_argc = items; 2851 slf_argc = items;
2318 2852
2319 for (i = 0; i < items; ++i) 2853 for (i = 0; i < items; ++i)
… …
2373{ 2907{
2374 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2908 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2375 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2909 on_enterleave_call (aTHX_ sv_2mortal (cb));
2376} 2910}
2377 2911
2912static void
2913enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2914{
2915 if (!hook)
2916 return;
2917
2918 if (!*avp)
2919 {
2920 *avp = newAV ();
2921 AvREAL_off (*avp);
2922 }
2923
2924 av_push (*avp, (SV *)hook);
2925 av_push (*avp, (SV *)arg);
2926}
2927
2928static void
2929enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2930{
2931 AV *av = *avp;
2932 int i;
2933
2934 if (!av)
2935 return;
2936
2937 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2938 if (AvARRAY (av)[i] == (SV *)hook)
2939 {
2940 if (execute)
2941 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2942
2943 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2944 av_pop (av);
2945 av_pop (av);
2946 break;
2947 }
2948
2949 if (AvFILLp (av) >= 0)
2950 {
2951 *avp = 0;
2952 SvREFCNT_dec_NN (av);
2953 }
2954}
2955
2956static void
2957api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 if (SvSTATE_current == coro)
2962 if (enter)
2963 enter (aTHX_ enter_arg);
2964
2965 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2966 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2967}
2968
2969static void
2970api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2971{
2972 struct coro *coro = SvSTATE (coro_sv);
2973
2974 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2975 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2976}
2977
2978static void
2979savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2980{
2981 struct coro *coro = SvSTATE_current;
2982
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2984}
2985
2986static void
2987savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2992}
2993
2994static void
2995api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2996{
2997 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2998
2999 /* this ought to be much cheaper than malloc + a single destructor call */
3000 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3001 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3002}
3003
2378/*****************************************************************************/ 3004/*****************************************************************************/
2379/* PerlIO::cede */ 3005/* PerlIO::cede */
2380 3006
2381typedef struct 3007typedef struct
2382{ 3008{
2383 PerlIOBuf base; 3009 PerlIOBuf base;
2384 NV next, every; 3010 NV next, every;
2385} PerlIOCede; 3011} PerlIOCede;
2386 3012
2387static IV 3013static IV ecb_cold
2388PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3014PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2389{ 3015{
2390 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3016 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2391 3017
2392 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3018 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2393 self->next = nvtime () + self->every; 3019 self->next = nvtime () + self->every;
2394 3020
2395 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3021 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2396} 3022}
2397 3023
2398static SV * 3024static SV * ecb_cold
2399PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3025PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2400{ 3026{
2401 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3027 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2402 3028
2403 return newSVnv (self->every); 3029 return newSVnv (self->every);
… …
2454/* Coro::Semaphore & Coro::Signal */ 3080/* Coro::Semaphore & Coro::Signal */
2455 3081
2456static SV * 3082static SV *
2457coro_waitarray_new (pTHX_ int count) 3083coro_waitarray_new (pTHX_ int count)
2458{ 3084{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3085 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 3086 AV *av = newAV ();
2461 SV **ary; 3087 SV **ary;
2462 3088
2463 /* unfortunately, building manually saves memory */ 3089 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 3090 Newx (ary, 2, SV *);
… …
2510 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2511 PUTBACK; 3137 PUTBACK;
2512 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3138 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2513 } 3139 }
2514 3140
2515 SvREFCNT_dec (cb); 3141 SvREFCNT_dec_NN (cb);
2516 } 3142 }
2517} 3143}
2518 3144
2519static void 3145static void
2520coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3146coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2521{ 3147{
2522 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3148 /* call $sem->adjust (0) to possibly wake up some other waiters */
2523 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3149 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2524} 3150}
2525 3151
2526static int 3152static int
2527slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3153slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2528{ 3154{
2529 AV *av = (AV *)frame->data; 3155 AV *av = (AV *)frame->data;
2530 SV *count_sv = AvARRAY (av)[0]; 3156 SV *count_sv = AvARRAY (av)[0];
3157 SV *coro_hv = SvRV (coro_current);
3158
3159 frame->destroy = 0;
2531 3160
2532 /* if we are about to throw, don't actually acquire the lock, just throw */ 3161 /* if we are about to throw, don't actually acquire the lock, just throw */
2533 if (CORO_THROW) 3162 if (ecb_expect_false (CORO_THROW))
3163 {
3164 /* we still might be responsible for the semaphore, so wake up others */
3165 coro_semaphore_adjust (aTHX_ av, 0);
3166
2534 return 0; 3167 return 0;
3168 }
2535 else if (SvIVX (count_sv) > 0) 3169 else if (SvIVX (count_sv) > 0)
2536 { 3170 {
2537 SvSTATE_current->on_destroy = 0;
2538
2539 if (acquire) 3171 if (acquire)
2540 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3172 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2541 else 3173 else
2542 coro_semaphore_adjust (aTHX_ av, 0); 3174 coro_semaphore_adjust (aTHX_ av, 0);
2543 3175
… …
2547 { 3179 {
2548 int i; 3180 int i;
2549 /* if we were woken up but can't down, we look through the whole */ 3181 /* if we were woken up but can't down, we look through the whole */
2550 /* waiters list and only add us if we aren't in there already */ 3182 /* waiters list and only add us if we aren't in there already */
2551 /* this avoids some degenerate memory usage cases */ 3183 /* this avoids some degenerate memory usage cases */
2552 3184 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)) 3185 if (AvARRAY (av)[i] == coro_hv)
2555 return 1; 3186 return 1;
2556 3187
2557 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3188 av_push (av, SvREFCNT_inc (coro_hv));
2558 return 1; 3189 return 1;
2559 } 3190 }
2560} 3191}
2561 3192
2562static int 3193static int
… …
2585 { 3216 {
2586 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3217 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2587 3218
2588 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3219 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2589 frame->prepare = prepare_schedule; 3220 frame->prepare = prepare_schedule;
2590
2591 /* to avoid race conditions when a woken-up coro gets terminated */ 3221 /* to avoid race conditions when a woken-up coro gets terminated */
2592 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3222 /* we arrange for a temporary on_destroy that calls adjust (0) */
2593 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3223 frame->destroy = coro_semaphore_destroy;
2594 } 3224 }
2595} 3225}
2596 3226
2597static void 3227static void
2598slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3228slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2606{ 3236{
2607 if (items >= 2) 3237 if (items >= 2)
2608 { 3238 {
2609 /* callback form */ 3239 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 3240 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3241 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 3242
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3243 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 3244
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 3245 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 3246 coro_semaphore_adjust (aTHX_ av, 0);
2617 3247
2618 frame->prepare = prepare_nop; 3248 frame->prepare = prepare_nop;
… …
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 3272 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 3273 AvARRAY (av)[1] = cb;
2644 3274
2645 cb = av_shift (av); 3275 cb = av_shift (av);
2646 3276
3277 if (SvTYPE (cb) == SVt_PVCV)
3278 {
3279 dSP;
3280 PUSHMARK (SP);
3281 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3282 PUTBACK;
3283 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3284 }
3285 else
3286 {
2647 api_ready (aTHX_ cb); 3287 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 3288 sv_setiv (cb, 0); /* signal waiter */
3289 }
3290
2649 SvREFCNT_dec (cb); 3291 SvREFCNT_dec_NN (cb);
2650 3292
2651 --count; 3293 --count;
2652 } 3294 }
2653} 3295}
2654 3296
… …
2662static void 3304static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3305slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 3306{
2665 AV *av = (AV *)SvRV (arg [0]); 3307 AV *av = (AV *)SvRV (arg [0]);
2666 3308
3309 if (items >= 2)
3310 {
3311 SV *cb_cv = s_get_cv_croak (arg [1]);
3312 av_push (av, SvREFCNT_inc_NN (cb_cv));
3313
2667 if (SvIVX (AvARRAY (av)[0])) 3314 if (SvIVX (AvARRAY (av)[0]))
3315 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3316
3317 frame->prepare = prepare_nop;
3318 frame->check = slf_check_nop;
3319 }
3320 else if (SvIVX (AvARRAY (av)[0]))
2668 { 3321 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 3322 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 3323 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 3324 frame->check = slf_check_nop;
2672 } 3325 }
2673 else 3326 else
2674 { 3327 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3328 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 3329
2677 av_push (av, waiter); 3330 av_push (av, waiter);
2678 3331
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3332 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 3333 frame->prepare = prepare_schedule;
… …
2698 3351
2699static void 3352static void
2700coro_aio_callback (pTHX_ CV *cv) 3353coro_aio_callback (pTHX_ CV *cv)
2701{ 3354{
2702 dXSARGS; 3355 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 3356 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 3357 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 3358 SV *data_sv = newSV (sizeof (struct io_state));
2706 3359
2707 av_extend (state, items - 1); 3360 av_extend (state, items - 1);
2708 3361
… …
2728 } 3381 }
2729 3382
2730 av_push (state, data_sv); 3383 av_push (state, data_sv);
2731 3384
2732 api_ready (aTHX_ coro); 3385 api_ready (aTHX_ coro);
2733 SvREFCNT_dec (coro); 3386 SvREFCNT_dec_NN (coro);
2734 SvREFCNT_dec ((AV *)state); 3387 SvREFCNT_dec_NN ((AV *)state);
2735} 3388}
2736 3389
2737static int 3390static int
2738slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3391slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2739{ 3392{
… …
2744 /* it quickly returns */ 3397 /* it quickly returns */
2745 if (CORO_THROW) 3398 if (CORO_THROW)
2746 return 0; 3399 return 0;
2747 3400
2748 /* one element that is an RV? repeat! */ 3401 /* one element that is an RV? repeat! */
2749 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3402 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2750 return 1; 3403 return 1;
2751 3404
2752 /* restore status */ 3405 /* restore status */
2753 { 3406 {
2754 SV *data_sv = av_pop (state); 3407 SV *data_sv = av_pop (state);
… …
2757 errno = data->errorno; 3410 errno = data->errorno;
2758 PL_laststype = data->laststype; 3411 PL_laststype = data->laststype;
2759 PL_laststatval = data->laststatval; 3412 PL_laststatval = data->laststatval;
2760 PL_statcache = data->statcache; 3413 PL_statcache = data->statcache;
2761 3414
2762 SvREFCNT_dec (data_sv); 3415 SvREFCNT_dec_NN (data_sv);
2763 } 3416 }
2764 3417
2765 /* push result values */ 3418 /* push result values */
2766 { 3419 {
2767 dSP; 3420 dSP;
… …
2793 dSP; 3446 dSP;
2794 3447
2795 static SV *prio_cv; 3448 static SV *prio_cv;
2796 static SV *prio_sv; 3449 static SV *prio_sv;
2797 3450
2798 if (expect_false (!prio_cv)) 3451 if (ecb_expect_false (!prio_cv))
2799 { 3452 {
2800 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3453 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2801 prio_sv = newSViv (0); 3454 prio_sv = newSViv (0);
2802 } 3455 }
2803 3456
… …
2822 3475
2823 for (i = 0; i < items; ++i) 3476 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 3477 PUSHs (arg [i]);
2825 3478
2826 /* now push the callback closure */ 3479 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3480 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 3481
2829 /* now call the AIO function - we assume our request is uncancelable */ 3482 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 3483 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 3484 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 3485 }
2833 3486
2834 /* now that the requets is going, we loop toll we have a result */ 3487 /* now that the request is going, we loop till we have a result */
2835 frame->data = (void *)state; 3488 frame->data = (void *)state;
2836 frame->prepare = prepare_schedule; 3489 frame->prepare = prepare_schedule;
2837 frame->check = slf_check_aio_req; 3490 frame->check = slf_check_aio_req;
2838} 3491}
2839 3492
… …
2851 3504
2852#if CORO_CLONE 3505#if CORO_CLONE
2853# include "clone.c" 3506# include "clone.c"
2854#endif 3507#endif
2855 3508
3509/*****************************************************************************/
3510
3511static SV *
3512coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3513{
3514 SV *coro_sv;
3515 struct coro *coro;
3516 MAGIC *mg;
3517 HV *hv;
3518 SV *cb;
3519 int i;
3520
3521 if (argc > 0)
3522 {
3523 cb = s_get_cv_croak (argv [0]);
3524
3525 if (!is_coro)
3526 {
3527 if (CvISXSUB (cb))
3528 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3529
3530 if (!CvROOT (cb))
3531 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3532 }
3533 }
3534
3535 Newz (0, coro, 1, struct coro);
3536 coro->args = newAV ();
3537 coro->flags = CF_NEW;
3538
3539 if (coro_first) coro_first->prev = coro;
3540 coro->next = coro_first;
3541 coro_first = coro;
3542
3543 coro->hv = hv = newHV ();
3544 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3545 mg->mg_flags |= MGf_DUP;
3546 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3547
3548 if (argc > 0)
3549 {
3550 av_extend (coro->args, argc + is_coro - 1);
3551
3552 if (is_coro)
3553 {
3554 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3555 cb = (SV *)cv_coro_run;
3556 }
3557
3558 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3559
3560 for (i = 1; i < argc; i++)
3561 av_push (coro->args, newSVsv (argv [i]));
3562 }
3563
3564 return coro_sv;
3565}
3566
3567#ifndef __cplusplus
3568ecb_cold XS(boot_Coro__State);
3569#endif
3570
3571#if CORO_JIT
3572
3573static void ecb_noinline ecb_cold
3574pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3575{
3576 dSP;
3577 AV *av = newAV ();
3578
3579 av_store (av, 3, newSVuv (d));
3580 av_store (av, 2, newSVuv (c));
3581 av_store (av, 1, newSVuv (b));
3582 av_store (av, 0, newSVuv (a));
3583
3584 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3585
3586 PUTBACK;
3587}
3588
3589static void ecb_noinline ecb_cold
3590jit_init (pTHX)
3591{
3592 dSP;
3593 SV *load, *save;
3594 char *map_base;
3595 char *load_ptr, *save_ptr;
3596 STRLEN load_len, save_len, map_len;
3597 int count;
3598
3599 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3600
3601 PUSHMARK (SP);
3602 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3603 #include "state.h"
3604 count = call_pv ("Coro::State::_jit", G_ARRAY);
3605 SPAGAIN;
3606
3607 save = POPs; save_ptr = SvPVbyte (save, save_len);
3608 load = POPs; load_ptr = SvPVbyte (load, load_len);
3609
3610 map_len = load_len + save_len + 16;
3611
3612 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3613
3614 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3615
3616 load_perl_slots = (load_save_perl_slots_type)map_base;
3617 memcpy (map_base, load_ptr, load_len);
3618
3619 map_base += (load_len + 15) & ~15;
3620
3621 save_perl_slots = (load_save_perl_slots_type)map_base;
3622 memcpy (map_base, save_ptr, save_len);
3623
3624 /* we are good citizens and try to make the page read-only, so the evil evil */
3625 /* hackers might have it a bit more difficult */
3626 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3627
3628 PUTBACK;
3629 eval_pv ("undef &Coro::State::_jit", 1);
3630}
3631
3632#endif
3633
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3634MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 3635
2858PROTOTYPES: DISABLE 3636PROTOTYPES: DISABLE
2859 3637
2860BOOT: 3638BOOT:
2861{ 3639{
3640#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3641#include "state.h"
2862#ifdef USE_ITHREADS 3642#ifdef USE_ITHREADS
2863# if CORO_PTHREAD 3643# if CORO_PTHREAD
2864 coro_thx = PERL_GET_CONTEXT; 3644 coro_thx = PERL_GET_CONTEXT;
2865# endif 3645# endif
2866#endif 3646#endif
2867 BOOT_PAGESIZE; 3647 /* perl defines these to check for existance first, but why it doesn't */
3648 /* just create them one at init time is not clear to me, except for */
3649 /* programs trying to delete them, but... */
3650 /* anyway, we declare this as invalid and make sure they are initialised here */
3651 DEFSV;
3652 ERRSV;
2868 3653
2869 cctx_current = cctx_new_empty (); 3654 cctx_current = cctx_new_empty ();
2870 3655
2871 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3656 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2872 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3657 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2873 3658
2874 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3659 {
2875 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3660 /*
2876 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3661 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3662 * by coro_sig_vtbl in hash values.
3663 */
3664 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3665
3666 /* this only works if perl doesn't have a vtbl for %SIG */
3667 assert (!mg->mg_virtual);
3668
3669 /*
3670 * The irony is that the perl API itself asserts that mg_virtual
3671 * must be non-const, yet perl5porters insisted on marking their
3672 * vtbls as read-only, just to thwart perl modules from patching
3673 * them.
3674 */
3675 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3676 mg->mg_flags |= MGf_COPY;
3677
3678 coro_sigelem_vtbl = PL_vtbl_sigelem;
3679 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3680 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3681 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3682 }
2877 3683
2878 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2879 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3684 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2880 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3685 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2881 3686
2882 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3687 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2883 3688
… …
2912 coroapi.prepare_nop = prepare_nop; 3717 coroapi.prepare_nop = prepare_nop;
2913 coroapi.prepare_schedule = prepare_schedule; 3718 coroapi.prepare_schedule = prepare_schedule;
2914 coroapi.prepare_cede = prepare_cede; 3719 coroapi.prepare_cede = prepare_cede;
2915 coroapi.prepare_cede_notself = prepare_cede_notself; 3720 coroapi.prepare_cede_notself = prepare_cede_notself;
2916 3721
2917 { 3722 time_init (aTHX);
2918 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2919 3723
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)); 3724 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3725#if CORO_JIT
3726 PUTBACK;
3727 jit_init (aTHX);
3728 SPAGAIN;
3729#endif
2927} 3730}
2928 3731
2929SV * 3732SV *
2930new (char *klass, ...) 3733new (SV *klass, ...)
2931 ALIAS: 3734 ALIAS:
2932 Coro::new = 1 3735 Coro::new = 1
2933 CODE: 3736 CODE:
2934{ 3737 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3738 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 3739 RETVAL
2986 3740
2987void 3741void
2988transfer (...) 3742transfer (...)
2989 PROTOTYPE: $$ 3743 PROTOTYPE: $$
2990 CODE: 3744 CODE:
2991 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3745 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 3746
3006SV * 3747SV *
3007clone (Coro::State coro) 3748clone (Coro::State coro)
3008 CODE: 3749 CODE:
3009{ 3750{
… …
3064void 3805void
3065list () 3806list ()
3066 PROTOTYPE: 3807 PROTOTYPE:
3067 PPCODE: 3808 PPCODE:
3068{ 3809{
3069 struct coro *coro; 3810 struct coro *coro;
3070 for (coro = coro_first; coro; coro = coro->next) 3811 for (coro = coro_first; coro; coro = coro->next)
3071 if (coro->hv) 3812 if (coro->hv)
3072 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3813 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3073} 3814}
3074 3815
… …
3079 CODE: 3820 CODE:
3080{ 3821{
3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3822 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3082 { 3823 {
3083 struct coro *current = SvSTATE_current; 3824 struct coro *current = SvSTATE_current;
3825 struct CoroSLF slf_save;
3084 3826
3085 if (current != coro) 3827 if (current != coro)
3086 { 3828 {
3087 PUTBACK; 3829 PUTBACK;
3088 save_perl (aTHX_ current); 3830 save_perl (aTHX_ current);
3089 load_perl (aTHX_ coro); 3831 load_perl (aTHX_ coro);
3832 /* the coro is most likely in an active SLF call.
3833 * while not strictly required (the code we execute is
3834 * not allowed to call any SLF functions), it's cleaner
3835 * to reinitialise the slf_frame and restore it later.
3836 * This might one day allow us to actually do SLF calls
3837 * from code executed here.
3838 */
3839 slf_save = slf_frame;
3840 slf_frame.prepare = 0;
3090 SPAGAIN; 3841 SPAGAIN;
3091 } 3842 }
3092 3843
3093 PUSHSTACK; 3844 PUSHSTACK;
3094 3845
… …
3104 SPAGAIN; 3855 SPAGAIN;
3105 3856
3106 if (current != coro) 3857 if (current != coro)
3107 { 3858 {
3108 PUTBACK; 3859 PUTBACK;
3860 slf_frame = slf_save;
3109 save_perl (aTHX_ coro); 3861 save_perl (aTHX_ coro);
3110 load_perl (aTHX_ current); 3862 load_perl (aTHX_ current);
3111 SPAGAIN; 3863 SPAGAIN;
3112 } 3864 }
3113 } 3865 }
… …
3118 PROTOTYPE: $ 3870 PROTOTYPE: $
3119 ALIAS: 3871 ALIAS:
3120 is_ready = CF_READY 3872 is_ready = CF_READY
3121 is_running = CF_RUNNING 3873 is_running = CF_RUNNING
3122 is_new = CF_NEW 3874 is_new = CF_NEW
3123 is_destroyed = CF_DESTROYED 3875 is_destroyed = CF_ZOMBIE
3876 is_zombie = CF_ZOMBIE
3124 is_suspended = CF_SUSPENDED 3877 is_suspended = CF_SUSPENDED
3125 CODE: 3878 CODE:
3126 RETVAL = boolSV (coro->flags & ix); 3879 RETVAL = boolSV (coro->flags & ix);
3127 OUTPUT: 3880 OUTPUT:
3128 RETVAL 3881 RETVAL
3129 3882
3130void 3883void
3131throw (Coro::State self, SV *throw = &PL_sv_undef) 3884throw (SV *self, SV *exception = &PL_sv_undef)
3132 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
3133 CODE: 3886 CODE:
3134{ 3887{
3888 struct coro *coro = SvSTATE (self);
3135 struct coro *current = SvSTATE_current; 3889 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3890 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3137 SvREFCNT_dec (*throwp); 3891 SvREFCNT_dec (*exceptionp);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3892 SvGETMAGIC (exception);
3893 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3894
3895 api_ready (aTHX_ self);
3139} 3896}
3140 3897
3141void 3898void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3899api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3143 PROTOTYPE: $;$ 3900 PROTOTYPE: $;$
… …
3198 3955
3199void 3956void
3200cancel (Coro::State self) 3957cancel (Coro::State self)
3201 CODE: 3958 CODE:
3202 coro_state_destroy (aTHX_ self); 3959 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3960
3961SV *
3962enable_times (int enabled = enable_times)
3963 CODE:
3964{
3965 RETVAL = boolSV (enable_times);
3966
3967 if (enabled != enable_times)
3968 {
3969 enable_times = enabled;
3970
3971 coro_times_update ();
3972 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3973 }
3974}
3975 OUTPUT:
3976 RETVAL
3977
3978void
3979times (Coro::State self)
3980 PPCODE:
3981{
3982 struct coro *current = SvSTATE (coro_current);
3983
3984 if (ecb_expect_false (current == self))
3985 {
3986 coro_times_update ();
3987 coro_times_add (SvSTATE (coro_current));
3988 }
3989
3990 EXTEND (SP, 2);
3991 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3992 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3993
3994 if (ecb_expect_false (current == self))
3995 coro_times_sub (SvSTATE (coro_current));
3996}
3997
3998void
3999swap_sv (Coro::State coro, SV *sva, SV *svb)
4000 CODE:
4001{
4002 struct coro *current = SvSTATE_current;
4003 AV *swap_sv;
4004 int i;
4005
4006 sva = SvRV (sva);
4007 svb = SvRV (svb);
4008
4009 if (current == coro)
4010 SWAP_SVS_LEAVE (current);
4011
4012 if (!coro->swap_sv)
4013 coro->swap_sv = newAV ();
4014
4015 swap_sv = coro->swap_sv;
4016
4017 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4018 {
4019 SV *a = AvARRAY (swap_sv)[i ];
4020 SV *b = AvARRAY (swap_sv)[i + 1];
4021
4022 if (a == sva && b == svb)
4023 {
4024 SvREFCNT_dec_NN (a);
4025 SvREFCNT_dec_NN (b);
4026
4027 for (; i <= AvFILLp (swap_sv) - 2; i++)
4028 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4029
4030 AvFILLp (swap_sv) -= 2;
4031
4032 goto removed;
4033 }
4034 }
4035
4036 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4037 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4038
4039 removed:
4040
4041 if (current == coro)
4042 SWAP_SVS_ENTER (current);
4043}
3204 4044
3205 4045
3206MODULE = Coro::State PACKAGE = Coro 4046MODULE = Coro::State PACKAGE = Coro
3207 4047
3208BOOT: 4048BOOT:
3209{ 4049{
3210 int i; 4050 if (SVt_LAST > 32)
4051 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3211 4052
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4053 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4054 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4055 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); 4056 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); 4057 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3218 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4058 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3219 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4059 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4060 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221 4061
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4062 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4063 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); 4064 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); 4065 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3226 4066
3227 coro_stash = gv_stashpv ("Coro", TRUE); 4067 coro_stash = gv_stashpv ("Coro", TRUE);
3228 4068
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4069 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4070 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4071 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4072 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4073 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4074 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 4075
3239 { 4076 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4077 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 4078
3242 coroapi.schedule = api_schedule; 4079 coroapi.schedule = api_schedule;
… …
3246 coroapi.ready = api_ready; 4083 coroapi.ready = api_ready;
3247 coroapi.is_ready = api_is_ready; 4084 coroapi.is_ready = api_is_ready;
3248 coroapi.nready = coro_nready; 4085 coroapi.nready = coro_nready;
3249 coroapi.current = coro_current; 4086 coroapi.current = coro_current;
3250 4087
4088 coroapi.enterleave_hook = api_enterleave_hook;
4089 coroapi.enterleave_unhook = api_enterleave_unhook;
4090 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4091
3251 /*GCoroAPI = &coroapi;*/ 4092 /*GCoroAPI = &coroapi;*/
3252 sv_setiv (sv, (IV)&coroapi); 4093 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 4094 SvREADONLY_on (sv);
3254 } 4095 }
3255} 4096}
3256 4097
4098SV *
4099async (...)
4100 PROTOTYPE: &@
4101 CODE:
4102 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4103 api_ready (aTHX_ RETVAL);
4104 OUTPUT:
4105 RETVAL
4106
4107void
4108_destroy (Coro::State coro)
4109 CODE:
4110 /* used by the manager thread */
4111 coro_state_destroy (aTHX_ coro);
4112
4113void
4114on_destroy (Coro::State coro, SV *cb)
4115 CODE:
4116 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4117
4118void
4119join (...)
4120 CODE:
4121 CORO_EXECUTE_SLF_XS (slf_init_join);
4122
3257void 4123void
3258terminate (...) 4124terminate (...)
3259 CODE: 4125 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4126 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3261 4127
3262void 4128void
4129cancel (...)
4130 CODE:
4131 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4132
4133int
4134safe_cancel (Coro::State self, ...)
4135 C_ARGS: aTHX_ self, &ST (1), items - 1
4136
4137void
3263schedule (...) 4138schedule (...)
3264 CODE: 4139 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4140 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3266 4141
3267void 4142void
… …
3286 4161
3287void 4162void
3288_set_current (SV *current) 4163_set_current (SV *current)
3289 PROTOTYPE: $ 4164 PROTOTYPE: $
3290 CODE: 4165 CODE:
3291 SvREFCNT_dec (SvRV (coro_current)); 4166 SvREFCNT_dec_NN (SvRV (coro_current));
3292 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4167 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3293 4168
3294void 4169void
3295_set_readyhook (SV *hook) 4170_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 4171 PROTOTYPE: $
3297 CODE: 4172 CODE:
3298 SvREFCNT_dec (coro_readyhook); 4173 SvREFCNT_dec (coro_readyhook);
4174 SvGETMAGIC (hook);
4175 if (SvOK (hook))
4176 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4177 coro_readyhook = newSVsv (hook);
4178 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4179 }
4180 else
4181 {
4182 coro_readyhook = 0;
4183 CORO_READYHOOK = 0;
4184 }
3300 4185
3301int 4186int
3302prio (Coro::State coro, int newprio = 0) 4187prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 4188 PROTOTYPE: $;$
3304 ALIAS: 4189 ALIAS:
… …
3310 if (items > 1) 4195 if (items > 1)
3311 { 4196 {
3312 if (ix) 4197 if (ix)
3313 newprio = coro->prio - newprio; 4198 newprio = coro->prio - newprio;
3314 4199
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4200 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4201 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 4202
3318 coro->prio = newprio; 4203 coro->prio = newprio;
3319 } 4204 }
3320} 4205}
3321 OUTPUT: 4206 OUTPUT:
… …
3336 RETVAL = coro_nready; 4221 RETVAL = coro_nready;
3337 OUTPUT: 4222 OUTPUT:
3338 RETVAL 4223 RETVAL
3339 4224
3340void 4225void
4226suspend (Coro::State self)
4227 PROTOTYPE: $
4228 CODE:
4229 self->flags |= CF_SUSPENDED;
4230
4231void
4232resume (Coro::State self)
4233 PROTOTYPE: $
4234 CODE:
4235 self->flags &= ~CF_SUSPENDED;
4236
4237void
3341_pool_handler (...) 4238_pool_handler (...)
3342 CODE: 4239 CODE:
3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4240 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3344 4241
3345void 4242void
… …
3356 for (i = 1; i < items; ++i) 4253 for (i = 1; i < items; ++i)
3357 av_push (av, SvREFCNT_inc_NN (ST (i))); 4254 av_push (av, SvREFCNT_inc_NN (ST (i)));
3358 4255
3359 if ((SV *)hv == &PL_sv_undef) 4256 if ((SV *)hv == &PL_sv_undef)
3360 { 4257 {
3361 PUSHMARK (SP); 4258 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3362 EXTEND (SP, 2);
3363 PUSHs (sv_Coro);
3364 PUSHs ((SV *)cv_pool_handler);
3365 PUTBACK;
3366 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3367 SPAGAIN;
3368
3369 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4259 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4260 SvREFCNT_dec_NN (sv);
3370 } 4261 }
3371 4262
3372 { 4263 {
3373 struct coro *coro = SvSTATE_hv (hv); 4264 struct coro *coro = SvSTATE_hv (hv);
3374 4265
… …
3381 api_ready (aTHX_ (SV *)hv); 4272 api_ready (aTHX_ (SV *)hv);
3382 4273
3383 if (GIMME_V != G_VOID) 4274 if (GIMME_V != G_VOID)
3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4275 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3385 else 4276 else
3386 SvREFCNT_dec (hv); 4277 SvREFCNT_dec_NN (hv);
3387} 4278}
3388 4279
3389SV * 4280SV *
3390rouse_cb () 4281rouse_cb ()
3391 PROTOTYPE: 4282 PROTOTYPE:
… …
3406 on_leave = 1 4297 on_leave = 1
3407 PROTOTYPE: & 4298 PROTOTYPE: &
3408 CODE: 4299 CODE:
3409{ 4300{
3410 struct coro *coro = SvSTATE_current; 4301 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4302 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412 4303
3413 block = (SV *)coro_sv_2cv (aTHX_ block); 4304 block = s_get_cv_croak (block);
3414 4305
3415 if (!*avp) 4306 if (!*avp)
3416 *avp = newAV (); 4307 *avp = newAV ();
3417 4308
3418 av_push (*avp, SvREFCNT_inc (block)); 4309 av_push (*avp, SvREFCNT_inc (block));
3419 4310
3420 if (!ix) 4311 if (!ix)
3421 on_enterleave_call (aTHX_ block); 4312 on_enterleave_call (aTHX_ block);
3422 4313
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4314 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3424 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 4315 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3425 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4316 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3426} 4317}
3427 4318
3428 4319
3429MODULE = Coro::State PACKAGE = PerlIO::cede 4320MODULE = Coro::State PACKAGE = PerlIO::cede
3430 4321
… …
3435MODULE = Coro::State PACKAGE = Coro::Semaphore 4326MODULE = Coro::State PACKAGE = Coro::Semaphore
3436 4327
3437SV * 4328SV *
3438new (SV *klass, SV *count = 0) 4329new (SV *klass, SV *count = 0)
3439 CODE: 4330 CODE:
4331{
4332 int semcnt = 1;
4333
4334 if (count)
4335 {
4336 SvGETMAGIC (count);
4337
4338 if (SvOK (count))
4339 semcnt = SvIV (count);
4340 }
4341
3440 RETVAL = sv_bless ( 4342 RETVAL = sv_bless (
3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4343 coro_waitarray_new (aTHX_ semcnt),
3442 GvSTASH (CvGV (cv)) 4344 GvSTASH (CvGV (cv))
3443 ); 4345 );
4346}
3444 OUTPUT: 4347 OUTPUT:
3445 RETVAL 4348 RETVAL
3446 4349
3447# helper for Coro::Channel 4350# helper for Coro::Channel and others
3448SV * 4351SV *
3449_alloc (int count) 4352_alloc (int count)
3450 CODE: 4353 CODE:
3451 RETVAL = coro_waitarray_new (aTHX_ count); 4354 RETVAL = coro_waitarray_new (aTHX_ count);
3452 OUTPUT: 4355 OUTPUT:
… …
3458 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4361 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3459 OUTPUT: 4362 OUTPUT:
3460 RETVAL 4363 RETVAL
3461 4364
3462void 4365void
3463up (SV *self, int adjust = 1) 4366up (SV *self)
3464 ALIAS:
3465 adjust = 1
3466 CODE: 4367 CODE:
4368 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4369
4370void
4371adjust (SV *self, int adjust)
4372 CODE:
3467 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4373 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3468 4374
3469void 4375void
3470down (...) 4376down (...)
3471 CODE: 4377 CODE:
3472 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4378 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3494 XSRETURN_NO; 4400 XSRETURN_NO;
3495} 4401}
3496 4402
3497void 4403void
3498waiters (SV *self) 4404waiters (SV *self)
3499 PPCODE: 4405 PPCODE:
3500{ 4406{
3501 AV *av = (AV *)SvRV (self); 4407 AV *av = (AV *)SvRV (self);
3502 int wcount = AvFILLp (av) + 1 - 1; 4408 int wcount = AvFILLp (av) + 1 - 1;
3503 4409
3504 if (GIMME_V == G_SCALAR) 4410 if (GIMME_V == G_SCALAR)
… …
3510 for (i = 1; i <= wcount; ++i) 4416 for (i = 1; i <= wcount; ++i)
3511 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4417 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3512 } 4418 }
3513} 4419}
3514 4420
4421MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4422
4423void
4424_may_delete (SV *sem, int count, unsigned int extra_refs)
4425 PPCODE:
4426{
4427 AV *av = (AV *)SvRV (sem);
4428
4429 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4430 && AvFILLp (av) == 0 /* no waiters, just count */
4431 && SvIV (AvARRAY (av)[0]) == count)
4432 XSRETURN_YES;
4433
4434 XSRETURN_NO;
4435}
4436
3515MODULE = Coro::State PACKAGE = Coro::Signal 4437MODULE = Coro::State PACKAGE = Coro::Signal
3516 4438
3517SV * 4439SV *
3518new (SV *klass) 4440new (SV *klass)
3519 CODE: 4441 CODE:
… …
3531 4453
3532void 4454void
3533broadcast (SV *self) 4455broadcast (SV *self)
3534 CODE: 4456 CODE:
3535{ 4457{
3536 AV *av = (AV *)SvRV (self); 4458 AV *av = (AV *)SvRV (self);
3537 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4459 coro_signal_wake (aTHX_ av, AvFILLp (av));
3538} 4460}
3539 4461
3540void 4462void
3541send (SV *self) 4463send (SV *self)
… …
3549 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4471 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3550} 4472}
3551 4473
3552IV 4474IV
3553awaited (SV *self) 4475awaited (SV *self)
3554 CODE: 4476 CODE:
3555 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4477 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3556 OUTPUT: 4478 OUTPUT:
3557 RETVAL 4479 RETVAL
3558 4480
3559 4481
… …
3564 4486
3565void 4487void
3566_schedule (...) 4488_schedule (...)
3567 CODE: 4489 CODE:
3568{ 4490{
3569 static int incede; 4491 static int incede;
3570 4492
3571 api_cede_notself (aTHX); 4493 api_cede_notself (aTHX);
3572 4494
3573 ++incede; 4495 ++incede;
3574 while (coro_nready >= incede && api_cede (aTHX)) 4496 while (coro_nready >= incede && api_cede (aTHX))
… …
3590 4512
3591void 4513void
3592_register (char *target, char *proto, SV *req) 4514_register (char *target, char *proto, SV *req)
3593 CODE: 4515 CODE:
3594{ 4516{
3595 CV *req_cv = coro_sv_2cv (aTHX_ req); 4517 SV *req_cv = s_get_cv_croak (req);
3596 /* newXSproto doesn't return the CV on 5.8 */ 4518 /* newXSproto doesn't return the CV on 5.8 */
3597 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4519 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3598 sv_setpv ((SV *)slf_cv, proto); 4520 sv_setpv ((SV *)slf_cv, proto);
3599 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4521 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3600} 4522}
3601 4523
4524MODULE = Coro::State PACKAGE = Coro::Select
4525
4526void
4527patch_pp_sselect ()
4528 CODE:
4529 if (!coro_old_pp_sselect)
4530 {
4531 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4532 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4533 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4534 }
4535
4536void
4537unpatch_pp_sselect ()
4538 CODE:
4539 if (coro_old_pp_sselect)
4540 {
4541 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4542 coro_old_pp_sselect = 0;
4543 }
4544
4545MODULE = Coro::State PACKAGE = Coro::Util
4546
4547void
4548_exit (int code)
4549 CODE:
4550 _exit (code);
4551
4552NV
4553time ()
4554 CODE:
4555 RETVAL = nvtime (aTHX);
4556 OUTPUT:
4557 RETVAL
4558
4559NV
4560gettimeofday ()
4561 PPCODE:
4562{
4563 UV tv [2];
4564 u2time (aTHX_ tv);
4565 EXTEND (SP, 2);
4566 PUSHs (sv_2mortal (newSVuv (tv [0])));
4567 PUSHs (sv_2mortal (newSVuv (tv [1])));
4568}
4569

Diff Legend

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