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

Diff Legend

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