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.324 by root, Sat Nov 22 07:02:28 2008 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 2016 UTC

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

Diff Legend

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