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.363 by root, Tue Jul 14 00:55:10 2009 UTC vs.
Revision 1.422 by root, Sat Oct 6 21:25:24 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
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 "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
57# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
58#endif 74#endif
59 75
60#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
76# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
77#endif 93#endif
78 94
79#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
80 96
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 97#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
98 99
99#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
100# if CORO_PTHREAD 101# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 117static void (*u2time)(pTHX_ UV ret[2]);
117 118
118/* we hijack an hopefully unused CV flag for our purposes */ 119/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 120#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 121static OP *pp_slf (pTHX);
122static void slf_destroy (pTHX_ struct coro *coro);
121 123
122static U32 cctx_gen; 124static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 125static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 126static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 127static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 144static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 145static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 146static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 147static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 148static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 149
149/* Coro::AnyEvent */ 150/* Coro::AnyEvent */
150static SV *sv_activity; 151static SV *sv_activity;
151 152
152/* enable processtime/realtime profiling */ 153/* enable processtime/realtime profiling */
… …
156static char times_valid; 157static char times_valid;
157 158
158static struct coro_cctx *cctx_first; 159static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 160static int cctx_count, cctx_idle;
160 161
161enum { 162enum
163{
162 CC_MAPPED = 0x01, 164 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 165 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 166 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 167 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 168 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176 void *sptr; 178 void *sptr;
177 size_t ssize; 179 size_t ssize;
178 180
179 /* cpu state */ 181 /* cpu state */
180 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG
181 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 184 JMPENV *idle_te; /* same as idle_sp, but for top_env */
185#endif
182 JMPENV *top_env; 186 JMPENV *top_env;
183 coro_context cctx; 187 coro_context cctx;
184 188
185 U32 gen; 189 U32 gen;
186#if CORO_USE_VALGRIND 190#if CORO_USE_VALGRIND
187 int valgrind_id; 191 int valgrind_id;
188#endif 192#endif
189 unsigned char flags; 193 unsigned char flags;
190} coro_cctx; 194} coro_cctx;
191 195
192coro_cctx *cctx_current; /* the currently running cctx */ 196static coro_cctx *cctx_current; /* the currently running cctx */
193 197
194/*****************************************************************************/ 198/*****************************************************************************/
195 199
200static MGVTBL coro_state_vtbl;
201
196enum { 202enum
203{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 204 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 205 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 206 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 207 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 208 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
209 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 210};
203 211
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 213typedef struct
206{ 214{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 215 #define VARx(name,expr,type) type name;
213# include "state.h" 216 #include "state.h"
214#undef VAR
215} perl_slots; 217} perl_slots;
216 218
219/* how many context stack entries do we need for perl_slots */
217#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 221
219/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
220struct coro { 223struct coro
224{
221 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 226 coro_cctx *cctx;
223 227
224 /* ready queue */ 228 /* ready queue */
225 struct coro *next_ready; 229 struct coro *next_ready;
… …
227 /* state data */ 231 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 233 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
231 235
232 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 240
239 /* statistics */ 241 /* statistics */
240 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
241 243
242 /* coro process data */ 244 /* coro process data */
243 int prio; 245 int prio;
244 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
246 250
247 /* async_pool */ 251 /* async_pool */
248 SV *saved_deffh; 252 SV *saved_deffh;
249 SV *invoke_cb; 253 SV *invoke_cb;
250 AV *invoke_av; 254 AV *invoke_av;
251 255
252 /* on_enter/on_leave */ 256 /* on_enter/on_leave */
253 AV *on_enter; 257 AV *on_enter;
254 AV *on_leave; 258 AV *on_leave;
255 259
260 /* swap_sv */
261 AV *swap_sv;
262
256 /* times */ 263 /* times */
257 coro_ts t_cpu, t_real; 264 coro_ts t_cpu, t_real;
258 265
259 /* linked list */ 266 /* linked list */
260 struct coro *next, *prev; 267 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
265 272
266/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
270 277
271/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
272 279
273#define CORO_PRIO_MAX 3 280#define CORO_PRIO_MAX 3
… …
279 286
280/* for Coro.pm */ 287/* for Coro.pm */
281static SV *coro_current; 288static SV *coro_current;
282static SV *coro_readyhook; 289static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
285static struct coro *coro_first; 292static struct coro *coro_first;
286#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
287 294
295/** JIT *********************************************************************/
296
297#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix"
305 #endif
306 #endif
307#endif
308
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
310 #undef CORO_JIT
311#endif
312
313#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *);
315 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
316#endif
317
318/** Coro::Select ************************************************************/
319
320static OP *(*coro_old_pp_sselect) (pTHX);
321static SV *coro_select_select;
322
323/* horrible hack, but if it works... */
324static OP *
325coro_pp_sselect (pTHX)
326{
327 dSP;
328 PUSHMARK (SP - 4); /* fake argument list */
329 XPUSHs (coro_select_select);
330 PUTBACK;
331
332 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
333 PL_op->op_flags |= OPf_STACKED;
334 PL_op->op_private = 0;
335 return PL_ppaddr [OP_ENTERSUB](aTHX);
336}
337
338/** time stuff **************************************************************/
339
340#ifdef HAS_GETTIMEOFDAY
341
342ecb_inline void
343coro_u2time (pTHX_ UV ret[2])
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 ret [0] = tv.tv_sec;
349 ret [1] = tv.tv_usec;
350}
351
352ecb_inline double
353coro_nvtime (void)
354{
355 struct timeval tv;
356 gettimeofday (&tv, 0);
357
358 return tv.tv_sec + tv.tv_usec * 1e-6;
359}
360
361ecb_inline void
362time_init (pTHX)
363{
364 nvtime = coro_nvtime;
365 u2time = coro_u2time;
366}
367
368#else
369
370ecb_inline void
371time_init (pTHX)
372{
373 SV **svp;
374
375 require_pv ("Time/HiRes.pm");
376
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
381
382 nvtime = INT2PTR (double (*)(), SvIV (*svp));
383
384 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
385 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
386}
387
388#endif
389
288/** lowlevel stuff **********************************************************/ 390/** lowlevel stuff **********************************************************/
289 391
290static SV * 392static SV * ecb_noinline
291coro_get_sv (pTHX_ const char *name, int create) 393coro_get_sv (pTHX_ const char *name, int create)
292{ 394{
293#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
295 get_sv (name, create); 397 get_sv (name, create);
296#endif 398#endif
297 return get_sv (name, create); 399 return get_sv (name, create);
298} 400}
299 401
300static AV * 402static AV * ecb_noinline
301coro_get_av (pTHX_ const char *name, int create) 403coro_get_av (pTHX_ const char *name, int create)
302{ 404{
303#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
305 get_av (name, create); 407 get_av (name, create);
306#endif 408#endif
307 return get_av (name, create); 409 return get_av (name, create);
308} 410}
309 411
310static HV * 412static HV * ecb_noinline
311coro_get_hv (pTHX_ const char *name, int create) 413coro_get_hv (pTHX_ const char *name, int create)
312{ 414{
313#if PERL_VERSION_ATLEAST (5,10,0) 415#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 416 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_hv (name, create); 417 get_hv (name, create);
316#endif 418#endif
317 return get_hv (name, create); 419 return get_hv (name, create);
318} 420}
319 421
320INLINE void 422ecb_inline void
321coro_times_update () 423coro_times_update (void)
322{ 424{
323#ifdef coro_clock_gettime 425#ifdef coro_clock_gettime
324 struct timespec ts; 426 struct timespec ts;
325 427
326 ts.tv_sec = ts.tv_nsec = 0; 428 ts.tv_sec = ts.tv_nsec = 0;
… …
338 time_real [0] = tv [0]; 440 time_real [0] = tv [0];
339 time_real [1] = tv [1] * 1000; 441 time_real [1] = tv [1] * 1000;
340#endif 442#endif
341} 443}
342 444
343INLINE void 445ecb_inline void
344coro_times_add (struct coro *c) 446coro_times_add (struct coro *c)
345{ 447{
346 c->t_real [1] += time_real [1]; 448 c->t_real [1] += time_real [1];
347 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 449 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
348 c->t_real [0] += time_real [0]; 450 c->t_real [0] += time_real [0];
… …
350 c->t_cpu [1] += time_cpu [1]; 452 c->t_cpu [1] += time_cpu [1];
351 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 453 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
352 c->t_cpu [0] += time_cpu [0]; 454 c->t_cpu [0] += time_cpu [0];
353} 455}
354 456
355INLINE void 457ecb_inline void
356coro_times_sub (struct coro *c) 458coro_times_sub (struct coro *c)
357{ 459{
358 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 460 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
359 c->t_real [1] -= time_real [1]; 461 c->t_real [1] -= time_real [1];
360 c->t_real [0] -= time_real [0]; 462 c->t_real [0] -= time_real [0];
… …
368/* magic glue */ 470/* magic glue */
369 471
370#define CORO_MAGIC_type_cv 26 472#define CORO_MAGIC_type_cv 26
371#define CORO_MAGIC_type_state PERL_MAGIC_ext 473#define CORO_MAGIC_type_state PERL_MAGIC_ext
372 474
373#define CORO_MAGIC_NN(sv, type) \ 475#define CORO_MAGIC_NN(sv, type) \
374 (expect_true (SvMAGIC (sv)->mg_type == type) \ 476 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
375 ? SvMAGIC (sv) \ 477 ? SvMAGIC (sv) \
376 : mg_find (sv, type)) 478 : mg_find (sv, type))
377 479
378#define CORO_MAGIC(sv, type) \ 480#define CORO_MAGIC(sv, type) \
379 (expect_true (SvMAGIC (sv)) \ 481 (ecb_expect_true (SvMAGIC (sv)) \
380 ? CORO_MAGIC_NN (sv, type) \ 482 ? CORO_MAGIC_NN (sv, type) \
381 : 0) 483 : 0)
382 484
383#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 485#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
384#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 486#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
385 487
386INLINE struct coro * 488ecb_inline MAGIC *
489SvSTATEhv_p (pTHX_ SV *coro)
490{
491 MAGIC *mg;
492
493 if (ecb_expect_true (
494 SvTYPE (coro) == SVt_PVHV
495 && (mg = CORO_MAGIC_state (coro))
496 && mg->mg_virtual == &coro_state_vtbl
497 ))
498 return mg;
499
500 return 0;
501}
502
503ecb_inline struct coro *
387SvSTATE_ (pTHX_ SV *coro) 504SvSTATE_ (pTHX_ SV *coro)
388{ 505{
389 HV *stash;
390 MAGIC *mg; 506 MAGIC *mg;
391 507
392 if (SvROK (coro)) 508 if (SvROK (coro))
393 coro = SvRV (coro); 509 coro = SvRV (coro);
394 510
395 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 511 mg = SvSTATEhv_p (aTHX_ coro);
512 if (!mg)
396 croak ("Coro::State object required"); 513 croak ("Coro::State object required");
397 514
398 stash = SvSTASH (coro);
399 if (expect_false (stash != coro_stash && stash != coro_state_stash))
400 {
401 /* very slow, but rare, check */
402 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
403 croak ("Coro::State object required");
404 }
405
406 mg = CORO_MAGIC_state (coro);
407 return (struct coro *)mg->mg_ptr; 515 return (struct coro *)mg->mg_ptr;
408} 516}
409 517
410#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 518#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
411 519
… …
414#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
415 523
416/*****************************************************************************/ 524/*****************************************************************************/
417/* padlist management and caching */ 525/* padlist management and caching */
418 526
419static AV * 527ecb_inline AV *
420coro_derive_padlist (pTHX_ CV *cv) 528coro_derive_padlist (pTHX_ CV *cv)
421{ 529{
422 AV *padlist = CvPADLIST (cv); 530 AV *padlist = CvPADLIST (cv);
423 AV *newpadlist, *newpad; 531 AV *newpadlist, *newpad;
424 532
… …
436 av_store (newpadlist, 1, (SV *)newpad); 544 av_store (newpadlist, 1, (SV *)newpad);
437 545
438 return newpadlist; 546 return newpadlist;
439} 547}
440 548
441static void 549ecb_inline void
442free_padlist (pTHX_ AV *padlist) 550free_padlist (pTHX_ AV *padlist)
443{ 551{
444 /* may be during global destruction */ 552 /* may be during global destruction */
445 if (!IN_DESTRUCT) 553 if (!IN_DESTRUCT)
446 { 554 {
… …
489 0, 0, 0, 0, 597 0, 0, 0, 0,
490 coro_cv_free 598 coro_cv_free
491}; 599};
492 600
493/* the next two functions merely cache the padlists */ 601/* the next two functions merely cache the padlists */
494static void 602ecb_inline void
495get_padlist (pTHX_ CV *cv) 603get_padlist (pTHX_ CV *cv)
496{ 604{
497 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
498 AV *av; 606 AV *av;
499 607
500 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
501 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
502 else 610 else
503 { 611 {
504#if CORO_PREFER_PERL_FUNCTIONS 612#if CORO_PREFER_PERL_FUNCTIONS
505 /* this is probably cleaner? but also slower! */ 613 /* this is probably cleaner? but also slower! */
… …
512 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 620 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
513#endif 621#endif
514 } 622 }
515} 623}
516 624
517static void 625ecb_inline void
518put_padlist (pTHX_ CV *cv) 626put_padlist (pTHX_ CV *cv)
519{ 627{
520 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
521 AV *av; 629 AV *av;
522 630
523 if (expect_false (!mg)) 631 if (ecb_expect_false (!mg))
524 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
525 633
526 av = (AV *)mg->mg_obj; 634 av = (AV *)mg->mg_obj;
527 635
528 if (expect_false (AvFILLp (av) >= AvMAX (av))) 636 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
529 av_extend (av, AvFILLp (av) + 1); 637 av_extend (av, AvFILLp (av) + 1);
530 638
531 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 639 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
532} 640}
533 641
534/** load & save, init *******************************************************/ 642/** load & save, init *******************************************************/
643
644ecb_inline void
645swap_sv (SV *a, SV *b)
646{
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 and later complicates this _quite_ a bit, but it also
660 * is much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680}
681
682/* swap sv heads, at least logically */
683static void
684swap_svs (pTHX_ Coro__State c)
685{
686 int i;
687
688 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
689 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
690}
691
692#define SWAP_SVS(coro) \
693 if (ecb_expect_false ((coro)->swap_sv)) \
694 swap_svs (aTHX_ (coro))
535 695
536static void 696static void
537on_enterleave_call (pTHX_ SV *cb); 697on_enterleave_call (pTHX_ SV *cb);
538 698
539static void 699static void
… …
542 perl_slots *slot = c->slot; 702 perl_slots *slot = c->slot;
543 c->slot = 0; 703 c->slot = 0;
544 704
545 PL_mainstack = c->mainstack; 705 PL_mainstack = c->mainstack;
546 706
547 GvSV (PL_defgv) = slot->defsv; 707#if CORO_JIT
548 GvAV (PL_defgv) = slot->defav; 708 load_perl_slots (slot);
549 GvSV (PL_errgv) = slot->errsv; 709#else
550 GvSV (irsgv) = slot->irsgv;
551 GvHV (PL_hintgv) = slot->hinthv;
552
553 #define VAR(name,type) PL_ ## name = slot->name; 710 #define VARx(name,expr,type) expr = slot->name;
554 # include "state.h" 711 #include "state.h"
555 #undef VAR 712#endif
556 713
557 { 714 {
558 dSP; 715 dSP;
559 716
560 CV *cv; 717 CV *cv;
561 718
562 /* now do the ugly restore mess */ 719 /* now do the ugly restore mess */
563 while (expect_true (cv = (CV *)POPs)) 720 while (ecb_expect_true (cv = (CV *)POPs))
564 { 721 {
565 put_padlist (aTHX_ cv); /* mark this padlist as available */ 722 put_padlist (aTHX_ cv); /* mark this padlist as available */
566 CvDEPTH (cv) = PTR2IV (POPs); 723 CvDEPTH (cv) = PTR2IV (POPs);
567 CvPADLIST (cv) = (AV *)POPs; 724 CvPADLIST (cv) = (AV *)POPs;
568 } 725 }
… …
571 } 728 }
572 729
573 slf_frame = c->slf_frame; 730 slf_frame = c->slf_frame;
574 CORO_THROW = c->except; 731 CORO_THROW = c->except;
575 732
576 if (expect_false (enable_times)) 733 if (ecb_expect_false (enable_times))
577 { 734 {
578 if (expect_false (!times_valid)) 735 if (ecb_expect_false (!times_valid))
579 coro_times_update (); 736 coro_times_update ();
580 737
581 coro_times_sub (c); 738 coro_times_sub (c);
582 } 739 }
583 740
584 if (expect_false (c->on_enter)) 741 if (ecb_expect_false (c->on_enter))
585 { 742 {
586 int i; 743 int i;
587 744
588 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 745 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
589 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 746 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
590 } 747 }
748
749 SWAP_SVS (c);
591} 750}
592 751
593static void 752static void
594save_perl (pTHX_ Coro__State c) 753save_perl (pTHX_ Coro__State c)
595{ 754{
755 SWAP_SVS (c);
756
596 if (expect_false (c->on_leave)) 757 if (ecb_expect_false (c->on_leave))
597 { 758 {
598 int i; 759 int i;
599 760
600 for (i = AvFILLp (c->on_leave); i >= 0; --i) 761 for (i = AvFILLp (c->on_leave); i >= 0; --i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 762 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
602 } 763 }
603 764
604 times_valid = 0; 765 times_valid = 0;
605 766
606 if (expect_false (enable_times)) 767 if (ecb_expect_false (enable_times))
607 { 768 {
608 coro_times_update (); times_valid = 1; 769 coro_times_update (); times_valid = 1;
609 coro_times_add (c); 770 coro_times_add (c);
610 } 771 }
611 772
… …
625 786
626 XPUSHs (Nullsv); 787 XPUSHs (Nullsv);
627 /* this loop was inspired by pp_caller */ 788 /* this loop was inspired by pp_caller */
628 for (;;) 789 for (;;)
629 { 790 {
630 while (expect_true (cxix >= 0)) 791 while (ecb_expect_true (cxix >= 0))
631 { 792 {
632 PERL_CONTEXT *cx = &ccstk[cxix--]; 793 PERL_CONTEXT *cx = &ccstk[cxix--];
633 794
634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 795 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
635 { 796 {
636 CV *cv = cx->blk_sub.cv; 797 CV *cv = cx->blk_sub.cv;
637 798
638 if (expect_true (CvDEPTH (cv))) 799 if (ecb_expect_true (CvDEPTH (cv)))
639 { 800 {
640 EXTEND (SP, 3); 801 EXTEND (SP, 3);
641 PUSHs ((SV *)CvPADLIST (cv)); 802 PUSHs ((SV *)CvPADLIST (cv));
642 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 803 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
643 PUSHs ((SV *)cv); 804 PUSHs ((SV *)cv);
… …
646 get_padlist (aTHX_ cv); 807 get_padlist (aTHX_ cv);
647 } 808 }
648 } 809 }
649 } 810 }
650 811
651 if (expect_true (top_si->si_type == PERLSI_MAIN)) 812 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
652 break; 813 break;
653 814
654 top_si = top_si->si_prev; 815 top_si = top_si->si_prev;
655 ccstk = top_si->si_cxstack; 816 ccstk = top_si->si_cxstack;
656 cxix = top_si->si_cxix; 817 cxix = top_si->si_cxix;
… …
658 819
659 PUTBACK; 820 PUTBACK;
660 } 821 }
661 822
662 /* allocate some space on the context stack for our purposes */ 823 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 824 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 825 {
668 unsigned int i; 826 unsigned int i;
827
669 for (i = 3; i < SLOT_COUNT; ++i) 828 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 829 CXINC;
671 } 830
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 831 cxstack_ix -= SLOT_COUNT; /* undo allocation */
832 }
673 833
674 c->mainstack = PL_mainstack; 834 c->mainstack = PL_mainstack;
675 835
676 { 836 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 837 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
678 838
679 slot->defav = GvAV (PL_defgv); 839#if CORO_JIT
680 slot->defsv = DEFSV; 840 save_perl_slots (slot);
681 slot->errsv = ERRSV; 841#else
682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
684
685 #define VAR(name,type) slot->name = PL_ ## name; 842 #define VARx(name,expr,type) slot->name = expr;
686 # include "state.h" 843 #include "state.h"
687 #undef VAR 844#endif
688 } 845 }
689} 846}
690 847
691/* 848/*
692 * allocate various perl stacks. This is almost an exact copy 849 * allocate various perl stacks. This is almost an exact copy
… …
698# define coro_init_stacks(thx) init_stacks () 855# define coro_init_stacks(thx) init_stacks ()
699#else 856#else
700static void 857static void
701coro_init_stacks (pTHX) 858coro_init_stacks (pTHX)
702{ 859{
703 PL_curstackinfo = new_stackinfo(32, 8); 860 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 861 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 862 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 863 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 864
708 PL_stack_base = AvARRAY(PL_curstack); 865 PL_stack_base = AvARRAY(PL_curstack);
… …
723#endif 880#endif
724 881
725 New(54,PL_scopestack,8,I32); 882 New(54,PL_scopestack,8,I32);
726 PL_scopestack_ix = 0; 883 PL_scopestack_ix = 0;
727 PL_scopestack_max = 8; 884 PL_scopestack_max = 8;
885#if HAS_SCOPESTACK_NAME
886 New(54,PL_scopestack_name,8,const char*);
887#endif
728 888
729 New(54,PL_savestack,24,ANY); 889 New(54,PL_savestack,24,ANY);
730 PL_savestack_ix = 0; 890 PL_savestack_ix = 0;
731 PL_savestack_max = 24; 891 PL_savestack_max = 24;
732 892
… …
760 } 920 }
761 921
762 Safefree (PL_tmps_stack); 922 Safefree (PL_tmps_stack);
763 Safefree (PL_markstack); 923 Safefree (PL_markstack);
764 Safefree (PL_scopestack); 924 Safefree (PL_scopestack);
925#if HAS_SCOPESTACK_NAME
926 Safefree (PL_scopestack_name);
927#endif
765 Safefree (PL_savestack); 928 Safefree (PL_savestack);
766#if !PERL_VERSION_ATLEAST (5,10,0) 929#if !PERL_VERSION_ATLEAST (5,10,0)
767 Safefree (PL_retstack); 930 Safefree (PL_retstack);
768#endif 931#endif
769} 932}
… …
815#endif 978#endif
816 979
817/* 980/*
818 * This overrides the default magic get method of %SIG elements. 981 * This overrides the default magic get method of %SIG elements.
819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 982 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
820 * and instead of trying to save and restore the hash elements, we just provide 983 * and instead of trying to save and restore the hash elements (extremely slow),
821 * readback here. 984 * we just provide our own readback here.
822 */ 985 */
823static int 986static int ecb_cold
824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 987coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
825{ 988{
826 const char *s = MgPV_nolen_const (mg); 989 const char *s = MgPV_nolen_const (mg);
827 990
828 if (*s == '_') 991 if (*s == '_')
… …
832 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
833 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
834 997
835 if (svp) 998 if (svp)
836 { 999 {
837 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1000 SV *ssv;
1001
1002 if (!*svp)
1003 ssv = &PL_sv_undef;
1004 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1005 ssv = sv_2mortal (newRV_inc (*svp));
1006 else
1007 ssv = *svp;
1008
1009 sv_setsv (sv, ssv);
838 return 0; 1010 return 0;
839 } 1011 }
840 } 1012 }
841 1013
842 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1014 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
843} 1015}
844 1016
845static int 1017static int ecb_cold
846coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1018coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
847{ 1019{
848 const char *s = MgPV_nolen_const (mg); 1020 const char *s = MgPV_nolen_const (mg);
849 1021
850 if (*s == '_') 1022 if (*s == '_')
… …
864 } 1036 }
865 1037
866 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
867} 1039}
868 1040
869static int 1041static int ecb_cold
870coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
871{ 1043{
872 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
873 1045
874 if (*s == '_') 1046 if (*s == '_')
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1079slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1080{
909 return 1; 1081 return 1;
910} 1082}
911 1083
912static UNOP coro_setup_op; 1084static UNOP init_perl_op;
913 1085
914static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1086ecb_noinline static void /* noinline to keep it out of the transfer fast path */
915coro_setup (pTHX_ struct coro *coro) 1087init_perl (pTHX_ struct coro *coro)
916{ 1088{
917 /* 1089 /*
918 * emulate part of the perl startup here. 1090 * emulate part of the perl startup here.
919 */ 1091 */
920 coro_init_stacks (aTHX); 1092 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1099 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1100 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1101 PL_curpm = 0;
930 PL_curpad = 0; 1102 PL_curpad = 0;
931 PL_localizing = 0; 1103 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1104 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1105#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1106 PL_parser = 0;
936#endif 1107#endif
937 PL_hints = 0; 1108 PL_hints = 0;
938 1109
939 /* recreate the die/warn hooks */ 1110 /* recreate the die/warn hooks */
940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1111 PL_diehook = SvREFCNT_inc (rv_diehook);
941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1112 PL_warnhook = SvREFCNT_inc (rv_warnhook);
942 1113
943 GvSV (PL_defgv) = newSV (0); 1114 GvSV (PL_defgv) = newSV (0);
944 GvAV (PL_defgv) = coro->args; coro->args = 0; 1115 GvAV (PL_defgv) = coro->args; coro->args = 0;
945 GvSV (PL_errgv) = newSV (0); 1116 GvSV (PL_errgv) = newSV (0);
946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
967 /* this newly created coroutine might be run on an existing cctx which most 1138 /* this newly created coroutine might be run on an existing cctx which most
968 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1139 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
969 */ 1140 */
970 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1141 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1142 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1143 slf_frame.destroy = 0;
972 1144
973 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1145 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
974 coro_setup_op.op_next = PL_op; 1146 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1147 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1148 init_perl_op.op_ppaddr = pp_slf;
977 /* no flags etc. required, as an init function won't be called */ 1149 /* no flags etc. required, as an init function won't be called */
978 1150
979 PL_op = (OP *)&coro_setup_op; 1151 PL_op = (OP *)&init_perl_op;
980 1152
981 /* copy throw, in case it was set before coro_setup */ 1153 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1154 CORO_THROW = coro->except;
983 1155
1156 SWAP_SVS (coro);
1157
984 if (expect_false (enable_times)) 1158 if (ecb_expect_false (enable_times))
985 { 1159 {
986 coro_times_update (); 1160 coro_times_update ();
987 coro_times_sub (coro); 1161 coro_times_sub (coro);
988 } 1162 }
989} 1163}
… …
1008 dounwind (-1); 1182 dounwind (-1);
1009 } 1183 }
1010} 1184}
1011 1185
1012static void 1186static void
1013coro_destruct_perl (pTHX_ struct coro *coro) 1187destroy_perl (pTHX_ struct coro *coro)
1014{ 1188{
1015 SV *svf [9]; 1189 SV *svf [9];
1016 1190
1017 { 1191 {
1192 SV *old_current = SvRV (coro_current);
1018 struct coro *current = SvSTATE_current; 1193 struct coro *current = SvSTATE (old_current);
1019 1194
1020 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1195 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1021 1196
1022 save_perl (aTHX_ current); 1197 save_perl (aTHX_ current);
1198
1199 /* this will cause transfer_check to croak on block*/
1200 SvRV_set (coro_current, (SV *)coro->hv);
1201
1023 load_perl (aTHX_ coro); 1202 load_perl (aTHX_ coro);
1024 1203
1025 coro_unwind_stacks (aTHX); 1204 coro_unwind_stacks (aTHX);
1205
1206 /* restore swapped sv's */
1207 SWAP_SVS (coro);
1208
1026 coro_destruct_stacks (aTHX); 1209 coro_destruct_stacks (aTHX);
1027 1210
1028 // now save some sv's to be free'd later 1211 /* now save some sv's to be free'd later */
1029 svf [0] = GvSV (PL_defgv); 1212 svf [0] = GvSV (PL_defgv);
1030 svf [1] = (SV *)GvAV (PL_defgv); 1213 svf [1] = (SV *)GvAV (PL_defgv);
1031 svf [2] = GvSV (PL_errgv); 1214 svf [2] = GvSV (PL_errgv);
1032 svf [3] = (SV *)PL_defoutgv; 1215 svf [3] = (SV *)PL_defoutgv;
1033 svf [4] = PL_rs; 1216 svf [4] = PL_rs;
… …
1035 svf [6] = (SV *)GvHV (PL_hintgv); 1218 svf [6] = (SV *)GvHV (PL_hintgv);
1036 svf [7] = PL_diehook; 1219 svf [7] = PL_diehook;
1037 svf [8] = PL_warnhook; 1220 svf [8] = PL_warnhook;
1038 assert (9 == sizeof (svf) / sizeof (*svf)); 1221 assert (9 == sizeof (svf) / sizeof (*svf));
1039 1222
1223 SvRV_set (coro_current, old_current);
1224
1040 load_perl (aTHX_ current); 1225 load_perl (aTHX_ current);
1041 } 1226 }
1042 1227
1043 { 1228 {
1044 unsigned int i; 1229 unsigned int i;
… …
1051 SvREFCNT_dec (coro->invoke_cb); 1236 SvREFCNT_dec (coro->invoke_cb);
1052 SvREFCNT_dec (coro->invoke_av); 1237 SvREFCNT_dec (coro->invoke_av);
1053 } 1238 }
1054} 1239}
1055 1240
1056INLINE void 1241ecb_inline void
1057free_coro_mortal (pTHX) 1242free_coro_mortal (pTHX)
1058{ 1243{
1059 if (expect_true (coro_mortal)) 1244 if (ecb_expect_true (coro_mortal))
1060 { 1245 {
1061 SvREFCNT_dec (coro_mortal); 1246 SvREFCNT_dec ((SV *)coro_mortal);
1062 coro_mortal = 0; 1247 coro_mortal = 0;
1063 } 1248 }
1064} 1249}
1065 1250
1066static int 1251static int
… …
1199 1384
1200 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1385 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1201} 1386}
1202 1387
1203/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1388/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1204static void NOINLINE 1389static void ecb_noinline
1205cctx_prepare (pTHX) 1390cctx_prepare (pTHX)
1206{ 1391{
1207 PL_top_env = &PL_start_env; 1392 PL_top_env = &PL_start_env;
1208 1393
1209 if (cctx_current->flags & CC_TRACE) 1394 if (cctx_current->flags & CC_TRACE)
… …
1220 slf_frame.prepare = slf_prepare_set_stacklevel; 1405 slf_frame.prepare = slf_prepare_set_stacklevel;
1221 slf_frame.check = slf_check_set_stacklevel; 1406 slf_frame.check = slf_check_set_stacklevel;
1222} 1407}
1223 1408
1224/* the tail of transfer: execute stuff we can only do after a transfer */ 1409/* the tail of transfer: execute stuff we can only do after a transfer */
1225INLINE void 1410ecb_inline void
1226transfer_tail (pTHX) 1411transfer_tail (pTHX)
1227{ 1412{
1228 free_coro_mortal (aTHX); 1413 free_coro_mortal (aTHX);
1414}
1415
1416/* try to exit the same way perl's main function would do */
1417/* we do not bother resetting the environment or other things *7
1418/* that are not, uhm, essential */
1419/* this obviously also doesn't work when perl is embedded */
1420static void ecb_noinline ecb_cold
1421perlish_exit (pTHX)
1422{
1423 int exitstatus = perl_destruct (PL_curinterp);
1424 perl_free (PL_curinterp);
1425 exit (exitstatus);
1229} 1426}
1230 1427
1231/* 1428/*
1232 * this is a _very_ stripped down perl interpreter ;) 1429 * this is a _very_ stripped down perl interpreter ;)
1233 */ 1430 */
… …
1255 /* somebody or something will hit me for both perl_run and PL_restartop */ 1452 /* somebody or something will hit me for both perl_run and PL_restartop */
1256 PL_restartop = PL_op; 1453 PL_restartop = PL_op;
1257 perl_run (PL_curinterp); 1454 perl_run (PL_curinterp);
1258 /* 1455 /*
1259 * Unfortunately, there is no way to get at the return values of the 1456 * Unfortunately, there is no way to get at the return values of the
1260 * coro body here, as perl_run destroys these 1457 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1458 * runtime errors here, as this is just a random interpreter, not a thread.
1261 */ 1459 */
1262 1460
1263 /* 1461 /*
1264 * If perl-run returns we assume exit() was being called or the coro 1462 * If perl-run returns we assume exit() was being called or the coro
1265 * fell off the end, which seems to be the only valid (non-bug) 1463 * fell off the end, which seems to be the only valid (non-bug)
1266 * reason for perl_run to return. We try to exit by jumping to the 1464 * reason for perl_run to return. We try to mimic whatever perl is normally
1267 * bootstrap-time "top" top_env, as we cannot restore the "main" 1465 * doing in that case. YMMV.
1268 * coroutine as Coro has no such concept.
1269 * This actually isn't valid with the pthread backend, but OSes requiring
1270 * that backend are too broken to do it in a standards-compliant way.
1271 */ 1466 */
1272 PL_top_env = main_top_env; 1467 perlish_exit (aTHX);
1273 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1274 } 1468 }
1275} 1469}
1276 1470
1277static coro_cctx * 1471static coro_cctx *
1278cctx_new () 1472cctx_new (void)
1279{ 1473{
1280 coro_cctx *cctx; 1474 coro_cctx *cctx;
1281 1475
1282 ++cctx_count; 1476 ++cctx_count;
1283 New (0, cctx, 1, coro_cctx); 1477 New (0, cctx, 1, coro_cctx);
… …
1289 return cctx; 1483 return cctx;
1290} 1484}
1291 1485
1292/* create a new cctx only suitable as source */ 1486/* create a new cctx only suitable as source */
1293static coro_cctx * 1487static coro_cctx *
1294cctx_new_empty () 1488cctx_new_empty (void)
1295{ 1489{
1296 coro_cctx *cctx = cctx_new (); 1490 coro_cctx *cctx = cctx_new ();
1297 1491
1298 cctx->sptr = 0; 1492 cctx->sptr = 0;
1299 coro_create (&cctx->cctx, 0, 0, 0, 0); 1493 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1301 return cctx; 1495 return cctx;
1302} 1496}
1303 1497
1304/* create a new cctx suitable as destination/running a perl interpreter */ 1498/* create a new cctx suitable as destination/running a perl interpreter */
1305static coro_cctx * 1499static coro_cctx *
1306cctx_new_run () 1500cctx_new_run (void)
1307{ 1501{
1308 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1309 void *stack_start; 1503 void *stack_start;
1310 size_t stack_size; 1504 size_t stack_size;
1311 1505
1312#if HAVE_MMAP 1506#if HAVE_MMAP
1313 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1507 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1314 /* mmap supposedly does allocate-on-write for us */ 1508 /* mmap supposedly does allocate-on-write for us */
1315 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1509 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1316 1510
1317 if (cctx->sptr != (void *)-1) 1511 if (cctx->sptr != (void *)-1)
1318 { 1512 {
1319 #if CORO_STACKGUARD 1513 #if CORO_STACKGUARD
1320 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1352cctx_destroy (coro_cctx *cctx) 1546cctx_destroy (coro_cctx *cctx)
1353{ 1547{
1354 if (!cctx) 1548 if (!cctx)
1355 return; 1549 return;
1356 1550
1357 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1358 1552
1359 --cctx_count; 1553 --cctx_count;
1360 coro_destroy (&cctx->cctx); 1554 coro_destroy (&cctx->cctx);
1361 1555
1362 /* coro_transfer creates new, empty cctx's */ 1556 /* coro_transfer creates new, empty cctx's */
… …
1381#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1575#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1382 1576
1383static coro_cctx * 1577static coro_cctx *
1384cctx_get (pTHX) 1578cctx_get (pTHX)
1385{ 1579{
1386 while (expect_true (cctx_first)) 1580 while (ecb_expect_true (cctx_first))
1387 { 1581 {
1388 coro_cctx *cctx = cctx_first; 1582 coro_cctx *cctx = cctx_first;
1389 cctx_first = cctx->next; 1583 cctx_first = cctx->next;
1390 --cctx_idle; 1584 --cctx_idle;
1391 1585
1392 if (expect_true (!CCTX_EXPIRED (cctx))) 1586 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1393 return cctx; 1587 return cctx;
1394 1588
1395 cctx_destroy (cctx); 1589 cctx_destroy (cctx);
1396 } 1590 }
1397 1591
… …
1402cctx_put (coro_cctx *cctx) 1596cctx_put (coro_cctx *cctx)
1403{ 1597{
1404 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1405 1599
1406 /* free another cctx if overlimit */ 1600 /* free another cctx if overlimit */
1407 if (expect_false (cctx_idle >= cctx_max_idle)) 1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1408 { 1602 {
1409 coro_cctx *first = cctx_first; 1603 coro_cctx *first = cctx_first;
1410 cctx_first = first->next; 1604 cctx_first = first->next;
1411 --cctx_idle; 1605 --cctx_idle;
1412 1606
… …
1423static void 1617static void
1424transfer_check (pTHX_ struct coro *prev, struct coro *next) 1618transfer_check (pTHX_ struct coro *prev, struct coro *next)
1425{ 1619{
1426 /* TODO: throwing up here is considered harmful */ 1620 /* TODO: throwing up here is considered harmful */
1427 1621
1428 if (expect_true (prev != next)) 1622 if (ecb_expect_true (prev != next))
1429 { 1623 {
1430 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1624 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1431 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1625 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1432 1626
1433 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1627 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1434 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1628 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1435 1629
1436#if !PERL_VERSION_ATLEAST (5,10,0) 1630#if !PERL_VERSION_ATLEAST (5,10,0)
1437 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1631 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1438 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1632 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1439#endif 1633#endif
1440 } 1634 }
1441} 1635}
1442 1636
1443/* always use the TRANSFER macro */ 1637/* always use the TRANSFER macro */
1444static void NOINLINE /* noinline so we have a fixed stackframe */ 1638static void ecb_noinline /* noinline so we have a fixed stackframe */
1445transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1639transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1446{ 1640{
1447 dSTACKLEVEL; 1641 dSTACKLEVEL;
1448 1642
1449 /* sometimes transfer is only called to set idle_sp */ 1643 /* sometimes transfer is only called to set idle_sp */
1450 if (expect_false (!prev)) 1644 if (ecb_expect_false (!prev))
1451 { 1645 {
1452 cctx_current->idle_sp = STACKLEVEL; 1646 cctx_current->idle_sp = STACKLEVEL;
1453 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1647 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1454 } 1648 }
1455 else if (expect_true (prev != next)) 1649 else if (ecb_expect_true (prev != next))
1456 { 1650 {
1457 coro_cctx *cctx_prev; 1651 coro_cctx *cctx_prev;
1458 1652
1459 if (expect_false (prev->flags & CF_NEW)) 1653 if (ecb_expect_false (prev->flags & CF_NEW))
1460 { 1654 {
1461 /* create a new empty/source context */ 1655 /* create a new empty/source context */
1462 prev->flags &= ~CF_NEW; 1656 prev->flags &= ~CF_NEW;
1463 prev->flags |= CF_RUNNING; 1657 prev->flags |= CF_RUNNING;
1464 } 1658 }
… …
1467 next->flags |= CF_RUNNING; 1661 next->flags |= CF_RUNNING;
1468 1662
1469 /* first get rid of the old state */ 1663 /* first get rid of the old state */
1470 save_perl (aTHX_ prev); 1664 save_perl (aTHX_ prev);
1471 1665
1472 if (expect_false (next->flags & CF_NEW)) 1666 if (ecb_expect_false (next->flags & CF_NEW))
1473 { 1667 {
1474 /* need to start coroutine */ 1668 /* need to start coroutine */
1475 next->flags &= ~CF_NEW; 1669 next->flags &= ~CF_NEW;
1476 /* setup coroutine call */ 1670 /* setup coroutine call */
1477 coro_setup (aTHX_ next); 1671 init_perl (aTHX_ next);
1478 } 1672 }
1479 else 1673 else
1480 load_perl (aTHX_ next); 1674 load_perl (aTHX_ next);
1481 1675
1482 /* possibly untie and reuse the cctx */ 1676 /* possibly untie and reuse the cctx */
1483 if (expect_true ( 1677 if (ecb_expect_true (
1484 cctx_current->idle_sp == STACKLEVEL 1678 cctx_current->idle_sp == STACKLEVEL
1485 && !(cctx_current->flags & CC_TRACE) 1679 && !(cctx_current->flags & CC_TRACE)
1486 && !force_cctx 1680 && !force_cctx
1487 )) 1681 ))
1488 { 1682 {
1489 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1683 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1490 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1684 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1491 1685
1492 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1686 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1493 /* without this the next cctx_get might destroy the running cctx while still in use */ 1687 /* without this the next cctx_get might destroy the running cctx while still in use */
1494 if (expect_false (CCTX_EXPIRED (cctx_current))) 1688 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1495 if (expect_true (!next->cctx)) 1689 if (ecb_expect_true (!next->cctx))
1496 next->cctx = cctx_get (aTHX); 1690 next->cctx = cctx_get (aTHX);
1497 1691
1498 cctx_put (cctx_current); 1692 cctx_put (cctx_current);
1499 } 1693 }
1500 else 1694 else
1501 prev->cctx = cctx_current; 1695 prev->cctx = cctx_current;
1502 1696
1503 ++next->usecount; 1697 ++next->usecount;
1504 1698
1505 cctx_prev = cctx_current; 1699 cctx_prev = cctx_current;
1506 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1700 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1507 1701
1508 next->cctx = 0; 1702 next->cctx = 0;
1509 1703
1510 if (expect_false (cctx_prev != cctx_current)) 1704 if (ecb_expect_false (cctx_prev != cctx_current))
1511 { 1705 {
1512 cctx_prev->top_env = PL_top_env; 1706 cctx_prev->top_env = PL_top_env;
1513 PL_top_env = cctx_current->top_env; 1707 PL_top_env = cctx_current->top_env;
1514 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1708 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1515 } 1709 }
… …
1521#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1715#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1522#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1716#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1523 1717
1524/** high level stuff ********************************************************/ 1718/** high level stuff ********************************************************/
1525 1719
1720/* this function is actually Coro, not Coro::State, but we call it from here */
1721/* because it is convenient - but it hasn't been declared yet for that reason */
1526static int 1722static void
1723coro_call_on_destroy (pTHX_ struct coro *coro);
1724
1725static void
1527coro_state_destroy (pTHX_ struct coro *coro) 1726coro_state_destroy (pTHX_ struct coro *coro)
1528{ 1727{
1529 if (coro->flags & CF_DESTROYED) 1728 if (coro->flags & CF_ZOMBIE)
1530 return 0; 1729 return;
1531 1730
1532 if (coro->on_destroy && !PL_dirty)
1533 coro->on_destroy (aTHX_ coro); 1731 slf_destroy (aTHX_ coro);
1534 1732
1535 coro->flags |= CF_DESTROYED; 1733 coro->flags |= CF_ZOMBIE;
1536 1734
1537 if (coro->flags & CF_READY) 1735 if (coro->flags & CF_READY)
1538 { 1736 {
1539 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1737 /* reduce nready, as destroying a ready coro effectively unreadies it */
1540 /* alternative: look through all ready queues and remove the coro */ 1738 /* alternative: look through all ready queues and remove the coro */
1541 --coro_nready; 1739 --coro_nready;
1542 } 1740 }
1543 else 1741 else
1544 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1742 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1743
1744 if (coro->next) coro->next->prev = coro->prev;
1745 if (coro->prev) coro->prev->next = coro->next;
1746 if (coro == coro_first) coro_first = coro->next;
1545 1747
1546 if (coro->mainstack 1748 if (coro->mainstack
1547 && coro->mainstack != main_mainstack 1749 && coro->mainstack != main_mainstack
1548 && coro->slot 1750 && coro->slot
1549 && !PL_dirty) 1751 && !PL_dirty)
1550 coro_destruct_perl (aTHX_ coro); 1752 destroy_perl (aTHX_ coro);
1551 1753
1552 cctx_destroy (coro->cctx); 1754 cctx_destroy (coro->cctx);
1553 SvREFCNT_dec (coro->startcv); 1755 SvREFCNT_dec (coro->startcv);
1554 SvREFCNT_dec (coro->args); 1756 SvREFCNT_dec (coro->args);
1757 SvREFCNT_dec (coro->swap_sv);
1555 SvREFCNT_dec (CORO_THROW); 1758 SvREFCNT_dec (CORO_THROW);
1556 1759
1557 if (coro->next) coro->next->prev = coro->prev; 1760 coro_call_on_destroy (aTHX_ coro);
1558 if (coro->prev) coro->prev->next = coro->next;
1559 if (coro == coro_first) coro_first = coro->next;
1560 1761
1561 return 1; 1762 /* more destruction mayhem in coro_state_free */
1562} 1763}
1563 1764
1564static int 1765static int
1565coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1766coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1566{ 1767{
1567 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 struct coro *coro = (struct coro *)mg->mg_ptr;
1568 mg->mg_ptr = 0; 1769 mg->mg_ptr = 0;
1569 1770
1570 coro->hv = 0;
1571
1572 if (--coro->refcnt < 0)
1573 {
1574 coro_state_destroy (aTHX_ coro); 1771 coro_state_destroy (aTHX_ coro);
1772 SvREFCNT_dec (coro->on_destroy);
1773 SvREFCNT_dec (coro->status);
1774
1575 Safefree (coro); 1775 Safefree (coro);
1576 }
1577 1776
1578 return 0; 1777 return 0;
1579} 1778}
1580 1779
1581static int 1780static int ecb_cold
1582coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1781coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1583{ 1782{
1584 struct coro *coro = (struct coro *)mg->mg_ptr; 1783 /* called when perl clones the current process the slow way (windows process emulation) */
1585 1784 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1586 ++coro->refcnt; 1785 mg->mg_ptr = 0;
1786 mg->mg_virtual = 0;
1587 1787
1588 return 0; 1788 return 0;
1589} 1789}
1590 1790
1591static MGVTBL coro_state_vtbl = { 1791static MGVTBL coro_state_vtbl = {
… …
1616 TRANSFER (ta, 1); 1816 TRANSFER (ta, 1);
1617} 1817}
1618 1818
1619/** Coro ********************************************************************/ 1819/** Coro ********************************************************************/
1620 1820
1621INLINE void 1821ecb_inline void
1622coro_enq (pTHX_ struct coro *coro) 1822coro_enq (pTHX_ struct coro *coro)
1623{ 1823{
1624 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1824 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1625 1825
1626 SvREFCNT_inc_NN (coro->hv); 1826 SvREFCNT_inc_NN (coro->hv);
… …
1628 coro->next_ready = 0; 1828 coro->next_ready = 0;
1629 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1829 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1630 ready [1] = coro; 1830 ready [1] = coro;
1631} 1831}
1632 1832
1633INLINE struct coro * 1833ecb_inline struct coro *
1634coro_deq (pTHX) 1834coro_deq (pTHX)
1635{ 1835{
1636 int prio; 1836 int prio;
1637 1837
1638 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1838 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1648 } 1848 }
1649 1849
1650 return 0; 1850 return 0;
1651} 1851}
1652 1852
1853static void
1854invoke_sv_ready_hook_helper (void)
1855{
1856 dTHX;
1857 dSP;
1858
1859 ENTER;
1860 SAVETMPS;
1861
1862 PUSHMARK (SP);
1863 PUTBACK;
1864 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1865
1866 FREETMPS;
1867 LEAVE;
1868}
1869
1653static int 1870static int
1654api_ready (pTHX_ SV *coro_sv) 1871api_ready (pTHX_ SV *coro_sv)
1655{ 1872{
1656 struct coro *coro;
1657 SV *sv_hook;
1658 void (*xs_hook)(void);
1659
1660 coro = SvSTATE (coro_sv); 1873 struct coro *coro = SvSTATE (coro_sv);
1661 1874
1662 if (coro->flags & CF_READY) 1875 if (coro->flags & CF_READY)
1663 return 0; 1876 return 0;
1664 1877
1665 coro->flags |= CF_READY; 1878 coro->flags |= CF_READY;
1666 1879
1667 sv_hook = coro_nready ? 0 : coro_readyhook;
1668 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1669
1670 coro_enq (aTHX_ coro); 1880 coro_enq (aTHX_ coro);
1671 ++coro_nready;
1672 1881
1673 if (sv_hook) 1882 if (!coro_nready++)
1674 { 1883 if (coroapi.readyhook)
1675 dSP; 1884 coroapi.readyhook ();
1676
1677 ENTER;
1678 SAVETMPS;
1679
1680 PUSHMARK (SP);
1681 PUTBACK;
1682 call_sv (sv_hook, G_VOID | G_DISCARD);
1683
1684 FREETMPS;
1685 LEAVE;
1686 }
1687
1688 if (xs_hook)
1689 xs_hook ();
1690 1885
1691 return 1; 1886 return 1;
1692} 1887}
1693 1888
1694static int 1889static int
… …
1696{ 1891{
1697 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1892 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1698} 1893}
1699 1894
1700/* expects to own a reference to next->hv */ 1895/* expects to own a reference to next->hv */
1701INLINE void 1896ecb_inline void
1702prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1897prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1703{ 1898{
1704 SV *prev_sv = SvRV (coro_current); 1899 SV *prev_sv = SvRV (coro_current);
1705 1900
1706 ta->prev = SvSTATE_hv (prev_sv); 1901 ta->prev = SvSTATE_hv (prev_sv);
… …
1719{ 1914{
1720 for (;;) 1915 for (;;)
1721 { 1916 {
1722 struct coro *next = coro_deq (aTHX); 1917 struct coro *next = coro_deq (aTHX);
1723 1918
1724 if (expect_true (next)) 1919 if (ecb_expect_true (next))
1725 { 1920 {
1726 /* cannot transfer to destroyed coros, skip and look for next */ 1921 /* cannot transfer to destroyed coros, skip and look for next */
1727 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1922 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1728 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1923 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1729 else 1924 else
1730 { 1925 {
1731 next->flags &= ~CF_READY; 1926 next->flags &= ~CF_READY;
1732 --coro_nready; 1927 --coro_nready;
… …
1739 { 1934 {
1740 /* nothing to schedule: call the idle handler */ 1935 /* nothing to schedule: call the idle handler */
1741 if (SvROK (sv_idle) 1936 if (SvROK (sv_idle)
1742 && SvOBJECT (SvRV (sv_idle))) 1937 && SvOBJECT (SvRV (sv_idle)))
1743 { 1938 {
1939 if (SvRV (sv_idle) == SvRV (coro_current))
1940 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1941
1744 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1942 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1745 api_ready (aTHX_ SvRV (sv_idle)); 1943 api_ready (aTHX_ SvRV (sv_idle));
1746 --coro_nready; 1944 --coro_nready;
1747 } 1945 }
1748 else 1946 else
1749 { 1947 {
1948 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1750 dSP; 1949 dSP;
1751 1950
1752 ENTER; 1951 ENTER;
1753 SAVETMPS; 1952 SAVETMPS;
1754 1953
… …
1761 } 1960 }
1762 } 1961 }
1763 } 1962 }
1764} 1963}
1765 1964
1766INLINE void 1965ecb_inline void
1767prepare_cede (pTHX_ struct coro_transfer_args *ta) 1966prepare_cede (pTHX_ struct coro_transfer_args *ta)
1768{ 1967{
1769 api_ready (aTHX_ coro_current); 1968 api_ready (aTHX_ coro_current);
1770 prepare_schedule (aTHX_ ta); 1969 prepare_schedule (aTHX_ ta);
1771} 1970}
1772 1971
1773INLINE void 1972ecb_inline void
1774prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1973prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1775{ 1974{
1776 SV *prev = SvRV (coro_current); 1975 SV *prev = SvRV (coro_current);
1777 1976
1778 if (coro_nready) 1977 if (coro_nready)
… …
1808{ 2007{
1809 struct coro_transfer_args ta; 2008 struct coro_transfer_args ta;
1810 2009
1811 prepare_cede (aTHX_ &ta); 2010 prepare_cede (aTHX_ &ta);
1812 2011
1813 if (expect_true (ta.prev != ta.next)) 2012 if (ecb_expect_true (ta.prev != ta.next))
1814 { 2013 {
1815 TRANSFER (ta, 1); 2014 TRANSFER (ta, 1);
1816 return 1; 2015 return 1;
1817 } 2016 }
1818 else 2017 else
… …
1861 coro->slot->runops = RUNOPS_DEFAULT; 2060 coro->slot->runops = RUNOPS_DEFAULT;
1862 } 2061 }
1863} 2062}
1864 2063
1865static void 2064static void
2065coro_push_av (pTHX_ AV *av, I32 gimme_v)
2066{
2067 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2068 {
2069 dSP;
2070
2071 if (gimme_v == G_SCALAR)
2072 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2073 else
2074 {
2075 int i;
2076 EXTEND (SP, AvFILLp (av) + 1);
2077
2078 for (i = 0; i <= AvFILLp (av); ++i)
2079 PUSHs (AvARRAY (av)[i]);
2080 }
2081
2082 PUTBACK;
2083 }
2084}
2085
2086static void
2087coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2088{
2089 if (!coro->on_destroy)
2090 coro->on_destroy = newAV ();
2091
2092 av_push (coro->on_destroy, cb);
2093}
2094
2095static void
2096slf_destroy_join (pTHX_ struct CoroSLF *frame)
2097{
2098 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2099}
2100
2101static int
2102slf_check_join (pTHX_ struct CoroSLF *frame)
2103{
2104 struct coro *coro = (struct coro *)frame->data;
2105
2106 if (!coro->status)
2107 return 1;
2108
2109 frame->destroy = 0;
2110
2111 coro_push_av (aTHX_ coro->status, GIMME_V);
2112
2113 SvREFCNT_dec ((SV *)coro->hv);
2114
2115 return 0;
2116}
2117
2118static void
2119slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2120{
2121 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2122
2123 if (items > 1)
2124 croak ("join called with too many arguments");
2125
2126 if (coro->status)
2127 frame->prepare = prepare_nop;
2128 else
2129 {
2130 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2131 frame->prepare = prepare_schedule;
2132 }
2133
2134 frame->check = slf_check_join;
2135 frame->destroy = slf_destroy_join;
2136 frame->data = (void *)coro;
2137 SvREFCNT_inc (coro->hv);
2138}
2139
2140static void
1866coro_call_on_destroy (pTHX_ struct coro *coro) 2141coro_call_on_destroy (pTHX_ struct coro *coro)
1867{ 2142{
1868 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2143 AV *od = coro->on_destroy;
1869 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1870 2144
1871 if (on_destroyp) 2145 if (!od)
1872 { 2146 return;
1873 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1874 2147
1875 while (AvFILLp (on_destroy) >= 0) 2148 while (AvFILLp (od) >= 0)
2149 {
2150 SV *cb = sv_2mortal (av_pop (od));
2151
2152 /* coro hv's (and only hv's at the moment) are supported as well */
2153 if (SvSTATEhv_p (aTHX_ cb))
2154 api_ready (aTHX_ cb);
2155 else
1876 { 2156 {
1877 dSP; /* don't disturb outer sp */ 2157 dSP; /* don't disturb outer sp */
1878 SV *cb = av_pop (on_destroy);
1879
1880 PUSHMARK (SP); 2158 PUSHMARK (SP);
1881 2159
1882 if (statusp) 2160 if (coro->status)
1883 { 2161 {
1884 int i; 2162 PUTBACK;
1885 AV *status = (AV *)SvRV (*statusp); 2163 coro_push_av (aTHX_ coro->status, G_ARRAY);
1886 EXTEND (SP, AvFILLp (status) + 1); 2164 SPAGAIN;
1887
1888 for (i = 0; i <= AvFILLp (status); ++i)
1889 PUSHs (AvARRAY (status)[i]);
1890 } 2165 }
1891 2166
1892 PUTBACK; 2167 PUTBACK;
1893 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2168 call_sv (cb, G_VOID | G_DISCARD);
1894 } 2169 }
1895 } 2170 }
1896} 2171}
1897 2172
1898static void 2173static void
1899slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1900{ 2175{
2176 AV *av;
2177
2178 if (coro->status)
2179 {
2180 av = coro->status;
2181 av_clear (av);
2182 }
2183 else
2184 av = coro->status = newAV ();
2185
2186 /* items are actually not so common, so optimise for this case */
2187 if (items)
2188 {
1901 int i; 2189 int i;
1902 HV *hv = (HV *)SvRV (coro_current);
1903 AV *av = newAV ();
1904 2190
1905 av_extend (av, items - 1); 2191 av_extend (av, items - 1);
2192
1906 for (i = 0; i < items; ++i) 2193 for (i = 0; i < items; ++i)
1907 av_push (av, SvREFCNT_inc_NN (arg [i])); 2194 av_push (av, SvREFCNT_inc_NN (arg [i]));
2195 }
2196}
1908 2197
1909 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2198static void
1910 2199slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2200{
1911 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2201 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1912 api_ready (aTHX_ sv_manager); 2202 api_ready (aTHX_ sv_manager);
1913 2203
1914 frame->prepare = prepare_schedule; 2204 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_repeat; 2205 frame->check = slf_check_repeat;
1916 2206
1917 /* as a minor optimisation, we could unwind all stacks here */ 2207 /* as a minor optimisation, we could unwind all stacks here */
1918 /* but that puts extra pressure on pp_slf, and is not worth much */ 2208 /* but that puts extra pressure on pp_slf, and is not worth much */
1919 /*coro_unwind_stacks (aTHX);*/ 2209 /*coro_unwind_stacks (aTHX);*/
2210}
2211
2212static void
2213slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2214{
2215 HV *coro_hv = (HV *)SvRV (coro_current);
2216
2217 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219}
2220
2221static void
2222slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{
2224 HV *coro_hv;
2225 struct coro *coro;
2226
2227 if (items <= 0)
2228 croak ("Coro::cancel called without coro object,");
2229
2230 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv;
2232
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 {
2237 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro;
2239
2240 frame->prepare = prepare_nop;
2241 frame->check = slf_check_nop;
2242 }
2243 else if (coro_hv == (HV *)SvRV (coro_current))
2244 {
2245 /* cancelling the current coro is allowed, and equals terminate */
2246 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2247 }
2248 else
2249 {
2250 struct coro *self = SvSTATE_current;
2251
2252 /* otherwise we cancel directly, purely for speed reasons
2253 * unfortunately, this requires some magic trickery, as
2254 * somebody else could cancel us, so we have to fight the cancellation.
2255 * this is ugly, and hopefully fully worth the extra speed.
2256 * besides, I can't get the slow-but-safe version working...
2257 */
2258 slf_frame.data = 0;
2259 self->flags |= CF_NOCANCEL;
2260 coro_state_destroy (aTHX_ coro);
2261 self->flags &= ~CF_NOCANCEL;
2262
2263 if (slf_frame.data)
2264 {
2265 /* while we were busy we have been cancelled, so terminate */
2266 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2267 }
2268 else
2269 {
2270 frame->prepare = prepare_nop;
2271 frame->check = slf_check_nop;
2272 }
2273 }
2274}
2275
2276static int
2277slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2278{
2279 frame->prepare = 0;
2280 coro_unwind_stacks (aTHX);
2281
2282 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2283
2284 return 1;
2285}
2286
2287static int
2288safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2289{
2290 if (coro->cctx)
2291 croak ("coro inside C callback, unable to cancel at this time, caught");
2292
2293 if (coro->flags & CF_NEW)
2294 {
2295 coro_set_status (aTHX_ coro, arg, items);
2296 coro_state_destroy (aTHX_ coro);
2297 }
2298 else
2299 {
2300 if (!coro->slf_frame.prepare)
2301 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2302
2303 slf_destroy (aTHX_ coro);
2304
2305 coro_set_status (aTHX_ coro, arg, items);
2306 coro->slf_frame.prepare = prepare_nop;
2307 coro->slf_frame.check = slf_check_safe_cancel;
2308
2309 api_ready (aTHX_ (SV *)coro->hv);
2310 }
2311
2312 return 1;
1920} 2313}
1921 2314
1922/*****************************************************************************/ 2315/*****************************************************************************/
1923/* async pool handler */ 2316/* async pool handler */
1924 2317
… …
1955slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2348slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1956{ 2349{
1957 HV *hv = (HV *)SvRV (coro_current); 2350 HV *hv = (HV *)SvRV (coro_current);
1958 struct coro *coro = SvSTATE_hv ((SV *)hv); 2351 struct coro *coro = SvSTATE_hv ((SV *)hv);
1959 2352
1960 if (expect_true (coro->saved_deffh)) 2353 if (ecb_expect_true (coro->saved_deffh))
1961 { 2354 {
1962 /* subsequent iteration */ 2355 /* subsequent iteration */
1963 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2356 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1964 coro->saved_deffh = 0; 2357 coro->saved_deffh = 0;
1965 2358
1966 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2359 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1967 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2360 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1968 { 2361 {
1969 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2362 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1970 coro->invoke_av = newAV (); 2363 return;
1971
1972 frame->prepare = prepare_nop;
1973 } 2364 }
1974 else 2365 else
1975 { 2366 {
1976 av_clear (GvAV (PL_defgv)); 2367 av_clear (GvAV (PL_defgv));
1977 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2368 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2200static void 2591static void
2201slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2592slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2202{ 2593{
2203 frame->prepare = prepare_cede_notself; 2594 frame->prepare = prepare_cede_notself;
2204 frame->check = slf_check_nop; 2595 frame->check = slf_check_nop;
2596}
2597
2598/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2599static void
2600slf_destroy (pTHX_ struct coro *coro)
2601{
2602 /* this callback is reserved for slf functions needing to do cleanup */
2603 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2604 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2605
2606 /*
2607 * The on_destroy above most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions.
2611 */
2612 coro->slf_frame.prepare = 0;
2205} 2613}
2206 2614
2207/* 2615/*
2208 * these not obviously related functions are all rolled into one 2616 * these not obviously related functions are all rolled into one
2209 * function to increase chances that they all will call transfer with the same 2617 * function to increase chances that they all will call transfer with the same
… …
2216 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2624 I32 checkmark; /* mark SP to see how many elements check has pushed */
2217 2625
2218 /* set up the slf frame, unless it has already been set-up */ 2626 /* set up the slf frame, unless it has already been set-up */
2219 /* the latter happens when a new coro has been started */ 2627 /* the latter happens when a new coro has been started */
2220 /* or when a new cctx was attached to an existing coroutine */ 2628 /* or when a new cctx was attached to an existing coroutine */
2221 if (expect_true (!slf_frame.prepare)) 2629 if (ecb_expect_true (!slf_frame.prepare))
2222 { 2630 {
2223 /* first iteration */ 2631 /* first iteration */
2224 dSP; 2632 dSP;
2225 SV **arg = PL_stack_base + TOPMARK + 1; 2633 SV **arg = PL_stack_base + TOPMARK + 1;
2226 int items = SP - arg; /* args without function object */ 2634 int items = SP - arg; /* args without function object */
… …
2267 while (slf_frame.check (aTHX_ &slf_frame)); 2675 while (slf_frame.check (aTHX_ &slf_frame));
2268 2676
2269 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2677 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2270 2678
2271 /* exception handling */ 2679 /* exception handling */
2272 if (expect_false (CORO_THROW)) 2680 if (ecb_expect_false (CORO_THROW))
2273 { 2681 {
2274 SV *exception = sv_2mortal (CORO_THROW); 2682 SV *exception = sv_2mortal (CORO_THROW);
2275 2683
2276 CORO_THROW = 0; 2684 CORO_THROW = 0;
2277 sv_setsv (ERRSV, exception); 2685 sv_setsv (ERRSV, exception);
2278 croak (0); 2686 croak (0);
2279 } 2687 }
2280 2688
2281 /* return value handling - mostly like entersub */ 2689 /* return value handling - mostly like entersub */
2282 /* make sure we put something on the stack in scalar context */ 2690 /* make sure we put something on the stack in scalar context */
2283 if (GIMME_V == G_SCALAR) 2691 if (GIMME_V == G_SCALAR
2692 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2284 { 2693 {
2285 dSP; 2694 dSP;
2286 SV **bot = PL_stack_base + checkmark; 2695 SV **bot = PL_stack_base + checkmark;
2287 2696
2288 if (sp == bot) /* too few, push undef */ 2697 if (sp == bot) /* too few, push undef */
2289 bot [1] = &PL_sv_undef; 2698 bot [1] = &PL_sv_undef;
2290 else if (sp != bot + 1) /* too many, take last one */ 2699 else /* too many, take last one */
2291 bot [1] = *sp; 2700 bot [1] = *sp;
2292 2701
2293 SP = bot + 1; 2702 SP = bot + 1;
2294 2703
2295 PUTBACK; 2704 PUTBACK;
… …
2328 if (PL_op->op_flags & OPf_STACKED) 2737 if (PL_op->op_flags & OPf_STACKED)
2329 { 2738 {
2330 if (items > slf_arga) 2739 if (items > slf_arga)
2331 { 2740 {
2332 slf_arga = items; 2741 slf_arga = items;
2333 free (slf_argv); 2742 Safefree (slf_argv);
2334 slf_argv = malloc (slf_arga * sizeof (SV *)); 2743 New (0, slf_argv, slf_arga, SV *);
2335 } 2744 }
2336 2745
2337 slf_argc = items; 2746 slf_argc = items;
2338 2747
2339 for (i = 0; i < items; ++i) 2748 for (i = 0; i < items; ++i)
… …
2402{ 2811{
2403 PerlIOBuf base; 2812 PerlIOBuf base;
2404 NV next, every; 2813 NV next, every;
2405} PerlIOCede; 2814} PerlIOCede;
2406 2815
2407static IV 2816static IV ecb_cold
2408PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2817PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2409{ 2818{
2410 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2819 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2411 2820
2412 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2821 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2413 self->next = nvtime () + self->every; 2822 self->next = nvtime () + self->every;
2414 2823
2415 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2824 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2416} 2825}
2417 2826
2418static SV * 2827static SV * ecb_cold
2419PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2828PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2420{ 2829{
2421 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2830 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2422 2831
2423 return newSVnv (self->every); 2832 return newSVnv (self->every);
… …
2535 SvREFCNT_dec (cb); 2944 SvREFCNT_dec (cb);
2536 } 2945 }
2537} 2946}
2538 2947
2539static void 2948static void
2540coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2949coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2541{ 2950{
2542 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2951 /* call $sem->adjust (0) to possibly wake up some other waiters */
2543 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2952 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2544} 2953}
2545 2954
2546static int 2955static int
2547slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2956slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2548{ 2957{
2549 AV *av = (AV *)frame->data; 2958 AV *av = (AV *)frame->data;
2550 SV *count_sv = AvARRAY (av)[0]; 2959 SV *count_sv = AvARRAY (av)[0];
2960 SV *coro_hv = SvRV (coro_current);
2551 2961
2552 /* if we are about to throw, don't actually acquire the lock, just throw */ 2962 /* if we are about to throw, don't actually acquire the lock, just throw */
2553 if (CORO_THROW) 2963 if (CORO_THROW)
2554 return 0; 2964 return 0;
2555 else if (SvIVX (count_sv) > 0) 2965 else if (SvIVX (count_sv) > 0)
2556 { 2966 {
2557 SvSTATE_current->on_destroy = 0; 2967 frame->destroy = 0;
2558 2968
2559 if (acquire) 2969 if (acquire)
2560 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2970 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2561 else 2971 else
2562 coro_semaphore_adjust (aTHX_ av, 0); 2972 coro_semaphore_adjust (aTHX_ av, 0);
… …
2567 { 2977 {
2568 int i; 2978 int i;
2569 /* if we were woken up but can't down, we look through the whole */ 2979 /* if we were woken up but can't down, we look through the whole */
2570 /* waiters list and only add us if we aren't in there already */ 2980 /* waiters list and only add us if we aren't in there already */
2571 /* this avoids some degenerate memory usage cases */ 2981 /* this avoids some degenerate memory usage cases */
2572 2982 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2573 for (i = 1; i <= AvFILLp (av); ++i)
2574 if (AvARRAY (av)[i] == SvRV (coro_current)) 2983 if (AvARRAY (av)[i] == coro_hv)
2575 return 1; 2984 return 1;
2576 2985
2577 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2986 av_push (av, SvREFCNT_inc (coro_hv));
2578 return 1; 2987 return 1;
2579 } 2988 }
2580} 2989}
2581 2990
2582static int 2991static int
… …
2605 { 3014 {
2606 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3015 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2607 3016
2608 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3017 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2609 frame->prepare = prepare_schedule; 3018 frame->prepare = prepare_schedule;
2610
2611 /* to avoid race conditions when a woken-up coro gets terminated */ 3019 /* to avoid race conditions when a woken-up coro gets terminated */
2612 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3020 /* we arrange for a temporary on_destroy that calls adjust (0) */
2613 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3021 frame->destroy = coro_semaphore_destroy;
2614 } 3022 }
2615} 3023}
2616 3024
2617static void 3025static void
2618slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3026slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2700 { 3108 {
2701 SV *cb_cv = s_get_cv_croak (arg [1]); 3109 SV *cb_cv = s_get_cv_croak (arg [1]);
2702 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3110 av_push (av, SvREFCNT_inc_NN (cb_cv));
2703 3111
2704 if (SvIVX (AvARRAY (av)[0])) 3112 if (SvIVX (AvARRAY (av)[0]))
2705 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3113 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2706 3114
2707 frame->prepare = prepare_nop; 3115 frame->prepare = prepare_nop;
2708 frame->check = slf_check_nop; 3116 frame->check = slf_check_nop;
2709 } 3117 }
2710 else if (SvIVX (AvARRAY (av)[0])) 3118 else if (SvIVX (AvARRAY (av)[0]))
… …
2836 dSP; 3244 dSP;
2837 3245
2838 static SV *prio_cv; 3246 static SV *prio_cv;
2839 static SV *prio_sv; 3247 static SV *prio_sv;
2840 3248
2841 if (expect_false (!prio_cv)) 3249 if (ecb_expect_false (!prio_cv))
2842 { 3250 {
2843 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3251 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2844 prio_sv = newSViv (0); 3252 prio_sv = newSViv (0);
2845 } 3253 }
2846 3254
… …
2872 /* now call the AIO function - we assume our request is uncancelable */ 3280 /* now call the AIO function - we assume our request is uncancelable */
2873 PUTBACK; 3281 PUTBACK;
2874 call_sv ((SV *)req, G_VOID | G_DISCARD); 3282 call_sv ((SV *)req, G_VOID | G_DISCARD);
2875 } 3283 }
2876 3284
2877 /* now that the requets is going, we loop toll we have a result */ 3285 /* now that the request is going, we loop till we have a result */
2878 frame->data = (void *)state; 3286 frame->data = (void *)state;
2879 frame->prepare = prepare_schedule; 3287 frame->prepare = prepare_schedule;
2880 frame->check = slf_check_aio_req; 3288 frame->check = slf_check_aio_req;
2881} 3289}
2882 3290
… …
2892 3300
2893/*****************************************************************************/ 3301/*****************************************************************************/
2894 3302
2895#if CORO_CLONE 3303#if CORO_CLONE
2896# include "clone.c" 3304# include "clone.c"
3305#endif
3306
3307/*****************************************************************************/
3308
3309static SV *
3310coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3311{
3312 SV *coro_sv;
3313 struct coro *coro;
3314 MAGIC *mg;
3315 HV *hv;
3316 SV *cb;
3317 int i;
3318
3319 if (argc > 0)
3320 {
3321 cb = s_get_cv_croak (argv [0]);
3322
3323 if (!is_coro)
3324 {
3325 if (CvISXSUB (cb))
3326 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3327
3328 if (!CvROOT (cb))
3329 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3330 }
3331 }
3332
3333 Newz (0, coro, 1, struct coro);
3334 coro->args = newAV ();
3335 coro->flags = CF_NEW;
3336
3337 if (coro_first) coro_first->prev = coro;
3338 coro->next = coro_first;
3339 coro_first = coro;
3340
3341 coro->hv = hv = newHV ();
3342 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3343 mg->mg_flags |= MGf_DUP;
3344 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3345
3346 if (argc > 0)
3347 {
3348 av_extend (coro->args, argc + is_coro - 1);
3349
3350 if (is_coro)
3351 {
3352 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3353 cb = (SV *)cv_coro_run;
3354 }
3355
3356 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3357
3358 for (i = 1; i < argc; i++)
3359 av_push (coro->args, newSVsv (argv [i]));
3360 }
3361
3362 return coro_sv;
3363}
3364
3365#ifndef __cplusplus
3366ecb_cold XS(boot_Coro__State);
3367#endif
3368
3369#if CORO_JIT
3370
3371static void ecb_noinline ecb_cold
3372pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3373{
3374 dSP;
3375 AV *av = newAV ();
3376
3377 av_store (av, 3, newSVuv (d));
3378 av_store (av, 2, newSVuv (c));
3379 av_store (av, 1, newSVuv (b));
3380 av_store (av, 0, newSVuv (a));
3381
3382 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3383
3384 PUTBACK;
3385}
3386
3387static void ecb_noinline ecb_cold
3388jit_init (pTHX)
3389{
3390 dSP;
3391 SV *load, *save;
3392 char *map_base;
3393 char *load_ptr, *save_ptr;
3394 STRLEN load_len, save_len, map_len;
3395 int count;
3396
3397 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3398
3399 PUSHMARK (SP);
3400 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3401 #include "state.h"
3402 count = call_pv ("Coro::State::_jit", G_ARRAY);
3403 SPAGAIN;
3404
3405 save = POPs; save_ptr = SvPVbyte (save, save_len);
3406 load = POPs; load_ptr = SvPVbyte (load, load_len);
3407
3408 map_len = load_len + save_len + 16;
3409
3410 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3411
3412 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3413
3414 load_perl_slots = (load_save_perl_slots_type)map_base;
3415 memcpy (map_base, load_ptr, load_len);
3416
3417 map_base += (load_len + 15) & ~15;
3418
3419 save_perl_slots = (load_save_perl_slots_type)map_base;
3420 memcpy (map_base, save_ptr, save_len);
3421
3422 /* we are good citizens and try to make the page read-only, so the evil evil */
3423 /* hackers might have it a bit more difficult */
3424 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3425
3426 PUTBACK;
3427 eval_pv ("undef &Coro::State::_jit", 1);
3428}
3429
2897#endif 3430#endif
2898 3431
2899MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3432MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2900 3433
2901PROTOTYPES: DISABLE 3434PROTOTYPES: DISABLE
… …
2906# if CORO_PTHREAD 3439# if CORO_PTHREAD
2907 coro_thx = PERL_GET_CONTEXT; 3440 coro_thx = PERL_GET_CONTEXT;
2908# endif 3441# endif
2909#endif 3442#endif
2910 BOOT_PAGESIZE; 3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV;
3450 ERRSV;
2911 3451
2912 cctx_current = cctx_new_empty (); 3452 cctx_current = cctx_new_empty ();
2913 3453
2914 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3454 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2915 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3455 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2955 coroapi.prepare_nop = prepare_nop; 3495 coroapi.prepare_nop = prepare_nop;
2956 coroapi.prepare_schedule = prepare_schedule; 3496 coroapi.prepare_schedule = prepare_schedule;
2957 coroapi.prepare_cede = prepare_cede; 3497 coroapi.prepare_cede = prepare_cede;
2958 coroapi.prepare_cede_notself = prepare_cede_notself; 3498 coroapi.prepare_cede_notself = prepare_cede_notself;
2959 3499
2960 { 3500 time_init (aTHX);
2961 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2962
2963 if (!svp) croak ("Time::HiRes is required");
2964 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2965
2966 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2967
2968 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2969 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2970 }
2971 3501
2972 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3502 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3503#if CORO_JIT
3504 PUTBACK;
3505 jit_init (aTHX);
3506 SPAGAIN;
3507#endif
2973} 3508}
2974 3509
2975SV * 3510SV *
2976new (char *klass, ...) 3511new (SV *klass, ...)
2977 ALIAS: 3512 ALIAS:
2978 Coro::new = 1 3513 Coro::new = 1
2979 CODE: 3514 CODE:
2980{ 3515 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2981 struct coro *coro; 3516 OUTPUT:
2982 MAGIC *mg;
2983 HV *hv;
2984 SV *cb;
2985 int i;
2986
2987 if (items > 1)
2988 {
2989 cb = s_get_cv_croak (ST (1));
2990
2991 if (!ix)
2992 {
2993 if (CvISXSUB (cb))
2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2995
2996 if (!CvROOT (cb))
2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2999 }
3000
3001 Newz (0, coro, 1, struct coro);
3002 coro->args = newAV ();
3003 coro->flags = CF_NEW;
3004
3005 if (coro_first) coro_first->prev = coro;
3006 coro->next = coro_first;
3007 coro_first = coro;
3008
3009 coro->hv = hv = newHV ();
3010 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3011 mg->mg_flags |= MGf_DUP;
3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3013
3014 if (items > 1)
3015 {
3016 av_extend (coro->args, items - 1 + ix - 1);
3017
3018 if (ix)
3019 {
3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3021 cb = (SV *)cv_coro_run;
3022 }
3023
3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3025
3026 for (i = 2; i < items; i++)
3027 av_push (coro->args, newSVsv (ST (i)));
3028 }
3029}
3030 OUTPUT:
3031 RETVAL 3517 RETVAL
3032 3518
3033void 3519void
3034transfer (...) 3520transfer (...)
3035 PROTOTYPE: $$ 3521 PROTOTYPE: $$
3036 CODE: 3522 CODE:
3037 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3523 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3038
3039bool
3040_destroy (SV *coro_sv)
3041 CODE:
3042 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3043 OUTPUT:
3044 RETVAL
3045 3524
3046void 3525void
3047_exit (int code) 3526_exit (int code)
3048 PROTOTYPE: $ 3527 PROTOTYPE: $
3049 CODE: 3528 CODE:
… …
3125 CODE: 3604 CODE:
3126{ 3605{
3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3606 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3128 { 3607 {
3129 struct coro *current = SvSTATE_current; 3608 struct coro *current = SvSTATE_current;
3609 struct CoroSLF slf_save;
3130 3610
3131 if (current != coro) 3611 if (current != coro)
3132 { 3612 {
3133 PUTBACK; 3613 PUTBACK;
3134 save_perl (aTHX_ current); 3614 save_perl (aTHX_ current);
3135 load_perl (aTHX_ coro); 3615 load_perl (aTHX_ coro);
3616 /* the coro is most likely in an active SLF call.
3617 * while not strictly required (the code we execute is
3618 * not allowed to call any SLF functions), it's cleaner
3619 * to reinitialise the slf_frame and restore it later.
3620 * This might one day allow us to actually do SLF calls
3621 * from code executed here.
3622 */
3623 slf_save = slf_frame;
3624 slf_frame.prepare = 0;
3136 SPAGAIN; 3625 SPAGAIN;
3137 } 3626 }
3138 3627
3139 PUSHSTACK; 3628 PUSHSTACK;
3140 3629
… …
3150 SPAGAIN; 3639 SPAGAIN;
3151 3640
3152 if (current != coro) 3641 if (current != coro)
3153 { 3642 {
3154 PUTBACK; 3643 PUTBACK;
3644 slf_frame = slf_save;
3155 save_perl (aTHX_ coro); 3645 save_perl (aTHX_ coro);
3156 load_perl (aTHX_ current); 3646 load_perl (aTHX_ current);
3157 SPAGAIN; 3647 SPAGAIN;
3158 } 3648 }
3159 } 3649 }
… …
3164 PROTOTYPE: $ 3654 PROTOTYPE: $
3165 ALIAS: 3655 ALIAS:
3166 is_ready = CF_READY 3656 is_ready = CF_READY
3167 is_running = CF_RUNNING 3657 is_running = CF_RUNNING
3168 is_new = CF_NEW 3658 is_new = CF_NEW
3169 is_destroyed = CF_DESTROYED 3659 is_destroyed = CF_ZOMBIE
3660 is_zombie = CF_ZOMBIE
3170 is_suspended = CF_SUSPENDED 3661 is_suspended = CF_SUSPENDED
3171 CODE: 3662 CODE:
3172 RETVAL = boolSV (coro->flags & ix); 3663 RETVAL = boolSV (coro->flags & ix);
3173 OUTPUT: 3664 OUTPUT:
3174 RETVAL 3665 RETVAL
3175 3666
3176void 3667void
3177throw (Coro::State self, SV *throw = &PL_sv_undef) 3668throw (SV *self, SV *exception = &PL_sv_undef)
3178 PROTOTYPE: $;$ 3669 PROTOTYPE: $;$
3179 CODE: 3670 CODE:
3180{ 3671{
3672 struct coro *coro = SvSTATE (self);
3181 struct coro *current = SvSTATE_current; 3673 struct coro *current = SvSTATE_current;
3182 SV **throwp = self == current ? &CORO_THROW : &self->except; 3674 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3183 SvREFCNT_dec (*throwp); 3675 SvREFCNT_dec (*exceptionp);
3184 SvGETMAGIC (throw); 3676 SvGETMAGIC (exception);
3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3677 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3678
3679 api_ready (aTHX_ self);
3186} 3680}
3187 3681
3188void 3682void
3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3683api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3190 PROTOTYPE: $;$ 3684 PROTOTYPE: $;$
… …
3245 3739
3246void 3740void
3247cancel (Coro::State self) 3741cancel (Coro::State self)
3248 CODE: 3742 CODE:
3249 coro_state_destroy (aTHX_ self); 3743 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3251
3252 3744
3253SV * 3745SV *
3254enable_times (int enabled = enable_times) 3746enable_times (int enabled = enable_times)
3255 CODE: 3747 CODE:
3256{ 3748{
… …
3271times (Coro::State self) 3763times (Coro::State self)
3272 PPCODE: 3764 PPCODE:
3273{ 3765{
3274 struct coro *current = SvSTATE (coro_current); 3766 struct coro *current = SvSTATE (coro_current);
3275 3767
3276 if (expect_false (current == self)) 3768 if (ecb_expect_false (current == self))
3277 { 3769 {
3278 coro_times_update (); 3770 coro_times_update ();
3279 coro_times_add (SvSTATE (coro_current)); 3771 coro_times_add (SvSTATE (coro_current));
3280 } 3772 }
3281 3773
3282 EXTEND (SP, 2); 3774 EXTEND (SP, 2);
3283 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3775 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3284 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3776 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3285 3777
3286 if (expect_false (current == self)) 3778 if (ecb_expect_false (current == self))
3287 coro_times_sub (SvSTATE (coro_current)); 3779 coro_times_sub (SvSTATE (coro_current));
3288} 3780}
3781
3782void
3783swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3784 CODE:
3785{
3786 struct coro *current = SvSTATE_current;
3787
3788 if (current == coro)
3789 SWAP_SVS (current);
3790
3791 if (!coro->swap_sv)
3792 coro->swap_sv = newAV ();
3793
3794 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3795 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3796
3797 if (current == coro)
3798 SWAP_SVS (current);
3799}
3800
3289 3801
3290MODULE = Coro::State PACKAGE = Coro 3802MODULE = Coro::State PACKAGE = Coro
3291 3803
3292BOOT: 3804BOOT:
3293{ 3805{
3294 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3806 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3295 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3807 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3296 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3808 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3297 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3298 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3809 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3299 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3810 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3300 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3811 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3301 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3812 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3302 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3813 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3303 3814
3304 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3815 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3305 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3816 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3306 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3817 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3307 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3818 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3308 3819
3309 coro_stash = gv_stashpv ("Coro", TRUE); 3820 coro_stash = gv_stashpv ("Coro", TRUE);
3310 3821
3311 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3822 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3312 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3823 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3313 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3824 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3331 sv_setiv (sv, (IV)&coroapi); 3842 sv_setiv (sv, (IV)&coroapi);
3332 SvREADONLY_on (sv); 3843 SvREADONLY_on (sv);
3333 } 3844 }
3334} 3845}
3335 3846
3847SV *
3848async (...)
3849 PROTOTYPE: &@
3850 CODE:
3851 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3852 api_ready (aTHX_ RETVAL);
3853 OUTPUT:
3854 RETVAL
3855
3856void
3857_destroy (Coro::State coro)
3858 CODE:
3859 /* used by the manager thread */
3860 coro_state_destroy (aTHX_ coro);
3861
3862void
3863on_destroy (Coro::State coro, SV *cb)
3864 CODE:
3865 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3866
3867void
3868join (...)
3869 CODE:
3870 CORO_EXECUTE_SLF_XS (slf_init_join);
3871
3336void 3872void
3337terminate (...) 3873terminate (...)
3338 CODE: 3874 CODE:
3339 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3875 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3876
3877void
3878cancel (...)
3879 CODE:
3880 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3881
3882int
3883safe_cancel (Coro::State self, ...)
3884 C_ARGS: aTHX_ self, &ST (1), items - 1
3340 3885
3341void 3886void
3342schedule (...) 3887schedule (...)
3343 CODE: 3888 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3889 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3374_set_readyhook (SV *hook) 3919_set_readyhook (SV *hook)
3375 PROTOTYPE: $ 3920 PROTOTYPE: $
3376 CODE: 3921 CODE:
3377 SvREFCNT_dec (coro_readyhook); 3922 SvREFCNT_dec (coro_readyhook);
3378 SvGETMAGIC (hook); 3923 SvGETMAGIC (hook);
3924 if (SvOK (hook))
3925 {
3379 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3926 coro_readyhook = newSVsv (hook);
3927 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3928 }
3929 else
3930 {
3931 coro_readyhook = 0;
3932 CORO_READYHOOK = 0;
3933 }
3380 3934
3381int 3935int
3382prio (Coro::State coro, int newprio = 0) 3936prio (Coro::State coro, int newprio = 0)
3383 PROTOTYPE: $;$ 3937 PROTOTYPE: $;$
3384 ALIAS: 3938 ALIAS:
… …
3448 for (i = 1; i < items; ++i) 4002 for (i = 1; i < items; ++i)
3449 av_push (av, SvREFCNT_inc_NN (ST (i))); 4003 av_push (av, SvREFCNT_inc_NN (ST (i)));
3450 4004
3451 if ((SV *)hv == &PL_sv_undef) 4005 if ((SV *)hv == &PL_sv_undef)
3452 { 4006 {
3453 PUSHMARK (SP); 4007 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3454 EXTEND (SP, 2);
3455 PUSHs (sv_Coro);
3456 PUSHs ((SV *)cv_pool_handler);
3457 PUTBACK;
3458 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3459 SPAGAIN;
3460
3461 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4008 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4009 SvREFCNT_dec (sv);
3462 } 4010 }
3463 4011
3464 { 4012 {
3465 struct coro *coro = SvSTATE_hv (hv); 4013 struct coro *coro = SvSTATE_hv (hv);
3466 4014
… …
3617} 4165}
3618 4166
3619MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4167MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3620 4168
3621void 4169void
3622_may_delete (SV *sem, int count, int extra_refs) 4170_may_delete (SV *sem, int count, unsigned int extra_refs)
3623 PPCODE: 4171 PPCODE:
3624{ 4172{
3625 AV *av = (AV *)SvRV (sem); 4173 AV *av = (AV *)SvRV (sem);
3626 4174
3627 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4175 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3717 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4265 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3718 sv_setpv ((SV *)slf_cv, proto); 4266 sv_setpv ((SV *)slf_cv, proto);
3719 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4267 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3720} 4268}
3721 4269
4270MODULE = Coro::State PACKAGE = Coro::Select
4271
4272void
4273patch_pp_sselect ()
4274 CODE:
4275 if (!coro_old_pp_sselect)
4276 {
4277 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4278 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4279 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4280 }
4281
4282void
4283unpatch_pp_sselect ()
4284 CODE:
4285 if (coro_old_pp_sselect)
4286 {
4287 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4288 coro_old_pp_sselect = 0;
4289 }
4290

Diff Legend

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