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.359 by root, Mon Jun 29 05:07:19 2009 UTC vs.
Revision 1.447 by root, Tue Oct 14 21:53:32 2014 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
18# undef setjmp 56# undef setjmp
19# undef longjmp 57# undef longjmp
20# undef _exit 58# undef _exit
21# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
22#else 60#else
23# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
24#endif 62#endif
25 63
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 */ 64/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
55 66
56#define PERL_VERSION_ATLEAST(a,b,c) \ 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 68# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 69#endif
122 70
123/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
136#endif 84#endif
137 85
138#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
139 87
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 88#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
157 90
158#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
159# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 103# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 104# endif
172#endif 105#endif
173 106
174static double (*nvtime)(); /* so why doesn't it take void? */ 107static double (*nvtime)(); /* so why doesn't it take void? */
108static void (*u2time)(pTHX_ UV ret[2]);
175 109
176/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
179 114
180static U32 cctx_gen; 115static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
200static SV *sv_pool_size; 135static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 136static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 137static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 138static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 139static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 140
207/* Coro::AnyEvent */ 141/* Coro::AnyEvent */
208static SV *sv_activity; 142static SV *sv_activity;
209 143
210/* enable processtime/realtime profiling */ 144/* enable processtime/realtime profiling */
211static char profile_times; 145static char enable_times;
212typedef U32 coro_ts[2]; 146typedef U32 coro_ts[2];
147static coro_ts time_real, time_cpu;
148static char times_valid;
213 149
214static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
215static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
216 152
217enum { 153enum
154{
218 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
219 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
220 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
221 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
222 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
227typedef struct coro_cctx 164typedef struct coro_cctx
228{ 165{
229 struct coro_cctx *next; 166 struct coro_cctx *next;
230 167
231 /* the stack */ 168 /* the stack */
232 void *sptr; 169 struct coro_stack stack;
233 size_t ssize;
234 170
235 /* cpu state */ 171 /* cpu state */
236 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
237 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
238 JMPENV *top_env; 176 JMPENV *top_env;
239 coro_context cctx; 177 coro_context cctx;
240 178
241 U32 gen; 179 U32 gen;
242#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
243 int valgrind_id; 181 int valgrind_id;
244#endif 182#endif
245 unsigned char flags; 183 unsigned char flags;
246} coro_cctx; 184} coro_cctx;
247 185
248coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
249 187
250/*****************************************************************************/ 188/*****************************************************************************/
251 189
190static MGVTBL coro_state_vtbl;
191
252enum { 192enum
193{
253 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
254 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
255 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
256 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
257 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
258}; 200};
259 201
260/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
261typedef struct 203typedef struct
262{ 204{
263 SV *defsv;
264 AV *defav;
265 SV *errsv;
266 SV *irsgv;
267 HV *hinthv;
268#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
269# include "state.h" 206 #include "state.h"
270#undef VAR
271} perl_slots; 207} perl_slots;
272 208
209/* how many context stack entries do we need for perl_slots */
273#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
274 211
275/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
276struct coro { 213struct coro
214{
277 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
278 coro_cctx *cctx; 216 coro_cctx *cctx;
279 217
280 /* ready queue */ 218 /* ready queue */
281 struct coro *next_ready; 219 struct coro *next_ready;
… …
283 /* state data */ 221 /* state data */
284 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
285 AV *mainstack; 223 AV *mainstack;
286 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
287 225
288 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
289 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
290 int refcnt; /* coroutines are refcounted, yes */
291 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
292 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
293 void (*on_destroy)(pTHX_ struct coro *coro);
294 230
295 /* statistics */ 231 /* statistics */
296 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
297 233
298 /* coro process data */ 234 /* coro process data */
299 int prio; 235 int prio;
300 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
301 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
302 240
303 /* async_pool */ 241 /* async_pool */
304 SV *saved_deffh; 242 SV *saved_deffh;
305 SV *invoke_cb; 243 SV *invoke_cb;
306 AV *invoke_av; 244 AV *invoke_av;
307 245
308 /* on_enter/on_leave */ 246 /* on_enter/on_leave */
309 AV *on_enter; 247 AV *on_enter;
310 AV *on_leave; 248 AV *on_leave;
311 249
250 /* swap_sv */
251 AV *swap_sv;
252
253 /* times */
254 coro_ts t_cpu, t_real;
255
312 /* linked list */ 256 /* linked list */
313 struct coro *next, *prev; 257 struct coro *next, *prev;
314}; 258};
315 259
316typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
317typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
318 262
319/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
320/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
321/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
322static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
323 267
324/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
325 269
326#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
332 276
333/* for Coro.pm */ 277/* for Coro.pm */
334static SV *coro_current; 278static SV *coro_current;
335static SV *coro_readyhook; 279static SV *coro_readyhook;
336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
337static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
338static struct coro *coro_first; 282static struct coro *coro_first;
339#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
340 284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
307
308/** Coro::Select ************************************************************/
309
310static OP *(*coro_old_pp_sselect) (pTHX);
311static SV *coro_select_select;
312
313/* horrible hack, but if it works... */
314static OP *
315coro_pp_sselect (pTHX)
316{
317 dSP;
318 PUSHMARK (SP - 4); /* fake argument list */
319 XPUSHs (coro_select_select);
320 PUTBACK;
321
322 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
323 PL_op->op_flags |= OPf_STACKED;
324 PL_op->op_private = 0;
325 return PL_ppaddr [OP_ENTERSUB](aTHX);
326}
327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332ecb_inline void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342ecb_inline double
343coro_nvtime (void)
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351ecb_inline void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360ecb_inline void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
379
341/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
342 381
343static SV * 382static SV * ecb_noinline
344coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
345{ 384{
346#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
347 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
348 get_sv (name, create); 387 get_sv (name, create);
349#endif 388#endif
350 return get_sv (name, create); 389 return get_sv (name, create);
351} 390}
352 391
353static AV * 392static AV * ecb_noinline
354coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
355{ 394{
356#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
357 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
358 get_av (name, create); 397 get_av (name, create);
359#endif 398#endif
360 return get_av (name, create); 399 return get_av (name, create);
361} 400}
362 401
363static HV * 402static HV * ecb_noinline
364coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
365{ 404{
366#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
367 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
368 get_hv (name, create); 407 get_hv (name, create);
369#endif 408#endif
370 return get_hv (name, create); 409 return get_hv (name, create);
371} 410}
372 411
373/* may croak */ 412ecb_inline void
374INLINE CV * 413coro_times_update (void)
375coro_sv_2cv (pTHX_ SV *sv)
376{ 414{
377 HV *st; 415#ifdef coro_clock_gettime
378 GV *gvp; 416 struct timespec ts;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380 417
381 if (!cv) 418 ts.tv_sec = ts.tv_nsec = 0;
382 croak ("code reference expected"); 419 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
420 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
383 421
384 return cv; 422 ts.tv_sec = ts.tv_nsec = 0;
423 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
424 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
425#else
426 dTHX;
427 UV tv[2];
428
429 u2time (aTHX_ tv);
430 time_real [0] = tv [0];
431 time_real [1] = tv [1] * 1000;
432#endif
433}
434
435ecb_inline void
436coro_times_add (struct coro *c)
437{
438 c->t_real [1] += time_real [1];
439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
440 c->t_real [0] += time_real [0];
441
442 c->t_cpu [1] += time_cpu [1];
443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
444 c->t_cpu [0] += time_cpu [0];
445}
446
447ecb_inline void
448coro_times_sub (struct coro *c)
449{
450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
451 c->t_real [1] -= time_real [1];
452 c->t_real [0] -= time_real [0];
453
454 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
455 c->t_cpu [1] -= time_cpu [1];
456 c->t_cpu [0] -= time_cpu [0];
385} 457}
386 458
387/*****************************************************************************/ 459/*****************************************************************************/
388/* magic glue */ 460/* magic glue */
389 461
390#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 464
393#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 468 : mg_find (sv, type))
397 469
398#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 473 : 0)
402 474
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 477
406INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
407SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
408{ 495{
409 HV *stash;
410 MAGIC *mg; 496 MAGIC *mg;
411 497
412 if (SvROK (coro)) 498 if (SvROK (coro))
413 coro = SvRV (coro); 499 coro = SvRV (coro);
414 500
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
416 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
417 504
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
428} 506}
429 507
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 509
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 513
436/*****************************************************************************/ 514/*****************************************************************************/
437/* padlist management and caching */ 515/* padlist management and caching */
438 516
439static AV * 517ecb_inline PADLIST *
440coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
441{ 519{
442 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
444 524
445 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
446 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
447#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
449#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
451#endif 554#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
453 --AvFILLp (padlist);
454 555
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
456 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
457 560
458 return newpadlist; 561 return newpadlist;
459} 562}
460 563
461static void 564ecb_inline void
462free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
463{ 566{
464 /* may be during global destruction */ 567 /* may be during global destruction */
465 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
466 { 569 {
467 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
468 571
469 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
470 { 573 {
471 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av);
474 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
475 while (j >= 0) 581 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 583
478 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
480 } 587 }
481 588
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
483 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
484 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
486 } 599 }
487} 600}
488 601
489static int 602static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 604{
492 AV *padlist; 605 PADLIST *padlist;
493 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
494 608
495 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
497 return; 611 return 0;
498 612
499 /* casting is fun. */ 613 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 615
505 return 0; 616 return 0;
506} 617}
507 618
508static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 620 0, 0, 0, 0,
510 coro_cv_free 621 coro_cv_free
511}; 622};
512 623
513/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
514static void 625ecb_inline void
515get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
516{ 627{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 629 size_t *lenp;
519 630
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 633 else
523 { 634 {
524#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 644#endif
534 } 645 }
535} 646}
536 647
537static void 648ecb_inline void
538put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
539{ 650{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 652
543 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
545 663
546 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
547
548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1);
550
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 665}
553 666
554/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
707/* swap sv heads, at least logically */
708static void
709swap_svs (pTHX_ Coro__State c)
710{
711 int i;
712
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715}
716
717#define SWAP_SVS(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro))
555 720
556static void 721static void
557on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
558 723
559static void 724static void
… …
562 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
563 c->slot = 0; 728 c->slot = 0;
564 729
565 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
566 731
567 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 734#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 736 #include "state.h"
575 #undef VAR 737#endif
576 738
577 { 739 {
578 dSP; 740 dSP;
579 741
580 CV *cv; 742 CV *cv;
581 743
582 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
584 { 746 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 750 }
589 751
590 PUTBACK; 752 PUTBACK;
591 } 753 }
592 754
593 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 756 CORO_THROW = c->except;
595 757
758 if (ecb_expect_false (enable_times))
759 {
760 if (ecb_expect_false (!times_valid))
761 coro_times_update ();
762
763 coro_times_sub (c);
764 }
765
596 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
597 { 767 {
598 int i; 768 int i;
599 769
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
602 } 772 }
773
774 SWAP_SVS (c);
603} 775}
604 776
605static void 777static void
606save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
607{ 779{
780 SWAP_SVS (c);
781
608 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
609 { 783 {
610 int i; 784 int i;
611 785
612 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
788 }
789
790 times_valid = 0;
791
792 if (ecb_expect_false (enable_times))
793 {
794 coro_times_update (); times_valid = 1;
795 coro_times_add (c);
614 } 796 }
615 797
616 c->except = CORO_THROW; 798 c->except = CORO_THROW;
617 c->slf_frame = slf_frame; 799 c->slf_frame = slf_frame;
618 800
… …
629 811
630 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
631 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
632 for (;;) 814 for (;;)
633 { 815 {
634 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
635 { 817 {
636 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
637 819
638 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
639 { 821 {
640 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
641 823
642 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
643 { 825 {
644 EXTEND (SP, 3); 826 EXTEND (SP, 3);
645 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
646 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
647 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
650 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
651 } 833 }
652 } 834 }
653 } 835 }
654 836
655 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
656 break; 838 break;
657 839
658 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
659 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
660 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
662 844
663 PUTBACK; 845 PUTBACK;
664 } 846 }
665 847
666 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
667 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
668 if (SLOT_COUNT >= 1) CXINC;
669 if (SLOT_COUNT >= 2) CXINC;
670 if (SLOT_COUNT >= 3) CXINC;
671 { 850 {
672 int i; 851 unsigned int i;
852
673 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
674 CXINC; 854 CXINC;
675 } 855
676 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
677 858
678 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
679 860
680 { 861 {
681 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
682 863
683 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
684 slot->defsv = DEFSV; 865 save_perl_slots (slot);
685 slot->errsv = ERRSV; 866#else
686 slot->irsgv = GvSV (irsgv);
687 slot->hinthv = GvHV (PL_hintgv);
688
689 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
690 # include "state.h" 868 #include "state.h"
691 #undef VAR 869#endif
692 } 870 }
693} 871}
694 872
695/* 873/*
696 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
702# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
703#else 881#else
704static void 882static void
705coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
706{ 884{
707 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
708 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
709 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
710 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
711 889
712 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
727#endif 905#endif
728 906
729 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
730 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
731 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
732 913
733 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
734 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
735 PL_savestack_max = 24; 916 PL_savestack_max = 24;
736 917
… …
764 } 945 }
765 946
766 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
767 Safefree (PL_markstack); 948 Safefree (PL_markstack);
768 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
769 Safefree (PL_savestack); 953 Safefree (PL_savestack);
770#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
771 Safefree (PL_retstack); 955 Safefree (PL_retstack);
772#endif 956#endif
773} 957}
… …
819#endif 1003#endif
820 1004
821/* 1005/*
822 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
823 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
824 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
825 * readback here. 1009 * we just provide our own readback here.
826 */ 1010 */
827static int 1011static int ecb_cold
828coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
829{ 1013{
830 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
831 1015
832 if (*s == '_') 1016 if (*s == '_')
833 { 1017 {
834 SV **svp = 0; 1018 SV **svp = 0;
835 1019
836 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
837 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
838 1022
839 if (svp) 1023 if (svp)
840 { 1024 {
841 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
842 return 0; 1035 return 0;
843 } 1036 }
844 } 1037 }
845 1038
846 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
847} 1040}
848 1041
849static int 1042static int ecb_cold
850coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
851{ 1044{
852 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
853 1046
854 if (*s == '_') 1047 if (*s == '_')
… …
868 } 1061 }
869 1062
870 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
871} 1064}
872 1065
873static int 1066static int ecb_cold
874coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
875{ 1068{
876 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
877 1070
878 if (*s == '_') 1071 if (*s == '_')
… …
911slf_check_repeat (pTHX_ struct CoroSLF *frame) 1104slf_check_repeat (pTHX_ struct CoroSLF *frame)
912{ 1105{
913 return 1; 1106 return 1;
914} 1107}
915 1108
916static UNOP coro_setup_op; 1109static UNOP init_perl_op;
917 1110
918static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
919coro_setup (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
920{ 1113{
921 /* 1114 /*
922 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
923 */ 1116 */
924 coro_init_stacks (aTHX); 1117 coro_init_stacks (aTHX);
… …
931 PL_comppad_name_fill = 0; 1124 PL_comppad_name_fill = 0;
932 PL_comppad_name_floor = 0; 1125 PL_comppad_name_floor = 0;
933 PL_curpm = 0; 1126 PL_curpm = 0;
934 PL_curpad = 0; 1127 PL_curpad = 0;
935 PL_localizing = 0; 1128 PL_localizing = 0;
936 PL_dirty = 0;
937 PL_restartop = 0; 1129 PL_restartop = 0;
938#if PERL_VERSION_ATLEAST (5,10,0) 1130#if PERL_VERSION_ATLEAST (5,10,0)
939 PL_parser = 0; 1131 PL_parser = 0;
940#endif 1132#endif
941 PL_hints = 0; 1133 PL_hints = 0;
942 1134
943 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
944 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
945 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
946 1138
947 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
948 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
949 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
950 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
951 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = newHV ();
1144#if PERL_VERSION_ATLEAST (5,10,0)
1145 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1146#endif
952 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
953 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
954 1149
955 { 1150 {
956 dSP; 1151 dSP;
… …
971 /* this newly created coroutine might be run on an existing cctx which most 1166 /* this newly created coroutine might be run on an existing cctx which most
972 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1167 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
973 */ 1168 */
974 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1169 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
975 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1170 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1171 slf_frame.destroy = 0;
976 1172
977 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1173 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
978 coro_setup_op.op_next = PL_op; 1174 init_perl_op.op_next = PL_op;
979 coro_setup_op.op_type = OP_ENTERSUB; 1175 init_perl_op.op_type = OP_ENTERSUB;
980 coro_setup_op.op_ppaddr = pp_slf; 1176 init_perl_op.op_ppaddr = pp_slf;
981 /* no flags etc. required, as an init function won't be called */ 1177 /* no flags etc. required, as an init function won't be called */
982 1178
983 PL_op = (OP *)&coro_setup_op; 1179 PL_op = (OP *)&init_perl_op;
984 1180
985 /* copy throw, in case it was set before coro_setup */ 1181 /* copy throw, in case it was set before init_perl */
986 CORO_THROW = coro->except; 1182 CORO_THROW = coro->except;
1183
1184 SWAP_SVS (coro);
1185
1186 if (ecb_expect_false (enable_times))
1187 {
1188 coro_times_update ();
1189 coro_times_sub (coro);
1190 }
987} 1191}
988 1192
989static void 1193static void
990coro_unwind_stacks (pTHX) 1194coro_unwind_stacks (pTHX)
991{ 1195{
… …
1006 dounwind (-1); 1210 dounwind (-1);
1007 } 1211 }
1008} 1212}
1009 1213
1010static void 1214static void
1011coro_destruct_perl (pTHX_ struct coro *coro) 1215destroy_perl (pTHX_ struct coro *coro)
1012{ 1216{
1013 SV *svf [9]; 1217 SV *svf [9];
1014 1218
1015 { 1219 {
1220 SV *old_current = SvRV (coro_current);
1016 struct coro *current = SvSTATE_current; 1221 struct coro *current = SvSTATE (old_current);
1017 1222
1018 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1223 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1019 1224
1020 save_perl (aTHX_ current); 1225 save_perl (aTHX_ current);
1226
1227 /* this will cause transfer_check to croak on block*/
1228 SvRV_set (coro_current, (SV *)coro->hv);
1229
1021 load_perl (aTHX_ coro); 1230 load_perl (aTHX_ coro);
1022 1231
1023 coro_unwind_stacks (aTHX); 1232 coro_unwind_stacks (aTHX);
1233
1234 /* restore swapped sv's */
1235 SWAP_SVS (coro);
1236
1024 coro_destruct_stacks (aTHX); 1237 coro_destruct_stacks (aTHX);
1025 1238
1026 // now save some sv's to be free'd later 1239 /* now save some sv's to be free'd later */
1027 svf [0] = GvSV (PL_defgv); 1240 svf [0] = GvSV (PL_defgv);
1028 svf [1] = (SV *)GvAV (PL_defgv); 1241 svf [1] = (SV *)GvAV (PL_defgv);
1029 svf [2] = GvSV (PL_errgv); 1242 svf [2] = GvSV (PL_errgv);
1030 svf [3] = (SV *)PL_defoutgv; 1243 svf [3] = (SV *)PL_defoutgv;
1031 svf [4] = PL_rs; 1244 svf [4] = PL_rs;
… …
1033 svf [6] = (SV *)GvHV (PL_hintgv); 1246 svf [6] = (SV *)GvHV (PL_hintgv);
1034 svf [7] = PL_diehook; 1247 svf [7] = PL_diehook;
1035 svf [8] = PL_warnhook; 1248 svf [8] = PL_warnhook;
1036 assert (9 == sizeof (svf) / sizeof (*svf)); 1249 assert (9 == sizeof (svf) / sizeof (*svf));
1037 1250
1251 SvRV_set (coro_current, old_current);
1252
1038 load_perl (aTHX_ current); 1253 load_perl (aTHX_ current);
1039 } 1254 }
1040 1255
1041 { 1256 {
1042 int i; 1257 unsigned int i;
1043 1258
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1259 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]); 1260 SvREFCNT_dec (svf [i]);
1046 1261
1047 SvREFCNT_dec (coro->saved_deffh); 1262 SvREFCNT_dec (coro->saved_deffh);
… …
1049 SvREFCNT_dec (coro->invoke_cb); 1264 SvREFCNT_dec (coro->invoke_cb);
1050 SvREFCNT_dec (coro->invoke_av); 1265 SvREFCNT_dec (coro->invoke_av);
1051 } 1266 }
1052} 1267}
1053 1268
1054INLINE void 1269ecb_inline void
1055free_coro_mortal (pTHX) 1270free_coro_mortal (pTHX)
1056{ 1271{
1057 if (expect_true (coro_mortal)) 1272 if (ecb_expect_true (coro_mortal))
1058 { 1273 {
1059 SvREFCNT_dec (coro_mortal); 1274 SvREFCNT_dec ((SV *)coro_mortal);
1060 coro_mortal = 0; 1275 coro_mortal = 0;
1061 } 1276 }
1062} 1277}
1063 1278
1064static int 1279static int
… …
1197 1412
1198 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1413 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1199} 1414}
1200 1415
1201/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1416/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1202static void NOINLINE 1417static void ecb_noinline
1203cctx_prepare (pTHX) 1418cctx_prepare (pTHX)
1204{ 1419{
1205 PL_top_env = &PL_start_env; 1420 PL_top_env = &PL_start_env;
1206 1421
1207 if (cctx_current->flags & CC_TRACE) 1422 if (cctx_current->flags & CC_TRACE)
… …
1218 slf_frame.prepare = slf_prepare_set_stacklevel; 1433 slf_frame.prepare = slf_prepare_set_stacklevel;
1219 slf_frame.check = slf_check_set_stacklevel; 1434 slf_frame.check = slf_check_set_stacklevel;
1220} 1435}
1221 1436
1222/* the tail of transfer: execute stuff we can only do after a transfer */ 1437/* the tail of transfer: execute stuff we can only do after a transfer */
1223INLINE void 1438ecb_inline void
1224transfer_tail (pTHX) 1439transfer_tail (pTHX)
1225{ 1440{
1226 free_coro_mortal (aTHX); 1441 free_coro_mortal (aTHX);
1442}
1443
1444/* try to exit the same way perl's main function would do */
1445/* we do not bother resetting the environment or other things *7
1446/* that are not, uhm, essential */
1447/* this obviously also doesn't work when perl is embedded */
1448static void ecb_noinline ecb_cold
1449perlish_exit (pTHX)
1450{
1451 int exitstatus = perl_destruct (PL_curinterp);
1452 perl_free (PL_curinterp);
1453 exit (exitstatus);
1227} 1454}
1228 1455
1229/* 1456/*
1230 * this is a _very_ stripped down perl interpreter ;) 1457 * this is a _very_ stripped down perl interpreter ;)
1231 */ 1458 */
… …
1253 /* somebody or something will hit me for both perl_run and PL_restartop */ 1480 /* somebody or something will hit me for both perl_run and PL_restartop */
1254 PL_restartop = PL_op; 1481 PL_restartop = PL_op;
1255 perl_run (PL_curinterp); 1482 perl_run (PL_curinterp);
1256 /* 1483 /*
1257 * Unfortunately, there is no way to get at the return values of the 1484 * Unfortunately, there is no way to get at the return values of the
1258 * coro body here, as perl_run destroys these 1485 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1486 * runtime errors here, as this is just a random interpreter, not a thread.
1259 */ 1487 */
1260 1488
1261 /* 1489 /*
1262 * If perl-run returns we assume exit() was being called or the coro 1490 * If perl-run returns we assume exit() was being called or the coro
1263 * fell off the end, which seems to be the only valid (non-bug) 1491 * fell off the end, which seems to be the only valid (non-bug)
1264 * reason for perl_run to return. We try to exit by jumping to the 1492 * reason for perl_run to return. We try to mimic whatever perl is normally
1265 * bootstrap-time "top" top_env, as we cannot restore the "main" 1493 * doing in that case. YMMV.
1266 * coroutine as Coro has no such concept.
1267 * This actually isn't valid with the pthread backend, but OSes requiring
1268 * that backend are too broken to do it in a standards-compliant way.
1269 */ 1494 */
1270 PL_top_env = main_top_env; 1495 perlish_exit (aTHX);
1271 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1272 } 1496 }
1273} 1497}
1274 1498
1275static coro_cctx * 1499static coro_cctx *
1276cctx_new () 1500cctx_new (void)
1277{ 1501{
1278 coro_cctx *cctx; 1502 coro_cctx *cctx;
1279 1503
1280 ++cctx_count; 1504 ++cctx_count;
1281 New (0, cctx, 1, coro_cctx); 1505 New (0, cctx, 1, coro_cctx);
… …
1287 return cctx; 1511 return cctx;
1288} 1512}
1289 1513
1290/* create a new cctx only suitable as source */ 1514/* create a new cctx only suitable as source */
1291static coro_cctx * 1515static coro_cctx *
1292cctx_new_empty () 1516cctx_new_empty (void)
1293{ 1517{
1294 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1295 1519
1296 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1297 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1298 1522
1299 return cctx; 1523 return cctx;
1300} 1524}
1301 1525
1302/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1303static coro_cctx * 1527static coro_cctx *
1304cctx_new_run () 1528cctx_new_run (void)
1305{ 1529{
1306 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1307 void *stack_start;
1308 size_t stack_size;
1309 1531
1310#if HAVE_MMAP 1532 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1311 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1312 /* mmap supposedly does allocate-on-write for us */
1313 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1314
1315 if (cctx->sptr != (void *)-1)
1316 {
1317 #if CORO_STACKGUARD
1318 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1319 #endif
1320 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1321 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1322 cctx->flags |= CC_MAPPED;
1323 } 1533 {
1324 else
1325#endif
1326 {
1327 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1328 New (0, cctx->sptr, cctx_stacksize, long);
1329
1330 if (!cctx->sptr)
1331 {
1332 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1333 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1334 }
1335
1336 stack_start = cctx->sptr;
1337 stack_size = cctx->ssize;
1338 } 1536 }
1339 1537
1340 #if CORO_USE_VALGRIND
1341 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1342 #endif
1343
1344 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1345 1539
1346 return cctx; 1540 return cctx;
1347} 1541}
1348 1542
1349static void 1543static void
1350cctx_destroy (coro_cctx *cctx) 1544cctx_destroy (coro_cctx *cctx)
1351{ 1545{
1352 if (!cctx) 1546 if (!cctx)
1353 return; 1547 return;
1354 1548
1355 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1356 1550
1357 --cctx_count; 1551 --cctx_count;
1358 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1359 1553
1360 /* coro_transfer creates new, empty cctx's */ 1554 coro_stack_free (&cctx->stack);
1361 if (cctx->sptr)
1362 {
1363 #if CORO_USE_VALGRIND
1364 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1365 #endif
1366
1367#if HAVE_MMAP
1368 if (cctx->flags & CC_MAPPED)
1369 munmap (cctx->sptr, cctx->ssize);
1370 else
1371#endif
1372 Safefree (cctx->sptr);
1373 }
1374 1555
1375 Safefree (cctx); 1556 Safefree (cctx);
1376} 1557}
1377 1558
1378/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
1379#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1560#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1380 1561
1381static coro_cctx * 1562static coro_cctx *
1382cctx_get (pTHX) 1563cctx_get (pTHX)
1383{ 1564{
1384 while (expect_true (cctx_first)) 1565 while (ecb_expect_true (cctx_first))
1385 { 1566 {
1386 coro_cctx *cctx = cctx_first; 1567 coro_cctx *cctx = cctx_first;
1387 cctx_first = cctx->next; 1568 cctx_first = cctx->next;
1388 --cctx_idle; 1569 --cctx_idle;
1389 1570
1390 if (expect_true (!CCTX_EXPIRED (cctx))) 1571 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1391 return cctx; 1572 return cctx;
1392 1573
1393 cctx_destroy (cctx); 1574 cctx_destroy (cctx);
1394 } 1575 }
1395 1576
… …
1397} 1578}
1398 1579
1399static void 1580static void
1400cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1401{ 1582{
1402 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1583 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1403 1584
1404 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1405 if (expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1406 { 1587 {
1407 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
1408 cctx_first = first->next; 1589 cctx_first = first->next;
1409 --cctx_idle; 1590 --cctx_idle;
1410 1591
… …
1421static void 1602static void
1422transfer_check (pTHX_ struct coro *prev, struct coro *next) 1603transfer_check (pTHX_ struct coro *prev, struct coro *next)
1423{ 1604{
1424 /* TODO: throwing up here is considered harmful */ 1605 /* TODO: throwing up here is considered harmful */
1425 1606
1426 if (expect_true (prev != next)) 1607 if (ecb_expect_true (prev != next))
1427 { 1608 {
1428 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1609 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1429 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1610 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1430 1611
1431 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1612 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1432 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1613 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1433 1614
1434#if !PERL_VERSION_ATLEAST (5,10,0) 1615#if !PERL_VERSION_ATLEAST (5,10,0)
1435 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1616 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1436 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1617 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1437#endif 1618#endif
1438 } 1619 }
1439} 1620}
1440 1621
1441/* always use the TRANSFER macro */ 1622/* always use the TRANSFER macro */
1442static void NOINLINE /* noinline so we have a fixed stackframe */ 1623static void ecb_noinline /* noinline so we have a fixed stackframe */
1443transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1624transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1444{ 1625{
1445 dSTACKLEVEL; 1626 dSTACKLEVEL;
1446 1627
1447 /* sometimes transfer is only called to set idle_sp */ 1628 /* sometimes transfer is only called to set idle_sp */
1448 if (expect_false (!prev)) 1629 if (ecb_expect_false (!prev))
1449 { 1630 {
1450 cctx_current->idle_sp = STACKLEVEL; 1631 cctx_current->idle_sp = STACKLEVEL;
1451 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1632 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1452 } 1633 }
1453 else if (expect_true (prev != next)) 1634 else if (ecb_expect_true (prev != next))
1454 { 1635 {
1455 coro_cctx *cctx_prev; 1636 coro_cctx *cctx_prev;
1456 1637
1457 if (expect_false (prev->flags & CF_NEW)) 1638 if (ecb_expect_false (prev->flags & CF_NEW))
1458 { 1639 {
1459 /* create a new empty/source context */ 1640 /* create a new empty/source context */
1460 prev->flags &= ~CF_NEW; 1641 prev->flags &= ~CF_NEW;
1461 prev->flags |= CF_RUNNING; 1642 prev->flags |= CF_RUNNING;
1462 } 1643 }
… …
1465 next->flags |= CF_RUNNING; 1646 next->flags |= CF_RUNNING;
1466 1647
1467 /* first get rid of the old state */ 1648 /* first get rid of the old state */
1468 save_perl (aTHX_ prev); 1649 save_perl (aTHX_ prev);
1469 1650
1470 if (expect_false (next->flags & CF_NEW)) 1651 if (ecb_expect_false (next->flags & CF_NEW))
1471 { 1652 {
1472 /* need to start coroutine */ 1653 /* need to start coroutine */
1473 next->flags &= ~CF_NEW; 1654 next->flags &= ~CF_NEW;
1474 /* setup coroutine call */ 1655 /* setup coroutine call */
1475 coro_setup (aTHX_ next); 1656 init_perl (aTHX_ next);
1476 } 1657 }
1477 else 1658 else
1478 load_perl (aTHX_ next); 1659 load_perl (aTHX_ next);
1479 1660
1480 /* possibly untie and reuse the cctx */ 1661 /* possibly untie and reuse the cctx */
1481 if (expect_true ( 1662 if (ecb_expect_true (
1482 cctx_current->idle_sp == STACKLEVEL 1663 cctx_current->idle_sp == STACKLEVEL
1483 && !(cctx_current->flags & CC_TRACE) 1664 && !(cctx_current->flags & CC_TRACE)
1484 && !force_cctx 1665 && !force_cctx
1485 )) 1666 ))
1486 { 1667 {
1487 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1668 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1488 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1669 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1489 1670
1490 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1671 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1491 /* without this the next cctx_get might destroy the running cctx while still in use */ 1672 /* without this the next cctx_get might destroy the running cctx while still in use */
1492 if (expect_false (CCTX_EXPIRED (cctx_current))) 1673 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1493 if (expect_true (!next->cctx)) 1674 if (ecb_expect_true (!next->cctx))
1494 next->cctx = cctx_get (aTHX); 1675 next->cctx = cctx_get (aTHX);
1495 1676
1496 cctx_put (cctx_current); 1677 cctx_put (cctx_current);
1497 } 1678 }
1498 else 1679 else
1499 prev->cctx = cctx_current; 1680 prev->cctx = cctx_current;
1500 1681
1501 ++next->usecount; 1682 ++next->usecount;
1502 1683
1503 cctx_prev = cctx_current; 1684 cctx_prev = cctx_current;
1504 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1685 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1505 1686
1506 next->cctx = 0; 1687 next->cctx = 0;
1507 1688
1508 if (expect_false (cctx_prev != cctx_current)) 1689 if (ecb_expect_false (cctx_prev != cctx_current))
1509 { 1690 {
1510 cctx_prev->top_env = PL_top_env; 1691 cctx_prev->top_env = PL_top_env;
1511 PL_top_env = cctx_current->top_env; 1692 PL_top_env = cctx_current->top_env;
1512 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1693 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1513 } 1694 }
… …
1519#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1700#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1520#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1701#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1521 1702
1522/** high level stuff ********************************************************/ 1703/** high level stuff ********************************************************/
1523 1704
1705/* this function is actually Coro, not Coro::State, but we call it from here */
1706/* because it is convenient - but it hasn't been declared yet for that reason */
1524static int 1707static void
1708coro_call_on_destroy (pTHX_ struct coro *coro);
1709
1710static void
1525coro_state_destroy (pTHX_ struct coro *coro) 1711coro_state_destroy (pTHX_ struct coro *coro)
1526{ 1712{
1527 if (coro->flags & CF_DESTROYED) 1713 if (coro->flags & CF_ZOMBIE)
1528 return 0; 1714 return;
1529 1715
1530 if (coro->on_destroy && !PL_dirty)
1531 coro->on_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1532 1717
1533 coro->flags |= CF_DESTROYED; 1718 coro->flags |= CF_ZOMBIE;
1534 1719
1535 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1536 { 1721 {
1537 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1538 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1539 --coro_nready; 1724 --coro_nready;
1540 } 1725 }
1541 else 1726 else
1542 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1727 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1728
1729 if (coro->next) coro->next->prev = coro->prev;
1730 if (coro->prev) coro->prev->next = coro->next;
1731 if (coro == coro_first) coro_first = coro->next;
1543 1732
1544 if (coro->mainstack 1733 if (coro->mainstack
1545 && coro->mainstack != main_mainstack 1734 && coro->mainstack != main_mainstack
1546 && coro->slot 1735 && coro->slot
1547 && !PL_dirty) 1736 && !PL_dirty)
1548 coro_destruct_perl (aTHX_ coro); 1737 destroy_perl (aTHX_ coro);
1549 1738
1550 cctx_destroy (coro->cctx); 1739 cctx_destroy (coro->cctx);
1551 SvREFCNT_dec (coro->startcv); 1740 SvREFCNT_dec (coro->startcv);
1552 SvREFCNT_dec (coro->args); 1741 SvREFCNT_dec (coro->args);
1742 SvREFCNT_dec (coro->swap_sv);
1553 SvREFCNT_dec (CORO_THROW); 1743 SvREFCNT_dec (CORO_THROW);
1554 1744
1555 if (coro->next) coro->next->prev = coro->prev; 1745 coro_call_on_destroy (aTHX_ coro);
1556 if (coro->prev) coro->prev->next = coro->next;
1557 if (coro == coro_first) coro_first = coro->next;
1558 1746
1559 return 1; 1747 /* more destruction mayhem in coro_state_free */
1560} 1748}
1561 1749
1562static int 1750static int
1563coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1751coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1564{ 1752{
1565 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 struct coro *coro = (struct coro *)mg->mg_ptr;
1566 mg->mg_ptr = 0; 1754 mg->mg_ptr = 0;
1567 1755
1568 coro->hv = 0;
1569
1570 if (--coro->refcnt < 0)
1571 {
1572 coro_state_destroy (aTHX_ coro); 1756 coro_state_destroy (aTHX_ coro);
1757 SvREFCNT_dec (coro->on_destroy);
1758 SvREFCNT_dec (coro->status);
1759
1573 Safefree (coro); 1760 Safefree (coro);
1574 }
1575 1761
1576 return 0; 1762 return 0;
1577} 1763}
1578 1764
1579static int 1765static int ecb_cold
1580coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1766coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1581{ 1767{
1582 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 /* called when perl clones the current process the slow way (windows process emulation) */
1583 1769 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1584 ++coro->refcnt; 1770 mg->mg_ptr = 0;
1771 mg->mg_virtual = 0;
1585 1772
1586 return 0; 1773 return 0;
1587} 1774}
1588 1775
1589static MGVTBL coro_state_vtbl = { 1776static MGVTBL coro_state_vtbl = {
… …
1612 1799
1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1800 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1614 TRANSFER (ta, 1); 1801 TRANSFER (ta, 1);
1615} 1802}
1616 1803
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1640/** Coro ********************************************************************/ 1804/** Coro ********************************************************************/
1641 1805
1642INLINE void 1806ecb_inline void
1643coro_enq (pTHX_ struct coro *coro) 1807coro_enq (pTHX_ struct coro *coro)
1644{ 1808{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1809 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1810
1647 SvREFCNT_inc_NN (coro->hv); 1811 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1813 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1814 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1815 ready [1] = coro;
1652} 1816}
1653 1817
1654INLINE struct coro * 1818ecb_inline struct coro *
1655coro_deq (pTHX) 1819coro_deq (pTHX)
1656{ 1820{
1657 int prio; 1821 int prio;
1658 1822
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1823 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1669 } 1833 }
1670 1834
1671 return 0; 1835 return 0;
1672} 1836}
1673 1837
1838static void
1839invoke_sv_ready_hook_helper (void)
1840{
1841 dTHX;
1842 dSP;
1843
1844 ENTER;
1845 SAVETMPS;
1846
1847 PUSHMARK (SP);
1848 PUTBACK;
1849 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1850
1851 FREETMPS;
1852 LEAVE;
1853}
1854
1674static int 1855static int
1675api_ready (pTHX_ SV *coro_sv) 1856api_ready (pTHX_ SV *coro_sv)
1676{ 1857{
1677 struct coro *coro;
1678 SV *sv_hook;
1679 void (*xs_hook)(void);
1680
1681 coro = SvSTATE (coro_sv); 1858 struct coro *coro = SvSTATE (coro_sv);
1682 1859
1683 if (coro->flags & CF_READY) 1860 if (coro->flags & CF_READY)
1684 return 0; 1861 return 0;
1685 1862
1686 coro->flags |= CF_READY; 1863 coro->flags |= CF_READY;
1687 1864
1688 sv_hook = coro_nready ? 0 : coro_readyhook;
1689 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1690
1691 coro_enq (aTHX_ coro); 1865 coro_enq (aTHX_ coro);
1692 ++coro_nready;
1693 1866
1694 if (sv_hook) 1867 if (!coro_nready++)
1695 { 1868 if (coroapi.readyhook)
1696 dSP; 1869 coroapi.readyhook ();
1697
1698 ENTER;
1699 SAVETMPS;
1700
1701 PUSHMARK (SP);
1702 PUTBACK;
1703 call_sv (sv_hook, G_VOID | G_DISCARD);
1704
1705 FREETMPS;
1706 LEAVE;
1707 }
1708
1709 if (xs_hook)
1710 xs_hook ();
1711 1870
1712 return 1; 1871 return 1;
1713} 1872}
1714 1873
1715static int 1874static int
… …
1717{ 1876{
1718 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1877 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1719} 1878}
1720 1879
1721/* expects to own a reference to next->hv */ 1880/* expects to own a reference to next->hv */
1722INLINE void 1881ecb_inline void
1723prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1882prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1724{ 1883{
1725 SV *prev_sv = SvRV (coro_current); 1884 SV *prev_sv = SvRV (coro_current);
1726 1885
1727 ta->prev = SvSTATE_hv (prev_sv); 1886 ta->prev = SvSTATE_hv (prev_sv);
… …
1740{ 1899{
1741 for (;;) 1900 for (;;)
1742 { 1901 {
1743 struct coro *next = coro_deq (aTHX); 1902 struct coro *next = coro_deq (aTHX);
1744 1903
1745 if (expect_true (next)) 1904 if (ecb_expect_true (next))
1746 { 1905 {
1747 /* cannot transfer to destroyed coros, skip and look for next */ 1906 /* cannot transfer to destroyed coros, skip and look for next */
1748 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1907 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1749 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1908 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1750 else 1909 else
1751 { 1910 {
1752 next->flags &= ~CF_READY; 1911 next->flags &= ~CF_READY;
1753 --coro_nready; 1912 --coro_nready;
… …
1760 { 1919 {
1761 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1762 if (SvROK (sv_idle) 1921 if (SvROK (sv_idle)
1763 && SvOBJECT (SvRV (sv_idle))) 1922 && SvOBJECT (SvRV (sv_idle)))
1764 { 1923 {
1924 if (SvRV (sv_idle) == SvRV (coro_current))
1925 {
1926 require_pv ("Carp");
1927
1928 {
1929 dSP;
1930
1931 ENTER;
1932 SAVETMPS;
1933
1934 PUSHMARK (SP);
1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1941 }
1942 }
1943
1765 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1766 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready; 1946 --coro_nready;
1768 } 1947 }
1769 else 1948 else
1770 { 1949 {
1950 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1771 dSP; 1951 dSP;
1772 1952
1773 ENTER; 1953 ENTER;
1774 SAVETMPS; 1954 SAVETMPS;
1775 1955
… …
1782 } 1962 }
1783 } 1963 }
1784 } 1964 }
1785} 1965}
1786 1966
1787INLINE void 1967ecb_inline void
1788prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1789{ 1969{
1790 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1791 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1792} 1972}
1793 1973
1794INLINE void 1974ecb_inline void
1795prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1796{ 1976{
1797 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1798 1978
1799 if (coro_nready) 1979 if (coro_nready)
… …
1829{ 2009{
1830 struct coro_transfer_args ta; 2010 struct coro_transfer_args ta;
1831 2011
1832 prepare_cede (aTHX_ &ta); 2012 prepare_cede (aTHX_ &ta);
1833 2013
1834 if (expect_true (ta.prev != ta.next)) 2014 if (ecb_expect_true (ta.prev != ta.next))
1835 { 2015 {
1836 TRANSFER (ta, 1); 2016 TRANSFER (ta, 1);
1837 return 1; 2017 return 1;
1838 } 2018 }
1839 else 2019 else
… …
1882 coro->slot->runops = RUNOPS_DEFAULT; 2062 coro->slot->runops = RUNOPS_DEFAULT;
1883 } 2063 }
1884} 2064}
1885 2065
1886static void 2066static void
2067coro_push_av (pTHX_ AV *av, I32 gimme_v)
2068{
2069 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2070 {
2071 dSP;
2072
2073 if (gimme_v == G_SCALAR)
2074 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2075 else
2076 {
2077 int i;
2078 EXTEND (SP, AvFILLp (av) + 1);
2079
2080 for (i = 0; i <= AvFILLp (av); ++i)
2081 PUSHs (AvARRAY (av)[i]);
2082 }
2083
2084 PUTBACK;
2085 }
2086}
2087
2088static void
2089coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2090{
2091 if (!coro->on_destroy)
2092 coro->on_destroy = newAV ();
2093
2094 av_push (coro->on_destroy, cb);
2095}
2096
2097static void
2098slf_destroy_join (pTHX_ struct CoroSLF *frame)
2099{
2100 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2101}
2102
2103static int
2104slf_check_join (pTHX_ struct CoroSLF *frame)
2105{
2106 struct coro *coro = (struct coro *)frame->data;
2107
2108 if (!coro->status)
2109 return 1;
2110
2111 frame->destroy = 0;
2112
2113 coro_push_av (aTHX_ coro->status, GIMME_V);
2114
2115 SvREFCNT_dec ((SV *)coro->hv);
2116
2117 return 0;
2118}
2119
2120static void
2121slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2122{
2123 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2124
2125 if (items > 1)
2126 croak ("join called with too many arguments");
2127
2128 if (coro->status)
2129 frame->prepare = prepare_nop;
2130 else
2131 {
2132 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2133 frame->prepare = prepare_schedule;
2134 }
2135
2136 frame->check = slf_check_join;
2137 frame->destroy = slf_destroy_join;
2138 frame->data = (void *)coro;
2139 SvREFCNT_inc (coro->hv);
2140}
2141
2142static void
1887coro_call_on_destroy (pTHX_ struct coro *coro) 2143coro_call_on_destroy (pTHX_ struct coro *coro)
1888{ 2144{
1889 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2145 AV *od = coro->on_destroy;
1890 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1891 2146
1892 if (on_destroyp) 2147 if (!od)
1893 { 2148 return;
1894 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1895 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
1896 while (AvFILLp (on_destroy) >= 0) 2153 while (AvFILLp (od) >= 0)
2154 {
2155 SV *cb = sv_2mortal (av_pop (od));
2156
2157 /* coro hv's (and only hv's at the moment) are supported as well */
2158 if (SvSTATEhv_p (aTHX_ cb))
2159 api_ready (aTHX_ cb);
2160 else
1897 { 2161 {
1898 dSP; /* don't disturb outer sp */ 2162 dSP; /* don't disturb outer sp */
1899 SV *cb = av_pop (on_destroy);
1900
1901 PUSHMARK (SP); 2163 PUSHMARK (SP);
1902 2164
1903 if (statusp) 2165 if (coro->status)
1904 { 2166 {
1905 int i; 2167 PUTBACK;
1906 AV *status = (AV *)SvRV (*statusp); 2168 coro_push_av (aTHX_ coro->status, G_ARRAY);
1907 EXTEND (SP, AvFILLp (status) + 1); 2169 SPAGAIN;
1908
1909 for (i = 0; i <= AvFILLp (status); ++i)
1910 PUSHs (AvARRAY (status)[i]);
1911 } 2170 }
1912 2171
1913 PUTBACK; 2172 PUTBACK;
1914 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2173 call_sv (cb, G_VOID | G_DISCARD);
1915 } 2174 }
1916 } 2175 }
1917} 2176}
1918 2177
1919static void 2178static void
1920slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1921{ 2180{
2181 AV *av;
2182
2183 if (coro->status)
2184 {
2185 av = coro->status;
2186 av_clear (av);
2187 }
2188 else
2189 av = coro->status = newAV ();
2190
2191 /* items are actually not so common, so optimise for this case */
2192 if (items)
2193 {
1922 int i; 2194 int i;
1923 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV ();
1925 2195
1926 av_extend (av, items - 1); 2196 av_extend (av, items - 1);
2197
1927 for (i = 0; i < items; ++i) 2198 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i])); 2199 av_push (av, SvREFCNT_inc_NN (arg [i]));
2200 }
2201}
1929 2202
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2203static void
1931 2204slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2205{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2206 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2207 api_ready (aTHX_ sv_manager);
1934 2208
1935 frame->prepare = prepare_schedule; 2209 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2210 frame->check = slf_check_repeat;
1937 2211
1938 /* as a minor optimisation, we could unwind all stacks here */ 2212 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2213 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2214 /*coro_unwind_stacks (aTHX);*/
2215}
2216
2217static void
2218slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{
2220 HV *coro_hv = (HV *)SvRV (coro_current);
2221
2222 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2223 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2224}
2225
2226static void
2227slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2228{
2229 HV *coro_hv;
2230 struct coro *coro;
2231
2232 if (items <= 0)
2233 croak ("Coro::cancel called without coro object,");
2234
2235 coro = SvSTATE (arg [0]);
2236 coro_hv = coro->hv;
2237
2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2239
2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2241 {
2242 /* coro currently busy cancelling something, so just notify it */
2243 coro->slf_frame.data = (void *)coro;
2244
2245 frame->prepare = prepare_nop;
2246 frame->check = slf_check_nop;
2247 }
2248 else if (coro_hv == (HV *)SvRV (coro_current))
2249 {
2250 /* cancelling the current coro is allowed, and equals terminate */
2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2252 }
2253 else
2254 {
2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2259
2260 /* otherwise we cancel directly, purely for speed reasons
2261 * unfortunately, this requires some magic trickery, as
2262 * somebody else could cancel us, so we have to fight the cancellation.
2263 * this is ugly, and hopefully fully worth the extra speed.
2264 * besides, I can't get the slow-but-safe version working...
2265 */
2266 slf_frame.data = 0;
2267 self->flags |= CF_NOCANCEL;
2268 coro_state_destroy (aTHX_ coro);
2269 self->flags &= ~CF_NOCANCEL;
2270
2271 if (slf_frame.data)
2272 {
2273 /* while we were busy we have been cancelled, so terminate */
2274 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2275 }
2276 else
2277 {
2278 frame->prepare = prepare_nop;
2279 frame->check = slf_check_nop;
2280 }
2281 }
2282}
2283
2284static int
2285slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2286{
2287 frame->prepare = 0;
2288 coro_unwind_stacks (aTHX);
2289
2290 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2291
2292 return 1;
2293}
2294
2295static int
2296safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2297{
2298 if (coro->cctx)
2299 croak ("coro inside C callback, unable to cancel at this time, caught");
2300
2301 if (coro->flags & CF_NEW)
2302 {
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro_state_destroy (aTHX_ coro);
2305 }
2306 else
2307 {
2308 if (!coro->slf_frame.prepare)
2309 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2310
2311 slf_destroy (aTHX_ coro);
2312
2313 coro_set_status (aTHX_ coro, arg, items);
2314 coro->slf_frame.prepare = prepare_nop;
2315 coro->slf_frame.check = slf_check_safe_cancel;
2316
2317 api_ready (aTHX_ (SV *)coro->hv);
2318 }
2319
2320 return 1;
1941} 2321}
1942 2322
1943/*****************************************************************************/ 2323/*****************************************************************************/
1944/* async pool handler */ 2324/* async pool handler */
1945 2325
… …
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2356slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{ 2357{
1978 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv); 2359 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980 2360
1981 if (expect_true (coro->saved_deffh)) 2361 if (ecb_expect_true (coro->saved_deffh))
1982 { 2362 {
1983 /* subsequent iteration */ 2363 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2364 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0; 2365 coro->saved_deffh = 0;
1986 2366
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2367 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2368 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2369 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2370 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2371 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2372 }
1995 else 2373 else
1996 { 2374 {
1997 av_clear (GvAV (PL_defgv)); 2375 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2376 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2023 2401
2024static void 2402static void
2025coro_rouse_callback (pTHX_ CV *cv) 2403coro_rouse_callback (pTHX_ CV *cv)
2026{ 2404{
2027 dXSARGS; 2405 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG; 2406 SV *data = (SV *)S_GENSUB_ARG;
2029 2407
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2408 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 { 2409 {
2032 /* first call, set args */ 2410 /* first call, set args */
2033 SV *coro = SvRV (data); 2411 SV *coro = SvRV (data);
… …
2048 2426
2049static int 2427static int
2050slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2051{ 2429{
2052 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
2053 2431
2054 if (CORO_THROW) 2432 if (CORO_THROW)
2055 return 0; 2433 return 0;
2056 2434
2057 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2058 return 1; 2436 return 1;
… …
2094 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
2095 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
2096 } 2474 }
2097 2475
2098 if (!SvROK (cb) 2476 if (!SvROK (cb)
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2480
2103 { 2481 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG; 2483 SV *data = (SV *)S_GENSUB_ARG;
2106 2484
2107 frame->data = (void *)data; 2485 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2486 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait; 2487 frame->check = slf_check_rouse_wait;
2110 } 2488 }
… …
2114coro_new_rouse_cb (pTHX) 2492coro_new_rouse_cb (pTHX)
2115{ 2493{
2116 HV *hv = (HV *)SvRV (coro_current); 2494 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv); 2495 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv); 2496 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2497 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120 2498
2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2499 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */ 2500 SvREFCNT_dec (data); /* magicext increases the refcount */
2123 2501
2124 SvREFCNT_dec (coro->rouse_cb); 2502 SvREFCNT_dec (coro->rouse_cb);
… …
2221static void 2599static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2600slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2601{
2224 frame->prepare = prepare_cede_notself; 2602 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2603 frame->check = slf_check_nop;
2604}
2605
2606/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2607static void
2608slf_destroy (pTHX_ struct coro *coro)
2609{
2610 struct CoroSLF frame = coro->slf_frame;
2611
2612 /*
2613 * The on_destroy below most likely is from an SLF call.
2614 * Since by definition the SLF call will not finish when we destroy
2615 * the coro, we will have to force-finish it here, otherwise
2616 * cleanup functions cannot call SLF functions.
2617 */
2618 coro->slf_frame.prepare = 0;
2619
2620 /* this callback is reserved for slf functions needing to do cleanup */
2621 if (frame.destroy && frame.prepare && !PL_dirty)
2622 frame.destroy (aTHX_ &frame);
2226} 2623}
2227 2624
2228/* 2625/*
2229 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2627 * function to increase chances that they all will call transfer with the same
… …
2237 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2634 I32 checkmark; /* mark SP to see how many elements check has pushed */
2238 2635
2239 /* set up the slf frame, unless it has already been set-up */ 2636 /* set up the slf frame, unless it has already been set-up */
2240 /* the latter happens when a new coro has been started */ 2637 /* the latter happens when a new coro has been started */
2241 /* or when a new cctx was attached to an existing coroutine */ 2638 /* or when a new cctx was attached to an existing coroutine */
2242 if (expect_true (!slf_frame.prepare)) 2639 if (ecb_expect_true (!slf_frame.prepare))
2243 { 2640 {
2244 /* first iteration */ 2641 /* first iteration */
2245 dSP; 2642 dSP;
2246 SV **arg = PL_stack_base + TOPMARK + 1; 2643 SV **arg = PL_stack_base + TOPMARK + 1;
2247 int items = SP - arg; /* args without function object */ 2644 int items = SP - arg; /* args without function object */
… …
2288 while (slf_frame.check (aTHX_ &slf_frame)); 2685 while (slf_frame.check (aTHX_ &slf_frame));
2289 2686
2290 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2687 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2291 2688
2292 /* exception handling */ 2689 /* exception handling */
2293 if (expect_false (CORO_THROW)) 2690 if (ecb_expect_false (CORO_THROW))
2294 { 2691 {
2295 SV *exception = sv_2mortal (CORO_THROW); 2692 SV *exception = sv_2mortal (CORO_THROW);
2296 2693
2297 CORO_THROW = 0; 2694 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception); 2695 sv_setsv (ERRSV, exception);
2299 croak (0); 2696 croak (0);
2300 } 2697 }
2301 2698
2302 /* return value handling - mostly like entersub */ 2699 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2700 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2701 if (GIMME_V == G_SCALAR
2702 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2703 {
2306 dSP; 2704 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2705 SV **bot = PL_stack_base + checkmark;
2308 2706
2309 if (sp == bot) /* too few, push undef */ 2707 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2708 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2709 else /* too many, take last one */
2312 bot [1] = *sp; 2710 bot [1] = *sp;
2313 2711
2314 SP = bot + 1; 2712 SP = bot + 1;
2315 2713
2316 PUTBACK; 2714 PUTBACK;
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2747 if (PL_op->op_flags & OPf_STACKED)
2350 { 2748 {
2351 if (items > slf_arga) 2749 if (items > slf_arga)
2352 { 2750 {
2353 slf_arga = items; 2751 slf_arga = items;
2354 free (slf_argv); 2752 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2753 New (0, slf_argv, slf_arga, SV *);
2356 } 2754 }
2357 2755
2358 slf_argc = items; 2756 slf_argc = items;
2359 2757
2360 for (i = 0; i < items; ++i) 2758 for (i = 0; i < items; ++i)
… …
2423{ 2821{
2424 PerlIOBuf base; 2822 PerlIOBuf base;
2425 NV next, every; 2823 NV next, every;
2426} PerlIOCede; 2824} PerlIOCede;
2427 2825
2428static IV 2826static IV ecb_cold
2429PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2827PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2430{ 2828{
2431 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2829 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2432 2830
2433 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2831 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2434 self->next = nvtime () + self->every; 2832 self->next = nvtime () + self->every;
2435 2833
2436 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2834 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2437} 2835}
2438 2836
2439static SV * 2837static SV * ecb_cold
2440PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2838PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2441{ 2839{
2442 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2443 2841
2444 return newSVnv (self->every); 2842 return newSVnv (self->every);
… …
2556 SvREFCNT_dec (cb); 2954 SvREFCNT_dec (cb);
2557 } 2955 }
2558} 2956}
2559 2957
2560static void 2958static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2959coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2562{ 2960{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2961 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2962 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2565} 2963}
2566 2964
2567static int 2965static int
2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2966slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2569{ 2967{
2570 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2571 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2970 SV *coro_hv = SvRV (coro_current);
2971
2972 frame->destroy = 0;
2572 2973
2573 /* if we are about to throw, don't actually acquire the lock, just throw */ 2974 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW) 2975 if (ecb_expect_false (CORO_THROW))
2976 {
2977 /* we still might be responsible for the semaphore, so wake up others */
2978 coro_semaphore_adjust (aTHX_ av, 0);
2979
2575 return 0; 2980 return 0;
2981 }
2576 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2577 { 2983 {
2578 SvSTATE_current->on_destroy = 0;
2579
2580 if (acquire) 2984 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 2986 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2584 2988
… …
2588 { 2992 {
2589 int i; 2993 int i;
2590 /* if we were woken up but can't down, we look through the whole */ 2994 /* if we were woken up but can't down, we look through the whole */
2591 /* waiters list and only add us if we aren't in there already */ 2995 /* waiters list and only add us if we aren't in there already */
2592 /* this avoids some degenerate memory usage cases */ 2996 /* this avoids some degenerate memory usage cases */
2593 2997 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2594 for (i = 1; i <= AvFILLp (av); ++i)
2595 if (AvARRAY (av)[i] == SvRV (coro_current)) 2998 if (AvARRAY (av)[i] == coro_hv)
2596 return 1; 2999 return 1;
2597 3000
2598 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (coro_hv));
2599 return 1; 3002 return 1;
2600 } 3003 }
2601} 3004}
2602 3005
2603static int 3006static int
… …
2626 { 3029 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3030 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 3031
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3032 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 3033 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 3034 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3035 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3036 frame->destroy = coro_semaphore_destroy;
2635 } 3037 }
2636} 3038}
2637 3039
2638static void 3040static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3041slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2647{ 3049{
2648 if (items >= 2) 3050 if (items >= 2)
2649 { 3051 {
2650 /* callback form */ 3052 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]); 3053 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3054 SV *cb_cv = s_get_cv_croak (arg [1]);
2653 3055
2654 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3056 av_push (av, SvREFCNT_inc_NN (cb_cv));
2655 3057
2656 if (SvIVX (AvARRAY (av)[0]) > 0) 3058 if (SvIVX (AvARRAY (av)[0]) > 0)
2657 coro_semaphore_adjust (aTHX_ av, 0); 3059 coro_semaphore_adjust (aTHX_ av, 0);
… …
2717{ 3119{
2718 AV *av = (AV *)SvRV (arg [0]); 3120 AV *av = (AV *)SvRV (arg [0]);
2719 3121
2720 if (items >= 2) 3122 if (items >= 2)
2721 { 3123 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3124 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3125 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 3126
2725 if (SvIVX (AvARRAY (av)[0])) 3127 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3128 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 3129
2728 frame->prepare = prepare_nop; 3130 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 3131 frame->check = slf_check_nop;
2730 } 3132 }
2731 else if (SvIVX (AvARRAY (av)[0])) 3133 else if (SvIVX (AvARRAY (av)[0]))
… …
2762 3164
2763static void 3165static void
2764coro_aio_callback (pTHX_ CV *cv) 3166coro_aio_callback (pTHX_ CV *cv)
2765{ 3167{
2766 dXSARGS; 3168 dXSARGS;
2767 AV *state = (AV *)GENSUB_ARG; 3169 AV *state = (AV *)S_GENSUB_ARG;
2768 SV *coro = av_pop (state); 3170 SV *coro = av_pop (state);
2769 SV *data_sv = newSV (sizeof (struct io_state)); 3171 SV *data_sv = newSV (sizeof (struct io_state));
2770 3172
2771 av_extend (state, items - 1); 3173 av_extend (state, items - 1);
2772 3174
… …
2808 /* it quickly returns */ 3210 /* it quickly returns */
2809 if (CORO_THROW) 3211 if (CORO_THROW)
2810 return 0; 3212 return 0;
2811 3213
2812 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
2813 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2814 return 1; 3216 return 1;
2815 3217
2816 /* restore status */ 3218 /* restore status */
2817 { 3219 {
2818 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
2857 dSP; 3259 dSP;
2858 3260
2859 static SV *prio_cv; 3261 static SV *prio_cv;
2860 static SV *prio_sv; 3262 static SV *prio_sv;
2861 3263
2862 if (expect_false (!prio_cv)) 3264 if (ecb_expect_false (!prio_cv))
2863 { 3265 {
2864 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3266 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2865 prio_sv = newSViv (0); 3267 prio_sv = newSViv (0);
2866 } 3268 }
2867 3269
… …
2886 3288
2887 for (i = 0; i < items; ++i) 3289 for (i = 0; i < items; ++i)
2888 PUSHs (arg [i]); 3290 PUSHs (arg [i]);
2889 3291
2890 /* now push the callback closure */ 3292 /* now push the callback closure */
2891 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3293 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2892 3294
2893 /* now call the AIO function - we assume our request is uncancelable */ 3295 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3296 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3297 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3298 }
2897 3299
2898 /* now that the requets is going, we loop toll we have a result */ 3300 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3301 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3302 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3303 frame->check = slf_check_aio_req;
2902} 3304}
2903 3305
… …
2915 3317
2916#if CORO_CLONE 3318#if CORO_CLONE
2917# include "clone.c" 3319# include "clone.c"
2918#endif 3320#endif
2919 3321
3322/*****************************************************************************/
3323
3324static SV *
3325coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3326{
3327 SV *coro_sv;
3328 struct coro *coro;
3329 MAGIC *mg;
3330 HV *hv;
3331 SV *cb;
3332 int i;
3333
3334 if (argc > 0)
3335 {
3336 cb = s_get_cv_croak (argv [0]);
3337
3338 if (!is_coro)
3339 {
3340 if (CvISXSUB (cb))
3341 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3342
3343 if (!CvROOT (cb))
3344 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3345 }
3346 }
3347
3348 Newz (0, coro, 1, struct coro);
3349 coro->args = newAV ();
3350 coro->flags = CF_NEW;
3351
3352 if (coro_first) coro_first->prev = coro;
3353 coro->next = coro_first;
3354 coro_first = coro;
3355
3356 coro->hv = hv = newHV ();
3357 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3358 mg->mg_flags |= MGf_DUP;
3359 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3360
3361 if (argc > 0)
3362 {
3363 av_extend (coro->args, argc + is_coro - 1);
3364
3365 if (is_coro)
3366 {
3367 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3368 cb = (SV *)cv_coro_run;
3369 }
3370
3371 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3372
3373 for (i = 1; i < argc; i++)
3374 av_push (coro->args, newSVsv (argv [i]));
3375 }
3376
3377 return coro_sv;
3378}
3379
3380#ifndef __cplusplus
3381ecb_cold XS(boot_Coro__State);
3382#endif
3383
3384#if CORO_JIT
3385
3386static void ecb_noinline ecb_cold
3387pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3388{
3389 dSP;
3390 AV *av = newAV ();
3391
3392 av_store (av, 3, newSVuv (d));
3393 av_store (av, 2, newSVuv (c));
3394 av_store (av, 1, newSVuv (b));
3395 av_store (av, 0, newSVuv (a));
3396
3397 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3398
3399 PUTBACK;
3400}
3401
3402static void ecb_noinline ecb_cold
3403jit_init (pTHX)
3404{
3405 dSP;
3406 SV *load, *save;
3407 char *map_base;
3408 char *load_ptr, *save_ptr;
3409 STRLEN load_len, save_len, map_len;
3410 int count;
3411
3412 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3413
3414 PUSHMARK (SP);
3415 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3416 #include "state.h"
3417 count = call_pv ("Coro::State::_jit", G_ARRAY);
3418 SPAGAIN;
3419
3420 save = POPs; save_ptr = SvPVbyte (save, save_len);
3421 load = POPs; load_ptr = SvPVbyte (load, load_len);
3422
3423 map_len = load_len + save_len + 16;
3424
3425 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3426
3427 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3428
3429 load_perl_slots = (load_save_perl_slots_type)map_base;
3430 memcpy (map_base, load_ptr, load_len);
3431
3432 map_base += (load_len + 15) & ~15;
3433
3434 save_perl_slots = (load_save_perl_slots_type)map_base;
3435 memcpy (map_base, save_ptr, save_len);
3436
3437 /* we are good citizens and try to make the page read-only, so the evil evil */
3438 /* hackers might have it a bit more difficult */
3439 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3440
3441 PUTBACK;
3442 eval_pv ("undef &Coro::State::_jit", 1);
3443}
3444
3445#endif
3446
2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3447MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2921 3448
2922PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
2923 3450
2924BOOT: 3451BOOT:
2925{ 3452{
3453#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3454#include "state.h"
2926#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
2927# if CORO_PTHREAD 3456# if CORO_PTHREAD
2928 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
2929# endif 3458# endif
2930#endif 3459#endif
2931 BOOT_PAGESIZE; 3460 /* perl defines these to check for existance first, but why it doesn't */
3461 /* just create them one at init time is not clear to me, except for */
3462 /* programs trying to delete them, but... */
3463 /* anyway, we declare this as invalid and make sure they are initialised here */
3464 DEFSV;
3465 ERRSV;
2932 3466
2933 cctx_current = cctx_new_empty (); 3467 cctx_current = cctx_new_empty ();
2934 3468
2935 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3469 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2936 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3470 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2976 coroapi.prepare_nop = prepare_nop; 3510 coroapi.prepare_nop = prepare_nop;
2977 coroapi.prepare_schedule = prepare_schedule; 3511 coroapi.prepare_schedule = prepare_schedule;
2978 coroapi.prepare_cede = prepare_cede; 3512 coroapi.prepare_cede = prepare_cede;
2979 coroapi.prepare_cede_notself = prepare_cede_notself; 3513 coroapi.prepare_cede_notself = prepare_cede_notself;
2980 3514
2981 { 3515 time_init (aTHX);
2982 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2983
2984 if (!svp) croak ("Time::HiRes is required");
2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2986
2987 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2988 }
2989 3516
2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3517 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3518#if CORO_JIT
3519 PUTBACK;
3520 jit_init (aTHX);
3521 SPAGAIN;
3522#endif
2991} 3523}
2992 3524
2993SV * 3525SV *
2994new (char *klass, ...) 3526new (SV *klass, ...)
2995 ALIAS: 3527 ALIAS:
2996 Coro::new = 1 3528 Coro::new = 1
2997 CODE: 3529 CODE:
2998{ 3530 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2999 struct coro *coro; 3531 OUTPUT:
3000 MAGIC *mg;
3001 HV *hv;
3002 CV *cb;
3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3031
3032 if (items > 1)
3033 {
3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 2; i < items; i++)
3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
3047}
3048 OUTPUT:
3049 RETVAL 3532 RETVAL
3050 3533
3051void 3534void
3052transfer (...) 3535transfer (...)
3053 PROTOTYPE: $$ 3536 PROTOTYPE: $$
3054 CODE: 3537 CODE:
3055 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3056
3057bool
3058_destroy (SV *coro_sv)
3059 CODE:
3060 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3061 OUTPUT:
3062 RETVAL
3063
3064void
3065_exit (int code)
3066 PROTOTYPE: $
3067 CODE:
3068 _exit (code);
3069 3539
3070SV * 3540SV *
3071clone (Coro::State coro) 3541clone (Coro::State coro)
3072 CODE: 3542 CODE:
3073{ 3543{
… …
3128void 3598void
3129list () 3599list ()
3130 PROTOTYPE: 3600 PROTOTYPE:
3131 PPCODE: 3601 PPCODE:
3132{ 3602{
3133 struct coro *coro; 3603 struct coro *coro;
3134 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
3135 if (coro->hv) 3605 if (coro->hv)
3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3137} 3607}
3138 3608
… …
3143 CODE: 3613 CODE:
3144{ 3614{
3145 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3615 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3146 { 3616 {
3147 struct coro *current = SvSTATE_current; 3617 struct coro *current = SvSTATE_current;
3618 struct CoroSLF slf_save;
3148 3619
3149 if (current != coro) 3620 if (current != coro)
3150 { 3621 {
3151 PUTBACK; 3622 PUTBACK;
3152 save_perl (aTHX_ current); 3623 save_perl (aTHX_ current);
3153 load_perl (aTHX_ coro); 3624 load_perl (aTHX_ coro);
3625 /* the coro is most likely in an active SLF call.
3626 * while not strictly required (the code we execute is
3627 * not allowed to call any SLF functions), it's cleaner
3628 * to reinitialise the slf_frame and restore it later.
3629 * This might one day allow us to actually do SLF calls
3630 * from code executed here.
3631 */
3632 slf_save = slf_frame;
3633 slf_frame.prepare = 0;
3154 SPAGAIN; 3634 SPAGAIN;
3155 } 3635 }
3156 3636
3157 PUSHSTACK; 3637 PUSHSTACK;
3158 3638
… …
3168 SPAGAIN; 3648 SPAGAIN;
3169 3649
3170 if (current != coro) 3650 if (current != coro)
3171 { 3651 {
3172 PUTBACK; 3652 PUTBACK;
3653 slf_frame = slf_save;
3173 save_perl (aTHX_ coro); 3654 save_perl (aTHX_ coro);
3174 load_perl (aTHX_ current); 3655 load_perl (aTHX_ current);
3175 SPAGAIN; 3656 SPAGAIN;
3176 } 3657 }
3177 } 3658 }
… …
3182 PROTOTYPE: $ 3663 PROTOTYPE: $
3183 ALIAS: 3664 ALIAS:
3184 is_ready = CF_READY 3665 is_ready = CF_READY
3185 is_running = CF_RUNNING 3666 is_running = CF_RUNNING
3186 is_new = CF_NEW 3667 is_new = CF_NEW
3187 is_destroyed = CF_DESTROYED 3668 is_destroyed = CF_ZOMBIE
3669 is_zombie = CF_ZOMBIE
3188 is_suspended = CF_SUSPENDED 3670 is_suspended = CF_SUSPENDED
3189 CODE: 3671 CODE:
3190 RETVAL = boolSV (coro->flags & ix); 3672 RETVAL = boolSV (coro->flags & ix);
3191 OUTPUT: 3673 OUTPUT:
3192 RETVAL 3674 RETVAL
3193 3675
3194void 3676void
3195throw (Coro::State self, SV *throw = &PL_sv_undef) 3677throw (SV *self, SV *exception = &PL_sv_undef)
3196 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
3197 CODE: 3679 CODE:
3198{ 3680{
3681 struct coro *coro = SvSTATE (self);
3199 struct coro *current = SvSTATE_current; 3682 struct coro *current = SvSTATE_current;
3200 SV **throwp = self == current ? &CORO_THROW : &self->except; 3683 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3201 SvREFCNT_dec (*throwp); 3684 SvREFCNT_dec (*exceptionp);
3202 SvGETMAGIC (throw); 3685 SvGETMAGIC (exception);
3203 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3686 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3687
3688 api_ready (aTHX_ self);
3204} 3689}
3205 3690
3206void 3691void
3207api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3692api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3208 PROTOTYPE: $;$ 3693 PROTOTYPE: $;$
… …
3263 3748
3264void 3749void
3265cancel (Coro::State self) 3750cancel (Coro::State self)
3266 CODE: 3751 CODE:
3267 coro_state_destroy (aTHX_ self); 3752 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3753
3754SV *
3755enable_times (int enabled = enable_times)
3756 CODE:
3757{
3758 RETVAL = boolSV (enable_times);
3759
3760 if (enabled != enable_times)
3761 {
3762 enable_times = enabled;
3763
3764 coro_times_update ();
3765 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3766 }
3767}
3768 OUTPUT:
3769 RETVAL
3770
3771void
3772times (Coro::State self)
3773 PPCODE:
3774{
3775 struct coro *current = SvSTATE (coro_current);
3776
3777 if (ecb_expect_false (current == self))
3778 {
3779 coro_times_update ();
3780 coro_times_add (SvSTATE (coro_current));
3781 }
3782
3783 EXTEND (SP, 2);
3784 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3785 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3786
3787 if (ecb_expect_false (current == self))
3788 coro_times_sub (SvSTATE (coro_current));
3789}
3790
3791void
3792swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3793 CODE:
3794{
3795 struct coro *current = SvSTATE_current;
3796
3797 if (current == coro)
3798 SWAP_SVS (current);
3799
3800 if (!coro->swap_sv)
3801 coro->swap_sv = newAV ();
3802
3803 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3804 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3805
3806 if (current == coro)
3807 SWAP_SVS (current);
3808}
3269 3809
3270 3810
3271MODULE = Coro::State PACKAGE = Coro 3811MODULE = Coro::State PACKAGE = Coro
3272 3812
3273BOOT: 3813BOOT:
3274{ 3814{
3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3815 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3276 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3816 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3277 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3817 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3278 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3279 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3818 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3280 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3281 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3820 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3282 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3821 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3822 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284 3823
3285 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3824 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3825 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3826 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3827 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3289 3828
3290 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3291 3830
3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3312 sv_setiv (sv, (IV)&coroapi); 3851 sv_setiv (sv, (IV)&coroapi);
3313 SvREADONLY_on (sv); 3852 SvREADONLY_on (sv);
3314 } 3853 }
3315} 3854}
3316 3855
3856SV *
3857async (...)
3858 PROTOTYPE: &@
3859 CODE:
3860 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3861 api_ready (aTHX_ RETVAL);
3862 OUTPUT:
3863 RETVAL
3864
3865void
3866_destroy (Coro::State coro)
3867 CODE:
3868 /* used by the manager thread */
3869 coro_state_destroy (aTHX_ coro);
3870
3871void
3872on_destroy (Coro::State coro, SV *cb)
3873 CODE:
3874 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3875
3876void
3877join (...)
3878 CODE:
3879 CORO_EXECUTE_SLF_XS (slf_init_join);
3880
3317void 3881void
3318terminate (...) 3882terminate (...)
3319 CODE: 3883 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3884 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3885
3886void
3887cancel (...)
3888 CODE:
3889 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3890
3891int
3892safe_cancel (Coro::State self, ...)
3893 C_ARGS: aTHX_ self, &ST (1), items - 1
3321 3894
3322void 3895void
3323schedule (...) 3896schedule (...)
3324 CODE: 3897 CODE:
3325 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3898 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3355_set_readyhook (SV *hook) 3928_set_readyhook (SV *hook)
3356 PROTOTYPE: $ 3929 PROTOTYPE: $
3357 CODE: 3930 CODE:
3358 SvREFCNT_dec (coro_readyhook); 3931 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook); 3932 SvGETMAGIC (hook);
3933 if (SvOK (hook))
3934 {
3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3935 coro_readyhook = newSVsv (hook);
3936 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3937 }
3938 else
3939 {
3940 coro_readyhook = 0;
3941 CORO_READYHOOK = 0;
3942 }
3361 3943
3362int 3944int
3363prio (Coro::State coro, int newprio = 0) 3945prio (Coro::State coro, int newprio = 0)
3364 PROTOTYPE: $;$ 3946 PROTOTYPE: $;$
3365 ALIAS: 3947 ALIAS:
… …
3429 for (i = 1; i < items; ++i) 4011 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i))); 4012 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431 4013
3432 if ((SV *)hv == &PL_sv_undef) 4014 if ((SV *)hv == &PL_sv_undef)
3433 { 4015 {
3434 PUSHMARK (SP); 4016 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3435 EXTEND (SP, 2);
3436 PUSHs (sv_Coro);
3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4017 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4018 SvREFCNT_dec (sv);
3443 } 4019 }
3444 4020
3445 { 4021 {
3446 struct coro *coro = SvSTATE_hv (hv); 4022 struct coro *coro = SvSTATE_hv (hv);
3447 4023
… …
3479 on_leave = 1 4055 on_leave = 1
3480 PROTOTYPE: & 4056 PROTOTYPE: &
3481 CODE: 4057 CODE:
3482{ 4058{
3483 struct coro *coro = SvSTATE_current; 4059 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3485 4061
3486 block = (SV *)coro_sv_2cv (aTHX_ block); 4062 block = s_get_cv_croak (block);
3487 4063
3488 if (!*avp) 4064 if (!*avp)
3489 *avp = newAV (); 4065 *avp = newAV ();
3490 4066
3491 av_push (*avp, SvREFCNT_inc (block)); 4067 av_push (*avp, SvREFCNT_inc (block));
… …
3509 4085
3510SV * 4086SV *
3511new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
3512 CODE: 4088 CODE:
3513{ 4089{
3514 int semcnt = 1; 4090 int semcnt = 1;
3515 4091
3516 if (count) 4092 if (count)
3517 { 4093 {
3518 SvGETMAGIC (count); 4094 SvGETMAGIC (count);
3519 4095
… …
3579 XSRETURN_NO; 4155 XSRETURN_NO;
3580} 4156}
3581 4157
3582void 4158void
3583waiters (SV *self) 4159waiters (SV *self)
3584 PPCODE: 4160 PPCODE:
3585{ 4161{
3586 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
3587 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
3588 4164
3589 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
3598} 4174}
3599 4175
3600MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4176MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3601 4177
3602void 4178void
3603_may_delete (SV *sem, int count, int extra_refs) 4179_may_delete (SV *sem, int count, unsigned int extra_refs)
3604 PPCODE: 4180 PPCODE:
3605{ 4181{
3606 AV *av = (AV *)SvRV (sem); 4182 AV *av = (AV *)SvRV (sem);
3607 4183
3608 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3609 && AvFILLp (av) == 0 /* no waiters, just count */ 4185 && AvFILLp (av) == 0 /* no waiters, just count */
3610 && SvIV (AvARRAY (av)[0]) == count) 4186 && SvIV (AvARRAY (av)[0]) == count)
3611 XSRETURN_YES; 4187 XSRETURN_YES;
… …
3632 4208
3633void 4209void
3634broadcast (SV *self) 4210broadcast (SV *self)
3635 CODE: 4211 CODE:
3636{ 4212{
3637 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
3638 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
3639} 4215}
3640 4216
3641void 4217void
3642send (SV *self) 4218send (SV *self)
… …
3650 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3651} 4227}
3652 4228
3653IV 4229IV
3654awaited (SV *self) 4230awaited (SV *self)
3655 CODE: 4231 CODE:
3656 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3657 OUTPUT: 4233 OUTPUT:
3658 RETVAL 4234 RETVAL
3659 4235
3660 4236
… …
3665 4241
3666void 4242void
3667_schedule (...) 4243_schedule (...)
3668 CODE: 4244 CODE:
3669{ 4245{
3670 static int incede; 4246 static int incede;
3671 4247
3672 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
3673 4249
3674 ++incede; 4250 ++incede;
3675 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
3691 4267
3692void 4268void
3693_register (char *target, char *proto, SV *req) 4269_register (char *target, char *proto, SV *req)
3694 CODE: 4270 CODE:
3695{ 4271{
3696 CV *req_cv = coro_sv_2cv (aTHX_ req); 4272 SV *req_cv = s_get_cv_croak (req);
3697 /* newXSproto doesn't return the CV on 5.8 */ 4273 /* newXSproto doesn't return the CV on 5.8 */
3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4274 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3699 sv_setpv ((SV *)slf_cv, proto); 4275 sv_setpv ((SV *)slf_cv, proto);
3700 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4276 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3701} 4277}
3702 4278
4279MODULE = Coro::State PACKAGE = Coro::Select
4280
4281void
4282patch_pp_sselect ()
4283 CODE:
4284 if (!coro_old_pp_sselect)
4285 {
4286 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4287 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4288 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4289 }
4290
4291void
4292unpatch_pp_sselect ()
4293 CODE:
4294 if (coro_old_pp_sselect)
4295 {
4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4297 coro_old_pp_sselect = 0;
4298 }
4299
4300MODULE = Coro::State PACKAGE = Coro::Util
4301
4302void
4303_exit (int code)
4304 CODE:
4305 _exit (code);
4306
4307NV
4308time ()
4309 CODE:
4310 RETVAL = nvtime (aTHX);
4311 OUTPUT:
4312 RETVAL
4313
4314NV
4315gettimeofday ()
4316 PPCODE:
4317{
4318 UV tv [2];
4319 u2time (aTHX_ tv);
4320 EXTEND (SP, 2);
4321 PUSHs (sv_2mortal (newSVuv (tv [0])));
4322 PUSHs (sv_2mortal (newSVuv (tv [1])));
4323}
4324

Diff Legend

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