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.316 by root, Thu Nov 20 06:01:40 2008 UTC vs.
Revision 1.409 by root, Sun Jun 12 04:29:15 2011 UTC

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

Diff Legend

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