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.321 by root, Sat Nov 22 02:09:54 2008 UTC vs.
Revision 1.469 by root, Fri Jul 14 02:43:50 2017 UTC

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

Diff Legend

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