ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.318 by root, Thu Nov 20 07:02:43 2008 UTC vs.
Revision 1.466 by root, Sat Jun 25 19:22:33 2016 UTC

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

Diff Legend

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