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.340 by root, Mon Dec 15 00:30:40 2008 UTC vs.
Revision 1.418 by root, Mon Feb 20 00:03:07 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \ 68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 69# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif 70#endif
114 71
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
117#endif 74#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
136#endif 93#endif
137 94
138#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
139 96
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 97#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
157 99
158#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
159# if CORO_PTHREAD 101# if CORO_PTHREAD
160static void *coro_thx; 102static void *coro_thx;
161# endif 103# endif
162#endif 104#endif
163 105
106/* 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 */
… …
218 void *sptr; 181 void *sptr;
219 size_t ssize; 182 size_t ssize;
220 183
221 /* cpu state */ 184 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
224 JMPENV *top_env; 189 JMPENV *top_env;
225 coro_context cctx; 190 coro_context cctx;
226 191
227 U32 gen; 192 U32 gen;
228#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
229 int valgrind_id; 194 int valgrind_id;
230#endif 195#endif
231 unsigned char flags; 196 unsigned char flags;
232} coro_cctx; 197} coro_cctx;
233 198
234coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
235 200
236/*****************************************************************************/ 201/*****************************************************************************/
237 202
203static MGVTBL coro_state_vtbl;
204
238enum { 205enum
206{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 213};
244 214
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 216typedef struct
247{ 217{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 218#define VARx(name,expr,type) type name;
254# include "state.h" 219# include "state.h"
255#undef VAR 220#undef VARx
256} perl_slots; 221} perl_slots;
257 222
223/* how many context stack entries do we need for perl_slots */
258#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 225
260/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
261struct coro { 227struct coro
228{
262 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 230 coro_cctx *cctx;
231
232 /* ready queue */
233 struct coro *next_ready;
264 234
265 /* state data */ 235 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 237 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
269 239
270 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 244
277 /* statistics */ 245 /* statistics */
278 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
279 247
280 /* coro process data */ 248 /* coro process data */
281 int prio; 249 int prio;
282 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
283 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
284 254
285 /* async_pool */ 255 /* async_pool */
286 SV *saved_deffh; 256 SV *saved_deffh;
287 SV *invoke_cb; 257 SV *invoke_cb;
288 AV *invoke_av; 258 AV *invoke_av;
289 259
290 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
291 AV *on_enter; 261 AV *on_enter;
292 AV *on_leave; 262 AV *on_leave;
293 263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
294 /* linked list */ 270 /* linked list */
295 struct coro *next, *prev; 271 struct coro *next, *prev;
296}; 272};
297 273
298typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
299typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
300 276
301/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
302/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
303/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
305 281
306/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
307 283
308#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
314 290
315/* for Coro.pm */ 291/* for Coro.pm */
316static SV *coro_current; 292static SV *coro_current;
317static SV *coro_readyhook; 293static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
320static struct coro *coro_first; 296static struct coro *coro_first;
321#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
322 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
322/** Coro::Select ************************************************************/
323
324static OP *(*coro_old_pp_sselect) (pTHX);
325static SV *coro_select_select;
326
327/* horrible hack, but if it works... */
328static OP *
329coro_pp_sselect (pTHX)
330{
331 dSP;
332 PUSHMARK (SP - 4); /* fake argument list */
333 XPUSHs (coro_select_select);
334 PUTBACK;
335
336 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
337 PL_op->op_flags |= OPf_STACKED;
338 PL_op->op_private = 0;
339 return PL_ppaddr [OP_ENTERSUB](aTHX);
340}
341
342/** time stuff **************************************************************/
343
344#ifdef HAS_GETTIMEOFDAY
345
346ecb_inline void
347coro_u2time (pTHX_ UV ret[2])
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 ret [0] = tv.tv_sec;
353 ret [1] = tv.tv_usec;
354}
355
356ecb_inline double
357coro_nvtime (void)
358{
359 struct timeval tv;
360 gettimeofday (&tv, 0);
361
362 return tv.tv_sec + tv.tv_usec * 1e-6;
363}
364
365ecb_inline void
366time_init (pTHX)
367{
368 nvtime = coro_nvtime;
369 u2time = coro_u2time;
370}
371
372#else
373
374ecb_inline void
375time_init (pTHX)
376{
377 SV **svp;
378
379 require_pv ("Time/HiRes.pm");
380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385
386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
387
388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
390}
391
392#endif
393
323/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
324 395
325static SV * 396static SV * ecb_noinline
326coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
327{ 398{
328#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
329 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
330 get_sv (name, create); 401 get_sv (name, create);
331#endif 402#endif
332 return get_sv (name, create); 403 return get_sv (name, create);
333} 404}
334 405
335static AV * 406static AV * ecb_noinline
336coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
337{ 408{
338#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
339 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
340 get_av (name, create); 411 get_av (name, create);
341#endif 412#endif
342 return get_av (name, create); 413 return get_av (name, create);
343} 414}
344 415
345static HV * 416static HV * ecb_noinline
346coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
347{ 418{
348#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
349 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
350 get_hv (name, create); 421 get_hv (name, create);
351#endif 422#endif
352 return get_hv (name, create); 423 return get_hv (name, create);
353} 424}
354 425
355/* may croak */ 426ecb_inline void
356INLINE CV * 427coro_times_update (void)
357coro_sv_2cv (pTHX_ SV *sv)
358{ 428{
359 HV *st; 429#ifdef coro_clock_gettime
360 GV *gvp; 430 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 431
363 if (!cv) 432 ts.tv_sec = ts.tv_nsec = 0;
364 croak ("code reference expected"); 433 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
434 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
365 435
366 return cv; 436 ts.tv_sec = ts.tv_nsec = 0;
437 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
438 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
439#else
440 dTHX;
441 UV tv[2];
442
443 u2time (aTHX_ tv);
444 time_real [0] = tv [0];
445 time_real [1] = tv [1] * 1000;
446#endif
447}
448
449ecb_inline void
450coro_times_add (struct coro *c)
451{
452 c->t_real [1] += time_real [1];
453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
454 c->t_real [0] += time_real [0];
455
456 c->t_cpu [1] += time_cpu [1];
457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
458 c->t_cpu [0] += time_cpu [0];
459}
460
461ecb_inline void
462coro_times_sub (struct coro *c)
463{
464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
465 c->t_real [1] -= time_real [1];
466 c->t_real [0] -= time_real [0];
467
468 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
469 c->t_cpu [1] -= time_cpu [1];
470 c->t_cpu [0] -= time_cpu [0];
367} 471}
368 472
369/*****************************************************************************/ 473/*****************************************************************************/
370/* magic glue */ 474/* magic glue */
371 475
372#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
373#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
374 478
375#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
376 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
377 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
378 : mg_find (sv, type)) 482 : mg_find (sv, type))
379 483
380#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
381 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
382 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
383 : 0) 487 : 0)
384 488
385#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
386#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
387 491
388INLINE struct coro * 492ecb_inline MAGIC *
493SvSTATEhv_p (pTHX_ SV *coro)
494{
495 MAGIC *mg;
496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
389SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro)
390{ 509{
391 HV *stash;
392 MAGIC *mg; 510 MAGIC *mg;
393 511
394 if (SvROK (coro)) 512 if (SvROK (coro))
395 coro = SvRV (coro); 513 coro = SvRV (coro);
396 514
397 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro);
516 if (!mg)
398 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
399 518
400 stash = SvSTASH (coro);
401 if (expect_false (stash != coro_stash && stash != coro_state_stash))
402 {
403 /* very slow, but rare, check */
404 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
405 croak ("Coro::State object required");
406 }
407
408 mg = CORO_MAGIC_state (coro);
409 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
410} 520}
411 521
412#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
413 523
… …
416#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
417 527
418/*****************************************************************************/ 528/*****************************************************************************/
419/* padlist management and caching */ 529/* padlist management and caching */
420 530
421static AV * 531ecb_inline AV *
422coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
423{ 533{
424 AV *padlist = CvPADLIST (cv); 534 AV *padlist = CvPADLIST (cv);
425 AV *newpadlist, *newpad; 535 AV *newpadlist, *newpad;
426 536
… …
438 av_store (newpadlist, 1, (SV *)newpad); 548 av_store (newpadlist, 1, (SV *)newpad);
439 549
440 return newpadlist; 550 return newpadlist;
441} 551}
442 552
443static void 553ecb_inline void
444free_padlist (pTHX_ AV *padlist) 554free_padlist (pTHX_ AV *padlist)
445{ 555{
446 /* may be during global destruction */ 556 /* may be during global destruction */
447 if (!IN_DESTRUCT) 557 if (!IN_DESTRUCT)
448 { 558 {
… …
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 582coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 583{
474 AV *padlist; 584 AV *padlist;
475 AV *av = (AV *)mg->mg_obj; 585 AV *av = (AV *)mg->mg_obj;
476 586
587 /* perl manages to free our internal AV and _then_ call us */
588 if (IN_DESTRUCT)
589 return 0;
590
477 /* casting is fun. */ 591 /* casting is fun. */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
479 free_padlist (aTHX_ padlist); 593 free_padlist (aTHX_ padlist);
480 594
481 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 595 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
… …
487 0, 0, 0, 0, 601 0, 0, 0, 0,
488 coro_cv_free 602 coro_cv_free
489}; 603};
490 604
491/* the next two functions merely cache the padlists */ 605/* the next two functions merely cache the padlists */
492static void 606ecb_inline void
493get_padlist (pTHX_ CV *cv) 607get_padlist (pTHX_ CV *cv)
494{ 608{
495 MAGIC *mg = CORO_MAGIC_cv (cv); 609 MAGIC *mg = CORO_MAGIC_cv (cv);
496 AV *av; 610 AV *av;
497 611
498 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
499 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
500 else 614 else
501 { 615 {
502#if CORO_PREFER_PERL_FUNCTIONS 616#if CORO_PREFER_PERL_FUNCTIONS
503 /* this is probably cleaner? but also slower! */ 617 /* this is probably cleaner? but also slower! */
… …
510 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 624 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
511#endif 625#endif
512 } 626 }
513} 627}
514 628
515static void 629ecb_inline void
516put_padlist (pTHX_ CV *cv) 630put_padlist (pTHX_ CV *cv)
517{ 631{
518 MAGIC *mg = CORO_MAGIC_cv (cv); 632 MAGIC *mg = CORO_MAGIC_cv (cv);
519 AV *av; 633 AV *av;
520 634
521 if (expect_false (!mg)) 635 if (ecb_expect_false (!mg))
522 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
523 637
524 av = (AV *)mg->mg_obj; 638 av = (AV *)mg->mg_obj;
525 639
526 if (expect_false (AvFILLp (av) >= AvMAX (av))) 640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
527 av_extend (av, AvFILLp (av) + 1); 641 av_extend (av, AvFILLp (av) + 1);
528 642
529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
530} 644}
531 645
532/** load & save, init *******************************************************/ 646/** load & save, init *******************************************************/
647
648ecb_inline void
649swap_sv (SV *a, SV *b)
650{
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 and later complicates this _quite_ a bit, but it also
664 * is much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684}
685
686/* swap sv heads, at least logically */
687static void
688swap_svs (pTHX_ Coro__State c)
689{
690 int i;
691
692 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
693 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
694}
695
696#define SWAP_SVS(coro) \
697 if (ecb_expect_false ((coro)->swap_sv)) \
698 swap_svs (aTHX_ (coro))
533 699
534static void 700static void
535on_enterleave_call (pTHX_ SV *cb); 701on_enterleave_call (pTHX_ SV *cb);
536 702
537static void 703static void
… …
540 perl_slots *slot = c->slot; 706 perl_slots *slot = c->slot;
541 c->slot = 0; 707 c->slot = 0;
542 708
543 PL_mainstack = c->mainstack; 709 PL_mainstack = c->mainstack;
544 710
545 GvSV (PL_defgv) = slot->defsv; 711#if CORO_JIT
546 GvAV (PL_defgv) = slot->defav; 712 load_perl_slots (slot);
547 GvSV (PL_errgv) = slot->errsv; 713#else
548 GvSV (irsgv) = slot->irsgv;
549 GvHV (PL_hintgv) = slot->hinthv;
550
551 #define VAR(name,type) PL_ ## name = slot->name; 714 #define VARx(name,expr,type) expr = slot->name;
552 # include "state.h" 715 # include "state.h"
553 #undef VAR 716 #undef VARx
717#endif
554 718
555 { 719 {
556 dSP; 720 dSP;
557 721
558 CV *cv; 722 CV *cv;
559 723
560 /* now do the ugly restore mess */ 724 /* now do the ugly restore mess */
561 while (expect_true (cv = (CV *)POPs)) 725 while (ecb_expect_true (cv = (CV *)POPs))
562 { 726 {
563 put_padlist (aTHX_ cv); /* mark this padlist as available */ 727 put_padlist (aTHX_ cv); /* mark this padlist as available */
564 CvDEPTH (cv) = PTR2IV (POPs); 728 CvDEPTH (cv) = PTR2IV (POPs);
565 CvPADLIST (cv) = (AV *)POPs; 729 CvPADLIST (cv) = (AV *)POPs;
566 } 730 }
… …
569 } 733 }
570 734
571 slf_frame = c->slf_frame; 735 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 736 CORO_THROW = c->except;
573 737
738 if (ecb_expect_false (enable_times))
739 {
740 if (ecb_expect_false (!times_valid))
741 coro_times_update ();
742
743 coro_times_sub (c);
744 }
745
574 if (expect_false (c->on_enter)) 746 if (ecb_expect_false (c->on_enter))
575 { 747 {
576 int i; 748 int i;
577 749
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 750 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 } 752 }
753
754 SWAP_SVS (c);
581} 755}
582 756
583static void 757static void
584save_perl (pTHX_ Coro__State c) 758save_perl (pTHX_ Coro__State c)
585{ 759{
760 SWAP_SVS (c);
761
586 if (expect_false (c->on_leave)) 762 if (ecb_expect_false (c->on_leave))
587 { 763 {
588 int i; 764 int i;
589 765
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 766 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 767 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
768 }
769
770 times_valid = 0;
771
772 if (ecb_expect_false (enable_times))
773 {
774 coro_times_update (); times_valid = 1;
775 coro_times_add (c);
592 } 776 }
593 777
594 c->except = CORO_THROW; 778 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 779 c->slf_frame = slf_frame;
596 780
… …
607 791
608 XPUSHs (Nullsv); 792 XPUSHs (Nullsv);
609 /* this loop was inspired by pp_caller */ 793 /* this loop was inspired by pp_caller */
610 for (;;) 794 for (;;)
611 { 795 {
612 while (expect_true (cxix >= 0)) 796 while (ecb_expect_true (cxix >= 0))
613 { 797 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 798 PERL_CONTEXT *cx = &ccstk[cxix--];
615 799
616 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 800 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
617 { 801 {
618 CV *cv = cx->blk_sub.cv; 802 CV *cv = cx->blk_sub.cv;
619 803
620 if (expect_true (CvDEPTH (cv))) 804 if (ecb_expect_true (CvDEPTH (cv)))
621 { 805 {
622 EXTEND (SP, 3); 806 EXTEND (SP, 3);
623 PUSHs ((SV *)CvPADLIST (cv)); 807 PUSHs ((SV *)CvPADLIST (cv));
624 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 808 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
625 PUSHs ((SV *)cv); 809 PUSHs ((SV *)cv);
… …
628 get_padlist (aTHX_ cv); 812 get_padlist (aTHX_ cv);
629 } 813 }
630 } 814 }
631 } 815 }
632 816
633 if (expect_true (top_si->si_type == PERLSI_MAIN)) 817 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
634 break; 818 break;
635 819
636 top_si = top_si->si_prev; 820 top_si = top_si->si_prev;
637 ccstk = top_si->si_cxstack; 821 ccstk = top_si->si_cxstack;
638 cxix = top_si->si_cxix; 822 cxix = top_si->si_cxix;
… …
640 824
641 PUTBACK; 825 PUTBACK;
642 } 826 }
643 827
644 /* allocate some space on the context stack for our purposes */ 828 /* allocate some space on the context stack for our purposes */
645 /* we manually unroll here, as usually 2 slots is enough */ 829 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
646 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC;
649 { 830 {
650 int i; 831 unsigned int i;
832
651 for (i = 3; i < SLOT_COUNT; ++i) 833 for (i = 0; i < SLOT_COUNT; ++i)
652 CXINC; 834 CXINC;
653 } 835
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 836 cxstack_ix -= SLOT_COUNT; /* undo allocation */
837 }
655 838
656 c->mainstack = PL_mainstack; 839 c->mainstack = PL_mainstack;
657 840
658 { 841 {
659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 842 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
660 843
661 slot->defav = GvAV (PL_defgv); 844#if CORO_JIT
662 slot->defsv = DEFSV; 845 save_perl_slots (slot);
663 slot->errsv = ERRSV; 846#else
664 slot->irsgv = GvSV (irsgv);
665 slot->hinthv = GvHV (PL_hintgv);
666
667 #define VAR(name,type) slot->name = PL_ ## name; 847 #define VARx(name,expr,type) slot->name = expr;
668 # include "state.h" 848 # include "state.h"
669 #undef VAR 849 #undef VARx
850#endif
670 } 851 }
671} 852}
672 853
673/* 854/*
674 * allocate various perl stacks. This is almost an exact copy 855 * allocate various perl stacks. This is almost an exact copy
… …
680# define coro_init_stacks(thx) init_stacks () 861# define coro_init_stacks(thx) init_stacks ()
681#else 862#else
682static void 863static void
683coro_init_stacks (pTHX) 864coro_init_stacks (pTHX)
684{ 865{
685 PL_curstackinfo = new_stackinfo(32, 8); 866 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
686 PL_curstackinfo->si_type = PERLSI_MAIN; 867 PL_curstackinfo->si_type = PERLSI_MAIN;
687 PL_curstack = PL_curstackinfo->si_stack; 868 PL_curstack = PL_curstackinfo->si_stack;
688 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 869 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
689 870
690 PL_stack_base = AvARRAY(PL_curstack); 871 PL_stack_base = AvARRAY(PL_curstack);
… …
705#endif 886#endif
706 887
707 New(54,PL_scopestack,8,I32); 888 New(54,PL_scopestack,8,I32);
708 PL_scopestack_ix = 0; 889 PL_scopestack_ix = 0;
709 PL_scopestack_max = 8; 890 PL_scopestack_max = 8;
891#if HAS_SCOPESTACK_NAME
892 New(54,PL_scopestack_name,8,const char*);
893#endif
710 894
711 New(54,PL_savestack,24,ANY); 895 New(54,PL_savestack,24,ANY);
712 PL_savestack_ix = 0; 896 PL_savestack_ix = 0;
713 PL_savestack_max = 24; 897 PL_savestack_max = 24;
714 898
… …
742 } 926 }
743 927
744 Safefree (PL_tmps_stack); 928 Safefree (PL_tmps_stack);
745 Safefree (PL_markstack); 929 Safefree (PL_markstack);
746 Safefree (PL_scopestack); 930 Safefree (PL_scopestack);
931#if HAS_SCOPESTACK_NAME
932 Safefree (PL_scopestack_name);
933#endif
747 Safefree (PL_savestack); 934 Safefree (PL_savestack);
748#if !PERL_VERSION_ATLEAST (5,10,0) 935#if !PERL_VERSION_ATLEAST (5,10,0)
749 Safefree (PL_retstack); 936 Safefree (PL_retstack);
750#endif 937#endif
751} 938}
… …
797#endif 984#endif
798 985
799/* 986/*
800 * This overrides the default magic get method of %SIG elements. 987 * This overrides the default magic get method of %SIG elements.
801 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 988 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
802 * and instead of trying to save and restore the hash elements, we just provide 989 * and instead of trying to save and restore the hash elements (extremely slow),
803 * readback here. 990 * we just provide our own readback here.
804 */ 991 */
805static int 992static int ecb_cold
806coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 993coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
807{ 994{
808 const char *s = MgPV_nolen_const (mg); 995 const char *s = MgPV_nolen_const (mg);
809 996
810 if (*s == '_') 997 if (*s == '_')
… …
814 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 1003
817 if (svp) 1004 if (svp)
818 { 1005 {
819 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1006 SV *ssv;
1007
1008 if (!*svp)
1009 ssv = &PL_sv_undef;
1010 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1011 ssv = sv_2mortal (newRV_inc (*svp));
1012 else
1013 ssv = *svp;
1014
1015 sv_setsv (sv, ssv);
820 return 0; 1016 return 0;
821 } 1017 }
822 } 1018 }
823 1019
824 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
825} 1021}
826 1022
827static int 1023static int ecb_cold
828coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
829{ 1025{
830 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
831 1027
832 if (*s == '_') 1028 if (*s == '_')
… …
846 } 1042 }
847 1043
848 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1044 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
849} 1045}
850 1046
851static int 1047static int ecb_cold
852coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1048coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
853{ 1049{
854 const char *s = MgPV_nolen_const (mg); 1050 const char *s = MgPV_nolen_const (mg);
855 1051
856 if (*s == '_') 1052 if (*s == '_')
… …
889slf_check_repeat (pTHX_ struct CoroSLF *frame) 1085slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{ 1086{
891 return 1; 1087 return 1;
892} 1088}
893 1089
894static UNOP coro_setup_op; 1090static UNOP init_perl_op;
895 1091
896static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1092ecb_noinline static void /* noinline to keep it out of the transfer fast path */
897coro_setup (pTHX_ struct coro *coro) 1093init_perl (pTHX_ struct coro *coro)
898{ 1094{
899 /* 1095 /*
900 * emulate part of the perl startup here. 1096 * emulate part of the perl startup here.
901 */ 1097 */
902 coro_init_stacks (aTHX); 1098 coro_init_stacks (aTHX);
… …
909 PL_comppad_name_fill = 0; 1105 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0; 1106 PL_comppad_name_floor = 0;
911 PL_curpm = 0; 1107 PL_curpm = 0;
912 PL_curpad = 0; 1108 PL_curpad = 0;
913 PL_localizing = 0; 1109 PL_localizing = 0;
914 PL_dirty = 0;
915 PL_restartop = 0; 1110 PL_restartop = 0;
916#if PERL_VERSION_ATLEAST (5,10,0) 1111#if PERL_VERSION_ATLEAST (5,10,0)
917 PL_parser = 0; 1112 PL_parser = 0;
918#endif 1113#endif
919 PL_hints = 0; 1114 PL_hints = 0;
920 1115
921 /* recreate the die/warn hooks */ 1116 /* recreate the die/warn hooks */
922 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1117 PL_diehook = SvREFCNT_inc (rv_diehook);
923 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1118 PL_warnhook = SvREFCNT_inc (rv_warnhook);
924 1119
925 GvSV (PL_defgv) = newSV (0); 1120 GvSV (PL_defgv) = newSV (0);
926 GvAV (PL_defgv) = coro->args; coro->args = 0; 1121 GvAV (PL_defgv) = coro->args; coro->args = 0;
927 GvSV (PL_errgv) = newSV (0); 1122 GvSV (PL_errgv) = newSV (0);
928 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
949 /* this newly created coroutine might be run on an existing cctx which most 1144 /* this newly created coroutine might be run on an existing cctx which most
950 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1145 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
951 */ 1146 */
952 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1147 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
953 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1148 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1149 slf_frame.destroy = 0;
954 1150
955 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1151 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
956 coro_setup_op.op_next = PL_op; 1152 init_perl_op.op_next = PL_op;
957 coro_setup_op.op_type = OP_ENTERSUB; 1153 init_perl_op.op_type = OP_ENTERSUB;
958 coro_setup_op.op_ppaddr = pp_slf; 1154 init_perl_op.op_ppaddr = pp_slf;
959 /* no flags etc. required, as an init function won't be called */ 1155 /* no flags etc. required, as an init function won't be called */
960 1156
961 PL_op = (OP *)&coro_setup_op; 1157 PL_op = (OP *)&init_perl_op;
962 1158
963 /* copy throw, in case it was set before coro_setup */ 1159 /* copy throw, in case it was set before init_perl */
964 CORO_THROW = coro->except; 1160 CORO_THROW = coro->except;
1161
1162 SWAP_SVS (coro);
1163
1164 if (ecb_expect_false (enable_times))
1165 {
1166 coro_times_update ();
1167 coro_times_sub (coro);
1168 }
965} 1169}
966 1170
967static void 1171static void
968coro_unwind_stacks (pTHX) 1172coro_unwind_stacks (pTHX)
969{ 1173{
… …
984 dounwind (-1); 1188 dounwind (-1);
985 } 1189 }
986} 1190}
987 1191
988static void 1192static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1193destroy_perl (pTHX_ struct coro *coro)
990{ 1194{
1195 SV *svf [9];
1196
1197 {
1198 SV *old_current = SvRV (coro_current);
1199 struct coro *current = SvSTATE (old_current);
1200
1201 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1202
1203 save_perl (aTHX_ current);
1204
1205 /* this will cause transfer_check to croak on block*/
1206 SvRV_set (coro_current, (SV *)coro->hv);
1207
1208 load_perl (aTHX_ coro);
1209
991 coro_unwind_stacks (aTHX); 1210 coro_unwind_stacks (aTHX);
992 1211
993 SvREFCNT_dec (GvSV (PL_defgv)); 1212 /* restore swapped sv's */
994 SvREFCNT_dec (GvAV (PL_defgv)); 1213 SWAP_SVS (coro);
995 SvREFCNT_dec (GvSV (PL_errgv));
996 SvREFCNT_dec (PL_defoutgv);
997 SvREFCNT_dec (PL_rs);
998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
1000 1214
1001 SvREFCNT_dec (PL_diehook); 1215 coro_destruct_stacks (aTHX);
1002 SvREFCNT_dec (PL_warnhook); 1216
1217 /* now save some sv's to be free'd later */
1218 svf [0] = GvSV (PL_defgv);
1219 svf [1] = (SV *)GvAV (PL_defgv);
1220 svf [2] = GvSV (PL_errgv);
1221 svf [3] = (SV *)PL_defoutgv;
1222 svf [4] = PL_rs;
1223 svf [5] = GvSV (irsgv);
1224 svf [6] = (SV *)GvHV (PL_hintgv);
1225 svf [7] = PL_diehook;
1226 svf [8] = PL_warnhook;
1227 assert (9 == sizeof (svf) / sizeof (*svf));
1228
1229 SvRV_set (coro_current, old_current);
1230
1231 load_perl (aTHX_ current);
1003 1232 }
1233
1234 {
1235 unsigned int i;
1236
1237 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1238 SvREFCNT_dec (svf [i]);
1239
1004 SvREFCNT_dec (coro->saved_deffh); 1240 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1241 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1242 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1243 SvREFCNT_dec (coro->invoke_av);
1008 1244 }
1009 coro_destruct_stacks (aTHX);
1010} 1245}
1011 1246
1012INLINE void 1247ecb_inline void
1013free_coro_mortal (pTHX) 1248free_coro_mortal (pTHX)
1014{ 1249{
1015 if (expect_true (coro_mortal)) 1250 if (ecb_expect_true (coro_mortal))
1016 { 1251 {
1017 SvREFCNT_dec (coro_mortal); 1252 SvREFCNT_dec ((SV *)coro_mortal);
1018 coro_mortal = 0; 1253 coro_mortal = 0;
1019 } 1254 }
1020} 1255}
1021 1256
1022static int 1257static int
… …
1155 1390
1156 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1391 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1157} 1392}
1158 1393
1159/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1394/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1160static void NOINLINE 1395static void ecb_noinline
1161cctx_prepare (pTHX) 1396cctx_prepare (pTHX)
1162{ 1397{
1163 PL_top_env = &PL_start_env; 1398 PL_top_env = &PL_start_env;
1164 1399
1165 if (cctx_current->flags & CC_TRACE) 1400 if (cctx_current->flags & CC_TRACE)
… …
1176 slf_frame.prepare = slf_prepare_set_stacklevel; 1411 slf_frame.prepare = slf_prepare_set_stacklevel;
1177 slf_frame.check = slf_check_set_stacklevel; 1412 slf_frame.check = slf_check_set_stacklevel;
1178} 1413}
1179 1414
1180/* the tail of transfer: execute stuff we can only do after a transfer */ 1415/* the tail of transfer: execute stuff we can only do after a transfer */
1181INLINE void 1416ecb_inline void
1182transfer_tail (pTHX) 1417transfer_tail (pTHX)
1183{ 1418{
1184 free_coro_mortal (aTHX); 1419 free_coro_mortal (aTHX);
1420}
1421
1422/* try to exit the same way perl's main function would do */
1423/* we do not bother resetting the environment or other things *7
1424/* that are not, uhm, essential */
1425/* this obviously also doesn't work when perl is embedded */
1426static void ecb_noinline ecb_cold
1427perlish_exit (void)
1428{
1429 int exitstatus = perl_destruct (PL_curinterp);
1430 perl_free (PL_curinterp);
1431 exit (exitstatus);
1185} 1432}
1186 1433
1187/* 1434/*
1188 * this is a _very_ stripped down perl interpreter ;) 1435 * this is a _very_ stripped down perl interpreter ;)
1189 */ 1436 */
… …
1211 /* somebody or something will hit me for both perl_run and PL_restartop */ 1458 /* somebody or something will hit me for both perl_run and PL_restartop */
1212 PL_restartop = PL_op; 1459 PL_restartop = PL_op;
1213 perl_run (PL_curinterp); 1460 perl_run (PL_curinterp);
1214 /* 1461 /*
1215 * Unfortunately, there is no way to get at the return values of the 1462 * Unfortunately, there is no way to get at the return values of the
1216 * coro body here, as perl_run destroys these 1463 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1464 * runtime errors here, as this is just a random interpreter, not a thread.
1217 */ 1465 */
1218 1466
1219 /* 1467 /*
1220 * If perl-run returns we assume exit() was being called or the coro 1468 * If perl-run returns we assume exit() was being called or the coro
1221 * fell off the end, which seems to be the only valid (non-bug) 1469 * fell off the end, which seems to be the only valid (non-bug)
1222 * reason for perl_run to return. We try to exit by jumping to the 1470 * reason for perl_run to return. We try to mimic whatever perl is normally
1223 * bootstrap-time "top" top_env, as we cannot restore the "main" 1471 * doing in that case. YMMV.
1224 * coroutine as Coro has no such concept.
1225 * This actually isn't valid with the pthread backend, but OSes requiring
1226 * that backend are too broken to do it in a standards-compliant way.
1227 */ 1472 */
1228 PL_top_env = main_top_env; 1473 perlish_exit ();
1229 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1230 } 1474 }
1231} 1475}
1232 1476
1233static coro_cctx * 1477static coro_cctx *
1234cctx_new () 1478cctx_new (void)
1235{ 1479{
1236 coro_cctx *cctx; 1480 coro_cctx *cctx;
1237 1481
1238 ++cctx_count; 1482 ++cctx_count;
1239 New (0, cctx, 1, coro_cctx); 1483 New (0, cctx, 1, coro_cctx);
… …
1245 return cctx; 1489 return cctx;
1246} 1490}
1247 1491
1248/* create a new cctx only suitable as source */ 1492/* create a new cctx only suitable as source */
1249static coro_cctx * 1493static coro_cctx *
1250cctx_new_empty () 1494cctx_new_empty (void)
1251{ 1495{
1252 coro_cctx *cctx = cctx_new (); 1496 coro_cctx *cctx = cctx_new ();
1253 1497
1254 cctx->sptr = 0; 1498 cctx->sptr = 0;
1255 coro_create (&cctx->cctx, 0, 0, 0, 0); 1499 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1257 return cctx; 1501 return cctx;
1258} 1502}
1259 1503
1260/* create a new cctx suitable as destination/running a perl interpreter */ 1504/* create a new cctx suitable as destination/running a perl interpreter */
1261static coro_cctx * 1505static coro_cctx *
1262cctx_new_run () 1506cctx_new_run (void)
1263{ 1507{
1264 coro_cctx *cctx = cctx_new (); 1508 coro_cctx *cctx = cctx_new ();
1265 void *stack_start; 1509 void *stack_start;
1266 size_t stack_size; 1510 size_t stack_size;
1267 1511
1268#if HAVE_MMAP 1512#if HAVE_MMAP
1269 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1513 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1270 /* mmap supposedly does allocate-on-write for us */ 1514 /* mmap supposedly does allocate-on-write for us */
1271 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1515 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1272 1516
1273 if (cctx->sptr != (void *)-1) 1517 if (cctx->sptr != (void *)-1)
1274 { 1518 {
1275 #if CORO_STACKGUARD 1519 #if CORO_STACKGUARD
1276 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1520 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1308cctx_destroy (coro_cctx *cctx) 1552cctx_destroy (coro_cctx *cctx)
1309{ 1553{
1310 if (!cctx) 1554 if (!cctx)
1311 return; 1555 return;
1312 1556
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1557 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1314 1558
1315 --cctx_count; 1559 --cctx_count;
1316 coro_destroy (&cctx->cctx); 1560 coro_destroy (&cctx->cctx);
1317 1561
1318 /* coro_transfer creates new, empty cctx's */ 1562 /* coro_transfer creates new, empty cctx's */
… …
1337#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1581#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1338 1582
1339static coro_cctx * 1583static coro_cctx *
1340cctx_get (pTHX) 1584cctx_get (pTHX)
1341{ 1585{
1342 while (expect_true (cctx_first)) 1586 while (ecb_expect_true (cctx_first))
1343 { 1587 {
1344 coro_cctx *cctx = cctx_first; 1588 coro_cctx *cctx = cctx_first;
1345 cctx_first = cctx->next; 1589 cctx_first = cctx->next;
1346 --cctx_idle; 1590 --cctx_idle;
1347 1591
1348 if (expect_true (!CCTX_EXPIRED (cctx))) 1592 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1349 return cctx; 1593 return cctx;
1350 1594
1351 cctx_destroy (cctx); 1595 cctx_destroy (cctx);
1352 } 1596 }
1353 1597
… …
1358cctx_put (coro_cctx *cctx) 1602cctx_put (coro_cctx *cctx)
1359{ 1603{
1360 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1604 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1361 1605
1362 /* free another cctx if overlimit */ 1606 /* free another cctx if overlimit */
1363 if (expect_false (cctx_idle >= cctx_max_idle)) 1607 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1364 { 1608 {
1365 coro_cctx *first = cctx_first; 1609 coro_cctx *first = cctx_first;
1366 cctx_first = first->next; 1610 cctx_first = first->next;
1367 --cctx_idle; 1611 --cctx_idle;
1368 1612
… …
1379static void 1623static void
1380transfer_check (pTHX_ struct coro *prev, struct coro *next) 1624transfer_check (pTHX_ struct coro *prev, struct coro *next)
1381{ 1625{
1382 /* TODO: throwing up here is considered harmful */ 1626 /* TODO: throwing up here is considered harmful */
1383 1627
1384 if (expect_true (prev != next)) 1628 if (ecb_expect_true (prev != next))
1385 { 1629 {
1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1630 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1387 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1631 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1388 1632
1389 if (expect_false (next->flags & CF_RUNNING)) 1633 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1391
1392 if (expect_false (next->flags & CF_DESTROYED))
1393 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1634 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1394 1635
1395#if !PERL_VERSION_ATLEAST (5,10,0) 1636#if !PERL_VERSION_ATLEAST (5,10,0)
1396 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1637 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1397 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1638 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1398#endif 1639#endif
1399 } 1640 }
1400} 1641}
1401 1642
1402/* always use the TRANSFER macro */ 1643/* always use the TRANSFER macro */
1403static void NOINLINE /* noinline so we have a fixed stackframe */ 1644static void ecb_noinline /* noinline so we have a fixed stackframe */
1404transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1645transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1405{ 1646{
1406 dSTACKLEVEL; 1647 dSTACKLEVEL;
1407 1648
1408 /* sometimes transfer is only called to set idle_sp */ 1649 /* sometimes transfer is only called to set idle_sp */
1409 if (expect_false (!prev)) 1650 if (ecb_expect_false (!prev))
1410 { 1651 {
1411 cctx_current->idle_sp = STACKLEVEL; 1652 cctx_current->idle_sp = STACKLEVEL;
1412 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1653 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1413 } 1654 }
1414 else if (expect_true (prev != next)) 1655 else if (ecb_expect_true (prev != next))
1415 { 1656 {
1416 coro_cctx *cctx_prev; 1657 coro_cctx *cctx_prev;
1417 1658
1418 if (expect_false (prev->flags & CF_NEW)) 1659 if (ecb_expect_false (prev->flags & CF_NEW))
1419 { 1660 {
1420 /* create a new empty/source context */ 1661 /* create a new empty/source context */
1421 prev->flags &= ~CF_NEW; 1662 prev->flags &= ~CF_NEW;
1422 prev->flags |= CF_RUNNING; 1663 prev->flags |= CF_RUNNING;
1423 } 1664 }
… …
1426 next->flags |= CF_RUNNING; 1667 next->flags |= CF_RUNNING;
1427 1668
1428 /* first get rid of the old state */ 1669 /* first get rid of the old state */
1429 save_perl (aTHX_ prev); 1670 save_perl (aTHX_ prev);
1430 1671
1431 if (expect_false (next->flags & CF_NEW)) 1672 if (ecb_expect_false (next->flags & CF_NEW))
1432 { 1673 {
1433 /* need to start coroutine */ 1674 /* need to start coroutine */
1434 next->flags &= ~CF_NEW; 1675 next->flags &= ~CF_NEW;
1435 /* setup coroutine call */ 1676 /* setup coroutine call */
1436 coro_setup (aTHX_ next); 1677 init_perl (aTHX_ next);
1437 } 1678 }
1438 else 1679 else
1439 load_perl (aTHX_ next); 1680 load_perl (aTHX_ next);
1440 1681
1441 /* possibly untie and reuse the cctx */ 1682 /* possibly untie and reuse the cctx */
1442 if (expect_true ( 1683 if (ecb_expect_true (
1443 cctx_current->idle_sp == STACKLEVEL 1684 cctx_current->idle_sp == STACKLEVEL
1444 && !(cctx_current->flags & CC_TRACE) 1685 && !(cctx_current->flags & CC_TRACE)
1445 && !force_cctx 1686 && !force_cctx
1446 )) 1687 ))
1447 { 1688 {
1448 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1689 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1449 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1690 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1450 1691
1451 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1692 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1452 /* without this the next cctx_get might destroy the running cctx while still in use */ 1693 /* without this the next cctx_get might destroy the running cctx while still in use */
1453 if (expect_false (CCTX_EXPIRED (cctx_current))) 1694 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1454 if (expect_true (!next->cctx)) 1695 if (ecb_expect_true (!next->cctx))
1455 next->cctx = cctx_get (aTHX); 1696 next->cctx = cctx_get (aTHX);
1456 1697
1457 cctx_put (cctx_current); 1698 cctx_put (cctx_current);
1458 } 1699 }
1459 else 1700 else
1460 prev->cctx = cctx_current; 1701 prev->cctx = cctx_current;
1461 1702
1462 ++next->usecount; 1703 ++next->usecount;
1463 1704
1464 cctx_prev = cctx_current; 1705 cctx_prev = cctx_current;
1465 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1706 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1466 1707
1467 next->cctx = 0; 1708 next->cctx = 0;
1468 1709
1469 if (expect_false (cctx_prev != cctx_current)) 1710 if (ecb_expect_false (cctx_prev != cctx_current))
1470 { 1711 {
1471 cctx_prev->top_env = PL_top_env; 1712 cctx_prev->top_env = PL_top_env;
1472 PL_top_env = cctx_current->top_env; 1713 PL_top_env = cctx_current->top_env;
1473 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1714 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1474 } 1715 }
… …
1480#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1721#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1481#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1722#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1482 1723
1483/** high level stuff ********************************************************/ 1724/** high level stuff ********************************************************/
1484 1725
1726/* this function is actually Coro, not Coro::State, but we call it from here */
1727/* because it is convenient - but it hasn't been declared yet for that reason */
1485static int 1728static void
1729coro_call_on_destroy (pTHX_ struct coro *coro);
1730
1731static void
1486coro_state_destroy (pTHX_ struct coro *coro) 1732coro_state_destroy (pTHX_ struct coro *coro)
1487{ 1733{
1488 if (coro->flags & CF_DESTROYED) 1734 if (coro->flags & CF_ZOMBIE)
1489 return 0; 1735 return;
1490 1736
1491 if (coro->on_destroy)
1492 coro->on_destroy (aTHX_ coro); 1737 slf_destroy (aTHX_ coro);
1493 1738
1494 coro->flags |= CF_DESTROYED; 1739 coro->flags |= CF_ZOMBIE;
1495 1740
1496 if (coro->flags & CF_READY) 1741 if (coro->flags & CF_READY)
1497 { 1742 {
1498 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1743 /* reduce nready, as destroying a ready coro effectively unreadies it */
1499 /* alternative: look through all ready queues and remove the coro */ 1744 /* alternative: look through all ready queues and remove the coro */
1500 --coro_nready; 1745 --coro_nready;
1501 } 1746 }
1502 else 1747 else
1503 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1748 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1749
1750 if (coro->next) coro->next->prev = coro->prev;
1751 if (coro->prev) coro->prev->next = coro->next;
1752 if (coro == coro_first) coro_first = coro->next;
1504 1753
1505 if (coro->mainstack 1754 if (coro->mainstack
1506 && coro->mainstack != main_mainstack 1755 && coro->mainstack != main_mainstack
1507 && coro->slot 1756 && coro->slot
1508 && !PL_dirty) 1757 && !PL_dirty)
1509 {
1510 struct coro *current = SvSTATE_current;
1511
1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1513
1514 save_perl (aTHX_ current);
1515 load_perl (aTHX_ coro);
1516
1517 coro_destruct_perl (aTHX_ coro); 1758 destroy_perl (aTHX_ coro);
1518
1519 load_perl (aTHX_ current);
1520
1521 coro->slot = 0;
1522 }
1523 1759
1524 cctx_destroy (coro->cctx); 1760 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv); 1761 SvREFCNT_dec (coro->startcv);
1526 SvREFCNT_dec (coro->args); 1762 SvREFCNT_dec (coro->args);
1763 SvREFCNT_dec (coro->swap_sv);
1527 SvREFCNT_dec (CORO_THROW); 1764 SvREFCNT_dec (CORO_THROW);
1528 1765
1529 if (coro->next) coro->next->prev = coro->prev; 1766 coro_call_on_destroy (aTHX_ coro);
1530 if (coro->prev) coro->prev->next = coro->next;
1531 if (coro == coro_first) coro_first = coro->next;
1532 1767
1533 return 1; 1768 /* more destruction mayhem in coro_state_free */
1534} 1769}
1535 1770
1536static int 1771static int
1537coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1772coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1538{ 1773{
1539 struct coro *coro = (struct coro *)mg->mg_ptr; 1774 struct coro *coro = (struct coro *)mg->mg_ptr;
1540 mg->mg_ptr = 0; 1775 mg->mg_ptr = 0;
1541 1776
1542 coro->hv = 0;
1543
1544 if (--coro->refcnt < 0)
1545 {
1546 coro_state_destroy (aTHX_ coro); 1777 coro_state_destroy (aTHX_ coro);
1778 SvREFCNT_dec (coro->on_destroy);
1779 SvREFCNT_dec (coro->status);
1780
1547 Safefree (coro); 1781 Safefree (coro);
1548 }
1549 1782
1550 return 0; 1783 return 0;
1551} 1784}
1552 1785
1553static int 1786static int ecb_cold
1554coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1787coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1555{ 1788{
1556 struct coro *coro = (struct coro *)mg->mg_ptr; 1789 /* called when perl clones the current process the slow way (windows process emulation) */
1557 1790 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1558 ++coro->refcnt; 1791 mg->mg_ptr = 0;
1792 mg->mg_virtual = 0;
1559 1793
1560 return 0; 1794 return 0;
1561} 1795}
1562 1796
1563static MGVTBL coro_state_vtbl = { 1797static MGVTBL coro_state_vtbl = {
… …
1586 1820
1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1821 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1588 TRANSFER (ta, 1); 1822 TRANSFER (ta, 1);
1589} 1823}
1590 1824
1591/*****************************************************************************/
1592/* gensub: simple closure generation utility */
1593
1594#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1595
1596/* create a closure from XS, returns a code reference */
1597/* the arg can be accessed via GENSUB_ARG from the callback */
1598/* the callback must use dXSARGS/XSRETURN */
1599static SV *
1600gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1601{
1602 CV *cv = (CV *)newSV (0);
1603
1604 sv_upgrade ((SV *)cv, SVt_PVCV);
1605
1606 CvANON_on (cv);
1607 CvISXSUB_on (cv);
1608 CvXSUB (cv) = xsub;
1609 GENSUB_ARG = arg;
1610
1611 return newRV_noinc ((SV *)cv);
1612}
1613
1614/** Coro ********************************************************************/ 1825/** Coro ********************************************************************/
1615 1826
1616INLINE void 1827ecb_inline void
1617coro_enq (pTHX_ struct coro *coro) 1828coro_enq (pTHX_ struct coro *coro)
1618{ 1829{
1619 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1830 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1620}
1621 1831
1622INLINE SV * 1832 SvREFCNT_inc_NN (coro->hv);
1833
1834 coro->next_ready = 0;
1835 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1836 ready [1] = coro;
1837}
1838
1839ecb_inline struct coro *
1623coro_deq (pTHX) 1840coro_deq (pTHX)
1624{ 1841{
1625 int prio; 1842 int prio;
1626 1843
1627 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1844 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1628 if (AvFILLp (coro_ready [prio]) >= 0) 1845 {
1629 return av_shift (coro_ready [prio]); 1846 struct coro **ready = coro_ready [prio];
1847
1848 if (ready [0])
1849 {
1850 struct coro *coro = ready [0];
1851 ready [0] = coro->next_ready;
1852 return coro;
1853 }
1854 }
1630 1855
1631 return 0; 1856 return 0;
1857}
1858
1859static void
1860invoke_sv_ready_hook_helper (void)
1861{
1862 dTHX;
1863 dSP;
1864
1865 ENTER;
1866 SAVETMPS;
1867
1868 PUSHMARK (SP);
1869 PUTBACK;
1870 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1871
1872 FREETMPS;
1873 LEAVE;
1632} 1874}
1633 1875
1634static int 1876static int
1635api_ready (pTHX_ SV *coro_sv) 1877api_ready (pTHX_ SV *coro_sv)
1636{ 1878{
1637 struct coro *coro;
1638 SV *sv_hook;
1639 void (*xs_hook)(void);
1640
1641 coro = SvSTATE (coro_sv); 1879 struct coro *coro = SvSTATE (coro_sv);
1642 1880
1643 if (coro->flags & CF_READY) 1881 if (coro->flags & CF_READY)
1644 return 0; 1882 return 0;
1645 1883
1646 coro->flags |= CF_READY; 1884 coro->flags |= CF_READY;
1647 1885
1648 sv_hook = coro_nready ? 0 : coro_readyhook;
1649 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1650
1651 coro_enq (aTHX_ coro); 1886 coro_enq (aTHX_ coro);
1652 ++coro_nready;
1653 1887
1654 if (sv_hook) 1888 if (!coro_nready++)
1655 { 1889 if (coroapi.readyhook)
1656 dSP; 1890 coroapi.readyhook ();
1657
1658 ENTER;
1659 SAVETMPS;
1660
1661 PUSHMARK (SP);
1662 PUTBACK;
1663 call_sv (sv_hook, G_VOID | G_DISCARD);
1664
1665 FREETMPS;
1666 LEAVE;
1667 }
1668
1669 if (xs_hook)
1670 xs_hook ();
1671 1891
1672 return 1; 1892 return 1;
1673} 1893}
1674 1894
1675static int 1895static int
… …
1677{ 1897{
1678 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1898 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1679} 1899}
1680 1900
1681/* expects to own a reference to next->hv */ 1901/* expects to own a reference to next->hv */
1682INLINE void 1902ecb_inline void
1683prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1903prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1684{ 1904{
1685 SV *prev_sv = SvRV (coro_current); 1905 SV *prev_sv = SvRV (coro_current);
1686 1906
1687 ta->prev = SvSTATE_hv (prev_sv); 1907 ta->prev = SvSTATE_hv (prev_sv);
… …
1698static void 1918static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1919prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{ 1920{
1701 for (;;) 1921 for (;;)
1702 { 1922 {
1703 SV *next_sv = coro_deq (aTHX); 1923 struct coro *next = coro_deq (aTHX);
1704 1924
1705 if (expect_true (next_sv)) 1925 if (ecb_expect_true (next))
1706 { 1926 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */ 1927 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED)) 1928 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1929 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1712 else 1930 else
1713 { 1931 {
1714 next->flags &= ~CF_READY; 1932 next->flags &= ~CF_READY;
1715 --coro_nready; 1933 --coro_nready;
1716 1934
… …
1722 { 1940 {
1723 /* nothing to schedule: call the idle handler */ 1941 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle) 1942 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle))) 1943 && SvOBJECT (SvRV (sv_idle)))
1726 { 1944 {
1945 if (SvRV (sv_idle) == SvRV (coro_current))
1946 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1947
1727 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1948 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1728 api_ready (aTHX_ SvRV (sv_idle)); 1949 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready; 1950 --coro_nready;
1730 } 1951 }
1731 else 1952 else
1732 { 1953 {
1954 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1733 dSP; 1955 dSP;
1734 1956
1735 ENTER; 1957 ENTER;
1736 SAVETMPS; 1958 SAVETMPS;
1737 1959
… …
1744 } 1966 }
1745 } 1967 }
1746 } 1968 }
1747} 1969}
1748 1970
1749INLINE void 1971ecb_inline void
1750prepare_cede (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede (pTHX_ struct coro_transfer_args *ta)
1751{ 1973{
1752 api_ready (aTHX_ coro_current); 1974 api_ready (aTHX_ coro_current);
1753 prepare_schedule (aTHX_ ta); 1975 prepare_schedule (aTHX_ ta);
1754} 1976}
1755 1977
1756INLINE void 1978ecb_inline void
1757prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1758{ 1980{
1759 SV *prev = SvRV (coro_current); 1981 SV *prev = SvRV (coro_current);
1760 1982
1761 if (coro_nready) 1983 if (coro_nready)
… …
1791{ 2013{
1792 struct coro_transfer_args ta; 2014 struct coro_transfer_args ta;
1793 2015
1794 prepare_cede (aTHX_ &ta); 2016 prepare_cede (aTHX_ &ta);
1795 2017
1796 if (expect_true (ta.prev != ta.next)) 2018 if (ecb_expect_true (ta.prev != ta.next))
1797 { 2019 {
1798 TRANSFER (ta, 1); 2020 TRANSFER (ta, 1);
1799 return 1; 2021 return 1;
1800 } 2022 }
1801 else 2023 else
… …
1844 coro->slot->runops = RUNOPS_DEFAULT; 2066 coro->slot->runops = RUNOPS_DEFAULT;
1845 } 2067 }
1846} 2068}
1847 2069
1848static void 2070static void
2071coro_push_av (pTHX_ AV *av, I32 gimme_v)
2072{
2073 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2074 {
2075 dSP;
2076
2077 if (gimme_v == G_SCALAR)
2078 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2079 else
2080 {
2081 int i;
2082 EXTEND (SP, AvFILLp (av) + 1);
2083
2084 for (i = 0; i <= AvFILLp (av); ++i)
2085 PUSHs (AvARRAY (av)[i]);
2086 }
2087
2088 PUTBACK;
2089 }
2090}
2091
2092static void
2093coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2094{
2095 if (!coro->on_destroy)
2096 coro->on_destroy = newAV ();
2097
2098 av_push (coro->on_destroy, cb);
2099}
2100
2101static void
2102slf_destroy_join (pTHX_ struct CoroSLF *frame)
2103{
2104 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2105}
2106
2107static int
2108slf_check_join (pTHX_ struct CoroSLF *frame)
2109{
2110 struct coro *coro = (struct coro *)frame->data;
2111
2112 if (!coro->status)
2113 return 1;
2114
2115 frame->destroy = 0;
2116
2117 coro_push_av (aTHX_ coro->status, GIMME_V);
2118
2119 SvREFCNT_dec ((SV *)coro->hv);
2120
2121 return 0;
2122}
2123
2124static void
2125slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2126{
2127 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2128
2129 if (items > 1)
2130 croak ("join called with too many arguments");
2131
2132 if (coro->status)
2133 frame->prepare = prepare_nop;
2134 else
2135 {
2136 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2137 frame->prepare = prepare_schedule;
2138 }
2139
2140 frame->check = slf_check_join;
2141 frame->destroy = slf_destroy_join;
2142 frame->data = (void *)coro;
2143 SvREFCNT_inc (coro->hv);
2144}
2145
2146static void
1849coro_call_on_destroy (pTHX_ struct coro *coro) 2147coro_call_on_destroy (pTHX_ struct coro *coro)
1850{ 2148{
1851 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2149 AV *od = coro->on_destroy;
1852 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1853 2150
1854 if (on_destroyp) 2151 if (!od)
1855 { 2152 return;
1856 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1857 2153
1858 while (AvFILLp (on_destroy) >= 0) 2154 while (AvFILLp (od) >= 0)
2155 {
2156 SV *cb = sv_2mortal (av_pop (od));
2157
2158 /* coro hv's (and only hv's at the moment) are supported as well */
2159 if (SvSTATEhv_p (aTHX_ cb))
2160 api_ready (aTHX_ cb);
2161 else
1859 { 2162 {
1860 dSP; /* don't disturb outer sp */ 2163 dSP; /* don't disturb outer sp */
1861 SV *cb = av_pop (on_destroy);
1862
1863 PUSHMARK (SP); 2164 PUSHMARK (SP);
1864 2165
1865 if (statusp) 2166 if (coro->status)
1866 { 2167 {
1867 int i; 2168 PUTBACK;
1868 AV *status = (AV *)SvRV (*statusp); 2169 coro_push_av (aTHX_ coro->status, G_ARRAY);
1869 EXTEND (SP, AvFILLp (status) + 1); 2170 SPAGAIN;
1870
1871 for (i = 0; i <= AvFILLp (status); ++i)
1872 PUSHs (AvARRAY (status)[i]);
1873 } 2171 }
1874 2172
1875 PUTBACK; 2173 PUTBACK;
1876 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2174 call_sv (cb, G_VOID | G_DISCARD);
1877 } 2175 }
1878 } 2176 }
1879} 2177}
1880 2178
1881static void 2179static void
1882slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2180coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1883{ 2181{
2182 AV *av;
2183
2184 if (coro->status)
2185 {
2186 av = coro->status;
2187 av_clear (av);
2188 }
2189 else
2190 av = coro->status = newAV ();
2191
2192 /* items are actually not so common, so optimise for this case */
2193 if (items)
2194 {
1884 int i; 2195 int i;
1885 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV ();
1887 2196
1888 av_extend (av, items - 1); 2197 av_extend (av, items - 1);
2198
1889 for (i = 0; i < items; ++i) 2199 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i])); 2200 av_push (av, SvREFCNT_inc_NN (arg [i]));
2201 }
2202}
1891 2203
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2204static void
1893 2205slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2206{
1894 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2207 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1895 api_ready (aTHX_ sv_manager); 2208 api_ready (aTHX_ sv_manager);
1896 2209
1897 frame->prepare = prepare_schedule; 2210 frame->prepare = prepare_schedule;
1898 frame->check = slf_check_repeat; 2211 frame->check = slf_check_repeat;
1899 2212
1900 /* as a minor optimisation, we could unwind all stacks here */ 2213 /* as a minor optimisation, we could unwind all stacks here */
1901 /* but that puts extra pressure on pp_slf, and is not worth much */ 2214 /* but that puts extra pressure on pp_slf, and is not worth much */
1902 /*coro_unwind_stacks (aTHX);*/ 2215 /*coro_unwind_stacks (aTHX);*/
2216}
2217
2218static void
2219slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2220{
2221 HV *coro_hv = (HV *)SvRV (coro_current);
2222
2223 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2224 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2225}
2226
2227static void
2228slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2229{
2230 HV *coro_hv;
2231 struct coro *coro;
2232
2233 if (items <= 0)
2234 croak ("Coro::cancel called without coro object,");
2235
2236 coro = SvSTATE (arg [0]);
2237 coro_hv = coro->hv;
2238
2239 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2240
2241 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2242 {
2243 /* coro currently busy cancelling something, so just notify it */
2244 coro->slf_frame.data = (void *)coro;
2245
2246 frame->prepare = prepare_nop;
2247 frame->check = slf_check_nop;
2248 }
2249 else if (coro_hv == (HV *)SvRV (coro_current))
2250 {
2251 /* cancelling the current coro is allowed, and equals terminate */
2252 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2253 }
2254 else
2255 {
2256 struct coro *self = SvSTATE_current;
2257
2258 /* otherwise we cancel directly, purely for speed reasons
2259 * unfortunately, this requires some magic trickery, as
2260 * somebody else could cancel us, so we have to fight the cancellation.
2261 * this is ugly, and hopefully fully worth the extra speed.
2262 * besides, I can't get the slow-but-safe version working...
2263 */
2264 slf_frame.data = 0;
2265 self->flags |= CF_NOCANCEL;
2266 coro_state_destroy (aTHX_ coro);
2267 self->flags &= ~CF_NOCANCEL;
2268
2269 if (slf_frame.data)
2270 {
2271 /* while we were busy we have been cancelled, so terminate */
2272 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2273 }
2274 else
2275 {
2276 frame->prepare = prepare_nop;
2277 frame->check = slf_check_nop;
2278 }
2279 }
2280}
2281
2282static int
2283slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2284{
2285 frame->prepare = 0;
2286 coro_unwind_stacks (aTHX);
2287
2288 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2289
2290 return 1;
2291}
2292
2293static int
2294safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2295{
2296 if (coro->cctx)
2297 croak ("coro inside C callback, unable to cancel at this time, caught");
2298
2299 if (coro->flags & CF_NEW)
2300 {
2301 coro_set_status (aTHX_ coro, arg, items);
2302 coro_state_destroy (aTHX_ coro);
2303 }
2304 else
2305 {
2306 if (!coro->slf_frame.prepare)
2307 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2308
2309 slf_destroy (aTHX_ coro);
2310
2311 coro_set_status (aTHX_ coro, arg, items);
2312 coro->slf_frame.prepare = prepare_nop;
2313 coro->slf_frame.check = slf_check_safe_cancel;
2314
2315 api_ready (aTHX_ (SV *)coro->hv);
2316 }
2317
2318 return 1;
1903} 2319}
1904 2320
1905/*****************************************************************************/ 2321/*****************************************************************************/
1906/* async pool handler */ 2322/* async pool handler */
1907 2323
… …
1938slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2354slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1939{ 2355{
1940 HV *hv = (HV *)SvRV (coro_current); 2356 HV *hv = (HV *)SvRV (coro_current);
1941 struct coro *coro = SvSTATE_hv ((SV *)hv); 2357 struct coro *coro = SvSTATE_hv ((SV *)hv);
1942 2358
1943 if (expect_true (coro->saved_deffh)) 2359 if (ecb_expect_true (coro->saved_deffh))
1944 { 2360 {
1945 /* subsequent iteration */ 2361 /* subsequent iteration */
1946 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2362 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1947 coro->saved_deffh = 0; 2363 coro->saved_deffh = 0;
1948 2364
1949 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2365 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1950 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2366 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1951 { 2367 {
1952 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2368 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1953 coro->invoke_av = newAV (); 2369 return;
1954
1955 frame->prepare = prepare_nop;
1956 } 2370 }
1957 else 2371 else
1958 { 2372 {
1959 av_clear (GvAV (PL_defgv)); 2373 av_clear (GvAV (PL_defgv));
1960 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2374 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1985 2399
1986static void 2400static void
1987coro_rouse_callback (pTHX_ CV *cv) 2401coro_rouse_callback (pTHX_ CV *cv)
1988{ 2402{
1989 dXSARGS; 2403 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2404 SV *data = (SV *)S_GENSUB_ARG;
1991 2405
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2406 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2407 {
1994 /* first call, set args */ 2408 /* first call, set args */
2409 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2410 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2411
1998 SvRV_set (data, (SV *)av); 2412 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2413
2002 /* better take a full copy of the arguments */ 2414 /* better take a full copy of the arguments */
2003 while (items--) 2415 while (items--)
2004 av_store (av, items, newSVsv (ST (items))); 2416 av_store (av, items, newSVsv (ST (items)));
2417
2418 api_ready (aTHX_ coro);
2419 SvREFCNT_dec (coro);
2005 } 2420 }
2006 2421
2007 XSRETURN_EMPTY; 2422 XSRETURN_EMPTY;
2008} 2423}
2009 2424
… …
2026 2441
2027 EXTEND (SP, AvFILLp (av) + 1); 2442 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2443 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2444 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2445
2031 /* we have stolen the elements, so ste length to zero and free */ 2446 /* we have stolen the elements, so set length to zero and free */
2032 AvFILLp (av) = -1; 2447 AvFILLp (av) = -1;
2033 av_undef (av); 2448 av_undef (av);
2034 2449
2035 PUTBACK; 2450 PUTBACK;
2036 } 2451 }
… …
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2475 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2476 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2477 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2478
2064 { 2479 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2480 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2481 SV *data = (SV *)S_GENSUB_ARG;
2067 2482
2068 frame->data = (void *)data; 2483 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2484 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2485 frame->check = slf_check_rouse_wait;
2071 } 2486 }
… …
2075coro_new_rouse_cb (pTHX) 2490coro_new_rouse_cb (pTHX)
2076{ 2491{
2077 HV *hv = (HV *)SvRV (coro_current); 2492 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2493 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2494 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2495 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2496
2082 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2497 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2498 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2499
2085 SvREFCNT_dec (coro->rouse_cb); 2500 SvREFCNT_dec (coro->rouse_cb);
… …
2182static void 2597static void
2183slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2598slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{ 2599{
2185 frame->prepare = prepare_cede_notself; 2600 frame->prepare = prepare_cede_notself;
2186 frame->check = slf_check_nop; 2601 frame->check = slf_check_nop;
2602}
2603
2604/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2605static void
2606slf_destroy (pTHX_ struct coro *coro)
2607{
2608 /* this callback is reserved for slf functions needing to do cleanup */
2609 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2610 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2611
2612 /*
2613 * The on_destroy above most likely is from an SLF call.
2614 * Since by definition the SLF call will not finish when we destroy
2615 * the coro, we will have to force-finish it here, otherwise
2616 * cleanup functions cannot call SLF functions.
2617 */
2618 coro->slf_frame.prepare = 0;
2187} 2619}
2188 2620
2189/* 2621/*
2190 * these not obviously related functions are all rolled into one 2622 * these not obviously related functions are all rolled into one
2191 * function to increase chances that they all will call transfer with the same 2623 * function to increase chances that they all will call transfer with the same
… …
2198 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2630 I32 checkmark; /* mark SP to see how many elements check has pushed */
2199 2631
2200 /* set up the slf frame, unless it has already been set-up */ 2632 /* set up the slf frame, unless it has already been set-up */
2201 /* the latter happens when a new coro has been started */ 2633 /* the latter happens when a new coro has been started */
2202 /* or when a new cctx was attached to an existing coroutine */ 2634 /* or when a new cctx was attached to an existing coroutine */
2203 if (expect_true (!slf_frame.prepare)) 2635 if (ecb_expect_true (!slf_frame.prepare))
2204 { 2636 {
2205 /* first iteration */ 2637 /* first iteration */
2206 dSP; 2638 dSP;
2207 SV **arg = PL_stack_base + TOPMARK + 1; 2639 SV **arg = PL_stack_base + TOPMARK + 1;
2208 int items = SP - arg; /* args without function object */ 2640 int items = SP - arg; /* args without function object */
… …
2249 while (slf_frame.check (aTHX_ &slf_frame)); 2681 while (slf_frame.check (aTHX_ &slf_frame));
2250 2682
2251 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2683 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2252 2684
2253 /* exception handling */ 2685 /* exception handling */
2254 if (expect_false (CORO_THROW)) 2686 if (ecb_expect_false (CORO_THROW))
2255 { 2687 {
2256 SV *exception = sv_2mortal (CORO_THROW); 2688 SV *exception = sv_2mortal (CORO_THROW);
2257 2689
2258 CORO_THROW = 0; 2690 CORO_THROW = 0;
2259 sv_setsv (ERRSV, exception); 2691 sv_setsv (ERRSV, exception);
2260 croak (0); 2692 croak (0);
2261 } 2693 }
2262 2694
2263 /* return value handling - mostly like entersub */ 2695 /* return value handling - mostly like entersub */
2264 /* make sure we put something on the stack in scalar context */ 2696 /* make sure we put something on the stack in scalar context */
2265 if (GIMME_V == G_SCALAR) 2697 if (GIMME_V == G_SCALAR
2698 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2266 { 2699 {
2267 dSP; 2700 dSP;
2268 SV **bot = PL_stack_base + checkmark; 2701 SV **bot = PL_stack_base + checkmark;
2269 2702
2270 if (sp == bot) /* too few, push undef */ 2703 if (sp == bot) /* too few, push undef */
2271 bot [1] = &PL_sv_undef; 2704 bot [1] = &PL_sv_undef;
2272 else if (sp != bot + 1) /* too many, take last one */ 2705 else /* too many, take last one */
2273 bot [1] = *sp; 2706 bot [1] = *sp;
2274 2707
2275 SP = bot + 1; 2708 SP = bot + 1;
2276 2709
2277 PUTBACK; 2710 PUTBACK;
… …
2310 if (PL_op->op_flags & OPf_STACKED) 2743 if (PL_op->op_flags & OPf_STACKED)
2311 { 2744 {
2312 if (items > slf_arga) 2745 if (items > slf_arga)
2313 { 2746 {
2314 slf_arga = items; 2747 slf_arga = items;
2315 free (slf_argv); 2748 Safefree (slf_argv);
2316 slf_argv = malloc (slf_arga * sizeof (SV *)); 2749 New (0, slf_argv, slf_arga, SV *);
2317 } 2750 }
2318 2751
2319 slf_argc = items; 2752 slf_argc = items;
2320 2753
2321 for (i = 0; i < items; ++i) 2754 for (i = 0; i < items; ++i)
… …
2384{ 2817{
2385 PerlIOBuf base; 2818 PerlIOBuf base;
2386 NV next, every; 2819 NV next, every;
2387} PerlIOCede; 2820} PerlIOCede;
2388 2821
2389static IV 2822static IV ecb_cold
2390PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2823PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2391{ 2824{
2392 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2825 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2393 2826
2394 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2827 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2395 self->next = nvtime () + self->every; 2828 self->next = nvtime () + self->every;
2396 2829
2397 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2830 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2398} 2831}
2399 2832
2400static SV * 2833static SV * ecb_cold
2401PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2834PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2402{ 2835{
2403 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2836 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2404 2837
2405 return newSVnv (self->every); 2838 return newSVnv (self->every);
… …
2456/* Coro::Semaphore & Coro::Signal */ 2889/* Coro::Semaphore & Coro::Signal */
2457 2890
2458static SV * 2891static SV *
2459coro_waitarray_new (pTHX_ int count) 2892coro_waitarray_new (pTHX_ int count)
2460{ 2893{
2461 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2894 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2462 AV *av = newAV (); 2895 AV *av = newAV ();
2463 SV **ary; 2896 SV **ary;
2464 2897
2465 /* unfortunately, building manually saves memory */ 2898 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 2899 Newx (ary, 2, SV *);
… …
2517 SvREFCNT_dec (cb); 2950 SvREFCNT_dec (cb);
2518 } 2951 }
2519} 2952}
2520 2953
2521static void 2954static void
2522coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2955coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2523{ 2956{
2524 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2957 /* call $sem->adjust (0) to possibly wake up some other waiters */
2525 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2958 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2526} 2959}
2527 2960
2528static int 2961static int
2529slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2962slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2530{ 2963{
2531 AV *av = (AV *)frame->data; 2964 AV *av = (AV *)frame->data;
2532 SV *count_sv = AvARRAY (av)[0]; 2965 SV *count_sv = AvARRAY (av)[0];
2966 SV *coro_hv = SvRV (coro_current);
2533 2967
2534 /* if we are about to throw, don't actually acquire the lock, just throw */ 2968 /* if we are about to throw, don't actually acquire the lock, just throw */
2535 if (CORO_THROW) 2969 if (CORO_THROW)
2536 return 0; 2970 return 0;
2537 else if (SvIVX (count_sv) > 0) 2971 else if (SvIVX (count_sv) > 0)
2538 { 2972 {
2539 SvSTATE_current->on_destroy = 0; 2973 frame->destroy = 0;
2540 2974
2541 if (acquire) 2975 if (acquire)
2542 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2976 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2543 else 2977 else
2544 coro_semaphore_adjust (aTHX_ av, 0); 2978 coro_semaphore_adjust (aTHX_ av, 0);
… …
2549 { 2983 {
2550 int i; 2984 int i;
2551 /* if we were woken up but can't down, we look through the whole */ 2985 /* if we were woken up but can't down, we look through the whole */
2552 /* waiters list and only add us if we aren't in there already */ 2986 /* waiters list and only add us if we aren't in there already */
2553 /* this avoids some degenerate memory usage cases */ 2987 /* this avoids some degenerate memory usage cases */
2554 2988 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2555 for (i = 1; i <= AvFILLp (av); ++i)
2556 if (AvARRAY (av)[i] == SvRV (coro_current)) 2989 if (AvARRAY (av)[i] == coro_hv)
2557 return 1; 2990 return 1;
2558 2991
2559 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2992 av_push (av, SvREFCNT_inc (coro_hv));
2560 return 1; 2993 return 1;
2561 } 2994 }
2562} 2995}
2563 2996
2564static int 2997static int
… …
2587 { 3020 {
2588 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3021 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2589 3022
2590 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3023 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2591 frame->prepare = prepare_schedule; 3024 frame->prepare = prepare_schedule;
2592
2593 /* to avoid race conditions when a woken-up coro gets terminated */ 3025 /* to avoid race conditions when a woken-up coro gets terminated */
2594 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3026 /* we arrange for a temporary on_destroy that calls adjust (0) */
2595 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3027 frame->destroy = coro_semaphore_destroy;
2596 } 3028 }
2597} 3029}
2598 3030
2599static void 3031static void
2600slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3032slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2608{ 3040{
2609 if (items >= 2) 3041 if (items >= 2)
2610 { 3042 {
2611 /* callback form */ 3043 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 3044 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3045 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 3046
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3047 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 3048
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 3049 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 3050 coro_semaphore_adjust (aTHX_ av, 0);
2619 3051
2620 frame->prepare = prepare_nop; 3052 frame->prepare = prepare_nop;
… …
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 3076 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 3077 AvARRAY (av)[1] = cb;
2646 3078
2647 cb = av_shift (av); 3079 cb = av_shift (av);
2648 3080
3081 if (SvTYPE (cb) == SVt_PVCV)
3082 {
3083 dSP;
3084 PUSHMARK (SP);
3085 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3086 PUTBACK;
3087 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3088 }
3089 else
3090 {
2649 api_ready (aTHX_ cb); 3091 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 3092 sv_setiv (cb, 0); /* signal waiter */
3093 }
3094
2651 SvREFCNT_dec (cb); 3095 SvREFCNT_dec (cb);
2652 3096
2653 --count; 3097 --count;
2654 } 3098 }
2655} 3099}
… …
2664static void 3108static void
2665slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3109slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2666{ 3110{
2667 AV *av = (AV *)SvRV (arg [0]); 3111 AV *av = (AV *)SvRV (arg [0]);
2668 3112
3113 if (items >= 2)
3114 {
3115 SV *cb_cv = s_get_cv_croak (arg [1]);
3116 av_push (av, SvREFCNT_inc_NN (cb_cv));
3117
2669 if (SvIVX (AvARRAY (av)[0])) 3118 if (SvIVX (AvARRAY (av)[0]))
3119 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3120
3121 frame->prepare = prepare_nop;
3122 frame->check = slf_check_nop;
3123 }
3124 else if (SvIVX (AvARRAY (av)[0]))
2670 { 3125 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 3126 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 3127 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 3128 frame->check = slf_check_nop;
2674 } 3129 }
2675 else 3130 else
2676 { 3131 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3132 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 3133
2679 av_push (av, waiter); 3134 av_push (av, waiter);
2680 3135
2681 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3136 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2682 frame->prepare = prepare_schedule; 3137 frame->prepare = prepare_schedule;
… …
2700 3155
2701static void 3156static void
2702coro_aio_callback (pTHX_ CV *cv) 3157coro_aio_callback (pTHX_ CV *cv)
2703{ 3158{
2704 dXSARGS; 3159 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 3160 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 3161 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 3162 SV *data_sv = newSV (sizeof (struct io_state));
2708 3163
2709 av_extend (state, items - 1); 3164 av_extend (state, items - 1);
2710 3165
… …
2795 dSP; 3250 dSP;
2796 3251
2797 static SV *prio_cv; 3252 static SV *prio_cv;
2798 static SV *prio_sv; 3253 static SV *prio_sv;
2799 3254
2800 if (expect_false (!prio_cv)) 3255 if (ecb_expect_false (!prio_cv))
2801 { 3256 {
2802 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3257 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2803 prio_sv = newSViv (0); 3258 prio_sv = newSViv (0);
2804 } 3259 }
2805 3260
… …
2824 3279
2825 for (i = 0; i < items; ++i) 3280 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 3281 PUSHs (arg [i]);
2827 3282
2828 /* now push the callback closure */ 3283 /* now push the callback closure */
2829 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3284 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2830 3285
2831 /* now call the AIO function - we assume our request is uncancelable */ 3286 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 3287 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 3288 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 3289 }
2835 3290
2836 /* now that the requets is going, we loop toll we have a result */ 3291 /* now that the request is going, we loop till we have a result */
2837 frame->data = (void *)state; 3292 frame->data = (void *)state;
2838 frame->prepare = prepare_schedule; 3293 frame->prepare = prepare_schedule;
2839 frame->check = slf_check_aio_req; 3294 frame->check = slf_check_aio_req;
2840} 3295}
2841 3296
… …
2851 3306
2852/*****************************************************************************/ 3307/*****************************************************************************/
2853 3308
2854#if CORO_CLONE 3309#if CORO_CLONE
2855# include "clone.c" 3310# include "clone.c"
3311#endif
3312
3313/*****************************************************************************/
3314
3315static SV *
3316coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3317{
3318 SV *coro_sv;
3319 struct coro *coro;
3320 MAGIC *mg;
3321 HV *hv;
3322 SV *cb;
3323 int i;
3324
3325 if (argc > 0)
3326 {
3327 cb = s_get_cv_croak (argv [0]);
3328
3329 if (!is_coro)
3330 {
3331 if (CvISXSUB (cb))
3332 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3333
3334 if (!CvROOT (cb))
3335 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3336 }
3337 }
3338
3339 Newz (0, coro, 1, struct coro);
3340 coro->args = newAV ();
3341 coro->flags = CF_NEW;
3342
3343 if (coro_first) coro_first->prev = coro;
3344 coro->next = coro_first;
3345 coro_first = coro;
3346
3347 coro->hv = hv = newHV ();
3348 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3349 mg->mg_flags |= MGf_DUP;
3350 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3351
3352 if (argc > 0)
3353 {
3354 av_extend (coro->args, argc + is_coro - 1);
3355
3356 if (is_coro)
3357 {
3358 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3359 cb = (SV *)cv_coro_run;
3360 }
3361
3362 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3363
3364 for (i = 1; i < argc; i++)
3365 av_push (coro->args, newSVsv (argv [i]));
3366 }
3367
3368 return coro_sv;
3369}
3370
3371#ifndef __cplusplus
3372ecb_cold XS(boot_Coro__State);
3373#endif
3374
3375#if CORO_JIT
3376
3377static void ecb_noinline ecb_cold
3378pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3379{
3380 dSP;
3381 AV *av = newAV ();
3382
3383 av_store (av, 3, newSVuv (d));
3384 av_store (av, 2, newSVuv (c));
3385 av_store (av, 1, newSVuv (b));
3386 av_store (av, 0, newSVuv (a));
3387
3388 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3389
3390 PUTBACK;
3391}
3392
3393static void ecb_noinline ecb_cold
3394jit_init (pTHX)
3395{
3396 dSP;
3397 SV *load, *save;
3398 char *map_base;
3399 char *load_ptr, *save_ptr;
3400 STRLEN load_len, save_len, map_len;
3401 int count;
3402
3403 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3404
3405 PUSHMARK (SP);
3406#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3407# include "state.h"
3408#undef VARx
3409 count = call_pv ("Coro::State::_jit", G_ARRAY);
3410 SPAGAIN;
3411
3412 save = POPs; save_ptr = SvPVbyte (save, save_len);
3413 load = POPs; load_ptr = SvPVbyte (load, load_len);
3414
3415 map_len = load_len + save_len + 16;
3416
3417 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3418
3419 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3420
3421 load_perl_slots = (load_save_perl_slots_type)map_base;
3422 memcpy (map_base, load_ptr, load_len);
3423
3424 map_base += (load_len + 15) & ~15;
3425
3426 save_perl_slots = (load_save_perl_slots_type)map_base;
3427 memcpy (map_base, save_ptr, save_len);
3428
3429 /* we are good citizens and try to make the page read-only, so the evil evil */
3430 /* hackers might have it a bit more difficult */
3431 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3432
3433 PUTBACK;
3434 eval_pv ("undef &Coro::State::_jit", 1);
3435}
3436
2856#endif 3437#endif
2857 3438
2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3439MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2859 3440
2860PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
… …
2865# if CORO_PTHREAD 3446# if CORO_PTHREAD
2866 coro_thx = PERL_GET_CONTEXT; 3447 coro_thx = PERL_GET_CONTEXT;
2867# endif 3448# endif
2868#endif 3449#endif
2869 BOOT_PAGESIZE; 3450 BOOT_PAGESIZE;
3451
3452 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV;
3457 ERRSV;
2870 3458
2871 cctx_current = cctx_new_empty (); 3459 cctx_current = cctx_new_empty ();
2872 3460
2873 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3461 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2874 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3462 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2914 coroapi.prepare_nop = prepare_nop; 3502 coroapi.prepare_nop = prepare_nop;
2915 coroapi.prepare_schedule = prepare_schedule; 3503 coroapi.prepare_schedule = prepare_schedule;
2916 coroapi.prepare_cede = prepare_cede; 3504 coroapi.prepare_cede = prepare_cede;
2917 coroapi.prepare_cede_notself = prepare_cede_notself; 3505 coroapi.prepare_cede_notself = prepare_cede_notself;
2918 3506
2919 { 3507 time_init (aTHX);
2920 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2921 3508
2922 if (!svp) croak ("Time::HiRes is required");
2923 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2924
2925 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2926 }
2927
2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3509 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3510#if CORO_JIT
3511 PUTBACK;
3512 jit_init (aTHX);
3513 SPAGAIN;
3514#endif
2929} 3515}
2930 3516
2931SV * 3517SV *
2932new (char *klass, ...) 3518new (SV *klass, ...)
2933 ALIAS: 3519 ALIAS:
2934 Coro::new = 1 3520 Coro::new = 1
2935 CODE: 3521 CODE:
2936{ 3522 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2937 struct coro *coro; 3523 OUTPUT:
2938 MAGIC *mg;
2939 HV *hv;
2940 CV *cb;
2941 int i;
2942
2943 if (items > 1)
2944 {
2945 cb = coro_sv_2cv (aTHX_ ST (1));
2946
2947 if (!ix)
2948 {
2949 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2951
2952 if (!CvROOT (cb))
2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2955 }
2956
2957 Newz (0, coro, 1, struct coro);
2958 coro->args = newAV ();
2959 coro->flags = CF_NEW;
2960
2961 if (coro_first) coro_first->prev = coro;
2962 coro->next = coro_first;
2963 coro_first = coro;
2964
2965 coro->hv = hv = newHV ();
2966 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2967 mg->mg_flags |= MGf_DUP;
2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2969
2970 if (items > 1)
2971 {
2972 av_extend (coro->args, items - 1 + ix - 1);
2973
2974 if (ix)
2975 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run;
2978 }
2979
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981
2982 for (i = 2; i < items; i++)
2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2985}
2986 OUTPUT:
2987 RETVAL 3524 RETVAL
2988 3525
2989void 3526void
2990transfer (...) 3527transfer (...)
2991 PROTOTYPE: $$ 3528 PROTOTYPE: $$
2992 CODE: 3529 CODE:
2993 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3530 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2994
2995bool
2996_destroy (SV *coro_sv)
2997 CODE:
2998 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2999 OUTPUT:
3000 RETVAL
3001 3531
3002void 3532void
3003_exit (int code) 3533_exit (int code)
3004 PROTOTYPE: $ 3534 PROTOTYPE: $
3005 CODE: 3535 CODE:
… …
3081 CODE: 3611 CODE:
3082{ 3612{
3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3613 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3084 { 3614 {
3085 struct coro *current = SvSTATE_current; 3615 struct coro *current = SvSTATE_current;
3616 struct CoroSLF slf_save;
3086 3617
3087 if (current != coro) 3618 if (current != coro)
3088 { 3619 {
3089 PUTBACK; 3620 PUTBACK;
3090 save_perl (aTHX_ current); 3621 save_perl (aTHX_ current);
3091 load_perl (aTHX_ coro); 3622 load_perl (aTHX_ coro);
3623 /* the coro is most likely in an active SLF call.
3624 * while not strictly required (the code we execute is
3625 * not allowed to call any SLF functions), it's cleaner
3626 * to reinitialise the slf_frame and restore it later.
3627 * This might one day allow us to actually do SLF calls
3628 * from code executed here.
3629 */
3630 slf_save = slf_frame;
3631 slf_frame.prepare = 0;
3092 SPAGAIN; 3632 SPAGAIN;
3093 } 3633 }
3094 3634
3095 PUSHSTACK; 3635 PUSHSTACK;
3096 3636
… …
3100 if (ix) 3640 if (ix)
3101 eval_sv (coderef, 0); 3641 eval_sv (coderef, 0);
3102 else 3642 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3643 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3644
3645 POPSTACK;
3105 SPAGAIN; 3646 SPAGAIN;
3106 POPSTACK;
3107 3647
3108 if (current != coro) 3648 if (current != coro)
3109 { 3649 {
3110 PUTBACK; 3650 PUTBACK;
3651 slf_frame = slf_save;
3111 save_perl (aTHX_ coro); 3652 save_perl (aTHX_ coro);
3112 load_perl (aTHX_ current); 3653 load_perl (aTHX_ current);
3113 SPAGAIN; 3654 SPAGAIN;
3114 } 3655 }
3115 } 3656 }
… …
3120 PROTOTYPE: $ 3661 PROTOTYPE: $
3121 ALIAS: 3662 ALIAS:
3122 is_ready = CF_READY 3663 is_ready = CF_READY
3123 is_running = CF_RUNNING 3664 is_running = CF_RUNNING
3124 is_new = CF_NEW 3665 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3666 is_destroyed = CF_ZOMBIE
3667 is_zombie = CF_ZOMBIE
3668 is_suspended = CF_SUSPENDED
3126 CODE: 3669 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3670 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3671 OUTPUT:
3129 RETVAL 3672 RETVAL
3130 3673
3131void 3674void
3132throw (Coro::State self, SV *throw = &PL_sv_undef) 3675throw (Coro::State self, SV *exception = &PL_sv_undef)
3133 PROTOTYPE: $;$ 3676 PROTOTYPE: $;$
3134 CODE: 3677 CODE:
3135{ 3678{
3136 struct coro *current = SvSTATE_current; 3679 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3680 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3681 SvREFCNT_dec (*exceptionp);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3682 SvGETMAGIC (exception);
3683 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3140} 3684}
3141 3685
3142void 3686void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3687api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3144 PROTOTYPE: $;$ 3688 PROTOTYPE: $;$
… …
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3739 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3740
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3741 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3742 }
3199 3743
3744void
3745cancel (Coro::State self)
3746 CODE:
3747 coro_state_destroy (aTHX_ self);
3748
3749SV *
3750enable_times (int enabled = enable_times)
3751 CODE:
3752{
3753 RETVAL = boolSV (enable_times);
3754
3755 if (enabled != enable_times)
3756 {
3757 enable_times = enabled;
3758
3759 coro_times_update ();
3760 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3761 }
3762}
3763 OUTPUT:
3764 RETVAL
3765
3766void
3767times (Coro::State self)
3768 PPCODE:
3769{
3770 struct coro *current = SvSTATE (coro_current);
3771
3772 if (ecb_expect_false (current == self))
3773 {
3774 coro_times_update ();
3775 coro_times_add (SvSTATE (coro_current));
3776 }
3777
3778 EXTEND (SP, 2);
3779 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3780 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3781
3782 if (ecb_expect_false (current == self))
3783 coro_times_sub (SvSTATE (coro_current));
3784}
3785
3786void
3787swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3788 CODE:
3789{
3790 struct coro *current = SvSTATE_current;
3791
3792 if (current == coro)
3793 SWAP_SVS (current);
3794
3795 if (!coro->swap_sv)
3796 coro->swap_sv = newAV ();
3797
3798 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3799 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3800
3801 if (current == coro)
3802 SWAP_SVS (current);
3803}
3804
3200 3805
3201MODULE = Coro::State PACKAGE = Coro 3806MODULE = Coro::State PACKAGE = Coro
3202 3807
3203BOOT: 3808BOOT:
3204{ 3809{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3812 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3813 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3212 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3213 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3815 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3214 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3816 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3817 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216 3818
3217 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3819 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3820 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3821 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3220 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3822 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3221 3823
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3824 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3825
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3829 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3830 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3831 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3230
3231 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3232 coro_ready[i] = newAV ();
3233 3832
3234 { 3833 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3834 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3835
3237 coroapi.schedule = api_schedule; 3836 coroapi.schedule = api_schedule;
… …
3247 sv_setiv (sv, (IV)&coroapi); 3846 sv_setiv (sv, (IV)&coroapi);
3248 SvREADONLY_on (sv); 3847 SvREADONLY_on (sv);
3249 } 3848 }
3250} 3849}
3251 3850
3851SV *
3852async (...)
3853 PROTOTYPE: &@
3854 CODE:
3855 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3856 api_ready (aTHX_ RETVAL);
3857 OUTPUT:
3858 RETVAL
3859
3860void
3861_destroy (Coro::State coro)
3862 CODE:
3863 /* used by the manager thread */
3864 coro_state_destroy (aTHX_ coro);
3865
3866void
3867on_destroy (Coro::State coro, SV *cb)
3868 CODE:
3869 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3870
3871void
3872join (...)
3873 CODE:
3874 CORO_EXECUTE_SLF_XS (slf_init_join);
3875
3252void 3876void
3253terminate (...) 3877terminate (...)
3254 CODE: 3878 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3879 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256 3880
3257void 3881void
3882cancel (...)
3883 CODE:
3884 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3885
3886int
3887safe_cancel (Coro::State self, ...)
3888 C_ARGS: aTHX_ self, &ST (1), items - 1
3889
3890void
3258schedule (...) 3891schedule (...)
3259 CODE: 3892 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3893 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3261 3894
3262void 3895void
… …
3276 3909
3277void 3910void
3278cede_notself (...) 3911cede_notself (...)
3279 CODE: 3912 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3913 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281
3282void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
3287 3914
3288void 3915void
3289_set_current (SV *current) 3916_set_current (SV *current)
3290 PROTOTYPE: $ 3917 PROTOTYPE: $
3291 CODE: 3918 CODE:
… …
3295void 3922void
3296_set_readyhook (SV *hook) 3923_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3924 PROTOTYPE: $
3298 CODE: 3925 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3926 SvREFCNT_dec (coro_readyhook);
3927 SvGETMAGIC (hook);
3928 if (SvOK (hook))
3929 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3930 coro_readyhook = newSVsv (hook);
3931 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3932 }
3933 else
3934 {
3935 coro_readyhook = 0;
3936 CORO_READYHOOK = 0;
3937 }
3301 3938
3302int 3939int
3303prio (Coro::State coro, int newprio = 0) 3940prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3941 PROTOTYPE: $;$
3305 ALIAS: 3942 ALIAS:
… …
3311 if (items > 1) 3948 if (items > 1)
3312 { 3949 {
3313 if (ix) 3950 if (ix)
3314 newprio = coro->prio - newprio; 3951 newprio = coro->prio - newprio;
3315 3952
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3953 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3954 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3955
3319 coro->prio = newprio; 3956 coro->prio = newprio;
3320 } 3957 }
3321} 3958}
3322 OUTPUT: 3959 OUTPUT:
… …
3337 RETVAL = coro_nready; 3974 RETVAL = coro_nready;
3338 OUTPUT: 3975 OUTPUT:
3339 RETVAL 3976 RETVAL
3340 3977
3341void 3978void
3979suspend (Coro::State self)
3980 PROTOTYPE: $
3981 CODE:
3982 self->flags |= CF_SUSPENDED;
3983
3984void
3985resume (Coro::State self)
3986 PROTOTYPE: $
3987 CODE:
3988 self->flags &= ~CF_SUSPENDED;
3989
3990void
3342_pool_handler (...) 3991_pool_handler (...)
3343 CODE: 3992 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3993 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3345 3994
3346void 3995void
… …
3357 for (i = 1; i < items; ++i) 4006 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i))); 4007 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359 4008
3360 if ((SV *)hv == &PL_sv_undef) 4009 if ((SV *)hv == &PL_sv_undef)
3361 { 4010 {
3362 PUSHMARK (SP); 4011 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3363 EXTEND (SP, 2);
3364 PUSHs (sv_Coro);
3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4012 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4013 SvREFCNT_dec (sv);
3371 } 4014 }
3372 4015
3373 { 4016 {
3374 struct coro *coro = SvSTATE_hv (hv); 4017 struct coro *coro = SvSTATE_hv (hv);
3375 4018
… …
3409 CODE: 4052 CODE:
3410{ 4053{
3411 struct coro *coro = SvSTATE_current; 4054 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4055 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 4056
3414 block = (SV *)coro_sv_2cv (aTHX_ block); 4057 block = s_get_cv_croak (block);
3415 4058
3416 if (!*avp) 4059 if (!*avp)
3417 *avp = newAV (); 4060 *avp = newAV ();
3418 4061
3419 av_push (*avp, SvREFCNT_inc (block)); 4062 av_push (*avp, SvREFCNT_inc (block));
3420 4063
3421 if (!ix) 4064 if (!ix)
3422 on_enterleave_call (aTHX_ block); 4065 on_enterleave_call (aTHX_ block);
3423 4066
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4067 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 4068 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4069 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 4070}
3428 4071
3429 4072
3430MODULE = Coro::State PACKAGE = PerlIO::cede 4073MODULE = Coro::State PACKAGE = PerlIO::cede
3431 4074
… …
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 4079MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 4080
3438SV * 4081SV *
3439new (SV *klass, SV *count = 0) 4082new (SV *klass, SV *count = 0)
3440 CODE: 4083 CODE:
4084{
4085 int semcnt = 1;
4086
4087 if (count)
4088 {
4089 SvGETMAGIC (count);
4090
4091 if (SvOK (count))
4092 semcnt = SvIV (count);
4093 }
4094
3441 RETVAL = sv_bless ( 4095 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4096 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 4097 GvSTASH (CvGV (cv))
3444 ); 4098 );
4099}
3445 OUTPUT: 4100 OUTPUT:
3446 RETVAL 4101 RETVAL
3447 4102
3448# helper for Coro::Channel 4103# helper for Coro::Channel and others
3449SV * 4104SV *
3450_alloc (int count) 4105_alloc (int count)
3451 CODE: 4106 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 4107 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 4108 OUTPUT:
… …
3511 for (i = 1; i <= wcount; ++i) 4166 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4167 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 4168 }
3514} 4169}
3515 4170
4171MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4172
4173void
4174_may_delete (SV *sem, int count, unsigned int extra_refs)
4175 PPCODE:
4176{
4177 AV *av = (AV *)SvRV (sem);
4178
4179 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4180 && AvFILLp (av) == 0 /* no waiters, just count */
4181 && SvIV (AvARRAY (av)[0]) == count)
4182 XSRETURN_YES;
4183
4184 XSRETURN_NO;
4185}
4186
3516MODULE = Coro::State PACKAGE = Coro::Signal 4187MODULE = Coro::State PACKAGE = Coro::Signal
3517 4188
3518SV * 4189SV *
3519new (SV *klass) 4190new (SV *klass)
3520 CODE: 4191 CODE:
… …
3591 4262
3592void 4263void
3593_register (char *target, char *proto, SV *req) 4264_register (char *target, char *proto, SV *req)
3594 CODE: 4265 CODE:
3595{ 4266{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 4267 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 4268 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4269 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 4270 sv_setpv ((SV *)slf_cv, proto);
3600 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4271 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3601} 4272}
3602 4273
4274MODULE = Coro::State PACKAGE = Coro::Select
4275
4276void
4277patch_pp_sselect ()
4278 CODE:
4279 if (!coro_old_pp_sselect)
4280 {
4281 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4282 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4283 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4284 }
4285
4286void
4287unpatch_pp_sselect ()
4288 CODE:
4289 if (coro_old_pp_sselect)
4290 {
4291 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4292 coro_old_pp_sselect = 0;
4293 }
4294

Diff Legend

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