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

Diff Legend

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