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.325 by root, Sun Nov 23 06:48:45 2008 UTC vs.
Revision 1.451 by root, Mon Jun 29 23:49:34 2015 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;
… …
189static SV *sv_pool_size; 149static SV *sv_pool_size;
190static SV *sv_async_pool_idle; /* description string */ 150static SV *sv_async_pool_idle; /* description string */
191static AV *av_async_pool; /* idle pool */ 151static AV *av_async_pool; /* idle pool */
192static SV *sv_Coro; /* class string */ 152static SV *sv_Coro; /* class string */
193static CV *cv_pool_handler; 153static CV *cv_pool_handler;
194static CV *cv_coro_state_new;
195 154
196/* Coro::AnyEvent */ 155/* Coro::AnyEvent */
197static SV *sv_activity; 156static SV *sv_activity;
198 157
158/* enable processtime/realtime profiling */
159static char enable_times;
160typedef U32 coro_ts[2];
161static coro_ts time_real, time_cpu;
162static char times_valid;
163
199static struct coro_cctx *cctx_first; 164static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 165static int cctx_count, cctx_idle;
201 166
202enum { 167enum
168{
203 CC_MAPPED = 0x01, 169 CC_MAPPED = 0x01,
204 CC_NOREUSE = 0x02, /* throw this away after tracing */ 170 CC_NOREUSE = 0x02, /* throw this away after tracing */
205 CC_TRACE = 0x04, 171 CC_TRACE = 0x04,
206 CC_TRACE_SUB = 0x08, /* trace sub calls */ 172 CC_TRACE_SUB = 0x08, /* trace sub calls */
207 CC_TRACE_LINE = 0x10, /* trace each statement */ 173 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
212typedef struct coro_cctx 178typedef struct coro_cctx
213{ 179{
214 struct coro_cctx *next; 180 struct coro_cctx *next;
215 181
216 /* the stack */ 182 /* the stack */
217 void *sptr; 183 struct coro_stack stack;
218 size_t ssize;
219 184
220 /* cpu state */ 185 /* cpu state */
221 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187#ifndef NDEBUG
222 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
189#endif
223 JMPENV *top_env; 190 JMPENV *top_env;
224 coro_context cctx; 191 coro_context cctx;
225 192
226 U32 gen; 193 U32 gen;
227#if CORO_USE_VALGRIND 194#if CORO_USE_VALGRIND
228 int valgrind_id; 195 int valgrind_id;
229#endif 196#endif
230 unsigned char flags; 197 unsigned char flags;
231} coro_cctx; 198} coro_cctx;
232 199
233coro_cctx *cctx_current; /* the currently running cctx */ 200static coro_cctx *cctx_current; /* the currently running cctx */
234 201
235/*****************************************************************************/ 202/*****************************************************************************/
236 203
204static MGVTBL coro_state_vtbl;
205
237enum { 206enum
207{
238 CF_RUNNING = 0x0001, /* coroutine is running */ 208 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 209 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 210 CF_NEW = 0x0004, /* has never been switched to */
241 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 211 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
212 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
213 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
242}; 214};
243 215
244/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
245typedef struct 217typedef struct
246{ 218{
247 SV *defsv;
248 AV *defav;
249 SV *errsv;
250 SV *irsgv;
251#define VAR(name,type) type name; 219 #define VARx(name,expr,type) type name;
252# include "state.h" 220 #include "state.h"
253#undef VAR
254} perl_slots; 221} perl_slots;
255 222
223/* 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)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
257 225
258/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
259struct coro { 227struct coro
228{
260 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 230 coro_cctx *cctx;
231
232 /* ready queue */
233 struct coro *next_ready;
262 234
263 /* state data */ 235 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 237 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
267 239
268 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
269 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
270 int refcnt; /* coroutines are refcounted, yes */
271 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
272 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
273 void (*on_destroy)(pTHX_ struct coro *coro);
274 244
275 /* statistics */ 245 /* statistics */
276 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
277 247
278 /* coro process data */ 248 /* coro process data */
279 int prio; 249 int prio;
280 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
281 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
282 254
283 /* async_pool */ 255 /* async_pool */
284 SV *saved_deffh; 256 SV *saved_deffh;
285 SV *invoke_cb; 257 SV *invoke_cb;
286 AV *invoke_av; 258 AV *invoke_av;
287 259
260 /* on_enter/on_leave */
261 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; AV *on_leave_xs;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
288 /* linked list */ 270 /* linked list */
289 struct coro *next, *prev; 271 struct coro *next, *prev;
290}; 272};
291 273
292typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
293typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
294 276
295/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
296/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
297/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
299 281
300/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
301 283
302#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
308 290
309/* for Coro.pm */ 291/* for Coro.pm */
310static SV *coro_current; 292static SV *coro_current;
311static SV *coro_readyhook; 293static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
314static struct coro *coro_first; 296static struct coro *coro_first;
315#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
316 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
322/** Coro::Select ************************************************************/
323
324static OP *(*coro_old_pp_sselect) (pTHX);
325static SV *coro_select_select;
326
327/* horrible hack, but if it works... */
328static OP *
329coro_pp_sselect (pTHX)
330{
331 dSP;
332 PUSHMARK (SP - 4); /* fake argument list */
333 XPUSHs (coro_select_select);
334 PUTBACK;
335
336 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
337 PL_op->op_flags |= OPf_STACKED;
338 PL_op->op_private = 0;
339 return PL_ppaddr [OP_ENTERSUB](aTHX);
340}
341
342/** time stuff **************************************************************/
343
344#ifdef HAS_GETTIMEOFDAY
345
346ecb_inline void
347coro_u2time (pTHX_ UV ret[2])
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 ret [0] = tv.tv_sec;
353 ret [1] = tv.tv_usec;
354}
355
356ecb_inline double
357coro_nvtime (void)
358{
359 struct timeval tv;
360 gettimeofday (&tv, 0);
361
362 return tv.tv_sec + tv.tv_usec * 1e-6;
363}
364
365ecb_inline void
366time_init (pTHX)
367{
368 nvtime = coro_nvtime;
369 u2time = coro_u2time;
370}
371
372#else
373
374ecb_inline void
375time_init (pTHX)
376{
377 SV **svp;
378
379 require_pv ("Time/HiRes.pm");
380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385
386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
387
388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
390}
391
392#endif
393
317/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
318 395
319static SV * 396static SV * ecb_noinline
320coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
321{ 398{
322#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_sv (name, create); 401 get_sv (name, create);
325#endif 402#endif
326 return get_sv (name, create); 403 return get_sv (name, create);
327} 404}
328 405
329static AV * 406static AV * ecb_noinline
330coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
331{ 408{
332#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_av (name, create); 411 get_av (name, create);
335#endif 412#endif
336 return get_av (name, create); 413 return get_av (name, create);
337} 414}
338 415
339static HV * 416static HV * ecb_noinline
340coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
341{ 418{
342#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_hv (name, create); 421 get_hv (name, create);
345#endif 422#endif
346 return get_hv (name, create); 423 return get_hv (name, create);
347} 424}
348 425
349/* may croak */ 426ecb_inline void
350INLINE CV * 427coro_times_update (void)
351coro_sv_2cv (pTHX_ SV *sv)
352{ 428{
353 HV *st; 429#ifdef coro_clock_gettime
354 GV *gvp; 430 struct timespec ts;
355 return sv_2cv (sv, &st, &gvp, 0);
356}
357 431
358static AV * 432 ts.tv_sec = ts.tv_nsec = 0;
433 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
434 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
435
436 ts.tv_sec = ts.tv_nsec = 0;
437 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
438 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
439#else
440 dTHX;
441 UV tv[2];
442
443 u2time (aTHX_ tv);
444 time_real [0] = tv [0];
445 time_real [1] = tv [1] * 1000;
446#endif
447}
448
449ecb_inline void
450coro_times_add (struct coro *c)
451{
452 c->t_real [1] += time_real [1];
453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
454 c->t_real [0] += time_real [0];
455
456 c->t_cpu [1] += time_cpu [1];
457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
458 c->t_cpu [0] += time_cpu [0];
459}
460
461ecb_inline void
462coro_times_sub (struct coro *c)
463{
464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
465 c->t_real [1] -= time_real [1];
466 c->t_real [0] -= time_real [0];
467
468 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
469 c->t_cpu [1] -= time_cpu [1];
470 c->t_cpu [0] -= time_cpu [0];
471}
472
473/*****************************************************************************/
474/* magic glue */
475
476#define CORO_MAGIC_type_cv 26
477#define CORO_MAGIC_type_state PERL_MAGIC_ext
478
479#define CORO_MAGIC_NN(sv, type) \
480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
481 ? SvMAGIC (sv) \
482 : mg_find (sv, type))
483
484#define CORO_MAGIC(sv, type) \
485 (ecb_expect_true (SvMAGIC (sv)) \
486 ? CORO_MAGIC_NN (sv, type) \
487 : 0)
488
489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
491
492ecb_inline MAGIC *
493SvSTATEhv_p (pTHX_ SV *coro)
494{
495 MAGIC *mg;
496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
508SvSTATE_ (pTHX_ SV *coro_sv)
509{
510 MAGIC *mg;
511
512 if (SvROK (coro_sv))
513 coro_sv = SvRV (coro_sv);
514
515 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg)
517 croak ("Coro::State object required");
518
519 return (struct coro *)mg->mg_ptr;
520}
521
522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
523
524/* faster than SvSTATE, but expects a coroutine hv */
525#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
527
528/*****************************************************************************/
529/* padlist management and caching */
530
531ecb_inline PADLIST *
359coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
360{ 533{
361 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
362 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
363 539
364 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
365 AvREAL_off (newpadlist); 568 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 569#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist);
373 570
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 571 /* Already extended to 2 elements by newPADLIST. */
375 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
376 579
377 return newpadlist; 580 return newpadlist;
378} 581}
379 582
380static void 583ecb_inline void
381free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
382{ 585{
383 /* may be during global destruction */ 586 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 587 if (!IN_DESTRUCT)
385 { 588 {
386 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
387 while (i >= 0) 590
591 while (i > 0) /* special-case index 0 */
388 { 592 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 593 /* we try to be extra-careful here */
594 PAD *pad = PadlistARRAY (padlist)[i--];
595
390 if (svp) 596 if (pad)
391 { 597 {
392 SV *sv; 598 I32 j = PadMAX (pad);
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 599
600 while (j >= 0)
394 SvREFCNT_dec (sv); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
395 602
603 PadMAX (pad) = -1;
396 SvREFCNT_dec (*svp); 604 SvREFCNT_dec (pad);
397 } 605 }
398 } 606 }
399 607
608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
400 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
401 } 618 }
402} 619}
403 620
404static int 621static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 623{
407 AV *padlist; 624 PADLIST *padlist;
408 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
409 627
410 /* casting is fun. */ 628 /* perl manages to free our internal AV and _then_ call us */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 629 if (IN_DESTRUCT)
630 return 0;
631
632 while (len--)
412 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
413
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 634
416 return 0; 635 return 0;
417} 636}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 637
422static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 639 0, 0, 0, 0,
424 coro_cv_free 640 coro_cv_free
425}; 641};
426 642
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 */ 643/* the next two functions merely cache the padlists */
471static void 644ecb_inline void
472get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
473{ 646{
474 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
475 AV *av; 648 size_t *lenp;
476 649
477 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
478 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
479 else 652 else
480 { 653 {
481#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
482 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
483 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
489 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
490#endif 663#endif
491 } 664 }
492} 665}
493 666
494static void 667ecb_inline void
495put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
496{ 669{
497 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
498 AV *av;
499 671
500 if (expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
502 682
503 av = (AV *)mg->mg_obj; 683 ((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} 684}
510 685
511/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
687
688ecb_inline void
689swap_sv (SV *a, SV *b)
690{
691 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
692 SV tmp;
693
694 /* swap sv_any */
695 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
696
697 /* swap sv_flags */
698 SvFLAGS (&tmp) = SvFLAGS (a);
699 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
700 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
701
702#if PERL_VERSION_ATLEAST (5,10,0)
703 /* perl 5.10 and later complicates this _quite_ a bit, but it also
704 * is much faster, so no quarrels here. alternatively, we could
705 * sv_upgrade to avoid this.
706 */
707 {
708 /* swap sv_u */
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710
711 /* if SvANY points to the head, we need to adjust the pointers,
712 * as the pointer for a still points to b, and maybe vice versa.
713 */
714 #define svany_in_head(type) \
715 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
716
717 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719
720 if (svany_in_head (SvTYPE (b)))
721 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
722 }
723#endif
724}
725
726/* swap sv heads, at least logically */
727static void
728swap_svs (pTHX_ Coro__State c)
729{
730 int i;
731
732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
733 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
734}
735
736#define SWAP_SVS(coro) \
737 if (ecb_expect_false ((coro)->swap_sv)) \
738 swap_svs (aTHX_ (coro))
739
740static void
741on_enterleave_call (pTHX_ SV *cb);
512 742
513static void 743static void
514load_perl (pTHX_ Coro__State c) 744load_perl (pTHX_ Coro__State c)
515{ 745{
516 perl_slots *slot = c->slot; 746 perl_slots *slot = c->slot;
517 c->slot = 0; 747 c->slot = 0;
518 748
519 PL_mainstack = c->mainstack; 749 PL_mainstack = c->mainstack;
520 750
521 GvSV (PL_defgv) = slot->defsv; 751#if CORO_JIT
522 GvAV (PL_defgv) = slot->defav; 752 load_perl_slots (slot);
523 GvSV (PL_errgv) = slot->errsv; 753#else
524 GvSV (irsgv) = slot->irsgv;
525
526 #define VAR(name,type) PL_ ## name = slot->name; 754 #define VARx(name,expr,type) expr = slot->name;
527 # include "state.h" 755 #include "state.h"
528 #undef VAR 756#endif
529 757
530 { 758 {
531 dSP; 759 dSP;
532 760
533 CV *cv; 761 CV *cv;
534 762
535 /* now do the ugly restore mess */ 763 /* now do the ugly restore mess */
536 while (expect_true (cv = (CV *)POPs)) 764 while (ecb_expect_true (cv = (CV *)POPs))
537 { 765 {
538 put_padlist (aTHX_ cv); /* mark this padlist as available */ 766 put_padlist (aTHX_ cv); /* mark this padlist as available */
539 CvDEPTH (cv) = PTR2IV (POPs); 767 CvDEPTH (cv) = PTR2IV (POPs);
540 CvPADLIST (cv) = (AV *)POPs; 768 CvPADLIST (cv) = (PADLIST *)POPs;
541 } 769 }
542 770
543 PUTBACK; 771 PUTBACK;
544 } 772 }
545 773
546 slf_frame = c->slf_frame; 774 slf_frame = c->slf_frame;
547 CORO_THROW = c->except; 775 CORO_THROW = c->except;
776
777 if (ecb_expect_false (enable_times))
778 {
779 if (ecb_expect_false (!times_valid))
780 coro_times_update ();
781
782 coro_times_sub (c);
783 }
784
785 if (ecb_expect_false (c->on_enter))
786 {
787 int i;
788
789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
791 }
792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
801 SWAP_SVS (c);
548} 802}
549 803
550static void 804static void
551save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
552{ 806{
807 SWAP_SVS (c);
808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
816
817 if (ecb_expect_false (c->on_leave))
818 {
819 int i;
820
821 for (i = AvFILLp (c->on_leave); i >= 0; --i)
822 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
823 }
824
825 times_valid = 0;
826
827 if (ecb_expect_false (enable_times))
828 {
829 coro_times_update (); times_valid = 1;
830 coro_times_add (c);
831 }
832
553 c->except = CORO_THROW; 833 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 834 c->slf_frame = slf_frame;
555 835
556 { 836 {
557 dSP; 837 dSP;
… …
566 846
567 XPUSHs (Nullsv); 847 XPUSHs (Nullsv);
568 /* this loop was inspired by pp_caller */ 848 /* this loop was inspired by pp_caller */
569 for (;;) 849 for (;;)
570 { 850 {
571 while (expect_true (cxix >= 0)) 851 while (ecb_expect_true (cxix >= 0))
572 { 852 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 853 PERL_CONTEXT *cx = &ccstk[cxix--];
574 854
575 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 855 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
576 { 856 {
577 CV *cv = cx->blk_sub.cv; 857 CV *cv = cx->blk_sub.cv;
578 858
579 if (expect_true (CvDEPTH (cv))) 859 if (ecb_expect_true (CvDEPTH (cv)))
580 { 860 {
581 EXTEND (SP, 3); 861 EXTEND (SP, 3);
582 PUSHs ((SV *)CvPADLIST (cv)); 862 PUSHs ((SV *)CvPADLIST (cv));
583 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 863 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
584 PUSHs ((SV *)cv); 864 PUSHs ((SV *)cv);
… …
587 get_padlist (aTHX_ cv); 867 get_padlist (aTHX_ cv);
588 } 868 }
589 } 869 }
590 } 870 }
591 871
592 if (expect_true (top_si->si_type == PERLSI_MAIN)) 872 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
593 break; 873 break;
594 874
595 top_si = top_si->si_prev; 875 top_si = top_si->si_prev;
596 ccstk = top_si->si_cxstack; 876 ccstk = top_si->si_cxstack;
597 cxix = top_si->si_cxix; 877 cxix = top_si->si_cxix;
… …
599 879
600 PUTBACK; 880 PUTBACK;
601 } 881 }
602 882
603 /* allocate some space on the context stack for our purposes */ 883 /* allocate some space on the context stack for our purposes */
604 /* we manually unroll here, as usually 2 slots is enough */ 884 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 { 885 {
609 int i; 886 unsigned int i;
887
610 for (i = 3; i < SLOT_COUNT; ++i) 888 for (i = 0; i < SLOT_COUNT; ++i)
611 CXINC; 889 CXINC;
612 } 890
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 891 cxstack_ix -= SLOT_COUNT; /* undo allocation */
892 }
614 893
615 c->mainstack = PL_mainstack; 894 c->mainstack = PL_mainstack;
616 895
617 { 896 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 897 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 898
620 slot->defav = GvAV (PL_defgv); 899#if CORO_JIT
621 slot->defsv = DEFSV; 900 save_perl_slots (slot);
622 slot->errsv = ERRSV; 901#else
623 slot->irsgv = GvSV (irsgv);
624
625 #define VAR(name,type) slot->name = PL_ ## name; 902 #define VARx(name,expr,type) slot->name = expr;
626 # include "state.h" 903 #include "state.h"
627 #undef VAR 904#endif
628 } 905 }
629} 906}
630 907
631/* 908/*
632 * allocate various perl stacks. This is almost an exact copy 909 * allocate various perl stacks. This is almost an exact copy
… …
638# define coro_init_stacks(thx) init_stacks () 915# define coro_init_stacks(thx) init_stacks ()
639#else 916#else
640static void 917static void
641coro_init_stacks (pTHX) 918coro_init_stacks (pTHX)
642{ 919{
643 PL_curstackinfo = new_stackinfo(32, 8); 920 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; 921 PL_curstackinfo->si_type = PERLSI_MAIN;
645 PL_curstack = PL_curstackinfo->si_stack; 922 PL_curstack = PL_curstackinfo->si_stack;
646 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 923 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
647 924
648 PL_stack_base = AvARRAY(PL_curstack); 925 PL_stack_base = AvARRAY(PL_curstack);
… …
663#endif 940#endif
664 941
665 New(54,PL_scopestack,8,I32); 942 New(54,PL_scopestack,8,I32);
666 PL_scopestack_ix = 0; 943 PL_scopestack_ix = 0;
667 PL_scopestack_max = 8; 944 PL_scopestack_max = 8;
945#if HAS_SCOPESTACK_NAME
946 New(54,PL_scopestack_name,8,const char*);
947#endif
668 948
669 New(54,PL_savestack,24,ANY); 949 New(54,PL_savestack,24,ANY);
670 PL_savestack_ix = 0; 950 PL_savestack_ix = 0;
671 PL_savestack_max = 24; 951 PL_savestack_max = 24;
672 952
… …
700 } 980 }
701 981
702 Safefree (PL_tmps_stack); 982 Safefree (PL_tmps_stack);
703 Safefree (PL_markstack); 983 Safefree (PL_markstack);
704 Safefree (PL_scopestack); 984 Safefree (PL_scopestack);
985#if HAS_SCOPESTACK_NAME
986 Safefree (PL_scopestack_name);
987#endif
705 Safefree (PL_savestack); 988 Safefree (PL_savestack);
706#if !PERL_VERSION_ATLEAST (5,10,0) 989#if !PERL_VERSION_ATLEAST (5,10,0)
707 Safefree (PL_retstack); 990 Safefree (PL_retstack);
708#endif 991#endif
709} 992}
… …
755#endif 1038#endif
756 1039
757/* 1040/*
758 * This overrides the default magic get method of %SIG elements. 1041 * 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 1042 * 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 1043 * and instead of trying to save and restore the hash elements (extremely slow),
761 * readback here. 1044 * 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 */ 1045 */
766static int 1046static int ecb_cold
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1047coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 1048{
769 const char *s = MgPV_nolen_const (mg); 1049 const char *s = MgPV_nolen_const (mg);
770 1050
771 if (*s == '_') 1051 if (*s == '_')
772 { 1052 {
773 SV **svp = 0; 1053 SV **svp = 0;
774 1054
775 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
776 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
777 1057
778 if (svp) 1058 if (svp)
779 { 1059 {
780 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp));
1066 else
1067 ssv = *svp;
1068
1069 sv_setsv (sv, ssv);
781 return 0; 1070 return 0;
782 } 1071 }
783 } 1072 }
784 1073
785 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
786} 1075}
787 1076
788static int 1077static int ecb_cold
789coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
790{ 1079{
791 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
792 1081
793 if (*s == '_') 1082 if (*s == '_')
… …
807 } 1096 }
808 1097
809 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1098 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
810} 1099}
811 1100
812static int 1101static int ecb_cold
813coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1102coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
814{ 1103{
815 const char *s = MgPV_nolen_const (mg); 1104 const char *s = MgPV_nolen_const (mg);
816 1105
817 if (*s == '_') 1106 if (*s == '_')
… …
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1111 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 1112
824 if (svp) 1113 if (svp)
825 { 1114 {
826 SV *old = *svp; 1115 SV *old = *svp;
827 *svp = newSVsv (sv); 1116 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 1117 SvREFCNT_dec (old);
829 return 0; 1118 return 0;
830 } 1119 }
831 } 1120 }
832 1121
… …
850slf_check_repeat (pTHX_ struct CoroSLF *frame) 1139slf_check_repeat (pTHX_ struct CoroSLF *frame)
851{ 1140{
852 return 1; 1141 return 1;
853} 1142}
854 1143
855static UNOP coro_setup_op; 1144static UNOP init_perl_op;
856 1145
857static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1146ecb_noinline static void /* noinline to keep it out of the transfer fast path */
858coro_setup (pTHX_ struct coro *coro) 1147init_perl (pTHX_ struct coro *coro)
859{ 1148{
860 /* 1149 /*
861 * emulate part of the perl startup here. 1150 * emulate part of the perl startup here.
862 */ 1151 */
863 coro_init_stacks (aTHX); 1152 coro_init_stacks (aTHX);
864 1153
865 PL_runops = RUNOPS_DEFAULT; 1154 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 1155 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 1156 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 1157 PL_comppad = 0;
1158 PL_comppad_name = 0;
1159 PL_comppad_name_fill = 0;
1160 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 1161 PL_curpm = 0;
870 PL_curpad = 0; 1162 PL_curpad = 0;
871 PL_localizing = 0; 1163 PL_localizing = 0;
872 PL_dirty = 0;
873 PL_restartop = 0; 1164 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 1165#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 1166 PL_parser = 0;
876#endif 1167#endif
1168 PL_hints = 0;
877 1169
878 /* recreate the die/warn hooks */ 1170 /* recreate the die/warn hooks */
879 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1171 PL_diehook = SvREFCNT_inc (rv_diehook);
880 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1172 PL_warnhook = SvREFCNT_inc (rv_warnhook);
881 1173
882 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
885 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
886 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 1184
889 { 1185 {
890 dSP; 1186 dSP;
… …
905 /* this newly created coroutine might be run on an existing cctx which most 1201 /* 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. 1202 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
907 */ 1203 */
908 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1204 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 */ 1205 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1206 slf_frame.destroy = 0;
910 1207
911 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1208 /* 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; 1209 init_perl_op.op_next = PL_op;
913 coro_setup_op.op_type = OP_ENTERSUB; 1210 init_perl_op.op_type = OP_ENTERSUB;
914 coro_setup_op.op_ppaddr = pp_slf; 1211 init_perl_op.op_ppaddr = pp_slf;
915 /* no flags etc. required, as an init function won't be called */ 1212 /* no flags etc. required, as an init function won't be called */
916 1213
917 PL_op = (OP *)&coro_setup_op; 1214 PL_op = (OP *)&init_perl_op;
918 1215
919 /* copy throw, in case it was set before coro_setup */ 1216 /* copy throw, in case it was set before init_perl */
920 CORO_THROW = coro->except; 1217 CORO_THROW = coro->except;
921}
922 1218
1219 SWAP_SVS (coro);
1220
1221 if (ecb_expect_false (enable_times))
1222 {
1223 coro_times_update ();
1224 coro_times_sub (coro);
1225 }
1226}
1227
923static void 1228static void
924coro_destruct (pTHX_ struct coro *coro) 1229coro_unwind_stacks (pTHX)
925{ 1230{
926 if (!IN_DESTRUCT) 1231 if (!IN_DESTRUCT)
927 { 1232 {
928 /* restore all saved variables and stuff */ 1233 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 1234 LEAVE_SCOPE (0);
… …
937 POPSTACK_TO (PL_mainstack); 1242 POPSTACK_TO (PL_mainstack);
938 1243
939 /* unwind main stack */ 1244 /* unwind main stack */
940 dounwind (-1); 1245 dounwind (-1);
941 } 1246 }
1247}
942 1248
943 SvREFCNT_dec (GvSV (PL_defgv)); 1249static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1250destroy_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1251{
946 SvREFCNT_dec (PL_defoutgv); 1252 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1253
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 1254 {
1255 SV *old_current = SvRV (coro_current);
1256 struct coro *current = SvSTATE (old_current);
1257
1258 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1259
1260 save_perl (aTHX_ current);
1261
1262 /* this will cause transfer_check to croak on block*/
1263 SvRV_set (coro_current, (SV *)coro->hv);
1264
1265 load_perl (aTHX_ coro);
1266
1267 coro_unwind_stacks (aTHX);
1268
1269 /* restore swapped sv's */
1270 SWAP_SVS (coro);
1271
1272 coro_destruct_stacks (aTHX);
1273
1274 /* now save some sv's to be free'd later */
1275 svf [0] = GvSV (PL_defgv);
1276 svf [1] = (SV *)GvAV (PL_defgv);
1277 svf [2] = GvSV (PL_errgv);
1278 svf [3] = (SV *)PL_defoutgv;
1279 svf [4] = PL_rs;
1280 svf [5] = GvSV (irsgv);
1281 svf [6] = (SV *)GvHV (PL_hintgv);
1282 svf [7] = PL_diehook;
1283 svf [8] = PL_warnhook;
1284 assert (9 == sizeof (svf) / sizeof (*svf));
1285
1286 SvRV_set (coro_current, old_current);
1287
1288 load_perl (aTHX_ current);
1289 }
1290
1291 {
1292 unsigned int i;
1293
1294 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1295 SvREFCNT_dec (svf [i]);
1296
953 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
957 1301 SvREFCNT_dec (coro->on_enter_xs);
958 coro_destruct_stacks (aTHX); 1302 SvREFCNT_dec (coro->on_leave_xs);
1303 }
959} 1304}
960 1305
961INLINE void 1306ecb_inline void
962free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
963{ 1308{
964 if (expect_true (coro_mortal)) 1309 if (ecb_expect_true (coro_mortal))
965 { 1310 {
966 SvREFCNT_dec (coro_mortal); 1311 SvREFCNT_dec ((SV *)coro_mortal);
967 coro_mortal = 0; 1312 coro_mortal = 0;
968 } 1313 }
969} 1314}
970 1315
971static int 1316static int
… …
1025 1370
1026 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1027 { 1372 {
1028 SV **cb; 1373 SV **cb;
1029 1374
1030 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1031 { 1376 {
1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1033 1378
1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1035 { 1380 {
… …
1104 1449
1105 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1450 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1106} 1451}
1107 1452
1108/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1453/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1109static void NOINLINE 1454static void ecb_noinline
1110cctx_prepare (pTHX) 1455cctx_prepare (pTHX)
1111{ 1456{
1112 PL_top_env = &PL_start_env; 1457 PL_top_env = &PL_start_env;
1113 1458
1114 if (cctx_current->flags & CC_TRACE) 1459 if (cctx_current->flags & CC_TRACE)
… …
1125 slf_frame.prepare = slf_prepare_set_stacklevel; 1470 slf_frame.prepare = slf_prepare_set_stacklevel;
1126 slf_frame.check = slf_check_set_stacklevel; 1471 slf_frame.check = slf_check_set_stacklevel;
1127} 1472}
1128 1473
1129/* the tail of transfer: execute stuff we can only do after a transfer */ 1474/* the tail of transfer: execute stuff we can only do after a transfer */
1130INLINE void 1475ecb_inline void
1131transfer_tail (pTHX) 1476transfer_tail (pTHX)
1132{ 1477{
1133 free_coro_mortal (aTHX); 1478 free_coro_mortal (aTHX);
1479}
1480
1481/* try to exit the same way perl's main function would do */
1482/* we do not bother resetting the environment or other things *7
1483/* that are not, uhm, essential */
1484/* this obviously also doesn't work when perl is embedded */
1485static void ecb_noinline ecb_cold
1486perlish_exit (pTHX)
1487{
1488 int exitstatus = perl_destruct (PL_curinterp);
1489 perl_free (PL_curinterp);
1490 exit (exitstatus);
1134} 1491}
1135 1492
1136/* 1493/*
1137 * this is a _very_ stripped down perl interpreter ;) 1494 * this is a _very_ stripped down perl interpreter ;)
1138 */ 1495 */
… …
1160 /* somebody or something will hit me for both perl_run and PL_restartop */ 1517 /* somebody or something will hit me for both perl_run and PL_restartop */
1161 PL_restartop = PL_op; 1518 PL_restartop = PL_op;
1162 perl_run (PL_curinterp); 1519 perl_run (PL_curinterp);
1163 /* 1520 /*
1164 * Unfortunately, there is no way to get at the return values of the 1521 * Unfortunately, there is no way to get at the return values of the
1165 * coro body here, as perl_run destroys these 1522 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1523 * runtime errors here, as this is just a random interpreter, not a thread.
1166 */ 1524 */
1167 1525
1168 /* 1526 /*
1169 * If perl-run returns we assume exit() was being called or the coro 1527 * 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) 1528 * 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 1529 * 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" 1530 * doing in that case. YMMV.
1173 * coroutine as Coro has no such concept
1174 */ 1531 */
1175 PL_top_env = main_top_env; 1532 perlish_exit (aTHX);
1176 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1177 } 1533 }
1178} 1534}
1179 1535
1180static coro_cctx * 1536static coro_cctx *
1181cctx_new () 1537cctx_new (void)
1182{ 1538{
1183 coro_cctx *cctx; 1539 coro_cctx *cctx;
1184 1540
1185 ++cctx_count; 1541 ++cctx_count;
1186 New (0, cctx, 1, coro_cctx); 1542 New (0, cctx, 1, coro_cctx);
… …
1192 return cctx; 1548 return cctx;
1193} 1549}
1194 1550
1195/* create a new cctx only suitable as source */ 1551/* create a new cctx only suitable as source */
1196static coro_cctx * 1552static coro_cctx *
1197cctx_new_empty () 1553cctx_new_empty (void)
1198{ 1554{
1199 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1200 1556
1201 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1202 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1203 1559
1204 return cctx; 1560 return cctx;
1205} 1561}
1206 1562
1207/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1208static coro_cctx * 1564static coro_cctx *
1209cctx_new_run () 1565cctx_new_run (void)
1210{ 1566{
1211 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1212 void *stack_start;
1213 size_t stack_size;
1214 1568
1215#if HAVE_MMAP 1569 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 } 1570 {
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."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1238 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1239 }
1240
1241 stack_start = cctx->sptr;
1242 stack_size = cctx->ssize;
1243 } 1573 }
1244 1574
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); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1250 1576
1251 return cctx; 1577 return cctx;
1252} 1578}
1253 1579
1254static void 1580static void
1255cctx_destroy (coro_cctx *cctx) 1581cctx_destroy (coro_cctx *cctx)
1256{ 1582{
1257 if (!cctx) 1583 if (!cctx)
1258 return; 1584 return;
1259 1585
1260 assert (cctx != cctx_current);//D temporary 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1261 1587
1262 --cctx_count; 1588 --cctx_count;
1263 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1264 1590
1265 /* coro_transfer creates new, empty cctx's */ 1591 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 1592
1280 Safefree (cctx); 1593 Safefree (cctx);
1281} 1594}
1282 1595
1283/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1284#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1597#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1285 1598
1286static coro_cctx * 1599static coro_cctx *
1287cctx_get (pTHX) 1600cctx_get (pTHX)
1288{ 1601{
1289 while (expect_true (cctx_first)) 1602 while (ecb_expect_true (cctx_first))
1290 { 1603 {
1291 coro_cctx *cctx = cctx_first; 1604 coro_cctx *cctx = cctx_first;
1292 cctx_first = cctx->next; 1605 cctx_first = cctx->next;
1293 --cctx_idle; 1606 --cctx_idle;
1294 1607
1295 if (expect_true (!CCTX_EXPIRED (cctx))) 1608 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1296 return cctx; 1609 return cctx;
1297 1610
1298 cctx_destroy (cctx); 1611 cctx_destroy (cctx);
1299 } 1612 }
1300 1613
… …
1302} 1615}
1303 1616
1304static void 1617static void
1305cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1306{ 1619{
1307 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1308 1621
1309 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1310 if (expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1311 { 1624 {
1312 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1313 cctx_first = first->next; 1626 cctx_first = first->next;
1314 --cctx_idle; 1627 --cctx_idle;
1315 1628
… …
1326static void 1639static void
1327transfer_check (pTHX_ struct coro *prev, struct coro *next) 1640transfer_check (pTHX_ struct coro *prev, struct coro *next)
1328{ 1641{
1329 /* TODO: throwing up here is considered harmful */ 1642 /* TODO: throwing up here is considered harmful */
1330 1643
1331 if (expect_true (prev != next)) 1644 if (ecb_expect_true (prev != next))
1332 { 1645 {
1333 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1646 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1334 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1647 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1335 1648
1336 if (expect_false (next->flags & CF_RUNNING)) 1649 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,"); 1650 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1341 1651
1342#if !PERL_VERSION_ATLEAST (5,10,0) 1652#if !PERL_VERSION_ATLEAST (5,10,0)
1343 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1653 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,"); 1654 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1345#endif 1655#endif
1346 } 1656 }
1347} 1657}
1348 1658
1349/* always use the TRANSFER macro */ 1659/* always use the TRANSFER macro */
1350static void NOINLINE /* noinline so we have a fixed stackframe */ 1660static void ecb_noinline /* noinline so we have a fixed stackframe */
1351transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1661transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1352{ 1662{
1353 dSTACKLEVEL; 1663 dSTACKLEVEL;
1354 1664
1355 /* sometimes transfer is only called to set idle_sp */ 1665 /* sometimes transfer is only called to set idle_sp */
1356 if (expect_false (!prev)) 1666 if (ecb_expect_false (!prev))
1357 { 1667 {
1358 cctx_current->idle_sp = STACKLEVEL; 1668 cctx_current->idle_sp = STACKLEVEL;
1359 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1669 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1360 } 1670 }
1361 else if (expect_true (prev != next)) 1671 else if (ecb_expect_true (prev != next))
1362 { 1672 {
1363 coro_cctx *cctx_prev; 1673 coro_cctx *cctx_prev;
1364 1674
1365 if (expect_false (prev->flags & CF_NEW)) 1675 if (ecb_expect_false (prev->flags & CF_NEW))
1366 { 1676 {
1367 /* create a new empty/source context */ 1677 /* create a new empty/source context */
1368 prev->flags &= ~CF_NEW; 1678 prev->flags &= ~CF_NEW;
1369 prev->flags |= CF_RUNNING; 1679 prev->flags |= CF_RUNNING;
1370 } 1680 }
… …
1373 next->flags |= CF_RUNNING; 1683 next->flags |= CF_RUNNING;
1374 1684
1375 /* first get rid of the old state */ 1685 /* first get rid of the old state */
1376 save_perl (aTHX_ prev); 1686 save_perl (aTHX_ prev);
1377 1687
1378 if (expect_false (next->flags & CF_NEW)) 1688 if (ecb_expect_false (next->flags & CF_NEW))
1379 { 1689 {
1380 /* need to start coroutine */ 1690 /* need to start coroutine */
1381 next->flags &= ~CF_NEW; 1691 next->flags &= ~CF_NEW;
1382 /* setup coroutine call */ 1692 /* setup coroutine call */
1383 coro_setup (aTHX_ next); 1693 init_perl (aTHX_ next);
1384 } 1694 }
1385 else 1695 else
1386 load_perl (aTHX_ next); 1696 load_perl (aTHX_ next);
1387 1697
1388 assert (!prev->cctx);//D temporary
1389
1390 /* possibly untie and reuse the cctx */ 1698 /* possibly untie and reuse the cctx */
1391 if (expect_true ( 1699 if (ecb_expect_true (
1392 cctx_current->idle_sp == STACKLEVEL 1700 cctx_current->idle_sp == STACKLEVEL
1393 && !(cctx_current->flags & CC_TRACE) 1701 && !(cctx_current->flags & CC_TRACE)
1394 && !force_cctx 1702 && !force_cctx
1395 )) 1703 ))
1396 { 1704 {
1397 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1705 /* 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)); 1706 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1399 1707
1400 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1708 /* 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 */ 1709 /* without this the next cctx_get might destroy the running cctx while still in use */
1402 if (expect_false (CCTX_EXPIRED (cctx_current))) 1710 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1403 if (expect_true (!next->cctx)) 1711 if (ecb_expect_true (!next->cctx))
1404 next->cctx = cctx_get (aTHX); 1712 next->cctx = cctx_get (aTHX);
1405 1713
1406 cctx_put (cctx_current); 1714 cctx_put (cctx_current);
1407 } 1715 }
1408 else 1716 else
1409 prev->cctx = cctx_current; 1717 prev->cctx = cctx_current;
1410 1718
1411 ++next->usecount; 1719 ++next->usecount;
1412 1720
1413 cctx_prev = cctx_current; 1721 cctx_prev = cctx_current;
1414 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1722 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1415 1723
1416 next->cctx = 0; 1724 next->cctx = 0;
1417 1725
1418 if (expect_false (cctx_prev != cctx_current)) 1726 if (ecb_expect_false (cctx_prev != cctx_current))
1419 { 1727 {
1420 cctx_prev->top_env = PL_top_env; 1728 cctx_prev->top_env = PL_top_env;
1421 PL_top_env = cctx_current->top_env; 1729 PL_top_env = cctx_current->top_env;
1422 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1730 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1423 } 1731 }
… …
1429#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1737#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) 1738#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1431 1739
1432/** high level stuff ********************************************************/ 1740/** high level stuff ********************************************************/
1433 1741
1742/* this function is actually Coro, not Coro::State, but we call it from here */
1743/* because it is convenient - but it hasn't been declared yet for that reason */
1434static int 1744static void
1745coro_call_on_destroy (pTHX_ struct coro *coro);
1746
1747static void
1435coro_state_destroy (pTHX_ struct coro *coro) 1748coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1749{
1437 if (coro->flags & CF_DESTROYED) 1750 if (coro->flags & CF_ZOMBIE)
1438 return 0; 1751 return;
1439 1752
1440 if (coro->on_destroy)
1441 coro->on_destroy (aTHX_ coro); 1753 slf_destroy (aTHX_ coro);
1442 1754
1443 coro->flags |= CF_DESTROYED; 1755 coro->flags |= CF_ZOMBIE;
1444 1756
1445 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1446 { 1758 {
1447 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1759 /* reduce nready, as destroying a ready coro effectively unreadies it */
1448 /* alternative: look through all ready queues and remove the coro */ 1760 /* alternative: look through all ready queues and remove the coro */
1449 --coro_nready; 1761 --coro_nready;
1450 } 1762 }
1451 else 1763 else
1452 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1764 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1453 1765
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1766 if (coro->next) coro->next->prev = coro->prev;
1455 { 1767 if (coro->prev) coro->prev->next = coro->next;
1456 struct coro temp; 1768 if (coro == coro_first) coro_first = coro->next;
1457 1769
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1770 if (coro->mainstack
1459 1771 && coro->mainstack != main_mainstack
1460 save_perl (aTHX_ &temp); 1772 && coro->slot
1773 && !PL_dirty)
1461 load_perl (aTHX_ coro); 1774 destroy_perl (aTHX_ coro);
1462
1463 coro_destruct (aTHX_ coro);
1464
1465 load_perl (aTHX_ &temp);
1466
1467 coro->slot = 0;
1468 }
1469 1775
1470 cctx_destroy (coro->cctx); 1776 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1777 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1778 SvREFCNT_dec (coro->args);
1779 SvREFCNT_dec (coro->swap_sv);
1473 SvREFCNT_dec (CORO_THROW); 1780 SvREFCNT_dec (CORO_THROW);
1474 1781
1475 if (coro->next) coro->next->prev = coro->prev; 1782 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 1783
1479 return 1; 1784 /* more destruction mayhem in coro_state_free */
1480} 1785}
1481 1786
1482static int 1787static int
1483coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1788coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1484{ 1789{
1485 struct coro *coro = (struct coro *)mg->mg_ptr; 1790 struct coro *coro = (struct coro *)mg->mg_ptr;
1486 mg->mg_ptr = 0; 1791 mg->mg_ptr = 0;
1487 1792
1488 coro->hv = 0;
1489
1490 if (--coro->refcnt < 0)
1491 {
1492 coro_state_destroy (aTHX_ coro); 1793 coro_state_destroy (aTHX_ coro);
1794 SvREFCNT_dec (coro->on_destroy);
1795 SvREFCNT_dec (coro->status);
1796
1493 Safefree (coro); 1797 Safefree (coro);
1494 }
1495 1798
1496 return 0; 1799 return 0;
1497} 1800}
1498 1801
1499static int 1802static int ecb_cold
1500coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1803coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1501{ 1804{
1502 struct coro *coro = (struct coro *)mg->mg_ptr; 1805 /* called when perl clones the current process the slow way (windows process emulation) */
1503 1806 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1504 ++coro->refcnt; 1807 mg->mg_ptr = 0;
1808 mg->mg_virtual = 0;
1505 1809
1506 return 0; 1810 return 0;
1507} 1811}
1508 1812
1509static MGVTBL coro_state_vtbl = { 1813static MGVTBL coro_state_vtbl = {
… …
1532 1836
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1837 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1838 TRANSFER (ta, 1);
1535} 1839}
1536 1840
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 ********************************************************************/ 1841/** Coro ********************************************************************/
1561 1842
1562INLINE void 1843ecb_inline void
1563coro_enq (pTHX_ struct coro *coro) 1844coro_enq (pTHX_ struct coro *coro)
1564{ 1845{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1846 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1847
1568INLINE SV * 1848 SvREFCNT_inc_NN (coro->hv);
1849
1850 coro->next_ready = 0;
1851 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1852 ready [1] = coro;
1853}
1854
1855ecb_inline struct coro *
1569coro_deq (pTHX) 1856coro_deq (pTHX)
1570{ 1857{
1571 int prio; 1858 int prio;
1572 1859
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1860 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1861 {
1575 return av_shift (coro_ready [prio]); 1862 struct coro **ready = coro_ready [prio];
1863
1864 if (ready [0])
1865 {
1866 struct coro *coro = ready [0];
1867 ready [0] = coro->next_ready;
1868 return coro;
1869 }
1870 }
1576 1871
1577 return 0; 1872 return 0;
1873}
1874
1875static void
1876invoke_sv_ready_hook_helper (void)
1877{
1878 dTHX;
1879 dSP;
1880
1881 ENTER;
1882 SAVETMPS;
1883
1884 PUSHMARK (SP);
1885 PUTBACK;
1886 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1887
1888 FREETMPS;
1889 LEAVE;
1578} 1890}
1579 1891
1580static int 1892static int
1581api_ready (pTHX_ SV *coro_sv) 1893api_ready (pTHX_ SV *coro_sv)
1582{ 1894{
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); 1895 struct coro *coro = SvSTATE (coro_sv);
1591 1896
1592 if (coro->flags & CF_READY) 1897 if (coro->flags & CF_READY)
1593 return 0; 1898 return 0;
1594 1899
1595 coro->flags |= CF_READY; 1900 coro->flags |= CF_READY;
1596 1901
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1902 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1903
1603 if (sv_hook) 1904 if (!coro_nready++)
1604 { 1905 if (coroapi.readyhook)
1605 dSP; 1906 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 1907
1621 return 1; 1908 return 1;
1622} 1909}
1623 1910
1624static int 1911static int
… …
1626{ 1913{
1627 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1914 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1628} 1915}
1629 1916
1630/* expects to own a reference to next->hv */ 1917/* expects to own a reference to next->hv */
1631INLINE void 1918ecb_inline void
1632prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1919prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1633{ 1920{
1634 SV *prev_sv = SvRV (coro_current); 1921 SV *prev_sv = SvRV (coro_current);
1635 1922
1636 ta->prev = SvSTATE_hv (prev_sv); 1923 ta->prev = SvSTATE_hv (prev_sv);
… …
1647static void 1934static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1935prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1936{
1650 for (;;) 1937 for (;;)
1651 { 1938 {
1652 SV *next_sv = coro_deq (aTHX); 1939 struct coro *next = coro_deq (aTHX);
1653 1940
1654 if (expect_true (next_sv)) 1941 if (ecb_expect_true (next))
1655 { 1942 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1943 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1944 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 */ 1945 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1946 else
1662 { 1947 {
1663 next->flags &= ~CF_READY; 1948 next->flags &= ~CF_READY;
1664 --coro_nready; 1949 --coro_nready;
1665 1950
… …
1668 } 1953 }
1669 } 1954 }
1670 else 1955 else
1671 { 1956 {
1672 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1958 if (SvROK (sv_idle)
1959 && SvOBJECT (SvRV (sv_idle)))
1960 {
1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1980
1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1982 api_ready (aTHX_ SvRV (sv_idle));
1983 --coro_nready;
1984 }
1985 else
1986 {
1987 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1673 dSP; 1988 dSP;
1674 1989
1675 ENTER; 1990 ENTER;
1676 SAVETMPS; 1991 SAVETMPS;
1677 1992
1678 PUSHMARK (SP); 1993 PUSHMARK (SP);
1679 PUTBACK; 1994 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1995 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1996
1682 FREETMPS; 1997 FREETMPS;
1683 LEAVE; 1998 LEAVE;
1999 }
1684 } 2000 }
1685 } 2001 }
1686} 2002}
1687 2003
1688INLINE void 2004ecb_inline void
1689prepare_cede (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede (pTHX_ struct coro_transfer_args *ta)
1690{ 2006{
1691 api_ready (aTHX_ coro_current); 2007 api_ready (aTHX_ coro_current);
1692 prepare_schedule (aTHX_ ta); 2008 prepare_schedule (aTHX_ ta);
1693} 2009}
1694 2010
1695INLINE void 2011ecb_inline void
1696prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2012prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1697{ 2013{
1698 SV *prev = SvRV (coro_current); 2014 SV *prev = SvRV (coro_current);
1699 2015
1700 if (coro_nready) 2016 if (coro_nready)
… …
1730{ 2046{
1731 struct coro_transfer_args ta; 2047 struct coro_transfer_args ta;
1732 2048
1733 prepare_cede (aTHX_ &ta); 2049 prepare_cede (aTHX_ &ta);
1734 2050
1735 if (expect_true (ta.prev != ta.next)) 2051 if (ecb_expect_true (ta.prev != ta.next))
1736 { 2052 {
1737 TRANSFER (ta, 1); 2053 TRANSFER (ta, 1);
1738 return 1; 2054 return 1;
1739 } 2055 }
1740 else 2056 else
… …
1783 coro->slot->runops = RUNOPS_DEFAULT; 2099 coro->slot->runops = RUNOPS_DEFAULT;
1784 } 2100 }
1785} 2101}
1786 2102
1787static void 2103static void
2104coro_push_av (pTHX_ AV *av, I32 gimme_v)
2105{
2106 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2107 {
2108 dSP;
2109
2110 if (gimme_v == G_SCALAR)
2111 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2112 else
2113 {
2114 int i;
2115 EXTEND (SP, AvFILLp (av) + 1);
2116
2117 for (i = 0; i <= AvFILLp (av); ++i)
2118 PUSHs (AvARRAY (av)[i]);
2119 }
2120
2121 PUTBACK;
2122 }
2123}
2124
2125static void
2126coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2127{
2128 if (!coro->on_destroy)
2129 coro->on_destroy = newAV ();
2130
2131 av_push (coro->on_destroy, cb);
2132}
2133
2134static void
2135slf_destroy_join (pTHX_ struct CoroSLF *frame)
2136{
2137 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2138}
2139
2140static int
2141slf_check_join (pTHX_ struct CoroSLF *frame)
2142{
2143 struct coro *coro = (struct coro *)frame->data;
2144
2145 if (!coro->status)
2146 return 1;
2147
2148 frame->destroy = 0;
2149
2150 coro_push_av (aTHX_ coro->status, GIMME_V);
2151
2152 SvREFCNT_dec ((SV *)coro->hv);
2153
2154 return 0;
2155}
2156
2157static void
2158slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2159{
2160 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2161
2162 if (items > 1)
2163 croak ("join called with too many arguments");
2164
2165 if (coro->status)
2166 frame->prepare = prepare_nop;
2167 else
2168 {
2169 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2170 frame->prepare = prepare_schedule;
2171 }
2172
2173 frame->check = slf_check_join;
2174 frame->destroy = slf_destroy_join;
2175 frame->data = (void *)coro;
2176 SvREFCNT_inc (coro->hv);
2177}
2178
2179static void
1788coro_call_on_destroy (pTHX_ struct coro *coro) 2180coro_call_on_destroy (pTHX_ struct coro *coro)
1789{ 2181{
1790 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2182 AV *od = coro->on_destroy;
1791 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1792 2183
1793 if (on_destroyp) 2184 if (!od)
1794 { 2185 return;
1795 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1796 2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2189
1797 while (AvFILLp (on_destroy) >= 0) 2190 while (AvFILLp (od) >= 0)
2191 {
2192 SV *cb = sv_2mortal (av_pop (od));
2193
2194 /* coro hv's (and only hv's at the moment) are supported as well */
2195 if (SvSTATEhv_p (aTHX_ cb))
2196 api_ready (aTHX_ cb);
2197 else
1798 { 2198 {
1799 dSP; /* don't disturb outer sp */ 2199 dSP; /* don't disturb outer sp */
1800 SV *cb = av_pop (on_destroy);
1801
1802 PUSHMARK (SP); 2200 PUSHMARK (SP);
1803 2201
1804 if (statusp) 2202 if (coro->status)
1805 { 2203 {
1806 int i; 2204 PUTBACK;
1807 AV *status = (AV *)SvRV (*statusp); 2205 coro_push_av (aTHX_ coro->status, G_ARRAY);
1808 EXTEND (SP, AvFILLp (status) + 1); 2206 SPAGAIN;
1809
1810 for (i = 0; i <= AvFILLp (status); ++i)
1811 PUSHs (AvARRAY (status)[i]);
1812 } 2207 }
1813 2208
1814 PUTBACK; 2209 PUTBACK;
1815 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2210 call_sv (cb, G_VOID | G_DISCARD);
1816 } 2211 }
1817 } 2212 }
1818} 2213}
1819 2214
1820static void 2215static void
1821slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2216coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1822{ 2217{
2218 AV *av;
2219
2220 if (coro->status)
2221 {
2222 av = coro->status;
2223 av_clear (av);
2224 }
2225 else
2226 av = coro->status = newAV ();
2227
2228 /* items are actually not so common, so optimise for this case */
2229 if (items)
2230 {
1823 int i; 2231 int i;
1824 HV *hv = (HV *)SvRV (coro_current);
1825 AV *av = newAV ();
1826 2232
1827 av_extend (av, items - 1); 2233 av_extend (av, items - 1);
2234
1828 for (i = 0; i < items; ++i) 2235 for (i = 0; i < items; ++i)
1829 av_push (av, SvREFCNT_inc_NN (arg [i])); 2236 av_push (av, SvREFCNT_inc_NN (arg [i]));
2237 }
2238}
1830 2239
1831 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2240static void
1832 2241slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2242{
1833 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2243 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1834 api_ready (aTHX_ sv_manager); 2244 api_ready (aTHX_ sv_manager);
1835 2245
1836 frame->prepare = prepare_schedule; 2246 frame->prepare = prepare_schedule;
1837 frame->check = slf_check_repeat; 2247 frame->check = slf_check_repeat;
2248
2249 /* as a minor optimisation, we could unwind all stacks here */
2250 /* but that puts extra pressure on pp_slf, and is not worth much */
2251 /*coro_unwind_stacks (aTHX);*/
2252}
2253
2254static void
2255slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2256{
2257 HV *coro_hv = (HV *)SvRV (coro_current);
2258
2259 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2260 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2261}
2262
2263static void
2264slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2265{
2266 HV *coro_hv;
2267 struct coro *coro;
2268
2269 if (items <= 0)
2270 croak ("Coro::cancel called without coro object,");
2271
2272 coro = SvSTATE (arg [0]);
2273 coro_hv = coro->hv;
2274
2275 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2276
2277 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2278 {
2279 /* coro currently busy cancelling something, so just notify it */
2280 coro->slf_frame.data = (void *)coro;
2281
2282 frame->prepare = prepare_nop;
2283 frame->check = slf_check_nop;
2284 }
2285 else if (coro_hv == (HV *)SvRV (coro_current))
2286 {
2287 /* cancelling the current coro is allowed, and equals terminate */
2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2289 }
2290 else
2291 {
2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2296
2297 /* otherwise we cancel directly, purely for speed reasons
2298 * unfortunately, this requires some magic trickery, as
2299 * somebody else could cancel us, so we have to fight the cancellation.
2300 * this is ugly, and hopefully fully worth the extra speed.
2301 * besides, I can't get the slow-but-safe version working...
2302 */
2303 slf_frame.data = 0;
2304 self->flags |= CF_NOCANCEL;
2305 coro_state_destroy (aTHX_ coro);
2306 self->flags &= ~CF_NOCANCEL;
2307
2308 if (slf_frame.data)
2309 {
2310 /* while we were busy we have been cancelled, so terminate */
2311 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2312 }
2313 else
2314 {
2315 frame->prepare = prepare_nop;
2316 frame->check = slf_check_nop;
2317 }
2318 }
2319}
2320
2321static int
2322slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2323{
2324 frame->prepare = 0;
2325 coro_unwind_stacks (aTHX);
2326
2327 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2328
2329 return 1;
2330}
2331
2332static int
2333safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2334{
2335 if (coro->cctx)
2336 croak ("coro inside C callback, unable to cancel at this time, caught");
2337
2338 if (coro->flags & CF_NEW)
2339 {
2340 coro_set_status (aTHX_ coro, arg, items);
2341 coro_state_destroy (aTHX_ coro);
2342 }
2343 else
2344 {
2345 if (!coro->slf_frame.prepare)
2346 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2347
2348 slf_destroy (aTHX_ coro);
2349
2350 coro_set_status (aTHX_ coro, arg, items);
2351 coro->slf_frame.prepare = prepare_nop;
2352 coro->slf_frame.check = slf_check_safe_cancel;
2353
2354 api_ready (aTHX_ (SV *)coro->hv);
2355 }
2356
2357 return 1;
1838} 2358}
1839 2359
1840/*****************************************************************************/ 2360/*****************************************************************************/
1841/* async pool handler */ 2361/* async pool handler */
1842 2362
… …
1873slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2393slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1874{ 2394{
1875 HV *hv = (HV *)SvRV (coro_current); 2395 HV *hv = (HV *)SvRV (coro_current);
1876 struct coro *coro = SvSTATE_hv ((SV *)hv); 2396 struct coro *coro = SvSTATE_hv ((SV *)hv);
1877 2397
1878 if (expect_true (coro->saved_deffh)) 2398 if (ecb_expect_true (coro->saved_deffh))
1879 { 2399 {
1880 /* subsequent iteration */ 2400 /* subsequent iteration */
1881 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2401 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1882 coro->saved_deffh = 0; 2402 coro->saved_deffh = 0;
1883 2403
1884 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2404 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1885 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2405 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1886 { 2406 {
1887 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2407 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1888 coro->invoke_av = newAV (); 2408 return;
1889
1890 frame->prepare = prepare_nop;
1891 } 2409 }
1892 else 2410 else
1893 { 2411 {
1894 av_clear (GvAV (PL_defgv)); 2412 av_clear (GvAV (PL_defgv));
1895 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2413 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1920 2438
1921static void 2439static void
1922coro_rouse_callback (pTHX_ CV *cv) 2440coro_rouse_callback (pTHX_ CV *cv)
1923{ 2441{
1924 dXSARGS; 2442 dXSARGS;
1925 SV *data = (SV *)GENSUB_ARG; 2443 SV *data = (SV *)S_GENSUB_ARG;
1926 2444
1927 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2445 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1928 { 2446 {
1929 /* first call, set args */ 2447 /* first call, set args */
2448 SV *coro = SvRV (data);
1930 AV *av = newAV (); 2449 AV *av = newAV ();
1931 SV *coro = SvRV (data);
1932 2450
1933 SvRV_set (data, (SV *)av); 2451 SvRV_set (data, (SV *)av);
1934 api_ready (aTHX_ coro);
1935 SvREFCNT_dec (coro);
1936 2452
1937 /* better take a full copy of the arguments */ 2453 /* better take a full copy of the arguments */
1938 while (items--) 2454 while (items--)
1939 av_store (av, items, newSVsv (ST (items))); 2455 av_store (av, items, newSVsv (ST (items)));
2456
2457 api_ready (aTHX_ coro);
2458 SvREFCNT_dec (coro);
1940 } 2459 }
1941 2460
1942 XSRETURN_EMPTY; 2461 XSRETURN_EMPTY;
1943} 2462}
1944 2463
1945static int 2464static int
1946slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2465slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1947{ 2466{
1948 SV *data = (SV *)frame->data; 2467 SV *data = (SV *)frame->data;
1949 2468
1950 if (CORO_THROW) 2469 if (CORO_THROW)
1951 return 0; 2470 return 0;
1952 2471
1953 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2472 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1954 return 1; 2473 return 1;
… …
1961 2480
1962 EXTEND (SP, AvFILLp (av) + 1); 2481 EXTEND (SP, AvFILLp (av) + 1);
1963 for (i = 0; i <= AvFILLp (av); ++i) 2482 for (i = 0; i <= AvFILLp (av); ++i)
1964 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2483 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1965 2484
1966 /* we have stolen the elements, so ste length to zero and free */ 2485 /* we have stolen the elements, so set length to zero and free */
1967 AvFILLp (av) = -1; 2486 AvFILLp (av) = -1;
1968 av_undef (av); 2487 av_undef (av);
1969 2488
1970 PUTBACK; 2489 PUTBACK;
1971 } 2490 }
… …
1990 cb = sv_2mortal (coro->rouse_cb); 2509 cb = sv_2mortal (coro->rouse_cb);
1991 coro->rouse_cb = 0; 2510 coro->rouse_cb = 0;
1992 } 2511 }
1993 2512
1994 if (!SvROK (cb) 2513 if (!SvROK (cb)
1995 || SvTYPE (SvRV (cb)) != SVt_PVCV 2514 || SvTYPE (SvRV (cb)) != SVt_PVCV
1996 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2515 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1997 croak ("Coro::rouse_wait called with illegal callback argument,"); 2516 croak ("Coro::rouse_wait called with illegal callback argument,");
1998 2517
1999 { 2518 {
2000 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2001 SV *data = (SV *)GENSUB_ARG; 2520 SV *data = (SV *)S_GENSUB_ARG;
2002 2521
2003 frame->data = (void *)data; 2522 frame->data = (void *)data;
2004 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2523 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2005 frame->check = slf_check_rouse_wait; 2524 frame->check = slf_check_rouse_wait;
2006 } 2525 }
… …
2010coro_new_rouse_cb (pTHX) 2529coro_new_rouse_cb (pTHX)
2011{ 2530{
2012 HV *hv = (HV *)SvRV (coro_current); 2531 HV *hv = (HV *)SvRV (coro_current);
2013 struct coro *coro = SvSTATE_hv (hv); 2532 struct coro *coro = SvSTATE_hv (hv);
2014 SV *data = newRV_inc ((SV *)hv); 2533 SV *data = newRV_inc ((SV *)hv);
2015 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2534 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2016 2535
2017 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2536 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2018 SvREFCNT_dec (data); /* magicext increases the refcount */ 2537 SvREFCNT_dec (data); /* magicext increases the refcount */
2019 2538
2020 SvREFCNT_dec (coro->rouse_cb); 2539 SvREFCNT_dec (coro->rouse_cb);
… …
2117static void 2636static void
2118slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2637slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{ 2638{
2120 frame->prepare = prepare_cede_notself; 2639 frame->prepare = prepare_cede_notself;
2121 frame->check = slf_check_nop; 2640 frame->check = slf_check_nop;
2641}
2642
2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2644static void
2645slf_destroy (pTHX_ struct coro *coro)
2646{
2647 struct CoroSLF frame = coro->slf_frame;
2648
2649 /*
2650 * The on_destroy below most likely is from an SLF call.
2651 * Since by definition the SLF call will not finish when we destroy
2652 * the coro, we will have to force-finish it here, otherwise
2653 * cleanup functions cannot call SLF functions.
2654 */
2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2122} 2660}
2123 2661
2124/* 2662/*
2125 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2126 * function to increase chances that they all will call transfer with the same 2664 * 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 */ 2671 I32 checkmark; /* mark SP to see how many elements check has pushed */
2134 2672
2135 /* set up the slf frame, unless it has already been set-up */ 2673 /* set up the slf frame, unless it has already been set-up */
2136 /* the latter happens when a new coro has been started */ 2674 /* the latter happens when a new coro has been started */
2137 /* or when a new cctx was attached to an existing coroutine */ 2675 /* or when a new cctx was attached to an existing coroutine */
2138 if (expect_true (!slf_frame.prepare)) 2676 if (ecb_expect_true (!slf_frame.prepare))
2139 { 2677 {
2140 /* first iteration */ 2678 /* first iteration */
2141 dSP; 2679 dSP;
2142 SV **arg = PL_stack_base + TOPMARK + 1; 2680 SV **arg = PL_stack_base + TOPMARK + 1;
2143 int items = SP - arg; /* args without function object */ 2681 int items = SP - arg; /* args without function object */
… …
2184 while (slf_frame.check (aTHX_ &slf_frame)); 2722 while (slf_frame.check (aTHX_ &slf_frame));
2185 2723
2186 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2724 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2187 2725
2188 /* exception handling */ 2726 /* exception handling */
2189 if (expect_false (CORO_THROW)) 2727 if (ecb_expect_false (CORO_THROW))
2190 { 2728 {
2191 SV *exception = sv_2mortal (CORO_THROW); 2729 SV *exception = sv_2mortal (CORO_THROW);
2192 2730
2193 CORO_THROW = 0; 2731 CORO_THROW = 0;
2194 sv_setsv (ERRSV, exception); 2732 sv_setsv (ERRSV, exception);
2195 croak (0); 2733 croak (0);
2196 } 2734 }
2197 2735
2198 /* return value handling - mostly like entersub */ 2736 /* return value handling - mostly like entersub */
2199 /* make sure we put something on the stack in scalar context */ 2737 /* make sure we put something on the stack in scalar context */
2200 if (GIMME_V == G_SCALAR) 2738 if (GIMME_V == G_SCALAR
2739 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2201 { 2740 {
2202 dSP; 2741 dSP;
2203 SV **bot = PL_stack_base + checkmark; 2742 SV **bot = PL_stack_base + checkmark;
2204 2743
2205 if (sp == bot) /* too few, push undef */ 2744 if (sp == bot) /* too few, push undef */
2206 bot [1] = &PL_sv_undef; 2745 bot [1] = &PL_sv_undef;
2207 else if (sp != bot + 1) /* too many, take last one */ 2746 else /* too many, take last one */
2208 bot [1] = *sp; 2747 bot [1] = *sp;
2209 2748
2210 SP = bot + 1; 2749 SP = bot + 1;
2211 2750
2212 PUTBACK; 2751 PUTBACK;
… …
2245 if (PL_op->op_flags & OPf_STACKED) 2784 if (PL_op->op_flags & OPf_STACKED)
2246 { 2785 {
2247 if (items > slf_arga) 2786 if (items > slf_arga)
2248 { 2787 {
2249 slf_arga = items; 2788 slf_arga = items;
2250 free (slf_argv); 2789 Safefree (slf_argv);
2251 slf_argv = malloc (slf_arga * sizeof (SV *)); 2790 New (0, slf_argv, slf_arga, SV *);
2252 } 2791 }
2253 2792
2254 slf_argc = items; 2793 slf_argc = items;
2255 2794
2256 for (i = 0; i < items; ++i) 2795 for (i = 0; i < items; ++i)
… …
2261 2800
2262 PL_op->op_ppaddr = pp_slf; 2801 PL_op->op_ppaddr = pp_slf;
2263 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2802 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2264 2803
2265 PL_op = (OP *)&slf_restore; 2804 PL_op = (OP *)&slf_restore;
2805}
2806
2807/*****************************************************************************/
2808/* dynamic wind */
2809
2810static void
2811on_enterleave_call (pTHX_ SV *cb)
2812{
2813 dSP;
2814
2815 PUSHSTACK;
2816
2817 PUSHMARK (SP);
2818 PUTBACK;
2819 call_sv (cb, G_VOID | G_DISCARD);
2820 SPAGAIN;
2821
2822 POPSTACK;
2823}
2824
2825static SV *
2826coro_avp_pop_and_free (pTHX_ AV **avp)
2827{
2828 AV *av = *avp;
2829 SV *res = av_pop (av);
2830
2831 if (AvFILLp (av) < 0)
2832 {
2833 *avp = 0;
2834 SvREFCNT_dec (av);
2835 }
2836
2837 return res;
2838}
2839
2840static void
2841coro_pop_on_enter (pTHX_ void *coro)
2842{
2843 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2844 SvREFCNT_dec (cb);
2845}
2846
2847static void
2848coro_pop_on_leave (pTHX_ void *coro)
2849{
2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2852}
2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook ((void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2266} 2944}
2267 2945
2268/*****************************************************************************/ 2946/*****************************************************************************/
2269/* PerlIO::cede */ 2947/* PerlIO::cede */
2270 2948
… …
2272{ 2950{
2273 PerlIOBuf base; 2951 PerlIOBuf base;
2274 NV next, every; 2952 NV next, every;
2275} PerlIOCede; 2953} PerlIOCede;
2276 2954
2277static IV 2955static IV ecb_cold
2278PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2956PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2279{ 2957{
2280 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2958 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2281 2959
2282 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2960 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2283 self->next = nvtime () + self->every; 2961 self->next = nvtime () + self->every;
2284 2962
2285 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2963 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2286} 2964}
2287 2965
2288static SV * 2966static SV * ecb_cold
2289PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2967PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2290{ 2968{
2291 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2969 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2292 2970
2293 return newSVnv (self->every); 2971 return newSVnv (self->every);
… …
2344/* Coro::Semaphore & Coro::Signal */ 3022/* Coro::Semaphore & Coro::Signal */
2345 3023
2346static SV * 3024static SV *
2347coro_waitarray_new (pTHX_ int count) 3025coro_waitarray_new (pTHX_ int count)
2348{ 3026{
2349 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3027 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2350 AV *av = newAV (); 3028 AV *av = newAV ();
2351 SV **ary; 3029 SV **ary;
2352 3030
2353 /* unfortunately, building manually saves memory */ 3031 /* unfortunately, building manually saves memory */
2354 Newx (ary, 2, SV *); 3032 Newx (ary, 2, SV *);
2355 AvALLOC (av) = ary; 3033 AvALLOC (av) = ary;
3034#if PERL_VERSION_ATLEAST (5,10,0)
2356 /*AvARRAY (av) = ary;*/ 3035 AvARRAY (av) = ary;
3036#else
2357 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 3037 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
3038 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
3039 SvPVX ((SV *)av) = (char *)ary;
3040#endif
2358 AvMAX (av) = 1; 3041 AvMAX (av) = 1;
2359 AvFILLp (av) = 0; 3042 AvFILLp (av) = 0;
2360 ary [0] = newSViv (count); 3043 ary [0] = newSViv (count);
2361 3044
2362 return newRV_noinc ((SV *)av); 3045 return newRV_noinc ((SV *)av);
… …
2395 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2396 PUTBACK; 3079 PUTBACK;
2397 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2398 } 3081 }
2399 3082
2400 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2401 } 3084 }
2402} 3085}
2403 3086
2404static void 3087static void
2405coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2406{ 3089{
2407 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3090 /* call $sem->adjust (0) to possibly wake up some other waiters */
2408 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3091 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2409} 3092}
2410 3093
2411static int 3094static int
2412slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3095slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2413{ 3096{
2414 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2415 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
3099 SV *coro_hv = SvRV (coro_current);
3100
3101 frame->destroy = 0;
2416 3102
2417 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2418 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2419 return 0; 3109 return 0;
3110 }
2420 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2421 { 3112 {
2422 SvSTATE_current->on_destroy = 0;
2423
2424 if (acquire) 3113 if (acquire)
2425 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2426 else 3115 else
2427 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2428 3117
… …
2432 { 3121 {
2433 int i; 3122 int i;
2434 /* if we were woken up but can't down, we look through the whole */ 3123 /* 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 */ 3124 /* waiters list and only add us if we aren't in there already */
2436 /* this avoids some degenerate memory usage cases */ 3125 /* this avoids some degenerate memory usage cases */
2437 3126 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)) 3127 if (AvARRAY (av)[i] == coro_hv)
2440 return 1; 3128 return 1;
2441 3129
2442 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3130 av_push (av, SvREFCNT_inc (coro_hv));
2443 return 1; 3131 return 1;
2444 } 3132 }
2445} 3133}
2446 3134
2447static int 3135static int
… …
2470 { 3158 {
2471 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3159 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2472 3160
2473 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3161 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2474 frame->prepare = prepare_schedule; 3162 frame->prepare = prepare_schedule;
2475
2476 /* to avoid race conditions when a woken-up coro gets terminated */ 3163 /* to avoid race conditions when a woken-up coro gets terminated */
2477 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3164 /* we arrange for a temporary on_destroy that calls adjust (0) */
2478 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3165 frame->destroy = coro_semaphore_destroy;
2479 } 3166 }
2480} 3167}
2481 3168
2482static void 3169static void
2483slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3170slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2491{ 3178{
2492 if (items >= 2) 3179 if (items >= 2)
2493 { 3180 {
2494 /* callback form */ 3181 /* callback form */
2495 AV *av = (AV *)SvRV (arg [0]); 3182 AV *av = (AV *)SvRV (arg [0]);
2496 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3183 SV *cb_cv = s_get_cv_croak (arg [1]);
2497 3184
2498 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3185 av_push (av, SvREFCNT_inc_NN (cb_cv));
2499 3186
2500 if (SvIVX (AvARRAY (av)[0]) > 0) 3187 if (SvIVX (AvARRAY (av)[0]) > 0)
2501 coro_semaphore_adjust (aTHX_ av, 0); 3188 coro_semaphore_adjust (aTHX_ av, 0);
2502 3189
2503 frame->prepare = prepare_nop; 3190 frame->prepare = prepare_nop;
… …
2527 AvARRAY (av)[0] = AvARRAY (av)[1]; 3214 AvARRAY (av)[0] = AvARRAY (av)[1];
2528 AvARRAY (av)[1] = cb; 3215 AvARRAY (av)[1] = cb;
2529 3216
2530 cb = av_shift (av); 3217 cb = av_shift (av);
2531 3218
3219 if (SvTYPE (cb) == SVt_PVCV)
3220 {
3221 dSP;
3222 PUSHMARK (SP);
3223 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3224 PUTBACK;
3225 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3226 }
3227 else
3228 {
2532 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
2533 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3231 }
3232
2534 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
2535 3234
2536 --count; 3235 --count;
2537 } 3236 }
2538} 3237}
2539 3238
… …
2547static void 3246static void
2548slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3247slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2549{ 3248{
2550 AV *av = (AV *)SvRV (arg [0]); 3249 AV *av = (AV *)SvRV (arg [0]);
2551 3250
3251 if (items >= 2)
3252 {
3253 SV *cb_cv = s_get_cv_croak (arg [1]);
3254 av_push (av, SvREFCNT_inc_NN (cb_cv));
3255
2552 if (SvIVX (AvARRAY (av)[0])) 3256 if (SvIVX (AvARRAY (av)[0]))
3257 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3258
3259 frame->prepare = prepare_nop;
3260 frame->check = slf_check_nop;
3261 }
3262 else if (SvIVX (AvARRAY (av)[0]))
2553 { 3263 {
2554 SvIVX (AvARRAY (av)[0]) = 0; 3264 SvIVX (AvARRAY (av)[0]) = 0;
2555 frame->prepare = prepare_nop; 3265 frame->prepare = prepare_nop;
2556 frame->check = slf_check_nop; 3266 frame->check = slf_check_nop;
2557 } 3267 }
2558 else 3268 else
2559 { 3269 {
2560 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3270 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2561 3271
2562 av_push (av, waiter); 3272 av_push (av, waiter);
2563 3273
2564 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3274 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2565 frame->prepare = prepare_schedule; 3275 frame->prepare = prepare_schedule;
… …
2583 3293
2584static void 3294static void
2585coro_aio_callback (pTHX_ CV *cv) 3295coro_aio_callback (pTHX_ CV *cv)
2586{ 3296{
2587 dXSARGS; 3297 dXSARGS;
2588 AV *state = (AV *)GENSUB_ARG; 3298 AV *state = (AV *)S_GENSUB_ARG;
2589 SV *coro = av_pop (state); 3299 SV *coro = av_pop (state);
2590 SV *data_sv = newSV (sizeof (struct io_state)); 3300 SV *data_sv = newSV (sizeof (struct io_state));
2591 3301
2592 av_extend (state, items - 1); 3302 av_extend (state, items - 1);
2593 3303
… …
2613 } 3323 }
2614 3324
2615 av_push (state, data_sv); 3325 av_push (state, data_sv);
2616 3326
2617 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
2618 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
2619 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
2620} 3330}
2621 3331
2622static int 3332static int
2623slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2624{ 3334{
… …
2629 /* it quickly returns */ 3339 /* it quickly returns */
2630 if (CORO_THROW) 3340 if (CORO_THROW)
2631 return 0; 3341 return 0;
2632 3342
2633 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
2634 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2635 return 1; 3345 return 1;
2636 3346
2637 /* restore status */ 3347 /* restore status */
2638 { 3348 {
2639 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
… …
2642 errno = data->errorno; 3352 errno = data->errorno;
2643 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
2644 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
2645 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
2646 3356
2647 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
2648 } 3358 }
2649 3359
2650 /* push result values */ 3360 /* push result values */
2651 { 3361 {
2652 dSP; 3362 dSP;
… …
2678 dSP; 3388 dSP;
2679 3389
2680 static SV *prio_cv; 3390 static SV *prio_cv;
2681 static SV *prio_sv; 3391 static SV *prio_sv;
2682 3392
2683 if (expect_false (!prio_cv)) 3393 if (ecb_expect_false (!prio_cv))
2684 { 3394 {
2685 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3395 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2686 prio_sv = newSViv (0); 3396 prio_sv = newSViv (0);
2687 } 3397 }
2688 3398
… …
2707 3417
2708 for (i = 0; i < items; ++i) 3418 for (i = 0; i < items; ++i)
2709 PUSHs (arg [i]); 3419 PUSHs (arg [i]);
2710 3420
2711 /* now push the callback closure */ 3421 /* now push the callback closure */
2712 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3422 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2713 3423
2714 /* now call the AIO function - we assume our request is uncancelable */ 3424 /* now call the AIO function - we assume our request is uncancelable */
2715 PUTBACK; 3425 PUTBACK;
2716 call_sv ((SV *)req, G_VOID | G_DISCARD); 3426 call_sv ((SV *)req, G_VOID | G_DISCARD);
2717 } 3427 }
2718 3428
2719 /* now that the requets is going, we loop toll we have a result */ 3429 /* now that the request is going, we loop till we have a result */
2720 frame->data = (void *)state; 3430 frame->data = (void *)state;
2721 frame->prepare = prepare_schedule; 3431 frame->prepare = prepare_schedule;
2722 frame->check = slf_check_aio_req; 3432 frame->check = slf_check_aio_req;
2723} 3433}
2724 3434
… …
2736 3446
2737#if CORO_CLONE 3447#if CORO_CLONE
2738# include "clone.c" 3448# include "clone.c"
2739#endif 3449#endif
2740 3450
3451/*****************************************************************************/
3452
3453static SV *
3454coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3455{
3456 SV *coro_sv;
3457 struct coro *coro;
3458 MAGIC *mg;
3459 HV *hv;
3460 SV *cb;
3461 int i;
3462
3463 if (argc > 0)
3464 {
3465 cb = s_get_cv_croak (argv [0]);
3466
3467 if (!is_coro)
3468 {
3469 if (CvISXSUB (cb))
3470 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3471
3472 if (!CvROOT (cb))
3473 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3474 }
3475 }
3476
3477 Newz (0, coro, 1, struct coro);
3478 coro->args = newAV ();
3479 coro->flags = CF_NEW;
3480
3481 if (coro_first) coro_first->prev = coro;
3482 coro->next = coro_first;
3483 coro_first = coro;
3484
3485 coro->hv = hv = newHV ();
3486 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3487 mg->mg_flags |= MGf_DUP;
3488 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3489
3490 if (argc > 0)
3491 {
3492 av_extend (coro->args, argc + is_coro - 1);
3493
3494 if (is_coro)
3495 {
3496 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3497 cb = (SV *)cv_coro_run;
3498 }
3499
3500 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3501
3502 for (i = 1; i < argc; i++)
3503 av_push (coro->args, newSVsv (argv [i]));
3504 }
3505
3506 return coro_sv;
3507}
3508
3509#ifndef __cplusplus
3510ecb_cold XS(boot_Coro__State);
3511#endif
3512
3513#if CORO_JIT
3514
3515static void ecb_noinline ecb_cold
3516pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3517{
3518 dSP;
3519 AV *av = newAV ();
3520
3521 av_store (av, 3, newSVuv (d));
3522 av_store (av, 2, newSVuv (c));
3523 av_store (av, 1, newSVuv (b));
3524 av_store (av, 0, newSVuv (a));
3525
3526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3527
3528 PUTBACK;
3529}
3530
3531static void ecb_noinline ecb_cold
3532jit_init (pTHX)
3533{
3534 dSP;
3535 SV *load, *save;
3536 char *map_base;
3537 char *load_ptr, *save_ptr;
3538 STRLEN load_len, save_len, map_len;
3539 int count;
3540
3541 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3542
3543 PUSHMARK (SP);
3544 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3545 #include "state.h"
3546 count = call_pv ("Coro::State::_jit", G_ARRAY);
3547 SPAGAIN;
3548
3549 save = POPs; save_ptr = SvPVbyte (save, save_len);
3550 load = POPs; load_ptr = SvPVbyte (load, load_len);
3551
3552 map_len = load_len + save_len + 16;
3553
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557
3558 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len);
3560
3561 map_base += (load_len + 15) & ~15;
3562
3563 save_perl_slots = (load_save_perl_slots_type)map_base;
3564 memcpy (map_base, save_ptr, save_len);
3565
3566 /* we are good citizens and try to make the page read-only, so the evil evil */
3567 /* hackers might have it a bit more difficult */
3568 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3569
3570 PUTBACK;
3571 eval_pv ("undef &Coro::State::_jit", 1);
3572}
3573
3574#endif
3575
2741MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3576MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2742 3577
2743PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
2744 3579
2745BOOT: 3580BOOT:
2746{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
2747#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
2748# if CORO_PTHREAD 3585# if CORO_PTHREAD
2749 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
2750# endif 3587# endif
2751#endif 3588#endif
2752 BOOT_PAGESIZE; 3589 /* perl defines these to check for existance first, but why it doesn't */
3590 /* just create them one at init time is not clear to me, except for */
3591 /* programs trying to delete them, but... */
3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3593 DEFSV;
3594 ERRSV;
2753 3595
2754 cctx_current = cctx_new_empty (); 3596 cctx_current = cctx_new_empty ();
2755 3597
2756 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2757 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2797 coroapi.prepare_nop = prepare_nop; 3639 coroapi.prepare_nop = prepare_nop;
2798 coroapi.prepare_schedule = prepare_schedule; 3640 coroapi.prepare_schedule = prepare_schedule;
2799 coroapi.prepare_cede = prepare_cede; 3641 coroapi.prepare_cede = prepare_cede;
2800 coroapi.prepare_cede_notself = prepare_cede_notself; 3642 coroapi.prepare_cede_notself = prepare_cede_notself;
2801 3643
2802 { 3644 time_init (aTHX);
2803 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2804 3645
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)); 3646 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3647#if CORO_JIT
3648 PUTBACK;
3649 jit_init (aTHX);
3650 SPAGAIN;
3651#endif
2812} 3652}
2813 3653
2814SV * 3654SV *
2815new (char *klass, ...) 3655new (SV *klass, ...)
2816 ALIAS: 3656 ALIAS:
2817 Coro::new = 1 3657 Coro::new = 1
2818 CODE: 3658 CODE:
2819{ 3659 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2820 struct coro *coro; 3660 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 3661 RETVAL
2871 3662
2872void 3663void
2873transfer (...) 3664transfer (...)
2874 PROTOTYPE: $$ 3665 PROTOTYPE: $$
2875 CODE: 3666 CODE:
2876 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2877 3668
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 * 3669SV *
2892clone (Coro::State coro) 3670clone (Coro::State coro)
2893 CODE: 3671 CODE:
2894{ 3672{
2895#if CORO_CLONE 3673#if CORO_CLONE
2896 struct coro *ncoro = coro_clone (coro); 3674 struct coro *ncoro = coro_clone (aTHX_ coro);
2897 MAGIC *mg; 3675 MAGIC *mg;
2898 /* TODO: too much duplication */ 3676 /* TODO: too much duplication */
2899 ncoro->hv = newHV (); 3677 ncoro->hv = newHV ();
2900 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3678 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2901 mg->mg_flags |= MGf_DUP; 3679 mg->mg_flags |= MGf_DUP;
… …
2949void 3727void
2950list () 3728list ()
2951 PROTOTYPE: 3729 PROTOTYPE:
2952 PPCODE: 3730 PPCODE:
2953{ 3731{
2954 struct coro *coro; 3732 struct coro *coro;
2955 for (coro = coro_first; coro; coro = coro->next) 3733 for (coro = coro_first; coro; coro = coro->next)
2956 if (coro->hv) 3734 if (coro->hv)
2957 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3735 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2958} 3736}
2959 3737
… …
2963 eval = 1 3741 eval = 1
2964 CODE: 3742 CODE:
2965{ 3743{
2966 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3744 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2967 { 3745 {
2968 struct coro temp; 3746 struct coro *current = SvSTATE_current;
3747 struct CoroSLF slf_save;
2969 3748
2970 if (!(coro->flags & CF_RUNNING)) 3749 if (current != coro)
2971 { 3750 {
2972 PUTBACK; 3751 PUTBACK;
2973 save_perl (aTHX_ &temp); 3752 save_perl (aTHX_ current);
2974 load_perl (aTHX_ coro); 3753 load_perl (aTHX_ coro);
3754 /* the coro is most likely in an active SLF call.
3755 * while not strictly required (the code we execute is
3756 * not allowed to call any SLF functions), it's cleaner
3757 * to reinitialise the slf_frame and restore it later.
3758 * This might one day allow us to actually do SLF calls
3759 * from code executed here.
3760 */
3761 slf_save = slf_frame;
3762 slf_frame.prepare = 0;
3763 SPAGAIN;
2975 } 3764 }
2976 3765
2977 {
2978 dSP;
2979 ENTER;
2980 SAVETMPS;
2981 PUTBACK;
2982 PUSHSTACK; 3766 PUSHSTACK;
3767
2983 PUSHMARK (SP); 3768 PUSHMARK (SP);
3769 PUTBACK;
2984 3770
2985 if (ix) 3771 if (ix)
2986 eval_sv (coderef, 0); 3772 eval_sv (coderef, 0);
2987 else 3773 else
2988 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3774 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2989 3775
2990 POPSTACK; 3776 POPSTACK;
2991 SPAGAIN; 3777 SPAGAIN;
2992 FREETMPS;
2993 LEAVE;
2994 PUTBACK;
2995 }
2996 3778
2997 if (!(coro->flags & CF_RUNNING)) 3779 if (current != coro)
2998 { 3780 {
3781 PUTBACK;
3782 slf_frame = slf_save;
2999 save_perl (aTHX_ coro); 3783 save_perl (aTHX_ coro);
3000 load_perl (aTHX_ &temp); 3784 load_perl (aTHX_ current);
3001 SPAGAIN; 3785 SPAGAIN;
3002 } 3786 }
3003 } 3787 }
3004} 3788}
3005 3789
… …
3008 PROTOTYPE: $ 3792 PROTOTYPE: $
3009 ALIAS: 3793 ALIAS:
3010 is_ready = CF_READY 3794 is_ready = CF_READY
3011 is_running = CF_RUNNING 3795 is_running = CF_RUNNING
3012 is_new = CF_NEW 3796 is_new = CF_NEW
3013 is_destroyed = CF_DESTROYED 3797 is_destroyed = CF_ZOMBIE
3798 is_zombie = CF_ZOMBIE
3799 is_suspended = CF_SUSPENDED
3014 CODE: 3800 CODE:
3015 RETVAL = boolSV (coro->flags & ix); 3801 RETVAL = boolSV (coro->flags & ix);
3016 OUTPUT: 3802 OUTPUT:
3017 RETVAL 3803 RETVAL
3018 3804
3019void 3805void
3020throw (Coro::State self, SV *throw = &PL_sv_undef) 3806throw (SV *self, SV *exception = &PL_sv_undef)
3021 PROTOTYPE: $;$ 3807 PROTOTYPE: $;$
3022 CODE: 3808 CODE:
3023{ 3809{
3810 struct coro *coro = SvSTATE (self);
3024 struct coro *current = SvSTATE_current; 3811 struct coro *current = SvSTATE_current;
3025 SV **throwp = self == current ? &CORO_THROW : &self->except; 3812 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3026 SvREFCNT_dec (*throwp); 3813 SvREFCNT_dec (*exceptionp);
3027 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3814 SvGETMAGIC (exception);
3815 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3816
3817 api_ready (aTHX_ self);
3028} 3818}
3029 3819
3030void 3820void
3031api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3821api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3032 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
… …
3083 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3873 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3084 3874
3085 SV *tmp = *src; *src = *dst; *dst = tmp; 3875 SV *tmp = *src; *src = *dst; *dst = tmp;
3086 } 3876 }
3087 3877
3878void
3879cancel (Coro::State self)
3880 CODE:
3881 coro_state_destroy (aTHX_ self);
3882
3883SV *
3884enable_times (int enabled = enable_times)
3885 CODE:
3886{
3887 RETVAL = boolSV (enable_times);
3888
3889 if (enabled != enable_times)
3890 {
3891 enable_times = enabled;
3892
3893 coro_times_update ();
3894 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3895 }
3896}
3897 OUTPUT:
3898 RETVAL
3899
3900void
3901times (Coro::State self)
3902 PPCODE:
3903{
3904 struct coro *current = SvSTATE (coro_current);
3905
3906 if (ecb_expect_false (current == self))
3907 {
3908 coro_times_update ();
3909 coro_times_add (SvSTATE (coro_current));
3910 }
3911
3912 EXTEND (SP, 2);
3913 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3914 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3915
3916 if (ecb_expect_false (current == self))
3917 coro_times_sub (SvSTATE (coro_current));
3918}
3919
3920void
3921swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3922 CODE:
3923{
3924 struct coro *current = SvSTATE_current;
3925
3926 if (current == coro)
3927 SWAP_SVS (current);
3928
3929 if (!coro->swap_sv)
3930 coro->swap_sv = newAV ();
3931
3932 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3933 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3934
3935 if (current == coro)
3936 SWAP_SVS (current);
3937}
3938
3088 3939
3089MODULE = Coro::State PACKAGE = Coro 3940MODULE = Coro::State PACKAGE = Coro
3090 3941
3091BOOT: 3942BOOT:
3092{ 3943{
3093 int i;
3094
3095 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3096 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3097 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3946 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); 3947 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); 3948 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3101 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3949 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3102 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3950 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3951 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3103 3952
3104 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3953 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); 3954 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); 3955 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); 3956 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3108 3957
3109 coro_stash = gv_stashpv ("Coro", TRUE); 3958 coro_stash = gv_stashpv ("Coro", TRUE);
3110 3959
3111 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3960 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3112 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3961 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3113 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3962 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3114 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3963 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3115 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3964 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3116 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3965 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 3966
3121 { 3967 {
3122 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3968 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3123 3969
3124 coroapi.schedule = api_schedule; 3970 coroapi.schedule = api_schedule;
… …
3128 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3129 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3130 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3131 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3132 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3133 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3134 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3135 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3136 } 3986 }
3137} 3987}
3138 3988
3989SV *
3990async (...)
3991 PROTOTYPE: &@
3992 CODE:
3993 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3994 api_ready (aTHX_ RETVAL);
3995 OUTPUT:
3996 RETVAL
3997
3998void
3999_destroy (Coro::State coro)
4000 CODE:
4001 /* used by the manager thread */
4002 coro_state_destroy (aTHX_ coro);
4003
4004void
4005on_destroy (Coro::State coro, SV *cb)
4006 CODE:
4007 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4008
4009void
4010join (...)
4011 CODE:
4012 CORO_EXECUTE_SLF_XS (slf_init_join);
4013
3139void 4014void
3140terminate (...) 4015terminate (...)
3141 CODE: 4016 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4017 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3143 4018
3144void 4019void
4020cancel (...)
4021 CODE:
4022 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4023
4024int
4025safe_cancel (Coro::State self, ...)
4026 C_ARGS: aTHX_ self, &ST (1), items - 1
4027
4028void
3145schedule (...) 4029schedule (...)
3146 CODE: 4030 CODE:
3147 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4031 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3148 4032
3149void 4033void
… …
3165cede_notself (...) 4049cede_notself (...)
3166 CODE: 4050 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4051 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3168 4052
3169void 4053void
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) 4054_set_current (SV *current)
3177 PROTOTYPE: $ 4055 PROTOTYPE: $
3178 CODE: 4056 CODE:
3179 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3180 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3181 4059
3182void 4060void
3183_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3184 PROTOTYPE: $ 4062 PROTOTYPE: $
3185 CODE: 4063 CODE:
3186 SvREFCNT_dec (coro_readyhook); 4064 SvREFCNT_dec (coro_readyhook);
4065 SvGETMAGIC (hook);
4066 if (SvOK (hook))
4067 {
3187 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4068 coro_readyhook = newSVsv (hook);
4069 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4070 }
4071 else
4072 {
4073 coro_readyhook = 0;
4074 CORO_READYHOOK = 0;
4075 }
3188 4076
3189int 4077int
3190prio (Coro::State coro, int newprio = 0) 4078prio (Coro::State coro, int newprio = 0)
3191 PROTOTYPE: $;$ 4079 PROTOTYPE: $;$
3192 ALIAS: 4080 ALIAS:
… …
3198 if (items > 1) 4086 if (items > 1)
3199 { 4087 {
3200 if (ix) 4088 if (ix)
3201 newprio = coro->prio - newprio; 4089 newprio = coro->prio - newprio;
3202 4090
3203 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4091 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3204 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4092 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3205 4093
3206 coro->prio = newprio; 4094 coro->prio = newprio;
3207 } 4095 }
3208} 4096}
3209 OUTPUT: 4097 OUTPUT:
… …
3224 RETVAL = coro_nready; 4112 RETVAL = coro_nready;
3225 OUTPUT: 4113 OUTPUT:
3226 RETVAL 4114 RETVAL
3227 4115
3228void 4116void
4117suspend (Coro::State self)
4118 PROTOTYPE: $
4119 CODE:
4120 self->flags |= CF_SUSPENDED;
4121
4122void
4123resume (Coro::State self)
4124 PROTOTYPE: $
4125 CODE:
4126 self->flags &= ~CF_SUSPENDED;
4127
4128void
3229_pool_handler (...) 4129_pool_handler (...)
3230 CODE: 4130 CODE:
3231 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4131 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3232 4132
3233void 4133void
… …
3244 for (i = 1; i < items; ++i) 4144 for (i = 1; i < items; ++i)
3245 av_push (av, SvREFCNT_inc_NN (ST (i))); 4145 av_push (av, SvREFCNT_inc_NN (ST (i)));
3246 4146
3247 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3248 { 4148 {
3249 PUSHMARK (SP); 4149 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)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4151 SvREFCNT_dec_NN (sv);
3258 } 4152 }
3259 4153
3260 { 4154 {
3261 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3262 4156
… …
3269 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3270 4164
3271 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3272 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3273 else 4167 else
3274 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3275} 4169}
3276 4170
3277SV * 4171SV *
3278rouse_cb () 4172rouse_cb ()
3279 PROTOTYPE: 4173 PROTOTYPE:
… …
3286rouse_wait (...) 4180rouse_wait (...)
3287 PROTOTYPE: ;$ 4181 PROTOTYPE: ;$
3288 PPCODE: 4182 PPCODE:
3289 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4183 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3290 4184
4185void
4186on_enter (SV *block)
4187 ALIAS:
4188 on_leave = 1
4189 PROTOTYPE: &
4190 CODE:
4191{
4192 struct coro *coro = SvSTATE_current;
4193 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4194
4195 block = s_get_cv_croak (block);
4196
4197 if (!*avp)
4198 *avp = newAV ();
4199
4200 av_push (*avp, SvREFCNT_inc (block));
4201
4202 if (!ix)
4203 on_enterleave_call (aTHX_ block);
4204
4205 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4206 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4207 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4208}
4209
3291 4210
3292MODULE = Coro::State PACKAGE = PerlIO::cede 4211MODULE = Coro::State PACKAGE = PerlIO::cede
3293 4212
3294BOOT: 4213BOOT:
3295 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4214 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3298MODULE = Coro::State PACKAGE = Coro::Semaphore 4217MODULE = Coro::State PACKAGE = Coro::Semaphore
3299 4218
3300SV * 4219SV *
3301new (SV *klass, SV *count = 0) 4220new (SV *klass, SV *count = 0)
3302 CODE: 4221 CODE:
4222{
4223 int semcnt = 1;
4224
4225 if (count)
4226 {
4227 SvGETMAGIC (count);
4228
4229 if (SvOK (count))
4230 semcnt = SvIV (count);
4231 }
4232
3303 RETVAL = sv_bless ( 4233 RETVAL = sv_bless (
3304 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4234 coro_waitarray_new (aTHX_ semcnt),
3305 GvSTASH (CvGV (cv)) 4235 GvSTASH (CvGV (cv))
3306 ); 4236 );
4237}
3307 OUTPUT: 4238 OUTPUT:
3308 RETVAL 4239 RETVAL
3309 4240
3310# helper for Coro::Channel 4241# helper for Coro::Channel and others
3311SV * 4242SV *
3312_alloc (int count) 4243_alloc (int count)
3313 CODE: 4244 CODE:
3314 RETVAL = coro_waitarray_new (aTHX_ count); 4245 RETVAL = coro_waitarray_new (aTHX_ count);
3315 OUTPUT: 4246 OUTPUT:
… …
3357 XSRETURN_NO; 4288 XSRETURN_NO;
3358} 4289}
3359 4290
3360void 4291void
3361waiters (SV *self) 4292waiters (SV *self)
3362 PPCODE: 4293 PPCODE:
3363{ 4294{
3364 AV *av = (AV *)SvRV (self); 4295 AV *av = (AV *)SvRV (self);
3365 int wcount = AvFILLp (av) + 1 - 1; 4296 int wcount = AvFILLp (av) + 1 - 1;
3366 4297
3367 if (GIMME_V == G_SCALAR) 4298 if (GIMME_V == G_SCALAR)
… …
3373 for (i = 1; i <= wcount; ++i) 4304 for (i = 1; i <= wcount; ++i)
3374 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4305 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3375 } 4306 }
3376} 4307}
3377 4308
4309MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4310
4311void
4312_may_delete (SV *sem, int count, unsigned int extra_refs)
4313 PPCODE:
4314{
4315 AV *av = (AV *)SvRV (sem);
4316
4317 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4318 && AvFILLp (av) == 0 /* no waiters, just count */
4319 && SvIV (AvARRAY (av)[0]) == count)
4320 XSRETURN_YES;
4321
4322 XSRETURN_NO;
4323}
4324
3378MODULE = Coro::State PACKAGE = Coro::Signal 4325MODULE = Coro::State PACKAGE = Coro::Signal
3379 4326
3380SV * 4327SV *
3381new (SV *klass) 4328new (SV *klass)
3382 CODE: 4329 CODE:
… …
3394 4341
3395void 4342void
3396broadcast (SV *self) 4343broadcast (SV *self)
3397 CODE: 4344 CODE:
3398{ 4345{
3399 AV *av = (AV *)SvRV (self); 4346 AV *av = (AV *)SvRV (self);
3400 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4347 coro_signal_wake (aTHX_ av, AvFILLp (av));
3401} 4348}
3402 4349
3403void 4350void
3404send (SV *self) 4351send (SV *self)
… …
3412 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4359 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3413} 4360}
3414 4361
3415IV 4362IV
3416awaited (SV *self) 4363awaited (SV *self)
3417 CODE: 4364 CODE:
3418 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4365 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3419 OUTPUT: 4366 OUTPUT:
3420 RETVAL 4367 RETVAL
3421 4368
3422 4369
… …
3427 4374
3428void 4375void
3429_schedule (...) 4376_schedule (...)
3430 CODE: 4377 CODE:
3431{ 4378{
3432 static int incede; 4379 static int incede;
3433 4380
3434 api_cede_notself (aTHX); 4381 api_cede_notself (aTHX);
3435 4382
3436 ++incede; 4383 ++incede;
3437 while (coro_nready >= incede && api_cede (aTHX)) 4384 while (coro_nready >= incede && api_cede (aTHX))
… …
3453 4400
3454void 4401void
3455_register (char *target, char *proto, SV *req) 4402_register (char *target, char *proto, SV *req)
3456 CODE: 4403 CODE:
3457{ 4404{
3458 CV *req_cv = coro_sv_2cv (aTHX_ req); 4405 SV *req_cv = s_get_cv_croak (req);
3459 /* newXSproto doesn't return the CV on 5.8 */ 4406 /* newXSproto doesn't return the CV on 5.8 */
3460 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4407 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3461 sv_setpv ((SV *)slf_cv, proto); 4408 sv_setpv ((SV *)slf_cv, proto);
3462 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4409 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3463} 4410}
3464 4411
4412MODULE = Coro::State PACKAGE = Coro::Select
4413
4414void
4415patch_pp_sselect ()
4416 CODE:
4417 if (!coro_old_pp_sselect)
4418 {
4419 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4420 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4421 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4422 }
4423
4424void
4425unpatch_pp_sselect ()
4426 CODE:
4427 if (coro_old_pp_sselect)
4428 {
4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4430 coro_old_pp_sselect = 0;
4431 }
4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

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