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.333 by root, Thu Nov 27 12:39:00 2008 UTC vs.
Revision 1.480 by root, Fri Jun 25 01:13:21 2021 UTC

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

Diff Legend

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