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

Diff Legend

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