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.358 by root, Mon Jun 29 04:30:25 2009 UTC vs.
Revision 1.416 by root, Mon Dec 12 15:19:56 2011 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
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"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \ 68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 69# 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 70#endif
114 71
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
117#endif 74#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
136#endif 93#endif
137 94
138#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
139 96
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" 97#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
157 99
158#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
159# if CORO_PTHREAD 101# if CORO_PTHREAD
160static void *coro_thx; 102static void *coro_thx;
161# endif 103# endif
162#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
163 108
164#ifdef __linux 109#ifdef __linux
165# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 115# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 116# endif
172#endif 117#endif
173 118
174static double (*nvtime)(); /* so why doesn't it take void? */ 119static double (*nvtime)(); /* so why doesn't it take void? */
120static void (*u2time)(pTHX_ UV ret[2]);
175 121
176/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
179 126
180static U32 cctx_gen; 127static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
200static SV *sv_pool_size; 147static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 148static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 149static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 150static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 151static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 152
207/* Coro::AnyEvent */ 153/* Coro::AnyEvent */
208static SV *sv_activity; 154static SV *sv_activity;
209 155
156/* enable processtime/realtime profiling */
157static char enable_times;
158typedef U32 coro_ts[2];
159static coro_ts time_real, time_cpu;
160static char times_valid;
161
210static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
212 164
213enum { 165enum
166{
214 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
215 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
216 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
217 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
218 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
228 void *sptr; 181 void *sptr;
229 size_t ssize; 182 size_t ssize;
230 183
231 /* cpu state */ 184 /* cpu state */
232 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
233 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
234 JMPENV *top_env; 189 JMPENV *top_env;
235 coro_context cctx; 190 coro_context cctx;
236 191
237 U32 gen; 192 U32 gen;
238#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
239 int valgrind_id; 194 int valgrind_id;
240#endif 195#endif
241 unsigned char flags; 196 unsigned char flags;
242} coro_cctx; 197} coro_cctx;
243 198
244coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
245 200
246/*****************************************************************************/ 201/*****************************************************************************/
247 202
203static MGVTBL coro_state_vtbl;
204
248enum { 205enum
206{
249 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
254}; 213};
255 214
256/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
257typedef struct 216typedef struct
258{ 217{
259 SV *defsv;
260 AV *defav;
261 SV *errsv;
262 SV *irsgv;
263 HV *hinthv;
264#define VAR(name,type) type name; 218#define VARx(name,expr,type) type name;
265# include "state.h" 219# include "state.h"
266#undef VAR 220#undef VARx
267} perl_slots; 221} perl_slots;
268 222
223/* how many context stack entries do we need for perl_slots */
269#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
270 225
271/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
272struct coro { 227struct coro
228{
273 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
274 coro_cctx *cctx; 230 coro_cctx *cctx;
275 231
276 /* ready queue */ 232 /* ready queue */
277 struct coro *next_ready; 233 struct coro *next_ready;
… …
279 /* state data */ 235 /* state data */
280 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
281 AV *mainstack; 237 AV *mainstack;
282 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
283 239
284 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro);
290 244
291 /* statistics */ 245 /* statistics */
292 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
293 247
294 /* coro process data */ 248 /* coro process data */
295 int prio; 249 int prio;
296 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
297 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
298 254
299 /* async_pool */ 255 /* async_pool */
300 SV *saved_deffh; 256 SV *saved_deffh;
301 SV *invoke_cb; 257 SV *invoke_cb;
302 AV *invoke_av; 258 AV *invoke_av;
303 259
304 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
305 AV *on_enter; 261 AV *on_enter;
306 AV *on_leave; 262 AV *on_leave;
307 263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
308 /* linked list */ 270 /* linked list */
309 struct coro *next, *prev; 271 struct coro *next, *prev;
310}; 272};
311 273
312typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
314 276
315/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
319 281
320/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
321 283
322#define CORO_PRIO_MAX 3 284#define CORO_PRIO_MAX 3
… …
328 290
329/* for Coro.pm */ 291/* for Coro.pm */
330static SV *coro_current; 292static SV *coro_current;
331static SV *coro_readyhook; 293static SV *coro_readyhook;
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
334static struct coro *coro_first; 296static struct coro *coro_first;
335#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
336 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
322/** Coro::Select ************************************************************/
323
324static OP *(*coro_old_pp_sselect) (pTHX);
325static SV *coro_select_select;
326
327/* horrible hack, but if it works... */
328static OP *
329coro_pp_sselect (pTHX)
330{
331 dSP;
332 PUSHMARK (SP - 4); /* fake argument list */
333 XPUSHs (coro_select_select);
334 PUTBACK;
335
336 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
337 PL_op->op_flags |= OPf_STACKED;
338 PL_op->op_private = 0;
339 return PL_ppaddr [OP_ENTERSUB](aTHX);
340}
341
342/** time stuff **************************************************************/
343
344#ifdef HAS_GETTIMEOFDAY
345
346ecb_inline void
347coro_u2time (pTHX_ UV ret[2])
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 ret [0] = tv.tv_sec;
353 ret [1] = tv.tv_usec;
354}
355
356ecb_inline double
357coro_nvtime (void)
358{
359 struct timeval tv;
360 gettimeofday (&tv, 0);
361
362 return tv.tv_sec + tv.tv_usec * 1e-6;
363}
364
365ecb_inline void
366time_init (pTHX)
367{
368 nvtime = coro_nvtime;
369 u2time = coro_u2time;
370}
371
372#else
373
374ecb_inline void
375time_init (pTHX)
376{
377 SV **svp;
378
379 require_pv ("Time/HiRes.pm");
380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385
386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
387
388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
390}
391
392#endif
393
337/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
338 395
339static SV * 396static SV * ecb_noinline
340coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
341{ 398{
342#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_sv (name, create); 401 get_sv (name, create);
345#endif 402#endif
346 return get_sv (name, create); 403 return get_sv (name, create);
347} 404}
348 405
349static AV * 406static AV * ecb_noinline
350coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
351{ 408{
352#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_av (name, create); 411 get_av (name, create);
355#endif 412#endif
356 return get_av (name, create); 413 return get_av (name, create);
357} 414}
358 415
359static HV * 416static HV * ecb_noinline
360coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
361{ 418{
362#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_hv (name, create); 421 get_hv (name, create);
365#endif 422#endif
366 return get_hv (name, create); 423 return get_hv (name, create);
367} 424}
368 425
369/* may croak */ 426ecb_inline void
370INLINE CV * 427coro_times_update (void)
371coro_sv_2cv (pTHX_ SV *sv)
372{ 428{
373 HV *st; 429#ifdef coro_clock_gettime
374 GV *gvp; 430 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 431
377 if (!cv) 432 ts.tv_sec = ts.tv_nsec = 0;
378 croak ("code reference expected"); 433 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
434 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
379 435
380 return cv; 436 ts.tv_sec = ts.tv_nsec = 0;
437 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
438 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
439#else
440 dTHX;
441 UV tv[2];
442
443 u2time (aTHX_ tv);
444 time_real [0] = tv [0];
445 time_real [1] = tv [1] * 1000;
446#endif
447}
448
449ecb_inline void
450coro_times_add (struct coro *c)
451{
452 c->t_real [1] += time_real [1];
453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
454 c->t_real [0] += time_real [0];
455
456 c->t_cpu [1] += time_cpu [1];
457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
458 c->t_cpu [0] += time_cpu [0];
459}
460
461ecb_inline void
462coro_times_sub (struct coro *c)
463{
464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
465 c->t_real [1] -= time_real [1];
466 c->t_real [0] -= time_real [0];
467
468 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
469 c->t_cpu [1] -= time_cpu [1];
470 c->t_cpu [0] -= time_cpu [0];
381} 471}
382 472
383/*****************************************************************************/ 473/*****************************************************************************/
384/* magic glue */ 474/* magic glue */
385 475
386#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 478
389#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
392 : mg_find (sv, type)) 482 : mg_find (sv, type))
393 483
394#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
397 : 0) 487 : 0)
398 488
399#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
400#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
401 491
402INLINE struct coro * 492ecb_inline MAGIC *
493SvSTATEhv_p (pTHX_ SV *coro)
494{
495 MAGIC *mg;
496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
403SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro)
404{ 509{
405 HV *stash;
406 MAGIC *mg; 510 MAGIC *mg;
407 511
408 if (SvROK (coro)) 512 if (SvROK (coro))
409 coro = SvRV (coro); 513 coro = SvRV (coro);
410 514
411 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro);
516 if (!mg)
412 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
413 518
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
424} 520}
425 521
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427 523
… …
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431 527
432/*****************************************************************************/ 528/*****************************************************************************/
433/* padlist management and caching */ 529/* padlist management and caching */
434 530
435static AV * 531ecb_inline AV *
436coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
437{ 533{
438 AV *padlist = CvPADLIST (cv); 534 AV *padlist = CvPADLIST (cv);
439 AV *newpadlist, *newpad; 535 AV *newpadlist, *newpad;
440 536
… …
452 av_store (newpadlist, 1, (SV *)newpad); 548 av_store (newpadlist, 1, (SV *)newpad);
453 549
454 return newpadlist; 550 return newpadlist;
455} 551}
456 552
457static void 553ecb_inline void
458free_padlist (pTHX_ AV *padlist) 554free_padlist (pTHX_ AV *padlist)
459{ 555{
460 /* may be during global destruction */ 556 /* may be during global destruction */
461 if (!IN_DESTRUCT) 557 if (!IN_DESTRUCT)
462 { 558 {
… …
488 AV *padlist; 584 AV *padlist;
489 AV *av = (AV *)mg->mg_obj; 585 AV *av = (AV *)mg->mg_obj;
490 586
491 /* perl manages to free our internal AV and _then_ call us */ 587 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 588 if (IN_DESTRUCT)
493 return; 589 return 0;
494 590
495 /* casting is fun. */ 591 /* casting is fun. */
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 593 free_padlist (aTHX_ padlist);
498 594
… …
505 0, 0, 0, 0, 601 0, 0, 0, 0,
506 coro_cv_free 602 coro_cv_free
507}; 603};
508 604
509/* the next two functions merely cache the padlists */ 605/* the next two functions merely cache the padlists */
510static void 606ecb_inline void
511get_padlist (pTHX_ CV *cv) 607get_padlist (pTHX_ CV *cv)
512{ 608{
513 MAGIC *mg = CORO_MAGIC_cv (cv); 609 MAGIC *mg = CORO_MAGIC_cv (cv);
514 AV *av; 610 AV *av;
515 611
516 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
517 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
518 else 614 else
519 { 615 {
520#if CORO_PREFER_PERL_FUNCTIONS 616#if CORO_PREFER_PERL_FUNCTIONS
521 /* this is probably cleaner? but also slower! */ 617 /* this is probably cleaner? but also slower! */
… …
528 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 624 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
529#endif 625#endif
530 } 626 }
531} 627}
532 628
533static void 629ecb_inline void
534put_padlist (pTHX_ CV *cv) 630put_padlist (pTHX_ CV *cv)
535{ 631{
536 MAGIC *mg = CORO_MAGIC_cv (cv); 632 MAGIC *mg = CORO_MAGIC_cv (cv);
537 AV *av; 633 AV *av;
538 634
539 if (expect_false (!mg)) 635 if (ecb_expect_false (!mg))
540 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
541 637
542 av = (AV *)mg->mg_obj; 638 av = (AV *)mg->mg_obj;
543 639
544 if (expect_false (AvFILLp (av) >= AvMAX (av))) 640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
545 av_extend (av, AvFILLp (av) + 1); 641 av_extend (av, AvFILLp (av) + 1);
546 642
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 644}
549 645
550/** load & save, init *******************************************************/ 646/** load & save, init *******************************************************/
647
648ecb_inline void
649swap_sv (SV *a, SV *b)
650{
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 and later complicates this _quite_ a bit, but it also
664 * is much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684}
685
686/* swap sv heads, at least logically */
687static void
688swap_svs (pTHX_ Coro__State c)
689{
690 int i;
691
692 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
693 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
694}
695
696#define SWAP_SVS(coro) \
697 if (ecb_expect_false ((coro)->swap_sv)) \
698 swap_svs (aTHX_ (coro))
551 699
552static void 700static void
553on_enterleave_call (pTHX_ SV *cb); 701on_enterleave_call (pTHX_ SV *cb);
554 702
555static void 703static void
… …
558 perl_slots *slot = c->slot; 706 perl_slots *slot = c->slot;
559 c->slot = 0; 707 c->slot = 0;
560 708
561 PL_mainstack = c->mainstack; 709 PL_mainstack = c->mainstack;
562 710
563 GvSV (PL_defgv) = slot->defsv; 711#if CORO_JIT
564 GvAV (PL_defgv) = slot->defav; 712 load_perl_slots (slot);
565 GvSV (PL_errgv) = slot->errsv; 713#else
566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
568
569 #define VAR(name,type) PL_ ## name = slot->name; 714 #define VARx(name,expr,type) expr = slot->name;
570 # include "state.h" 715 # include "state.h"
571 #undef VAR 716 #undef VARx
717#endif
572 718
573 { 719 {
574 dSP; 720 dSP;
575 721
576 CV *cv; 722 CV *cv;
577 723
578 /* now do the ugly restore mess */ 724 /* now do the ugly restore mess */
579 while (expect_true (cv = (CV *)POPs)) 725 while (ecb_expect_true (cv = (CV *)POPs))
580 { 726 {
581 put_padlist (aTHX_ cv); /* mark this padlist as available */ 727 put_padlist (aTHX_ cv); /* mark this padlist as available */
582 CvDEPTH (cv) = PTR2IV (POPs); 728 CvDEPTH (cv) = PTR2IV (POPs);
583 CvPADLIST (cv) = (AV *)POPs; 729 CvPADLIST (cv) = (AV *)POPs;
584 } 730 }
… …
587 } 733 }
588 734
589 slf_frame = c->slf_frame; 735 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 736 CORO_THROW = c->except;
591 737
738 if (ecb_expect_false (enable_times))
739 {
740 if (ecb_expect_false (!times_valid))
741 coro_times_update ();
742
743 coro_times_sub (c);
744 }
745
592 if (expect_false (c->on_enter)) 746 if (ecb_expect_false (c->on_enter))
593 { 747 {
594 int i; 748 int i;
595 749
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 750 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 752 }
753
754 SWAP_SVS (c);
599} 755}
600 756
601static void 757static void
602save_perl (pTHX_ Coro__State c) 758save_perl (pTHX_ Coro__State c)
603{ 759{
760 SWAP_SVS (c);
761
604 if (expect_false (c->on_leave)) 762 if (ecb_expect_false (c->on_leave))
605 { 763 {
606 int i; 764 int i;
607 765
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 766 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 767 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
768 }
769
770 times_valid = 0;
771
772 if (ecb_expect_false (enable_times))
773 {
774 coro_times_update (); times_valid = 1;
775 coro_times_add (c);
610 } 776 }
611 777
612 c->except = CORO_THROW; 778 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 779 c->slf_frame = slf_frame;
614 780
… …
625 791
626 XPUSHs (Nullsv); 792 XPUSHs (Nullsv);
627 /* this loop was inspired by pp_caller */ 793 /* this loop was inspired by pp_caller */
628 for (;;) 794 for (;;)
629 { 795 {
630 while (expect_true (cxix >= 0)) 796 while (ecb_expect_true (cxix >= 0))
631 { 797 {
632 PERL_CONTEXT *cx = &ccstk[cxix--]; 798 PERL_CONTEXT *cx = &ccstk[cxix--];
633 799
634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 800 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
635 { 801 {
636 CV *cv = cx->blk_sub.cv; 802 CV *cv = cx->blk_sub.cv;
637 803
638 if (expect_true (CvDEPTH (cv))) 804 if (ecb_expect_true (CvDEPTH (cv)))
639 { 805 {
640 EXTEND (SP, 3); 806 EXTEND (SP, 3);
641 PUSHs ((SV *)CvPADLIST (cv)); 807 PUSHs ((SV *)CvPADLIST (cv));
642 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 808 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
643 PUSHs ((SV *)cv); 809 PUSHs ((SV *)cv);
… …
646 get_padlist (aTHX_ cv); 812 get_padlist (aTHX_ cv);
647 } 813 }
648 } 814 }
649 } 815 }
650 816
651 if (expect_true (top_si->si_type == PERLSI_MAIN)) 817 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
652 break; 818 break;
653 819
654 top_si = top_si->si_prev; 820 top_si = top_si->si_prev;
655 ccstk = top_si->si_cxstack; 821 ccstk = top_si->si_cxstack;
656 cxix = top_si->si_cxix; 822 cxix = top_si->si_cxix;
… …
658 824
659 PUTBACK; 825 PUTBACK;
660 } 826 }
661 827
662 /* allocate some space on the context stack for our purposes */ 828 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 829 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 830 {
668 int i; 831 unsigned int i;
832
669 for (i = 3; i < SLOT_COUNT; ++i) 833 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 834 CXINC;
671 } 835
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 836 cxstack_ix -= SLOT_COUNT; /* undo allocation */
837 }
673 838
674 c->mainstack = PL_mainstack; 839 c->mainstack = PL_mainstack;
675 840
676 { 841 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 842 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
678 843
679 slot->defav = GvAV (PL_defgv); 844#if CORO_JIT
680 slot->defsv = DEFSV; 845 save_perl_slots (slot);
681 slot->errsv = ERRSV; 846#else
682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
684
685 #define VAR(name,type) slot->name = PL_ ## name; 847 #define VARx(name,expr,type) slot->name = expr;
686 # include "state.h" 848 # include "state.h"
687 #undef VAR 849 #undef VARx
850#endif
688 } 851 }
689} 852}
690 853
691/* 854/*
692 * allocate various perl stacks. This is almost an exact copy 855 * allocate various perl stacks. This is almost an exact copy
… …
698# define coro_init_stacks(thx) init_stacks () 861# define coro_init_stacks(thx) init_stacks ()
699#else 862#else
700static void 863static void
701coro_init_stacks (pTHX) 864coro_init_stacks (pTHX)
702{ 865{
703 PL_curstackinfo = new_stackinfo(32, 8); 866 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 867 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 868 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 869 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 870
708 PL_stack_base = AvARRAY(PL_curstack); 871 PL_stack_base = AvARRAY(PL_curstack);
… …
723#endif 886#endif
724 887
725 New(54,PL_scopestack,8,I32); 888 New(54,PL_scopestack,8,I32);
726 PL_scopestack_ix = 0; 889 PL_scopestack_ix = 0;
727 PL_scopestack_max = 8; 890 PL_scopestack_max = 8;
891#if HAS_SCOPESTACK_NAME
892 New(54,PL_scopestack_name,8,const char*);
893#endif
728 894
729 New(54,PL_savestack,24,ANY); 895 New(54,PL_savestack,24,ANY);
730 PL_savestack_ix = 0; 896 PL_savestack_ix = 0;
731 PL_savestack_max = 24; 897 PL_savestack_max = 24;
732 898
… …
760 } 926 }
761 927
762 Safefree (PL_tmps_stack); 928 Safefree (PL_tmps_stack);
763 Safefree (PL_markstack); 929 Safefree (PL_markstack);
764 Safefree (PL_scopestack); 930 Safefree (PL_scopestack);
931#if HAS_SCOPESTACK_NAME
932 Safefree (PL_scopestack_name);
933#endif
765 Safefree (PL_savestack); 934 Safefree (PL_savestack);
766#if !PERL_VERSION_ATLEAST (5,10,0) 935#if !PERL_VERSION_ATLEAST (5,10,0)
767 Safefree (PL_retstack); 936 Safefree (PL_retstack);
768#endif 937#endif
769} 938}
… …
815#endif 984#endif
816 985
817/* 986/*
818 * This overrides the default magic get method of %SIG elements. 987 * This overrides the default magic get method of %SIG elements.
819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 988 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
820 * and instead of trying to save and restore the hash elements, we just provide 989 * and instead of trying to save and restore the hash elements (extremely slow),
821 * readback here. 990 * we just provide our own readback here.
822 */ 991 */
823static int 992static int ecb_cold
824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 993coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
825{ 994{
826 const char *s = MgPV_nolen_const (mg); 995 const char *s = MgPV_nolen_const (mg);
827 996
828 if (*s == '_') 997 if (*s == '_')
… …
832 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
833 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
834 1003
835 if (svp) 1004 if (svp)
836 { 1005 {
837 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1006 SV *ssv;
1007
1008 if (!*svp)
1009 ssv = &PL_sv_undef;
1010 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1011 ssv = sv_2mortal (newRV_inc (*svp));
1012 else
1013 ssv = *svp;
1014
1015 sv_setsv (sv, ssv);
838 return 0; 1016 return 0;
839 } 1017 }
840 } 1018 }
841 1019
842 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
843} 1021}
844 1022
845static int 1023static int ecb_cold
846coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
847{ 1025{
848 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
849 1027
850 if (*s == '_') 1028 if (*s == '_')
… …
864 } 1042 }
865 1043
866 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1044 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
867} 1045}
868 1046
869static int 1047static int ecb_cold
870coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1048coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
871{ 1049{
872 const char *s = MgPV_nolen_const (mg); 1050 const char *s = MgPV_nolen_const (mg);
873 1051
874 if (*s == '_') 1052 if (*s == '_')
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1085slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1086{
909 return 1; 1087 return 1;
910} 1088}
911 1089
912static UNOP coro_setup_op; 1090static UNOP init_perl_op;
913 1091
914static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1092ecb_noinline static void /* noinline to keep it out of the transfer fast path */
915coro_setup (pTHX_ struct coro *coro) 1093init_perl (pTHX_ struct coro *coro)
916{ 1094{
917 /* 1095 /*
918 * emulate part of the perl startup here. 1096 * emulate part of the perl startup here.
919 */ 1097 */
920 coro_init_stacks (aTHX); 1098 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1105 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1106 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1107 PL_curpm = 0;
930 PL_curpad = 0; 1108 PL_curpad = 0;
931 PL_localizing = 0; 1109 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1110 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1111#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1112 PL_parser = 0;
936#endif 1113#endif
937 PL_hints = 0; 1114 PL_hints = 0;
938 1115
939 /* recreate the die/warn hooks */ 1116 /* recreate the die/warn hooks */
940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1117 PL_diehook = SvREFCNT_inc (rv_diehook);
941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1118 PL_warnhook = SvREFCNT_inc (rv_warnhook);
942 1119
943 GvSV (PL_defgv) = newSV (0); 1120 GvSV (PL_defgv) = newSV (0);
944 GvAV (PL_defgv) = coro->args; coro->args = 0; 1121 GvAV (PL_defgv) = coro->args; coro->args = 0;
945 GvSV (PL_errgv) = newSV (0); 1122 GvSV (PL_errgv) = newSV (0);
946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
967 /* this newly created coroutine might be run on an existing cctx which most 1144 /* this newly created coroutine might be run on an existing cctx which most
968 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1145 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
969 */ 1146 */
970 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1147 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1148 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1149 slf_frame.destroy = 0;
972 1150
973 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1151 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
974 coro_setup_op.op_next = PL_op; 1152 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1153 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1154 init_perl_op.op_ppaddr = pp_slf;
977 /* no flags etc. required, as an init function won't be called */ 1155 /* no flags etc. required, as an init function won't be called */
978 1156
979 PL_op = (OP *)&coro_setup_op; 1157 PL_op = (OP *)&init_perl_op;
980 1158
981 /* copy throw, in case it was set before coro_setup */ 1159 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1160 CORO_THROW = coro->except;
1161
1162 SWAP_SVS (coro);
1163
1164 if (ecb_expect_false (enable_times))
1165 {
1166 coro_times_update ();
1167 coro_times_sub (coro);
1168 }
983} 1169}
984 1170
985static void 1171static void
986coro_unwind_stacks (pTHX) 1172coro_unwind_stacks (pTHX)
987{ 1173{
… …
1002 dounwind (-1); 1188 dounwind (-1);
1003 } 1189 }
1004} 1190}
1005 1191
1006static void 1192static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1193destroy_perl (pTHX_ struct coro *coro)
1008{ 1194{
1009 SV *svf [9]; 1195 SV *svf [9];
1010 1196
1011 { 1197 {
1198 SV *old_current = SvRV (coro_current);
1012 struct coro *current = SvSTATE_current; 1199 struct coro *current = SvSTATE (old_current);
1013 1200
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1201 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015 1202
1016 save_perl (aTHX_ current); 1203 save_perl (aTHX_ current);
1204
1205 /* this will cause transfer_check to croak on block*/
1206 SvRV_set (coro_current, (SV *)coro->hv);
1207
1017 load_perl (aTHX_ coro); 1208 load_perl (aTHX_ coro);
1018 1209
1019 coro_unwind_stacks (aTHX); 1210 coro_unwind_stacks (aTHX);
1211
1212 /* restore swapped sv's */
1213 SWAP_SVS (coro);
1214
1020 coro_destruct_stacks (aTHX); 1215 coro_destruct_stacks (aTHX);
1021 1216
1022 // now save some sv's to be free'd later 1217 /* now save some sv's to be free'd later */
1023 svf [0] = GvSV (PL_defgv); 1218 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1219 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1220 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv; 1221 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs; 1222 svf [4] = PL_rs;
… …
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1224 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1225 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1226 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1227 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1228
1229 SvRV_set (coro_current, old_current);
1230
1034 load_perl (aTHX_ current); 1231 load_perl (aTHX_ current);
1035 } 1232 }
1036 1233
1037 { 1234 {
1038 int i; 1235 unsigned int i;
1039 1236
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1237 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1238 SvREFCNT_dec (svf [i]);
1042 1239
1043 SvREFCNT_dec (coro->saved_deffh); 1240 SvREFCNT_dec (coro->saved_deffh);
… …
1045 SvREFCNT_dec (coro->invoke_cb); 1242 SvREFCNT_dec (coro->invoke_cb);
1046 SvREFCNT_dec (coro->invoke_av); 1243 SvREFCNT_dec (coro->invoke_av);
1047 } 1244 }
1048} 1245}
1049 1246
1050INLINE void 1247ecb_inline void
1051free_coro_mortal (pTHX) 1248free_coro_mortal (pTHX)
1052{ 1249{
1053 if (expect_true (coro_mortal)) 1250 if (ecb_expect_true (coro_mortal))
1054 { 1251 {
1055 SvREFCNT_dec (coro_mortal); 1252 SvREFCNT_dec ((SV *)coro_mortal);
1056 coro_mortal = 0; 1253 coro_mortal = 0;
1057 } 1254 }
1058} 1255}
1059 1256
1060static int 1257static int
… …
1193 1390
1194 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1391 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1195} 1392}
1196 1393
1197/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1394/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1198static void NOINLINE 1395static void ecb_noinline
1199cctx_prepare (pTHX) 1396cctx_prepare (pTHX)
1200{ 1397{
1201 PL_top_env = &PL_start_env; 1398 PL_top_env = &PL_start_env;
1202 1399
1203 if (cctx_current->flags & CC_TRACE) 1400 if (cctx_current->flags & CC_TRACE)
… …
1214 slf_frame.prepare = slf_prepare_set_stacklevel; 1411 slf_frame.prepare = slf_prepare_set_stacklevel;
1215 slf_frame.check = slf_check_set_stacklevel; 1412 slf_frame.check = slf_check_set_stacklevel;
1216} 1413}
1217 1414
1218/* the tail of transfer: execute stuff we can only do after a transfer */ 1415/* the tail of transfer: execute stuff we can only do after a transfer */
1219INLINE void 1416ecb_inline void
1220transfer_tail (pTHX) 1417transfer_tail (pTHX)
1221{ 1418{
1222 free_coro_mortal (aTHX); 1419 free_coro_mortal (aTHX);
1223} 1420}
1224 1421
… …
1249 /* somebody or something will hit me for both perl_run and PL_restartop */ 1446 /* somebody or something will hit me for both perl_run and PL_restartop */
1250 PL_restartop = PL_op; 1447 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1448 perl_run (PL_curinterp);
1252 /* 1449 /*
1253 * Unfortunately, there is no way to get at the return values of the 1450 * Unfortunately, there is no way to get at the return values of the
1254 * coro body here, as perl_run destroys these 1451 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1452 * runtime errors here, as this is just a random interpreter, not a thread.
1255 */ 1453 */
1256 1454
1257 /* 1455 /*
1258 * If perl-run returns we assume exit() was being called or the coro 1456 * If perl-run returns we assume exit() was being called or the coro
1259 * fell off the end, which seems to be the only valid (non-bug) 1457 * fell off the end, which seems to be the only valid (non-bug)
… …
1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1465 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1268 } 1466 }
1269} 1467}
1270 1468
1271static coro_cctx * 1469static coro_cctx *
1272cctx_new () 1470cctx_new (void)
1273{ 1471{
1274 coro_cctx *cctx; 1472 coro_cctx *cctx;
1275 1473
1276 ++cctx_count; 1474 ++cctx_count;
1277 New (0, cctx, 1, coro_cctx); 1475 New (0, cctx, 1, coro_cctx);
… …
1283 return cctx; 1481 return cctx;
1284} 1482}
1285 1483
1286/* create a new cctx only suitable as source */ 1484/* create a new cctx only suitable as source */
1287static coro_cctx * 1485static coro_cctx *
1288cctx_new_empty () 1486cctx_new_empty (void)
1289{ 1487{
1290 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1291 1489
1292 cctx->sptr = 0; 1490 cctx->sptr = 0;
1293 coro_create (&cctx->cctx, 0, 0, 0, 0); 1491 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1295 return cctx; 1493 return cctx;
1296} 1494}
1297 1495
1298/* create a new cctx suitable as destination/running a perl interpreter */ 1496/* create a new cctx suitable as destination/running a perl interpreter */
1299static coro_cctx * 1497static coro_cctx *
1300cctx_new_run () 1498cctx_new_run (void)
1301{ 1499{
1302 coro_cctx *cctx = cctx_new (); 1500 coro_cctx *cctx = cctx_new ();
1303 void *stack_start; 1501 void *stack_start;
1304 size_t stack_size; 1502 size_t stack_size;
1305 1503
1306#if HAVE_MMAP 1504#if HAVE_MMAP
1307 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1505 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1308 /* mmap supposedly does allocate-on-write for us */ 1506 /* mmap supposedly does allocate-on-write for us */
1309 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1507 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1310 1508
1311 if (cctx->sptr != (void *)-1) 1509 if (cctx->sptr != (void *)-1)
1312 { 1510 {
1313 #if CORO_STACKGUARD 1511 #if CORO_STACKGUARD
1314 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1512 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1346cctx_destroy (coro_cctx *cctx) 1544cctx_destroy (coro_cctx *cctx)
1347{ 1545{
1348 if (!cctx) 1546 if (!cctx)
1349 return; 1547 return;
1350 1548
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1550
1353 --cctx_count; 1551 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1355 1553
1356 /* coro_transfer creates new, empty cctx's */ 1554 /* coro_transfer creates new, empty cctx's */
… …
1375#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1573#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1376 1574
1377static coro_cctx * 1575static coro_cctx *
1378cctx_get (pTHX) 1576cctx_get (pTHX)
1379{ 1577{
1380 while (expect_true (cctx_first)) 1578 while (ecb_expect_true (cctx_first))
1381 { 1579 {
1382 coro_cctx *cctx = cctx_first; 1580 coro_cctx *cctx = cctx_first;
1383 cctx_first = cctx->next; 1581 cctx_first = cctx->next;
1384 --cctx_idle; 1582 --cctx_idle;
1385 1583
1386 if (expect_true (!CCTX_EXPIRED (cctx))) 1584 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1387 return cctx; 1585 return cctx;
1388 1586
1389 cctx_destroy (cctx); 1587 cctx_destroy (cctx);
1390 } 1588 }
1391 1589
… …
1396cctx_put (coro_cctx *cctx) 1594cctx_put (coro_cctx *cctx)
1397{ 1595{
1398 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1596 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1399 1597
1400 /* free another cctx if overlimit */ 1598 /* free another cctx if overlimit */
1401 if (expect_false (cctx_idle >= cctx_max_idle)) 1599 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1402 { 1600 {
1403 coro_cctx *first = cctx_first; 1601 coro_cctx *first = cctx_first;
1404 cctx_first = first->next; 1602 cctx_first = first->next;
1405 --cctx_idle; 1603 --cctx_idle;
1406 1604
… …
1417static void 1615static void
1418transfer_check (pTHX_ struct coro *prev, struct coro *next) 1616transfer_check (pTHX_ struct coro *prev, struct coro *next)
1419{ 1617{
1420 /* TODO: throwing up here is considered harmful */ 1618 /* TODO: throwing up here is considered harmful */
1421 1619
1422 if (expect_true (prev != next)) 1620 if (ecb_expect_true (prev != next))
1423 { 1621 {
1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1622 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1623 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1426 1624
1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1625 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1626 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1429 1627
1430#if !PERL_VERSION_ATLEAST (5,10,0) 1628#if !PERL_VERSION_ATLEAST (5,10,0)
1431 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1629 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1432 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1630 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1433#endif 1631#endif
1434 } 1632 }
1435} 1633}
1436 1634
1437/* always use the TRANSFER macro */ 1635/* always use the TRANSFER macro */
1438static void NOINLINE /* noinline so we have a fixed stackframe */ 1636static void ecb_noinline /* noinline so we have a fixed stackframe */
1439transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1637transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1440{ 1638{
1441 dSTACKLEVEL; 1639 dSTACKLEVEL;
1442 1640
1443 /* sometimes transfer is only called to set idle_sp */ 1641 /* sometimes transfer is only called to set idle_sp */
1444 if (expect_false (!prev)) 1642 if (ecb_expect_false (!prev))
1445 { 1643 {
1446 cctx_current->idle_sp = STACKLEVEL; 1644 cctx_current->idle_sp = STACKLEVEL;
1447 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1645 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1448 } 1646 }
1449 else if (expect_true (prev != next)) 1647 else if (ecb_expect_true (prev != next))
1450 { 1648 {
1451 coro_cctx *cctx_prev; 1649 coro_cctx *cctx_prev;
1452 1650
1453 if (expect_false (prev->flags & CF_NEW)) 1651 if (ecb_expect_false (prev->flags & CF_NEW))
1454 { 1652 {
1455 /* create a new empty/source context */ 1653 /* create a new empty/source context */
1456 prev->flags &= ~CF_NEW; 1654 prev->flags &= ~CF_NEW;
1457 prev->flags |= CF_RUNNING; 1655 prev->flags |= CF_RUNNING;
1458 } 1656 }
… …
1461 next->flags |= CF_RUNNING; 1659 next->flags |= CF_RUNNING;
1462 1660
1463 /* first get rid of the old state */ 1661 /* first get rid of the old state */
1464 save_perl (aTHX_ prev); 1662 save_perl (aTHX_ prev);
1465 1663
1466 if (expect_false (next->flags & CF_NEW)) 1664 if (ecb_expect_false (next->flags & CF_NEW))
1467 { 1665 {
1468 /* need to start coroutine */ 1666 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1667 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1668 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1669 init_perl (aTHX_ next);
1472 } 1670 }
1473 else 1671 else
1474 load_perl (aTHX_ next); 1672 load_perl (aTHX_ next);
1475 1673
1476 /* possibly untie and reuse the cctx */ 1674 /* possibly untie and reuse the cctx */
1477 if (expect_true ( 1675 if (ecb_expect_true (
1478 cctx_current->idle_sp == STACKLEVEL 1676 cctx_current->idle_sp == STACKLEVEL
1479 && !(cctx_current->flags & CC_TRACE) 1677 && !(cctx_current->flags & CC_TRACE)
1480 && !force_cctx 1678 && !force_cctx
1481 )) 1679 ))
1482 { 1680 {
1483 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1681 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1484 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1682 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1485 1683
1486 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1684 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1487 /* without this the next cctx_get might destroy the running cctx while still in use */ 1685 /* without this the next cctx_get might destroy the running cctx while still in use */
1488 if (expect_false (CCTX_EXPIRED (cctx_current))) 1686 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1489 if (expect_true (!next->cctx)) 1687 if (ecb_expect_true (!next->cctx))
1490 next->cctx = cctx_get (aTHX); 1688 next->cctx = cctx_get (aTHX);
1491 1689
1492 cctx_put (cctx_current); 1690 cctx_put (cctx_current);
1493 } 1691 }
1494 else 1692 else
1495 prev->cctx = cctx_current; 1693 prev->cctx = cctx_current;
1496 1694
1497 ++next->usecount; 1695 ++next->usecount;
1498 1696
1499 cctx_prev = cctx_current; 1697 cctx_prev = cctx_current;
1500 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1698 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1501 1699
1502 next->cctx = 0; 1700 next->cctx = 0;
1503 1701
1504 if (expect_false (cctx_prev != cctx_current)) 1702 if (ecb_expect_false (cctx_prev != cctx_current))
1505 { 1703 {
1506 cctx_prev->top_env = PL_top_env; 1704 cctx_prev->top_env = PL_top_env;
1507 PL_top_env = cctx_current->top_env; 1705 PL_top_env = cctx_current->top_env;
1508 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1706 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1509 } 1707 }
… …
1515#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1713#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1714#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1715
1518/** high level stuff ********************************************************/ 1716/** high level stuff ********************************************************/
1519 1717
1718/* this function is actually Coro, not Coro::State, but we call it from here */
1719/* because it is convenient - but it hasn't been declared yet for that reason */
1520static int 1720static void
1721coro_call_on_destroy (pTHX_ struct coro *coro);
1722
1723static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1724coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1725{
1523 if (coro->flags & CF_DESTROYED) 1726 if (coro->flags & CF_ZOMBIE)
1524 return 0; 1727 return;
1525 1728
1526 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1729 slf_destroy (aTHX_ coro);
1528 1730
1529 coro->flags |= CF_DESTROYED; 1731 coro->flags |= CF_ZOMBIE;
1530 1732
1531 if (coro->flags & CF_READY) 1733 if (coro->flags & CF_READY)
1532 { 1734 {
1533 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1735 /* reduce nready, as destroying a ready coro effectively unreadies it */
1534 /* alternative: look through all ready queues and remove the coro */ 1736 /* alternative: look through all ready queues and remove the coro */
1535 --coro_nready; 1737 --coro_nready;
1536 } 1738 }
1537 else 1739 else
1538 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1740 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1741
1742 if (coro->next) coro->next->prev = coro->prev;
1743 if (coro->prev) coro->prev->next = coro->next;
1744 if (coro == coro_first) coro_first = coro->next;
1539 1745
1540 if (coro->mainstack 1746 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1747 && coro->mainstack != main_mainstack
1542 && coro->slot 1748 && coro->slot
1543 && !PL_dirty) 1749 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1750 destroy_perl (aTHX_ coro);
1545 1751
1546 cctx_destroy (coro->cctx); 1752 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1753 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1754 SvREFCNT_dec (coro->args);
1755 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1756 SvREFCNT_dec (CORO_THROW);
1550 1757
1551 if (coro->next) coro->next->prev = coro->prev; 1758 coro_call_on_destroy (aTHX_ coro);
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554 1759
1555 return 1; 1760 /* more destruction mayhem in coro_state_free */
1556} 1761}
1557 1762
1558static int 1763static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1764coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1765{
1561 struct coro *coro = (struct coro *)mg->mg_ptr; 1766 struct coro *coro = (struct coro *)mg->mg_ptr;
1562 mg->mg_ptr = 0; 1767 mg->mg_ptr = 0;
1563 1768
1564 coro->hv = 0;
1565
1566 if (--coro->refcnt < 0)
1567 {
1568 coro_state_destroy (aTHX_ coro); 1769 coro_state_destroy (aTHX_ coro);
1770 SvREFCNT_dec (coro->on_destroy);
1771 SvREFCNT_dec (coro->status);
1772
1569 Safefree (coro); 1773 Safefree (coro);
1570 }
1571 1774
1572 return 0; 1775 return 0;
1573} 1776}
1574 1777
1575static int 1778static int ecb_cold
1576coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1779coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1577{ 1780{
1578 struct coro *coro = (struct coro *)mg->mg_ptr; 1781 /* called when perl clones the current process the slow way (windows process emulation) */
1579 1782 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1580 ++coro->refcnt; 1783 mg->mg_ptr = 0;
1784 mg->mg_virtual = 0;
1581 1785
1582 return 0; 1786 return 0;
1583} 1787}
1584 1788
1585static MGVTBL coro_state_vtbl = { 1789static MGVTBL coro_state_vtbl = {
… …
1608 1812
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1813 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1814 TRANSFER (ta, 1);
1611} 1815}
1612 1816
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1817/** Coro ********************************************************************/
1637 1818
1638INLINE void 1819ecb_inline void
1639coro_enq (pTHX_ struct coro *coro) 1820coro_enq (pTHX_ struct coro *coro)
1640{ 1821{
1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1822 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1642 1823
1643 SvREFCNT_inc_NN (coro->hv); 1824 SvREFCNT_inc_NN (coro->hv);
… …
1645 coro->next_ready = 0; 1826 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1827 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro; 1828 ready [1] = coro;
1648} 1829}
1649 1830
1650INLINE struct coro * 1831ecb_inline struct coro *
1651coro_deq (pTHX) 1832coro_deq (pTHX)
1652{ 1833{
1653 int prio; 1834 int prio;
1654 1835
1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1836 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1665 } 1846 }
1666 1847
1667 return 0; 1848 return 0;
1668} 1849}
1669 1850
1851static void
1852invoke_sv_ready_hook_helper (void)
1853{
1854 dTHX;
1855 dSP;
1856
1857 ENTER;
1858 SAVETMPS;
1859
1860 PUSHMARK (SP);
1861 PUTBACK;
1862 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1863
1864 FREETMPS;
1865 LEAVE;
1866}
1867
1670static int 1868static int
1671api_ready (pTHX_ SV *coro_sv) 1869api_ready (pTHX_ SV *coro_sv)
1672{ 1870{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1871 struct coro *coro = SvSTATE (coro_sv);
1678 1872
1679 if (coro->flags & CF_READY) 1873 if (coro->flags & CF_READY)
1680 return 0; 1874 return 0;
1681 1875
1682 coro->flags |= CF_READY; 1876 coro->flags |= CF_READY;
1683 1877
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1878 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1879
1690 if (sv_hook) 1880 if (!coro_nready++)
1691 { 1881 if (coroapi.readyhook)
1692 dSP; 1882 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1883
1708 return 1; 1884 return 1;
1709} 1885}
1710 1886
1711static int 1887static int
… …
1713{ 1889{
1714 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1890 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1715} 1891}
1716 1892
1717/* expects to own a reference to next->hv */ 1893/* expects to own a reference to next->hv */
1718INLINE void 1894ecb_inline void
1719prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1895prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1720{ 1896{
1721 SV *prev_sv = SvRV (coro_current); 1897 SV *prev_sv = SvRV (coro_current);
1722 1898
1723 ta->prev = SvSTATE_hv (prev_sv); 1899 ta->prev = SvSTATE_hv (prev_sv);
… …
1736{ 1912{
1737 for (;;) 1913 for (;;)
1738 { 1914 {
1739 struct coro *next = coro_deq (aTHX); 1915 struct coro *next = coro_deq (aTHX);
1740 1916
1741 if (expect_true (next)) 1917 if (ecb_expect_true (next))
1742 { 1918 {
1743 /* cannot transfer to destroyed coros, skip and look for next */ 1919 /* cannot transfer to destroyed coros, skip and look for next */
1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1920 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1921 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1746 else 1922 else
1747 { 1923 {
1748 next->flags &= ~CF_READY; 1924 next->flags &= ~CF_READY;
1749 --coro_nready; 1925 --coro_nready;
… …
1756 { 1932 {
1757 /* nothing to schedule: call the idle handler */ 1933 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1934 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1935 && SvOBJECT (SvRV (sv_idle)))
1760 { 1936 {
1937 if (SvRV (sv_idle) == SvRV (coro_current))
1938 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1939
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1941 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1942 --coro_nready;
1764 } 1943 }
1765 else 1944 else
1766 { 1945 {
1946 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1947 dSP;
1768 1948
1769 ENTER; 1949 ENTER;
1770 SAVETMPS; 1950 SAVETMPS;
1771 1951
… …
1778 } 1958 }
1779 } 1959 }
1780 } 1960 }
1781} 1961}
1782 1962
1783INLINE void 1963ecb_inline void
1784prepare_cede (pTHX_ struct coro_transfer_args *ta) 1964prepare_cede (pTHX_ struct coro_transfer_args *ta)
1785{ 1965{
1786 api_ready (aTHX_ coro_current); 1966 api_ready (aTHX_ coro_current);
1787 prepare_schedule (aTHX_ ta); 1967 prepare_schedule (aTHX_ ta);
1788} 1968}
1789 1969
1790INLINE void 1970ecb_inline void
1791prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1971prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1792{ 1972{
1793 SV *prev = SvRV (coro_current); 1973 SV *prev = SvRV (coro_current);
1794 1974
1795 if (coro_nready) 1975 if (coro_nready)
… …
1825{ 2005{
1826 struct coro_transfer_args ta; 2006 struct coro_transfer_args ta;
1827 2007
1828 prepare_cede (aTHX_ &ta); 2008 prepare_cede (aTHX_ &ta);
1829 2009
1830 if (expect_true (ta.prev != ta.next)) 2010 if (ecb_expect_true (ta.prev != ta.next))
1831 { 2011 {
1832 TRANSFER (ta, 1); 2012 TRANSFER (ta, 1);
1833 return 1; 2013 return 1;
1834 } 2014 }
1835 else 2015 else
… …
1878 coro->slot->runops = RUNOPS_DEFAULT; 2058 coro->slot->runops = RUNOPS_DEFAULT;
1879 } 2059 }
1880} 2060}
1881 2061
1882static void 2062static void
2063coro_push_av (pTHX_ AV *av, I32 gimme_v)
2064{
2065 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2066 {
2067 dSP;
2068
2069 if (gimme_v == G_SCALAR)
2070 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2071 else
2072 {
2073 int i;
2074 EXTEND (SP, AvFILLp (av) + 1);
2075
2076 for (i = 0; i <= AvFILLp (av); ++i)
2077 PUSHs (AvARRAY (av)[i]);
2078 }
2079
2080 PUTBACK;
2081 }
2082}
2083
2084static void
2085coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2086{
2087 if (!coro->on_destroy)
2088 coro->on_destroy = newAV ();
2089
2090 av_push (coro->on_destroy, cb);
2091}
2092
2093static void
2094slf_destroy_join (pTHX_ struct CoroSLF *frame)
2095{
2096 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2097}
2098
2099static int
2100slf_check_join (pTHX_ struct CoroSLF *frame)
2101{
2102 struct coro *coro = (struct coro *)frame->data;
2103
2104 if (!coro->status)
2105 return 1;
2106
2107 frame->destroy = 0;
2108
2109 coro_push_av (aTHX_ coro->status, GIMME_V);
2110
2111 SvREFCNT_dec ((SV *)coro->hv);
2112
2113 return 0;
2114}
2115
2116static void
2117slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2118{
2119 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2120
2121 if (items > 1)
2122 croak ("join called with too many arguments");
2123
2124 if (coro->status)
2125 frame->prepare = prepare_nop;
2126 else
2127 {
2128 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2129 frame->prepare = prepare_schedule;
2130 }
2131
2132 frame->check = slf_check_join;
2133 frame->destroy = slf_destroy_join;
2134 frame->data = (void *)coro;
2135 SvREFCNT_inc (coro->hv);
2136}
2137
2138static void
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2139coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2140{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2141 AV *od = coro->on_destroy;
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2142
1888 if (on_destroyp) 2143 if (!od)
1889 { 2144 return;
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1891 2145
1892 while (AvFILLp (on_destroy) >= 0) 2146 while (AvFILLp (od) >= 0)
2147 {
2148 SV *cb = sv_2mortal (av_pop (od));
2149
2150 /* coro hv's (and only hv's at the moment) are supported as well */
2151 if (SvSTATEhv_p (aTHX_ cb))
2152 api_ready (aTHX_ cb);
2153 else
1893 { 2154 {
1894 dSP; /* don't disturb outer sp */ 2155 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy);
1896
1897 PUSHMARK (SP); 2156 PUSHMARK (SP);
1898 2157
1899 if (statusp) 2158 if (coro->status)
1900 { 2159 {
1901 int i; 2160 PUTBACK;
1902 AV *status = (AV *)SvRV (*statusp); 2161 coro_push_av (aTHX_ coro->status, G_ARRAY);
1903 EXTEND (SP, AvFILLp (status) + 1); 2162 SPAGAIN;
1904
1905 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]);
1907 } 2163 }
1908 2164
1909 PUTBACK; 2165 PUTBACK;
1910 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2166 call_sv (cb, G_VOID | G_DISCARD);
1911 } 2167 }
1912 } 2168 }
1913} 2169}
1914 2170
1915static void 2171static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2172coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1917{ 2173{
2174 AV *av;
2175
2176 if (coro->status)
2177 {
2178 av = coro->status;
2179 av_clear (av);
2180 }
2181 else
2182 av = coro->status = newAV ();
2183
2184 /* items are actually not so common, so optimise for this case */
2185 if (items)
2186 {
1918 int i; 2187 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV ();
1921 2188
1922 av_extend (av, items - 1); 2189 av_extend (av, items - 1);
2190
1923 for (i = 0; i < items; ++i) 2191 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2192 av_push (av, SvREFCNT_inc_NN (arg [i]));
2193 }
2194}
1925 2195
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2196static void
1927 2197slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2198{
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2199 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2200 api_ready (aTHX_ sv_manager);
1930 2201
1931 frame->prepare = prepare_schedule; 2202 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2203 frame->check = slf_check_repeat;
1933 2204
1934 /* as a minor optimisation, we could unwind all stacks here */ 2205 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2206 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2207 /*coro_unwind_stacks (aTHX);*/
2208}
2209
2210static void
2211slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2212{
2213 HV *coro_hv = (HV *)SvRV (coro_current);
2214
2215 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217}
2218
2219static void
2220slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{
2222 HV *coro_hv;
2223 struct coro *coro;
2224
2225 if (items <= 0)
2226 croak ("Coro::cancel called without coro object,");
2227
2228 coro = SvSTATE (arg [0]);
2229 coro_hv = coro->hv;
2230
2231 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2232
2233 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2234 {
2235 /* coro currently busy cancelling something, so just notify it */
2236 coro->slf_frame.data = (void *)coro;
2237
2238 frame->prepare = prepare_nop;
2239 frame->check = slf_check_nop;
2240 }
2241 else if (coro_hv == (HV *)SvRV (coro_current))
2242 {
2243 /* cancelling the current coro is allowed, and equals terminate */
2244 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2245 }
2246 else
2247 {
2248 struct coro *self = SvSTATE_current;
2249
2250 /* otherwise we cancel directly, purely for speed reasons
2251 * unfortunately, this requires some magic trickery, as
2252 * somebody else could cancel us, so we have to fight the cancellation.
2253 * this is ugly, and hopefully fully worth the extra speed.
2254 * besides, I can't get the slow-but-safe version working...
2255 */
2256 slf_frame.data = 0;
2257 self->flags |= CF_NOCANCEL;
2258 coro_state_destroy (aTHX_ coro);
2259 self->flags &= ~CF_NOCANCEL;
2260
2261 if (slf_frame.data)
2262 {
2263 /* while we were busy we have been cancelled, so terminate */
2264 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2265 }
2266 else
2267 {
2268 frame->prepare = prepare_nop;
2269 frame->check = slf_check_nop;
2270 }
2271 }
2272}
2273
2274static int
2275slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2276{
2277 frame->prepare = 0;
2278 coro_unwind_stacks (aTHX);
2279
2280 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2281
2282 return 1;
2283}
2284
2285static int
2286safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2287{
2288 if (coro->cctx)
2289 croak ("coro inside C callback, unable to cancel at this time, caught");
2290
2291 if (coro->flags & CF_NEW)
2292 {
2293 coro_set_status (aTHX_ coro, arg, items);
2294 coro_state_destroy (aTHX_ coro);
2295 }
2296 else
2297 {
2298 if (!coro->slf_frame.prepare)
2299 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2300
2301 slf_destroy (aTHX_ coro);
2302
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro->slf_frame.prepare = prepare_nop;
2305 coro->slf_frame.check = slf_check_safe_cancel;
2306
2307 api_ready (aTHX_ (SV *)coro->hv);
2308 }
2309
2310 return 1;
1937} 2311}
1938 2312
1939/*****************************************************************************/ 2313/*****************************************************************************/
1940/* async pool handler */ 2314/* async pool handler */
1941 2315
… …
1972slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2346slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1973{ 2347{
1974 HV *hv = (HV *)SvRV (coro_current); 2348 HV *hv = (HV *)SvRV (coro_current);
1975 struct coro *coro = SvSTATE_hv ((SV *)hv); 2349 struct coro *coro = SvSTATE_hv ((SV *)hv);
1976 2350
1977 if (expect_true (coro->saved_deffh)) 2351 if (ecb_expect_true (coro->saved_deffh))
1978 { 2352 {
1979 /* subsequent iteration */ 2353 /* subsequent iteration */
1980 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2354 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1981 coro->saved_deffh = 0; 2355 coro->saved_deffh = 0;
1982 2356
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2357 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2358 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 { 2359 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2360 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1987 coro->invoke_av = newAV (); 2361 return;
1988
1989 frame->prepare = prepare_nop;
1990 } 2362 }
1991 else 2363 else
1992 { 2364 {
1993 av_clear (GvAV (PL_defgv)); 2365 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2366 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2019 2391
2020static void 2392static void
2021coro_rouse_callback (pTHX_ CV *cv) 2393coro_rouse_callback (pTHX_ CV *cv)
2022{ 2394{
2023 dXSARGS; 2395 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2396 SV *data = (SV *)S_GENSUB_ARG;
2025 2397
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2398 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2399 {
2028 /* first call, set args */ 2400 /* first call, set args */
2029 SV *coro = SvRV (data); 2401 SV *coro = SvRV (data);
… …
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2467 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2468 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2469 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2470
2099 { 2471 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2472 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2473 SV *data = (SV *)S_GENSUB_ARG;
2102 2474
2103 frame->data = (void *)data; 2475 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2476 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2477 frame->check = slf_check_rouse_wait;
2106 } 2478 }
… …
2110coro_new_rouse_cb (pTHX) 2482coro_new_rouse_cb (pTHX)
2111{ 2483{
2112 HV *hv = (HV *)SvRV (coro_current); 2484 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2485 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2486 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2487 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2488
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2489 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2490 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2491
2120 SvREFCNT_dec (coro->rouse_cb); 2492 SvREFCNT_dec (coro->rouse_cb);
… …
2217static void 2589static void
2218slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2590slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{ 2591{
2220 frame->prepare = prepare_cede_notself; 2592 frame->prepare = prepare_cede_notself;
2221 frame->check = slf_check_nop; 2593 frame->check = slf_check_nop;
2594}
2595
2596/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2597static void
2598slf_destroy (pTHX_ struct coro *coro)
2599{
2600 /* this callback is reserved for slf functions needing to do cleanup */
2601 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2602 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2603
2604 /*
2605 * The on_destroy above most likely is from an SLF call.
2606 * Since by definition the SLF call will not finish when we destroy
2607 * the coro, we will have to force-finish it here, otherwise
2608 * cleanup functions cannot call SLF functions.
2609 */
2610 coro->slf_frame.prepare = 0;
2222} 2611}
2223 2612
2224/* 2613/*
2225 * these not obviously related functions are all rolled into one 2614 * these not obviously related functions are all rolled into one
2226 * function to increase chances that they all will call transfer with the same 2615 * function to increase chances that they all will call transfer with the same
… …
2233 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2622 I32 checkmark; /* mark SP to see how many elements check has pushed */
2234 2623
2235 /* set up the slf frame, unless it has already been set-up */ 2624 /* set up the slf frame, unless it has already been set-up */
2236 /* the latter happens when a new coro has been started */ 2625 /* the latter happens when a new coro has been started */
2237 /* or when a new cctx was attached to an existing coroutine */ 2626 /* or when a new cctx was attached to an existing coroutine */
2238 if (expect_true (!slf_frame.prepare)) 2627 if (ecb_expect_true (!slf_frame.prepare))
2239 { 2628 {
2240 /* first iteration */ 2629 /* first iteration */
2241 dSP; 2630 dSP;
2242 SV **arg = PL_stack_base + TOPMARK + 1; 2631 SV **arg = PL_stack_base + TOPMARK + 1;
2243 int items = SP - arg; /* args without function object */ 2632 int items = SP - arg; /* args without function object */
… …
2284 while (slf_frame.check (aTHX_ &slf_frame)); 2673 while (slf_frame.check (aTHX_ &slf_frame));
2285 2674
2286 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2675 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2287 2676
2288 /* exception handling */ 2677 /* exception handling */
2289 if (expect_false (CORO_THROW)) 2678 if (ecb_expect_false (CORO_THROW))
2290 { 2679 {
2291 SV *exception = sv_2mortal (CORO_THROW); 2680 SV *exception = sv_2mortal (CORO_THROW);
2292 2681
2293 CORO_THROW = 0; 2682 CORO_THROW = 0;
2294 sv_setsv (ERRSV, exception); 2683 sv_setsv (ERRSV, exception);
2295 croak (0); 2684 croak (0);
2296 } 2685 }
2297 2686
2298 /* return value handling - mostly like entersub */ 2687 /* return value handling - mostly like entersub */
2299 /* make sure we put something on the stack in scalar context */ 2688 /* make sure we put something on the stack in scalar context */
2300 if (GIMME_V == G_SCALAR) 2689 if (GIMME_V == G_SCALAR
2690 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2301 { 2691 {
2302 dSP; 2692 dSP;
2303 SV **bot = PL_stack_base + checkmark; 2693 SV **bot = PL_stack_base + checkmark;
2304 2694
2305 if (sp == bot) /* too few, push undef */ 2695 if (sp == bot) /* too few, push undef */
2306 bot [1] = &PL_sv_undef; 2696 bot [1] = &PL_sv_undef;
2307 else if (sp != bot + 1) /* too many, take last one */ 2697 else /* too many, take last one */
2308 bot [1] = *sp; 2698 bot [1] = *sp;
2309 2699
2310 SP = bot + 1; 2700 SP = bot + 1;
2311 2701
2312 PUTBACK; 2702 PUTBACK;
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2735 if (PL_op->op_flags & OPf_STACKED)
2346 { 2736 {
2347 if (items > slf_arga) 2737 if (items > slf_arga)
2348 { 2738 {
2349 slf_arga = items; 2739 slf_arga = items;
2350 free (slf_argv); 2740 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2741 New (0, slf_argv, slf_arga, SV *);
2352 } 2742 }
2353 2743
2354 slf_argc = items; 2744 slf_argc = items;
2355 2745
2356 for (i = 0; i < items; ++i) 2746 for (i = 0; i < items; ++i)
… …
2419{ 2809{
2420 PerlIOBuf base; 2810 PerlIOBuf base;
2421 NV next, every; 2811 NV next, every;
2422} PerlIOCede; 2812} PerlIOCede;
2423 2813
2424static IV 2814static IV ecb_cold
2425PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2815PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2426{ 2816{
2427 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2817 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2428 2818
2429 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2819 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2430 self->next = nvtime () + self->every; 2820 self->next = nvtime () + self->every;
2431 2821
2432 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2822 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2433} 2823}
2434 2824
2435static SV * 2825static SV * ecb_cold
2436PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2826PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2437{ 2827{
2438 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2828 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2439 2829
2440 return newSVnv (self->every); 2830 return newSVnv (self->every);
… …
2552 SvREFCNT_dec (cb); 2942 SvREFCNT_dec (cb);
2553 } 2943 }
2554} 2944}
2555 2945
2556static void 2946static void
2557coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2947coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2558{ 2948{
2559 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2949 /* call $sem->adjust (0) to possibly wake up some other waiters */
2560 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2950 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2561} 2951}
2562 2952
2563static int 2953static int
2564slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2954slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2565{ 2955{
2566 AV *av = (AV *)frame->data; 2956 AV *av = (AV *)frame->data;
2567 SV *count_sv = AvARRAY (av)[0]; 2957 SV *count_sv = AvARRAY (av)[0];
2958 SV *coro_hv = SvRV (coro_current);
2568 2959
2569 /* if we are about to throw, don't actually acquire the lock, just throw */ 2960 /* if we are about to throw, don't actually acquire the lock, just throw */
2570 if (CORO_THROW) 2961 if (CORO_THROW)
2571 return 0; 2962 return 0;
2572 else if (SvIVX (count_sv) > 0) 2963 else if (SvIVX (count_sv) > 0)
2573 { 2964 {
2574 SvSTATE_current->on_destroy = 0; 2965 frame->destroy = 0;
2575 2966
2576 if (acquire) 2967 if (acquire)
2577 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2968 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2578 else 2969 else
2579 coro_semaphore_adjust (aTHX_ av, 0); 2970 coro_semaphore_adjust (aTHX_ av, 0);
… …
2584 { 2975 {
2585 int i; 2976 int i;
2586 /* if we were woken up but can't down, we look through the whole */ 2977 /* if we were woken up but can't down, we look through the whole */
2587 /* waiters list and only add us if we aren't in there already */ 2978 /* waiters list and only add us if we aren't in there already */
2588 /* this avoids some degenerate memory usage cases */ 2979 /* this avoids some degenerate memory usage cases */
2589 2980 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2590 for (i = 1; i <= AvFILLp (av); ++i)
2591 if (AvARRAY (av)[i] == SvRV (coro_current)) 2981 if (AvARRAY (av)[i] == coro_hv)
2592 return 1; 2982 return 1;
2593 2983
2594 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2984 av_push (av, SvREFCNT_inc (coro_hv));
2595 return 1; 2985 return 1;
2596 } 2986 }
2597} 2987}
2598 2988
2599static int 2989static int
… …
2622 { 3012 {
2623 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3013 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2624 3014
2625 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3015 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2626 frame->prepare = prepare_schedule; 3016 frame->prepare = prepare_schedule;
2627
2628 /* to avoid race conditions when a woken-up coro gets terminated */ 3017 /* to avoid race conditions when a woken-up coro gets terminated */
2629 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3018 /* we arrange for a temporary on_destroy that calls adjust (0) */
2630 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3019 frame->destroy = coro_semaphore_destroy;
2631 } 3020 }
2632} 3021}
2633 3022
2634static void 3023static void
2635slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3024slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2643{ 3032{
2644 if (items >= 2) 3033 if (items >= 2)
2645 { 3034 {
2646 /* callback form */ 3035 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 3036 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3037 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 3038
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3039 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 3040
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 3041 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 3042 coro_semaphore_adjust (aTHX_ av, 0);
… …
2713{ 3102{
2714 AV *av = (AV *)SvRV (arg [0]); 3103 AV *av = (AV *)SvRV (arg [0]);
2715 3104
2716 if (items >= 2) 3105 if (items >= 2)
2717 { 3106 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3107 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3108 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 3109
2721 if (SvIVX (AvARRAY (av)[0])) 3110 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3111 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 3112
2724 frame->prepare = prepare_nop; 3113 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 3114 frame->check = slf_check_nop;
2726 } 3115 }
2727 else if (SvIVX (AvARRAY (av)[0])) 3116 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 3147
2759static void 3148static void
2760coro_aio_callback (pTHX_ CV *cv) 3149coro_aio_callback (pTHX_ CV *cv)
2761{ 3150{
2762 dXSARGS; 3151 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 3152 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 3153 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 3154 SV *data_sv = newSV (sizeof (struct io_state));
2766 3155
2767 av_extend (state, items - 1); 3156 av_extend (state, items - 1);
2768 3157
… …
2853 dSP; 3242 dSP;
2854 3243
2855 static SV *prio_cv; 3244 static SV *prio_cv;
2856 static SV *prio_sv; 3245 static SV *prio_sv;
2857 3246
2858 if (expect_false (!prio_cv)) 3247 if (ecb_expect_false (!prio_cv))
2859 { 3248 {
2860 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3249 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2861 prio_sv = newSViv (0); 3250 prio_sv = newSViv (0);
2862 } 3251 }
2863 3252
… …
2882 3271
2883 for (i = 0; i < items; ++i) 3272 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3273 PUSHs (arg [i]);
2885 3274
2886 /* now push the callback closure */ 3275 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3276 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3277
2889 /* now call the AIO function - we assume our request is uncancelable */ 3278 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3279 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3280 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3281 }
2893 3282
2894 /* now that the requets is going, we loop toll we have a result */ 3283 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3284 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3285 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3286 frame->check = slf_check_aio_req;
2898} 3287}
2899 3288
… …
2909 3298
2910/*****************************************************************************/ 3299/*****************************************************************************/
2911 3300
2912#if CORO_CLONE 3301#if CORO_CLONE
2913# include "clone.c" 3302# include "clone.c"
3303#endif
3304
3305/*****************************************************************************/
3306
3307static SV *
3308coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3309{
3310 SV *coro_sv;
3311 struct coro *coro;
3312 MAGIC *mg;
3313 HV *hv;
3314 SV *cb;
3315 int i;
3316
3317 if (argc > 0)
3318 {
3319 cb = s_get_cv_croak (argv [0]);
3320
3321 if (!is_coro)
3322 {
3323 if (CvISXSUB (cb))
3324 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3325
3326 if (!CvROOT (cb))
3327 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3328 }
3329 }
3330
3331 Newz (0, coro, 1, struct coro);
3332 coro->args = newAV ();
3333 coro->flags = CF_NEW;
3334
3335 if (coro_first) coro_first->prev = coro;
3336 coro->next = coro_first;
3337 coro_first = coro;
3338
3339 coro->hv = hv = newHV ();
3340 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3341 mg->mg_flags |= MGf_DUP;
3342 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3343
3344 if (argc > 0)
3345 {
3346 av_extend (coro->args, argc + is_coro - 1);
3347
3348 if (is_coro)
3349 {
3350 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3351 cb = (SV *)cv_coro_run;
3352 }
3353
3354 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3355
3356 for (i = 1; i < argc; i++)
3357 av_push (coro->args, newSVsv (argv [i]));
3358 }
3359
3360 return coro_sv;
3361}
3362
3363#ifndef __cplusplus
3364ecb_cold XS(boot_Coro__State);
3365#endif
3366
3367#if CORO_JIT
3368
3369static void ecb_noinline ecb_cold
3370pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3371{
3372 dSP;
3373 AV *av = newAV ();
3374
3375 av_store (av, 3, newSVuv (d));
3376 av_store (av, 2, newSVuv (c));
3377 av_store (av, 1, newSVuv (b));
3378 av_store (av, 0, newSVuv (a));
3379
3380 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3381
3382 PUTBACK;
3383}
3384
3385static void ecb_noinline ecb_cold
3386jit_init (pTHX)
3387{
3388 dSP;
3389 SV *load, *save;
3390 char *map_base;
3391 char *load_ptr, *save_ptr;
3392 STRLEN load_len, save_len, map_len;
3393 int count;
3394
3395 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3396
3397 PUSHMARK (SP);
3398#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3399# include "state.h"
3400#undef VARx
3401 count = call_pv ("Coro::State::_jit", G_ARRAY);
3402 SPAGAIN;
3403
3404 save = POPs; save_ptr = SvPVbyte (save, save_len);
3405 load = POPs; load_ptr = SvPVbyte (load, load_len);
3406
3407 map_len = load_len + save_len + 16;
3408
3409 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3410
3411 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3412
3413 load_perl_slots = (load_save_perl_slots_type)map_base;
3414 memcpy (map_base, load_ptr, load_len);
3415
3416 map_base += (load_len + 15) & ~15;
3417
3418 save_perl_slots = (load_save_perl_slots_type)map_base;
3419 memcpy (map_base, save_ptr, save_len);
3420
3421 /* we are good citizens and try to make the page read-only, so the evil evil */
3422 /* hackers might have it a bit more difficult */
3423 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3424
3425 PUTBACK;
3426 eval_pv ("undef &Coro::State::_jit", 1);
3427}
3428
2914#endif 3429#endif
2915 3430
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3431MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3432
2918PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
… …
2923# if CORO_PTHREAD 3438# if CORO_PTHREAD
2924 coro_thx = PERL_GET_CONTEXT; 3439 coro_thx = PERL_GET_CONTEXT;
2925# endif 3440# endif
2926#endif 3441#endif
2927 BOOT_PAGESIZE; 3442 BOOT_PAGESIZE;
3443
3444 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV;
3449 ERRSV;
2928 3450
2929 cctx_current = cctx_new_empty (); 3451 cctx_current = cctx_new_empty ();
2930 3452
2931 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2932 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2972 coroapi.prepare_nop = prepare_nop; 3494 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3495 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3496 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3497 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3498
2977 { 3499 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3500
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3501 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3502#if CORO_JIT
3503 PUTBACK;
3504 jit_init (aTHX);
3505 SPAGAIN;
3506#endif
2987} 3507}
2988 3508
2989SV * 3509SV *
2990new (char *klass, ...) 3510new (SV *klass, ...)
2991 ALIAS: 3511 ALIAS:
2992 Coro::new = 1 3512 Coro::new = 1
2993 CODE: 3513 CODE:
2994{ 3514 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3515 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3516 RETVAL
3046 3517
3047void 3518void
3048transfer (...) 3519transfer (...)
3049 PROTOTYPE: $$ 3520 PROTOTYPE: $$
3050 CODE: 3521 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3522 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3052
3053bool
3054_destroy (SV *coro_sv)
3055 CODE:
3056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3057 OUTPUT:
3058 RETVAL
3059 3523
3060void 3524void
3061_exit (int code) 3525_exit (int code)
3062 PROTOTYPE: $ 3526 PROTOTYPE: $
3063 CODE: 3527 CODE:
… …
3139 CODE: 3603 CODE:
3140{ 3604{
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3605 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3142 { 3606 {
3143 struct coro *current = SvSTATE_current; 3607 struct coro *current = SvSTATE_current;
3608 struct CoroSLF slf_save;
3144 3609
3145 if (current != coro) 3610 if (current != coro)
3146 { 3611 {
3147 PUTBACK; 3612 PUTBACK;
3148 save_perl (aTHX_ current); 3613 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3614 load_perl (aTHX_ coro);
3615 /* the coro is most likely in an active SLF call.
3616 * while not strictly required (the code we execute is
3617 * not allowed to call any SLF functions), it's cleaner
3618 * to reinitialise the slf_frame and restore it later.
3619 * This might one day allow us to actually do SLF calls
3620 * from code executed here.
3621 */
3622 slf_save = slf_frame;
3623 slf_frame.prepare = 0;
3150 SPAGAIN; 3624 SPAGAIN;
3151 } 3625 }
3152 3626
3153 PUSHSTACK; 3627 PUSHSTACK;
3154 3628
… …
3164 SPAGAIN; 3638 SPAGAIN;
3165 3639
3166 if (current != coro) 3640 if (current != coro)
3167 { 3641 {
3168 PUTBACK; 3642 PUTBACK;
3643 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3644 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3645 load_perl (aTHX_ current);
3171 SPAGAIN; 3646 SPAGAIN;
3172 } 3647 }
3173 } 3648 }
… …
3178 PROTOTYPE: $ 3653 PROTOTYPE: $
3179 ALIAS: 3654 ALIAS:
3180 is_ready = CF_READY 3655 is_ready = CF_READY
3181 is_running = CF_RUNNING 3656 is_running = CF_RUNNING
3182 is_new = CF_NEW 3657 is_new = CF_NEW
3183 is_destroyed = CF_DESTROYED 3658 is_destroyed = CF_ZOMBIE
3659 is_zombie = CF_ZOMBIE
3184 is_suspended = CF_SUSPENDED 3660 is_suspended = CF_SUSPENDED
3185 CODE: 3661 CODE:
3186 RETVAL = boolSV (coro->flags & ix); 3662 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3663 OUTPUT:
3188 RETVAL 3664 RETVAL
3189 3665
3190void 3666void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3667throw (Coro::State self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3668 PROTOTYPE: $;$
3193 CODE: 3669 CODE:
3194{ 3670{
3195 struct coro *current = SvSTATE_current; 3671 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3672 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3197 SvREFCNT_dec (*throwp); 3673 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3674 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3675 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3200} 3676}
3201 3677
3202void 3678void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3679api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3680 PROTOTYPE: $;$
… …
3259 3735
3260void 3736void
3261cancel (Coro::State self) 3737cancel (Coro::State self)
3262 CODE: 3738 CODE:
3263 coro_state_destroy (aTHX_ self); 3739 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3740
3741SV *
3742enable_times (int enabled = enable_times)
3743 CODE:
3744{
3745 RETVAL = boolSV (enable_times);
3746
3747 if (enabled != enable_times)
3748 {
3749 enable_times = enabled;
3750
3751 coro_times_update ();
3752 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3753 }
3754}
3755 OUTPUT:
3756 RETVAL
3757
3758void
3759times (Coro::State self)
3760 PPCODE:
3761{
3762 struct coro *current = SvSTATE (coro_current);
3763
3764 if (ecb_expect_false (current == self))
3765 {
3766 coro_times_update ();
3767 coro_times_add (SvSTATE (coro_current));
3768 }
3769
3770 EXTEND (SP, 2);
3771 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3772 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3773
3774 if (ecb_expect_false (current == self))
3775 coro_times_sub (SvSTATE (coro_current));
3776}
3777
3778void
3779swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3780 CODE:
3781{
3782 struct coro *current = SvSTATE_current;
3783
3784 if (current == coro)
3785 SWAP_SVS (current);
3786
3787 if (!coro->swap_sv)
3788 coro->swap_sv = newAV ();
3789
3790 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3791 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3792
3793 if (current == coro)
3794 SWAP_SVS (current);
3795}
3265 3796
3266 3797
3267MODULE = Coro::State PACKAGE = Coro 3798MODULE = Coro::State PACKAGE = Coro
3268 3799
3269BOOT: 3800BOOT:
3270{ 3801{
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3802 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3803 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3804 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3805 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3806 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3807 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3808 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3809 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3810
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3811 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3812 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3813 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3814 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3815
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3816 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3817
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3308 sv_setiv (sv, (IV)&coroapi); 3838 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3839 SvREADONLY_on (sv);
3310 } 3840 }
3311} 3841}
3312 3842
3843SV *
3844async (...)
3845 PROTOTYPE: &@
3846 CODE:
3847 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3848 api_ready (aTHX_ RETVAL);
3849 OUTPUT:
3850 RETVAL
3851
3852void
3853_destroy (Coro::State coro)
3854 CODE:
3855 /* used by the manager thread */
3856 coro_state_destroy (aTHX_ coro);
3857
3858void
3859on_destroy (Coro::State coro, SV *cb)
3860 CODE:
3861 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3862
3863void
3864join (...)
3865 CODE:
3866 CORO_EXECUTE_SLF_XS (slf_init_join);
3867
3313void 3868void
3314terminate (...) 3869terminate (...)
3315 CODE: 3870 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3871 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3872
3873void
3874cancel (...)
3875 CODE:
3876 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3877
3878int
3879safe_cancel (Coro::State self, ...)
3880 C_ARGS: aTHX_ self, &ST (1), items - 1
3317 3881
3318void 3882void
3319schedule (...) 3883schedule (...)
3320 CODE: 3884 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3885 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3351_set_readyhook (SV *hook) 3915_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3916 PROTOTYPE: $
3353 CODE: 3917 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3918 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3919 SvGETMAGIC (hook);
3920 if (SvOK (hook))
3921 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3922 coro_readyhook = newSVsv (hook);
3923 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3924 }
3925 else
3926 {
3927 coro_readyhook = 0;
3928 CORO_READYHOOK = 0;
3929 }
3357 3930
3358int 3931int
3359prio (Coro::State coro, int newprio = 0) 3932prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3933 PROTOTYPE: $;$
3361 ALIAS: 3934 ALIAS:
… …
3367 if (items > 1) 3940 if (items > 1)
3368 { 3941 {
3369 if (ix) 3942 if (ix)
3370 newprio = coro->prio - newprio; 3943 newprio = coro->prio - newprio;
3371 3944
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3945 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3946 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3947
3375 coro->prio = newprio; 3948 coro->prio = newprio;
3376 } 3949 }
3377} 3950}
3378 OUTPUT: 3951 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 3998 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 3999 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 4000
3428 if ((SV *)hv == &PL_sv_undef) 4001 if ((SV *)hv == &PL_sv_undef)
3429 { 4002 {
3430 PUSHMARK (SP); 4003 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4004 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4005 SvREFCNT_dec (sv);
3439 } 4006 }
3440 4007
3441 { 4008 {
3442 struct coro *coro = SvSTATE_hv (hv); 4009 struct coro *coro = SvSTATE_hv (hv);
3443 4010
… …
3477 CODE: 4044 CODE:
3478{ 4045{
3479 struct coro *coro = SvSTATE_current; 4046 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4047 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 4048
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 4049 block = s_get_cv_croak (block);
3483 4050
3484 if (!*avp) 4051 if (!*avp)
3485 *avp = newAV (); 4052 *avp = newAV ();
3486 4053
3487 av_push (*avp, SvREFCNT_inc (block)); 4054 av_push (*avp, SvREFCNT_inc (block));
… …
3594} 4161}
3595 4162
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4163MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597 4164
3598void 4165void
3599_may_delete (SV *sem, int count, int extra_refs) 4166_may_delete (SV *sem, int count, unsigned int extra_refs)
3600 PPCODE: 4167 PPCODE:
3601{ 4168{
3602 AV *av = (AV *)SvRV (sem); 4169 AV *av = (AV *)SvRV (sem);
3603 4170
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4171 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3687 4254
3688void 4255void
3689_register (char *target, char *proto, SV *req) 4256_register (char *target, char *proto, SV *req)
3690 CODE: 4257 CODE:
3691{ 4258{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 4259 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 4260 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4261 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 4262 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4263 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 4264}
3698 4265
4266MODULE = Coro::State PACKAGE = Coro::Select
4267
4268void
4269patch_pp_sselect ()
4270 CODE:
4271 if (!coro_old_pp_sselect)
4272 {
4273 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4274 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4275 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4276 }
4277
4278void
4279unpatch_pp_sselect ()
4280 CODE:
4281 if (coro_old_pp_sselect)
4282 {
4283 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4284 coro_old_pp_sselect = 0;
4285 }
4286

Diff Legend

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