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.334 by root, Fri Nov 28 23:30:55 2008 UTC vs.
Revision 1.416 by root, Mon Dec 12 15:19:56 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \ 68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 69# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif 70#endif
114 71
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
117#endif 74#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
136#endif 93#endif
137 94
138#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
139 96
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 97#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
157 99
158#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
159# if CORO_PTHREAD 101# if CORO_PTHREAD
160static void *coro_thx; 102static void *coro_thx;
161# endif 103# endif
162#endif 104#endif
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
260 /* on_enter/on_leave */
261 AV *on_enter;
262 AV *on_leave;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
290 /* linked list */ 270 /* linked list */
291 struct coro *next, *prev; 271 struct coro *next, *prev;
292}; 272};
293 273
294typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
296 276
297/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
301 281
302/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
303 283
304#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
310 290
311/* for Coro.pm */ 291/* for Coro.pm */
312static SV *coro_current; 292static SV *coro_current;
313static SV *coro_readyhook; 293static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
316static struct coro *coro_first; 296static struct coro *coro_first;
317#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
318 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
319/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
320 395
321static SV * 396static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
323{ 398{
324#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 401 get_sv (name, create);
327#endif 402#endif
328 return get_sv (name, create); 403 return get_sv (name, create);
329} 404}
330 405
331static AV * 406static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
333{ 408{
334#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 411 get_av (name, create);
337#endif 412#endif
338 return get_av (name, create); 413 return get_av (name, create);
339} 414}
340 415
341static HV * 416static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
343{ 418{
344#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 421 get_hv (name, create);
347#endif 422#endif
348 return get_hv (name, create); 423 return get_hv (name, create);
349} 424}
350 425
351/* may croak */ 426ecb_inline void
352INLINE CV * 427coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 428{
355 HV *st; 429#ifdef coro_clock_gettime
356 GV *gvp; 430 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 431
432 ts.tv_sec = ts.tv_nsec = 0;
433 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
434 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
435
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];
358} 471}
359 472
360/*****************************************************************************/ 473/*****************************************************************************/
361/* magic glue */ 474/* magic glue */
362 475
363#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
365 478
366#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
369 : mg_find (sv, type)) 482 : mg_find (sv, type))
370 483
371#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
374 : 0) 487 : 0)
375 488
376#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)
377#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)
378 491
379INLINE 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 *
380SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro)
381{ 509{
382 HV *stash;
383 MAGIC *mg; 510 MAGIC *mg;
384 511
385 if (SvROK (coro)) 512 if (SvROK (coro))
386 coro = SvRV (coro); 513 coro = SvRV (coro);
387 514
388 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro);
516 if (!mg)
389 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
390 518
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
401} 520}
402 521
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404 523
… …
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408 527
409/*****************************************************************************/ 528/*****************************************************************************/
410/* padlist management and caching */ 529/* padlist management and caching */
411 530
412static AV * 531ecb_inline AV *
413coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
414{ 533{
415 AV *padlist = CvPADLIST (cv); 534 AV *padlist = CvPADLIST (cv);
416 AV *newpadlist, *newpad; 535 AV *newpadlist, *newpad;
417 536
… …
429 av_store (newpadlist, 1, (SV *)newpad); 548 av_store (newpadlist, 1, (SV *)newpad);
430 549
431 return newpadlist; 550 return newpadlist;
432} 551}
433 552
434static void 553ecb_inline void
435free_padlist (pTHX_ AV *padlist) 554free_padlist (pTHX_ AV *padlist)
436{ 555{
437 /* may be during global destruction */ 556 /* may be during global destruction */
438 if (!IN_DESTRUCT) 557 if (!IN_DESTRUCT)
439 { 558 {
… …
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 582coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 583{
465 AV *padlist; 584 AV *padlist;
466 AV *av = (AV *)mg->mg_obj; 585 AV *av = (AV *)mg->mg_obj;
467 586
587 /* perl manages to free our internal AV and _then_ call us */
588 if (IN_DESTRUCT)
589 return 0;
590
468 /* casting is fun. */ 591 /* casting is fun. */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
470 free_padlist (aTHX_ padlist); 593 free_padlist (aTHX_ padlist);
471 594
472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 595 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
… …
478 0, 0, 0, 0, 601 0, 0, 0, 0,
479 coro_cv_free 602 coro_cv_free
480}; 603};
481 604
482/* the next two functions merely cache the padlists */ 605/* the next two functions merely cache the padlists */
483static void 606ecb_inline void
484get_padlist (pTHX_ CV *cv) 607get_padlist (pTHX_ CV *cv)
485{ 608{
486 MAGIC *mg = CORO_MAGIC_cv (cv); 609 MAGIC *mg = CORO_MAGIC_cv (cv);
487 AV *av; 610 AV *av;
488 611
489 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
490 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
491 else 614 else
492 { 615 {
493#if CORO_PREFER_PERL_FUNCTIONS 616#if CORO_PREFER_PERL_FUNCTIONS
494 /* this is probably cleaner? but also slower! */ 617 /* this is probably cleaner? but also slower! */
… …
501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 624 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
502#endif 625#endif
503 } 626 }
504} 627}
505 628
506static void 629ecb_inline void
507put_padlist (pTHX_ CV *cv) 630put_padlist (pTHX_ CV *cv)
508{ 631{
509 MAGIC *mg = CORO_MAGIC_cv (cv); 632 MAGIC *mg = CORO_MAGIC_cv (cv);
510 AV *av; 633 AV *av;
511 634
512 if (expect_false (!mg)) 635 if (ecb_expect_false (!mg))
513 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);
514 637
515 av = (AV *)mg->mg_obj; 638 av = (AV *)mg->mg_obj;
516 639
517 if (expect_false (AvFILLp (av) >= AvMAX (av))) 640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
518 av_extend (av, AvFILLp (av) + 1); 641 av_extend (av, AvFILLp (av) + 1);
519 642
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 644}
522 645
523/** 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))
699
700static void
701on_enterleave_call (pTHX_ SV *cb);
524 702
525static void 703static void
526load_perl (pTHX_ Coro__State c) 704load_perl (pTHX_ Coro__State c)
527{ 705{
528 perl_slots *slot = c->slot; 706 perl_slots *slot = c->slot;
529 c->slot = 0; 707 c->slot = 0;
530 708
531 PL_mainstack = c->mainstack; 709 PL_mainstack = c->mainstack;
532 710
533 GvSV (PL_defgv) = slot->defsv; 711#if CORO_JIT
534 GvAV (PL_defgv) = slot->defav; 712 load_perl_slots (slot);
535 GvSV (PL_errgv) = slot->errsv; 713#else
536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
538
539 #define VAR(name,type) PL_ ## name = slot->name; 714 #define VARx(name,expr,type) expr = slot->name;
540 # include "state.h" 715 # include "state.h"
541 #undef VAR 716 #undef VARx
717#endif
542 718
543 { 719 {
544 dSP; 720 dSP;
545 721
546 CV *cv; 722 CV *cv;
547 723
548 /* now do the ugly restore mess */ 724 /* now do the ugly restore mess */
549 while (expect_true (cv = (CV *)POPs)) 725 while (ecb_expect_true (cv = (CV *)POPs))
550 { 726 {
551 put_padlist (aTHX_ cv); /* mark this padlist as available */ 727 put_padlist (aTHX_ cv); /* mark this padlist as available */
552 CvDEPTH (cv) = PTR2IV (POPs); 728 CvDEPTH (cv) = PTR2IV (POPs);
553 CvPADLIST (cv) = (AV *)POPs; 729 CvPADLIST (cv) = (AV *)POPs;
554 } 730 }
… …
556 PUTBACK; 732 PUTBACK;
557 } 733 }
558 734
559 slf_frame = c->slf_frame; 735 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 736 CORO_THROW = c->except;
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
746 if (ecb_expect_false (c->on_enter))
747 {
748 int i;
749
750 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
752 }
753
754 SWAP_SVS (c);
561} 755}
562 756
563static void 757static void
564save_perl (pTHX_ Coro__State c) 758save_perl (pTHX_ Coro__State c)
565{ 759{
760 SWAP_SVS (c);
761
762 if (ecb_expect_false (c->on_leave))
763 {
764 int i;
765
766 for (i = AvFILLp (c->on_leave); i >= 0; --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);
776 }
777
566 c->except = CORO_THROW; 778 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 779 c->slf_frame = slf_frame;
568 780
569 { 781 {
570 dSP; 782 dSP;
… …
579 791
580 XPUSHs (Nullsv); 792 XPUSHs (Nullsv);
581 /* this loop was inspired by pp_caller */ 793 /* this loop was inspired by pp_caller */
582 for (;;) 794 for (;;)
583 { 795 {
584 while (expect_true (cxix >= 0)) 796 while (ecb_expect_true (cxix >= 0))
585 { 797 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 798 PERL_CONTEXT *cx = &ccstk[cxix--];
587 799
588 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))
589 { 801 {
590 CV *cv = cx->blk_sub.cv; 802 CV *cv = cx->blk_sub.cv;
591 803
592 if (expect_true (CvDEPTH (cv))) 804 if (ecb_expect_true (CvDEPTH (cv)))
593 { 805 {
594 EXTEND (SP, 3); 806 EXTEND (SP, 3);
595 PUSHs ((SV *)CvPADLIST (cv)); 807 PUSHs ((SV *)CvPADLIST (cv));
596 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 808 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
597 PUSHs ((SV *)cv); 809 PUSHs ((SV *)cv);
… …
600 get_padlist (aTHX_ cv); 812 get_padlist (aTHX_ cv);
601 } 813 }
602 } 814 }
603 } 815 }
604 816
605 if (expect_true (top_si->si_type == PERLSI_MAIN)) 817 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
606 break; 818 break;
607 819
608 top_si = top_si->si_prev; 820 top_si = top_si->si_prev;
609 ccstk = top_si->si_cxstack; 821 ccstk = top_si->si_cxstack;
610 cxix = top_si->si_cxix; 822 cxix = top_si->si_cxix;
… …
612 824
613 PUTBACK; 825 PUTBACK;
614 } 826 }
615 827
616 /* allocate some space on the context stack for our purposes */ 828 /* allocate some space on the context stack for our purposes */
617 /* we manually unroll here, as usually 2 slots is enough */ 829 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
618 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC;
621 { 830 {
622 int i; 831 unsigned int i;
832
623 for (i = 3; i < SLOT_COUNT; ++i) 833 for (i = 0; i < SLOT_COUNT; ++i)
624 CXINC; 834 CXINC;
625 } 835
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 836 cxstack_ix -= SLOT_COUNT; /* undo allocation */
837 }
627 838
628 c->mainstack = PL_mainstack; 839 c->mainstack = PL_mainstack;
629 840
630 { 841 {
631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 842 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
632 843
633 slot->defav = GvAV (PL_defgv); 844#if CORO_JIT
634 slot->defsv = DEFSV; 845 save_perl_slots (slot);
635 slot->errsv = ERRSV; 846#else
636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
638
639 #define VAR(name,type) slot->name = PL_ ## name; 847 #define VARx(name,expr,type) slot->name = expr;
640 # include "state.h" 848 # include "state.h"
641 #undef VAR 849 #undef VARx
850#endif
642 } 851 }
643} 852}
644 853
645/* 854/*
646 * allocate various perl stacks. This is almost an exact copy 855 * allocate various perl stacks. This is almost an exact copy
… …
652# define coro_init_stacks(thx) init_stacks () 861# define coro_init_stacks(thx) init_stacks ()
653#else 862#else
654static void 863static void
655coro_init_stacks (pTHX) 864coro_init_stacks (pTHX)
656{ 865{
657 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() */
658 PL_curstackinfo->si_type = PERLSI_MAIN; 867 PL_curstackinfo->si_type = PERLSI_MAIN;
659 PL_curstack = PL_curstackinfo->si_stack; 868 PL_curstack = PL_curstackinfo->si_stack;
660 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 869 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
661 870
662 PL_stack_base = AvARRAY(PL_curstack); 871 PL_stack_base = AvARRAY(PL_curstack);
… …
677#endif 886#endif
678 887
679 New(54,PL_scopestack,8,I32); 888 New(54,PL_scopestack,8,I32);
680 PL_scopestack_ix = 0; 889 PL_scopestack_ix = 0;
681 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
682 894
683 New(54,PL_savestack,24,ANY); 895 New(54,PL_savestack,24,ANY);
684 PL_savestack_ix = 0; 896 PL_savestack_ix = 0;
685 PL_savestack_max = 24; 897 PL_savestack_max = 24;
686 898
… …
714 } 926 }
715 927
716 Safefree (PL_tmps_stack); 928 Safefree (PL_tmps_stack);
717 Safefree (PL_markstack); 929 Safefree (PL_markstack);
718 Safefree (PL_scopestack); 930 Safefree (PL_scopestack);
931#if HAS_SCOPESTACK_NAME
932 Safefree (PL_scopestack_name);
933#endif
719 Safefree (PL_savestack); 934 Safefree (PL_savestack);
720#if !PERL_VERSION_ATLEAST (5,10,0) 935#if !PERL_VERSION_ATLEAST (5,10,0)
721 Safefree (PL_retstack); 936 Safefree (PL_retstack);
722#endif 937#endif
723} 938}
… …
769#endif 984#endif
770 985
771/* 986/*
772 * This overrides the default magic get method of %SIG elements. 987 * This overrides the default magic get method of %SIG elements.
773 * 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
774 * and instead of tryign to save and restore the hash elements, we just provide 989 * and instead of trying to save and restore the hash elements (extremely slow),
775 * readback here. 990 * we just provide our own readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 991 */
780static int 992static int ecb_cold
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 993coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 994{
783 const char *s = MgPV_nolen_const (mg); 995 const char *s = MgPV_nolen_const (mg);
784 996
785 if (*s == '_') 997 if (*s == '_')
… …
789 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
790 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
791 1003
792 if (svp) 1004 if (svp)
793 { 1005 {
794 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);
795 return 0; 1016 return 0;
796 } 1017 }
797 } 1018 }
798 1019
799 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
800} 1021}
801 1022
802static int 1023static int ecb_cold
803coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
804{ 1025{
805 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
806 1027
807 if (*s == '_') 1028 if (*s == '_')
… …
821 } 1042 }
822 1043
823 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1044 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
824} 1045}
825 1046
826static int 1047static int ecb_cold
827coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1048coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
828{ 1049{
829 const char *s = MgPV_nolen_const (mg); 1050 const char *s = MgPV_nolen_const (mg);
830 1051
831 if (*s == '_') 1052 if (*s == '_')
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1057 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 1058
838 if (svp) 1059 if (svp)
839 { 1060 {
840 SV *old = *svp; 1061 SV *old = *svp;
841 *svp = newSVsv (sv); 1062 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 1063 SvREFCNT_dec (old);
843 return 0; 1064 return 0;
844 } 1065 }
845 } 1066 }
846 1067
… …
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 1085slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 1086{
866 return 1; 1087 return 1;
867} 1088}
868 1089
869static UNOP coro_setup_op; 1090static UNOP init_perl_op;
870 1091
871static 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 */
872coro_setup (pTHX_ struct coro *coro) 1093init_perl (pTHX_ struct coro *coro)
873{ 1094{
874 /* 1095 /*
875 * emulate part of the perl startup here. 1096 * emulate part of the perl startup here.
876 */ 1097 */
877 coro_init_stacks (aTHX); 1098 coro_init_stacks (aTHX);
… …
884 PL_comppad_name_fill = 0; 1105 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0; 1106 PL_comppad_name_floor = 0;
886 PL_curpm = 0; 1107 PL_curpm = 0;
887 PL_curpad = 0; 1108 PL_curpad = 0;
888 PL_localizing = 0; 1109 PL_localizing = 0;
889 PL_dirty = 0;
890 PL_restartop = 0; 1110 PL_restartop = 0;
891#if PERL_VERSION_ATLEAST (5,10,0) 1111#if PERL_VERSION_ATLEAST (5,10,0)
892 PL_parser = 0; 1112 PL_parser = 0;
893#endif 1113#endif
894 PL_hints = 0; 1114 PL_hints = 0;
895 1115
896 /* recreate the die/warn hooks */ 1116 /* recreate the die/warn hooks */
897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1117 PL_diehook = SvREFCNT_inc (rv_diehook);
898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1118 PL_warnhook = SvREFCNT_inc (rv_warnhook);
899 1119
900 GvSV (PL_defgv) = newSV (0); 1120 GvSV (PL_defgv) = newSV (0);
901 GvAV (PL_defgv) = coro->args; coro->args = 0; 1121 GvAV (PL_defgv) = coro->args; coro->args = 0;
902 GvSV (PL_errgv) = newSV (0); 1122 GvSV (PL_errgv) = newSV (0);
903 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);
… …
924 /* 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
925 * 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.
926 */ 1146 */
927 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 */
928 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;
929 1150
930 /* 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 */
931 coro_setup_op.op_next = PL_op; 1152 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1153 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1154 init_perl_op.op_ppaddr = pp_slf;
934 /* 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 */
935 1156
936 PL_op = (OP *)&coro_setup_op; 1157 PL_op = (OP *)&init_perl_op;
937 1158
938 /* copy throw, in case it was set before coro_setup */ 1159 /* copy throw, in case it was set before init_perl */
939 CORO_THROW = coro->except; 1160 CORO_THROW = coro->except;
940}
941 1161
1162 SWAP_SVS (coro);
1163
1164 if (ecb_expect_false (enable_times))
1165 {
1166 coro_times_update ();
1167 coro_times_sub (coro);
1168 }
1169}
1170
942static void 1171static void
943coro_destruct_perl (pTHX_ struct coro *coro) 1172coro_unwind_stacks (pTHX)
944{ 1173{
945 if (!IN_DESTRUCT) 1174 if (!IN_DESTRUCT)
946 { 1175 {
947 /* restore all saved variables and stuff */ 1176 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 1177 LEAVE_SCOPE (0);
… …
956 POPSTACK_TO (PL_mainstack); 1185 POPSTACK_TO (PL_mainstack);
957 1186
958 /* unwind main stack */ 1187 /* unwind main stack */
959 dounwind (-1); 1188 dounwind (-1);
960 } 1189 }
1190}
961 1191
962 SvREFCNT_dec (GvSV (PL_defgv)); 1192static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 1193destroy_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 1194{
965 SvREFCNT_dec (PL_defoutgv); 1195 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 1196
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 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
1210 coro_unwind_stacks (aTHX);
1211
1212 /* restore swapped sv's */
1213 SWAP_SVS (coro);
1214
1215 coro_destruct_stacks (aTHX);
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);
1232 }
1233
1234 {
1235 unsigned int i;
1236
1237 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1238 SvREFCNT_dec (svf [i]);
1239
973 SvREFCNT_dec (coro->saved_deffh); 1240 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1241 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1242 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1243 SvREFCNT_dec (coro->invoke_av);
977 1244 }
978 coro_destruct_stacks (aTHX);
979} 1245}
980 1246
981INLINE void 1247ecb_inline void
982free_coro_mortal (pTHX) 1248free_coro_mortal (pTHX)
983{ 1249{
984 if (expect_true (coro_mortal)) 1250 if (ecb_expect_true (coro_mortal))
985 { 1251 {
986 SvREFCNT_dec (coro_mortal); 1252 SvREFCNT_dec ((SV *)coro_mortal);
987 coro_mortal = 0; 1253 coro_mortal = 0;
988 } 1254 }
989} 1255}
990 1256
991static int 1257static int
… …
1124 1390
1125 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 */
1126} 1392}
1127 1393
1128/* 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 */
1129static void NOINLINE 1395static void ecb_noinline
1130cctx_prepare (pTHX) 1396cctx_prepare (pTHX)
1131{ 1397{
1132 PL_top_env = &PL_start_env; 1398 PL_top_env = &PL_start_env;
1133 1399
1134 if (cctx_current->flags & CC_TRACE) 1400 if (cctx_current->flags & CC_TRACE)
… …
1145 slf_frame.prepare = slf_prepare_set_stacklevel; 1411 slf_frame.prepare = slf_prepare_set_stacklevel;
1146 slf_frame.check = slf_check_set_stacklevel; 1412 slf_frame.check = slf_check_set_stacklevel;
1147} 1413}
1148 1414
1149/* 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 */
1150INLINE void 1416ecb_inline void
1151transfer_tail (pTHX) 1417transfer_tail (pTHX)
1152{ 1418{
1153 free_coro_mortal (aTHX); 1419 free_coro_mortal (aTHX);
1154} 1420}
1155 1421
… …
1180 /* somebody or something will hit me for both perl_run and PL_restartop */ 1446 /* somebody or something will hit me for both perl_run and PL_restartop */
1181 PL_restartop = PL_op; 1447 PL_restartop = PL_op;
1182 perl_run (PL_curinterp); 1448 perl_run (PL_curinterp);
1183 /* 1449 /*
1184 * Unfortunately, there is no way to get at the return values of the 1450 * Unfortunately, there is no way to get at the return values of the
1185 * coro body here, as perl_run destroys these 1451 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1452 * runtime errors here, as this is just a random interpreter, not a thread.
1186 */ 1453 */
1187 1454
1188 /* 1455 /*
1189 * If perl-run returns we assume exit() was being called or the coro 1456 * If perl-run returns we assume exit() was being called or the coro
1190 * fell off the end, which seems to be the only valid (non-bug) 1457 * fell off the end, which seems to be the only valid (non-bug)
… …
1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1465 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1199 } 1466 }
1200} 1467}
1201 1468
1202static coro_cctx * 1469static coro_cctx *
1203cctx_new () 1470cctx_new (void)
1204{ 1471{
1205 coro_cctx *cctx; 1472 coro_cctx *cctx;
1206 1473
1207 ++cctx_count; 1474 ++cctx_count;
1208 New (0, cctx, 1, coro_cctx); 1475 New (0, cctx, 1, coro_cctx);
… …
1214 return cctx; 1481 return cctx;
1215} 1482}
1216 1483
1217/* create a new cctx only suitable as source */ 1484/* create a new cctx only suitable as source */
1218static coro_cctx * 1485static coro_cctx *
1219cctx_new_empty () 1486cctx_new_empty (void)
1220{ 1487{
1221 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1222 1489
1223 cctx->sptr = 0; 1490 cctx->sptr = 0;
1224 coro_create (&cctx->cctx, 0, 0, 0, 0); 1491 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1226 return cctx; 1493 return cctx;
1227} 1494}
1228 1495
1229/* create a new cctx suitable as destination/running a perl interpreter */ 1496/* create a new cctx suitable as destination/running a perl interpreter */
1230static coro_cctx * 1497static coro_cctx *
1231cctx_new_run () 1498cctx_new_run (void)
1232{ 1499{
1233 coro_cctx *cctx = cctx_new (); 1500 coro_cctx *cctx = cctx_new ();
1234 void *stack_start; 1501 void *stack_start;
1235 size_t stack_size; 1502 size_t stack_size;
1236 1503
1237#if HAVE_MMAP 1504#if HAVE_MMAP
1238 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1505 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1239 /* mmap supposedly does allocate-on-write for us */ 1506 /* mmap supposedly does allocate-on-write for us */
1240 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1507 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1241 1508
1242 if (cctx->sptr != (void *)-1) 1509 if (cctx->sptr != (void *)-1)
1243 { 1510 {
1244 #if CORO_STACKGUARD 1511 #if CORO_STACKGUARD
1245 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1512 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1277cctx_destroy (coro_cctx *cctx) 1544cctx_destroy (coro_cctx *cctx)
1278{ 1545{
1279 if (!cctx) 1546 if (!cctx)
1280 return; 1547 return;
1281 1548
1282 assert (cctx != cctx_current);//D temporary 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1283 1550
1284 --cctx_count; 1551 --cctx_count;
1285 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1286 1553
1287 /* coro_transfer creates new, empty cctx's */ 1554 /* coro_transfer creates new, empty cctx's */
… …
1306#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1573#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1307 1574
1308static coro_cctx * 1575static coro_cctx *
1309cctx_get (pTHX) 1576cctx_get (pTHX)
1310{ 1577{
1311 while (expect_true (cctx_first)) 1578 while (ecb_expect_true (cctx_first))
1312 { 1579 {
1313 coro_cctx *cctx = cctx_first; 1580 coro_cctx *cctx = cctx_first;
1314 cctx_first = cctx->next; 1581 cctx_first = cctx->next;
1315 --cctx_idle; 1582 --cctx_idle;
1316 1583
1317 if (expect_true (!CCTX_EXPIRED (cctx))) 1584 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1318 return cctx; 1585 return cctx;
1319 1586
1320 cctx_destroy (cctx); 1587 cctx_destroy (cctx);
1321 } 1588 }
1322 1589
… …
1327cctx_put (coro_cctx *cctx) 1594cctx_put (coro_cctx *cctx)
1328{ 1595{
1329 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1596 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1330 1597
1331 /* free another cctx if overlimit */ 1598 /* free another cctx if overlimit */
1332 if (expect_false (cctx_idle >= cctx_max_idle)) 1599 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1333 { 1600 {
1334 coro_cctx *first = cctx_first; 1601 coro_cctx *first = cctx_first;
1335 cctx_first = first->next; 1602 cctx_first = first->next;
1336 --cctx_idle; 1603 --cctx_idle;
1337 1604
… …
1348static void 1615static void
1349transfer_check (pTHX_ struct coro *prev, struct coro *next) 1616transfer_check (pTHX_ struct coro *prev, struct coro *next)
1350{ 1617{
1351 /* TODO: throwing up here is considered harmful */ 1618 /* TODO: throwing up here is considered harmful */
1352 1619
1353 if (expect_true (prev != next)) 1620 if (ecb_expect_true (prev != next))
1354 { 1621 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1622 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1623 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1357 1624
1358 if (expect_false (next->flags & CF_RUNNING)) 1625 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1360
1361 if (expect_false (next->flags & CF_DESTROYED))
1362 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1626 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1363 1627
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1628#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1629 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1366 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1630 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1367#endif 1631#endif
1368 } 1632 }
1369} 1633}
1370 1634
1371/* always use the TRANSFER macro */ 1635/* always use the TRANSFER macro */
1372static void NOINLINE /* noinline so we have a fixed stackframe */ 1636static void ecb_noinline /* noinline so we have a fixed stackframe */
1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1637transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1374{ 1638{
1375 dSTACKLEVEL; 1639 dSTACKLEVEL;
1376 1640
1377 /* sometimes transfer is only called to set idle_sp */ 1641 /* sometimes transfer is only called to set idle_sp */
1378 if (expect_false (!prev)) 1642 if (ecb_expect_false (!prev))
1379 { 1643 {
1380 cctx_current->idle_sp = STACKLEVEL; 1644 cctx_current->idle_sp = STACKLEVEL;
1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1645 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1382 } 1646 }
1383 else if (expect_true (prev != next)) 1647 else if (ecb_expect_true (prev != next))
1384 { 1648 {
1385 coro_cctx *cctx_prev; 1649 coro_cctx *cctx_prev;
1386 1650
1387 if (expect_false (prev->flags & CF_NEW)) 1651 if (ecb_expect_false (prev->flags & CF_NEW))
1388 { 1652 {
1389 /* create a new empty/source context */ 1653 /* create a new empty/source context */
1390 prev->flags &= ~CF_NEW; 1654 prev->flags &= ~CF_NEW;
1391 prev->flags |= CF_RUNNING; 1655 prev->flags |= CF_RUNNING;
1392 } 1656 }
… …
1395 next->flags |= CF_RUNNING; 1659 next->flags |= CF_RUNNING;
1396 1660
1397 /* first get rid of the old state */ 1661 /* first get rid of the old state */
1398 save_perl (aTHX_ prev); 1662 save_perl (aTHX_ prev);
1399 1663
1400 if (expect_false (next->flags & CF_NEW)) 1664 if (ecb_expect_false (next->flags & CF_NEW))
1401 { 1665 {
1402 /* need to start coroutine */ 1666 /* need to start coroutine */
1403 next->flags &= ~CF_NEW; 1667 next->flags &= ~CF_NEW;
1404 /* setup coroutine call */ 1668 /* setup coroutine call */
1405 coro_setup (aTHX_ next); 1669 init_perl (aTHX_ next);
1406 } 1670 }
1407 else 1671 else
1408 load_perl (aTHX_ next); 1672 load_perl (aTHX_ next);
1409 1673
1410 assert (!prev->cctx);//D temporary
1411
1412 /* possibly untie and reuse the cctx */ 1674 /* possibly untie and reuse the cctx */
1413 if (expect_true ( 1675 if (ecb_expect_true (
1414 cctx_current->idle_sp == STACKLEVEL 1676 cctx_current->idle_sp == STACKLEVEL
1415 && !(cctx_current->flags & CC_TRACE) 1677 && !(cctx_current->flags & CC_TRACE)
1416 && !force_cctx 1678 && !force_cctx
1417 )) 1679 ))
1418 { 1680 {
1419 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1681 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1420 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1682 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1421 1683
1422 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1684 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1423 /* without this the next cctx_get might destroy the running cctx while still in use */ 1685 /* without this the next cctx_get might destroy the running cctx while still in use */
1424 if (expect_false (CCTX_EXPIRED (cctx_current))) 1686 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1425 if (expect_true (!next->cctx)) 1687 if (ecb_expect_true (!next->cctx))
1426 next->cctx = cctx_get (aTHX); 1688 next->cctx = cctx_get (aTHX);
1427 1689
1428 cctx_put (cctx_current); 1690 cctx_put (cctx_current);
1429 } 1691 }
1430 else 1692 else
1431 prev->cctx = cctx_current; 1693 prev->cctx = cctx_current;
1432 1694
1433 ++next->usecount; 1695 ++next->usecount;
1434 1696
1435 cctx_prev = cctx_current; 1697 cctx_prev = cctx_current;
1436 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1698 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1437 1699
1438 next->cctx = 0; 1700 next->cctx = 0;
1439 1701
1440 if (expect_false (cctx_prev != cctx_current)) 1702 if (ecb_expect_false (cctx_prev != cctx_current))
1441 { 1703 {
1442 cctx_prev->top_env = PL_top_env; 1704 cctx_prev->top_env = PL_top_env;
1443 PL_top_env = cctx_current->top_env; 1705 PL_top_env = cctx_current->top_env;
1444 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1706 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1445 } 1707 }
… …
1451#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1713#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1452#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1714#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1453 1715
1454/** high level stuff ********************************************************/ 1716/** high level stuff ********************************************************/
1455 1717
1718/* this function is actually Coro, not Coro::State, but we call it from here */
1719/* because it is convenient - but it hasn't been declared yet for that reason */
1456static int 1720static void
1721coro_call_on_destroy (pTHX_ struct coro *coro);
1722
1723static void
1457coro_state_destroy (pTHX_ struct coro *coro) 1724coro_state_destroy (pTHX_ struct coro *coro)
1458{ 1725{
1459 if (coro->flags & CF_DESTROYED) 1726 if (coro->flags & CF_ZOMBIE)
1460 return 0; 1727 return;
1461 1728
1462 if (coro->on_destroy)
1463 coro->on_destroy (aTHX_ coro); 1729 slf_destroy (aTHX_ coro);
1464 1730
1465 coro->flags |= CF_DESTROYED; 1731 coro->flags |= CF_ZOMBIE;
1466 1732
1467 if (coro->flags & CF_READY) 1733 if (coro->flags & CF_READY)
1468 { 1734 {
1469 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1735 /* reduce nready, as destroying a ready coro effectively unreadies it */
1470 /* alternative: look through all ready queues and remove the coro */ 1736 /* alternative: look through all ready queues and remove the coro */
1471 --coro_nready; 1737 --coro_nready;
1472 } 1738 }
1473 else 1739 else
1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1740 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1475 1741
1742 if (coro->next) coro->next->prev = coro->prev;
1743 if (coro->prev) coro->prev->next = coro->next;
1744 if (coro == coro_first) coro_first = coro->next;
1745
1476 if (coro->mainstack 1746 if (coro->mainstack
1477 && coro->mainstack != main_mainstack 1747 && coro->mainstack != main_mainstack
1748 && coro->slot
1478 && !PL_dirty) 1749 && !PL_dirty)
1479 {
1480 struct coro temp;
1481
1482 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1483
1484 save_perl (aTHX_ &temp);
1485 load_perl (aTHX_ coro);
1486
1487 coro_destruct_perl (aTHX_ coro); 1750 destroy_perl (aTHX_ coro);
1488
1489 load_perl (aTHX_ &temp);
1490
1491 coro->slot = 0;
1492 }
1493 1751
1494 cctx_destroy (coro->cctx); 1752 cctx_destroy (coro->cctx);
1495 SvREFCNT_dec (coro->startcv); 1753 SvREFCNT_dec (coro->startcv);
1496 SvREFCNT_dec (coro->args); 1754 SvREFCNT_dec (coro->args);
1755 SvREFCNT_dec (coro->swap_sv);
1497 SvREFCNT_dec (CORO_THROW); 1756 SvREFCNT_dec (CORO_THROW);
1498 1757
1499 if (coro->next) coro->next->prev = coro->prev; 1758 coro_call_on_destroy (aTHX_ coro);
1500 if (coro->prev) coro->prev->next = coro->next;
1501 if (coro == coro_first) coro_first = coro->next;
1502 1759
1503 return 1; 1760 /* more destruction mayhem in coro_state_free */
1504} 1761}
1505 1762
1506static int 1763static int
1507coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1764coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1508{ 1765{
1509 struct coro *coro = (struct coro *)mg->mg_ptr; 1766 struct coro *coro = (struct coro *)mg->mg_ptr;
1510 mg->mg_ptr = 0; 1767 mg->mg_ptr = 0;
1511 1768
1512 coro->hv = 0;
1513
1514 if (--coro->refcnt < 0)
1515 {
1516 coro_state_destroy (aTHX_ coro); 1769 coro_state_destroy (aTHX_ coro);
1770 SvREFCNT_dec (coro->on_destroy);
1771 SvREFCNT_dec (coro->status);
1772
1517 Safefree (coro); 1773 Safefree (coro);
1518 }
1519 1774
1520 return 0; 1775 return 0;
1521} 1776}
1522 1777
1523static int 1778static int ecb_cold
1524coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1779coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1525{ 1780{
1526 struct coro *coro = (struct coro *)mg->mg_ptr; 1781 /* called when perl clones the current process the slow way (windows process emulation) */
1527 1782 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1528 ++coro->refcnt; 1783 mg->mg_ptr = 0;
1784 mg->mg_virtual = 0;
1529 1785
1530 return 0; 1786 return 0;
1531} 1787}
1532 1788
1533static MGVTBL coro_state_vtbl = { 1789static MGVTBL coro_state_vtbl = {
… …
1556 1812
1557 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1813 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1558 TRANSFER (ta, 1); 1814 TRANSFER (ta, 1);
1559} 1815}
1560 1816
1561/*****************************************************************************/
1562/* gensub: simple closure generation utility */
1563
1564#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1565
1566/* create a closure from XS, returns a code reference */
1567/* the arg can be accessed via GENSUB_ARG from the callback */
1568/* the callback must use dXSARGS/XSRETURN */
1569static SV *
1570gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1571{
1572 CV *cv = (CV *)newSV (0);
1573
1574 sv_upgrade ((SV *)cv, SVt_PVCV);
1575
1576 CvANON_on (cv);
1577 CvISXSUB_on (cv);
1578 CvXSUB (cv) = xsub;
1579 GENSUB_ARG = arg;
1580
1581 return newRV_noinc ((SV *)cv);
1582}
1583
1584/** Coro ********************************************************************/ 1817/** Coro ********************************************************************/
1585 1818
1586INLINE void 1819ecb_inline void
1587coro_enq (pTHX_ struct coro *coro) 1820coro_enq (pTHX_ struct coro *coro)
1588{ 1821{
1589 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1822 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1590}
1591 1823
1592INLINE SV * 1824 SvREFCNT_inc_NN (coro->hv);
1825
1826 coro->next_ready = 0;
1827 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1828 ready [1] = coro;
1829}
1830
1831ecb_inline struct coro *
1593coro_deq (pTHX) 1832coro_deq (pTHX)
1594{ 1833{
1595 int prio; 1834 int prio;
1596 1835
1597 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1836 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1598 if (AvFILLp (coro_ready [prio]) >= 0) 1837 {
1599 return av_shift (coro_ready [prio]); 1838 struct coro **ready = coro_ready [prio];
1839
1840 if (ready [0])
1841 {
1842 struct coro *coro = ready [0];
1843 ready [0] = coro->next_ready;
1844 return coro;
1845 }
1846 }
1600 1847
1601 return 0; 1848 return 0;
1849}
1850
1851static void
1852invoke_sv_ready_hook_helper (void)
1853{
1854 dTHX;
1855 dSP;
1856
1857 ENTER;
1858 SAVETMPS;
1859
1860 PUSHMARK (SP);
1861 PUTBACK;
1862 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1863
1864 FREETMPS;
1865 LEAVE;
1602} 1866}
1603 1867
1604static int 1868static int
1605api_ready (pTHX_ SV *coro_sv) 1869api_ready (pTHX_ SV *coro_sv)
1606{ 1870{
1607 struct coro *coro;
1608 SV *sv_hook;
1609 void (*xs_hook)(void);
1610
1611 coro = SvSTATE (coro_sv); 1871 struct coro *coro = SvSTATE (coro_sv);
1612 1872
1613 if (coro->flags & CF_READY) 1873 if (coro->flags & CF_READY)
1614 return 0; 1874 return 0;
1615 1875
1616 coro->flags |= CF_READY; 1876 coro->flags |= CF_READY;
1617 1877
1618 sv_hook = coro_nready ? 0 : coro_readyhook;
1619 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1620
1621 coro_enq (aTHX_ coro); 1878 coro_enq (aTHX_ coro);
1622 ++coro_nready;
1623 1879
1624 if (sv_hook) 1880 if (!coro_nready++)
1625 { 1881 if (coroapi.readyhook)
1626 dSP; 1882 coroapi.readyhook ();
1627
1628 ENTER;
1629 SAVETMPS;
1630
1631 PUSHMARK (SP);
1632 PUTBACK;
1633 call_sv (sv_hook, G_VOID | G_DISCARD);
1634
1635 FREETMPS;
1636 LEAVE;
1637 }
1638
1639 if (xs_hook)
1640 xs_hook ();
1641 1883
1642 return 1; 1884 return 1;
1643} 1885}
1644 1886
1645static int 1887static int
… …
1647{ 1889{
1648 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1890 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1649} 1891}
1650 1892
1651/* expects to own a reference to next->hv */ 1893/* expects to own a reference to next->hv */
1652INLINE void 1894ecb_inline void
1653prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1895prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1654{ 1896{
1655 SV *prev_sv = SvRV (coro_current); 1897 SV *prev_sv = SvRV (coro_current);
1656 1898
1657 ta->prev = SvSTATE_hv (prev_sv); 1899 ta->prev = SvSTATE_hv (prev_sv);
… …
1668static void 1910static void
1669prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1911prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1670{ 1912{
1671 for (;;) 1913 for (;;)
1672 { 1914 {
1673 SV *next_sv = coro_deq (aTHX); 1915 struct coro *next = coro_deq (aTHX);
1674 1916
1675 if (expect_true (next_sv)) 1917 if (ecb_expect_true (next))
1676 { 1918 {
1677 struct coro *next = SvSTATE_hv (next_sv);
1678
1679 /* cannot transfer to destroyed coros, skip and look for next */ 1919 /* cannot transfer to destroyed coros, skip and look for next */
1680 if (expect_false (next->flags & CF_DESTROYED)) 1920 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1681 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1921 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1682 else 1922 else
1683 { 1923 {
1684 next->flags &= ~CF_READY; 1924 next->flags &= ~CF_READY;
1685 --coro_nready; 1925 --coro_nready;
1686 1926
… …
1692 { 1932 {
1693 /* nothing to schedule: call the idle handler */ 1933 /* nothing to schedule: call the idle handler */
1694 if (SvROK (sv_idle) 1934 if (SvROK (sv_idle)
1695 && SvOBJECT (SvRV (sv_idle))) 1935 && SvOBJECT (SvRV (sv_idle)))
1696 { 1936 {
1937 if (SvRV (sv_idle) == SvRV (coro_current))
1938 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1939
1697 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1698 api_ready (aTHX_ SvRV (sv_idle)); 1941 api_ready (aTHX_ SvRV (sv_idle));
1699 --coro_nready; 1942 --coro_nready;
1700 } 1943 }
1701 else 1944 else
1702 { 1945 {
1946 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1703 dSP; 1947 dSP;
1704 1948
1705 ENTER; 1949 ENTER;
1706 SAVETMPS; 1950 SAVETMPS;
1707 1951
… …
1714 } 1958 }
1715 } 1959 }
1716 } 1960 }
1717} 1961}
1718 1962
1719INLINE void 1963ecb_inline void
1720prepare_cede (pTHX_ struct coro_transfer_args *ta) 1964prepare_cede (pTHX_ struct coro_transfer_args *ta)
1721{ 1965{
1722 api_ready (aTHX_ coro_current); 1966 api_ready (aTHX_ coro_current);
1723 prepare_schedule (aTHX_ ta); 1967 prepare_schedule (aTHX_ ta);
1724} 1968}
1725 1969
1726INLINE void 1970ecb_inline void
1727prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1971prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1728{ 1972{
1729 SV *prev = SvRV (coro_current); 1973 SV *prev = SvRV (coro_current);
1730 1974
1731 if (coro_nready) 1975 if (coro_nready)
… …
1761{ 2005{
1762 struct coro_transfer_args ta; 2006 struct coro_transfer_args ta;
1763 2007
1764 prepare_cede (aTHX_ &ta); 2008 prepare_cede (aTHX_ &ta);
1765 2009
1766 if (expect_true (ta.prev != ta.next)) 2010 if (ecb_expect_true (ta.prev != ta.next))
1767 { 2011 {
1768 TRANSFER (ta, 1); 2012 TRANSFER (ta, 1);
1769 return 1; 2013 return 1;
1770 } 2014 }
1771 else 2015 else
… …
1814 coro->slot->runops = RUNOPS_DEFAULT; 2058 coro->slot->runops = RUNOPS_DEFAULT;
1815 } 2059 }
1816} 2060}
1817 2061
1818static void 2062static void
2063coro_push_av (pTHX_ AV *av, I32 gimme_v)
2064{
2065 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2066 {
2067 dSP;
2068
2069 if (gimme_v == G_SCALAR)
2070 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2071 else
2072 {
2073 int i;
2074 EXTEND (SP, AvFILLp (av) + 1);
2075
2076 for (i = 0; i <= AvFILLp (av); ++i)
2077 PUSHs (AvARRAY (av)[i]);
2078 }
2079
2080 PUTBACK;
2081 }
2082}
2083
2084static void
2085coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2086{
2087 if (!coro->on_destroy)
2088 coro->on_destroy = newAV ();
2089
2090 av_push (coro->on_destroy, cb);
2091}
2092
2093static void
2094slf_destroy_join (pTHX_ struct CoroSLF *frame)
2095{
2096 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2097}
2098
2099static int
2100slf_check_join (pTHX_ struct CoroSLF *frame)
2101{
2102 struct coro *coro = (struct coro *)frame->data;
2103
2104 if (!coro->status)
2105 return 1;
2106
2107 frame->destroy = 0;
2108
2109 coro_push_av (aTHX_ coro->status, GIMME_V);
2110
2111 SvREFCNT_dec ((SV *)coro->hv);
2112
2113 return 0;
2114}
2115
2116static void
2117slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2118{
2119 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2120
2121 if (items > 1)
2122 croak ("join called with too many arguments");
2123
2124 if (coro->status)
2125 frame->prepare = prepare_nop;
2126 else
2127 {
2128 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2129 frame->prepare = prepare_schedule;
2130 }
2131
2132 frame->check = slf_check_join;
2133 frame->destroy = slf_destroy_join;
2134 frame->data = (void *)coro;
2135 SvREFCNT_inc (coro->hv);
2136}
2137
2138static void
1819coro_call_on_destroy (pTHX_ struct coro *coro) 2139coro_call_on_destroy (pTHX_ struct coro *coro)
1820{ 2140{
1821 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2141 AV *od = coro->on_destroy;
1822 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1823 2142
1824 if (on_destroyp) 2143 if (!od)
1825 { 2144 return;
1826 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1827 2145
1828 while (AvFILLp (on_destroy) >= 0) 2146 while (AvFILLp (od) >= 0)
2147 {
2148 SV *cb = sv_2mortal (av_pop (od));
2149
2150 /* coro hv's (and only hv's at the moment) are supported as well */
2151 if (SvSTATEhv_p (aTHX_ cb))
2152 api_ready (aTHX_ cb);
2153 else
1829 { 2154 {
1830 dSP; /* don't disturb outer sp */ 2155 dSP; /* don't disturb outer sp */
1831 SV *cb = av_pop (on_destroy);
1832
1833 PUSHMARK (SP); 2156 PUSHMARK (SP);
1834 2157
1835 if (statusp) 2158 if (coro->status)
1836 { 2159 {
1837 int i; 2160 PUTBACK;
1838 AV *status = (AV *)SvRV (*statusp); 2161 coro_push_av (aTHX_ coro->status, G_ARRAY);
1839 EXTEND (SP, AvFILLp (status) + 1); 2162 SPAGAIN;
1840
1841 for (i = 0; i <= AvFILLp (status); ++i)
1842 PUSHs (AvARRAY (status)[i]);
1843 } 2163 }
1844 2164
1845 PUTBACK; 2165 PUTBACK;
1846 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2166 call_sv (cb, G_VOID | G_DISCARD);
1847 } 2167 }
1848 } 2168 }
1849} 2169}
1850 2170
1851static void 2171static void
1852slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2172coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1853{ 2173{
2174 AV *av;
2175
2176 if (coro->status)
2177 {
2178 av = coro->status;
2179 av_clear (av);
2180 }
2181 else
2182 av = coro->status = newAV ();
2183
2184 /* items are actually not so common, so optimise for this case */
2185 if (items)
2186 {
1854 int i; 2187 int i;
1855 HV *hv = (HV *)SvRV (coro_current);
1856 AV *av = newAV ();
1857 2188
1858 av_extend (av, items - 1); 2189 av_extend (av, items - 1);
2190
1859 for (i = 0; i < items; ++i) 2191 for (i = 0; i < items; ++i)
1860 av_push (av, SvREFCNT_inc_NN (arg [i])); 2192 av_push (av, SvREFCNT_inc_NN (arg [i]));
2193 }
2194}
1861 2195
1862 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2196static void
1863 2197slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2198{
1864 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2199 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1865 api_ready (aTHX_ sv_manager); 2200 api_ready (aTHX_ sv_manager);
1866 2201
1867 frame->prepare = prepare_schedule; 2202 frame->prepare = prepare_schedule;
1868 frame->check = slf_check_repeat; 2203 frame->check = slf_check_repeat;
2204
2205 /* as a minor optimisation, we could unwind all stacks here */
2206 /* but that puts extra pressure on pp_slf, and is not worth much */
2207 /*coro_unwind_stacks (aTHX);*/
2208}
2209
2210static void
2211slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2212{
2213 HV *coro_hv = (HV *)SvRV (coro_current);
2214
2215 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217}
2218
2219static void
2220slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{
2222 HV *coro_hv;
2223 struct coro *coro;
2224
2225 if (items <= 0)
2226 croak ("Coro::cancel called without coro object,");
2227
2228 coro = SvSTATE (arg [0]);
2229 coro_hv = coro->hv;
2230
2231 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2232
2233 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2234 {
2235 /* coro currently busy cancelling something, so just notify it */
2236 coro->slf_frame.data = (void *)coro;
2237
2238 frame->prepare = prepare_nop;
2239 frame->check = slf_check_nop;
2240 }
2241 else if (coro_hv == (HV *)SvRV (coro_current))
2242 {
2243 /* cancelling the current coro is allowed, and equals terminate */
2244 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2245 }
2246 else
2247 {
2248 struct coro *self = SvSTATE_current;
2249
2250 /* otherwise we cancel directly, purely for speed reasons
2251 * unfortunately, this requires some magic trickery, as
2252 * somebody else could cancel us, so we have to fight the cancellation.
2253 * this is ugly, and hopefully fully worth the extra speed.
2254 * besides, I can't get the slow-but-safe version working...
2255 */
2256 slf_frame.data = 0;
2257 self->flags |= CF_NOCANCEL;
2258 coro_state_destroy (aTHX_ coro);
2259 self->flags &= ~CF_NOCANCEL;
2260
2261 if (slf_frame.data)
2262 {
2263 /* while we were busy we have been cancelled, so terminate */
2264 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2265 }
2266 else
2267 {
2268 frame->prepare = prepare_nop;
2269 frame->check = slf_check_nop;
2270 }
2271 }
2272}
2273
2274static int
2275slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2276{
2277 frame->prepare = 0;
2278 coro_unwind_stacks (aTHX);
2279
2280 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2281
2282 return 1;
2283}
2284
2285static int
2286safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2287{
2288 if (coro->cctx)
2289 croak ("coro inside C callback, unable to cancel at this time, caught");
2290
2291 if (coro->flags & CF_NEW)
2292 {
2293 coro_set_status (aTHX_ coro, arg, items);
2294 coro_state_destroy (aTHX_ coro);
2295 }
2296 else
2297 {
2298 if (!coro->slf_frame.prepare)
2299 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2300
2301 slf_destroy (aTHX_ coro);
2302
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro->slf_frame.prepare = prepare_nop;
2305 coro->slf_frame.check = slf_check_safe_cancel;
2306
2307 api_ready (aTHX_ (SV *)coro->hv);
2308 }
2309
2310 return 1;
1869} 2311}
1870 2312
1871/*****************************************************************************/ 2313/*****************************************************************************/
1872/* async pool handler */ 2314/* async pool handler */
1873 2315
… …
1904slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2346slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1905{ 2347{
1906 HV *hv = (HV *)SvRV (coro_current); 2348 HV *hv = (HV *)SvRV (coro_current);
1907 struct coro *coro = SvSTATE_hv ((SV *)hv); 2349 struct coro *coro = SvSTATE_hv ((SV *)hv);
1908 2350
1909 if (expect_true (coro->saved_deffh)) 2351 if (ecb_expect_true (coro->saved_deffh))
1910 { 2352 {
1911 /* subsequent iteration */ 2353 /* subsequent iteration */
1912 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2354 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1913 coro->saved_deffh = 0; 2355 coro->saved_deffh = 0;
1914 2356
1915 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2357 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1916 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2358 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1917 { 2359 {
1918 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2360 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1919 coro->invoke_av = newAV (); 2361 return;
1920
1921 frame->prepare = prepare_nop;
1922 } 2362 }
1923 else 2363 else
1924 { 2364 {
1925 av_clear (GvAV (PL_defgv)); 2365 av_clear (GvAV (PL_defgv));
1926 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2366 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1951 2391
1952static void 2392static void
1953coro_rouse_callback (pTHX_ CV *cv) 2393coro_rouse_callback (pTHX_ CV *cv)
1954{ 2394{
1955 dXSARGS; 2395 dXSARGS;
1956 SV *data = (SV *)GENSUB_ARG; 2396 SV *data = (SV *)S_GENSUB_ARG;
1957 2397
1958 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2398 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1959 { 2399 {
1960 /* first call, set args */ 2400 /* first call, set args */
2401 SV *coro = SvRV (data);
1961 AV *av = newAV (); 2402 AV *av = newAV ();
1962 SV *coro = SvRV (data);
1963 2403
1964 SvRV_set (data, (SV *)av); 2404 SvRV_set (data, (SV *)av);
1965 api_ready (aTHX_ coro);
1966 SvREFCNT_dec (coro);
1967 2405
1968 /* better take a full copy of the arguments */ 2406 /* better take a full copy of the arguments */
1969 while (items--) 2407 while (items--)
1970 av_store (av, items, newSVsv (ST (items))); 2408 av_store (av, items, newSVsv (ST (items)));
2409
2410 api_ready (aTHX_ coro);
2411 SvREFCNT_dec (coro);
1971 } 2412 }
1972 2413
1973 XSRETURN_EMPTY; 2414 XSRETURN_EMPTY;
1974} 2415}
1975 2416
… …
1992 2433
1993 EXTEND (SP, AvFILLp (av) + 1); 2434 EXTEND (SP, AvFILLp (av) + 1);
1994 for (i = 0; i <= AvFILLp (av); ++i) 2435 for (i = 0; i <= AvFILLp (av); ++i)
1995 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2436 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1996 2437
1997 /* we have stolen the elements, so ste length to zero and free */ 2438 /* we have stolen the elements, so set length to zero and free */
1998 AvFILLp (av) = -1; 2439 AvFILLp (av) = -1;
1999 av_undef (av); 2440 av_undef (av);
2000 2441
2001 PUTBACK; 2442 PUTBACK;
2002 } 2443 }
… …
2026 || SvTYPE (SvRV (cb)) != SVt_PVCV 2467 || SvTYPE (SvRV (cb)) != SVt_PVCV
2027 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2468 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2028 croak ("Coro::rouse_wait called with illegal callback argument,"); 2469 croak ("Coro::rouse_wait called with illegal callback argument,");
2029 2470
2030 { 2471 {
2031 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2472 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2032 SV *data = (SV *)GENSUB_ARG; 2473 SV *data = (SV *)S_GENSUB_ARG;
2033 2474
2034 frame->data = (void *)data; 2475 frame->data = (void *)data;
2035 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2476 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2036 frame->check = slf_check_rouse_wait; 2477 frame->check = slf_check_rouse_wait;
2037 } 2478 }
… …
2041coro_new_rouse_cb (pTHX) 2482coro_new_rouse_cb (pTHX)
2042{ 2483{
2043 HV *hv = (HV *)SvRV (coro_current); 2484 HV *hv = (HV *)SvRV (coro_current);
2044 struct coro *coro = SvSTATE_hv (hv); 2485 struct coro *coro = SvSTATE_hv (hv);
2045 SV *data = newRV_inc ((SV *)hv); 2486 SV *data = newRV_inc ((SV *)hv);
2046 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2487 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2047 2488
2048 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2489 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2049 SvREFCNT_dec (data); /* magicext increases the refcount */ 2490 SvREFCNT_dec (data); /* magicext increases the refcount */
2050 2491
2051 SvREFCNT_dec (coro->rouse_cb); 2492 SvREFCNT_dec (coro->rouse_cb);
… …
2148static void 2589static void
2149slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2590slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2150{ 2591{
2151 frame->prepare = prepare_cede_notself; 2592 frame->prepare = prepare_cede_notself;
2152 frame->check = slf_check_nop; 2593 frame->check = slf_check_nop;
2594}
2595
2596/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2597static void
2598slf_destroy (pTHX_ struct coro *coro)
2599{
2600 /* this callback is reserved for slf functions needing to do cleanup */
2601 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2602 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2603
2604 /*
2605 * The on_destroy above most likely is from an SLF call.
2606 * Since by definition the SLF call will not finish when we destroy
2607 * the coro, we will have to force-finish it here, otherwise
2608 * cleanup functions cannot call SLF functions.
2609 */
2610 coro->slf_frame.prepare = 0;
2153} 2611}
2154 2612
2155/* 2613/*
2156 * these not obviously related functions are all rolled into one 2614 * these not obviously related functions are all rolled into one
2157 * function to increase chances that they all will call transfer with the same 2615 * function to increase chances that they all will call transfer with the same
… …
2164 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2622 I32 checkmark; /* mark SP to see how many elements check has pushed */
2165 2623
2166 /* set up the slf frame, unless it has already been set-up */ 2624 /* set up the slf frame, unless it has already been set-up */
2167 /* the latter happens when a new coro has been started */ 2625 /* the latter happens when a new coro has been started */
2168 /* or when a new cctx was attached to an existing coroutine */ 2626 /* or when a new cctx was attached to an existing coroutine */
2169 if (expect_true (!slf_frame.prepare)) 2627 if (ecb_expect_true (!slf_frame.prepare))
2170 { 2628 {
2171 /* first iteration */ 2629 /* first iteration */
2172 dSP; 2630 dSP;
2173 SV **arg = PL_stack_base + TOPMARK + 1; 2631 SV **arg = PL_stack_base + TOPMARK + 1;
2174 int items = SP - arg; /* args without function object */ 2632 int items = SP - arg; /* args without function object */
… …
2215 while (slf_frame.check (aTHX_ &slf_frame)); 2673 while (slf_frame.check (aTHX_ &slf_frame));
2216 2674
2217 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2675 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2218 2676
2219 /* exception handling */ 2677 /* exception handling */
2220 if (expect_false (CORO_THROW)) 2678 if (ecb_expect_false (CORO_THROW))
2221 { 2679 {
2222 SV *exception = sv_2mortal (CORO_THROW); 2680 SV *exception = sv_2mortal (CORO_THROW);
2223 2681
2224 CORO_THROW = 0; 2682 CORO_THROW = 0;
2225 sv_setsv (ERRSV, exception); 2683 sv_setsv (ERRSV, exception);
2226 croak (0); 2684 croak (0);
2227 } 2685 }
2228 2686
2229 /* return value handling - mostly like entersub */ 2687 /* return value handling - mostly like entersub */
2230 /* make sure we put something on the stack in scalar context */ 2688 /* make sure we put something on the stack in scalar context */
2231 if (GIMME_V == G_SCALAR) 2689 if (GIMME_V == G_SCALAR
2690 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2232 { 2691 {
2233 dSP; 2692 dSP;
2234 SV **bot = PL_stack_base + checkmark; 2693 SV **bot = PL_stack_base + checkmark;
2235 2694
2236 if (sp == bot) /* too few, push undef */ 2695 if (sp == bot) /* too few, push undef */
2237 bot [1] = &PL_sv_undef; 2696 bot [1] = &PL_sv_undef;
2238 else if (sp != bot + 1) /* too many, take last one */ 2697 else /* too many, take last one */
2239 bot [1] = *sp; 2698 bot [1] = *sp;
2240 2699
2241 SP = bot + 1; 2700 SP = bot + 1;
2242 2701
2243 PUTBACK; 2702 PUTBACK;
… …
2276 if (PL_op->op_flags & OPf_STACKED) 2735 if (PL_op->op_flags & OPf_STACKED)
2277 { 2736 {
2278 if (items > slf_arga) 2737 if (items > slf_arga)
2279 { 2738 {
2280 slf_arga = items; 2739 slf_arga = items;
2281 free (slf_argv); 2740 Safefree (slf_argv);
2282 slf_argv = malloc (slf_arga * sizeof (SV *)); 2741 New (0, slf_argv, slf_arga, SV *);
2283 } 2742 }
2284 2743
2285 slf_argc = items; 2744 slf_argc = items;
2286 2745
2287 for (i = 0; i < items; ++i) 2746 for (i = 0; i < items; ++i)
… …
2292 2751
2293 PL_op->op_ppaddr = pp_slf; 2752 PL_op->op_ppaddr = pp_slf;
2294 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2753 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2295 2754
2296 PL_op = (OP *)&slf_restore; 2755 PL_op = (OP *)&slf_restore;
2756}
2757
2758/*****************************************************************************/
2759/* dynamic wind */
2760
2761static void
2762on_enterleave_call (pTHX_ SV *cb)
2763{
2764 dSP;
2765
2766 PUSHSTACK;
2767
2768 PUSHMARK (SP);
2769 PUTBACK;
2770 call_sv (cb, G_VOID | G_DISCARD);
2771 SPAGAIN;
2772
2773 POPSTACK;
2774}
2775
2776static SV *
2777coro_avp_pop_and_free (pTHX_ AV **avp)
2778{
2779 AV *av = *avp;
2780 SV *res = av_pop (av);
2781
2782 if (AvFILLp (av) < 0)
2783 {
2784 *avp = 0;
2785 SvREFCNT_dec (av);
2786 }
2787
2788 return res;
2789}
2790
2791static void
2792coro_pop_on_enter (pTHX_ void *coro)
2793{
2794 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2795 SvREFCNT_dec (cb);
2796}
2797
2798static void
2799coro_pop_on_leave (pTHX_ void *coro)
2800{
2801 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2802 on_enterleave_call (aTHX_ sv_2mortal (cb));
2297} 2803}
2298 2804
2299/*****************************************************************************/ 2805/*****************************************************************************/
2300/* PerlIO::cede */ 2806/* PerlIO::cede */
2301 2807
… …
2303{ 2809{
2304 PerlIOBuf base; 2810 PerlIOBuf base;
2305 NV next, every; 2811 NV next, every;
2306} PerlIOCede; 2812} PerlIOCede;
2307 2813
2308static IV 2814static IV ecb_cold
2309PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2815PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2310{ 2816{
2311 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2817 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2312 2818
2313 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2819 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2314 self->next = nvtime () + self->every; 2820 self->next = nvtime () + self->every;
2315 2821
2316 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2822 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2317} 2823}
2318 2824
2319static SV * 2825static SV * ecb_cold
2320PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2826PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2321{ 2827{
2322 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2828 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2323 2829
2324 return newSVnv (self->every); 2830 return newSVnv (self->every);
… …
2375/* Coro::Semaphore & Coro::Signal */ 2881/* Coro::Semaphore & Coro::Signal */
2376 2882
2377static SV * 2883static SV *
2378coro_waitarray_new (pTHX_ int count) 2884coro_waitarray_new (pTHX_ int count)
2379{ 2885{
2380 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2886 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2381 AV *av = newAV (); 2887 AV *av = newAV ();
2382 SV **ary; 2888 SV **ary;
2383 2889
2384 /* unfortunately, building manually saves memory */ 2890 /* unfortunately, building manually saves memory */
2385 Newx (ary, 2, SV *); 2891 Newx (ary, 2, SV *);
… …
2436 SvREFCNT_dec (cb); 2942 SvREFCNT_dec (cb);
2437 } 2943 }
2438} 2944}
2439 2945
2440static void 2946static void
2441coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2947coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2442{ 2948{
2443 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2949 /* call $sem->adjust (0) to possibly wake up some other waiters */
2444 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2950 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2445} 2951}
2446 2952
2447static int 2953static int
2448slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2954slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2449{ 2955{
2450 AV *av = (AV *)frame->data; 2956 AV *av = (AV *)frame->data;
2451 SV *count_sv = AvARRAY (av)[0]; 2957 SV *count_sv = AvARRAY (av)[0];
2958 SV *coro_hv = SvRV (coro_current);
2452 2959
2453 /* if we are about to throw, don't actually acquire the lock, just throw */ 2960 /* if we are about to throw, don't actually acquire the lock, just throw */
2454 if (CORO_THROW) 2961 if (CORO_THROW)
2455 return 0; 2962 return 0;
2456 else if (SvIVX (count_sv) > 0) 2963 else if (SvIVX (count_sv) > 0)
2457 { 2964 {
2458 SvSTATE_current->on_destroy = 0; 2965 frame->destroy = 0;
2459 2966
2460 if (acquire) 2967 if (acquire)
2461 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2968 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2462 else 2969 else
2463 coro_semaphore_adjust (aTHX_ av, 0); 2970 coro_semaphore_adjust (aTHX_ av, 0);
… …
2468 { 2975 {
2469 int i; 2976 int i;
2470 /* if we were woken up but can't down, we look through the whole */ 2977 /* if we were woken up but can't down, we look through the whole */
2471 /* waiters list and only add us if we aren't in there already */ 2978 /* waiters list and only add us if we aren't in there already */
2472 /* this avoids some degenerate memory usage cases */ 2979 /* this avoids some degenerate memory usage cases */
2473 2980 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2474 for (i = 1; i <= AvFILLp (av); ++i)
2475 if (AvARRAY (av)[i] == SvRV (coro_current)) 2981 if (AvARRAY (av)[i] == coro_hv)
2476 return 1; 2982 return 1;
2477 2983
2478 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2984 av_push (av, SvREFCNT_inc (coro_hv));
2479 return 1; 2985 return 1;
2480 } 2986 }
2481} 2987}
2482 2988
2483static int 2989static int
… …
2506 { 3012 {
2507 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3013 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2508 3014
2509 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3015 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2510 frame->prepare = prepare_schedule; 3016 frame->prepare = prepare_schedule;
2511
2512 /* to avoid race conditions when a woken-up coro gets terminated */ 3017 /* to avoid race conditions when a woken-up coro gets terminated */
2513 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3018 /* we arrange for a temporary on_destroy that calls adjust (0) */
2514 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3019 frame->destroy = coro_semaphore_destroy;
2515 } 3020 }
2516} 3021}
2517 3022
2518static void 3023static void
2519slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3024slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2527{ 3032{
2528 if (items >= 2) 3033 if (items >= 2)
2529 { 3034 {
2530 /* callback form */ 3035 /* callback form */
2531 AV *av = (AV *)SvRV (arg [0]); 3036 AV *av = (AV *)SvRV (arg [0]);
2532 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3037 SV *cb_cv = s_get_cv_croak (arg [1]);
2533 3038
2534 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3039 av_push (av, SvREFCNT_inc_NN (cb_cv));
2535 3040
2536 if (SvIVX (AvARRAY (av)[0]) > 0) 3041 if (SvIVX (AvARRAY (av)[0]) > 0)
2537 coro_semaphore_adjust (aTHX_ av, 0); 3042 coro_semaphore_adjust (aTHX_ av, 0);
2538 3043
2539 frame->prepare = prepare_nop; 3044 frame->prepare = prepare_nop;
… …
2563 AvARRAY (av)[0] = AvARRAY (av)[1]; 3068 AvARRAY (av)[0] = AvARRAY (av)[1];
2564 AvARRAY (av)[1] = cb; 3069 AvARRAY (av)[1] = cb;
2565 3070
2566 cb = av_shift (av); 3071 cb = av_shift (av);
2567 3072
3073 if (SvTYPE (cb) == SVt_PVCV)
3074 {
3075 dSP;
3076 PUSHMARK (SP);
3077 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3078 PUTBACK;
3079 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3080 }
3081 else
3082 {
2568 api_ready (aTHX_ cb); 3083 api_ready (aTHX_ cb);
2569 sv_setiv (cb, 0); /* signal waiter */ 3084 sv_setiv (cb, 0); /* signal waiter */
3085 }
3086
2570 SvREFCNT_dec (cb); 3087 SvREFCNT_dec (cb);
2571 3088
2572 --count; 3089 --count;
2573 } 3090 }
2574} 3091}
… …
2583static void 3100static void
2584slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3101slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2585{ 3102{
2586 AV *av = (AV *)SvRV (arg [0]); 3103 AV *av = (AV *)SvRV (arg [0]);
2587 3104
3105 if (items >= 2)
3106 {
3107 SV *cb_cv = s_get_cv_croak (arg [1]);
3108 av_push (av, SvREFCNT_inc_NN (cb_cv));
3109
2588 if (SvIVX (AvARRAY (av)[0])) 3110 if (SvIVX (AvARRAY (av)[0]))
3111 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3112
3113 frame->prepare = prepare_nop;
3114 frame->check = slf_check_nop;
3115 }
3116 else if (SvIVX (AvARRAY (av)[0]))
2589 { 3117 {
2590 SvIVX (AvARRAY (av)[0]) = 0; 3118 SvIVX (AvARRAY (av)[0]) = 0;
2591 frame->prepare = prepare_nop; 3119 frame->prepare = prepare_nop;
2592 frame->check = slf_check_nop; 3120 frame->check = slf_check_nop;
2593 } 3121 }
2594 else 3122 else
2595 { 3123 {
2596 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3124 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2597 3125
2598 av_push (av, waiter); 3126 av_push (av, waiter);
2599 3127
2600 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3128 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2601 frame->prepare = prepare_schedule; 3129 frame->prepare = prepare_schedule;
… …
2619 3147
2620static void 3148static void
2621coro_aio_callback (pTHX_ CV *cv) 3149coro_aio_callback (pTHX_ CV *cv)
2622{ 3150{
2623 dXSARGS; 3151 dXSARGS;
2624 AV *state = (AV *)GENSUB_ARG; 3152 AV *state = (AV *)S_GENSUB_ARG;
2625 SV *coro = av_pop (state); 3153 SV *coro = av_pop (state);
2626 SV *data_sv = newSV (sizeof (struct io_state)); 3154 SV *data_sv = newSV (sizeof (struct io_state));
2627 3155
2628 av_extend (state, items - 1); 3156 av_extend (state, items - 1);
2629 3157
… …
2714 dSP; 3242 dSP;
2715 3243
2716 static SV *prio_cv; 3244 static SV *prio_cv;
2717 static SV *prio_sv; 3245 static SV *prio_sv;
2718 3246
2719 if (expect_false (!prio_cv)) 3247 if (ecb_expect_false (!prio_cv))
2720 { 3248 {
2721 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3249 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2722 prio_sv = newSViv (0); 3250 prio_sv = newSViv (0);
2723 } 3251 }
2724 3252
… …
2743 3271
2744 for (i = 0; i < items; ++i) 3272 for (i = 0; i < items; ++i)
2745 PUSHs (arg [i]); 3273 PUSHs (arg [i]);
2746 3274
2747 /* now push the callback closure */ 3275 /* now push the callback closure */
2748 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3276 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2749 3277
2750 /* now call the AIO function - we assume our request is uncancelable */ 3278 /* now call the AIO function - we assume our request is uncancelable */
2751 PUTBACK; 3279 PUTBACK;
2752 call_sv ((SV *)req, G_VOID | G_DISCARD); 3280 call_sv ((SV *)req, G_VOID | G_DISCARD);
2753 } 3281 }
2754 3282
2755 /* now that the requets is going, we loop toll we have a result */ 3283 /* now that the request is going, we loop till we have a result */
2756 frame->data = (void *)state; 3284 frame->data = (void *)state;
2757 frame->prepare = prepare_schedule; 3285 frame->prepare = prepare_schedule;
2758 frame->check = slf_check_aio_req; 3286 frame->check = slf_check_aio_req;
2759} 3287}
2760 3288
… …
2770 3298
2771/*****************************************************************************/ 3299/*****************************************************************************/
2772 3300
2773#if CORO_CLONE 3301#if CORO_CLONE
2774# include "clone.c" 3302# include "clone.c"
3303#endif
3304
3305/*****************************************************************************/
3306
3307static SV *
3308coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3309{
3310 SV *coro_sv;
3311 struct coro *coro;
3312 MAGIC *mg;
3313 HV *hv;
3314 SV *cb;
3315 int i;
3316
3317 if (argc > 0)
3318 {
3319 cb = s_get_cv_croak (argv [0]);
3320
3321 if (!is_coro)
3322 {
3323 if (CvISXSUB (cb))
3324 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3325
3326 if (!CvROOT (cb))
3327 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3328 }
3329 }
3330
3331 Newz (0, coro, 1, struct coro);
3332 coro->args = newAV ();
3333 coro->flags = CF_NEW;
3334
3335 if (coro_first) coro_first->prev = coro;
3336 coro->next = coro_first;
3337 coro_first = coro;
3338
3339 coro->hv = hv = newHV ();
3340 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3341 mg->mg_flags |= MGf_DUP;
3342 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3343
3344 if (argc > 0)
3345 {
3346 av_extend (coro->args, argc + is_coro - 1);
3347
3348 if (is_coro)
3349 {
3350 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3351 cb = (SV *)cv_coro_run;
3352 }
3353
3354 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3355
3356 for (i = 1; i < argc; i++)
3357 av_push (coro->args, newSVsv (argv [i]));
3358 }
3359
3360 return coro_sv;
3361}
3362
3363#ifndef __cplusplus
3364ecb_cold XS(boot_Coro__State);
3365#endif
3366
3367#if CORO_JIT
3368
3369static void ecb_noinline ecb_cold
3370pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3371{
3372 dSP;
3373 AV *av = newAV ();
3374
3375 av_store (av, 3, newSVuv (d));
3376 av_store (av, 2, newSVuv (c));
3377 av_store (av, 1, newSVuv (b));
3378 av_store (av, 0, newSVuv (a));
3379
3380 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3381
3382 PUTBACK;
3383}
3384
3385static void ecb_noinline ecb_cold
3386jit_init (pTHX)
3387{
3388 dSP;
3389 SV *load, *save;
3390 char *map_base;
3391 char *load_ptr, *save_ptr;
3392 STRLEN load_len, save_len, map_len;
3393 int count;
3394
3395 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3396
3397 PUSHMARK (SP);
3398#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3399# include "state.h"
3400#undef VARx
3401 count = call_pv ("Coro::State::_jit", G_ARRAY);
3402 SPAGAIN;
3403
3404 save = POPs; save_ptr = SvPVbyte (save, save_len);
3405 load = POPs; load_ptr = SvPVbyte (load, load_len);
3406
3407 map_len = load_len + save_len + 16;
3408
3409 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3410
3411 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3412
3413 load_perl_slots = (load_save_perl_slots_type)map_base;
3414 memcpy (map_base, load_ptr, load_len);
3415
3416 map_base += (load_len + 15) & ~15;
3417
3418 save_perl_slots = (load_save_perl_slots_type)map_base;
3419 memcpy (map_base, save_ptr, save_len);
3420
3421 /* we are good citizens and try to make the page read-only, so the evil evil */
3422 /* hackers might have it a bit more difficult */
3423 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3424
3425 PUTBACK;
3426 eval_pv ("undef &Coro::State::_jit", 1);
3427}
3428
2775#endif 3429#endif
2776 3430
2777MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3431MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2778 3432
2779PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
… …
2784# if CORO_PTHREAD 3438# if CORO_PTHREAD
2785 coro_thx = PERL_GET_CONTEXT; 3439 coro_thx = PERL_GET_CONTEXT;
2786# endif 3440# endif
2787#endif 3441#endif
2788 BOOT_PAGESIZE; 3442 BOOT_PAGESIZE;
3443
3444 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV;
3449 ERRSV;
2789 3450
2790 cctx_current = cctx_new_empty (); 3451 cctx_current = cctx_new_empty ();
2791 3452
2792 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2793 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2833 coroapi.prepare_nop = prepare_nop; 3494 coroapi.prepare_nop = prepare_nop;
2834 coroapi.prepare_schedule = prepare_schedule; 3495 coroapi.prepare_schedule = prepare_schedule;
2835 coroapi.prepare_cede = prepare_cede; 3496 coroapi.prepare_cede = prepare_cede;
2836 coroapi.prepare_cede_notself = prepare_cede_notself; 3497 coroapi.prepare_cede_notself = prepare_cede_notself;
2837 3498
2838 { 3499 time_init (aTHX);
2839 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2840 3500
2841 if (!svp) croak ("Time::HiRes is required");
2842 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2843
2844 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2845 }
2846
2847 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3501 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3502#if CORO_JIT
3503 PUTBACK;
3504 jit_init (aTHX);
3505 SPAGAIN;
3506#endif
2848} 3507}
2849 3508
2850SV * 3509SV *
2851new (char *klass, ...) 3510new (SV *klass, ...)
2852 ALIAS: 3511 ALIAS:
2853 Coro::new = 1 3512 Coro::new = 1
2854 CODE: 3513 CODE:
2855{ 3514 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2856 struct coro *coro; 3515 OUTPUT:
2857 MAGIC *mg;
2858 HV *hv;
2859 CV *cb;
2860 int i;
2861
2862 if (items > 1)
2863 {
2864 cb = coro_sv_2cv (aTHX_ ST (1));
2865
2866 if (!ix)
2867 {
2868 if (CvISXSUB (cb))
2869 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2870
2871 if (!CvROOT (cb))
2872 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2873 }
2874 }
2875
2876 Newz (0, coro, 1, struct coro);
2877 coro->args = newAV ();
2878 coro->flags = CF_NEW;
2879
2880 if (coro_first) coro_first->prev = coro;
2881 coro->next = coro_first;
2882 coro_first = coro;
2883
2884 coro->hv = hv = newHV ();
2885 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2886 mg->mg_flags |= MGf_DUP;
2887 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2888
2889 if (items > 1)
2890 {
2891 av_extend (coro->args, items - 1 + ix - 1);
2892
2893 if (ix)
2894 {
2895 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2896 cb = cv_coro_run;
2897 }
2898
2899 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2900
2901 for (i = 2; i < items; i++)
2902 av_push (coro->args, newSVsv (ST (i)));
2903 }
2904}
2905 OUTPUT:
2906 RETVAL 3516 RETVAL
2907 3517
2908void 3518void
2909transfer (...) 3519transfer (...)
2910 PROTOTYPE: $$ 3520 PROTOTYPE: $$
2911 CODE: 3521 CODE:
2912 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3522 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2913
2914bool
2915_destroy (SV *coro_sv)
2916 CODE:
2917 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2918 OUTPUT:
2919 RETVAL
2920 3523
2921void 3524void
2922_exit (int code) 3525_exit (int code)
2923 PROTOTYPE: $ 3526 PROTOTYPE: $
2924 CODE: 3527 CODE:
… …
2999 eval = 1 3602 eval = 1
3000 CODE: 3603 CODE:
3001{ 3604{
3002 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3605 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3003 { 3606 {
3004 struct coro temp; 3607 struct coro *current = SvSTATE_current;
3608 struct CoroSLF slf_save;
3005 3609
3006 if (!(coro->flags & CF_RUNNING)) 3610 if (current != coro)
3007 { 3611 {
3008 PUTBACK; 3612 PUTBACK;
3009 save_perl (aTHX_ &temp); 3613 save_perl (aTHX_ current);
3010 load_perl (aTHX_ coro); 3614 load_perl (aTHX_ coro);
3615 /* the coro is most likely in an active SLF call.
3616 * while not strictly required (the code we execute is
3617 * not allowed to call any SLF functions), it's cleaner
3618 * to reinitialise the slf_frame and restore it later.
3619 * This might one day allow us to actually do SLF calls
3620 * from code executed here.
3621 */
3622 slf_save = slf_frame;
3623 slf_frame.prepare = 0;
3624 SPAGAIN;
3011 } 3625 }
3012 3626
3013 {
3014 dSP;
3015 ENTER;
3016 SAVETMPS;
3017 PUTBACK;
3018 PUSHSTACK; 3627 PUSHSTACK;
3628
3019 PUSHMARK (SP); 3629 PUSHMARK (SP);
3630 PUTBACK;
3020 3631
3021 if (ix) 3632 if (ix)
3022 eval_sv (coderef, 0); 3633 eval_sv (coderef, 0);
3023 else 3634 else
3024 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3635 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3025 3636
3026 POPSTACK; 3637 POPSTACK;
3027 SPAGAIN; 3638 SPAGAIN;
3028 FREETMPS;
3029 LEAVE;
3030 PUTBACK;
3031 }
3032 3639
3033 if (!(coro->flags & CF_RUNNING)) 3640 if (current != coro)
3034 { 3641 {
3642 PUTBACK;
3643 slf_frame = slf_save;
3035 save_perl (aTHX_ coro); 3644 save_perl (aTHX_ coro);
3036 load_perl (aTHX_ &temp); 3645 load_perl (aTHX_ current);
3037 SPAGAIN; 3646 SPAGAIN;
3038 } 3647 }
3039 } 3648 }
3040} 3649}
3041 3650
… …
3044 PROTOTYPE: $ 3653 PROTOTYPE: $
3045 ALIAS: 3654 ALIAS:
3046 is_ready = CF_READY 3655 is_ready = CF_READY
3047 is_running = CF_RUNNING 3656 is_running = CF_RUNNING
3048 is_new = CF_NEW 3657 is_new = CF_NEW
3049 is_destroyed = CF_DESTROYED 3658 is_destroyed = CF_ZOMBIE
3659 is_zombie = CF_ZOMBIE
3660 is_suspended = CF_SUSPENDED
3050 CODE: 3661 CODE:
3051 RETVAL = boolSV (coro->flags & ix); 3662 RETVAL = boolSV (coro->flags & ix);
3052 OUTPUT: 3663 OUTPUT:
3053 RETVAL 3664 RETVAL
3054 3665
3055void 3666void
3056throw (Coro::State self, SV *throw = &PL_sv_undef) 3667throw (Coro::State self, SV *exception = &PL_sv_undef)
3057 PROTOTYPE: $;$ 3668 PROTOTYPE: $;$
3058 CODE: 3669 CODE:
3059{ 3670{
3060 struct coro *current = SvSTATE_current; 3671 struct coro *current = SvSTATE_current;
3061 SV **throwp = self == current ? &CORO_THROW : &self->except; 3672 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3062 SvREFCNT_dec (*throwp); 3673 SvREFCNT_dec (*exceptionp);
3063 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3674 SvGETMAGIC (exception);
3675 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3064} 3676}
3065 3677
3066void 3678void
3067api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3679api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3068 PROTOTYPE: $;$ 3680 PROTOTYPE: $;$
… …
3119 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3731 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3120 3732
3121 SV *tmp = *src; *src = *dst; *dst = tmp; 3733 SV *tmp = *src; *src = *dst; *dst = tmp;
3122 } 3734 }
3123 3735
3736void
3737cancel (Coro::State self)
3738 CODE:
3739 coro_state_destroy (aTHX_ self);
3740
3741SV *
3742enable_times (int enabled = enable_times)
3743 CODE:
3744{
3745 RETVAL = boolSV (enable_times);
3746
3747 if (enabled != enable_times)
3748 {
3749 enable_times = enabled;
3750
3751 coro_times_update ();
3752 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3753 }
3754}
3755 OUTPUT:
3756 RETVAL
3757
3758void
3759times (Coro::State self)
3760 PPCODE:
3761{
3762 struct coro *current = SvSTATE (coro_current);
3763
3764 if (ecb_expect_false (current == self))
3765 {
3766 coro_times_update ();
3767 coro_times_add (SvSTATE (coro_current));
3768 }
3769
3770 EXTEND (SP, 2);
3771 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3772 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3773
3774 if (ecb_expect_false (current == self))
3775 coro_times_sub (SvSTATE (coro_current));
3776}
3777
3778void
3779swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3780 CODE:
3781{
3782 struct coro *current = SvSTATE_current;
3783
3784 if (current == coro)
3785 SWAP_SVS (current);
3786
3787 if (!coro->swap_sv)
3788 coro->swap_sv = newAV ();
3789
3790 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3791 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3792
3793 if (current == coro)
3794 SWAP_SVS (current);
3795}
3796
3124 3797
3125MODULE = Coro::State PACKAGE = Coro 3798MODULE = Coro::State PACKAGE = Coro
3126 3799
3127BOOT: 3800BOOT:
3128{ 3801{
3129 int i;
3130
3131 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3802 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3132 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3803 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3133 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3804 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3134 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3135 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3805 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3136 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3806 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3137 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3807 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3138 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3808 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3139 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3809 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3140 3810
3141 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3811 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3142 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3812 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3143 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3813 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3144 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3814 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3145 3815
3146 coro_stash = gv_stashpv ("Coro", TRUE); 3816 coro_stash = gv_stashpv ("Coro", TRUE);
3147 3817
3148 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3149 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3150 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3151 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3821 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3152 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3822 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3153 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3823 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3154
3155 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3156 coro_ready[i] = newAV ();
3157 3824
3158 { 3825 {
3159 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3826 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3160 3827
3161 coroapi.schedule = api_schedule; 3828 coroapi.schedule = api_schedule;
… …
3171 sv_setiv (sv, (IV)&coroapi); 3838 sv_setiv (sv, (IV)&coroapi);
3172 SvREADONLY_on (sv); 3839 SvREADONLY_on (sv);
3173 } 3840 }
3174} 3841}
3175 3842
3843SV *
3844async (...)
3845 PROTOTYPE: &@
3846 CODE:
3847 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3848 api_ready (aTHX_ RETVAL);
3849 OUTPUT:
3850 RETVAL
3851
3852void
3853_destroy (Coro::State coro)
3854 CODE:
3855 /* used by the manager thread */
3856 coro_state_destroy (aTHX_ coro);
3857
3858void
3859on_destroy (Coro::State coro, SV *cb)
3860 CODE:
3861 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3862
3863void
3864join (...)
3865 CODE:
3866 CORO_EXECUTE_SLF_XS (slf_init_join);
3867
3176void 3868void
3177terminate (...) 3869terminate (...)
3178 CODE: 3870 CODE:
3179 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3871 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3180 3872
3181void 3873void
3874cancel (...)
3875 CODE:
3876 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3877
3878int
3879safe_cancel (Coro::State self, ...)
3880 C_ARGS: aTHX_ self, &ST (1), items - 1
3881
3882void
3182schedule (...) 3883schedule (...)
3183 CODE: 3884 CODE:
3184 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3885 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3185 3886
3186void 3887void
… …
3200 3901
3201void 3902void
3202cede_notself (...) 3903cede_notself (...)
3203 CODE: 3904 CODE:
3204 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3905 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3205
3206void
3207_cancel (Coro::State self)
3208 CODE:
3209 coro_state_destroy (aTHX_ self);
3210 coro_call_on_destroy (aTHX_ self);
3211 3906
3212void 3907void
3213_set_current (SV *current) 3908_set_current (SV *current)
3214 PROTOTYPE: $ 3909 PROTOTYPE: $
3215 CODE: 3910 CODE:
… …
3219void 3914void
3220_set_readyhook (SV *hook) 3915_set_readyhook (SV *hook)
3221 PROTOTYPE: $ 3916 PROTOTYPE: $
3222 CODE: 3917 CODE:
3223 SvREFCNT_dec (coro_readyhook); 3918 SvREFCNT_dec (coro_readyhook);
3919 SvGETMAGIC (hook);
3920 if (SvOK (hook))
3921 {
3224 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3922 coro_readyhook = newSVsv (hook);
3923 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3924 }
3925 else
3926 {
3927 coro_readyhook = 0;
3928 CORO_READYHOOK = 0;
3929 }
3225 3930
3226int 3931int
3227prio (Coro::State coro, int newprio = 0) 3932prio (Coro::State coro, int newprio = 0)
3228 PROTOTYPE: $;$ 3933 PROTOTYPE: $;$
3229 ALIAS: 3934 ALIAS:
… …
3235 if (items > 1) 3940 if (items > 1)
3236 { 3941 {
3237 if (ix) 3942 if (ix)
3238 newprio = coro->prio - newprio; 3943 newprio = coro->prio - newprio;
3239 3944
3240 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3945 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3241 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3946 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3242 3947
3243 coro->prio = newprio; 3948 coro->prio = newprio;
3244 } 3949 }
3245} 3950}
3246 OUTPUT: 3951 OUTPUT:
… …
3261 RETVAL = coro_nready; 3966 RETVAL = coro_nready;
3262 OUTPUT: 3967 OUTPUT:
3263 RETVAL 3968 RETVAL
3264 3969
3265void 3970void
3971suspend (Coro::State self)
3972 PROTOTYPE: $
3973 CODE:
3974 self->flags |= CF_SUSPENDED;
3975
3976void
3977resume (Coro::State self)
3978 PROTOTYPE: $
3979 CODE:
3980 self->flags &= ~CF_SUSPENDED;
3981
3982void
3266_pool_handler (...) 3983_pool_handler (...)
3267 CODE: 3984 CODE:
3268 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3985 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3269 3986
3270void 3987void
… …
3281 for (i = 1; i < items; ++i) 3998 for (i = 1; i < items; ++i)
3282 av_push (av, SvREFCNT_inc_NN (ST (i))); 3999 av_push (av, SvREFCNT_inc_NN (ST (i)));
3283 4000
3284 if ((SV *)hv == &PL_sv_undef) 4001 if ((SV *)hv == &PL_sv_undef)
3285 { 4002 {
3286 PUSHMARK (SP); 4003 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3287 EXTEND (SP, 2);
3288 PUSHs (sv_Coro);
3289 PUSHs ((SV *)cv_pool_handler);
3290 PUTBACK;
3291 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3292 SPAGAIN;
3293
3294 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4004 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4005 SvREFCNT_dec (sv);
3295 } 4006 }
3296 4007
3297 { 4008 {
3298 struct coro *coro = SvSTATE_hv (hv); 4009 struct coro *coro = SvSTATE_hv (hv);
3299 4010
… …
3323rouse_wait (...) 4034rouse_wait (...)
3324 PROTOTYPE: ;$ 4035 PROTOTYPE: ;$
3325 PPCODE: 4036 PPCODE:
3326 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4037 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3327 4038
4039void
4040on_enter (SV *block)
4041 ALIAS:
4042 on_leave = 1
4043 PROTOTYPE: &
4044 CODE:
4045{
4046 struct coro *coro = SvSTATE_current;
4047 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4048
4049 block = s_get_cv_croak (block);
4050
4051 if (!*avp)
4052 *avp = newAV ();
4053
4054 av_push (*avp, SvREFCNT_inc (block));
4055
4056 if (!ix)
4057 on_enterleave_call (aTHX_ block);
4058
4059 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4060 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4061 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4062}
4063
3328 4064
3329MODULE = Coro::State PACKAGE = PerlIO::cede 4065MODULE = Coro::State PACKAGE = PerlIO::cede
3330 4066
3331BOOT: 4067BOOT:
3332 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4068 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3335MODULE = Coro::State PACKAGE = Coro::Semaphore 4071MODULE = Coro::State PACKAGE = Coro::Semaphore
3336 4072
3337SV * 4073SV *
3338new (SV *klass, SV *count = 0) 4074new (SV *klass, SV *count = 0)
3339 CODE: 4075 CODE:
4076{
4077 int semcnt = 1;
4078
4079 if (count)
4080 {
4081 SvGETMAGIC (count);
4082
4083 if (SvOK (count))
4084 semcnt = SvIV (count);
4085 }
4086
3340 RETVAL = sv_bless ( 4087 RETVAL = sv_bless (
3341 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4088 coro_waitarray_new (aTHX_ semcnt),
3342 GvSTASH (CvGV (cv)) 4089 GvSTASH (CvGV (cv))
3343 ); 4090 );
4091}
3344 OUTPUT: 4092 OUTPUT:
3345 RETVAL 4093 RETVAL
3346 4094
3347# helper for Coro::Channel 4095# helper for Coro::Channel and others
3348SV * 4096SV *
3349_alloc (int count) 4097_alloc (int count)
3350 CODE: 4098 CODE:
3351 RETVAL = coro_waitarray_new (aTHX_ count); 4099 RETVAL = coro_waitarray_new (aTHX_ count);
3352 OUTPUT: 4100 OUTPUT:
… …
3410 for (i = 1; i <= wcount; ++i) 4158 for (i = 1; i <= wcount; ++i)
3411 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4159 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3412 } 4160 }
3413} 4161}
3414 4162
4163MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4164
4165void
4166_may_delete (SV *sem, int count, unsigned int extra_refs)
4167 PPCODE:
4168{
4169 AV *av = (AV *)SvRV (sem);
4170
4171 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4172 && AvFILLp (av) == 0 /* no waiters, just count */
4173 && SvIV (AvARRAY (av)[0]) == count)
4174 XSRETURN_YES;
4175
4176 XSRETURN_NO;
4177}
4178
3415MODULE = Coro::State PACKAGE = Coro::Signal 4179MODULE = Coro::State PACKAGE = Coro::Signal
3416 4180
3417SV * 4181SV *
3418new (SV *klass) 4182new (SV *klass)
3419 CODE: 4183 CODE:
… …
3490 4254
3491void 4255void
3492_register (char *target, char *proto, SV *req) 4256_register (char *target, char *proto, SV *req)
3493 CODE: 4257 CODE:
3494{ 4258{
3495 CV *req_cv = coro_sv_2cv (aTHX_ req); 4259 SV *req_cv = s_get_cv_croak (req);
3496 /* newXSproto doesn't return the CV on 5.8 */ 4260 /* newXSproto doesn't return the CV on 5.8 */
3497 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4261 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3498 sv_setpv ((SV *)slf_cv, proto); 4262 sv_setpv ((SV *)slf_cv, proto);
3499 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4263 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3500} 4264}
3501 4265
4266MODULE = Coro::State PACKAGE = Coro::Select
4267
4268void
4269patch_pp_sselect ()
4270 CODE:
4271 if (!coro_old_pp_sselect)
4272 {
4273 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4274 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4275 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4276 }
4277
4278void
4279unpatch_pp_sselect ()
4280 CODE:
4281 if (coro_old_pp_sselect)
4282 {
4283 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4284 coro_old_pp_sselect = 0;
4285 }
4286

Diff Legend

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