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.312 by root, Thu Nov 20 03:10:30 2008 UTC vs.
Revision 1.419 by root, Mon Feb 20 08:13:25 2012 UTC

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

Diff Legend

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