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.322 by root, Sat Nov 22 05:13:34 2008 UTC vs.
Revision 1.415 by root, Tue Aug 30 07:48:53 2011 UTC

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

Diff Legend

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