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

Diff Legend

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