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.378 by root, Sat Dec 12 01:30:26 2009 UTC vs.
Revision 1.410 by root, Sun Jun 12 08:14:12 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
1#define NDEBUG 1 4#define NDEBUG 1
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
… …
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
14 18
19#include <stddef.h>
15#include <stdio.h> 20#include <stdio.h>
16#include <errno.h> 21#include <errno.h>
17#include <assert.h> 22#include <assert.h>
18 23
19#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 25# define SVs_PADSTALE 0
21#endif 26#endif
22 27
23#ifdef WIN32 28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
24# undef setjmp 30# undef setjmp
25# undef longjmp 31# undef longjmp
26# undef _exit 32# undef _exit
27# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
28#else 34#else
29# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
30#endif 36#endif
31 37
32#ifdef HAVE_MMAP 38#if HAVE_MMAP
33# include <unistd.h> 39# include <unistd.h>
34# include <sys/mman.h> 40# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
36# ifdef MAP_ANON 42# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
82# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
83#endif 89#endif
84 90
85#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
86 92
87#if __GNUC__ >= 3
88# define attribute(x) __attribute__(x)
89# define expect(expr,value) __builtin_expect ((expr), (value))
90# define INLINE static inline
91#else
92# define attribute(x)
93# define expect(expr,value) (expr)
94# define INLINE static
95#endif
96
97#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1)
99
100#define NOINLINE attribute ((noinline))
101
102#include "CoroAPI.h" 93#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
104 95
105#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
106# if CORO_PTHREAD 97# if CORO_PTHREAD
107static void *coro_thx; 98static void *coro_thx;
108# endif 99# endif
109#endif 100#endif
101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
110 104
111#ifdef __linux 105#ifdef __linux
112# include <time.h> /* for timespec */ 106# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */ 107# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime 108# ifdef SYS_clock_gettime
… …
122static void (*u2time)(pTHX_ UV ret[2]); 116static void (*u2time)(pTHX_ UV ret[2]);
123 117
124/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
127 122
128static U32 cctx_gen; 123static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 156static char times_valid;
162 157
163static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
165 160
166enum { 161enum
162{
167 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
192 int valgrind_id; 188 int valgrind_id;
193#endif 189#endif
194 unsigned char flags; 190 unsigned char flags;
195} coro_cctx; 191} coro_cctx;
196 192
197coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
198 194
199/*****************************************************************************/ 195/*****************************************************************************/
200 196
197static MGVTBL coro_state_vtbl;
198
201enum { 199enum
200{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 207};
208 208
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 210typedef struct
211{ 211{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
218# include "state.h" 213# include "state.h"
219#undef VAR 214#undef VARx
220} perl_slots; 215} perl_slots;
221 216
217/* how many context stack entries do we need for perl_slots */
222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 219
224/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
225struct coro { 221struct coro
222{
226 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 224 coro_cctx *cctx;
228 225
229 /* ready queue */ 226 /* ready queue */
230 struct coro *next_ready; 227 struct coro *next_ready;
… …
232 /* state data */ 229 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 231 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
236 233
237 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 238
244 /* statistics */ 239 /* statistics */
245 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
246 241
247 /* coro process data */ 242 /* coro process data */
248 int prio; 243 int prio;
249 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 245 SV *rouse_cb; /* last rouse callback */
246 AV *on_destroy; /* callbacks or coros to notify on destroy */
247 AV *status; /* the exit status list */
251 248
252 /* async_pool */ 249 /* async_pool */
253 SV *saved_deffh; 250 SV *saved_deffh;
254 SV *invoke_cb; 251 SV *invoke_cb;
255 AV *invoke_av; 252 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
273 270
274/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
278 275
279/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
280 277
281#define CORO_PRIO_MAX 3 278#define CORO_PRIO_MAX 3
… …
287 284
288/* for Coro.pm */ 285/* for Coro.pm */
289static SV *coro_current; 286static SV *coro_current;
290static SV *coro_readyhook; 287static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
293static struct coro *coro_first; 290static struct coro *coro_first;
294#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 /* APPLE doesn't have HAVE_MMAP though */
297 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
298 #ifndef CORO_JIT_TYPE
299 #if __x86_64 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "amd64-unix"
301 #elif __i386 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "x86-unix"
303 #endif
304 #endif
305#endif
306
307#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
308 #undef CORO_JIT
309#endif
310
311#if CORO_JIT
312 typedef void (*load_save_perl_slots_type)(perl_slots *);
313 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
314#endif
295 315
296/** Coro::Select ************************************************************/ 316/** Coro::Select ************************************************************/
297 317
298static OP *(*coro_old_pp_sselect) (pTHX); 318static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 319static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 331 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 332 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 333 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 334}
315 335
336/** time stuff **************************************************************/
337
338#ifdef HAS_GETTIMEOFDAY
339
340ECB_INLINE void
341coro_u2time (pTHX_ UV ret[2])
342{
343 struct timeval tv;
344 gettimeofday (&tv, 0);
345
346 ret [0] = tv.tv_sec;
347 ret [1] = tv.tv_usec;
348}
349
350ECB_INLINE double
351coro_nvtime (void)
352{
353 struct timeval tv;
354 gettimeofday (&tv, 0);
355
356 return tv.tv_sec + tv.tv_usec * 1e-6;
357}
358
359ECB_INLINE void
360time_init (pTHX)
361{
362 nvtime = coro_nvtime;
363 u2time = coro_u2time;
364}
365
366#else
367
368ECB_INLINE void
369time_init (pTHX)
370{
371 SV **svp;
372
373 require_pv ("Time/HiRes.pm");
374
375 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
376
377 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
378 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
379
380 nvtime = INT2PTR (double (*)(), SvIV (*svp));
381
382 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
383 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
384}
385
386#endif
387
316/** lowlevel stuff **********************************************************/ 388/** lowlevel stuff **********************************************************/
317 389
318static SV * 390static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 391coro_get_sv (pTHX_ const char *name, int create)
320{ 392{
321#if PERL_VERSION_ATLEAST (5,10,0) 393#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 394 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 395 get_sv (name, create);
324#endif 396#endif
325 return get_sv (name, create); 397 return get_sv (name, create);
326} 398}
327 399
328static AV * 400static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 401coro_get_av (pTHX_ const char *name, int create)
330{ 402{
331#if PERL_VERSION_ATLEAST (5,10,0) 403#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 404 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 405 get_av (name, create);
334#endif 406#endif
335 return get_av (name, create); 407 return get_av (name, create);
336} 408}
337 409
338static HV * 410static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 411coro_get_hv (pTHX_ const char *name, int create)
340{ 412{
341#if PERL_VERSION_ATLEAST (5,10,0) 413#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 414 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 415 get_hv (name, create);
344#endif 416#endif
345 return get_hv (name, create); 417 return get_hv (name, create);
346} 418}
347 419
348INLINE void 420ECB_INLINE void
349coro_times_update () 421coro_times_update (void)
350{ 422{
351#ifdef coro_clock_gettime 423#ifdef coro_clock_gettime
352 struct timespec ts; 424 struct timespec ts;
353 425
354 ts.tv_sec = ts.tv_nsec = 0; 426 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 438 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 439 time_real [1] = tv [1] * 1000;
368#endif 440#endif
369} 441}
370 442
371INLINE void 443ECB_INLINE void
372coro_times_add (struct coro *c) 444coro_times_add (struct coro *c)
373{ 445{
374 c->t_real [1] += time_real [1]; 446 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 447 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 448 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 450 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 451 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 452 c->t_cpu [0] += time_cpu [0];
381} 453}
382 454
383INLINE void 455ECB_INLINE void
384coro_times_sub (struct coro *c) 456coro_times_sub (struct coro *c)
385{ 457{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 458 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1]; 459 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 460 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 468/* magic glue */
397 469
398#define CORO_MAGIC_type_cv 26 470#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 471#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 472
401#define CORO_MAGIC_NN(sv, type) \ 473#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 474 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 475 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 476 : mg_find (sv, type))
405 477
406#define CORO_MAGIC(sv, type) \ 478#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 479 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 480 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 481 : 0)
410 482
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 483#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 484#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 485
486ECB_INLINE MAGIC *
487SvSTATEhv_p (pTHX_ SV *coro)
488{
489 MAGIC *mg;
490
491 if (ecb_expect_true (
492 SvTYPE (coro) == SVt_PVHV
493 && (mg = CORO_MAGIC_state (coro))
494 && mg->mg_virtual == &coro_state_vtbl
495 ))
496 return mg;
497
498 return 0;
499}
500
414INLINE struct coro * 501ECB_INLINE struct coro *
415SvSTATE_ (pTHX_ SV *coro) 502SvSTATE_ (pTHX_ SV *coro)
416{ 503{
417 HV *stash;
418 MAGIC *mg; 504 MAGIC *mg;
419 505
420 if (SvROK (coro)) 506 if (SvROK (coro))
421 coro = SvRV (coro); 507 coro = SvRV (coro);
422 508
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 509 mg = SvSTATEhv_p (aTHX_ coro);
510 if (!mg)
424 croak ("Coro::State object required"); 511 croak ("Coro::State object required");
425 512
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr; 513 return (struct coro *)mg->mg_ptr;
436} 514}
437 515
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 516#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 517
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 520#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 521
444/*****************************************************************************/ 522/*****************************************************************************/
445/* padlist management and caching */ 523/* padlist management and caching */
446 524
447static AV * 525ECB_INLINE AV *
448coro_derive_padlist (pTHX_ CV *cv) 526coro_derive_padlist (pTHX_ CV *cv)
449{ 527{
450 AV *padlist = CvPADLIST (cv); 528 AV *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 529 AV *newpadlist, *newpad;
452 530
… …
464 av_store (newpadlist, 1, (SV *)newpad); 542 av_store (newpadlist, 1, (SV *)newpad);
465 543
466 return newpadlist; 544 return newpadlist;
467} 545}
468 546
469static void 547ECB_INLINE void
470free_padlist (pTHX_ AV *padlist) 548free_padlist (pTHX_ AV *padlist)
471{ 549{
472 /* may be during global destruction */ 550 /* may be during global destruction */
473 if (!IN_DESTRUCT) 551 if (!IN_DESTRUCT)
474 { 552 {
… …
517 0, 0, 0, 0, 595 0, 0, 0, 0,
518 coro_cv_free 596 coro_cv_free
519}; 597};
520 598
521/* the next two functions merely cache the padlists */ 599/* the next two functions merely cache the padlists */
522static void 600ECB_INLINE void
523get_padlist (pTHX_ CV *cv) 601get_padlist (pTHX_ CV *cv)
524{ 602{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 603 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 604 AV *av;
527 605
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
530 else 608 else
531 { 609 {
532#if CORO_PREFER_PERL_FUNCTIONS 610#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 611 /* this is probably cleaner? but also slower! */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 618 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 619#endif
542 } 620 }
543} 621}
544 622
545static void 623ECB_INLINE void
546put_padlist (pTHX_ CV *cv) 624put_padlist (pTHX_ CV *cv)
547{ 625{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 626 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av; 627 AV *av;
550 628
551 if (expect_false (!mg)) 629 if (ecb_expect_false (!mg))
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 630 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
553 631
554 av = (AV *)mg->mg_obj; 632 av = (AV *)mg->mg_obj;
555 633
556 if (expect_false (AvFILLp (av) >= AvMAX (av))) 634 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
557 av_extend (av, AvFILLp (av) + 1); 635 av_extend (av, AvFILLp (av) + 1);
558 636
559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 637 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
560} 638}
561 639
… …
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep); 661 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep); 662 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585 663
586#if PERL_VERSION_ATLEAST (5,10,0) 664#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is 665 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could 666 * much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this. 667 * sv_upgrade to avoid this.
590 */ 668 */
591 { 669 {
592 /* swap sv_u */ 670 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 671 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
… …
606 } 684 }
607#endif 685#endif
608 } 686 }
609} 687}
610 688
611#define SWAP_SVS(coro) \ 689#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 690 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 691 swap_svs (aTHX_ (coro))
614 692
615static void 693static void
616on_enterleave_call (pTHX_ SV *cb); 694on_enterleave_call (pTHX_ SV *cb);
617 695
… …
621 perl_slots *slot = c->slot; 699 perl_slots *slot = c->slot;
622 c->slot = 0; 700 c->slot = 0;
623 701
624 PL_mainstack = c->mainstack; 702 PL_mainstack = c->mainstack;
625 703
626 GvSV (PL_defgv) = slot->defsv; 704#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 705 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 706#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 707 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 708 # include "state.h"
634 #undef VAR 709 #undef VARx
710#endif
635 711
636 { 712 {
637 dSP; 713 dSP;
638 714
639 CV *cv; 715 CV *cv;
640 716
641 /* now do the ugly restore mess */ 717 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 718 while (ecb_expect_true (cv = (CV *)POPs))
643 { 719 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 720 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 721 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 722 CvPADLIST (cv) = (AV *)POPs;
647 } 723 }
… …
650 } 726 }
651 727
652 slf_frame = c->slf_frame; 728 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 729 CORO_THROW = c->except;
654 730
655 if (expect_false (enable_times)) 731 if (ecb_expect_false (enable_times))
656 { 732 {
657 if (expect_false (!times_valid)) 733 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 734 coro_times_update ();
659 735
660 coro_times_sub (c); 736 coro_times_sub (c);
661 } 737 }
662 738
663 if (expect_false (c->on_enter)) 739 if (ecb_expect_false (c->on_enter))
664 { 740 {
665 int i; 741 int i;
666 742
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 743 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 744 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 750static void
675save_perl (pTHX_ Coro__State c) 751save_perl (pTHX_ Coro__State c)
676{ 752{
677 SWAP_SVS (c); 753 SWAP_SVS (c);
678 754
679 if (expect_false (c->on_leave)) 755 if (ecb_expect_false (c->on_leave))
680 { 756 {
681 int i; 757 int i;
682 758
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 759 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 760 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 761 }
686 762
687 times_valid = 0; 763 times_valid = 0;
688 764
689 if (expect_false (enable_times)) 765 if (ecb_expect_false (enable_times))
690 { 766 {
691 coro_times_update (); times_valid = 1; 767 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 768 coro_times_add (c);
693 } 769 }
694 770
… …
708 784
709 XPUSHs (Nullsv); 785 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 786 /* this loop was inspired by pp_caller */
711 for (;;) 787 for (;;)
712 { 788 {
713 while (expect_true (cxix >= 0)) 789 while (ecb_expect_true (cxix >= 0))
714 { 790 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 791 PERL_CONTEXT *cx = &ccstk[cxix--];
716 792
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 793 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 794 {
719 CV *cv = cx->blk_sub.cv; 795 CV *cv = cx->blk_sub.cv;
720 796
721 if (expect_true (CvDEPTH (cv))) 797 if (ecb_expect_true (CvDEPTH (cv)))
722 { 798 {
723 EXTEND (SP, 3); 799 EXTEND (SP, 3);
724 PUSHs ((SV *)CvPADLIST (cv)); 800 PUSHs ((SV *)CvPADLIST (cv));
725 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 801 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
726 PUSHs ((SV *)cv); 802 PUSHs ((SV *)cv);
… …
729 get_padlist (aTHX_ cv); 805 get_padlist (aTHX_ cv);
730 } 806 }
731 } 807 }
732 } 808 }
733 809
734 if (expect_true (top_si->si_type == PERLSI_MAIN)) 810 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
735 break; 811 break;
736 812
737 top_si = top_si->si_prev; 813 top_si = top_si->si_prev;
738 ccstk = top_si->si_cxstack; 814 ccstk = top_si->si_cxstack;
739 cxix = top_si->si_cxix; 815 cxix = top_si->si_cxix;
… …
741 817
742 PUTBACK; 818 PUTBACK;
743 } 819 }
744 820
745 /* allocate some space on the context stack for our purposes */ 821 /* allocate some space on the context stack for our purposes */
746 /* we manually unroll here, as usually 2 slots is enough */ 822 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
747 if (SLOT_COUNT >= 1) CXINC;
748 if (SLOT_COUNT >= 2) CXINC;
749 if (SLOT_COUNT >= 3) CXINC;
750 { 823 {
751 unsigned int i; 824 unsigned int i;
825
752 for (i = 3; i < SLOT_COUNT; ++i) 826 for (i = 0; i < SLOT_COUNT; ++i)
753 CXINC; 827 CXINC;
754 } 828
755 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 829 cxstack_ix -= SLOT_COUNT; /* undo allocation */
830 }
756 831
757 c->mainstack = PL_mainstack; 832 c->mainstack = PL_mainstack;
758 833
759 { 834 {
760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 835 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
761 836
762 slot->defav = GvAV (PL_defgv); 837#if CORO_JIT
763 slot->defsv = DEFSV; 838 save_perl_slots (slot);
764 slot->errsv = ERRSV; 839#else
765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
767
768 #define VAR(name,type) slot->name = PL_ ## name; 840 #define VARx(name,expr,type) slot->name = expr;
769 # include "state.h" 841 # include "state.h"
770 #undef VAR 842 #undef VARx
843#endif
771 } 844 }
772} 845}
773 846
774/* 847/*
775 * allocate various perl stacks. This is almost an exact copy 848 * allocate various perl stacks. This is almost an exact copy
… …
781# define coro_init_stacks(thx) init_stacks () 854# define coro_init_stacks(thx) init_stacks ()
782#else 855#else
783static void 856static void
784coro_init_stacks (pTHX) 857coro_init_stacks (pTHX)
785{ 858{
786 PL_curstackinfo = new_stackinfo(32, 8); 859 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
787 PL_curstackinfo->si_type = PERLSI_MAIN; 860 PL_curstackinfo->si_type = PERLSI_MAIN;
788 PL_curstack = PL_curstackinfo->si_stack; 861 PL_curstack = PL_curstackinfo->si_stack;
789 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 862 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
790 863
791 PL_stack_base = AvARRAY(PL_curstack); 864 PL_stack_base = AvARRAY(PL_curstack);
… …
898#endif 971#endif
899 972
900/* 973/*
901 * This overrides the default magic get method of %SIG elements. 974 * This overrides the default magic get method of %SIG elements.
902 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 975 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
903 * and instead of trying to save and restore the hash elements, we just provide 976 * and instead of trying to save and restore the hash elements (extremely slow),
904 * readback here. 977 * we just provide our own readback here.
905 */ 978 */
906static int 979static int ecb_cold
907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 980coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
908{ 981{
909 const char *s = MgPV_nolen_const (mg); 982 const char *s = MgPV_nolen_const (mg);
910 983
911 if (*s == '_') 984 if (*s == '_')
… …
923 } 996 }
924 997
925 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
926} 999}
927 1000
928static int 1001static int ecb_cold
929coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1002coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
930{ 1003{
931 const char *s = MgPV_nolen_const (mg); 1004 const char *s = MgPV_nolen_const (mg);
932 1005
933 if (*s == '_') 1006 if (*s == '_')
… …
947 } 1020 }
948 1021
949 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1022 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
950} 1023}
951 1024
952static int 1025static int ecb_cold
953coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1026coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
954{ 1027{
955 const char *s = MgPV_nolen_const (mg); 1028 const char *s = MgPV_nolen_const (mg);
956 1029
957 if (*s == '_') 1030 if (*s == '_')
… …
992 return 1; 1065 return 1;
993} 1066}
994 1067
995static UNOP init_perl_op; 1068static UNOP init_perl_op;
996 1069
997static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1070ecb_noinline static void /* noinline to keep it out of the transfer fast path */
998init_perl (pTHX_ struct coro *coro) 1071init_perl (pTHX_ struct coro *coro)
999{ 1072{
1000 /* 1073 /*
1001 * emulate part of the perl startup here. 1074 * emulate part of the perl startup here.
1002 */ 1075 */
… …
1010 PL_comppad_name_fill = 0; 1083 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1084 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1085 PL_curpm = 0;
1013 PL_curpad = 0; 1086 PL_curpad = 0;
1014 PL_localizing = 0; 1087 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1088 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1089#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1090 PL_parser = 0;
1019#endif 1091#endif
1020 PL_hints = 0; 1092 PL_hints = 0;
1021 1093
1022 /* recreate the die/warn hooks */ 1094 /* recreate the die/warn hooks */
1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1095 PL_diehook = SvREFCNT_inc (rv_diehook);
1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1096 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1025 1097
1026 GvSV (PL_defgv) = newSV (0); 1098 GvSV (PL_defgv) = newSV (0);
1027 GvAV (PL_defgv) = coro->args; coro->args = 0; 1099 GvAV (PL_defgv) = coro->args; coro->args = 0;
1028 GvSV (PL_errgv) = newSV (0); 1100 GvSV (PL_errgv) = newSV (0);
1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1101 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1050 /* this newly created coroutine might be run on an existing cctx which most 1122 /* this newly created coroutine might be run on an existing cctx which most
1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1123 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1052 */ 1124 */
1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1125 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1126 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1127 slf_frame.destroy = 0;
1055 1128
1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1129 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1057 init_perl_op.op_next = PL_op; 1130 init_perl_op.op_next = PL_op;
1058 init_perl_op.op_type = OP_ENTERSUB; 1131 init_perl_op.op_type = OP_ENTERSUB;
1059 init_perl_op.op_ppaddr = pp_slf; 1132 init_perl_op.op_ppaddr = pp_slf;
… …
1064 /* copy throw, in case it was set before init_perl */ 1137 /* copy throw, in case it was set before init_perl */
1065 CORO_THROW = coro->except; 1138 CORO_THROW = coro->except;
1066 1139
1067 SWAP_SVS (coro); 1140 SWAP_SVS (coro);
1068 1141
1069 if (expect_false (enable_times)) 1142 if (ecb_expect_false (enable_times))
1070 { 1143 {
1071 coro_times_update (); 1144 coro_times_update ();
1072 coro_times_sub (coro); 1145 coro_times_sub (coro);
1073 } 1146 }
1074} 1147}
… …
1098destroy_perl (pTHX_ struct coro *coro) 1171destroy_perl (pTHX_ struct coro *coro)
1099{ 1172{
1100 SV *svf [9]; 1173 SV *svf [9];
1101 1174
1102 { 1175 {
1176 SV *old_current = SvRV (coro_current);
1103 struct coro *current = SvSTATE_current; 1177 struct coro *current = SvSTATE (old_current);
1104 1178
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1179 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1180
1107 save_perl (aTHX_ current); 1181 save_perl (aTHX_ current);
1182
1183 /* this will cause transfer_check to croak on block*/
1184 SvRV_set (coro_current, (SV *)coro->hv);
1185
1108 load_perl (aTHX_ coro); 1186 load_perl (aTHX_ coro);
1109 1187
1110 coro_unwind_stacks (aTHX); 1188 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112 1189
1113 /* restore swapped sv's */ 1190 /* restore swapped sv's */
1114 SWAP_SVS (coro); 1191 SWAP_SVS (coro);
1115 1192
1193 coro_destruct_stacks (aTHX);
1194
1116 // now save some sv's to be free'd later 1195 /* now save some sv's to be free'd later */
1117 svf [0] = GvSV (PL_defgv); 1196 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv); 1197 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv); 1198 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv; 1199 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs; 1200 svf [4] = PL_rs;
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1202 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1203 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1204 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1205 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1206
1207 SvRV_set (coro_current, old_current);
1208
1128 load_perl (aTHX_ current); 1209 load_perl (aTHX_ current);
1129 } 1210 }
1130 1211
1131 { 1212 {
1132 unsigned int i; 1213 unsigned int i;
… …
1139 SvREFCNT_dec (coro->invoke_cb); 1220 SvREFCNT_dec (coro->invoke_cb);
1140 SvREFCNT_dec (coro->invoke_av); 1221 SvREFCNT_dec (coro->invoke_av);
1141 } 1222 }
1142} 1223}
1143 1224
1144INLINE void 1225ECB_INLINE void
1145free_coro_mortal (pTHX) 1226free_coro_mortal (pTHX)
1146{ 1227{
1147 if (expect_true (coro_mortal)) 1228 if (ecb_expect_true (coro_mortal))
1148 { 1229 {
1149 SvREFCNT_dec (coro_mortal); 1230 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1231 coro_mortal = 0;
1151 } 1232 }
1152} 1233}
1153 1234
1154static int 1235static int
… …
1287 1368
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1369 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1370}
1290 1371
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1372/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1373static void ecb_noinline
1293cctx_prepare (pTHX) 1374cctx_prepare (pTHX)
1294{ 1375{
1295 PL_top_env = &PL_start_env; 1376 PL_top_env = &PL_start_env;
1296 1377
1297 if (cctx_current->flags & CC_TRACE) 1378 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1389 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1390 slf_frame.check = slf_check_set_stacklevel;
1310} 1391}
1311 1392
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1393/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1394ECB_INLINE void
1314transfer_tail (pTHX) 1395transfer_tail (pTHX)
1315{ 1396{
1316 free_coro_mortal (aTHX); 1397 free_coro_mortal (aTHX);
1317} 1398}
1318 1399
… …
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1443 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1444 }
1364} 1445}
1365 1446
1366static coro_cctx * 1447static coro_cctx *
1367cctx_new () 1448cctx_new (void)
1368{ 1449{
1369 coro_cctx *cctx; 1450 coro_cctx *cctx;
1370 1451
1371 ++cctx_count; 1452 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1453 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1459 return cctx;
1379} 1460}
1380 1461
1381/* create a new cctx only suitable as source */ 1462/* create a new cctx only suitable as source */
1382static coro_cctx * 1463static coro_cctx *
1383cctx_new_empty () 1464cctx_new_empty (void)
1384{ 1465{
1385 coro_cctx *cctx = cctx_new (); 1466 coro_cctx *cctx = cctx_new ();
1386 1467
1387 cctx->sptr = 0; 1468 cctx->sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1469 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1390 return cctx; 1471 return cctx;
1391} 1472}
1392 1473
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1474/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1475static coro_cctx *
1395cctx_new_run () 1476cctx_new_run (void)
1396{ 1477{
1397 coro_cctx *cctx = cctx_new (); 1478 coro_cctx *cctx = cctx_new ();
1398 void *stack_start; 1479 void *stack_start;
1399 size_t stack_size; 1480 size_t stack_size;
1400 1481
1401#if HAVE_MMAP 1482#if HAVE_MMAP
1402 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1483 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1403 /* mmap supposedly does allocate-on-write for us */ 1484 /* mmap supposedly does allocate-on-write for us */
1404 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1485 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1405 1486
1406 if (cctx->sptr != (void *)-1) 1487 if (cctx->sptr != (void *)-1)
1407 { 1488 {
1408 #if CORO_STACKGUARD 1489 #if CORO_STACKGUARD
1409 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1490 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1441cctx_destroy (coro_cctx *cctx) 1522cctx_destroy (coro_cctx *cctx)
1442{ 1523{
1443 if (!cctx) 1524 if (!cctx)
1444 return; 1525 return;
1445 1526
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1527 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1528
1448 --cctx_count; 1529 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1530 coro_destroy (&cctx->cctx);
1450 1531
1451 /* coro_transfer creates new, empty cctx's */ 1532 /* coro_transfer creates new, empty cctx's */
… …
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1551#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1552
1472static coro_cctx * 1553static coro_cctx *
1473cctx_get (pTHX) 1554cctx_get (pTHX)
1474{ 1555{
1475 while (expect_true (cctx_first)) 1556 while (ecb_expect_true (cctx_first))
1476 { 1557 {
1477 coro_cctx *cctx = cctx_first; 1558 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1559 cctx_first = cctx->next;
1479 --cctx_idle; 1560 --cctx_idle;
1480 1561
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1562 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1563 return cctx;
1483 1564
1484 cctx_destroy (cctx); 1565 cctx_destroy (cctx);
1485 } 1566 }
1486 1567
… …
1491cctx_put (coro_cctx *cctx) 1572cctx_put (coro_cctx *cctx)
1492{ 1573{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1574 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1494 1575
1495 /* free another cctx if overlimit */ 1576 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1578 {
1498 coro_cctx *first = cctx_first; 1579 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1580 cctx_first = first->next;
1500 --cctx_idle; 1581 --cctx_idle;
1501 1582
… …
1512static void 1593static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1594transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1595{
1515 /* TODO: throwing up here is considered harmful */ 1596 /* TODO: throwing up here is considered harmful */
1516 1597
1517 if (expect_true (prev != next)) 1598 if (ecb_expect_true (prev != next))
1518 { 1599 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1600 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1601 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1602
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1603 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1604 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1605
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1606#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1607 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1608 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1609#endif
1529 } 1610 }
1530} 1611}
1531 1612
1532/* always use the TRANSFER macro */ 1613/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1614static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1615transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1616{
1536 dSTACKLEVEL; 1617 dSTACKLEVEL;
1537 1618
1538 /* sometimes transfer is only called to set idle_sp */ 1619 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1620 if (ecb_expect_false (!prev))
1540 { 1621 {
1541 cctx_current->idle_sp = STACKLEVEL; 1622 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1623 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1624 }
1544 else if (expect_true (prev != next)) 1625 else if (ecb_expect_true (prev != next))
1545 { 1626 {
1546 coro_cctx *cctx_prev; 1627 coro_cctx *cctx_prev;
1547 1628
1548 if (expect_false (prev->flags & CF_NEW)) 1629 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1630 {
1550 /* create a new empty/source context */ 1631 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1632 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1633 prev->flags |= CF_RUNNING;
1553 } 1634 }
… …
1556 next->flags |= CF_RUNNING; 1637 next->flags |= CF_RUNNING;
1557 1638
1558 /* first get rid of the old state */ 1639 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1640 save_perl (aTHX_ prev);
1560 1641
1561 if (expect_false (next->flags & CF_NEW)) 1642 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1643 {
1563 /* need to start coroutine */ 1644 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1645 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1646 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1647 init_perl (aTHX_ next);
1567 } 1648 }
1568 else 1649 else
1569 load_perl (aTHX_ next); 1650 load_perl (aTHX_ next);
1570 1651
1571 /* possibly untie and reuse the cctx */ 1652 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1653 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1654 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1655 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1656 && !force_cctx
1576 )) 1657 ))
1577 { 1658 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1659 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1660 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1661
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1662 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1582 /* without this the next cctx_get might destroy the running cctx while still in use */ 1663 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1664 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1665 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1666 next->cctx = cctx_get (aTHX);
1586 1667
1587 cctx_put (cctx_current); 1668 cctx_put (cctx_current);
1588 } 1669 }
1589 else 1670 else
1590 prev->cctx = cctx_current; 1671 prev->cctx = cctx_current;
1591 1672
1592 ++next->usecount; 1673 ++next->usecount;
1593 1674
1594 cctx_prev = cctx_current; 1675 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1676 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1677
1597 next->cctx = 0; 1678 next->cctx = 0;
1598 1679
1599 if (expect_false (cctx_prev != cctx_current)) 1680 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1681 {
1601 cctx_prev->top_env = PL_top_env; 1682 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1683 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1684 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1685 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1691#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1611#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1692#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1693
1613/** high level stuff ********************************************************/ 1694/** high level stuff ********************************************************/
1614 1695
1696/* this function is actually Coro, not Coro::State, but we call it from here */
1697/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1698static void
1699coro_call_on_destroy (pTHX_ struct coro *coro);
1700
1701static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1702coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1703{
1618 if (coro->flags & CF_DESTROYED) 1704 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1705 return;
1620 1706
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1707 slf_destroy (aTHX_ coro);
1623 1708
1624 coro->flags |= CF_DESTROYED; 1709 coro->flags |= CF_ZOMBIE;
1625 1710
1626 if (coro->flags & CF_READY) 1711 if (coro->flags & CF_READY)
1627 { 1712 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1713 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1714 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1715 --coro_nready;
1631 } 1716 }
1632 else 1717 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1718 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1719
1720 if (coro->next) coro->next->prev = coro->prev;
1721 if (coro->prev) coro->prev->next = coro->next;
1722 if (coro == coro_first) coro_first = coro->next;
1634 1723
1635 if (coro->mainstack 1724 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1725 && coro->mainstack != main_mainstack
1637 && coro->slot 1726 && coro->slot
1638 && !PL_dirty) 1727 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1728 destroy_perl (aTHX_ coro);
1640 1729
1641 if (coro->next) coro->next->prev = coro->prev;
1642 if (coro->prev) coro->prev->next = coro->next;
1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx); 1730 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1731 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1732 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1733 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1734 SvREFCNT_dec (CORO_THROW);
1650 1735
1651 return 1; 1736 coro_call_on_destroy (aTHX_ coro);
1737
1738 /* more destruction mayhem in coro_state_free */
1652} 1739}
1653 1740
1654static int 1741static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1742coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1743{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1744 struct coro *coro = (struct coro *)mg->mg_ptr;
1658 mg->mg_ptr = 0; 1745 mg->mg_ptr = 0;
1659 1746
1660 coro->hv = 0;
1661
1662 if (--coro->refcnt < 0)
1663 {
1664 coro_state_destroy (aTHX_ coro); 1747 coro_state_destroy (aTHX_ coro);
1748 SvREFCNT_dec (coro->on_destroy);
1749 SvREFCNT_dec (coro->status);
1750
1665 Safefree (coro); 1751 Safefree (coro);
1666 }
1667 1752
1668 return 0; 1753 return 0;
1669} 1754}
1670 1755
1671static int 1756static int ecb_cold
1672coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1757coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1673{ 1758{
1674 struct coro *coro = (struct coro *)mg->mg_ptr; 1759 /* called when perl clones the current process the slow way (windows process emulation) */
1675 1760 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1676 ++coro->refcnt; 1761 mg->mg_ptr = 0;
1762 mg->mg_virtual = 0;
1677 1763
1678 return 0; 1764 return 0;
1679} 1765}
1680 1766
1681static MGVTBL coro_state_vtbl = { 1767static MGVTBL coro_state_vtbl = {
… …
1706 TRANSFER (ta, 1); 1792 TRANSFER (ta, 1);
1707} 1793}
1708 1794
1709/** Coro ********************************************************************/ 1795/** Coro ********************************************************************/
1710 1796
1711INLINE void 1797ECB_INLINE void
1712coro_enq (pTHX_ struct coro *coro) 1798coro_enq (pTHX_ struct coro *coro)
1713{ 1799{
1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1800 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1715 1801
1716 SvREFCNT_inc_NN (coro->hv); 1802 SvREFCNT_inc_NN (coro->hv);
… …
1718 coro->next_ready = 0; 1804 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1805 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro; 1806 ready [1] = coro;
1721} 1807}
1722 1808
1723INLINE struct coro * 1809ECB_INLINE struct coro *
1724coro_deq (pTHX) 1810coro_deq (pTHX)
1725{ 1811{
1726 int prio; 1812 int prio;
1727 1813
1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1814 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1781{ 1867{
1782 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1868 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1783} 1869}
1784 1870
1785/* expects to own a reference to next->hv */ 1871/* expects to own a reference to next->hv */
1786INLINE void 1872ECB_INLINE void
1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1873prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1788{ 1874{
1789 SV *prev_sv = SvRV (coro_current); 1875 SV *prev_sv = SvRV (coro_current);
1790 1876
1791 ta->prev = SvSTATE_hv (prev_sv); 1877 ta->prev = SvSTATE_hv (prev_sv);
… …
1804{ 1890{
1805 for (;;) 1891 for (;;)
1806 { 1892 {
1807 struct coro *next = coro_deq (aTHX); 1893 struct coro *next = coro_deq (aTHX);
1808 1894
1809 if (expect_true (next)) 1895 if (ecb_expect_true (next))
1810 { 1896 {
1811 /* cannot transfer to destroyed coros, skip and look for next */ 1897 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1898 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1899 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else 1900 else
1815 { 1901 {
1816 next->flags &= ~CF_READY; 1902 next->flags &= ~CF_READY;
1817 --coro_nready; 1903 --coro_nready;
… …
1850 } 1936 }
1851 } 1937 }
1852 } 1938 }
1853} 1939}
1854 1940
1855INLINE void 1941ECB_INLINE void
1856prepare_cede (pTHX_ struct coro_transfer_args *ta) 1942prepare_cede (pTHX_ struct coro_transfer_args *ta)
1857{ 1943{
1858 api_ready (aTHX_ coro_current); 1944 api_ready (aTHX_ coro_current);
1859 prepare_schedule (aTHX_ ta); 1945 prepare_schedule (aTHX_ ta);
1860} 1946}
1861 1947
1862INLINE void 1948ECB_INLINE void
1863prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1949prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1864{ 1950{
1865 SV *prev = SvRV (coro_current); 1951 SV *prev = SvRV (coro_current);
1866 1952
1867 if (coro_nready) 1953 if (coro_nready)
… …
1897{ 1983{
1898 struct coro_transfer_args ta; 1984 struct coro_transfer_args ta;
1899 1985
1900 prepare_cede (aTHX_ &ta); 1986 prepare_cede (aTHX_ &ta);
1901 1987
1902 if (expect_true (ta.prev != ta.next)) 1988 if (ecb_expect_true (ta.prev != ta.next))
1903 { 1989 {
1904 TRANSFER (ta, 1); 1990 TRANSFER (ta, 1);
1905 return 1; 1991 return 1;
1906 } 1992 }
1907 else 1993 else
… …
1950 coro->slot->runops = RUNOPS_DEFAULT; 2036 coro->slot->runops = RUNOPS_DEFAULT;
1951 } 2037 }
1952} 2038}
1953 2039
1954static void 2040static void
2041coro_push_av (pTHX_ AV *av, I32 gimme_v)
2042{
2043 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2044 {
2045 dSP;
2046
2047 if (gimme_v == G_SCALAR)
2048 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2049 else
2050 {
2051 int i;
2052 EXTEND (SP, AvFILLp (av) + 1);
2053
2054 for (i = 0; i <= AvFILLp (av); ++i)
2055 PUSHs (AvARRAY (av)[i]);
2056 }
2057
2058 PUTBACK;
2059 }
2060}
2061
2062static void
2063coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2064{
2065 if (!coro->on_destroy)
2066 coro->on_destroy = newAV ();
2067
2068 av_push (coro->on_destroy, cb);
2069}
2070
2071static void
2072slf_destroy_join (pTHX_ struct CoroSLF *frame)
2073{
2074 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2075}
2076
2077static int
2078slf_check_join (pTHX_ struct CoroSLF *frame)
2079{
2080 struct coro *coro = (struct coro *)frame->data;
2081
2082 if (!coro->status)
2083 return 1;
2084
2085 frame->destroy = 0;
2086
2087 coro_push_av (aTHX_ coro->status, GIMME_V);
2088
2089 SvREFCNT_dec ((SV *)coro->hv);
2090
2091 return 0;
2092}
2093
2094static void
2095slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2098
2099 if (items > 1)
2100 croak ("join called with too many arguments");
2101
2102 if (coro->status)
2103 frame->prepare = prepare_nop;
2104 else
2105 {
2106 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2107 frame->prepare = prepare_schedule;
2108 }
2109
2110 frame->check = slf_check_join;
2111 frame->destroy = slf_destroy_join;
2112 frame->data = (void *)coro;
2113 SvREFCNT_inc (coro->hv);
2114}
2115
2116static void
1955coro_call_on_destroy (pTHX_ struct coro *coro) 2117coro_call_on_destroy (pTHX_ struct coro *coro)
1956{ 2118{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2119 AV *od = coro->on_destroy;
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959 2120
1960 if (on_destroyp) 2121 if (!od)
1961 { 2122 return;
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1963 2123
1964 while (AvFILLp (on_destroy) >= 0) 2124 while (AvFILLp (od) >= 0)
2125 {
2126 SV *cb = sv_2mortal (av_pop (od));
2127
2128 /* coro hv's (and only hv's at the moment) are supported as well */
2129 if (SvSTATEhv_p (aTHX_ cb))
2130 api_ready (aTHX_ cb);
2131 else
1965 { 2132 {
1966 dSP; /* don't disturb outer sp */ 2133 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy);
1968
1969 PUSHMARK (SP); 2134 PUSHMARK (SP);
1970 2135
1971 if (statusp) 2136 if (coro->status)
1972 { 2137 {
1973 int i; 2138 PUTBACK;
1974 AV *status = (AV *)SvRV (*statusp); 2139 coro_push_av (aTHX_ coro->status, G_ARRAY);
1975 EXTEND (SP, AvFILLp (status) + 1); 2140 SPAGAIN;
1976
1977 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]);
1979 } 2141 }
1980 2142
1981 PUTBACK; 2143 PUTBACK;
1982 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2144 call_sv (cb, G_VOID | G_DISCARD);
1983 } 2145 }
1984 } 2146 }
1985} 2147}
1986 2148
1987static void 2149static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1989{ 2151{
1990 int i; 2152 AV *av;
1991 HV *hv = (HV *)SvRV (coro_current); 2153
1992 AV *av = newAV (); 2154 if (coro->status)
2155 {
2156 av = coro->status;
2157 av_clear (av);
2158 }
2159 else
2160 av = coro->status = newAV ();
1993 2161
1994 /* items are actually not so common, so optimise for this case */ 2162 /* items are actually not so common, so optimise for this case */
1995 if (items) 2163 if (items)
1996 { 2164 {
2165 int i;
2166
1997 av_extend (av, items - 1); 2167 av_extend (av, items - 1);
1998 2168
1999 for (i = 0; i < items; ++i) 2169 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i])); 2170 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 } 2171 }
2172}
2002 2173
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2174static void
2004 2175slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2176{
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2177 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager); 2178 api_ready (aTHX_ sv_manager);
2007 2179
2008 frame->prepare = prepare_schedule; 2180 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat; 2181 frame->check = slf_check_repeat;
2010 2182
2011 /* as a minor optimisation, we could unwind all stacks here */ 2183 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */ 2184 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/ 2185 /*coro_unwind_stacks (aTHX);*/
2186}
2187
2188static void
2189slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2190{
2191 HV *coro_hv = (HV *)SvRV (coro_current);
2192
2193 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2194 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2195}
2196
2197static void
2198slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2199{
2200 HV *coro_hv;
2201 struct coro *coro;
2202
2203 if (items <= 0)
2204 croak ("Coro::cancel called without coro object,");
2205
2206 coro = SvSTATE (arg [0]);
2207 coro_hv = coro->hv;
2208
2209 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2210
2211 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2212 {
2213 /* coro currently busy cancelling something, so just notify it */
2214 coro->slf_frame.data = (void *)coro;
2215
2216 frame->prepare = prepare_nop;
2217 frame->check = slf_check_nop;
2218 }
2219 else if (coro_hv == (HV *)SvRV (coro_current))
2220 {
2221 /* cancelling the current coro is allowed, and equals terminate */
2222 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2223 }
2224 else
2225 {
2226 struct coro *self = SvSTATE_current;
2227
2228 /* otherwise we cancel directly, purely for speed reasons
2229 * unfortunately, this requires some magic trickery, as
2230 * somebody else could cancel us, so we have to fight the cancellation.
2231 * this is ugly, and hopefully fully worth the extra speed.
2232 * besides, I can't get the slow-but-safe version working...
2233 */
2234 slf_frame.data = 0;
2235 self->flags |= CF_NOCANCEL;
2236 coro_state_destroy (aTHX_ coro);
2237 self->flags &= ~CF_NOCANCEL;
2238
2239 if (slf_frame.data)
2240 {
2241 /* while we were busy we have been cancelled, so terminate */
2242 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2243 }
2244 else
2245 {
2246 frame->prepare = prepare_nop;
2247 frame->check = slf_check_nop;
2248 }
2249 }
2250}
2251
2252static int
2253slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2254{
2255 frame->prepare = 0;
2256 coro_unwind_stacks (aTHX);
2257
2258 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2259
2260 return 1;
2261}
2262
2263static int
2264safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2265{
2266 if (coro->cctx)
2267 croak ("coro inside C callback, unable to cancel at this time, caught");
2268
2269 if (coro->flags & CF_NEW)
2270 {
2271 coro_set_status (aTHX_ coro, arg, items);
2272 coro_state_destroy (aTHX_ coro);
2273 }
2274 else
2275 {
2276 if (!coro->slf_frame.prepare)
2277 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2278
2279 slf_destroy (aTHX_ coro);
2280
2281 coro_set_status (aTHX_ coro, arg, items);
2282 coro->slf_frame.prepare = prepare_nop;
2283 coro->slf_frame.check = slf_check_safe_cancel;
2284
2285 api_ready (aTHX_ (SV *)coro->hv);
2286 }
2287
2288 return 1;
2014} 2289}
2015 2290
2016/*****************************************************************************/ 2291/*****************************************************************************/
2017/* async pool handler */ 2292/* async pool handler */
2018 2293
… …
2049slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2324slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2050{ 2325{
2051 HV *hv = (HV *)SvRV (coro_current); 2326 HV *hv = (HV *)SvRV (coro_current);
2052 struct coro *coro = SvSTATE_hv ((SV *)hv); 2327 struct coro *coro = SvSTATE_hv ((SV *)hv);
2053 2328
2054 if (expect_true (coro->saved_deffh)) 2329 if (ecb_expect_true (coro->saved_deffh))
2055 { 2330 {
2056 /* subsequent iteration */ 2331 /* subsequent iteration */
2057 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2332 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2058 coro->saved_deffh = 0; 2333 coro->saved_deffh = 0;
2059 2334
2060 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2335 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2061 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2336 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2062 { 2337 {
2063 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2338 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2064 coro->invoke_av = newAV (); 2339 return;
2065
2066 frame->prepare = prepare_nop;
2067 } 2340 }
2068 else 2341 else
2069 { 2342 {
2070 av_clear (GvAV (PL_defgv)); 2343 av_clear (GvAV (PL_defgv));
2071 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2344 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2294static void 2567static void
2295slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2568slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2296{ 2569{
2297 frame->prepare = prepare_cede_notself; 2570 frame->prepare = prepare_cede_notself;
2298 frame->check = slf_check_nop; 2571 frame->check = slf_check_nop;
2572}
2573
2574/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2575static void
2576slf_destroy (pTHX_ struct coro *coro)
2577{
2578 /* this callback is reserved for slf functions needing to do cleanup */
2579 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2580 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2581
2582 /*
2583 * The on_destroy above most likely is from an SLF call.
2584 * Since by definition the SLF call will not finish when we destroy
2585 * the coro, we will have to force-finish it here, otherwise
2586 * cleanup functions cannot call SLF functions.
2587 */
2588 coro->slf_frame.prepare = 0;
2299} 2589}
2300 2590
2301/* 2591/*
2302 * these not obviously related functions are all rolled into one 2592 * these not obviously related functions are all rolled into one
2303 * function to increase chances that they all will call transfer with the same 2593 * function to increase chances that they all will call transfer with the same
… …
2310 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2600 I32 checkmark; /* mark SP to see how many elements check has pushed */
2311 2601
2312 /* set up the slf frame, unless it has already been set-up */ 2602 /* set up the slf frame, unless it has already been set-up */
2313 /* the latter happens when a new coro has been started */ 2603 /* the latter happens when a new coro has been started */
2314 /* or when a new cctx was attached to an existing coroutine */ 2604 /* or when a new cctx was attached to an existing coroutine */
2315 if (expect_true (!slf_frame.prepare)) 2605 if (ecb_expect_true (!slf_frame.prepare))
2316 { 2606 {
2317 /* first iteration */ 2607 /* first iteration */
2318 dSP; 2608 dSP;
2319 SV **arg = PL_stack_base + TOPMARK + 1; 2609 SV **arg = PL_stack_base + TOPMARK + 1;
2320 int items = SP - arg; /* args without function object */ 2610 int items = SP - arg; /* args without function object */
… …
2361 while (slf_frame.check (aTHX_ &slf_frame)); 2651 while (slf_frame.check (aTHX_ &slf_frame));
2362 2652
2363 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2653 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2364 2654
2365 /* exception handling */ 2655 /* exception handling */
2366 if (expect_false (CORO_THROW)) 2656 if (ecb_expect_false (CORO_THROW))
2367 { 2657 {
2368 SV *exception = sv_2mortal (CORO_THROW); 2658 SV *exception = sv_2mortal (CORO_THROW);
2369 2659
2370 CORO_THROW = 0; 2660 CORO_THROW = 0;
2371 sv_setsv (ERRSV, exception); 2661 sv_setsv (ERRSV, exception);
2372 croak (0); 2662 croak (0);
2373 } 2663 }
2374 2664
2375 /* return value handling - mostly like entersub */ 2665 /* return value handling - mostly like entersub */
2376 /* make sure we put something on the stack in scalar context */ 2666 /* make sure we put something on the stack in scalar context */
2377 if (GIMME_V == G_SCALAR) 2667 if (GIMME_V == G_SCALAR
2668 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2378 { 2669 {
2379 dSP; 2670 dSP;
2380 SV **bot = PL_stack_base + checkmark; 2671 SV **bot = PL_stack_base + checkmark;
2381 2672
2382 if (sp == bot) /* too few, push undef */ 2673 if (sp == bot) /* too few, push undef */
2383 bot [1] = &PL_sv_undef; 2674 bot [1] = &PL_sv_undef;
2384 else if (sp != bot + 1) /* too many, take last one */ 2675 else /* too many, take last one */
2385 bot [1] = *sp; 2676 bot [1] = *sp;
2386 2677
2387 SP = bot + 1; 2678 SP = bot + 1;
2388 2679
2389 PUTBACK; 2680 PUTBACK;
… …
2422 if (PL_op->op_flags & OPf_STACKED) 2713 if (PL_op->op_flags & OPf_STACKED)
2423 { 2714 {
2424 if (items > slf_arga) 2715 if (items > slf_arga)
2425 { 2716 {
2426 slf_arga = items; 2717 slf_arga = items;
2427 free (slf_argv); 2718 Safefree (slf_argv);
2428 slf_argv = malloc (slf_arga * sizeof (SV *)); 2719 New (0, slf_argv, slf_arga, SV *);
2429 } 2720 }
2430 2721
2431 slf_argc = items; 2722 slf_argc = items;
2432 2723
2433 for (i = 0; i < items; ++i) 2724 for (i = 0; i < items; ++i)
… …
2496{ 2787{
2497 PerlIOBuf base; 2788 PerlIOBuf base;
2498 NV next, every; 2789 NV next, every;
2499} PerlIOCede; 2790} PerlIOCede;
2500 2791
2501static IV 2792static IV ecb_cold
2502PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2793PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2503{ 2794{
2504 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2795 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2505 2796
2506 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2797 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2507 self->next = nvtime () + self->every; 2798 self->next = nvtime () + self->every;
2508 2799
2509 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2800 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2510} 2801}
2511 2802
2512static SV * 2803static SV * ecb_cold
2513PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2804PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2514{ 2805{
2515 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2806 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2516 2807
2517 return newSVnv (self->every); 2808 return newSVnv (self->every);
… …
2629 SvREFCNT_dec (cb); 2920 SvREFCNT_dec (cb);
2630 } 2921 }
2631} 2922}
2632 2923
2633static void 2924static void
2634coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2925coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2635{ 2926{
2636 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2927 /* call $sem->adjust (0) to possibly wake up some other waiters */
2637 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2928 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2638} 2929}
2639 2930
2640static int 2931static int
2641slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2932slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2642{ 2933{
2643 AV *av = (AV *)frame->data; 2934 AV *av = (AV *)frame->data;
2644 SV *count_sv = AvARRAY (av)[0]; 2935 SV *count_sv = AvARRAY (av)[0];
2936 SV *coro_hv = SvRV (coro_current);
2645 2937
2646 /* if we are about to throw, don't actually acquire the lock, just throw */ 2938 /* if we are about to throw, don't actually acquire the lock, just throw */
2647 if (CORO_THROW) 2939 if (CORO_THROW)
2648 return 0; 2940 return 0;
2649 else if (SvIVX (count_sv) > 0) 2941 else if (SvIVX (count_sv) > 0)
2650 { 2942 {
2651 SvSTATE_current->on_destroy = 0; 2943 frame->destroy = 0;
2652 2944
2653 if (acquire) 2945 if (acquire)
2654 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2946 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2655 else 2947 else
2656 coro_semaphore_adjust (aTHX_ av, 0); 2948 coro_semaphore_adjust (aTHX_ av, 0);
… …
2661 { 2953 {
2662 int i; 2954 int i;
2663 /* if we were woken up but can't down, we look through the whole */ 2955 /* if we were woken up but can't down, we look through the whole */
2664 /* waiters list and only add us if we aren't in there already */ 2956 /* waiters list and only add us if we aren't in there already */
2665 /* this avoids some degenerate memory usage cases */ 2957 /* this avoids some degenerate memory usage cases */
2666 2958 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2667 for (i = 1; i <= AvFILLp (av); ++i)
2668 if (AvARRAY (av)[i] == SvRV (coro_current)) 2959 if (AvARRAY (av)[i] == coro_hv)
2669 return 1; 2960 return 1;
2670 2961
2671 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2962 av_push (av, SvREFCNT_inc (coro_hv));
2672 return 1; 2963 return 1;
2673 } 2964 }
2674} 2965}
2675 2966
2676static int 2967static int
… …
2699 { 2990 {
2700 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2991 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2701 2992
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2993 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2703 frame->prepare = prepare_schedule; 2994 frame->prepare = prepare_schedule;
2704
2705 /* to avoid race conditions when a woken-up coro gets terminated */ 2995 /* to avoid race conditions when a woken-up coro gets terminated */
2706 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2996 /* we arrange for a temporary on_destroy that calls adjust (0) */
2707 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2997 frame->destroy = coro_semaphore_destroy;
2708 } 2998 }
2709} 2999}
2710 3000
2711static void 3001static void
2712slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3002slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2794 { 3084 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]); 3085 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3086 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797 3087
2798 if (SvIVX (AvARRAY (av)[0])) 3088 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3089 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2800 3090
2801 frame->prepare = prepare_nop; 3091 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop; 3092 frame->check = slf_check_nop;
2803 } 3093 }
2804 else if (SvIVX (AvARRAY (av)[0])) 3094 else if (SvIVX (AvARRAY (av)[0]))
… …
2930 dSP; 3220 dSP;
2931 3221
2932 static SV *prio_cv; 3222 static SV *prio_cv;
2933 static SV *prio_sv; 3223 static SV *prio_sv;
2934 3224
2935 if (expect_false (!prio_cv)) 3225 if (ecb_expect_false (!prio_cv))
2936 { 3226 {
2937 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3227 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2938 prio_sv = newSViv (0); 3228 prio_sv = newSViv (0);
2939 } 3229 }
2940 3230
… …
2966 /* now call the AIO function - we assume our request is uncancelable */ 3256 /* now call the AIO function - we assume our request is uncancelable */
2967 PUTBACK; 3257 PUTBACK;
2968 call_sv ((SV *)req, G_VOID | G_DISCARD); 3258 call_sv ((SV *)req, G_VOID | G_DISCARD);
2969 } 3259 }
2970 3260
2971 /* now that the requets is going, we loop toll we have a result */ 3261 /* now that the request is going, we loop till we have a result */
2972 frame->data = (void *)state; 3262 frame->data = (void *)state;
2973 frame->prepare = prepare_schedule; 3263 frame->prepare = prepare_schedule;
2974 frame->check = slf_check_aio_req; 3264 frame->check = slf_check_aio_req;
2975} 3265}
2976 3266
… …
3046 } 3336 }
3047 3337
3048 return coro_sv; 3338 return coro_sv;
3049} 3339}
3050 3340
3341#ifndef __cplusplus
3342ecb_cold XS(boot_Coro__State);
3343#endif
3344
3345#if CORO_JIT
3346
3347static void ecb_noinline ecb_cold
3348pushav_3uv (pTHX_ UV a, UV b, UV c)
3349{
3350 dSP;
3351 AV *av = newAV ();
3352
3353 av_store (av, 2, newSVuv (c));
3354 av_store (av, 1, newSVuv (b));
3355 av_store (av, 0, newSVuv (a));
3356
3357 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3358
3359 PUTBACK;
3360}
3361
3362static void ecb_noinline ecb_cold
3363jit_init (pTHX)
3364{
3365 dSP;
3366 SV *load, *save;
3367 char *map_base;
3368 char *load_ptr, *save_ptr;
3369 STRLEN load_len, save_len, map_len;
3370 int count;
3371
3372 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3373
3374 PUSHMARK (SP);
3375#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3376# include "state.h"
3377#undef VARx
3378 count = call_pv ("Coro::State::_jit", G_ARRAY);
3379 SPAGAIN;
3380
3381 save = POPs; save_ptr = SvPVbyte (save, save_len);
3382 load = POPs; load_ptr = SvPVbyte (load, load_len);
3383
3384 map_len = load_len + save_len + 16;
3385
3386 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3387
3388 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3389
3390 load_perl_slots = (load_save_perl_slots_type)map_base;
3391 memcpy (map_base, load_ptr, load_len);
3392
3393 map_base += (load_len + 15) & ~15;
3394
3395 save_perl_slots = (load_save_perl_slots_type)map_base;
3396 memcpy (map_base, save_ptr, save_len);
3397
3398 /* we are good citizens and try to make the page read-only, so the evil evil */
3399 /* hackers might have it a bit more difficult */
3400 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3401
3402 PUTBACK;
3403 eval_pv ("undef &Coro::State::_jit", 1);
3404}
3405
3406#endif
3407
3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3408MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3052 3409
3053PROTOTYPES: DISABLE 3410PROTOTYPES: DISABLE
3054 3411
3055BOOT: 3412BOOT:
… …
3059 coro_thx = PERL_GET_CONTEXT; 3416 coro_thx = PERL_GET_CONTEXT;
3060# endif 3417# endif
3061#endif 3418#endif
3062 BOOT_PAGESIZE; 3419 BOOT_PAGESIZE;
3063 3420
3421 /* perl defines these to check for existance first, but why it doesn't */
3422 /* just create them one at init time is not clear to me, except for */
3423 /* programs trying to delete them, but... */
3424 /* anyway, we declare this as invalid and make sure they are initialised here */
3425 DEFSV;
3426 ERRSV;
3427
3064 cctx_current = cctx_new_empty (); 3428 cctx_current = cctx_new_empty ();
3065 3429
3066 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3430 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3067 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3431 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3068 3432
… …
3107 coroapi.prepare_nop = prepare_nop; 3471 coroapi.prepare_nop = prepare_nop;
3108 coroapi.prepare_schedule = prepare_schedule; 3472 coroapi.prepare_schedule = prepare_schedule;
3109 coroapi.prepare_cede = prepare_cede; 3473 coroapi.prepare_cede = prepare_cede;
3110 coroapi.prepare_cede_notself = prepare_cede_notself; 3474 coroapi.prepare_cede_notself = prepare_cede_notself;
3111 3475
3112 { 3476 time_init (aTHX);
3113 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3114
3115 if (!svp) croak ("Time::HiRes is required");
3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3117
3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3122 }
3123 3477
3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3478 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3479#if CORO_JIT
3480 PUTBACK;
3481 jit_init (aTHX);
3482 SPAGAIN;
3483#endif
3125} 3484}
3126 3485
3127SV * 3486SV *
3128new (SV *klass, ...) 3487new (SV *klass, ...)
3129 ALIAS: 3488 ALIAS:
… …
3136void 3495void
3137transfer (...) 3496transfer (...)
3138 PROTOTYPE: $$ 3497 PROTOTYPE: $$
3139 CODE: 3498 CODE:
3140 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3499 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3141
3142bool
3143_destroy (SV *coro_sv)
3144 CODE:
3145 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3146 OUTPUT:
3147 RETVAL
3148 3500
3149void 3501void
3150_exit (int code) 3502_exit (int code)
3151 PROTOTYPE: $ 3503 PROTOTYPE: $
3152 CODE: 3504 CODE:
… …
3228 CODE: 3580 CODE:
3229{ 3581{
3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3582 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3231 { 3583 {
3232 struct coro *current = SvSTATE_current; 3584 struct coro *current = SvSTATE_current;
3585 struct CoroSLF slf_save;
3233 3586
3234 if (current != coro) 3587 if (current != coro)
3235 { 3588 {
3236 PUTBACK; 3589 PUTBACK;
3237 save_perl (aTHX_ current); 3590 save_perl (aTHX_ current);
3238 load_perl (aTHX_ coro); 3591 load_perl (aTHX_ coro);
3592 /* the coro is most likely in an active SLF call.
3593 * while not strictly required (the code we execute is
3594 * not allowed to call any SLF functions), it's cleaner
3595 * to reinitialise the slf_frame and restore it later.
3596 * This might one day allow us to actually do SLF calls
3597 * from code executed here.
3598 */
3599 slf_save = slf_frame;
3600 slf_frame.prepare = 0;
3239 SPAGAIN; 3601 SPAGAIN;
3240 } 3602 }
3241 3603
3242 PUSHSTACK; 3604 PUSHSTACK;
3243 3605
… …
3253 SPAGAIN; 3615 SPAGAIN;
3254 3616
3255 if (current != coro) 3617 if (current != coro)
3256 { 3618 {
3257 PUTBACK; 3619 PUTBACK;
3620 slf_frame = slf_save;
3258 save_perl (aTHX_ coro); 3621 save_perl (aTHX_ coro);
3259 load_perl (aTHX_ current); 3622 load_perl (aTHX_ current);
3260 SPAGAIN; 3623 SPAGAIN;
3261 } 3624 }
3262 } 3625 }
… …
3267 PROTOTYPE: $ 3630 PROTOTYPE: $
3268 ALIAS: 3631 ALIAS:
3269 is_ready = CF_READY 3632 is_ready = CF_READY
3270 is_running = CF_RUNNING 3633 is_running = CF_RUNNING
3271 is_new = CF_NEW 3634 is_new = CF_NEW
3272 is_destroyed = CF_DESTROYED 3635 is_destroyed = CF_ZOMBIE
3636 is_zombie = CF_ZOMBIE
3273 is_suspended = CF_SUSPENDED 3637 is_suspended = CF_SUSPENDED
3274 CODE: 3638 CODE:
3275 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3276 OUTPUT: 3640 OUTPUT:
3277 RETVAL 3641 RETVAL
3278 3642
3279void 3643void
3280throw (Coro::State self, SV *throw = &PL_sv_undef) 3644throw (Coro::State self, SV *exception = &PL_sv_undef)
3281 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3282 CODE: 3646 CODE:
3283{ 3647{
3284 struct coro *current = SvSTATE_current; 3648 struct coro *current = SvSTATE_current;
3285 SV **throwp = self == current ? &CORO_THROW : &self->except; 3649 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3286 SvREFCNT_dec (*throwp); 3650 SvREFCNT_dec (*exceptionp);
3287 SvGETMAGIC (throw); 3651 SvGETMAGIC (exception);
3288 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3652 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3289} 3653}
3290 3654
3291void 3655void
3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3656api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3293 PROTOTYPE: $;$ 3657 PROTOTYPE: $;$
… …
3348 3712
3349void 3713void
3350cancel (Coro::State self) 3714cancel (Coro::State self)
3351 CODE: 3715 CODE:
3352 coro_state_destroy (aTHX_ self); 3716 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355 3717
3356SV * 3718SV *
3357enable_times (int enabled = enable_times) 3719enable_times (int enabled = enable_times)
3358 CODE: 3720 CODE:
3359{ 3721{
… …
3374times (Coro::State self) 3736times (Coro::State self)
3375 PPCODE: 3737 PPCODE:
3376{ 3738{
3377 struct coro *current = SvSTATE (coro_current); 3739 struct coro *current = SvSTATE (coro_current);
3378 3740
3379 if (expect_false (current == self)) 3741 if (ecb_expect_false (current == self))
3380 { 3742 {
3381 coro_times_update (); 3743 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current)); 3744 coro_times_add (SvSTATE (coro_current));
3383 } 3745 }
3384 3746
3385 EXTEND (SP, 2); 3747 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3748 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3749 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388 3750
3389 if (expect_false (current == self)) 3751 if (ecb_expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current)); 3752 coro_times_sub (SvSTATE (coro_current));
3391} 3753}
3392 3754
3393void 3755void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3756swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3415BOOT: 3777BOOT:
3416{ 3778{
3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3779 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3780 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3781 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3782 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3783 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3784 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3785 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3786 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3464 api_ready (aTHX_ RETVAL); 3825 api_ready (aTHX_ RETVAL);
3465 OUTPUT: 3826 OUTPUT:
3466 RETVAL 3827 RETVAL
3467 3828
3468void 3829void
3830_destroy (Coro::State coro)
3831 CODE:
3832 /* used by the manager thread */
3833 coro_state_destroy (aTHX_ coro);
3834
3835void
3836on_destroy (Coro::State coro, SV *cb)
3837 CODE:
3838 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3839
3840void
3841join (...)
3842 CODE:
3843 CORO_EXECUTE_SLF_XS (slf_init_join);
3844
3845void
3469terminate (...) 3846terminate (...)
3470 CODE: 3847 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3848 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3849
3850void
3851cancel (...)
3852 CODE:
3853 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3854
3855int
3856safe_cancel (Coro::State self, ...)
3857 C_ARGS: aTHX_ self, &ST (1), items - 1
3472 3858
3473void 3859void
3474schedule (...) 3860schedule (...)
3475 CODE: 3861 CODE:
3476 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3862 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3873 { 4259 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4260 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0; 4261 coro_old_pp_sselect = 0;
3876 } 4262 }
3877 4263
3878

Diff Legend

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