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.409 by root, Sun Jun 12 04:29:15 2011 UTC

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

Diff Legend

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