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.322 by root, Sat Nov 22 05:13:34 2008 UTC vs.
Revision 1.477 by root, Sat Feb 29 21:40:22 2020 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
2 27
3#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 29#define PERL_EXT
5 30
6#include "EXTERN.h" 31#include "EXTERN.h"
7#include "perl.h" 32#include "perl.h"
8#include "XSUB.h" 33#include "XSUB.h"
9#include "perliol.h" 34#include "perliol.h"
10 35
11#include "patchlevel.h" 36#include "schmorp.h"
12 37
38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
40#include "ecb.h"
41
42#include <stddef.h>
13#include <stdio.h> 43#include <stdio.h>
14#include <errno.h> 44#include <errno.h>
15#include <assert.h> 45#include <assert.h>
16 46
17#ifdef WIN32 47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
54
55#ifndef SVs_PADSTALE
56# define SVs_PADSTALE 0
57#endif
58
59#ifdef PadARRAY
60# define NEWPADAPI 1
61# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
62#else
63typedef AV PADNAMELIST;
64# if !PERL_VERSION_ATLEAST(5,8,0)
65typedef AV PADLIST;
66typedef AV PAD;
67# endif
68# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
69# define PadlistMAX(pl) AvFILLp (pl)
70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
71# define PadARRAY AvARRAY
72# define PadMAX AvFILLp
73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
81
82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
84#if PERL_VERSION_ATLEAST(5,19,0)
85# define SVt_BIND SVt_IV
86#endif
87
88#if defined(_WIN32)
89# undef HAS_GETTIMEOFDAY
18# undef setjmp 90# undef setjmp
19# undef longjmp 91# undef longjmp
20# undef _exit 92# undef _exit
21# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
22#else 94#else
23# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
24#endif 96#endif
25 97
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 98/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
55 100
56#define PERL_VERSION_ATLEAST(a,b,c) \ 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 102# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#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; /* last 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
972runops_trace (pTHX) 1369runops_trace (pTHX)
973{ 1370{
974 COP *oldcop = 0; 1371 COP *oldcop = 0;
975 int oldcxix = -2; 1372 int oldcxix = -2;
976 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
977 coro_cctx *cctx = coro->cctx;
978 1373
979 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1374 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
980 { 1375 {
981 PERL_ASYNC_CHECK (); 1376 PERL_ASYNC_CHECK ();
982 1377
983 if (cctx->flags & CC_TRACE_ALL) 1378 if (cctx_current->flags & CC_TRACE_ALL)
984 { 1379 {
985 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1380 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
986 { 1381 {
987 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1382 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
988 SV **bot, **top; 1383 SV **bot, **top;
989 AV *av = newAV (); /* return values */ 1384 AV *av = newAV (); /* return values */
990 SV **cb; 1385 SV **cb;
… …
1005 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1006 1401
1007 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1008 ENTER; 1403 ENTER;
1009 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1010 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1011 PUSHMARK (SP);
1012 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1013 PUSHs (fullname); 1408 PUSHs (fullname);
1014 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1015 PUTBACK; 1410 PUTBACK;
1016 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);
… …
1027 1422
1028 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1029 { 1424 {
1030 SV **cb; 1425 SV **cb;
1031 1426
1032 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1033 { 1428 {
1034 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1035 1430
1036 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1037 { 1432 {
… …
1043 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1044 1439
1045 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1046 ENTER; 1441 ENTER;
1047 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1048 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1049 PUSHMARK (SP);
1050 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1051 PUSHs (fullname); 1446 PUSHs (fullname);
1052 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);
1053 PUTBACK; 1448 PUTBACK;
1054 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);
1055 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);
1056 SPAGAIN; 1451 SPAGAIN;
1057 FREETMPS; 1452 FREETMPS;
… …
1060 } 1455 }
1061 1456
1062 oldcxix = cxstack_ix; 1457 oldcxix = cxstack_ix;
1063 } 1458 }
1064 1459
1065 if (cctx->flags & CC_TRACE_LINE) 1460 if (cctx_current->flags & CC_TRACE_LINE)
1066 { 1461 {
1067 dSP; 1462 dSP;
1068 1463
1069 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1070 ENTER; 1465 ENTER;
1071 SAVETMPS; 1466 SAVETMPS;
1072 EXTEND (SP, 3);
1073 PL_runops = RUNOPS_DEFAULT;
1074 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1075 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1076 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1077 PUTBACK; 1471 PUTBACK;
1078 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);
1079 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);
… …
1106 1500
1107 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 */
1108} 1502}
1109 1503
1110/* 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 */
1111static void NOINLINE 1505static void ecb_noinline
1112cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1113{ 1507{
1114 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1115 1509
1116 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1127 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1128 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1129} 1523}
1130 1524
1131/* 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 */
1132INLINE void 1526ecb_inline void
1133transfer_tail (pTHX) 1527transfer_tail (pTHX)
1134{ 1528{
1135 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);
1136} 1542}
1137 1543
1138/* 1544/*
1139 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1140 */ 1546 */
… …
1162 /* 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 */
1163 PL_restartop = PL_op; 1569 PL_restartop = PL_op;
1164 perl_run (PL_curinterp); 1570 perl_run (PL_curinterp);
1165 /* 1571 /*
1166 * 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
1167 * 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.
1168 */ 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;
1169 1583
1170 /* 1584 /*
1171 * 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
1172 * 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)
1173 * 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
1174 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1175 * coroutine as Coro has no such concept
1176 */ 1589 */
1177 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1178 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1179 } 1591 }
1180} 1592}
1181 1593
1182static coro_cctx * 1594static coro_cctx *
1183cctx_new () 1595cctx_new (void)
1184{ 1596{
1185 coro_cctx *cctx; 1597 coro_cctx *cctx;
1186 1598
1187 ++cctx_count; 1599 ++cctx_count;
1188 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1194 return cctx; 1606 return cctx;
1195} 1607}
1196 1608
1197/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1198static coro_cctx * 1610static coro_cctx *
1199cctx_new_empty () 1611cctx_new_empty (void)
1200{ 1612{
1201 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1202 1614
1203 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1204 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1205 1617
1206 return cctx; 1618 return cctx;
1207} 1619}
1208 1620
1209/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1210static coro_cctx * 1622static coro_cctx *
1211cctx_new_run () 1623cctx_new_run (void)
1212{ 1624{
1213 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1214 void *stack_start;
1215 size_t stack_size;
1216 1626
1217#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1218 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1219 /* mmap supposedly does allocate-on-write for us */
1220 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1221
1222 if (cctx->sptr != (void *)-1)
1223 {
1224 #if CORO_STACKGUARD
1225 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1226 #endif
1227 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1228 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1229 cctx->flags |= CC_MAPPED;
1230 } 1628 {
1231 else
1232#endif
1233 {
1234 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1235 New (0, cctx->sptr, cctx_stacksize, long);
1236
1237 if (!cctx->sptr)
1238 {
1239 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1240 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1241 }
1242
1243 stack_start = cctx->sptr;
1244 stack_size = cctx->ssize;
1245 } 1631 }
1246 1632
1247 #if CORO_USE_VALGRIND
1248 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1249 #endif
1250
1251 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);
1252 1634
1253 return cctx; 1635 return cctx;
1254} 1636}
1255 1637
1256static void 1638static void
1257cctx_destroy (coro_cctx *cctx) 1639cctx_destroy (coro_cctx *cctx)
1258{ 1640{
1259 if (!cctx) 1641 if (!cctx)
1260 return; 1642 return;
1261 1643
1262 assert (cctx != cctx_current);//D temporary 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1263 1645
1264 --cctx_count; 1646 --cctx_count;
1265 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1266 1648
1267 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1268 if (cctx->sptr)
1269 {
1270 #if CORO_USE_VALGRIND
1271 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1272 #endif
1273
1274#if HAVE_MMAP
1275 if (cctx->flags & CC_MAPPED)
1276 munmap (cctx->sptr, cctx->ssize);
1277 else
1278#endif
1279 Safefree (cctx->sptr);
1280 }
1281 1650
1282 Safefree (cctx); 1651 Safefree (cctx);
1283} 1652}
1284 1653
1285/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1286#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))
1287 1656
1288static coro_cctx * 1657static coro_cctx *
1289cctx_get (pTHX) 1658cctx_get (pTHX)
1290{ 1659{
1291 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1292 { 1661 {
1293 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1294 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1295 --cctx_idle; 1664 --cctx_idle;
1296 1665
1297 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1298 return cctx; 1667 return cctx;
1299 1668
1300 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1301 } 1670 }
1302 1671
… …
1304} 1673}
1305 1674
1306static void 1675static void
1307cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1308{ 1677{
1309 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));
1310 1679
1311 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1312 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1313 { 1682 {
1314 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1315 cctx_first = first->next; 1684 cctx_first = first->next;
1316 --cctx_idle; 1685 --cctx_idle;
1317 1686
… …
1328static void 1697static void
1329transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1330{ 1699{
1331 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1332 1701
1333 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1334 { 1703 {
1335 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1336 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,");
1337 1706
1338 if (expect_false (next->flags & CF_RUNNING)) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1339 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1340
1341 if (expect_false (next->flags & CF_DESTROYED))
1342 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,");
1343 1709
1344#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1345 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1346 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,");
1347#endif 1713#endif
1348 } 1714 }
1349} 1715}
1350 1716
1351/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1352static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1353transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1354{ 1720{
1355 dSTACKLEVEL; 1721 dSTACKLEVEL;
1356 1722
1357 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1358 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1359 { 1725 {
1360 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1361 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 */
1362 } 1728 }
1363 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1364 { 1730 {
1365 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1366 1732
1367 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1368 { 1734 {
1369 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1370 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1371 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1372 } 1738 }
… …
1375 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1376 1742
1377 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1378 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1379 1745
1380 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1381 { 1747 {
1382 /* need to start coroutine */ 1748 /* need to start coroutine */
1383 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1384 /* setup coroutine call */ 1750 /* setup coroutine call */
1385 coro_setup (aTHX_ next); 1751 init_perl (aTHX_ next);
1386 } 1752 }
1387 else 1753 else
1388 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1389 1755
1390 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1391 if (expect_true ( 1757 if (ecb_expect_true (
1392 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1393 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1394 && !force_cctx 1760 && !force_cctx
1395 )) 1761 ))
1396 { 1762 {
1397 /* 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 */
1398 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));
1399 1765
1400 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1766 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1401 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1767 /* without this the next cctx_get might destroy the running cctx while still in use */
1402 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1403 if (!next->cctx) 1769 if (ecb_expect_true (!next->cctx))
1404 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1405 1771
1406 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1407 assert (!prev->cctx);//D temporary
1408 } 1773 }
1409 else 1774 else
1410 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1411 1776
1412 ++next->usecount; 1777 ++next->usecount;
1413 1778
1414 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1415 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1416 1781
1417 next->cctx = 0; 1782 next->cctx = 0;
1418 1783
1419 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1420 { 1785 {
1421 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1422 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1423 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1424 } 1789 }
… …
1430#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))
1431#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1796#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1432 1797
1433/** high level stuff ********************************************************/ 1798/** high level stuff ********************************************************/
1434 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 */
1435static int 1802static void
1803coro_call_on_destroy (pTHX_ struct coro *coro);
1804
1805static void
1436coro_state_destroy (pTHX_ struct coro *coro) 1806coro_state_destroy (pTHX_ struct coro *coro)
1437{ 1807{
1438 if (coro->flags & CF_DESTROYED) 1808 if (coro->flags & CF_ZOMBIE)
1439 return 0; 1809 return;
1440 1810
1441 if (coro->on_destroy)
1442 coro->on_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1443 1812
1444 coro->flags |= CF_DESTROYED; 1813 coro->flags |= CF_ZOMBIE;
1445 1814
1446 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1447 { 1816 {
1448 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1449 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1450 --coro_nready; 1819 --coro_nready;
1451 } 1820 }
1452 else 1821 else
1453 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 */
1454 1823
1455 if (coro->mainstack && coro->mainstack != main_mainstack) 1824 if (coro->next) coro->next->prev = coro->prev;
1456 { 1825 if (coro->prev) coro->prev->next = coro->next;
1457 struct coro temp; 1826 if (coro == coro_first) coro_first = coro->next;
1458 1827
1459 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1828 if (coro->mainstack
1460 1829 && coro->mainstack != main_mainstack
1461 save_perl (aTHX_ &temp); 1830 && coro->slot
1831 && !PL_dirty)
1462 load_perl (aTHX_ coro); 1832 destroy_perl (aTHX_ coro);
1463
1464 coro_destruct (aTHX_ coro);
1465
1466 load_perl (aTHX_ &temp);
1467
1468 coro->slot = 0;
1469 }
1470 1833
1471 cctx_destroy (coro->cctx); 1834 cctx_destroy (coro->cctx);
1472 SvREFCNT_dec (coro->startcv); 1835 SvREFCNT_dec (coro->startcv);
1473 SvREFCNT_dec (coro->args); 1836 SvREFCNT_dec (coro->args);
1837 SvREFCNT_dec (coro->swap_sv);
1474 SvREFCNT_dec (CORO_THROW); 1838 SvREFCNT_dec (CORO_THROW);
1475 1839
1476 if (coro->next) coro->next->prev = coro->prev; 1840 coro_call_on_destroy (aTHX_ coro);
1477 if (coro->prev) coro->prev->next = coro->next;
1478 if (coro == coro_first) coro_first = coro->next;
1479 1841
1480 return 1; 1842 /* more destruction mayhem in coro_state_free */
1481} 1843}
1482 1844
1483static int 1845static int
1484coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1485{ 1847{
1486 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1487 mg->mg_ptr = 0; 1849 mg->mg_ptr = 0;
1488 1850
1489 coro->hv = 0;
1490
1491 if (--coro->refcnt < 0)
1492 {
1493 coro_state_destroy (aTHX_ coro); 1851 coro_state_destroy (aTHX_ coro);
1852 SvREFCNT_dec (coro->on_destroy);
1853 SvREFCNT_dec (coro->status);
1854
1494 Safefree (coro); 1855 Safefree (coro);
1495 }
1496 1856
1497 return 0; 1857 return 0;
1498} 1858}
1499 1859
1500static int 1860static int ecb_cold
1501coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1502{ 1862{
1503 struct coro *coro = (struct coro *)mg->mg_ptr; 1863 /* called when perl clones the current process the slow way (windows process emulation) */
1504 1864 /* we simply nuke the pointers in the copy, causing perl to croak */
1505 ++coro->refcnt; 1865 mg->mg_ptr = 0;
1866 mg->mg_virtual = 0;
1506 1867
1507 return 0; 1868 return 0;
1508} 1869}
1509 1870
1510static MGVTBL coro_state_vtbl = { 1871static MGVTBL coro_state_vtbl = {
… …
1533 1894
1534 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1895 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1535 TRANSFER (ta, 1); 1896 TRANSFER (ta, 1);
1536} 1897}
1537 1898
1538/*****************************************************************************/
1539/* gensub: simple closure generation utility */
1540
1541#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1542
1543/* create a closure from XS, returns a code reference */
1544/* the arg can be accessed via GENSUB_ARG from the callback */
1545/* the callback must use dXSARGS/XSRETURN */
1546static SV *
1547gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1548{
1549 CV *cv = (CV *)newSV (0);
1550
1551 sv_upgrade ((SV *)cv, SVt_PVCV);
1552
1553 CvANON_on (cv);
1554 CvISXSUB_on (cv);
1555 CvXSUB (cv) = xsub;
1556 GENSUB_ARG = arg;
1557
1558 return newRV_noinc ((SV *)cv);
1559}
1560
1561/** Coro ********************************************************************/ 1899/** Coro ********************************************************************/
1562 1900
1563INLINE void 1901ecb_inline void
1564coro_enq (pTHX_ struct coro *coro) 1902coro_enq (pTHX_ struct coro *coro)
1565{ 1903{
1566 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1904 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1567}
1568 1905
1569INLINE SV * 1906 SvREFCNT_inc_NN (coro->hv);
1907
1908 coro->next_ready = 0;
1909 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1910 ready [1] = coro;
1911}
1912
1913ecb_inline struct coro *
1570coro_deq (pTHX) 1914coro_deq (pTHX)
1571{ 1915{
1572 int prio; 1916 int prio;
1573 1917
1574 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1918 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1575 if (AvFILLp (coro_ready [prio]) >= 0) 1919 {
1576 return av_shift (coro_ready [prio]); 1920 struct coro **ready = coro_ready [prio];
1921
1922 if (ready [0])
1923 {
1924 struct coro *coro = ready [0];
1925 ready [0] = coro->next_ready;
1926 return coro;
1927 }
1928 }
1577 1929
1578 return 0; 1930 return 0;
1931}
1932
1933static void
1934invoke_sv_ready_hook_helper (void)
1935{
1936 dTHX;
1937 dSP;
1938
1939 ENTER;
1940 SAVETMPS;
1941
1942 PUSHMARK (SP);
1943 PUTBACK;
1944 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1945
1946 FREETMPS;
1947 LEAVE;
1579} 1948}
1580 1949
1581static int 1950static int
1582api_ready (pTHX_ SV *coro_sv) 1951api_ready (pTHX_ SV *coro_sv)
1583{ 1952{
1584 struct coro *coro;
1585 SV *sv_hook;
1586 void (*xs_hook)(void);
1587
1588 if (SvROK (coro_sv))
1589 coro_sv = SvRV (coro_sv);
1590
1591 coro = SvSTATE (coro_sv); 1953 struct coro *coro = SvSTATE (coro_sv);
1592 1954
1593 if (coro->flags & CF_READY) 1955 if (coro->flags & CF_READY)
1594 return 0; 1956 return 0;
1595 1957
1596 coro->flags |= CF_READY; 1958 coro->flags |= CF_READY;
1597 1959
1598 sv_hook = coro_nready ? 0 : coro_readyhook;
1599 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1600
1601 coro_enq (aTHX_ coro); 1960 coro_enq (aTHX_ coro);
1602 ++coro_nready;
1603 1961
1604 if (sv_hook) 1962 if (!coro_nready++)
1605 { 1963 if (coroapi.readyhook)
1606 dSP; 1964 coroapi.readyhook ();
1607
1608 ENTER;
1609 SAVETMPS;
1610
1611 PUSHMARK (SP);
1612 PUTBACK;
1613 call_sv (sv_hook, G_VOID | G_DISCARD);
1614
1615 FREETMPS;
1616 LEAVE;
1617 }
1618
1619 if (xs_hook)
1620 xs_hook ();
1621 1965
1622 return 1; 1966 return 1;
1623} 1967}
1624 1968
1625static int 1969static int
… …
1627{ 1971{
1628 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1972 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1629} 1973}
1630 1974
1631/* expects to own a reference to next->hv */ 1975/* expects to own a reference to next->hv */
1632INLINE void 1976ecb_inline void
1633prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1977prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1634{ 1978{
1635 SV *prev_sv = SvRV (coro_current); 1979 SV *prev_sv = SvRV (coro_current);
1636 1980
1637 ta->prev = SvSTATE_hv (prev_sv); 1981 ta->prev = SvSTATE_hv (prev_sv);
… …
1648static void 1992static void
1649prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1993prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1650{ 1994{
1651 for (;;) 1995 for (;;)
1652 { 1996 {
1653 SV *next_sv = coro_deq (aTHX); 1997 struct coro *next = coro_deq (aTHX);
1654 1998
1655 if (expect_true (next_sv)) 1999 if (ecb_expect_true (next))
1656 { 2000 {
1657 struct coro *next = SvSTATE_hv (next_sv);
1658
1659 /* cannot transfer to destroyed coros, skip and look for next */ 2001 /* cannot transfer to destroyed coros, skip and look for next */
1660 if (expect_false (next->flags & CF_DESTROYED)) 2002 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1661 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 2003 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1662 else 2004 else
1663 { 2005 {
1664 next->flags &= ~CF_READY; 2006 next->flags &= ~CF_READY;
1665 --coro_nready; 2007 --coro_nready;
1666 2008
… …
1669 } 2011 }
1670 } 2012 }
1671 else 2013 else
1672 { 2014 {
1673 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
2016 if (SvROK (sv_idle)
2017 && SvOBJECT (SvRV (sv_idle)))
2018 {
2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
2038
2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
2040 api_ready (aTHX_ SvRV (sv_idle));
2041 --coro_nready;
2042 }
2043 else
2044 {
2045 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1674 dSP; 2046 dSP;
1675 2047
1676 ENTER; 2048 ENTER;
1677 SAVETMPS; 2049 SAVETMPS;
1678 2050
1679 PUSHMARK (SP); 2051 PUSHMARK (SP);
1680 PUTBACK; 2052 PUTBACK;
1681 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 2053 call_sv (sv_idle, G_VOID | G_DISCARD);
1682 2054
1683 FREETMPS; 2055 FREETMPS;
1684 LEAVE; 2056 LEAVE;
2057 }
1685 } 2058 }
1686 } 2059 }
1687} 2060}
1688 2061
1689INLINE void 2062ecb_inline void
1690prepare_cede (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede (pTHX_ struct coro_transfer_args *ta)
1691{ 2064{
1692 api_ready (aTHX_ coro_current); 2065 api_ready (aTHX_ coro_current);
1693 prepare_schedule (aTHX_ ta); 2066 prepare_schedule (aTHX_ ta);
1694} 2067}
1695 2068
1696INLINE void 2069ecb_inline void
1697prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2070prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1698{ 2071{
1699 SV *prev = SvRV (coro_current); 2072 SV *prev = SvRV (coro_current);
1700 2073
1701 if (coro_nready) 2074 if (coro_nready)
… …
1731{ 2104{
1732 struct coro_transfer_args ta; 2105 struct coro_transfer_args ta;
1733 2106
1734 prepare_cede (aTHX_ &ta); 2107 prepare_cede (aTHX_ &ta);
1735 2108
1736 if (expect_true (ta.prev != ta.next)) 2109 if (ecb_expect_true (ta.prev != ta.next))
1737 { 2110 {
1738 TRANSFER (ta, 1); 2111 TRANSFER (ta, 1);
1739 return 1; 2112 return 1;
1740 } 2113 }
1741 else 2114 else
… …
1760static void 2133static void
1761api_trace (pTHX_ SV *coro_sv, int flags) 2134api_trace (pTHX_ SV *coro_sv, int flags)
1762{ 2135{
1763 struct coro *coro = SvSTATE (coro_sv); 2136 struct coro *coro = SvSTATE (coro_sv);
1764 2137
2138 if (coro->flags & CF_RUNNING)
2139 croak ("cannot enable tracing on a running coroutine, caught");
2140
1765 if (flags & CC_TRACE) 2141 if (flags & CC_TRACE)
1766 { 2142 {
1767 if (!coro->cctx) 2143 if (!coro->cctx)
1768 coro->cctx = cctx_new_run (); 2144 coro->cctx = cctx_new_run ();
1769 else if (!(coro->cctx->flags & CC_TRACE)) 2145 else if (!(coro->cctx->flags & CC_TRACE))
1770 croak ("cannot enable tracing on coroutine with custom stack,"); 2146 croak ("cannot enable tracing on coroutine with custom stack, caught");
1771 2147
1772 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2148 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1773 } 2149 }
1774 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2150 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1775 { 2151 {
… …
1781 coro->slot->runops = RUNOPS_DEFAULT; 2157 coro->slot->runops = RUNOPS_DEFAULT;
1782 } 2158 }
1783} 2159}
1784 2160
1785static void 2161static void
2162coro_push_av (pTHX_ AV *av, I32 gimme_v)
2163{
2164 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2165 {
2166 dSP;
2167
2168 if (gimme_v == G_SCALAR)
2169 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2170 else
2171 {
2172 int i;
2173 EXTEND (SP, AvFILLp (av) + 1);
2174
2175 for (i = 0; i <= AvFILLp (av); ++i)
2176 PUSHs (AvARRAY (av)[i]);
2177 }
2178
2179 PUTBACK;
2180 }
2181}
2182
2183static void
2184coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2185{
2186 if (!coro->on_destroy)
2187 coro->on_destroy = newAV ();
2188
2189 av_push (coro->on_destroy, cb);
2190}
2191
2192static void
2193slf_destroy_join (pTHX_ struct CoroSLF *frame)
2194{
2195 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2196}
2197
2198static int
2199slf_check_join (pTHX_ struct CoroSLF *frame)
2200{
2201 struct coro *coro = (struct coro *)frame->data;
2202
2203 if (!coro->status)
2204 return 1;
2205
2206 frame->destroy = 0;
2207
2208 coro_push_av (aTHX_ coro->status, GIMME_V);
2209
2210 SvREFCNT_dec ((SV *)coro->hv);
2211
2212 return 0;
2213}
2214
2215static void
2216slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{
2218 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2219
2220 if (items > 1)
2221 croak ("join called with too many arguments");
2222
2223 if (coro->status)
2224 frame->prepare = prepare_nop;
2225 else
2226 {
2227 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2228 frame->prepare = prepare_schedule;
2229 }
2230
2231 frame->check = slf_check_join;
2232 frame->destroy = slf_destroy_join;
2233 frame->data = (void *)coro;
2234 SvREFCNT_inc (coro->hv);
2235}
2236
2237static void
1786coro_call_on_destroy (pTHX_ struct coro *coro) 2238coro_call_on_destroy (pTHX_ struct coro *coro)
1787{ 2239{
1788 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2240 AV *od = coro->on_destroy;
1789 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1790 2241
1791 if (on_destroyp) 2242 if (!od)
1792 { 2243 return;
1793 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1794 2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2247
1795 while (AvFILLp (on_destroy) >= 0) 2248 while (AvFILLp (od) >= 0)
2249 {
2250 SV *cb = sv_2mortal (av_pop (od));
2251
2252 /* coro hv's (and only hv's at the moment) are supported as well */
2253 if (SvSTATEhv_p (aTHX_ cb))
2254 api_ready (aTHX_ cb);
2255 else
1796 { 2256 {
1797 dSP; /* don't disturb outer sp */ 2257 dSP; /* don't disturb outer sp */
1798 SV *cb = av_pop (on_destroy);
1799
1800 PUSHMARK (SP); 2258 PUSHMARK (SP);
1801 2259
1802 if (statusp) 2260 if (coro->status)
1803 { 2261 {
1804 int i; 2262 PUTBACK;
1805 AV *status = (AV *)SvRV (*statusp); 2263 coro_push_av (aTHX_ coro->status, G_ARRAY);
1806 EXTEND (SP, AvFILLp (status) + 1); 2264 SPAGAIN;
1807
1808 for (i = 0; i <= AvFILLp (status); ++i)
1809 PUSHs (AvARRAY (status)[i]);
1810 } 2265 }
1811 2266
1812 PUTBACK; 2267 PUTBACK;
1813 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2268 call_sv (cb, G_VOID | G_DISCARD);
1814 } 2269 }
1815 } 2270 }
1816} 2271}
1817 2272
1818static void 2273static void
1819slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2274coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1820{ 2275{
2276 AV *av;
2277
2278 if (coro->status)
2279 {
2280 av = coro->status;
2281 av_clear (av);
2282 }
2283 else
2284 av = coro->status = newAV ();
2285
2286 /* items are actually not so common, so optimise for this case */
2287 if (items)
2288 {
1821 int i; 2289 int i;
1822 HV *hv = (HV *)SvRV (coro_current);
1823 AV *av = newAV ();
1824 2290
1825 av_extend (av, items - 1); 2291 av_extend (av, items - 1);
2292
1826 for (i = 0; i < items; ++i) 2293 for (i = 0; i < items; ++i)
1827 av_push (av, SvREFCNT_inc_NN (arg [i])); 2294 av_push (av, SvREFCNT_inc_NN (arg [i]));
2295 }
2296}
1828 2297
1829 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2298static void
1830 2299slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2300{
1831 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2301 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1832 api_ready (aTHX_ sv_manager); 2302 api_ready (aTHX_ sv_manager);
1833 2303
1834 frame->prepare = prepare_schedule; 2304 frame->prepare = prepare_schedule;
1835 frame->check = slf_check_repeat; 2305 frame->check = slf_check_repeat;
2306
2307 /* as a minor optimisation, we could unwind all stacks here */
2308 /* but that puts extra pressure on pp_slf, and is not worth much */
2309 /*coro_unwind_stacks (aTHX);*/
2310}
2311
2312static void
2313slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2314{
2315 HV *coro_hv = (HV *)SvRV (coro_current);
2316
2317 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2318 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2319}
2320
2321static void
2322slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2323{
2324 HV *coro_hv;
2325 struct coro *coro;
2326
2327 if (items <= 0)
2328 croak ("Coro::cancel called without coro object,");
2329
2330 coro = SvSTATE (arg [0]);
2331 coro_hv = coro->hv;
2332
2333 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2334
2335 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2336 {
2337 /* coro currently busy cancelling something, so just notify it */
2338 coro->slf_frame.data = (void *)coro;
2339
2340 frame->prepare = prepare_nop;
2341 frame->check = slf_check_nop;
2342 }
2343 else if (coro_hv == (HV *)SvRV (coro_current))
2344 {
2345 /* cancelling the current coro is allowed, and equals terminate */
2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2347 }
2348 else
2349 {
2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2354
2355 /* otherwise we cancel directly, purely for speed reasons
2356 * unfortunately, this requires some magic trickery, as
2357 * somebody else could cancel us, so we have to fight the cancellation.
2358 * this is ugly, and hopefully fully worth the extra speed.
2359 * besides, I can't get the slow-but-safe version working...
2360 */
2361 slf_frame.data = 0;
2362 self->flags |= CF_NOCANCEL;
2363 coro_state_destroy (aTHX_ coro);
2364 self->flags &= ~CF_NOCANCEL;
2365
2366 if (slf_frame.data)
2367 {
2368 /* while we were busy we have been cancelled, so terminate */
2369 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2370 }
2371 else
2372 {
2373 frame->prepare = prepare_nop;
2374 frame->check = slf_check_nop;
2375 }
2376 }
2377}
2378
2379static int
2380slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2381{
2382 frame->prepare = 0;
2383 coro_unwind_stacks (aTHX);
2384
2385 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2386
2387 return 1;
2388}
2389
2390static int
2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2392{
2393 if (coro->cctx)
2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2395
2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2397 {
2398 coro_set_status (aTHX_ coro, arg, items);
2399 coro_state_destroy (aTHX_ coro);
2400 }
2401 else
2402 {
2403 if (!coro->slf_frame.prepare)
2404 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2405
2406 slf_destroy (aTHX_ coro);
2407
2408 coro_set_status (aTHX_ coro, arg, items);
2409 coro->slf_frame.prepare = prepare_nop;
2410 coro->slf_frame.check = slf_check_safe_cancel;
2411
2412 api_ready (aTHX_ (SV *)coro->hv);
2413 }
2414
2415 return 1;
1836} 2416}
1837 2417
1838/*****************************************************************************/ 2418/*****************************************************************************/
1839/* async pool handler */ 2419/* async pool handler */
1840 2420
… …
1871slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2451slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1872{ 2452{
1873 HV *hv = (HV *)SvRV (coro_current); 2453 HV *hv = (HV *)SvRV (coro_current);
1874 struct coro *coro = SvSTATE_hv ((SV *)hv); 2454 struct coro *coro = SvSTATE_hv ((SV *)hv);
1875 2455
1876 if (expect_true (coro->saved_deffh)) 2456 if (ecb_expect_true (coro->saved_deffh))
1877 { 2457 {
1878 /* subsequent iteration */ 2458 /* subsequent iteration */
1879 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1880 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
1881 2461
1882 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1883 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1884 { 2464 {
1885 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2465 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1886 coro->invoke_av = newAV (); 2466 return;
1887
1888 frame->prepare = prepare_nop;
1889 } 2467 }
1890 else 2468 else
1891 { 2469 {
1892 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
1893 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1894 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
1895 coro->prio = 0; 2480 coro->prio = 0;
1896 2481
1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1898 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
1899 2484
1900 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
1901 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
1902 } 2487 }
1903 } 2488 }
1904 else 2489 else
1905 { 2490 {
1906 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
… …
1918 2503
1919static void 2504static void
1920coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
1921{ 2506{
1922 dXSARGS; 2507 dXSARGS;
1923 SV *data = (SV *)GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
1924 2509
2510 /* data starts being the coro, and is replaced by the results when done */
1925 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2511 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1926 { 2512 {
1927 /* first call, set args */ 2513 /* first call, set args */
2514 SV *coro = SvRV (data);
1928 AV *av = newAV (); 2515 AV *av = newAV ();
1929 SV *coro = SvRV (data);
1930 2516
1931 SvRV_set (data, (SV *)av); 2517 SvRV_set (data, (SV *)av);
1932 api_ready (aTHX_ coro);
1933 SvREFCNT_dec (coro);
1934 2518
1935 /* better take a full copy of the arguments */ 2519 /* better take a full copy of the arguments */
1936 while (items--) 2520 while (items--)
1937 av_store (av, items, newSVsv (ST (items))); 2521 av_store (av, items, newSVsv (ST (items)));
2522
2523 api_ready (aTHX_ coro);
2524 SvREFCNT_dec_NN (coro);
1938 } 2525 }
1939 2526
1940 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
1941} 2528}
1942 2529
1943static int 2530static int
1944slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2531slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1945{ 2532{
1946 SV *data = (SV *)frame->data; 2533 SV *data = (SV *)frame->data;
1947 2534
1948 if (CORO_THROW) 2535 if (CORO_THROW)
1949 return 0; 2536 return 0;
1950 2537
1951 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2538 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1952 return 1; 2539 return 1;
… …
1959 2546
1960 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
1961 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
1962 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1963 2550
1964 /* we have stolen the elements, so ste length to zero and free */ 2551 /* we have stolen the elements, so set length to zero and free */
1965 AvFILLp (av) = -1; 2552 AvFILLp (av) = -1;
1966 av_undef (av); 2553 av_undef (av);
1967 2554
1968 PUTBACK; 2555 PUTBACK;
1969 } 2556 }
… …
1988 cb = sv_2mortal (coro->rouse_cb); 2575 cb = sv_2mortal (coro->rouse_cb);
1989 coro->rouse_cb = 0; 2576 coro->rouse_cb = 0;
1990 } 2577 }
1991 2578
1992 if (!SvROK (cb) 2579 if (!SvROK (cb)
1993 || SvTYPE (SvRV (cb)) != SVt_PVCV 2580 || SvTYPE (SvRV (cb)) != SVt_PVCV
1994 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2581 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1995 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
1996 2583
1997 { 2584 {
1998 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1999 SV *data = (SV *)GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2000 2587
2001 frame->data = (void *)data; 2588 frame->data = (void *)data;
2002 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2589 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2003 frame->check = slf_check_rouse_wait; 2590 frame->check = slf_check_rouse_wait;
2004 } 2591 }
… …
2008coro_new_rouse_cb (pTHX) 2595coro_new_rouse_cb (pTHX)
2009{ 2596{
2010 HV *hv = (HV *)SvRV (coro_current); 2597 HV *hv = (HV *)SvRV (coro_current);
2011 struct coro *coro = SvSTATE_hv (hv); 2598 struct coro *coro = SvSTATE_hv (hv);
2012 SV *data = newRV_inc ((SV *)hv); 2599 SV *data = newRV_inc ((SV *)hv);
2013 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2600 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2014 2601
2015 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2602 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2016 SvREFCNT_dec (data); /* magicext increases the refcount */ 2603 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2017 2604
2018 SvREFCNT_dec (coro->rouse_cb); 2605 SvREFCNT_dec (coro->rouse_cb);
2019 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2606 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2020 2607
2021 return cb; 2608 return cb;
… …
2115static void 2702static void
2116slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2703slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2117{ 2704{
2118 frame->prepare = prepare_cede_notself; 2705 frame->prepare = prepare_cede_notself;
2119 frame->check = slf_check_nop; 2706 frame->check = slf_check_nop;
2707}
2708
2709/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2710static void
2711slf_destroy (pTHX_ struct coro *coro)
2712{
2713 struct CoroSLF frame = coro->slf_frame;
2714
2715 /*
2716 * The on_destroy below most likely is from an SLF call.
2717 * Since by definition the SLF call will not finish when we destroy
2718 * the coro, we will have to force-finish it here, otherwise
2719 * cleanup functions cannot call SLF functions.
2720 */
2721 coro->slf_frame.prepare = 0;
2722
2723 /* this callback is reserved for slf functions needing to do cleanup */
2724 if (frame.destroy && frame.prepare && !PL_dirty)
2725 frame.destroy (aTHX_ &frame);
2120} 2726}
2121 2727
2122/* 2728/*
2123 * these not obviously related functions are all rolled into one 2729 * these not obviously related functions are all rolled into one
2124 * function to increase chances that they all will call transfer with the same 2730 * function to increase chances that they all will call transfer with the same
… …
2131 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2737 I32 checkmark; /* mark SP to see how many elements check has pushed */
2132 2738
2133 /* set up the slf frame, unless it has already been set-up */ 2739 /* set up the slf frame, unless it has already been set-up */
2134 /* the latter happens when a new coro has been started */ 2740 /* the latter happens when a new coro has been started */
2135 /* or when a new cctx was attached to an existing coroutine */ 2741 /* or when a new cctx was attached to an existing coroutine */
2136 if (expect_true (!slf_frame.prepare)) 2742 if (ecb_expect_true (!slf_frame.prepare))
2137 { 2743 {
2138 /* first iteration */ 2744 /* first iteration */
2139 dSP; 2745 dSP;
2140 SV **arg = PL_stack_base + TOPMARK + 1; 2746 SV **arg = PL_stack_base + TOPMARK + 1;
2141 int items = SP - arg; /* args without function object */ 2747 int items = SP - arg; /* args without function object */
… …
2182 while (slf_frame.check (aTHX_ &slf_frame)); 2788 while (slf_frame.check (aTHX_ &slf_frame));
2183 2789
2184 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2790 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2185 2791
2186 /* exception handling */ 2792 /* exception handling */
2187 if (expect_false (CORO_THROW)) 2793 if (ecb_expect_false (CORO_THROW))
2188 { 2794 {
2189 SV *exception = sv_2mortal (CORO_THROW); 2795 SV *exception = sv_2mortal (CORO_THROW);
2190 2796
2191 CORO_THROW = 0; 2797 CORO_THROW = 0;
2192 sv_setsv (ERRSV, exception); 2798 sv_setsv (ERRSV, exception);
2193 croak (0); 2799 croak (0);
2194 } 2800 }
2195 2801
2196 /* return value handling - mostly like entersub */ 2802 /* return value handling - mostly like entersub */
2197 /* make sure we put something on the stack in scalar context */ 2803 /* make sure we put something on the stack in scalar context */
2198 if (GIMME_V == G_SCALAR) 2804 if (GIMME_V == G_SCALAR
2805 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2199 { 2806 {
2200 dSP; 2807 dSP;
2201 SV **bot = PL_stack_base + checkmark; 2808 SV **bot = PL_stack_base + checkmark;
2202 2809
2203 if (sp == bot) /* too few, push undef */ 2810 if (sp == bot) /* too few, push undef */
2204 bot [1] = &PL_sv_undef; 2811 bot [1] = &PL_sv_undef;
2205 else if (sp != bot + 1) /* too many, take last one */ 2812 else /* too many, take last one */
2206 bot [1] = *sp; 2813 bot [1] = *sp;
2207 2814
2208 SP = bot + 1; 2815 SP = bot + 1;
2209 2816
2210 PUTBACK; 2817 PUTBACK;
… …
2243 if (PL_op->op_flags & OPf_STACKED) 2850 if (PL_op->op_flags & OPf_STACKED)
2244 { 2851 {
2245 if (items > slf_arga) 2852 if (items > slf_arga)
2246 { 2853 {
2247 slf_arga = items; 2854 slf_arga = items;
2248 free (slf_argv); 2855 Safefree (slf_argv);
2249 slf_argv = malloc (slf_arga * sizeof (SV *)); 2856 New (0, slf_argv, slf_arga, SV *);
2250 } 2857 }
2251 2858
2252 slf_argc = items; 2859 slf_argc = items;
2253 2860
2254 for (i = 0; i < items; ++i) 2861 for (i = 0; i < items; ++i)
… …
2259 2866
2260 PL_op->op_ppaddr = pp_slf; 2867 PL_op->op_ppaddr = pp_slf;
2261 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2868 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2262 2869
2263 PL_op = (OP *)&slf_restore; 2870 PL_op = (OP *)&slf_restore;
2871}
2872
2873/*****************************************************************************/
2874/* dynamic wind */
2875
2876static void
2877on_enterleave_call (pTHX_ SV *cb)
2878{
2879 dSP;
2880
2881 PUSHSTACK;
2882
2883 PUSHMARK (SP);
2884 PUTBACK;
2885 call_sv (cb, G_VOID | G_DISCARD);
2886 SPAGAIN;
2887
2888 POPSTACK;
2889}
2890
2891static SV *
2892coro_avp_pop_and_free (pTHX_ AV **avp)
2893{
2894 AV *av = *avp;
2895 SV *res = av_pop (av);
2896
2897 if (AvFILLp (av) < 0)
2898 {
2899 *avp = 0;
2900 SvREFCNT_dec (av);
2901 }
2902
2903 return res;
2904}
2905
2906static void
2907coro_pop_on_enter (pTHX_ void *coro)
2908{
2909 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2910 SvREFCNT_dec (cb);
2911}
2912
2913static void
2914coro_pop_on_leave (pTHX_ void *coro)
2915{
2916 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2917 on_enterleave_call (aTHX_ sv_2mortal (cb));
2918}
2919
2920static void
2921enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2922{
2923 if (!hook)
2924 return;
2925
2926 if (!*avp)
2927 {
2928 *avp = newAV ();
2929 AvREAL_off (*avp);
2930 }
2931
2932 av_push (*avp, (SV *)hook);
2933 av_push (*avp, (SV *)arg);
2934}
2935
2936static void
2937enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2938{
2939 AV *av = *avp;
2940 int i;
2941
2942 if (!av)
2943 return;
2944
2945 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2946 if (AvARRAY (av)[i] == (SV *)hook)
2947 {
2948 if (execute)
2949 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2950
2951 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2952 av_pop (av);
2953 av_pop (av);
2954 break;
2955 }
2956
2957 if (AvFILLp (av) >= 0)
2958 {
2959 *avp = 0;
2960 SvREFCNT_dec_NN (av);
2961 }
2962}
2963
2964static void
2965api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2966{
2967 struct coro *coro = SvSTATE (coro_sv);
2968
2969 if (SvSTATE_current == coro)
2970 if (enter)
2971 enter (aTHX_ enter_arg);
2972
2973 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2974 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2975}
2976
2977static void
2978api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2979{
2980 struct coro *coro = SvSTATE (coro_sv);
2981
2982 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2984}
2985
2986static void
2987savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2992}
2993
2994static void
2995savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3000}
3001
3002static void
3003api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3004{
3005 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3006
3007 /* this ought to be much cheaper than malloc + a single destructor call */
3008 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3009 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2264} 3010}
2265 3011
2266/*****************************************************************************/ 3012/*****************************************************************************/
2267/* PerlIO::cede */ 3013/* PerlIO::cede */
2268 3014
… …
2270{ 3016{
2271 PerlIOBuf base; 3017 PerlIOBuf base;
2272 NV next, every; 3018 NV next, every;
2273} PerlIOCede; 3019} PerlIOCede;
2274 3020
2275static IV 3021static IV ecb_cold
2276PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3022PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2277{ 3023{
2278 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3024 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2279 3025
2280 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3026 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2281 self->next = nvtime () + self->every; 3027 self->next = nvtime () + self->every;
2282 3028
2283 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3029 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2284} 3030}
2285 3031
2286static SV * 3032static SV * ecb_cold
2287PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3033PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2288{ 3034{
2289 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3035 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2290 3036
2291 return newSVnv (self->every); 3037 return newSVnv (self->every);
… …
2342/* Coro::Semaphore & Coro::Signal */ 3088/* Coro::Semaphore & Coro::Signal */
2343 3089
2344static SV * 3090static SV *
2345coro_waitarray_new (pTHX_ int count) 3091coro_waitarray_new (pTHX_ int count)
2346{ 3092{
2347 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3093 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2348 AV *av = newAV (); 3094 AV *av = newAV ();
2349 SV **ary; 3095 SV **ary;
2350 3096
2351 /* unfortunately, building manually saves memory */ 3097 /* unfortunately, building manually saves memory */
2352 Newx (ary, 2, SV *); 3098 Newx (ary, 2, SV *);
2353 AvALLOC (av) = ary; 3099 AvALLOC (av) = ary;
3100#if PERL_VERSION_ATLEAST (5,10,0)
2354 /*AvARRAY (av) = ary;*/ 3101 AvARRAY (av) = ary;
3102#else
2355 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 3103 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
3104 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
3105 SvPVX ((SV *)av) = (char *)ary;
3106#endif
2356 AvMAX (av) = 1; 3107 AvMAX (av) = 1;
2357 AvFILLp (av) = 0; 3108 AvFILLp (av) = 0;
2358 ary [0] = newSViv (count); 3109 ary [0] = newSViv (count);
2359 3110
2360 return newRV_noinc ((SV *)av); 3111 return newRV_noinc ((SV *)av);
… …
2393 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3144 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2394 PUTBACK; 3145 PUTBACK;
2395 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3146 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2396 } 3147 }
2397 3148
2398 SvREFCNT_dec (cb); 3149 SvREFCNT_dec_NN (cb);
2399 } 3150 }
2400} 3151}
2401 3152
2402static void 3153static void
2403coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3154coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2404{ 3155{
2405 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3156 /* call $sem->adjust (0) to possibly wake up some other waiters */
2406 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3157 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2407} 3158}
2408 3159
2409static int 3160static int
2410slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3161slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2411{ 3162{
2412 AV *av = (AV *)frame->data; 3163 AV *av = (AV *)frame->data;
2413 SV *count_sv = AvARRAY (av)[0]; 3164 SV *count_sv = AvARRAY (av)[0];
3165 SV *coro_hv = SvRV (coro_current);
3166
3167 frame->destroy = 0;
2414 3168
2415 /* if we are about to throw, don't actually acquire the lock, just throw */ 3169 /* if we are about to throw, don't actually acquire the lock, just throw */
2416 if (CORO_THROW) 3170 if (ecb_expect_false (CORO_THROW))
3171 {
3172 /* we still might be responsible for the semaphore, so wake up others */
3173 coro_semaphore_adjust (aTHX_ av, 0);
3174
2417 return 0; 3175 return 0;
3176 }
2418 else if (SvIVX (count_sv) > 0) 3177 else if (SvIVX (count_sv) > 0)
2419 { 3178 {
2420 SvSTATE_current->on_destroy = 0;
2421
2422 if (acquire) 3179 if (acquire)
2423 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3180 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2424 else 3181 else
2425 coro_semaphore_adjust (aTHX_ av, 0); 3182 coro_semaphore_adjust (aTHX_ av, 0);
2426 3183
… …
2430 { 3187 {
2431 int i; 3188 int i;
2432 /* if we were woken up but can't down, we look through the whole */ 3189 /* if we were woken up but can't down, we look through the whole */
2433 /* waiters list and only add us if we aren't in there already */ 3190 /* waiters list and only add us if we aren't in there already */
2434 /* this avoids some degenerate memory usage cases */ 3191 /* this avoids some degenerate memory usage cases */
2435 3192 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2436 for (i = 1; i <= AvFILLp (av); ++i)
2437 if (AvARRAY (av)[i] == SvRV (coro_current)) 3193 if (AvARRAY (av)[i] == coro_hv)
2438 return 1; 3194 return 1;
2439 3195
2440 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3196 av_push (av, SvREFCNT_inc (coro_hv));
2441 return 1; 3197 return 1;
2442 } 3198 }
2443} 3199}
2444 3200
2445static int 3201static int
… …
2468 { 3224 {
2469 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3225 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2470 3226
2471 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3227 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2472 frame->prepare = prepare_schedule; 3228 frame->prepare = prepare_schedule;
2473
2474 /* to avoid race conditions when a woken-up coro gets terminated */ 3229 /* to avoid race conditions when a woken-up coro gets terminated */
2475 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3230 /* we arrange for a temporary on_destroy that calls adjust (0) */
2476 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3231 frame->destroy = coro_semaphore_destroy;
2477 } 3232 }
2478} 3233}
2479 3234
2480static void 3235static void
2481slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3236slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2489{ 3244{
2490 if (items >= 2) 3245 if (items >= 2)
2491 { 3246 {
2492 /* callback form */ 3247 /* callback form */
2493 AV *av = (AV *)SvRV (arg [0]); 3248 AV *av = (AV *)SvRV (arg [0]);
2494 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3249 SV *cb_cv = s_get_cv_croak (arg [1]);
2495 3250
2496 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3251 av_push (av, SvREFCNT_inc_NN (cb_cv));
2497 3252
2498 if (SvIVX (AvARRAY (av)[0]) > 0) 3253 if (SvIVX (AvARRAY (av)[0]) > 0)
2499 coro_semaphore_adjust (aTHX_ av, 0); 3254 coro_semaphore_adjust (aTHX_ av, 0);
2500 3255
2501 frame->prepare = prepare_nop; 3256 frame->prepare = prepare_nop;
… …
2525 AvARRAY (av)[0] = AvARRAY (av)[1]; 3280 AvARRAY (av)[0] = AvARRAY (av)[1];
2526 AvARRAY (av)[1] = cb; 3281 AvARRAY (av)[1] = cb;
2527 3282
2528 cb = av_shift (av); 3283 cb = av_shift (av);
2529 3284
3285 if (SvTYPE (cb) == SVt_PVCV)
3286 {
3287 dSP;
3288 PUSHMARK (SP);
3289 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3290 PUTBACK;
3291 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3292 }
3293 else
3294 {
2530 api_ready (aTHX_ cb); 3295 api_ready (aTHX_ cb);
2531 sv_setiv (cb, 0); /* signal waiter */ 3296 sv_setiv (cb, 0); /* signal waiter */
3297 }
3298
2532 SvREFCNT_dec (cb); 3299 SvREFCNT_dec_NN (cb);
2533 3300
2534 --count; 3301 --count;
2535 } 3302 }
2536} 3303}
2537 3304
… …
2545static void 3312static void
2546slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3313slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2547{ 3314{
2548 AV *av = (AV *)SvRV (arg [0]); 3315 AV *av = (AV *)SvRV (arg [0]);
2549 3316
3317 if (items >= 2)
3318 {
3319 SV *cb_cv = s_get_cv_croak (arg [1]);
3320 av_push (av, SvREFCNT_inc_NN (cb_cv));
3321
2550 if (SvIVX (AvARRAY (av)[0])) 3322 if (SvIVX (AvARRAY (av)[0]))
3323 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3324
3325 frame->prepare = prepare_nop;
3326 frame->check = slf_check_nop;
3327 }
3328 else if (SvIVX (AvARRAY (av)[0]))
2551 { 3329 {
2552 SvIVX (AvARRAY (av)[0]) = 0; 3330 SvIVX (AvARRAY (av)[0]) = 0;
2553 frame->prepare = prepare_nop; 3331 frame->prepare = prepare_nop;
2554 frame->check = slf_check_nop; 3332 frame->check = slf_check_nop;
2555 } 3333 }
2556 else 3334 else
2557 { 3335 {
2558 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3336 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2559 3337
2560 av_push (av, waiter); 3338 av_push (av, waiter);
2561 3339
2562 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3340 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2563 frame->prepare = prepare_schedule; 3341 frame->prepare = prepare_schedule;
… …
2581 3359
2582static void 3360static void
2583coro_aio_callback (pTHX_ CV *cv) 3361coro_aio_callback (pTHX_ CV *cv)
2584{ 3362{
2585 dXSARGS; 3363 dXSARGS;
2586 AV *state = (AV *)GENSUB_ARG; 3364 AV *state = (AV *)S_GENSUB_ARG;
2587 SV *coro = av_pop (state); 3365 SV *coro = av_pop (state);
2588 SV *data_sv = newSV (sizeof (struct io_state)); 3366 SV *data_sv = newSV (sizeof (struct io_state));
2589 3367
2590 av_extend (state, items - 1); 3368 av_extend (state, items - 1);
2591 3369
… …
2611 } 3389 }
2612 3390
2613 av_push (state, data_sv); 3391 av_push (state, data_sv);
2614 3392
2615 api_ready (aTHX_ coro); 3393 api_ready (aTHX_ coro);
2616 SvREFCNT_dec (coro); 3394 SvREFCNT_dec_NN (coro);
2617 SvREFCNT_dec ((AV *)state); 3395 SvREFCNT_dec_NN ((AV *)state);
2618} 3396}
2619 3397
2620static int 3398static int
2621slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3399slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2622{ 3400{
… …
2627 /* it quickly returns */ 3405 /* it quickly returns */
2628 if (CORO_THROW) 3406 if (CORO_THROW)
2629 return 0; 3407 return 0;
2630 3408
2631 /* one element that is an RV? repeat! */ 3409 /* one element that is an RV? repeat! */
2632 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3410 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2633 return 1; 3411 return 1;
2634 3412
2635 /* restore status */ 3413 /* restore status */
2636 { 3414 {
2637 SV *data_sv = av_pop (state); 3415 SV *data_sv = av_pop (state);
… …
2640 errno = data->errorno; 3418 errno = data->errorno;
2641 PL_laststype = data->laststype; 3419 PL_laststype = data->laststype;
2642 PL_laststatval = data->laststatval; 3420 PL_laststatval = data->laststatval;
2643 PL_statcache = data->statcache; 3421 PL_statcache = data->statcache;
2644 3422
2645 SvREFCNT_dec (data_sv); 3423 SvREFCNT_dec_NN (data_sv);
2646 } 3424 }
2647 3425
2648 /* push result values */ 3426 /* push result values */
2649 { 3427 {
2650 dSP; 3428 dSP;
… …
2676 dSP; 3454 dSP;
2677 3455
2678 static SV *prio_cv; 3456 static SV *prio_cv;
2679 static SV *prio_sv; 3457 static SV *prio_sv;
2680 3458
2681 if (expect_false (!prio_cv)) 3459 if (ecb_expect_false (!prio_cv))
2682 { 3460 {
2683 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3461 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2684 prio_sv = newSViv (0); 3462 prio_sv = newSViv (0);
2685 } 3463 }
2686 3464
… …
2705 3483
2706 for (i = 0; i < items; ++i) 3484 for (i = 0; i < items; ++i)
2707 PUSHs (arg [i]); 3485 PUSHs (arg [i]);
2708 3486
2709 /* now push the callback closure */ 3487 /* now push the callback closure */
2710 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3488 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2711 3489
2712 /* now call the AIO function - we assume our request is uncancelable */ 3490 /* now call the AIO function - we assume our request is uncancelable */
2713 PUTBACK; 3491 PUTBACK;
2714 call_sv ((SV *)req, G_VOID | G_DISCARD); 3492 call_sv ((SV *)req, G_VOID | G_DISCARD);
2715 } 3493 }
2716 3494
2717 /* now that the requets is going, we loop toll we have a result */ 3495 /* now that the request is going, we loop till we have a result */
2718 frame->data = (void *)state; 3496 frame->data = (void *)state;
2719 frame->prepare = prepare_schedule; 3497 frame->prepare = prepare_schedule;
2720 frame->check = slf_check_aio_req; 3498 frame->check = slf_check_aio_req;
2721} 3499}
2722 3500
… …
2734 3512
2735#if CORO_CLONE 3513#if CORO_CLONE
2736# include "clone.c" 3514# include "clone.c"
2737#endif 3515#endif
2738 3516
3517/*****************************************************************************/
3518
3519static SV *
3520coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3521{
3522 SV *coro_sv;
3523 struct coro *coro;
3524 MAGIC *mg;
3525 HV *hv;
3526 SV *cb;
3527 int i;
3528
3529 if (argc > 0)
3530 {
3531 cb = s_get_cv_croak (argv [0]);
3532
3533 if (!is_coro)
3534 {
3535 if (CvISXSUB (cb))
3536 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3537
3538 if (!CvROOT (cb))
3539 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3540 }
3541 }
3542
3543 Newz (0, coro, 1, struct coro);
3544 coro->args = newAV ();
3545 coro->flags = CF_NEW;
3546
3547 if (coro_first) coro_first->prev = coro;
3548 coro->next = coro_first;
3549 coro_first = coro;
3550
3551 coro->hv = hv = newHV ();
3552 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3553 mg->mg_flags |= MGf_DUP;
3554 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3555
3556 if (argc > 0)
3557 {
3558 av_extend (coro->args, argc + is_coro - 1);
3559
3560 if (is_coro)
3561 {
3562 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3563 cb = (SV *)cv_coro_run;
3564 }
3565
3566 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3567
3568 for (i = 1; i < argc; i++)
3569 av_push (coro->args, newSVsv (argv [i]));
3570 }
3571
3572 return coro_sv;
3573}
3574
3575#ifndef __cplusplus
3576ecb_cold XS(boot_Coro__State);
3577#endif
3578
3579#if CORO_JIT
3580
3581static void ecb_noinline ecb_cold
3582pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3583{
3584 dSP;
3585 AV *av = newAV ();
3586
3587 av_store (av, 3, newSVuv (d));
3588 av_store (av, 2, newSVuv (c));
3589 av_store (av, 1, newSVuv (b));
3590 av_store (av, 0, newSVuv (a));
3591
3592 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3593
3594 PUTBACK;
3595}
3596
3597static void ecb_noinline ecb_cold
3598jit_init (pTHX)
3599{
3600 dSP;
3601 SV *load, *save;
3602 char *map_base;
3603 char *load_ptr, *save_ptr;
3604 STRLEN load_len, save_len, map_len;
3605 int count;
3606
3607 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3608
3609 PUSHMARK (SP);
3610 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3611 #include "state.h"
3612 count = call_pv ("Coro::State::_jit", G_ARRAY);
3613 SPAGAIN;
3614
3615 save = POPs; save_ptr = SvPVbyte (save, save_len);
3616 load = POPs; load_ptr = SvPVbyte (load, load_len);
3617
3618 map_len = load_len + save_len + 16;
3619
3620 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3621
3622 if (map_base == (char *)MAP_FAILED)
3623 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3624
3625 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3626
3627 load_perl_slots = (load_save_perl_slots_type)map_base;
3628 memcpy (map_base, load_ptr, load_len);
3629
3630 map_base += (load_len + 15) & ~15;
3631
3632 save_perl_slots = (load_save_perl_slots_type)map_base;
3633 memcpy (map_base, save_ptr, save_len);
3634
3635 /* we are good citizens and try to make the page read-only, so the evil evil */
3636 /* hackers might have it a bit more difficult */
3637 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3638
3639 PUTBACK;
3640 eval_pv ("undef &Coro::State::_jit", 1);
3641}
3642
3643#endif
3644
2739MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3645MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2740 3646
2741PROTOTYPES: DISABLE 3647PROTOTYPES: DISABLE
2742 3648
2743BOOT: 3649BOOT:
2744{ 3650{
3651#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3652#include "state.h"
2745#ifdef USE_ITHREADS 3653#ifdef USE_ITHREADS
2746# if CORO_PTHREAD 3654# if CORO_PTHREAD
2747 coro_thx = PERL_GET_CONTEXT; 3655 coro_thx = PERL_GET_CONTEXT;
2748# endif 3656# endif
2749#endif 3657#endif
2750 BOOT_PAGESIZE; 3658 /* perl defines these to check for existance first, but why it doesn't */
3659 /* just create them one at init time is not clear to me, except for */
3660 /* programs trying to delete them, but... */
3661 /* anyway, we declare this as invalid and make sure they are initialised here */
3662 DEFSV;
3663 ERRSV;
2751 3664
2752 cctx_current = cctx_new_empty (); 3665 cctx_current = cctx_new_empty ();
2753 3666
2754 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3667 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2755 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3668 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2756 3669
2757 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3670 {
2758 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3671 /*
2759 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3672 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3673 * by coro_sig_vtbl in hash values.
3674 */
3675 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3676
3677 /* this only works if perl doesn't have a vtbl for %SIG */
3678 assert (!mg->mg_virtual);
3679
3680 /*
3681 * The irony is that the perl API itself asserts that mg_virtual
3682 * must be non-const, yet perl5porters insisted on marking their
3683 * vtbls as read-only, just to thwart perl modules from patching
3684 * them.
3685 */
3686 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3687 mg->mg_flags |= MGf_COPY;
3688
3689 coro_sigelem_vtbl = PL_vtbl_sigelem;
3690 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3691 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3692 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3693 }
2760 3694
2761 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2762 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3695 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2763 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3696 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2764 3697
2765 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3698 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3699
3700 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
2766 3701
2767 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3702 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
2768 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3703 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
2769 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3704 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
2770 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3705 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
2795 coroapi.prepare_nop = prepare_nop; 3730 coroapi.prepare_nop = prepare_nop;
2796 coroapi.prepare_schedule = prepare_schedule; 3731 coroapi.prepare_schedule = prepare_schedule;
2797 coroapi.prepare_cede = prepare_cede; 3732 coroapi.prepare_cede = prepare_cede;
2798 coroapi.prepare_cede_notself = prepare_cede_notself; 3733 coroapi.prepare_cede_notself = prepare_cede_notself;
2799 3734
2800 { 3735 time_init (aTHX);
2801 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2802 3736
2803 if (!svp) croak ("Time::HiRes is required");
2804 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2805
2806 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2807 }
2808
2809 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3737 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3738#if CORO_JIT
3739 PUTBACK;
3740 jit_init (aTHX);
3741 SPAGAIN;
3742#endif
2810} 3743}
2811 3744
2812SV * 3745SV *
2813new (char *klass, ...) 3746new (SV *klass, ...)
2814 ALIAS: 3747 ALIAS:
2815 Coro::new = 1 3748 Coro::new = 1
2816 CODE: 3749 CODE:
2817{ 3750 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2818 struct coro *coro; 3751 OUTPUT:
2819 MAGIC *mg;
2820 HV *hv;
2821 CV *cb;
2822 int i;
2823
2824 if (items > 1)
2825 {
2826 cb = coro_sv_2cv (aTHX_ ST (1));
2827
2828 if (!ix)
2829 {
2830 if (CvISXSUB (cb))
2831 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2832
2833 if (!CvROOT (cb))
2834 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2835 }
2836 }
2837
2838 Newz (0, coro, 1, struct coro);
2839 coro->args = newAV ();
2840 coro->flags = CF_NEW;
2841
2842 if (coro_first) coro_first->prev = coro;
2843 coro->next = coro_first;
2844 coro_first = coro;
2845
2846 coro->hv = hv = newHV ();
2847 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2848 mg->mg_flags |= MGf_DUP;
2849 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2850
2851 if (items > 1)
2852 {
2853 av_extend (coro->args, items - 1 + ix - 1);
2854
2855 if (ix)
2856 {
2857 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2858 cb = cv_coro_run;
2859 }
2860
2861 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2862
2863 for (i = 2; i < items; i++)
2864 av_push (coro->args, newSVsv (ST (i)));
2865 }
2866}
2867 OUTPUT:
2868 RETVAL 3752 RETVAL
2869 3753
2870void 3754void
2871transfer (...) 3755transfer (...)
2872 PROTOTYPE: $$ 3756 PROTOTYPE: $$
2873 CODE: 3757 CODE:
2874 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3758 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2875 3759
2876bool
2877_destroy (SV *coro_sv)
2878 CODE:
2879 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2880 OUTPUT:
2881 RETVAL
2882
2883void
2884_exit (int code)
2885 PROTOTYPE: $
2886 CODE:
2887 _exit (code);
2888
2889SV * 3760SV *
2890clone (Coro::State coro) 3761clone (Coro::State coro)
2891 CODE: 3762 CODE:
2892{ 3763{
2893#if CORO_CLONE 3764#if CORO_CLONE
2894 struct coro *ncoro = coro_clone (coro); 3765 struct coro *ncoro = coro_clone (aTHX_ coro);
2895 MAGIC *mg; 3766 MAGIC *mg;
2896 /* TODO: too much duplication */ 3767 /* TODO: too much duplication */
2897 ncoro->hv = newHV (); 3768 ncoro->hv = newHV ();
2898 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3769 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2899 mg->mg_flags |= MGf_DUP; 3770 mg->mg_flags |= MGf_DUP;
… …
2947void 3818void
2948list () 3819list ()
2949 PROTOTYPE: 3820 PROTOTYPE:
2950 PPCODE: 3821 PPCODE:
2951{ 3822{
2952 struct coro *coro; 3823 struct coro *coro;
2953 for (coro = coro_first; coro; coro = coro->next) 3824 for (coro = coro_first; coro; coro = coro->next)
2954 if (coro->hv) 3825 if (coro->hv)
2955 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3826 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2956} 3827}
2957 3828
… …
2959call (Coro::State coro, SV *coderef) 3830call (Coro::State coro, SV *coderef)
2960 ALIAS: 3831 ALIAS:
2961 eval = 1 3832 eval = 1
2962 CODE: 3833 CODE:
2963{ 3834{
3835 struct coro *current = SvSTATE_current;
3836
2964 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3837 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
2965 { 3838 {
2966 struct coro temp; 3839 struct CoroSLF slf_save;
2967 3840
2968 if (!(coro->flags & CF_RUNNING)) 3841 if (current != coro)
2969 { 3842 {
2970 PUTBACK; 3843 PUTBACK;
2971 save_perl (aTHX_ &temp); 3844 save_perl (aTHX_ current);
2972 load_perl (aTHX_ coro); 3845 load_perl (aTHX_ coro);
3846 /* the coro is most likely in an active SLF call.
3847 * while not strictly required (the code we execute is
3848 * not allowed to call any SLF functions), it's cleaner
3849 * to reinitialise the slf_frame and restore it later.
3850 * This might one day allow us to actually do SLF calls
3851 * from code executed here.
3852 */
3853 slf_save = slf_frame;
3854 slf_frame.prepare = 0;
3855 SPAGAIN;
2973 } 3856 }
2974 3857
2975 {
2976 dSP;
2977 ENTER;
2978 SAVETMPS;
2979 PUTBACK;
2980 PUSHSTACK; 3858 PUSHSTACK;
3859
2981 PUSHMARK (SP); 3860 PUSHMARK (SP);
3861 PUTBACK;
2982 3862
2983 if (ix) 3863 if (ix)
2984 eval_sv (coderef, 0); 3864 eval_sv (coderef, 0);
2985 else 3865 else
2986 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3866 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2987 3867
2988 POPSTACK; 3868 POPSTACK;
2989 SPAGAIN; 3869 SPAGAIN;
2990 FREETMPS;
2991 LEAVE;
2992 PUTBACK;
2993 }
2994 3870
2995 if (!(coro->flags & CF_RUNNING)) 3871 if (current != coro)
2996 { 3872 {
3873 PUTBACK;
3874 slf_frame = slf_save;
2997 save_perl (aTHX_ coro); 3875 save_perl (aTHX_ coro);
2998 load_perl (aTHX_ &temp); 3876 load_perl (aTHX_ current);
2999 SPAGAIN; 3877 SPAGAIN;
3000 } 3878 }
3001 } 3879 }
3002} 3880}
3003 3881
… …
3006 PROTOTYPE: $ 3884 PROTOTYPE: $
3007 ALIAS: 3885 ALIAS:
3008 is_ready = CF_READY 3886 is_ready = CF_READY
3009 is_running = CF_RUNNING 3887 is_running = CF_RUNNING
3010 is_new = CF_NEW 3888 is_new = CF_NEW
3011 is_destroyed = CF_DESTROYED 3889 is_destroyed = CF_ZOMBIE
3890 is_zombie = CF_ZOMBIE
3891 is_suspended = CF_SUSPENDED
3012 CODE: 3892 CODE:
3013 RETVAL = boolSV (coro->flags & ix); 3893 RETVAL = boolSV (coro->flags & ix);
3014 OUTPUT: 3894 OUTPUT:
3015 RETVAL 3895 RETVAL
3016 3896
3017void 3897void
3018throw (Coro::State self, SV *throw = &PL_sv_undef) 3898throw (SV *self, SV *exception = &PL_sv_undef)
3019 PROTOTYPE: $;$ 3899 PROTOTYPE: $;$
3020 CODE: 3900 CODE:
3021{ 3901{
3902 struct coro *coro = SvSTATE (self);
3022 struct coro *current = SvSTATE_current; 3903 struct coro *current = SvSTATE_current;
3023 SV **throwp = self == current ? &CORO_THROW : &self->except; 3904 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3024 SvREFCNT_dec (*throwp); 3905 SvREFCNT_dec (*exceptionp);
3025 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3906 SvGETMAGIC (exception);
3907 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3908
3909 api_ready (aTHX_ self);
3026} 3910}
3027 3911
3028void 3912void
3029api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3913api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3030 PROTOTYPE: $;$ 3914 PROTOTYPE: $;$
… …
3032 3916
3033SV * 3917SV *
3034has_cctx (Coro::State coro) 3918has_cctx (Coro::State coro)
3035 PROTOTYPE: $ 3919 PROTOTYPE: $
3036 CODE: 3920 CODE:
3037 RETVAL = boolSV (!!coro->cctx); 3921 /* maybe manage the running flag differently */
3922 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3038 OUTPUT: 3923 OUTPUT:
3039 RETVAL 3924 RETVAL
3040 3925
3041int 3926int
3042is_traced (Coro::State coro) 3927is_traced (Coro::State coro)
… …
3062 3947
3063void 3948void
3064force_cctx () 3949force_cctx ()
3065 PROTOTYPE: 3950 PROTOTYPE:
3066 CODE: 3951 CODE:
3067 SvSTATE_current->cctx->idle_sp = 0; 3952 cctx_current->idle_sp = 0;
3068 3953
3069void 3954void
3070swap_defsv (Coro::State self) 3955swap_defsv (Coro::State self)
3071 PROTOTYPE: $ 3956 PROTOTYPE: $
3072 ALIAS: 3957 ALIAS:
… …
3080 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3965 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3081 3966
3082 SV *tmp = *src; *src = *dst; *dst = tmp; 3967 SV *tmp = *src; *src = *dst; *dst = tmp;
3083 } 3968 }
3084 3969
3970void
3971cancel (Coro::State self)
3972 CODE:
3973 coro_state_destroy (aTHX_ self);
3974
3975SV *
3976enable_times (int enabled = enable_times)
3977 CODE:
3978{
3979 RETVAL = boolSV (enable_times);
3980
3981 if (enabled != enable_times)
3982 {
3983 enable_times = enabled;
3984
3985 coro_times_update ();
3986 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3987 }
3988}
3989 OUTPUT:
3990 RETVAL
3991
3992void
3993times (Coro::State self)
3994 PPCODE:
3995{
3996 struct coro *current = SvSTATE (coro_current);
3997
3998 if (ecb_expect_false (current == self))
3999 {
4000 coro_times_update ();
4001 coro_times_add (SvSTATE (coro_current));
4002 }
4003
4004 EXTEND (SP, 2);
4005 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
4006 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
4007
4008 if (ecb_expect_false (current == self))
4009 coro_times_sub (SvSTATE (coro_current));
4010}
4011
4012void
4013swap_sv (Coro::State coro, SV *sva, SV *svb)
4014 CODE:
4015{
4016 struct coro *current = SvSTATE_current;
4017 AV *swap_sv;
4018 int i;
4019
4020 sva = SvRV (sva);
4021 svb = SvRV (svb);
4022
4023 if (current == coro)
4024 SWAP_SVS_LEAVE (current);
4025
4026 if (!coro->swap_sv)
4027 coro->swap_sv = newAV ();
4028
4029 swap_sv = coro->swap_sv;
4030
4031 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4032 {
4033 SV *a = AvARRAY (swap_sv)[i ];
4034 SV *b = AvARRAY (swap_sv)[i + 1];
4035
4036 if (a == sva && b == svb)
4037 {
4038 SvREFCNT_dec_NN (a);
4039 SvREFCNT_dec_NN (b);
4040
4041 for (; i <= AvFILLp (swap_sv) - 2; i++)
4042 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4043
4044 AvFILLp (swap_sv) -= 2;
4045
4046 goto removed;
4047 }
4048 }
4049
4050 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4051 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4052
4053 removed:
4054
4055 if (current == coro)
4056 SWAP_SVS_ENTER (current);
4057}
4058
3085 4059
3086MODULE = Coro::State PACKAGE = Coro 4060MODULE = Coro::State PACKAGE = Coro
3087 4061
3088BOOT: 4062BOOT:
3089{ 4063{
3090 int i; 4064 if (SVt_LAST > 32)
4065 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3091 4066
3092 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4067 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3093 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4068 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3094 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 4069 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3095 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3096 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4070 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3097 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4071 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3098 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4072 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3099 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4073 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
4074 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3100 4075
3101 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4076 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3102 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4077 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3103 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4078 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3104 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4079 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3105 4080
3106 coro_stash = gv_stashpv ("Coro", TRUE); 4081 coro_stash = gv_stashpv ("Coro", TRUE);
3107 4082
3108 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4083 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3109 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4084 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3110 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4085 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3111 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4086 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3112 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4087 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3113 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4088 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3114
3115 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3116 coro_ready[i] = newAV ();
3117 4089
3118 { 4090 {
3119 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4091 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3120 4092
3121 coroapi.schedule = api_schedule; 4093 coroapi.schedule = api_schedule;
… …
3125 coroapi.ready = api_ready; 4097 coroapi.ready = api_ready;
3126 coroapi.is_ready = api_is_ready; 4098 coroapi.is_ready = api_is_ready;
3127 coroapi.nready = coro_nready; 4099 coroapi.nready = coro_nready;
3128 coroapi.current = coro_current; 4100 coroapi.current = coro_current;
3129 4101
4102 coroapi.enterleave_hook = api_enterleave_hook;
4103 coroapi.enterleave_unhook = api_enterleave_unhook;
4104 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4105
3130 /*GCoroAPI = &coroapi;*/ 4106 /*GCoroAPI = &coroapi;*/
3131 sv_setiv (sv, (IV)&coroapi); 4107 sv_setiv (sv, PTR2IV (&coroapi));
3132 SvREADONLY_on (sv); 4108 SvREADONLY_on (sv);
3133 } 4109 }
3134} 4110}
4111
4112SV *
4113async (...)
4114 PROTOTYPE: &@
4115 CODE:
4116 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4117 api_ready (aTHX_ RETVAL);
4118 OUTPUT:
4119 RETVAL
4120
4121void
4122_destroy (Coro::State coro)
4123 CODE:
4124 /* used by the manager thread */
4125 coro_state_destroy (aTHX_ coro);
4126
4127void
4128on_destroy (Coro::State coro, SV *cb)
4129 CODE:
4130 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4131
4132void
4133join (...)
4134 CODE:
4135 CORO_EXECUTE_SLF_XS (slf_init_join);
3135 4136
3136void 4137void
3137terminate (...) 4138terminate (...)
3138 CODE: 4139 CODE:
3139 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4140 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3140 4141
3141void 4142void
4143cancel (...)
4144 CODE:
4145 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4146
4147int
4148safe_cancel (Coro::State self, ...)
4149 C_ARGS: aTHX_ self, &ST (1), items - 1
4150
4151void
3142schedule (...) 4152schedule (...)
3143 CODE: 4153 CODE:
3144 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4154 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3145 4155
3146void 4156void
… …
3162cede_notself (...) 4172cede_notself (...)
3163 CODE: 4173 CODE:
3164 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4174 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3165 4175
3166void 4176void
3167_cancel (Coro::State self)
3168 CODE:
3169 coro_state_destroy (aTHX_ self);
3170 coro_call_on_destroy (aTHX_ self);
3171
3172void
3173_set_current (SV *current) 4177_set_current (SV *current)
3174 PROTOTYPE: $ 4178 PROTOTYPE: $
3175 CODE: 4179 CODE:
3176 SvREFCNT_dec (SvRV (coro_current)); 4180 SvREFCNT_dec_NN (SvRV (coro_current));
3177 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4181 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3178 4182
3179void 4183void
3180_set_readyhook (SV *hook) 4184_set_readyhook (SV *hook)
3181 PROTOTYPE: $ 4185 PROTOTYPE: $
3182 CODE: 4186 CODE:
3183 SvREFCNT_dec (coro_readyhook); 4187 SvREFCNT_dec (coro_readyhook);
4188 SvGETMAGIC (hook);
4189 if (SvOK (hook))
4190 {
3184 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4191 coro_readyhook = newSVsv (hook);
4192 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4193 }
4194 else
4195 {
4196 coro_readyhook = 0;
4197 CORO_READYHOOK = 0;
4198 }
3185 4199
3186int 4200int
3187prio (Coro::State coro, int newprio = 0) 4201prio (Coro::State coro, int newprio = 0)
3188 PROTOTYPE: $;$ 4202 PROTOTYPE: $;$
3189 ALIAS: 4203 ALIAS:
… …
3195 if (items > 1) 4209 if (items > 1)
3196 { 4210 {
3197 if (ix) 4211 if (ix)
3198 newprio = coro->prio - newprio; 4212 newprio = coro->prio - newprio;
3199 4213
3200 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4214 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3201 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4215 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3202 4216
3203 coro->prio = newprio; 4217 coro->prio = newprio;
3204 } 4218 }
3205} 4219}
3206 OUTPUT: 4220 OUTPUT:
… …
3221 RETVAL = coro_nready; 4235 RETVAL = coro_nready;
3222 OUTPUT: 4236 OUTPUT:
3223 RETVAL 4237 RETVAL
3224 4238
3225void 4239void
4240suspend (Coro::State self)
4241 PROTOTYPE: $
4242 CODE:
4243 self->flags |= CF_SUSPENDED;
4244
4245void
4246resume (Coro::State self)
4247 PROTOTYPE: $
4248 CODE:
4249 self->flags &= ~CF_SUSPENDED;
4250
4251void
3226_pool_handler (...) 4252_pool_handler (...)
3227 CODE: 4253 CODE:
3228 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4254 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3229 4255
3230void 4256void
… …
3241 for (i = 1; i < items; ++i) 4267 for (i = 1; i < items; ++i)
3242 av_push (av, SvREFCNT_inc_NN (ST (i))); 4268 av_push (av, SvREFCNT_inc_NN (ST (i)));
3243 4269
3244 if ((SV *)hv == &PL_sv_undef) 4270 if ((SV *)hv == &PL_sv_undef)
3245 { 4271 {
3246 PUSHMARK (SP); 4272 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3247 EXTEND (SP, 2);
3248 PUSHs (sv_Coro);
3249 PUSHs ((SV *)cv_pool_handler);
3250 PUTBACK;
3251 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3252 SPAGAIN;
3253
3254 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4273 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4274 SvREFCNT_dec_NN (sv);
3255 } 4275 }
3256 4276
3257 { 4277 {
3258 struct coro *coro = SvSTATE_hv (hv); 4278 struct coro *coro = SvSTATE_hv (hv);
3259 4279
… …
3266 api_ready (aTHX_ (SV *)hv); 4286 api_ready (aTHX_ (SV *)hv);
3267 4287
3268 if (GIMME_V != G_VOID) 4288 if (GIMME_V != G_VOID)
3269 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4289 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3270 else 4290 else
3271 SvREFCNT_dec (hv); 4291 SvREFCNT_dec_NN (hv);
3272} 4292}
3273 4293
3274SV * 4294SV *
3275rouse_cb () 4295rouse_cb ()
3276 PROTOTYPE: 4296 PROTOTYPE:
… …
3283rouse_wait (...) 4303rouse_wait (...)
3284 PROTOTYPE: ;$ 4304 PROTOTYPE: ;$
3285 PPCODE: 4305 PPCODE:
3286 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4306 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3287 4307
4308void
4309on_enter (SV *block)
4310 ALIAS:
4311 on_leave = 1
4312 PROTOTYPE: &
4313 CODE:
4314{
4315 struct coro *coro = SvSTATE_current;
4316 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4317
4318 block = s_get_cv_croak (block);
4319
4320 if (!*avp)
4321 *avp = newAV ();
4322
4323 av_push (*avp, SvREFCNT_inc (block));
4324
4325 if (!ix)
4326 on_enterleave_call (aTHX_ block);
4327
4328 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4329 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4330 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4331}
4332
3288 4333
3289MODULE = Coro::State PACKAGE = PerlIO::cede 4334MODULE = Coro::State PACKAGE = PerlIO::cede
3290 4335
3291BOOT: 4336BOOT:
3292 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4337 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3295MODULE = Coro::State PACKAGE = Coro::Semaphore 4340MODULE = Coro::State PACKAGE = Coro::Semaphore
3296 4341
3297SV * 4342SV *
3298new (SV *klass, SV *count = 0) 4343new (SV *klass, SV *count = 0)
3299 CODE: 4344 CODE:
4345{
4346 int semcnt = 1;
4347
4348 if (count)
4349 {
4350 SvGETMAGIC (count);
4351
4352 if (SvOK (count))
4353 semcnt = SvIV (count);
4354 }
4355
3300 RETVAL = sv_bless ( 4356 RETVAL = sv_bless (
3301 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4357 coro_waitarray_new (aTHX_ semcnt),
3302 GvSTASH (CvGV (cv)) 4358 GvSTASH (CvGV (cv))
3303 ); 4359 );
4360}
3304 OUTPUT: 4361 OUTPUT:
3305 RETVAL 4362 RETVAL
3306 4363
3307# helper for Coro::Channel 4364# helper for Coro::Channel and others
3308SV * 4365SV *
3309_alloc (int count) 4366_alloc (int count)
3310 CODE: 4367 CODE:
3311 RETVAL = coro_waitarray_new (aTHX_ count); 4368 RETVAL = coro_waitarray_new (aTHX_ count);
3312 OUTPUT: 4369 OUTPUT:
… …
3318 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4375 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3319 OUTPUT: 4376 OUTPUT:
3320 RETVAL 4377 RETVAL
3321 4378
3322void 4379void
3323up (SV *self, int adjust = 1) 4380up (SV *self)
3324 ALIAS:
3325 adjust = 1
3326 CODE: 4381 CODE:
4382 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4383
4384void
4385adjust (SV *self, int adjust)
4386 CODE:
3327 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3328 4388
3329void 4389void
3330down (...) 4390down (...)
3331 CODE: 4391 CODE:
3332 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4392 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3354 XSRETURN_NO; 4414 XSRETURN_NO;
3355} 4415}
3356 4416
3357void 4417void
3358waiters (SV *self) 4418waiters (SV *self)
3359 PPCODE: 4419 PPCODE:
3360{ 4420{
3361 AV *av = (AV *)SvRV (self); 4421 AV *av = (AV *)SvRV (self);
3362 int wcount = AvFILLp (av) + 1 - 1; 4422 int wcount = AvFILLp (av) + 1 - 1;
3363 4423
3364 if (GIMME_V == G_SCALAR) 4424 if (GIMME_V == G_SCALAR)
… …
3370 for (i = 1; i <= wcount; ++i) 4430 for (i = 1; i <= wcount; ++i)
3371 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4431 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3372 } 4432 }
3373} 4433}
3374 4434
4435MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4436
4437void
4438_may_delete (SV *sem, int count, unsigned int extra_refs)
4439 PPCODE:
4440{
4441 AV *av = (AV *)SvRV (sem);
4442
4443 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4444 && AvFILLp (av) == 0 /* no waiters, just count */
4445 && SvIV (AvARRAY (av)[0]) == count)
4446 XSRETURN_YES;
4447
4448 XSRETURN_NO;
4449}
4450
3375MODULE = Coro::State PACKAGE = Coro::Signal 4451MODULE = Coro::State PACKAGE = Coro::Signal
3376 4452
3377SV * 4453SV *
3378new (SV *klass) 4454new (SV *klass)
3379 CODE: 4455 CODE:
… …
3391 4467
3392void 4468void
3393broadcast (SV *self) 4469broadcast (SV *self)
3394 CODE: 4470 CODE:
3395{ 4471{
3396 AV *av = (AV *)SvRV (self); 4472 AV *av = (AV *)SvRV (self);
3397 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4473 coro_signal_wake (aTHX_ av, AvFILLp (av));
3398} 4474}
3399 4475
3400void 4476void
3401send (SV *self) 4477send (SV *self)
… …
3409 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4485 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3410} 4486}
3411 4487
3412IV 4488IV
3413awaited (SV *self) 4489awaited (SV *self)
3414 CODE: 4490 CODE:
3415 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4491 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3416 OUTPUT: 4492 OUTPUT:
3417 RETVAL 4493 RETVAL
3418 4494
3419 4495
… …
3424 4500
3425void 4501void
3426_schedule (...) 4502_schedule (...)
3427 CODE: 4503 CODE:
3428{ 4504{
3429 static int incede; 4505 static int incede;
3430 4506
3431 api_cede_notself (aTHX); 4507 api_cede_notself (aTHX);
3432 4508
3433 ++incede; 4509 ++incede;
3434 while (coro_nready >= incede && api_cede (aTHX)) 4510 while (coro_nready >= incede && api_cede (aTHX))
… …
3450 4526
3451void 4527void
3452_register (char *target, char *proto, SV *req) 4528_register (char *target, char *proto, SV *req)
3453 CODE: 4529 CODE:
3454{ 4530{
3455 CV *req_cv = coro_sv_2cv (aTHX_ req); 4531 SV *req_cv = s_get_cv_croak (req);
3456 /* newXSproto doesn't return the CV on 5.8 */ 4532 /* newXSproto doesn't return the CV on 5.8 */
3457 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4533 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3458 sv_setpv ((SV *)slf_cv, proto); 4534 sv_setpv ((SV *)slf_cv, proto);
3459 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4535 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3460} 4536}
3461 4537
4538MODULE = Coro::State PACKAGE = Coro::Select
4539
4540void
4541patch_pp_sselect ()
4542 CODE:
4543 if (!coro_old_pp_sselect)
4544 {
4545 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4546 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4547 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4548 }
4549
4550void
4551unpatch_pp_sselect ()
4552 CODE:
4553 if (coro_old_pp_sselect)
4554 {
4555 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4556 coro_old_pp_sselect = 0;
4557 }
4558
4559MODULE = Coro::State PACKAGE = Coro::Util
4560
4561void
4562_exit (int code)
4563 CODE:
4564 _exit (code);
4565
4566NV
4567time ()
4568 CODE:
4569 RETVAL = nvtime (aTHX);
4570 OUTPUT:
4571 RETVAL
4572
4573NV
4574gettimeofday ()
4575 PPCODE:
4576{
4577 UV tv [2];
4578 u2time (aTHX_ tv);
4579 EXTEND (SP, 2);
4580 PUSHs (sv_2mortal (newSVuv (tv [0])));
4581 PUSHs (sv_2mortal (newSVuv (tv [1])));
4582}
4583

Diff Legend

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