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.349 by root, Wed Jun 10 00:47:24 2009 UTC vs.
Revision 1.420 by root, Fri Apr 13 10:53:25 2012 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
163 105
106#ifdef __linux
107# include <time.h> /* for timespec */
108# include <syscall.h> /* for SYS_* */
109# ifdef SYS_clock_gettime
110# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
111# define CORO_CLOCK_MONOTONIC 1
112# define CORO_CLOCK_THREAD_CPUTIME_ID 3
113# endif
114#endif
115
164static double (*nvtime)(); /* so why doesn't it take void? */ 116static double (*nvtime)(); /* so why doesn't it take void? */
117static void (*u2time)(pTHX_ UV ret[2]);
165 118
166/* we hijack an hopefully unused CV flag for our purposes */ 119/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 120#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 121static OP *pp_slf (pTHX);
122static void slf_destroy (pTHX_ struct coro *coro);
169 123
170static U32 cctx_gen; 124static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 125static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 126static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 127static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 144static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 145static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 146static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 147static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 148static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 149
197/* Coro::AnyEvent */ 150/* Coro::AnyEvent */
198static SV *sv_activity; 151static SV *sv_activity;
199 152
153/* enable processtime/realtime profiling */
154static char enable_times;
155typedef U32 coro_ts[2];
156static coro_ts time_real, time_cpu;
157static char times_valid;
158
200static struct coro_cctx *cctx_first; 159static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 160static int cctx_count, cctx_idle;
202 161
203enum { 162enum
163{
204 CC_MAPPED = 0x01, 164 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 165 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 166 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 167 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 168 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
218 void *sptr; 178 void *sptr;
219 size_t ssize; 179 size_t ssize;
220 180
221 /* cpu state */ 181 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 184 JMPENV *idle_te; /* same as idle_sp, but for top_env */
185#endif
224 JMPENV *top_env; 186 JMPENV *top_env;
225 coro_context cctx; 187 coro_context cctx;
226 188
227 U32 gen; 189 U32 gen;
228#if CORO_USE_VALGRIND 190#if CORO_USE_VALGRIND
229 int valgrind_id; 191 int valgrind_id;
230#endif 192#endif
231 unsigned char flags; 193 unsigned char flags;
232} coro_cctx; 194} coro_cctx;
233 195
234coro_cctx *cctx_current; /* the currently running cctx */ 196static coro_cctx *cctx_current; /* the currently running cctx */
235 197
236/*****************************************************************************/ 198/*****************************************************************************/
237 199
200static MGVTBL coro_state_vtbl;
201
238enum { 202enum
203{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 204 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 205 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 206 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 207 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 208 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
209 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 210};
245 211
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 213typedef struct
248{ 214{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 215 #define VARx(name,expr,type) type name;
255# include "state.h" 216 #include "state.h"
256#undef VAR
257} perl_slots; 217} perl_slots;
258 218
219/* how many context stack entries do we need for perl_slots */
259#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 221
261/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
262struct coro { 223struct coro
224{
263 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 226 coro_cctx *cctx;
265 227
266 /* ready queue */ 228 /* ready queue */
267 struct coro *next_ready; 229 struct coro *next_ready;
… …
269 /* state data */ 231 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 233 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
273 235
274 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 240
281 /* statistics */ 241 /* statistics */
282 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
283 243
284 /* coro process data */ 244 /* coro process data */
285 int prio; 245 int prio;
286 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
287 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
288 250
289 /* async_pool */ 251 /* async_pool */
290 SV *saved_deffh; 252 SV *saved_deffh;
291 SV *invoke_cb; 253 SV *invoke_cb;
292 AV *invoke_av; 254 AV *invoke_av;
293 255
294 /* on_enter/on_leave */ 256 /* on_enter/on_leave */
295 AV *on_enter; 257 AV *on_enter;
296 AV *on_leave; 258 AV *on_leave;
297 259
260 /* swap_sv */
261 AV *swap_sv;
262
263 /* times */
264 coro_ts t_cpu, t_real;
265
298 /* linked list */ 266 /* linked list */
299 struct coro *next, *prev; 267 struct coro *next, *prev;
300}; 268};
301 269
302typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
304 272
305/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
309 277
310/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
311 279
312#define PRIO_MAX 3 280#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 281#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 282#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 283#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 284#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 285#define CORO_PRIO_MIN -4
318 286
319/* for Coro.pm */ 287/* for Coro.pm */
320static SV *coro_current; 288static SV *coro_current;
321static SV *coro_readyhook; 289static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
324static struct coro *coro_first; 292static struct coro *coro_first;
325#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
326 294
295/** JIT *********************************************************************/
296
297#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix"
305 #endif
306 #endif
307#endif
308
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
310 #undef CORO_JIT
311#endif
312
313#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *);
315 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
316#endif
317
318/** Coro::Select ************************************************************/
319
320static OP *(*coro_old_pp_sselect) (pTHX);
321static SV *coro_select_select;
322
323/* horrible hack, but if it works... */
324static OP *
325coro_pp_sselect (pTHX)
326{
327 dSP;
328 PUSHMARK (SP - 4); /* fake argument list */
329 XPUSHs (coro_select_select);
330 PUTBACK;
331
332 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
333 PL_op->op_flags |= OPf_STACKED;
334 PL_op->op_private = 0;
335 return PL_ppaddr [OP_ENTERSUB](aTHX);
336}
337
338/** time stuff **************************************************************/
339
340#ifdef HAS_GETTIMEOFDAY
341
342ecb_inline void
343coro_u2time (pTHX_ UV ret[2])
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 ret [0] = tv.tv_sec;
349 ret [1] = tv.tv_usec;
350}
351
352ecb_inline double
353coro_nvtime (void)
354{
355 struct timeval tv;
356 gettimeofday (&tv, 0);
357
358 return tv.tv_sec + tv.tv_usec * 1e-6;
359}
360
361ecb_inline void
362time_init (pTHX)
363{
364 nvtime = coro_nvtime;
365 u2time = coro_u2time;
366}
367
368#else
369
370ecb_inline void
371time_init (pTHX)
372{
373 SV **svp;
374
375 require_pv ("Time/HiRes.pm");
376
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
381
382 nvtime = INT2PTR (double (*)(), SvIV (*svp));
383
384 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
385 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
386}
387
388#endif
389
327/** lowlevel stuff **********************************************************/ 390/** lowlevel stuff **********************************************************/
328 391
329static SV * 392static SV * ecb_noinline
330coro_get_sv (pTHX_ const char *name, int create) 393coro_get_sv (pTHX_ const char *name, int create)
331{ 394{
332#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_sv (name, create); 397 get_sv (name, create);
335#endif 398#endif
336 return get_sv (name, create); 399 return get_sv (name, create);
337} 400}
338 401
339static AV * 402static AV * ecb_noinline
340coro_get_av (pTHX_ const char *name, int create) 403coro_get_av (pTHX_ const char *name, int create)
341{ 404{
342#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_av (name, create); 407 get_av (name, create);
345#endif 408#endif
346 return get_av (name, create); 409 return get_av (name, create);
347} 410}
348 411
349static HV * 412static HV * ecb_noinline
350coro_get_hv (pTHX_ const char *name, int create) 413coro_get_hv (pTHX_ const char *name, int create)
351{ 414{
352#if PERL_VERSION_ATLEAST (5,10,0) 415#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 416 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_hv (name, create); 417 get_hv (name, create);
355#endif 418#endif
356 return get_hv (name, create); 419 return get_hv (name, create);
357} 420}
358 421
359/* may croak */ 422ecb_inline void
360INLINE CV * 423coro_times_update (void)
361coro_sv_2cv (pTHX_ SV *sv)
362{ 424{
363 HV *st; 425#ifdef coro_clock_gettime
364 GV *gvp; 426 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 427
367 if (!cv) 428 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 429 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
430 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 431
370 return cv; 432 ts.tv_sec = ts.tv_nsec = 0;
433 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
434 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
435#else
436 dTHX;
437 UV tv[2];
438
439 u2time (aTHX_ tv);
440 time_real [0] = tv [0];
441 time_real [1] = tv [1] * 1000;
442#endif
443}
444
445ecb_inline void
446coro_times_add (struct coro *c)
447{
448 c->t_real [1] += time_real [1];
449 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
450 c->t_real [0] += time_real [0];
451
452 c->t_cpu [1] += time_cpu [1];
453 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
454 c->t_cpu [0] += time_cpu [0];
455}
456
457ecb_inline void
458coro_times_sub (struct coro *c)
459{
460 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
461 c->t_real [1] -= time_real [1];
462 c->t_real [0] -= time_real [0];
463
464 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
465 c->t_cpu [1] -= time_cpu [1];
466 c->t_cpu [0] -= time_cpu [0];
371} 467}
372 468
373/*****************************************************************************/ 469/*****************************************************************************/
374/* magic glue */ 470/* magic glue */
375 471
376#define CORO_MAGIC_type_cv 26 472#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext 473#define CORO_MAGIC_type_state PERL_MAGIC_ext
378 474
379#define CORO_MAGIC_NN(sv, type) \ 475#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \ 476 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \ 477 ? SvMAGIC (sv) \
382 : mg_find (sv, type)) 478 : mg_find (sv, type))
383 479
384#define CORO_MAGIC(sv, type) \ 480#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \ 481 (ecb_expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \ 482 ? CORO_MAGIC_NN (sv, type) \
387 : 0) 483 : 0)
388 484
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 485#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 486#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391 487
392INLINE struct coro * 488ecb_inline MAGIC *
489SvSTATEhv_p (pTHX_ SV *coro)
490{
491 MAGIC *mg;
492
493 if (ecb_expect_true (
494 SvTYPE (coro) == SVt_PVHV
495 && (mg = CORO_MAGIC_state (coro))
496 && mg->mg_virtual == &coro_state_vtbl
497 ))
498 return mg;
499
500 return 0;
501}
502
503ecb_inline struct coro *
393SvSTATE_ (pTHX_ SV *coro) 504SvSTATE_ (pTHX_ SV *coro)
394{ 505{
395 HV *stash;
396 MAGIC *mg; 506 MAGIC *mg;
397 507
398 if (SvROK (coro)) 508 if (SvROK (coro))
399 coro = SvRV (coro); 509 coro = SvRV (coro);
400 510
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 511 mg = SvSTATEhv_p (aTHX_ coro);
512 if (!mg)
402 croak ("Coro::State object required"); 513 croak ("Coro::State object required");
403 514
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 515 return (struct coro *)mg->mg_ptr;
414} 516}
415 517
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 518#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 519
… …
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421 523
422/*****************************************************************************/ 524/*****************************************************************************/
423/* padlist management and caching */ 525/* padlist management and caching */
424 526
425static AV * 527ecb_inline AV *
426coro_derive_padlist (pTHX_ CV *cv) 528coro_derive_padlist (pTHX_ CV *cv)
427{ 529{
428 AV *padlist = CvPADLIST (cv); 530 AV *padlist = CvPADLIST (cv);
429 AV *newpadlist, *newpad; 531 AV *newpadlist, *newpad;
430 532
… …
442 av_store (newpadlist, 1, (SV *)newpad); 544 av_store (newpadlist, 1, (SV *)newpad);
443 545
444 return newpadlist; 546 return newpadlist;
445} 547}
446 548
447static void 549ecb_inline void
448free_padlist (pTHX_ AV *padlist) 550free_padlist (pTHX_ AV *padlist)
449{ 551{
450 /* may be during global destruction */ 552 /* may be during global destruction */
451 if (!IN_DESTRUCT) 553 if (!IN_DESTRUCT)
452 { 554 {
… …
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 578coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 579{
478 AV *padlist; 580 AV *padlist;
479 AV *av = (AV *)mg->mg_obj; 581 AV *av = (AV *)mg->mg_obj;
480 582
583 /* perl manages to free our internal AV and _then_ call us */
584 if (IN_DESTRUCT)
585 return 0;
586
481 /* casting is fun. */ 587 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 588 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 589 free_padlist (aTHX_ padlist);
484 590
485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 591 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
… …
491 0, 0, 0, 0, 597 0, 0, 0, 0,
492 coro_cv_free 598 coro_cv_free
493}; 599};
494 600
495/* the next two functions merely cache the padlists */ 601/* the next two functions merely cache the padlists */
496static void 602ecb_inline void
497get_padlist (pTHX_ CV *cv) 603get_padlist (pTHX_ CV *cv)
498{ 604{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 606 AV *av;
501 607
502 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
503 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
504 else 610 else
505 { 611 {
506#if CORO_PREFER_PERL_FUNCTIONS 612#if CORO_PREFER_PERL_FUNCTIONS
507 /* this is probably cleaner? but also slower! */ 613 /* this is probably cleaner? but also slower! */
… …
514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 620 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
515#endif 621#endif
516 } 622 }
517} 623}
518 624
519static void 625ecb_inline void
520put_padlist (pTHX_ CV *cv) 626put_padlist (pTHX_ CV *cv)
521{ 627{
522 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
523 AV *av; 629 AV *av;
524 630
525 if (expect_false (!mg)) 631 if (ecb_expect_false (!mg))
526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
527 633
528 av = (AV *)mg->mg_obj; 634 av = (AV *)mg->mg_obj;
529 635
530 if (expect_false (AvFILLp (av) >= AvMAX (av))) 636 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
531 av_extend (av, AvFILLp (av) + 1); 637 av_extend (av, AvFILLp (av) + 1);
532 638
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 639 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 640}
535 641
536/** load & save, init *******************************************************/ 642/** load & save, init *******************************************************/
643
644ecb_inline void
645swap_sv (SV *a, SV *b)
646{
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 and later complicates this _quite_ a bit, but it also
660 * is much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680}
681
682/* swap sv heads, at least logically */
683static void
684swap_svs (pTHX_ Coro__State c)
685{
686 int i;
687
688 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
689 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
690}
691
692#define SWAP_SVS(coro) \
693 if (ecb_expect_false ((coro)->swap_sv)) \
694 swap_svs (aTHX_ (coro))
537 695
538static void 696static void
539on_enterleave_call (pTHX_ SV *cb); 697on_enterleave_call (pTHX_ SV *cb);
540 698
541static void 699static void
… …
544 perl_slots *slot = c->slot; 702 perl_slots *slot = c->slot;
545 c->slot = 0; 703 c->slot = 0;
546 704
547 PL_mainstack = c->mainstack; 705 PL_mainstack = c->mainstack;
548 706
549 GvSV (PL_defgv) = slot->defsv; 707#if CORO_JIT
550 GvAV (PL_defgv) = slot->defav; 708 load_perl_slots (slot);
551 GvSV (PL_errgv) = slot->errsv; 709#else
552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
554
555 #define VAR(name,type) PL_ ## name = slot->name; 710 #define VARx(name,expr,type) expr = slot->name;
556 # include "state.h" 711 #include "state.h"
557 #undef VAR 712#endif
558 713
559 { 714 {
560 dSP; 715 dSP;
561 716
562 CV *cv; 717 CV *cv;
563 718
564 /* now do the ugly restore mess */ 719 /* now do the ugly restore mess */
565 while (expect_true (cv = (CV *)POPs)) 720 while (ecb_expect_true (cv = (CV *)POPs))
566 { 721 {
567 put_padlist (aTHX_ cv); /* mark this padlist as available */ 722 put_padlist (aTHX_ cv); /* mark this padlist as available */
568 CvDEPTH (cv) = PTR2IV (POPs); 723 CvDEPTH (cv) = PTR2IV (POPs);
569 CvPADLIST (cv) = (AV *)POPs; 724 CvPADLIST (cv) = (AV *)POPs;
570 } 725 }
… …
573 } 728 }
574 729
575 slf_frame = c->slf_frame; 730 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 731 CORO_THROW = c->except;
577 732
733 if (ecb_expect_false (enable_times))
734 {
735 if (ecb_expect_false (!times_valid))
736 coro_times_update ();
737
738 coro_times_sub (c);
739 }
740
578 if (expect_false (c->on_enter)) 741 if (ecb_expect_false (c->on_enter))
579 { 742 {
580 int i; 743 int i;
581 744
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 745 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 746 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 747 }
748
749 SWAP_SVS (c);
585} 750}
586 751
587static void 752static void
588save_perl (pTHX_ Coro__State c) 753save_perl (pTHX_ Coro__State c)
589{ 754{
755 SWAP_SVS (c);
756
590 if (expect_false (c->on_leave)) 757 if (ecb_expect_false (c->on_leave))
591 { 758 {
592 int i; 759 int i;
593 760
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 761 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 762 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
763 }
764
765 times_valid = 0;
766
767 if (ecb_expect_false (enable_times))
768 {
769 coro_times_update (); times_valid = 1;
770 coro_times_add (c);
596 } 771 }
597 772
598 c->except = CORO_THROW; 773 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 774 c->slf_frame = slf_frame;
600 775
… …
611 786
612 XPUSHs (Nullsv); 787 XPUSHs (Nullsv);
613 /* this loop was inspired by pp_caller */ 788 /* this loop was inspired by pp_caller */
614 for (;;) 789 for (;;)
615 { 790 {
616 while (expect_true (cxix >= 0)) 791 while (ecb_expect_true (cxix >= 0))
617 { 792 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 793 PERL_CONTEXT *cx = &ccstk[cxix--];
619 794
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 795 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 796 {
622 CV *cv = cx->blk_sub.cv; 797 CV *cv = cx->blk_sub.cv;
623 798
624 if (expect_true (CvDEPTH (cv))) 799 if (ecb_expect_true (CvDEPTH (cv)))
625 { 800 {
626 EXTEND (SP, 3); 801 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 802 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 803 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 804 PUSHs ((SV *)cv);
… …
632 get_padlist (aTHX_ cv); 807 get_padlist (aTHX_ cv);
633 } 808 }
634 } 809 }
635 } 810 }
636 811
637 if (expect_true (top_si->si_type == PERLSI_MAIN)) 812 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
638 break; 813 break;
639 814
640 top_si = top_si->si_prev; 815 top_si = top_si->si_prev;
641 ccstk = top_si->si_cxstack; 816 ccstk = top_si->si_cxstack;
642 cxix = top_si->si_cxix; 817 cxix = top_si->si_cxix;
… …
644 819
645 PUTBACK; 820 PUTBACK;
646 } 821 }
647 822
648 /* allocate some space on the context stack for our purposes */ 823 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 824 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 825 {
654 int i; 826 unsigned int i;
827
655 for (i = 3; i < SLOT_COUNT; ++i) 828 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 829 CXINC;
657 } 830
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 831 cxstack_ix -= SLOT_COUNT; /* undo allocation */
832 }
659 833
660 c->mainstack = PL_mainstack; 834 c->mainstack = PL_mainstack;
661 835
662 { 836 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 837 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
664 838
665 slot->defav = GvAV (PL_defgv); 839#if CORO_JIT
666 slot->defsv = DEFSV; 840 save_perl_slots (slot);
667 slot->errsv = ERRSV; 841#else
668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
670
671 #define VAR(name,type) slot->name = PL_ ## name; 842 #define VARx(name,expr,type) slot->name = expr;
672 # include "state.h" 843 #include "state.h"
673 #undef VAR 844#endif
674 } 845 }
675} 846}
676 847
677/* 848/*
678 * allocate various perl stacks. This is almost an exact copy 849 * allocate various perl stacks. This is almost an exact copy
… …
684# define coro_init_stacks(thx) init_stacks () 855# define coro_init_stacks(thx) init_stacks ()
685#else 856#else
686static void 857static void
687coro_init_stacks (pTHX) 858coro_init_stacks (pTHX)
688{ 859{
689 PL_curstackinfo = new_stackinfo(32, 8); 860 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 861 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 862 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 863 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 864
694 PL_stack_base = AvARRAY(PL_curstack); 865 PL_stack_base = AvARRAY(PL_curstack);
… …
709#endif 880#endif
710 881
711 New(54,PL_scopestack,8,I32); 882 New(54,PL_scopestack,8,I32);
712 PL_scopestack_ix = 0; 883 PL_scopestack_ix = 0;
713 PL_scopestack_max = 8; 884 PL_scopestack_max = 8;
885#if HAS_SCOPESTACK_NAME
886 New(54,PL_scopestack_name,8,const char*);
887#endif
714 888
715 New(54,PL_savestack,24,ANY); 889 New(54,PL_savestack,24,ANY);
716 PL_savestack_ix = 0; 890 PL_savestack_ix = 0;
717 PL_savestack_max = 24; 891 PL_savestack_max = 24;
718 892
… …
746 } 920 }
747 921
748 Safefree (PL_tmps_stack); 922 Safefree (PL_tmps_stack);
749 Safefree (PL_markstack); 923 Safefree (PL_markstack);
750 Safefree (PL_scopestack); 924 Safefree (PL_scopestack);
925#if HAS_SCOPESTACK_NAME
926 Safefree (PL_scopestack_name);
927#endif
751 Safefree (PL_savestack); 928 Safefree (PL_savestack);
752#if !PERL_VERSION_ATLEAST (5,10,0) 929#if !PERL_VERSION_ATLEAST (5,10,0)
753 Safefree (PL_retstack); 930 Safefree (PL_retstack);
754#endif 931#endif
755} 932}
… …
801#endif 978#endif
802 979
803/* 980/*
804 * This overrides the default magic get method of %SIG elements. 981 * This overrides the default magic get method of %SIG elements.
805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 982 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
806 * and instead of trying to save and restore the hash elements, we just provide 983 * and instead of trying to save and restore the hash elements (extremely slow),
807 * readback here. 984 * we just provide our own readback here.
808 */ 985 */
809static int 986static int ecb_cold
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 987coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 988{
812 const char *s = MgPV_nolen_const (mg); 989 const char *s = MgPV_nolen_const (mg);
813 990
814 if (*s == '_') 991 if (*s == '_')
… …
818 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
819 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
820 997
821 if (svp) 998 if (svp)
822 { 999 {
823 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1000 SV *ssv;
1001
1002 if (!*svp)
1003 ssv = &PL_sv_undef;
1004 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1005 ssv = sv_2mortal (newRV_inc (*svp));
1006 else
1007 ssv = *svp;
1008
1009 sv_setsv (sv, ssv);
824 return 0; 1010 return 0;
825 } 1011 }
826 } 1012 }
827 1013
828 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1014 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
829} 1015}
830 1016
831static int 1017static int ecb_cold
832coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1018coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
833{ 1019{
834 const char *s = MgPV_nolen_const (mg); 1020 const char *s = MgPV_nolen_const (mg);
835 1021
836 if (*s == '_') 1022 if (*s == '_')
… …
850 } 1036 }
851 1037
852 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
853} 1039}
854 1040
855static int 1041static int ecb_cold
856coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
857{ 1043{
858 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
859 1045
860 if (*s == '_') 1046 if (*s == '_')
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1079slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1080{
895 return 1; 1081 return 1;
896} 1082}
897 1083
898static UNOP coro_setup_op; 1084static UNOP init_perl_op;
899 1085
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1086ecb_noinline static void /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 1087init_perl (pTHX_ struct coro *coro)
902{ 1088{
903 /* 1089 /*
904 * emulate part of the perl startup here. 1090 * emulate part of the perl startup here.
905 */ 1091 */
906 coro_init_stacks (aTHX); 1092 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1099 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1100 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1101 PL_curpm = 0;
916 PL_curpad = 0; 1102 PL_curpad = 0;
917 PL_localizing = 0; 1103 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1104 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1105#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1106 PL_parser = 0;
922#endif 1107#endif
923 PL_hints = 0; 1108 PL_hints = 0;
924 1109
925 /* recreate the die/warn hooks */ 1110 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1111 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1112 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1113
929 GvSV (PL_defgv) = newSV (0); 1114 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1115 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1116 GvSV (PL_errgv) = newSV (0);
932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
953 /* this newly created coroutine might be run on an existing cctx which most 1138 /* this newly created coroutine might be run on an existing cctx which most
954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1139 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
955 */ 1140 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1141 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1142 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1143 slf_frame.destroy = 0;
958 1144
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1145 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
960 coro_setup_op.op_next = PL_op; 1146 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1147 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1148 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1149 /* no flags etc. required, as an init function won't be called */
964 1150
965 PL_op = (OP *)&coro_setup_op; 1151 PL_op = (OP *)&init_perl_op;
966 1152
967 /* copy throw, in case it was set before coro_setup */ 1153 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1154 CORO_THROW = coro->except;
1155
1156 SWAP_SVS (coro);
1157
1158 if (ecb_expect_false (enable_times))
1159 {
1160 coro_times_update ();
1161 coro_times_sub (coro);
1162 }
969} 1163}
970 1164
971static void 1165static void
972coro_unwind_stacks (pTHX) 1166coro_unwind_stacks (pTHX)
973{ 1167{
… …
988 dounwind (-1); 1182 dounwind (-1);
989 } 1183 }
990} 1184}
991 1185
992static void 1186static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1187destroy_perl (pTHX_ struct coro *coro)
994{ 1188{
1189 SV *svf [9];
1190
1191 {
1192 SV *old_current = SvRV (coro_current);
1193 struct coro *current = SvSTATE (old_current);
1194
1195 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1196
1197 save_perl (aTHX_ current);
1198
1199 /* this will cause transfer_check to croak on block*/
1200 SvRV_set (coro_current, (SV *)coro->hv);
1201
1202 load_perl (aTHX_ coro);
1203
995 coro_unwind_stacks (aTHX); 1204 coro_unwind_stacks (aTHX);
996 1205
997 SvREFCNT_dec (GvSV (PL_defgv)); 1206 /* restore swapped sv's */
998 SvREFCNT_dec (GvAV (PL_defgv)); 1207 SWAP_SVS (coro);
999 SvREFCNT_dec (GvSV (PL_errgv));
1000 SvREFCNT_dec (PL_defoutgv);
1001 SvREFCNT_dec (PL_rs);
1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
1004 1208
1005 SvREFCNT_dec (PL_diehook); 1209 coro_destruct_stacks (aTHX);
1006 SvREFCNT_dec (PL_warnhook); 1210
1211 /* now save some sv's to be free'd later */
1212 svf [0] = GvSV (PL_defgv);
1213 svf [1] = (SV *)GvAV (PL_defgv);
1214 svf [2] = GvSV (PL_errgv);
1215 svf [3] = (SV *)PL_defoutgv;
1216 svf [4] = PL_rs;
1217 svf [5] = GvSV (irsgv);
1218 svf [6] = (SV *)GvHV (PL_hintgv);
1219 svf [7] = PL_diehook;
1220 svf [8] = PL_warnhook;
1221 assert (9 == sizeof (svf) / sizeof (*svf));
1222
1223 SvRV_set (coro_current, old_current);
1224
1225 load_perl (aTHX_ current);
1007 1226 }
1227
1228 {
1229 unsigned int i;
1230
1231 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1232 SvREFCNT_dec (svf [i]);
1233
1008 SvREFCNT_dec (coro->saved_deffh); 1234 SvREFCNT_dec (coro->saved_deffh);
1009 SvREFCNT_dec (coro->rouse_cb); 1235 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb); 1236 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av); 1237 SvREFCNT_dec (coro->invoke_av);
1012 1238 }
1013 coro_destruct_stacks (aTHX);
1014} 1239}
1015 1240
1016INLINE void 1241ecb_inline void
1017free_coro_mortal (pTHX) 1242free_coro_mortal (pTHX)
1018{ 1243{
1019 if (expect_true (coro_mortal)) 1244 if (ecb_expect_true (coro_mortal))
1020 { 1245 {
1021 SvREFCNT_dec (coro_mortal); 1246 SvREFCNT_dec ((SV *)coro_mortal);
1022 coro_mortal = 0; 1247 coro_mortal = 0;
1023 } 1248 }
1024} 1249}
1025 1250
1026static int 1251static int
… …
1159 1384
1160 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1385 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1161} 1386}
1162 1387
1163/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1388/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1164static void NOINLINE 1389static void ecb_noinline
1165cctx_prepare (pTHX) 1390cctx_prepare (pTHX)
1166{ 1391{
1167 PL_top_env = &PL_start_env; 1392 PL_top_env = &PL_start_env;
1168 1393
1169 if (cctx_current->flags & CC_TRACE) 1394 if (cctx_current->flags & CC_TRACE)
… …
1180 slf_frame.prepare = slf_prepare_set_stacklevel; 1405 slf_frame.prepare = slf_prepare_set_stacklevel;
1181 slf_frame.check = slf_check_set_stacklevel; 1406 slf_frame.check = slf_check_set_stacklevel;
1182} 1407}
1183 1408
1184/* the tail of transfer: execute stuff we can only do after a transfer */ 1409/* the tail of transfer: execute stuff we can only do after a transfer */
1185INLINE void 1410ecb_inline void
1186transfer_tail (pTHX) 1411transfer_tail (pTHX)
1187{ 1412{
1188 free_coro_mortal (aTHX); 1413 free_coro_mortal (aTHX);
1414}
1415
1416/* try to exit the same way perl's main function would do */
1417/* we do not bother resetting the environment or other things *7
1418/* that are not, uhm, essential */
1419/* this obviously also doesn't work when perl is embedded */
1420static void ecb_noinline ecb_cold
1421perlish_exit (pTHX)
1422{
1423 int exitstatus = perl_destruct (PL_curinterp);
1424 perl_free (PL_curinterp);
1425 exit (exitstatus);
1189} 1426}
1190 1427
1191/* 1428/*
1192 * this is a _very_ stripped down perl interpreter ;) 1429 * this is a _very_ stripped down perl interpreter ;)
1193 */ 1430 */
… …
1215 /* somebody or something will hit me for both perl_run and PL_restartop */ 1452 /* somebody or something will hit me for both perl_run and PL_restartop */
1216 PL_restartop = PL_op; 1453 PL_restartop = PL_op;
1217 perl_run (PL_curinterp); 1454 perl_run (PL_curinterp);
1218 /* 1455 /*
1219 * Unfortunately, there is no way to get at the return values of the 1456 * Unfortunately, there is no way to get at the return values of the
1220 * coro body here, as perl_run destroys these 1457 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1458 * runtime errors here, as this is just a random interpreter, not a thread.
1221 */ 1459 */
1222 1460
1223 /* 1461 /*
1224 * If perl-run returns we assume exit() was being called or the coro 1462 * If perl-run returns we assume exit() was being called or the coro
1225 * fell off the end, which seems to be the only valid (non-bug) 1463 * fell off the end, which seems to be the only valid (non-bug)
1226 * reason for perl_run to return. We try to exit by jumping to the 1464 * reason for perl_run to return. We try to mimic whatever perl is normally
1227 * bootstrap-time "top" top_env, as we cannot restore the "main" 1465 * doing in that case. YMMV.
1228 * coroutine as Coro has no such concept.
1229 * This actually isn't valid with the pthread backend, but OSes requiring
1230 * that backend are too broken to do it in a standards-compliant way.
1231 */ 1466 */
1232 PL_top_env = main_top_env; 1467 perlish_exit (aTHX);
1233 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1234 } 1468 }
1235} 1469}
1236 1470
1237static coro_cctx * 1471static coro_cctx *
1238cctx_new () 1472cctx_new (void)
1239{ 1473{
1240 coro_cctx *cctx; 1474 coro_cctx *cctx;
1241 1475
1242 ++cctx_count; 1476 ++cctx_count;
1243 New (0, cctx, 1, coro_cctx); 1477 New (0, cctx, 1, coro_cctx);
… …
1249 return cctx; 1483 return cctx;
1250} 1484}
1251 1485
1252/* create a new cctx only suitable as source */ 1486/* create a new cctx only suitable as source */
1253static coro_cctx * 1487static coro_cctx *
1254cctx_new_empty () 1488cctx_new_empty (void)
1255{ 1489{
1256 coro_cctx *cctx = cctx_new (); 1490 coro_cctx *cctx = cctx_new ();
1257 1491
1258 cctx->sptr = 0; 1492 cctx->sptr = 0;
1259 coro_create (&cctx->cctx, 0, 0, 0, 0); 1493 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1261 return cctx; 1495 return cctx;
1262} 1496}
1263 1497
1264/* create a new cctx suitable as destination/running a perl interpreter */ 1498/* create a new cctx suitable as destination/running a perl interpreter */
1265static coro_cctx * 1499static coro_cctx *
1266cctx_new_run () 1500cctx_new_run (void)
1267{ 1501{
1268 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1269 void *stack_start; 1503 void *stack_start;
1270 size_t stack_size; 1504 size_t stack_size;
1271 1505
1272#if HAVE_MMAP 1506#if HAVE_MMAP
1273 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1507 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1274 /* mmap supposedly does allocate-on-write for us */ 1508 /* mmap supposedly does allocate-on-write for us */
1275 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1509 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1276 1510
1277 if (cctx->sptr != (void *)-1) 1511 if (cctx->sptr != (void *)-1)
1278 { 1512 {
1279 #if CORO_STACKGUARD 1513 #if CORO_STACKGUARD
1280 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1312cctx_destroy (coro_cctx *cctx) 1546cctx_destroy (coro_cctx *cctx)
1313{ 1547{
1314 if (!cctx) 1548 if (!cctx)
1315 return; 1549 return;
1316 1550
1317 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1318 1552
1319 --cctx_count; 1553 --cctx_count;
1320 coro_destroy (&cctx->cctx); 1554 coro_destroy (&cctx->cctx);
1321 1555
1322 /* coro_transfer creates new, empty cctx's */ 1556 /* coro_transfer creates new, empty cctx's */
… …
1341#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1575#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1342 1576
1343static coro_cctx * 1577static coro_cctx *
1344cctx_get (pTHX) 1578cctx_get (pTHX)
1345{ 1579{
1346 while (expect_true (cctx_first)) 1580 while (ecb_expect_true (cctx_first))
1347 { 1581 {
1348 coro_cctx *cctx = cctx_first; 1582 coro_cctx *cctx = cctx_first;
1349 cctx_first = cctx->next; 1583 cctx_first = cctx->next;
1350 --cctx_idle; 1584 --cctx_idle;
1351 1585
1352 if (expect_true (!CCTX_EXPIRED (cctx))) 1586 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1353 return cctx; 1587 return cctx;
1354 1588
1355 cctx_destroy (cctx); 1589 cctx_destroy (cctx);
1356 } 1590 }
1357 1591
… …
1362cctx_put (coro_cctx *cctx) 1596cctx_put (coro_cctx *cctx)
1363{ 1597{
1364 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1365 1599
1366 /* free another cctx if overlimit */ 1600 /* free another cctx if overlimit */
1367 if (expect_false (cctx_idle >= cctx_max_idle)) 1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1368 { 1602 {
1369 coro_cctx *first = cctx_first; 1603 coro_cctx *first = cctx_first;
1370 cctx_first = first->next; 1604 cctx_first = first->next;
1371 --cctx_idle; 1605 --cctx_idle;
1372 1606
… …
1383static void 1617static void
1384transfer_check (pTHX_ struct coro *prev, struct coro *next) 1618transfer_check (pTHX_ struct coro *prev, struct coro *next)
1385{ 1619{
1386 /* TODO: throwing up here is considered harmful */ 1620 /* TODO: throwing up here is considered harmful */
1387 1621
1388 if (expect_true (prev != next)) 1622 if (ecb_expect_true (prev != next))
1389 { 1623 {
1390 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1624 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1391 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1625 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1392 1626
1393 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1627 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1394 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1628 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1395 1629
1396#if !PERL_VERSION_ATLEAST (5,10,0) 1630#if !PERL_VERSION_ATLEAST (5,10,0)
1397 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1631 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1398 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1632 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1399#endif 1633#endif
1400 } 1634 }
1401} 1635}
1402 1636
1403/* always use the TRANSFER macro */ 1637/* always use the TRANSFER macro */
1404static void NOINLINE /* noinline so we have a fixed stackframe */ 1638static void ecb_noinline /* noinline so we have a fixed stackframe */
1405transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1639transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1406{ 1640{
1407 dSTACKLEVEL; 1641 dSTACKLEVEL;
1408 1642
1409 /* sometimes transfer is only called to set idle_sp */ 1643 /* sometimes transfer is only called to set idle_sp */
1410 if (expect_false (!prev)) 1644 if (ecb_expect_false (!prev))
1411 { 1645 {
1412 cctx_current->idle_sp = STACKLEVEL; 1646 cctx_current->idle_sp = STACKLEVEL;
1413 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1647 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1414 } 1648 }
1415 else if (expect_true (prev != next)) 1649 else if (ecb_expect_true (prev != next))
1416 { 1650 {
1417 coro_cctx *cctx_prev; 1651 coro_cctx *cctx_prev;
1418 1652
1419 if (expect_false (prev->flags & CF_NEW)) 1653 if (ecb_expect_false (prev->flags & CF_NEW))
1420 { 1654 {
1421 /* create a new empty/source context */ 1655 /* create a new empty/source context */
1422 prev->flags &= ~CF_NEW; 1656 prev->flags &= ~CF_NEW;
1423 prev->flags |= CF_RUNNING; 1657 prev->flags |= CF_RUNNING;
1424 } 1658 }
… …
1427 next->flags |= CF_RUNNING; 1661 next->flags |= CF_RUNNING;
1428 1662
1429 /* first get rid of the old state */ 1663 /* first get rid of the old state */
1430 save_perl (aTHX_ prev); 1664 save_perl (aTHX_ prev);
1431 1665
1432 if (expect_false (next->flags & CF_NEW)) 1666 if (ecb_expect_false (next->flags & CF_NEW))
1433 { 1667 {
1434 /* need to start coroutine */ 1668 /* need to start coroutine */
1435 next->flags &= ~CF_NEW; 1669 next->flags &= ~CF_NEW;
1436 /* setup coroutine call */ 1670 /* setup coroutine call */
1437 coro_setup (aTHX_ next); 1671 init_perl (aTHX_ next);
1438 } 1672 }
1439 else 1673 else
1440 load_perl (aTHX_ next); 1674 load_perl (aTHX_ next);
1441 1675
1442 /* possibly untie and reuse the cctx */ 1676 /* possibly untie and reuse the cctx */
1443 if (expect_true ( 1677 if (ecb_expect_true (
1444 cctx_current->idle_sp == STACKLEVEL 1678 cctx_current->idle_sp == STACKLEVEL
1445 && !(cctx_current->flags & CC_TRACE) 1679 && !(cctx_current->flags & CC_TRACE)
1446 && !force_cctx 1680 && !force_cctx
1447 )) 1681 ))
1448 { 1682 {
1449 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1683 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1450 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1684 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1451 1685
1452 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1686 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1453 /* without this the next cctx_get might destroy the running cctx while still in use */ 1687 /* without this the next cctx_get might destroy the running cctx while still in use */
1454 if (expect_false (CCTX_EXPIRED (cctx_current))) 1688 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1455 if (expect_true (!next->cctx)) 1689 if (ecb_expect_true (!next->cctx))
1456 next->cctx = cctx_get (aTHX); 1690 next->cctx = cctx_get (aTHX);
1457 1691
1458 cctx_put (cctx_current); 1692 cctx_put (cctx_current);
1459 } 1693 }
1460 else 1694 else
1461 prev->cctx = cctx_current; 1695 prev->cctx = cctx_current;
1462 1696
1463 ++next->usecount; 1697 ++next->usecount;
1464 1698
1465 cctx_prev = cctx_current; 1699 cctx_prev = cctx_current;
1466 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1700 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1467 1701
1468 next->cctx = 0; 1702 next->cctx = 0;
1469 1703
1470 if (expect_false (cctx_prev != cctx_current)) 1704 if (ecb_expect_false (cctx_prev != cctx_current))
1471 { 1705 {
1472 cctx_prev->top_env = PL_top_env; 1706 cctx_prev->top_env = PL_top_env;
1473 PL_top_env = cctx_current->top_env; 1707 PL_top_env = cctx_current->top_env;
1474 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1708 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1475 } 1709 }
… …
1481#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1715#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1482#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1716#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1483 1717
1484/** high level stuff ********************************************************/ 1718/** high level stuff ********************************************************/
1485 1719
1720/* this function is actually Coro, not Coro::State, but we call it from here */
1721/* because it is convenient - but it hasn't been declared yet for that reason */
1486static int 1722static void
1723coro_call_on_destroy (pTHX_ struct coro *coro);
1724
1725static void
1487coro_state_destroy (pTHX_ struct coro *coro) 1726coro_state_destroy (pTHX_ struct coro *coro)
1488{ 1727{
1489 if (coro->flags & CF_DESTROYED) 1728 if (coro->flags & CF_ZOMBIE)
1490 return 0; 1729 return;
1491 1730
1492 if (coro->on_destroy && !PL_dirty)
1493 coro->on_destroy (aTHX_ coro); 1731 slf_destroy (aTHX_ coro);
1494 1732
1495 coro->flags |= CF_DESTROYED; 1733 coro->flags |= CF_ZOMBIE;
1496 1734
1497 if (coro->flags & CF_READY) 1735 if (coro->flags & CF_READY)
1498 { 1736 {
1499 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1737 /* reduce nready, as destroying a ready coro effectively unreadies it */
1500 /* alternative: look through all ready queues and remove the coro */ 1738 /* alternative: look through all ready queues and remove the coro */
1501 --coro_nready; 1739 --coro_nready;
1502 } 1740 }
1503 else 1741 else
1504 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1742 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1743
1744 if (coro->next) coro->next->prev = coro->prev;
1745 if (coro->prev) coro->prev->next = coro->next;
1746 if (coro == coro_first) coro_first = coro->next;
1505 1747
1506 if (coro->mainstack 1748 if (coro->mainstack
1507 && coro->mainstack != main_mainstack 1749 && coro->mainstack != main_mainstack
1508 && coro->slot 1750 && coro->slot
1509 && !PL_dirty) 1751 && !PL_dirty)
1510 {
1511 struct coro *current = SvSTATE_current;
1512
1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1514
1515 save_perl (aTHX_ current);
1516 load_perl (aTHX_ coro);
1517
1518 coro_destruct_perl (aTHX_ coro); 1752 destroy_perl (aTHX_ coro);
1519
1520 load_perl (aTHX_ current);
1521
1522 coro->slot = 0;
1523 }
1524 1753
1525 cctx_destroy (coro->cctx); 1754 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv); 1755 SvREFCNT_dec (coro->startcv);
1527 SvREFCNT_dec (coro->args); 1756 SvREFCNT_dec (coro->args);
1757 SvREFCNT_dec (coro->swap_sv);
1528 SvREFCNT_dec (CORO_THROW); 1758 SvREFCNT_dec (CORO_THROW);
1529 1759
1530 if (coro->next) coro->next->prev = coro->prev; 1760 coro_call_on_destroy (aTHX_ coro);
1531 if (coro->prev) coro->prev->next = coro->next;
1532 if (coro == coro_first) coro_first = coro->next;
1533 1761
1534 return 1; 1762 /* more destruction mayhem in coro_state_free */
1535} 1763}
1536 1764
1537static int 1765static int
1538coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1766coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1539{ 1767{
1540 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 struct coro *coro = (struct coro *)mg->mg_ptr;
1541 mg->mg_ptr = 0; 1769 mg->mg_ptr = 0;
1542 1770
1543 coro->hv = 0;
1544
1545 if (--coro->refcnt < 0)
1546 {
1547 coro_state_destroy (aTHX_ coro); 1771 coro_state_destroy (aTHX_ coro);
1772 SvREFCNT_dec (coro->on_destroy);
1773 SvREFCNT_dec (coro->status);
1774
1548 Safefree (coro); 1775 Safefree (coro);
1549 }
1550 1776
1551 return 0; 1777 return 0;
1552} 1778}
1553 1779
1554static int 1780static int ecb_cold
1555coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1781coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1556{ 1782{
1557 struct coro *coro = (struct coro *)mg->mg_ptr; 1783 /* called when perl clones the current process the slow way (windows process emulation) */
1558 1784 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1559 ++coro->refcnt; 1785 mg->mg_ptr = 0;
1786 mg->mg_virtual = 0;
1560 1787
1561 return 0; 1788 return 0;
1562} 1789}
1563 1790
1564static MGVTBL coro_state_vtbl = { 1791static MGVTBL coro_state_vtbl = {
… …
1587 1814
1588 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1815 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1589 TRANSFER (ta, 1); 1816 TRANSFER (ta, 1);
1590} 1817}
1591 1818
1592/*****************************************************************************/
1593/* gensub: simple closure generation utility */
1594
1595#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1596
1597/* create a closure from XS, returns a code reference */
1598/* the arg can be accessed via GENSUB_ARG from the callback */
1599/* the callback must use dXSARGS/XSRETURN */
1600static SV *
1601gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1602{
1603 CV *cv = (CV *)newSV (0);
1604
1605 sv_upgrade ((SV *)cv, SVt_PVCV);
1606
1607 CvANON_on (cv);
1608 CvISXSUB_on (cv);
1609 CvXSUB (cv) = xsub;
1610 GENSUB_ARG = arg;
1611
1612 return newRV_noinc ((SV *)cv);
1613}
1614
1615/** Coro ********************************************************************/ 1819/** Coro ********************************************************************/
1616 1820
1617INLINE void 1821ecb_inline void
1618coro_enq (pTHX_ struct coro *coro) 1822coro_enq (pTHX_ struct coro *coro)
1619{ 1823{
1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1824 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1621 1825
1622 SvREFCNT_inc_NN (coro->hv); 1826 SvREFCNT_inc_NN (coro->hv);
1623 1827
1624 coro->next_ready = 0; 1828 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1829 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1626 ready [1] = coro; 1830 ready [1] = coro;
1627} 1831}
1628 1832
1629INLINE struct coro * 1833ecb_inline struct coro *
1630coro_deq (pTHX) 1834coro_deq (pTHX)
1631{ 1835{
1632 int prio; 1836 int prio;
1633 1837
1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1838 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1635 { 1839 {
1636 struct coro **ready = coro_ready [prio]; 1840 struct coro **ready = coro_ready [prio];
1637 1841
1638 if (ready [0]) 1842 if (ready [0])
1639 { 1843 {
… …
1644 } 1848 }
1645 1849
1646 return 0; 1850 return 0;
1647} 1851}
1648 1852
1853static void
1854invoke_sv_ready_hook_helper (void)
1855{
1856 dTHX;
1857 dSP;
1858
1859 ENTER;
1860 SAVETMPS;
1861
1862 PUSHMARK (SP);
1863 PUTBACK;
1864 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1865
1866 FREETMPS;
1867 LEAVE;
1868}
1869
1649static int 1870static int
1650api_ready (pTHX_ SV *coro_sv) 1871api_ready (pTHX_ SV *coro_sv)
1651{ 1872{
1652 struct coro *coro;
1653 SV *sv_hook;
1654 void (*xs_hook)(void);
1655
1656 coro = SvSTATE (coro_sv); 1873 struct coro *coro = SvSTATE (coro_sv);
1657 1874
1658 if (coro->flags & CF_READY) 1875 if (coro->flags & CF_READY)
1659 return 0; 1876 return 0;
1660 1877
1661 coro->flags |= CF_READY; 1878 coro->flags |= CF_READY;
1662 1879
1663 sv_hook = coro_nready ? 0 : coro_readyhook;
1664 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1665
1666 coro_enq (aTHX_ coro); 1880 coro_enq (aTHX_ coro);
1667 ++coro_nready;
1668 1881
1669 if (sv_hook) 1882 if (!coro_nready++)
1670 { 1883 if (coroapi.readyhook)
1671 dSP; 1884 coroapi.readyhook ();
1672
1673 ENTER;
1674 SAVETMPS;
1675
1676 PUSHMARK (SP);
1677 PUTBACK;
1678 call_sv (sv_hook, G_VOID | G_DISCARD);
1679
1680 FREETMPS;
1681 LEAVE;
1682 }
1683
1684 if (xs_hook)
1685 xs_hook ();
1686 1885
1687 return 1; 1886 return 1;
1688} 1887}
1689 1888
1690static int 1889static int
… …
1692{ 1891{
1693 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1892 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1694} 1893}
1695 1894
1696/* expects to own a reference to next->hv */ 1895/* expects to own a reference to next->hv */
1697INLINE void 1896ecb_inline void
1698prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1897prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1699{ 1898{
1700 SV *prev_sv = SvRV (coro_current); 1899 SV *prev_sv = SvRV (coro_current);
1701 1900
1702 ta->prev = SvSTATE_hv (prev_sv); 1901 ta->prev = SvSTATE_hv (prev_sv);
… …
1715{ 1914{
1716 for (;;) 1915 for (;;)
1717 { 1916 {
1718 struct coro *next = coro_deq (aTHX); 1917 struct coro *next = coro_deq (aTHX);
1719 1918
1720 if (expect_true (next)) 1919 if (ecb_expect_true (next))
1721 { 1920 {
1722 /* cannot transfer to destroyed coros, skip and look for next */ 1921 /* cannot transfer to destroyed coros, skip and look for next */
1723 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1922 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1724 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1923 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1725 else 1924 else
1726 { 1925 {
1727 next->flags &= ~CF_READY; 1926 next->flags &= ~CF_READY;
1728 --coro_nready; 1927 --coro_nready;
… …
1735 { 1934 {
1736 /* nothing to schedule: call the idle handler */ 1935 /* nothing to schedule: call the idle handler */
1737 if (SvROK (sv_idle) 1936 if (SvROK (sv_idle)
1738 && SvOBJECT (SvRV (sv_idle))) 1937 && SvOBJECT (SvRV (sv_idle)))
1739 { 1938 {
1939 if (SvRV (sv_idle) == SvRV (coro_current))
1940 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1941
1740 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1942 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1741 api_ready (aTHX_ SvRV (sv_idle)); 1943 api_ready (aTHX_ SvRV (sv_idle));
1742 --coro_nready; 1944 --coro_nready;
1743 } 1945 }
1744 else 1946 else
1745 { 1947 {
1948 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1746 dSP; 1949 dSP;
1747 1950
1748 ENTER; 1951 ENTER;
1749 SAVETMPS; 1952 SAVETMPS;
1750 1953
… …
1757 } 1960 }
1758 } 1961 }
1759 } 1962 }
1760} 1963}
1761 1964
1762INLINE void 1965ecb_inline void
1763prepare_cede (pTHX_ struct coro_transfer_args *ta) 1966prepare_cede (pTHX_ struct coro_transfer_args *ta)
1764{ 1967{
1765 api_ready (aTHX_ coro_current); 1968 api_ready (aTHX_ coro_current);
1766 prepare_schedule (aTHX_ ta); 1969 prepare_schedule (aTHX_ ta);
1767} 1970}
1768 1971
1769INLINE void 1972ecb_inline void
1770prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1973prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1771{ 1974{
1772 SV *prev = SvRV (coro_current); 1975 SV *prev = SvRV (coro_current);
1773 1976
1774 if (coro_nready) 1977 if (coro_nready)
… …
1804{ 2007{
1805 struct coro_transfer_args ta; 2008 struct coro_transfer_args ta;
1806 2009
1807 prepare_cede (aTHX_ &ta); 2010 prepare_cede (aTHX_ &ta);
1808 2011
1809 if (expect_true (ta.prev != ta.next)) 2012 if (ecb_expect_true (ta.prev != ta.next))
1810 { 2013 {
1811 TRANSFER (ta, 1); 2014 TRANSFER (ta, 1);
1812 return 1; 2015 return 1;
1813 } 2016 }
1814 else 2017 else
… …
1857 coro->slot->runops = RUNOPS_DEFAULT; 2060 coro->slot->runops = RUNOPS_DEFAULT;
1858 } 2061 }
1859} 2062}
1860 2063
1861static void 2064static void
2065coro_push_av (pTHX_ AV *av, I32 gimme_v)
2066{
2067 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2068 {
2069 dSP;
2070
2071 if (gimme_v == G_SCALAR)
2072 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2073 else
2074 {
2075 int i;
2076 EXTEND (SP, AvFILLp (av) + 1);
2077
2078 for (i = 0; i <= AvFILLp (av); ++i)
2079 PUSHs (AvARRAY (av)[i]);
2080 }
2081
2082 PUTBACK;
2083 }
2084}
2085
2086static void
2087coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2088{
2089 if (!coro->on_destroy)
2090 coro->on_destroy = newAV ();
2091
2092 av_push (coro->on_destroy, cb);
2093}
2094
2095static void
2096slf_destroy_join (pTHX_ struct CoroSLF *frame)
2097{
2098 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2099}
2100
2101static int
2102slf_check_join (pTHX_ struct CoroSLF *frame)
2103{
2104 struct coro *coro = (struct coro *)frame->data;
2105
2106 if (!coro->status)
2107 return 1;
2108
2109 frame->destroy = 0;
2110
2111 coro_push_av (aTHX_ coro->status, GIMME_V);
2112
2113 SvREFCNT_dec ((SV *)coro->hv);
2114
2115 return 0;
2116}
2117
2118static void
2119slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2120{
2121 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2122
2123 if (items > 1)
2124 croak ("join called with too many arguments");
2125
2126 if (coro->status)
2127 frame->prepare = prepare_nop;
2128 else
2129 {
2130 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2131 frame->prepare = prepare_schedule;
2132 }
2133
2134 frame->check = slf_check_join;
2135 frame->destroy = slf_destroy_join;
2136 frame->data = (void *)coro;
2137 SvREFCNT_inc (coro->hv);
2138}
2139
2140static void
1862coro_call_on_destroy (pTHX_ struct coro *coro) 2141coro_call_on_destroy (pTHX_ struct coro *coro)
1863{ 2142{
1864 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2143 AV *od = coro->on_destroy;
1865 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1866 2144
1867 if (on_destroyp) 2145 if (!od)
1868 { 2146 return;
1869 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1870 2147
1871 while (AvFILLp (on_destroy) >= 0) 2148 while (AvFILLp (od) >= 0)
2149 {
2150 SV *cb = sv_2mortal (av_pop (od));
2151
2152 /* coro hv's (and only hv's at the moment) are supported as well */
2153 if (SvSTATEhv_p (aTHX_ cb))
2154 api_ready (aTHX_ cb);
2155 else
1872 { 2156 {
1873 dSP; /* don't disturb outer sp */ 2157 dSP; /* don't disturb outer sp */
1874 SV *cb = av_pop (on_destroy);
1875
1876 PUSHMARK (SP); 2158 PUSHMARK (SP);
1877 2159
1878 if (statusp) 2160 if (coro->status)
1879 { 2161 {
1880 int i; 2162 PUTBACK;
1881 AV *status = (AV *)SvRV (*statusp); 2163 coro_push_av (aTHX_ coro->status, G_ARRAY);
1882 EXTEND (SP, AvFILLp (status) + 1); 2164 SPAGAIN;
1883
1884 for (i = 0; i <= AvFILLp (status); ++i)
1885 PUSHs (AvARRAY (status)[i]);
1886 } 2165 }
1887 2166
1888 PUTBACK; 2167 PUTBACK;
1889 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2168 call_sv (cb, G_VOID | G_DISCARD);
1890 } 2169 }
1891 } 2170 }
1892} 2171}
1893 2172
1894static void 2173static void
1895slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1896{ 2175{
2176 AV *av;
2177
2178 if (coro->status)
2179 {
2180 av = coro->status;
2181 av_clear (av);
2182 }
2183 else
2184 av = coro->status = newAV ();
2185
2186 /* items are actually not so common, so optimise for this case */
2187 if (items)
2188 {
1897 int i; 2189 int i;
1898 HV *hv = (HV *)SvRV (coro_current);
1899 AV *av = newAV ();
1900 2190
1901 av_extend (av, items - 1); 2191 av_extend (av, items - 1);
2192
1902 for (i = 0; i < items; ++i) 2193 for (i = 0; i < items; ++i)
1903 av_push (av, SvREFCNT_inc_NN (arg [i])); 2194 av_push (av, SvREFCNT_inc_NN (arg [i]));
2195 }
2196}
1904 2197
1905 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2198static void
1906 2199slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2200{
1907 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2201 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1908 api_ready (aTHX_ sv_manager); 2202 api_ready (aTHX_ sv_manager);
1909 2203
1910 frame->prepare = prepare_schedule; 2204 frame->prepare = prepare_schedule;
1911 frame->check = slf_check_repeat; 2205 frame->check = slf_check_repeat;
1912 2206
1913 /* as a minor optimisation, we could unwind all stacks here */ 2207 /* as a minor optimisation, we could unwind all stacks here */
1914 /* but that puts extra pressure on pp_slf, and is not worth much */ 2208 /* but that puts extra pressure on pp_slf, and is not worth much */
1915 /*coro_unwind_stacks (aTHX);*/ 2209 /*coro_unwind_stacks (aTHX);*/
2210}
2211
2212static void
2213slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2214{
2215 HV *coro_hv = (HV *)SvRV (coro_current);
2216
2217 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219}
2220
2221static void
2222slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{
2224 HV *coro_hv;
2225 struct coro *coro;
2226
2227 if (items <= 0)
2228 croak ("Coro::cancel called without coro object,");
2229
2230 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv;
2232
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 {
2237 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro;
2239
2240 frame->prepare = prepare_nop;
2241 frame->check = slf_check_nop;
2242 }
2243 else if (coro_hv == (HV *)SvRV (coro_current))
2244 {
2245 /* cancelling the current coro is allowed, and equals terminate */
2246 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2247 }
2248 else
2249 {
2250 struct coro *self = SvSTATE_current;
2251
2252 /* otherwise we cancel directly, purely for speed reasons
2253 * unfortunately, this requires some magic trickery, as
2254 * somebody else could cancel us, so we have to fight the cancellation.
2255 * this is ugly, and hopefully fully worth the extra speed.
2256 * besides, I can't get the slow-but-safe version working...
2257 */
2258 slf_frame.data = 0;
2259 self->flags |= CF_NOCANCEL;
2260 coro_state_destroy (aTHX_ coro);
2261 self->flags &= ~CF_NOCANCEL;
2262
2263 if (slf_frame.data)
2264 {
2265 /* while we were busy we have been cancelled, so terminate */
2266 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2267 }
2268 else
2269 {
2270 frame->prepare = prepare_nop;
2271 frame->check = slf_check_nop;
2272 }
2273 }
2274}
2275
2276static int
2277slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2278{
2279 frame->prepare = 0;
2280 coro_unwind_stacks (aTHX);
2281
2282 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2283
2284 return 1;
2285}
2286
2287static int
2288safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2289{
2290 if (coro->cctx)
2291 croak ("coro inside C callback, unable to cancel at this time, caught");
2292
2293 if (coro->flags & CF_NEW)
2294 {
2295 coro_set_status (aTHX_ coro, arg, items);
2296 coro_state_destroy (aTHX_ coro);
2297 }
2298 else
2299 {
2300 if (!coro->slf_frame.prepare)
2301 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2302
2303 slf_destroy (aTHX_ coro);
2304
2305 coro_set_status (aTHX_ coro, arg, items);
2306 coro->slf_frame.prepare = prepare_nop;
2307 coro->slf_frame.check = slf_check_safe_cancel;
2308
2309 api_ready (aTHX_ (SV *)coro->hv);
2310 }
2311
2312 return 1;
1916} 2313}
1917 2314
1918/*****************************************************************************/ 2315/*****************************************************************************/
1919/* async pool handler */ 2316/* async pool handler */
1920 2317
… …
1951slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2348slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1952{ 2349{
1953 HV *hv = (HV *)SvRV (coro_current); 2350 HV *hv = (HV *)SvRV (coro_current);
1954 struct coro *coro = SvSTATE_hv ((SV *)hv); 2351 struct coro *coro = SvSTATE_hv ((SV *)hv);
1955 2352
1956 if (expect_true (coro->saved_deffh)) 2353 if (ecb_expect_true (coro->saved_deffh))
1957 { 2354 {
1958 /* subsequent iteration */ 2355 /* subsequent iteration */
1959 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2356 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1960 coro->saved_deffh = 0; 2357 coro->saved_deffh = 0;
1961 2358
1962 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2359 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1963 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2360 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1964 { 2361 {
1965 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2362 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1966 coro->invoke_av = newAV (); 2363 return;
1967
1968 frame->prepare = prepare_nop;
1969 } 2364 }
1970 else 2365 else
1971 { 2366 {
1972 av_clear (GvAV (PL_defgv)); 2367 av_clear (GvAV (PL_defgv));
1973 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2368 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1998 2393
1999static void 2394static void
2000coro_rouse_callback (pTHX_ CV *cv) 2395coro_rouse_callback (pTHX_ CV *cv)
2001{ 2396{
2002 dXSARGS; 2397 dXSARGS;
2003 SV *data = (SV *)GENSUB_ARG; 2398 SV *data = (SV *)S_GENSUB_ARG;
2004 2399
2005 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2400 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2006 { 2401 {
2007 /* first call, set args */ 2402 /* first call, set args */
2008 SV *coro = SvRV (data); 2403 SV *coro = SvRV (data);
… …
2074 || SvTYPE (SvRV (cb)) != SVt_PVCV 2469 || SvTYPE (SvRV (cb)) != SVt_PVCV
2075 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2470 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2076 croak ("Coro::rouse_wait called with illegal callback argument,"); 2471 croak ("Coro::rouse_wait called with illegal callback argument,");
2077 2472
2078 { 2473 {
2079 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2474 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2080 SV *data = (SV *)GENSUB_ARG; 2475 SV *data = (SV *)S_GENSUB_ARG;
2081 2476
2082 frame->data = (void *)data; 2477 frame->data = (void *)data;
2083 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2478 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2084 frame->check = slf_check_rouse_wait; 2479 frame->check = slf_check_rouse_wait;
2085 } 2480 }
… …
2089coro_new_rouse_cb (pTHX) 2484coro_new_rouse_cb (pTHX)
2090{ 2485{
2091 HV *hv = (HV *)SvRV (coro_current); 2486 HV *hv = (HV *)SvRV (coro_current);
2092 struct coro *coro = SvSTATE_hv (hv); 2487 struct coro *coro = SvSTATE_hv (hv);
2093 SV *data = newRV_inc ((SV *)hv); 2488 SV *data = newRV_inc ((SV *)hv);
2094 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2489 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2095 2490
2096 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2491 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2097 SvREFCNT_dec (data); /* magicext increases the refcount */ 2492 SvREFCNT_dec (data); /* magicext increases the refcount */
2098 2493
2099 SvREFCNT_dec (coro->rouse_cb); 2494 SvREFCNT_dec (coro->rouse_cb);
… …
2196static void 2591static void
2197slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2592slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{ 2593{
2199 frame->prepare = prepare_cede_notself; 2594 frame->prepare = prepare_cede_notself;
2200 frame->check = slf_check_nop; 2595 frame->check = slf_check_nop;
2596}
2597
2598/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2599static void
2600slf_destroy (pTHX_ struct coro *coro)
2601{
2602 /* this callback is reserved for slf functions needing to do cleanup */
2603 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2604 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2605
2606 /*
2607 * The on_destroy above most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions.
2611 */
2612 coro->slf_frame.prepare = 0;
2201} 2613}
2202 2614
2203/* 2615/*
2204 * these not obviously related functions are all rolled into one 2616 * these not obviously related functions are all rolled into one
2205 * function to increase chances that they all will call transfer with the same 2617 * function to increase chances that they all will call transfer with the same
… …
2212 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2624 I32 checkmark; /* mark SP to see how many elements check has pushed */
2213 2625
2214 /* set up the slf frame, unless it has already been set-up */ 2626 /* set up the slf frame, unless it has already been set-up */
2215 /* the latter happens when a new coro has been started */ 2627 /* the latter happens when a new coro has been started */
2216 /* or when a new cctx was attached to an existing coroutine */ 2628 /* or when a new cctx was attached to an existing coroutine */
2217 if (expect_true (!slf_frame.prepare)) 2629 if (ecb_expect_true (!slf_frame.prepare))
2218 { 2630 {
2219 /* first iteration */ 2631 /* first iteration */
2220 dSP; 2632 dSP;
2221 SV **arg = PL_stack_base + TOPMARK + 1; 2633 SV **arg = PL_stack_base + TOPMARK + 1;
2222 int items = SP - arg; /* args without function object */ 2634 int items = SP - arg; /* args without function object */
… …
2263 while (slf_frame.check (aTHX_ &slf_frame)); 2675 while (slf_frame.check (aTHX_ &slf_frame));
2264 2676
2265 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2677 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2266 2678
2267 /* exception handling */ 2679 /* exception handling */
2268 if (expect_false (CORO_THROW)) 2680 if (ecb_expect_false (CORO_THROW))
2269 { 2681 {
2270 SV *exception = sv_2mortal (CORO_THROW); 2682 SV *exception = sv_2mortal (CORO_THROW);
2271 2683
2272 CORO_THROW = 0; 2684 CORO_THROW = 0;
2273 sv_setsv (ERRSV, exception); 2685 sv_setsv (ERRSV, exception);
2274 croak (0); 2686 croak (0);
2275 } 2687 }
2276 2688
2277 /* return value handling - mostly like entersub */ 2689 /* return value handling - mostly like entersub */
2278 /* make sure we put something on the stack in scalar context */ 2690 /* make sure we put something on the stack in scalar context */
2279 if (GIMME_V == G_SCALAR) 2691 if (GIMME_V == G_SCALAR
2692 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2280 { 2693 {
2281 dSP; 2694 dSP;
2282 SV **bot = PL_stack_base + checkmark; 2695 SV **bot = PL_stack_base + checkmark;
2283 2696
2284 if (sp == bot) /* too few, push undef */ 2697 if (sp == bot) /* too few, push undef */
2285 bot [1] = &PL_sv_undef; 2698 bot [1] = &PL_sv_undef;
2286 else if (sp != bot + 1) /* too many, take last one */ 2699 else /* too many, take last one */
2287 bot [1] = *sp; 2700 bot [1] = *sp;
2288 2701
2289 SP = bot + 1; 2702 SP = bot + 1;
2290 2703
2291 PUTBACK; 2704 PUTBACK;
… …
2324 if (PL_op->op_flags & OPf_STACKED) 2737 if (PL_op->op_flags & OPf_STACKED)
2325 { 2738 {
2326 if (items > slf_arga) 2739 if (items > slf_arga)
2327 { 2740 {
2328 slf_arga = items; 2741 slf_arga = items;
2329 free (slf_argv); 2742 Safefree (slf_argv);
2330 slf_argv = malloc (slf_arga * sizeof (SV *)); 2743 New (0, slf_argv, slf_arga, SV *);
2331 } 2744 }
2332 2745
2333 slf_argc = items; 2746 slf_argc = items;
2334 2747
2335 for (i = 0; i < items; ++i) 2748 for (i = 0; i < items; ++i)
… …
2398{ 2811{
2399 PerlIOBuf base; 2812 PerlIOBuf base;
2400 NV next, every; 2813 NV next, every;
2401} PerlIOCede; 2814} PerlIOCede;
2402 2815
2403static IV 2816static IV ecb_cold
2404PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2817PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2405{ 2818{
2406 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2819 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2407 2820
2408 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2821 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2409 self->next = nvtime () + self->every; 2822 self->next = nvtime () + self->every;
2410 2823
2411 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2824 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2412} 2825}
2413 2826
2414static SV * 2827static SV * ecb_cold
2415PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2828PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2416{ 2829{
2417 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2830 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2418 2831
2419 return newSVnv (self->every); 2832 return newSVnv (self->every);
… …
2470/* Coro::Semaphore & Coro::Signal */ 2883/* Coro::Semaphore & Coro::Signal */
2471 2884
2472static SV * 2885static SV *
2473coro_waitarray_new (pTHX_ int count) 2886coro_waitarray_new (pTHX_ int count)
2474{ 2887{
2475 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2888 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2476 AV *av = newAV (); 2889 AV *av = newAV ();
2477 SV **ary; 2890 SV **ary;
2478 2891
2479 /* unfortunately, building manually saves memory */ 2892 /* unfortunately, building manually saves memory */
2480 Newx (ary, 2, SV *); 2893 Newx (ary, 2, SV *);
… …
2531 SvREFCNT_dec (cb); 2944 SvREFCNT_dec (cb);
2532 } 2945 }
2533} 2946}
2534 2947
2535static void 2948static void
2536coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2949coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2537{ 2950{
2538 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2951 /* call $sem->adjust (0) to possibly wake up some other waiters */
2539 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2952 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2540} 2953}
2541 2954
2542static int 2955static int
2543slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2956slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2544{ 2957{
2545 AV *av = (AV *)frame->data; 2958 AV *av = (AV *)frame->data;
2546 SV *count_sv = AvARRAY (av)[0]; 2959 SV *count_sv = AvARRAY (av)[0];
2960 SV *coro_hv = SvRV (coro_current);
2547 2961
2548 /* if we are about to throw, don't actually acquire the lock, just throw */ 2962 /* if we are about to throw, don't actually acquire the lock, just throw */
2549 if (CORO_THROW) 2963 if (CORO_THROW)
2550 return 0; 2964 return 0;
2551 else if (SvIVX (count_sv) > 0) 2965 else if (SvIVX (count_sv) > 0)
2552 { 2966 {
2553 SvSTATE_current->on_destroy = 0; 2967 frame->destroy = 0;
2554 2968
2555 if (acquire) 2969 if (acquire)
2556 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2970 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2557 else 2971 else
2558 coro_semaphore_adjust (aTHX_ av, 0); 2972 coro_semaphore_adjust (aTHX_ av, 0);
… …
2563 { 2977 {
2564 int i; 2978 int i;
2565 /* if we were woken up but can't down, we look through the whole */ 2979 /* if we were woken up but can't down, we look through the whole */
2566 /* waiters list and only add us if we aren't in there already */ 2980 /* waiters list and only add us if we aren't in there already */
2567 /* this avoids some degenerate memory usage cases */ 2981 /* this avoids some degenerate memory usage cases */
2568 2982 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2569 for (i = 1; i <= AvFILLp (av); ++i)
2570 if (AvARRAY (av)[i] == SvRV (coro_current)) 2983 if (AvARRAY (av)[i] == coro_hv)
2571 return 1; 2984 return 1;
2572 2985
2573 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2986 av_push (av, SvREFCNT_inc (coro_hv));
2574 return 1; 2987 return 1;
2575 } 2988 }
2576} 2989}
2577 2990
2578static int 2991static int
… …
2601 { 3014 {
2602 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3015 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2603 3016
2604 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3017 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2605 frame->prepare = prepare_schedule; 3018 frame->prepare = prepare_schedule;
2606
2607 /* to avoid race conditions when a woken-up coro gets terminated */ 3019 /* to avoid race conditions when a woken-up coro gets terminated */
2608 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3020 /* we arrange for a temporary on_destroy that calls adjust (0) */
2609 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3021 frame->destroy = coro_semaphore_destroy;
2610 } 3022 }
2611} 3023}
2612 3024
2613static void 3025static void
2614slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3026slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2622{ 3034{
2623 if (items >= 2) 3035 if (items >= 2)
2624 { 3036 {
2625 /* callback form */ 3037 /* callback form */
2626 AV *av = (AV *)SvRV (arg [0]); 3038 AV *av = (AV *)SvRV (arg [0]);
2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3039 SV *cb_cv = s_get_cv_croak (arg [1]);
2628 3040
2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3041 av_push (av, SvREFCNT_inc_NN (cb_cv));
2630 3042
2631 if (SvIVX (AvARRAY (av)[0]) > 0) 3043 if (SvIVX (AvARRAY (av)[0]) > 0)
2632 coro_semaphore_adjust (aTHX_ av, 0); 3044 coro_semaphore_adjust (aTHX_ av, 0);
2633 3045
2634 frame->prepare = prepare_nop; 3046 frame->prepare = prepare_nop;
… …
2658 AvARRAY (av)[0] = AvARRAY (av)[1]; 3070 AvARRAY (av)[0] = AvARRAY (av)[1];
2659 AvARRAY (av)[1] = cb; 3071 AvARRAY (av)[1] = cb;
2660 3072
2661 cb = av_shift (av); 3073 cb = av_shift (av);
2662 3074
3075 if (SvTYPE (cb) == SVt_PVCV)
3076 {
3077 dSP;
3078 PUSHMARK (SP);
3079 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3080 PUTBACK;
3081 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3082 }
3083 else
3084 {
2663 api_ready (aTHX_ cb); 3085 api_ready (aTHX_ cb);
2664 sv_setiv (cb, 0); /* signal waiter */ 3086 sv_setiv (cb, 0); /* signal waiter */
3087 }
3088
2665 SvREFCNT_dec (cb); 3089 SvREFCNT_dec (cb);
2666 3090
2667 --count; 3091 --count;
2668 } 3092 }
2669} 3093}
… …
2678static void 3102static void
2679slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3103slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2680{ 3104{
2681 AV *av = (AV *)SvRV (arg [0]); 3105 AV *av = (AV *)SvRV (arg [0]);
2682 3106
3107 if (items >= 2)
3108 {
3109 SV *cb_cv = s_get_cv_croak (arg [1]);
3110 av_push (av, SvREFCNT_inc_NN (cb_cv));
3111
2683 if (SvIVX (AvARRAY (av)[0])) 3112 if (SvIVX (AvARRAY (av)[0]))
3113 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3114
3115 frame->prepare = prepare_nop;
3116 frame->check = slf_check_nop;
3117 }
3118 else if (SvIVX (AvARRAY (av)[0]))
2684 { 3119 {
2685 SvIVX (AvARRAY (av)[0]) = 0; 3120 SvIVX (AvARRAY (av)[0]) = 0;
2686 frame->prepare = prepare_nop; 3121 frame->prepare = prepare_nop;
2687 frame->check = slf_check_nop; 3122 frame->check = slf_check_nop;
2688 } 3123 }
2689 else 3124 else
2690 { 3125 {
2691 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3126 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2692 3127
2693 av_push (av, waiter); 3128 av_push (av, waiter);
2694 3129
2695 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3130 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2696 frame->prepare = prepare_schedule; 3131 frame->prepare = prepare_schedule;
… …
2714 3149
2715static void 3150static void
2716coro_aio_callback (pTHX_ CV *cv) 3151coro_aio_callback (pTHX_ CV *cv)
2717{ 3152{
2718 dXSARGS; 3153 dXSARGS;
2719 AV *state = (AV *)GENSUB_ARG; 3154 AV *state = (AV *)S_GENSUB_ARG;
2720 SV *coro = av_pop (state); 3155 SV *coro = av_pop (state);
2721 SV *data_sv = newSV (sizeof (struct io_state)); 3156 SV *data_sv = newSV (sizeof (struct io_state));
2722 3157
2723 av_extend (state, items - 1); 3158 av_extend (state, items - 1);
2724 3159
… …
2809 dSP; 3244 dSP;
2810 3245
2811 static SV *prio_cv; 3246 static SV *prio_cv;
2812 static SV *prio_sv; 3247 static SV *prio_sv;
2813 3248
2814 if (expect_false (!prio_cv)) 3249 if (ecb_expect_false (!prio_cv))
2815 { 3250 {
2816 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3251 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2817 prio_sv = newSViv (0); 3252 prio_sv = newSViv (0);
2818 } 3253 }
2819 3254
… …
2838 3273
2839 for (i = 0; i < items; ++i) 3274 for (i = 0; i < items; ++i)
2840 PUSHs (arg [i]); 3275 PUSHs (arg [i]);
2841 3276
2842 /* now push the callback closure */ 3277 /* now push the callback closure */
2843 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3278 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2844 3279
2845 /* now call the AIO function - we assume our request is uncancelable */ 3280 /* now call the AIO function - we assume our request is uncancelable */
2846 PUTBACK; 3281 PUTBACK;
2847 call_sv ((SV *)req, G_VOID | G_DISCARD); 3282 call_sv ((SV *)req, G_VOID | G_DISCARD);
2848 } 3283 }
2849 3284
2850 /* now that the requets is going, we loop toll we have a result */ 3285 /* now that the request is going, we loop till we have a result */
2851 frame->data = (void *)state; 3286 frame->data = (void *)state;
2852 frame->prepare = prepare_schedule; 3287 frame->prepare = prepare_schedule;
2853 frame->check = slf_check_aio_req; 3288 frame->check = slf_check_aio_req;
2854} 3289}
2855 3290
… …
2865 3300
2866/*****************************************************************************/ 3301/*****************************************************************************/
2867 3302
2868#if CORO_CLONE 3303#if CORO_CLONE
2869# include "clone.c" 3304# include "clone.c"
3305#endif
3306
3307/*****************************************************************************/
3308
3309static SV *
3310coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3311{
3312 SV *coro_sv;
3313 struct coro *coro;
3314 MAGIC *mg;
3315 HV *hv;
3316 SV *cb;
3317 int i;
3318
3319 if (argc > 0)
3320 {
3321 cb = s_get_cv_croak (argv [0]);
3322
3323 if (!is_coro)
3324 {
3325 if (CvISXSUB (cb))
3326 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3327
3328 if (!CvROOT (cb))
3329 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3330 }
3331 }
3332
3333 Newz (0, coro, 1, struct coro);
3334 coro->args = newAV ();
3335 coro->flags = CF_NEW;
3336
3337 if (coro_first) coro_first->prev = coro;
3338 coro->next = coro_first;
3339 coro_first = coro;
3340
3341 coro->hv = hv = newHV ();
3342 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3343 mg->mg_flags |= MGf_DUP;
3344 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3345
3346 if (argc > 0)
3347 {
3348 av_extend (coro->args, argc + is_coro - 1);
3349
3350 if (is_coro)
3351 {
3352 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3353 cb = (SV *)cv_coro_run;
3354 }
3355
3356 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3357
3358 for (i = 1; i < argc; i++)
3359 av_push (coro->args, newSVsv (argv [i]));
3360 }
3361
3362 return coro_sv;
3363}
3364
3365#ifndef __cplusplus
3366ecb_cold XS(boot_Coro__State);
3367#endif
3368
3369#if CORO_JIT
3370
3371static void ecb_noinline ecb_cold
3372pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3373{
3374 dSP;
3375 AV *av = newAV ();
3376
3377 av_store (av, 3, newSVuv (d));
3378 av_store (av, 2, newSVuv (c));
3379 av_store (av, 1, newSVuv (b));
3380 av_store (av, 0, newSVuv (a));
3381
3382 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3383
3384 PUTBACK;
3385}
3386
3387static void ecb_noinline ecb_cold
3388jit_init (pTHX)
3389{
3390 dSP;
3391 SV *load, *save;
3392 char *map_base;
3393 char *load_ptr, *save_ptr;
3394 STRLEN load_len, save_len, map_len;
3395 int count;
3396
3397 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3398
3399 PUSHMARK (SP);
3400 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3401 #include "state.h"
3402 count = call_pv ("Coro::State::_jit", G_ARRAY);
3403 SPAGAIN;
3404
3405 save = POPs; save_ptr = SvPVbyte (save, save_len);
3406 load = POPs; load_ptr = SvPVbyte (load, load_len);
3407
3408 map_len = load_len + save_len + 16;
3409
3410 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3411
3412 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3413
3414 load_perl_slots = (load_save_perl_slots_type)map_base;
3415 memcpy (map_base, load_ptr, load_len);
3416
3417 map_base += (load_len + 15) & ~15;
3418
3419 save_perl_slots = (load_save_perl_slots_type)map_base;
3420 memcpy (map_base, save_ptr, save_len);
3421
3422 /* we are good citizens and try to make the page read-only, so the evil evil */
3423 /* hackers might have it a bit more difficult */
3424 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3425
3426 PUTBACK;
3427 eval_pv ("undef &Coro::State::_jit", 1);
3428}
3429
2870#endif 3430#endif
2871 3431
2872MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3432MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2873 3433
2874PROTOTYPES: DISABLE 3434PROTOTYPES: DISABLE
… …
2879# if CORO_PTHREAD 3439# if CORO_PTHREAD
2880 coro_thx = PERL_GET_CONTEXT; 3440 coro_thx = PERL_GET_CONTEXT;
2881# endif 3441# endif
2882#endif 3442#endif
2883 BOOT_PAGESIZE; 3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV;
3450 ERRSV;
2884 3451
2885 cctx_current = cctx_new_empty (); 3452 cctx_current = cctx_new_empty ();
2886 3453
2887 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3454 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2888 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3455 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2928 coroapi.prepare_nop = prepare_nop; 3495 coroapi.prepare_nop = prepare_nop;
2929 coroapi.prepare_schedule = prepare_schedule; 3496 coroapi.prepare_schedule = prepare_schedule;
2930 coroapi.prepare_cede = prepare_cede; 3497 coroapi.prepare_cede = prepare_cede;
2931 coroapi.prepare_cede_notself = prepare_cede_notself; 3498 coroapi.prepare_cede_notself = prepare_cede_notself;
2932 3499
2933 { 3500 time_init (aTHX);
2934 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2935 3501
2936 if (!svp) croak ("Time::HiRes is required");
2937 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2938
2939 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2940 }
2941
2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3502 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3503#if CORO_JIT
3504 PUTBACK;
3505 jit_init (aTHX);
3506 SPAGAIN;
3507#endif
2943} 3508}
2944 3509
2945SV * 3510SV *
2946new (char *klass, ...) 3511new (SV *klass, ...)
2947 ALIAS: 3512 ALIAS:
2948 Coro::new = 1 3513 Coro::new = 1
2949 CODE: 3514 CODE:
2950{ 3515 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2951 struct coro *coro; 3516 OUTPUT:
2952 MAGIC *mg;
2953 HV *hv;
2954 CV *cb;
2955 int i;
2956
2957 if (items > 1)
2958 {
2959 cb = coro_sv_2cv (aTHX_ ST (1));
2960
2961 if (!ix)
2962 {
2963 if (CvISXSUB (cb))
2964 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2965
2966 if (!CvROOT (cb))
2967 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2968 }
2969 }
2970
2971 Newz (0, coro, 1, struct coro);
2972 coro->args = newAV ();
2973 coro->flags = CF_NEW;
2974
2975 if (coro_first) coro_first->prev = coro;
2976 coro->next = coro_first;
2977 coro_first = coro;
2978
2979 coro->hv = hv = newHV ();
2980 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2981 mg->mg_flags |= MGf_DUP;
2982 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2983
2984 if (items > 1)
2985 {
2986 av_extend (coro->args, items - 1 + ix - 1);
2987
2988 if (ix)
2989 {
2990 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991 cb = cv_coro_run;
2992 }
2993
2994 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2995
2996 for (i = 2; i < items; i++)
2997 av_push (coro->args, newSVsv (ST (i)));
2998 }
2999}
3000 OUTPUT:
3001 RETVAL 3517 RETVAL
3002 3518
3003void 3519void
3004transfer (...) 3520transfer (...)
3005 PROTOTYPE: $$ 3521 PROTOTYPE: $$
3006 CODE: 3522 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3523 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3008
3009bool
3010_destroy (SV *coro_sv)
3011 CODE:
3012 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3013 OUTPUT:
3014 RETVAL
3015 3524
3016void 3525void
3017_exit (int code) 3526_exit (int code)
3018 PROTOTYPE: $ 3527 PROTOTYPE: $
3019 CODE: 3528 CODE:
… …
3095 CODE: 3604 CODE:
3096{ 3605{
3097 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3606 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3098 { 3607 {
3099 struct coro *current = SvSTATE_current; 3608 struct coro *current = SvSTATE_current;
3609 struct CoroSLF slf_save;
3100 3610
3101 if (current != coro) 3611 if (current != coro)
3102 { 3612 {
3103 PUTBACK; 3613 PUTBACK;
3104 save_perl (aTHX_ current); 3614 save_perl (aTHX_ current);
3105 load_perl (aTHX_ coro); 3615 load_perl (aTHX_ coro);
3616 /* the coro is most likely in an active SLF call.
3617 * while not strictly required (the code we execute is
3618 * not allowed to call any SLF functions), it's cleaner
3619 * to reinitialise the slf_frame and restore it later.
3620 * This might one day allow us to actually do SLF calls
3621 * from code executed here.
3622 */
3623 slf_save = slf_frame;
3624 slf_frame.prepare = 0;
3106 SPAGAIN; 3625 SPAGAIN;
3107 } 3626 }
3108 3627
3109 PUSHSTACK; 3628 PUSHSTACK;
3110 3629
… …
3120 SPAGAIN; 3639 SPAGAIN;
3121 3640
3122 if (current != coro) 3641 if (current != coro)
3123 { 3642 {
3124 PUTBACK; 3643 PUTBACK;
3644 slf_frame = slf_save;
3125 save_perl (aTHX_ coro); 3645 save_perl (aTHX_ coro);
3126 load_perl (aTHX_ current); 3646 load_perl (aTHX_ current);
3127 SPAGAIN; 3647 SPAGAIN;
3128 } 3648 }
3129 } 3649 }
… …
3134 PROTOTYPE: $ 3654 PROTOTYPE: $
3135 ALIAS: 3655 ALIAS:
3136 is_ready = CF_READY 3656 is_ready = CF_READY
3137 is_running = CF_RUNNING 3657 is_running = CF_RUNNING
3138 is_new = CF_NEW 3658 is_new = CF_NEW
3139 is_destroyed = CF_DESTROYED 3659 is_destroyed = CF_ZOMBIE
3660 is_zombie = CF_ZOMBIE
3140 is_suspended = CF_SUSPENDED 3661 is_suspended = CF_SUSPENDED
3141 CODE: 3662 CODE:
3142 RETVAL = boolSV (coro->flags & ix); 3663 RETVAL = boolSV (coro->flags & ix);
3143 OUTPUT: 3664 OUTPUT:
3144 RETVAL 3665 RETVAL
3145 3666
3146void 3667void
3147throw (Coro::State self, SV *throw = &PL_sv_undef) 3668throw (Coro::State self, SV *exception = &PL_sv_undef)
3148 PROTOTYPE: $;$ 3669 PROTOTYPE: $;$
3149 CODE: 3670 CODE:
3150{ 3671{
3151 struct coro *current = SvSTATE_current; 3672 struct coro *current = SvSTATE_current;
3152 SV **throwp = self == current ? &CORO_THROW : &self->except; 3673 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3153 SvREFCNT_dec (*throwp); 3674 SvREFCNT_dec (*exceptionp);
3154 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3675 SvGETMAGIC (exception);
3676 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3155} 3677}
3156 3678
3157void 3679void
3158api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3680api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3159 PROTOTYPE: $;$ 3681 PROTOTYPE: $;$
… …
3214 3736
3215void 3737void
3216cancel (Coro::State self) 3738cancel (Coro::State self)
3217 CODE: 3739 CODE:
3218 coro_state_destroy (aTHX_ self); 3740 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3741
3742SV *
3743enable_times (int enabled = enable_times)
3744 CODE:
3745{
3746 RETVAL = boolSV (enable_times);
3747
3748 if (enabled != enable_times)
3749 {
3750 enable_times = enabled;
3751
3752 coro_times_update ();
3753 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3754 }
3755}
3756 OUTPUT:
3757 RETVAL
3758
3759void
3760times (Coro::State self)
3761 PPCODE:
3762{
3763 struct coro *current = SvSTATE (coro_current);
3764
3765 if (ecb_expect_false (current == self))
3766 {
3767 coro_times_update ();
3768 coro_times_add (SvSTATE (coro_current));
3769 }
3770
3771 EXTEND (SP, 2);
3772 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3773 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3774
3775 if (ecb_expect_false (current == self))
3776 coro_times_sub (SvSTATE (coro_current));
3777}
3778
3779void
3780swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3781 CODE:
3782{
3783 struct coro *current = SvSTATE_current;
3784
3785 if (current == coro)
3786 SWAP_SVS (current);
3787
3788 if (!coro->swap_sv)
3789 coro->swap_sv = newAV ();
3790
3791 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3792 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3793
3794 if (current == coro)
3795 SWAP_SVS (current);
3796}
3220 3797
3221 3798
3222MODULE = Coro::State PACKAGE = Coro 3799MODULE = Coro::State PACKAGE = Coro
3223 3800
3224BOOT: 3801BOOT:
3225{ 3802{
3226 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3803 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3227 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3804 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3228 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3805 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3229 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3230 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3806 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3231 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3807 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3232 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3808 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3233 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3809 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3234 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3810 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3235 3811
3236 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3812 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3237 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3813 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3238 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3814 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3815 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3240 3816
3241 coro_stash = gv_stashpv ("Coro", TRUE); 3817 coro_stash = gv_stashpv ("Coro", TRUE);
3242 3818
3243 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3244 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3245 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3246 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3822 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3247 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3823 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3248 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3824 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3249 3825
3250 { 3826 {
3251 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3827 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3252 3828
3253 coroapi.schedule = api_schedule; 3829 coroapi.schedule = api_schedule;
… …
3263 sv_setiv (sv, (IV)&coroapi); 3839 sv_setiv (sv, (IV)&coroapi);
3264 SvREADONLY_on (sv); 3840 SvREADONLY_on (sv);
3265 } 3841 }
3266} 3842}
3267 3843
3844SV *
3845async (...)
3846 PROTOTYPE: &@
3847 CODE:
3848 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3849 api_ready (aTHX_ RETVAL);
3850 OUTPUT:
3851 RETVAL
3852
3853void
3854_destroy (Coro::State coro)
3855 CODE:
3856 /* used by the manager thread */
3857 coro_state_destroy (aTHX_ coro);
3858
3859void
3860on_destroy (Coro::State coro, SV *cb)
3861 CODE:
3862 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3863
3864void
3865join (...)
3866 CODE:
3867 CORO_EXECUTE_SLF_XS (slf_init_join);
3868
3268void 3869void
3269terminate (...) 3870terminate (...)
3270 CODE: 3871 CODE:
3271 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3872 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3873
3874void
3875cancel (...)
3876 CODE:
3877 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3878
3879int
3880safe_cancel (Coro::State self, ...)
3881 C_ARGS: aTHX_ self, &ST (1), items - 1
3272 3882
3273void 3883void
3274schedule (...) 3884schedule (...)
3275 CODE: 3885 CODE:
3276 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3886 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3305void 3915void
3306_set_readyhook (SV *hook) 3916_set_readyhook (SV *hook)
3307 PROTOTYPE: $ 3917 PROTOTYPE: $
3308 CODE: 3918 CODE:
3309 SvREFCNT_dec (coro_readyhook); 3919 SvREFCNT_dec (coro_readyhook);
3920 SvGETMAGIC (hook);
3921 if (SvOK (hook))
3922 {
3310 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3923 coro_readyhook = newSVsv (hook);
3924 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3925 }
3926 else
3927 {
3928 coro_readyhook = 0;
3929 CORO_READYHOOK = 0;
3930 }
3311 3931
3312int 3932int
3313prio (Coro::State coro, int newprio = 0) 3933prio (Coro::State coro, int newprio = 0)
3314 PROTOTYPE: $;$ 3934 PROTOTYPE: $;$
3315 ALIAS: 3935 ALIAS:
… …
3321 if (items > 1) 3941 if (items > 1)
3322 { 3942 {
3323 if (ix) 3943 if (ix)
3324 newprio = coro->prio - newprio; 3944 newprio = coro->prio - newprio;
3325 3945
3326 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3946 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3327 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3947 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3328 3948
3329 coro->prio = newprio; 3949 coro->prio = newprio;
3330 } 3950 }
3331} 3951}
3332 OUTPUT: 3952 OUTPUT:
… …
3379 for (i = 1; i < items; ++i) 3999 for (i = 1; i < items; ++i)
3380 av_push (av, SvREFCNT_inc_NN (ST (i))); 4000 av_push (av, SvREFCNT_inc_NN (ST (i)));
3381 4001
3382 if ((SV *)hv == &PL_sv_undef) 4002 if ((SV *)hv == &PL_sv_undef)
3383 { 4003 {
3384 PUSHMARK (SP); 4004 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3385 EXTEND (SP, 2);
3386 PUSHs (sv_Coro);
3387 PUSHs ((SV *)cv_pool_handler);
3388 PUTBACK;
3389 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3390 SPAGAIN;
3391
3392 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4005 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4006 SvREFCNT_dec (sv);
3393 } 4007 }
3394 4008
3395 { 4009 {
3396 struct coro *coro = SvSTATE_hv (hv); 4010 struct coro *coro = SvSTATE_hv (hv);
3397 4011
… …
3431 CODE: 4045 CODE:
3432{ 4046{
3433 struct coro *coro = SvSTATE_current; 4047 struct coro *coro = SvSTATE_current;
3434 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4048 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3435 4049
3436 block = (SV *)coro_sv_2cv (aTHX_ block); 4050 block = s_get_cv_croak (block);
3437 4051
3438 if (!*avp) 4052 if (!*avp)
3439 *avp = newAV (); 4053 *avp = newAV ();
3440 4054
3441 av_push (*avp, SvREFCNT_inc (block)); 4055 av_push (*avp, SvREFCNT_inc (block));
… …
3458MODULE = Coro::State PACKAGE = Coro::Semaphore 4072MODULE = Coro::State PACKAGE = Coro::Semaphore
3459 4073
3460SV * 4074SV *
3461new (SV *klass, SV *count = 0) 4075new (SV *klass, SV *count = 0)
3462 CODE: 4076 CODE:
4077{
4078 int semcnt = 1;
4079
4080 if (count)
4081 {
4082 SvGETMAGIC (count);
4083
4084 if (SvOK (count))
4085 semcnt = SvIV (count);
4086 }
4087
3463 RETVAL = sv_bless ( 4088 RETVAL = sv_bless (
3464 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4089 coro_waitarray_new (aTHX_ semcnt),
3465 GvSTASH (CvGV (cv)) 4090 GvSTASH (CvGV (cv))
3466 ); 4091 );
4092}
3467 OUTPUT: 4093 OUTPUT:
3468 RETVAL 4094 RETVAL
3469 4095
3470# helper for Coro::Channel and others 4096# helper for Coro::Channel and others
3471SV * 4097SV *
… …
3536} 4162}
3537 4163
3538MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4164MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3539 4165
3540void 4166void
3541_may_delete (SV *sem, int count, int extra_refs) 4167_may_delete (SV *sem, int count, unsigned int extra_refs)
3542 PPCODE: 4168 PPCODE:
3543{ 4169{
3544 AV *av = (AV *)SvRV (sem); 4170 AV *av = (AV *)SvRV (sem);
3545 4171
3546 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4172 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3629 4255
3630void 4256void
3631_register (char *target, char *proto, SV *req) 4257_register (char *target, char *proto, SV *req)
3632 CODE: 4258 CODE:
3633{ 4259{
3634 CV *req_cv = coro_sv_2cv (aTHX_ req); 4260 SV *req_cv = s_get_cv_croak (req);
3635 /* newXSproto doesn't return the CV on 5.8 */ 4261 /* newXSproto doesn't return the CV on 5.8 */
3636 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4262 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3637 sv_setpv ((SV *)slf_cv, proto); 4263 sv_setpv ((SV *)slf_cv, proto);
3638 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4264 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3639} 4265}
3640 4266
4267MODULE = Coro::State PACKAGE = Coro::Select
4268
4269void
4270patch_pp_sselect ()
4271 CODE:
4272 if (!coro_old_pp_sselect)
4273 {
4274 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4275 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4276 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4277 }
4278
4279void
4280unpatch_pp_sselect ()
4281 CODE:
4282 if (coro_old_pp_sselect)
4283 {
4284 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4285 coro_old_pp_sselect = 0;
4286 }
4287

Diff Legend

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