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.415 by root, Tue Aug 30 07:48:53 2011 UTC

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

Diff Legend

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