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.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.412 by root, Mon Jun 13 09:00:15 2011 UTC

… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
… …
31# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
32#else 34#else
33# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
34#endif 36#endif
35 37
36#ifdef HAVE_MMAP 38#if HAVE_MMAP
37# include <unistd.h> 39# include <unistd.h>
38# include <sys/mman.h> 40# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON 42# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
86# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
87#endif 89#endif
88 90
89#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
90 92
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 93#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
108 95
109#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
110# if CORO_PTHREAD 97# if CORO_PTHREAD
111static void *coro_thx; 98static void *coro_thx;
112# endif 99# endif
113#endif 100#endif
101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
114 104
115#ifdef __linux 105#ifdef __linux
116# include <time.h> /* for timespec */ 106# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */ 107# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime 108# ifdef SYS_clock_gettime
… …
126static void (*u2time)(pTHX_ UV ret[2]); 116static void (*u2time)(pTHX_ UV ret[2]);
127 117
128/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
131 122
132static U32 cctx_gen; 123static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 156static char times_valid;
166 157
167static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
169 160
170enum { 161enum
162{
171 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
200 192
201static coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
202 194
203/*****************************************************************************/ 195/*****************************************************************************/
204 196
197static MGVTBL coro_state_vtbl;
198
205enum { 199enum
200{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 207};
213 208
214/* 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 */
215typedef struct 210typedef struct
216{ 211{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
223# include "state.h" 213# include "state.h"
224#undef VAR 214#undef VARx
225} perl_slots; 215} perl_slots;
226 216
217/* how many context stack entries do we need for perl_slots */
227#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))
228 219
229/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
230struct coro { 221struct coro
222{
231 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 224 coro_cctx *cctx;
233 225
234 /* ready queue */ 226 /* ready queue */
235 struct coro *next_ready; 227 struct coro *next_ready;
… …
237 /* state data */ 229 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 231 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
241 233
242 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 238
249 /* statistics */ 239 /* statistics */
250 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
251 241
252 /* coro process data */ 242 /* coro process data */
253 int prio; 243 int prio;
254 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
255 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 */
256 248
257 /* async_pool */ 249 /* async_pool */
258 SV *saved_deffh; 250 SV *saved_deffh;
259 SV *invoke_cb; 251 SV *invoke_cb;
260 AV *invoke_av; 252 AV *invoke_av;
… …
292 284
293/* for Coro.pm */ 285/* for Coro.pm */
294static SV *coro_current; 286static SV *coro_current;
295static SV *coro_readyhook; 287static SV *coro_readyhook;
296static 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 */
297static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
298static struct coro *coro_first; 290static struct coro *coro_first;
299#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
300 315
301/** Coro::Select ************************************************************/ 316/** Coro::Select ************************************************************/
302 317
303static OP *(*coro_old_pp_sselect) (pTHX); 318static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 319static SV *coro_select_select;
… …
320 335
321/** time stuff **************************************************************/ 336/** time stuff **************************************************************/
322 337
323#ifdef HAS_GETTIMEOFDAY 338#ifdef HAS_GETTIMEOFDAY
324 339
325static void 340ECB_INLINE void
326coro_u2time (pTHX_ UV ret[2]) 341coro_u2time (pTHX_ UV ret[2])
327{ 342{
328 struct timeval tv; 343 struct timeval tv;
329 gettimeofday (&tv, 0); 344 gettimeofday (&tv, 0);
330 345
331 ret [0] = tv.tv_sec; 346 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 347 ret [1] = tv.tv_usec;
333} 348}
334 349
335static double 350ECB_INLINE double
336coro_nvtime () 351coro_nvtime (void)
337{ 352{
338 struct timeval tv; 353 struct timeval tv;
339 gettimeofday (&tv, 0); 354 gettimeofday (&tv, 0);
340 355
341 return tv.tv_sec + tv.tv_usec * 1e-6; 356 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 357}
343 358
344static void 359ECB_INLINE void
345time_init (pTHX) 360time_init (pTHX)
346{ 361{
347 nvtime = coro_nvtime; 362 nvtime = coro_nvtime;
348 u2time = coro_u2time; 363 u2time = coro_u2time;
349} 364}
350 365
351#else 366#else
352 367
353static void 368ECB_INLINE void
354time_init (pTHX) 369time_init (pTHX)
355{ 370{
356 SV **svp; 371 SV **svp;
357 372
358 require_pv ("Time/HiRes.pm"); 373 require_pv ("Time/HiRes.pm");
… …
370 385
371#endif 386#endif
372 387
373/** lowlevel stuff **********************************************************/ 388/** lowlevel stuff **********************************************************/
374 389
375static SV * 390static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 391coro_get_sv (pTHX_ const char *name, int create)
377{ 392{
378#if PERL_VERSION_ATLEAST (5,10,0) 393#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 395 get_sv (name, create);
381#endif 396#endif
382 return get_sv (name, create); 397 return get_sv (name, create);
383} 398}
384 399
385static AV * 400static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 401coro_get_av (pTHX_ const char *name, int create)
387{ 402{
388#if PERL_VERSION_ATLEAST (5,10,0) 403#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 405 get_av (name, create);
391#endif 406#endif
392 return get_av (name, create); 407 return get_av (name, create);
393} 408}
394 409
395static HV * 410static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 411coro_get_hv (pTHX_ const char *name, int create)
397{ 412{
398#if PERL_VERSION_ATLEAST (5,10,0) 413#if PERL_VERSION_ATLEAST (5,10,0)
399 /* 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 */
400 get_hv (name, create); 415 get_hv (name, create);
401#endif 416#endif
402 return get_hv (name, create); 417 return get_hv (name, create);
403} 418}
404 419
405INLINE void 420ECB_INLINE void
406coro_times_update () 421coro_times_update (void)
407{ 422{
408#ifdef coro_clock_gettime 423#ifdef coro_clock_gettime
409 struct timespec ts; 424 struct timespec ts;
410 425
411 ts.tv_sec = ts.tv_nsec = 0; 426 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 438 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 439 time_real [1] = tv [1] * 1000;
425#endif 440#endif
426} 441}
427 442
428INLINE void 443ECB_INLINE void
429coro_times_add (struct coro *c) 444coro_times_add (struct coro *c)
430{ 445{
431 c->t_real [1] += time_real [1]; 446 c->t_real [1] += time_real [1];
432 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]; }
433 c->t_real [0] += time_real [0]; 448 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 450 c->t_cpu [1] += time_cpu [1];
436 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]; }
437 c->t_cpu [0] += time_cpu [0]; 452 c->t_cpu [0] += time_cpu [0];
438} 453}
439 454
440INLINE void 455ECB_INLINE void
441coro_times_sub (struct coro *c) 456coro_times_sub (struct coro *c)
442{ 457{
443 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]; }
444 c->t_real [1] -= time_real [1]; 459 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 460 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 468/* magic glue */
454 469
455#define CORO_MAGIC_type_cv 26 470#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 471#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 472
458#define CORO_MAGIC_NN(sv, type) \ 473#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 474 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 475 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 476 : mg_find (sv, type))
462 477
463#define CORO_MAGIC(sv, type) \ 478#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 479 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 480 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 481 : 0)
467 482
468#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)
469#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)
470 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
471INLINE struct coro * 501ECB_INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro) 502SvSTATE_ (pTHX_ SV *coro)
473{ 503{
474 HV *stash;
475 MAGIC *mg; 504 MAGIC *mg;
476 505
477 if (SvROK (coro)) 506 if (SvROK (coro))
478 coro = SvRV (coro); 507 coro = SvRV (coro);
479 508
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 509 mg = SvSTATEhv_p (aTHX_ coro);
510 if (!mg)
481 croak ("Coro::State object required"); 511 croak ("Coro::State object required");
482 512
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 513 return (struct coro *)mg->mg_ptr;
493} 514}
494 515
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 516#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 517
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 520#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 521
501/*****************************************************************************/ 522/*****************************************************************************/
502/* padlist management and caching */ 523/* padlist management and caching */
503 524
504static AV * 525ECB_INLINE AV *
505coro_derive_padlist (pTHX_ CV *cv) 526coro_derive_padlist (pTHX_ CV *cv)
506{ 527{
507 AV *padlist = CvPADLIST (cv); 528 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 529 AV *newpadlist, *newpad;
509 530
… …
521 av_store (newpadlist, 1, (SV *)newpad); 542 av_store (newpadlist, 1, (SV *)newpad);
522 543
523 return newpadlist; 544 return newpadlist;
524} 545}
525 546
526static void 547ECB_INLINE void
527free_padlist (pTHX_ AV *padlist) 548free_padlist (pTHX_ AV *padlist)
528{ 549{
529 /* may be during global destruction */ 550 /* may be during global destruction */
530 if (!IN_DESTRUCT) 551 if (!IN_DESTRUCT)
531 { 552 {
… …
574 0, 0, 0, 0, 595 0, 0, 0, 0,
575 coro_cv_free 596 coro_cv_free
576}; 597};
577 598
578/* the next two functions merely cache the padlists */ 599/* the next two functions merely cache the padlists */
579static void 600ECB_INLINE void
580get_padlist (pTHX_ CV *cv) 601get_padlist (pTHX_ CV *cv)
581{ 602{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 603 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 604 AV *av;
584 605
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 608 else
588 { 609 {
589#if CORO_PREFER_PERL_FUNCTIONS 610#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 611 /* this is probably cleaner? but also slower! */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 618 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 619#endif
599 } 620 }
600} 621}
601 622
602static void 623ECB_INLINE void
603put_padlist (pTHX_ CV *cv) 624put_padlist (pTHX_ CV *cv)
604{ 625{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 626 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 627 AV *av;
607 628
608 if (expect_false (!mg)) 629 if (ecb_expect_false (!mg))
609 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);
610 631
611 av = (AV *)mg->mg_obj; 632 av = (AV *)mg->mg_obj;
612 633
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 634 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 635 av_extend (av, AvFILLp (av) + 1);
615 636
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 637 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 638}
618 639
… …
663 } 684 }
664#endif 685#endif
665 } 686 }
666} 687}
667 688
668#define SWAP_SVS(coro) \ 689#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 690 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 691 swap_svs (aTHX_ (coro))
671 692
672static void 693static void
673on_enterleave_call (pTHX_ SV *cb); 694on_enterleave_call (pTHX_ SV *cb);
674 695
… …
678 perl_slots *slot = c->slot; 699 perl_slots *slot = c->slot;
679 c->slot = 0; 700 c->slot = 0;
680 701
681 PL_mainstack = c->mainstack; 702 PL_mainstack = c->mainstack;
682 703
683 GvSV (PL_defgv) = slot->defsv; 704#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 705 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 706#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 707 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 708 # include "state.h"
691 #undef VAR 709 #undef VARx
710#endif
692 711
693 { 712 {
694 dSP; 713 dSP;
695 714
696 CV *cv; 715 CV *cv;
697 716
698 /* now do the ugly restore mess */ 717 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 718 while (ecb_expect_true (cv = (CV *)POPs))
700 { 719 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 720 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 721 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 722 CvPADLIST (cv) = (AV *)POPs;
704 } 723 }
… …
707 } 726 }
708 727
709 slf_frame = c->slf_frame; 728 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 729 CORO_THROW = c->except;
711 730
712 if (expect_false (enable_times)) 731 if (ecb_expect_false (enable_times))
713 { 732 {
714 if (expect_false (!times_valid)) 733 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 734 coro_times_update ();
716 735
717 coro_times_sub (c); 736 coro_times_sub (c);
718 } 737 }
719 738
720 if (expect_false (c->on_enter)) 739 if (ecb_expect_false (c->on_enter))
721 { 740 {
722 int i; 741 int i;
723 742
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 743 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 744 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 750static void
732save_perl (pTHX_ Coro__State c) 751save_perl (pTHX_ Coro__State c)
733{ 752{
734 SWAP_SVS (c); 753 SWAP_SVS (c);
735 754
736 if (expect_false (c->on_leave)) 755 if (ecb_expect_false (c->on_leave))
737 { 756 {
738 int i; 757 int i;
739 758
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 759 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 760 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 761 }
743 762
744 times_valid = 0; 763 times_valid = 0;
745 764
746 if (expect_false (enable_times)) 765 if (ecb_expect_false (enable_times))
747 { 766 {
748 coro_times_update (); times_valid = 1; 767 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 768 coro_times_add (c);
750 } 769 }
751 770
… …
765 784
766 XPUSHs (Nullsv); 785 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 786 /* this loop was inspired by pp_caller */
768 for (;;) 787 for (;;)
769 { 788 {
770 while (expect_true (cxix >= 0)) 789 while (ecb_expect_true (cxix >= 0))
771 { 790 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 791 PERL_CONTEXT *cx = &ccstk[cxix--];
773 792
774 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))
775 { 794 {
776 CV *cv = cx->blk_sub.cv; 795 CV *cv = cx->blk_sub.cv;
777 796
778 if (expect_true (CvDEPTH (cv))) 797 if (ecb_expect_true (CvDEPTH (cv)))
779 { 798 {
780 EXTEND (SP, 3); 799 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 800 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 801 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 802 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 805 get_padlist (aTHX_ cv);
787 } 806 }
788 } 807 }
789 } 808 }
790 809
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 810 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 811 break;
793 812
794 top_si = top_si->si_prev; 813 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 814 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 815 cxix = top_si->si_cxix;
… …
798 817
799 PUTBACK; 818 PUTBACK;
800 } 819 }
801 820
802 /* allocate some space on the context stack for our purposes */ 821 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 822 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 823 {
808 unsigned int i; 824 unsigned int i;
825
809 for (i = 3; i < SLOT_COUNT; ++i) 826 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 827 CXINC;
811 } 828
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 829 cxstack_ix -= SLOT_COUNT; /* undo allocation */
830 }
813 831
814 c->mainstack = PL_mainstack; 832 c->mainstack = PL_mainstack;
815 833
816 { 834 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 835 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 836
819 slot->defav = GvAV (PL_defgv); 837#if CORO_JIT
820 slot->defsv = DEFSV; 838 save_perl_slots (slot);
821 slot->errsv = ERRSV; 839#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 840 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 841 # include "state.h"
827 #undef VAR 842 #undef VARx
843#endif
828 } 844 }
829} 845}
830 846
831/* 847/*
832 * allocate various perl stacks. This is almost an exact copy 848 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 854# define coro_init_stacks(thx) init_stacks ()
839#else 855#else
840static void 856static void
841coro_init_stacks (pTHX) 857coro_init_stacks (pTHX)
842{ 858{
843 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() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 860 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 861 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 862 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 863
848 PL_stack_base = AvARRAY(PL_curstack); 864 PL_stack_base = AvARRAY(PL_curstack);
… …
955#endif 971#endif
956 972
957/* 973/*
958 * This overrides the default magic get method of %SIG elements. 974 * This overrides the default magic get method of %SIG elements.
959 * 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
960 * 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),
961 * readback here. 977 * we just provide our own readback here.
962 */ 978 */
963static int 979static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 980coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 981{
966 const char *s = MgPV_nolen_const (mg); 982 const char *s = MgPV_nolen_const (mg);
967 983
968 if (*s == '_') 984 if (*s == '_')
… …
980 } 996 }
981 997
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 999}
984 1000
985static int 1001static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1002coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1003{
988 const char *s = MgPV_nolen_const (mg); 1004 const char *s = MgPV_nolen_const (mg);
989 1005
990 if (*s == '_') 1006 if (*s == '_')
… …
1004 } 1020 }
1005 1021
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1022 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1023}
1008 1024
1009static int 1025static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1026coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1027{
1012 const char *s = MgPV_nolen_const (mg); 1028 const char *s = MgPV_nolen_const (mg);
1013 1029
1014 if (*s == '_') 1030 if (*s == '_')
… …
1049 return 1; 1065 return 1;
1050} 1066}
1051 1067
1052static UNOP init_perl_op; 1068static UNOP init_perl_op;
1053 1069
1054static 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 */
1055init_perl (pTHX_ struct coro *coro) 1071init_perl (pTHX_ struct coro *coro)
1056{ 1072{
1057 /* 1073 /*
1058 * emulate part of the perl startup here. 1074 * emulate part of the perl startup here.
1059 */ 1075 */
… …
1074 PL_parser = 0; 1090 PL_parser = 0;
1075#endif 1091#endif
1076 PL_hints = 0; 1092 PL_hints = 0;
1077 1093
1078 /* recreate the die/warn hooks */ 1094 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1095 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1096 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1097
1082 GvSV (PL_defgv) = newSV (0); 1098 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1099 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1100 GvSV (PL_errgv) = newSV (0);
1085 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);
… …
1106 /* 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
1107 * 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.
1108 */ 1124 */
1109 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 */
1110 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;
1111 1128
1112 /* 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 */
1113 init_perl_op.op_next = PL_op; 1130 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1131 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1132 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1137 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1138 CORO_THROW = coro->except;
1122 1139
1123 SWAP_SVS (coro); 1140 SWAP_SVS (coro);
1124 1141
1125 if (expect_false (enable_times)) 1142 if (ecb_expect_false (enable_times))
1126 { 1143 {
1127 coro_times_update (); 1144 coro_times_update ();
1128 coro_times_sub (coro); 1145 coro_times_sub (coro);
1129 } 1146 }
1130} 1147}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1171destroy_perl (pTHX_ struct coro *coro)
1155{ 1172{
1156 SV *svf [9]; 1173 SV *svf [9];
1157 1174
1158 { 1175 {
1176 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1177 struct coro *current = SvSTATE (old_current);
1160 1178
1161 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));
1162 1180
1163 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
1164 load_perl (aTHX_ coro); 1186 load_perl (aTHX_ coro);
1165 1187
1166 coro_unwind_stacks (aTHX); 1188 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1189
1169 /* restore swapped sv's */ 1190 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1191 SWAP_SVS (coro);
1171 1192
1193 coro_destruct_stacks (aTHX);
1194
1172 // now save some sv's to be free'd later 1195 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1196 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1197 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1198 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1199 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1200 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1202 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1203 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1204 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1205 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1206
1207 SvRV_set (coro_current, old_current);
1208
1184 load_perl (aTHX_ current); 1209 load_perl (aTHX_ current);
1185 } 1210 }
1186 1211
1187 { 1212 {
1188 unsigned int i; 1213 unsigned int i;
… …
1195 SvREFCNT_dec (coro->invoke_cb); 1220 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1221 SvREFCNT_dec (coro->invoke_av);
1197 } 1222 }
1198} 1223}
1199 1224
1200INLINE void 1225ECB_INLINE void
1201free_coro_mortal (pTHX) 1226free_coro_mortal (pTHX)
1202{ 1227{
1203 if (expect_true (coro_mortal)) 1228 if (ecb_expect_true (coro_mortal))
1204 { 1229 {
1205 SvREFCNT_dec (coro_mortal); 1230 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1231 coro_mortal = 0;
1207 } 1232 }
1208} 1233}
1209 1234
1210static int 1235static int
… …
1343 1368
1344 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 */
1345} 1370}
1346 1371
1347/* 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 */
1348static void NOINLINE 1373static void ecb_noinline
1349cctx_prepare (pTHX) 1374cctx_prepare (pTHX)
1350{ 1375{
1351 PL_top_env = &PL_start_env; 1376 PL_top_env = &PL_start_env;
1352 1377
1353 if (cctx_current->flags & CC_TRACE) 1378 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1389 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1390 slf_frame.check = slf_check_set_stacklevel;
1366} 1391}
1367 1392
1368/* 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 */
1369INLINE void 1394ECB_INLINE void
1370transfer_tail (pTHX) 1395transfer_tail (pTHX)
1371{ 1396{
1372 free_coro_mortal (aTHX); 1397 free_coro_mortal (aTHX);
1373} 1398}
1374 1399
… …
1418 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 */
1419 } 1444 }
1420} 1445}
1421 1446
1422static coro_cctx * 1447static coro_cctx *
1423cctx_new () 1448cctx_new (void)
1424{ 1449{
1425 coro_cctx *cctx; 1450 coro_cctx *cctx;
1426 1451
1427 ++cctx_count; 1452 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1453 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1459 return cctx;
1435} 1460}
1436 1461
1437/* create a new cctx only suitable as source */ 1462/* create a new cctx only suitable as source */
1438static coro_cctx * 1463static coro_cctx *
1439cctx_new_empty () 1464cctx_new_empty (void)
1440{ 1465{
1441 coro_cctx *cctx = cctx_new (); 1466 coro_cctx *cctx = cctx_new ();
1442 1467
1443 cctx->sptr = 0; 1468 cctx->sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1469 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1446 return cctx; 1471 return cctx;
1447} 1472}
1448 1473
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1474/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1475static coro_cctx *
1451cctx_new_run () 1476cctx_new_run (void)
1452{ 1477{
1453 coro_cctx *cctx = cctx_new (); 1478 coro_cctx *cctx = cctx_new ();
1454 void *stack_start; 1479 void *stack_start;
1455 size_t stack_size; 1480 size_t stack_size;
1456 1481
1457#if HAVE_MMAP 1482#if HAVE_MMAP
1458 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;
1459 /* mmap supposedly does allocate-on-write for us */ 1484 /* mmap supposedly does allocate-on-write for us */
1460 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);
1461 1486
1462 if (cctx->sptr != (void *)-1) 1487 if (cctx->sptr != (void *)-1)
1463 { 1488 {
1464 #if CORO_STACKGUARD 1489 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1490 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1526#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))
1527 1552
1528static coro_cctx * 1553static coro_cctx *
1529cctx_get (pTHX) 1554cctx_get (pTHX)
1530{ 1555{
1531 while (expect_true (cctx_first)) 1556 while (ecb_expect_true (cctx_first))
1532 { 1557 {
1533 coro_cctx *cctx = cctx_first; 1558 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1559 cctx_first = cctx->next;
1535 --cctx_idle; 1560 --cctx_idle;
1536 1561
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1562 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1563 return cctx;
1539 1564
1540 cctx_destroy (cctx); 1565 cctx_destroy (cctx);
1541 } 1566 }
1542 1567
… …
1547cctx_put (coro_cctx *cctx) 1572cctx_put (coro_cctx *cctx)
1548{ 1573{
1549 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));
1550 1575
1551 /* free another cctx if overlimit */ 1576 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1578 {
1554 coro_cctx *first = cctx_first; 1579 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1580 cctx_first = first->next;
1556 --cctx_idle; 1581 --cctx_idle;
1557 1582
… …
1568static void 1593static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1594transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1595{
1571 /* TODO: throwing up here is considered harmful */ 1596 /* TODO: throwing up here is considered harmful */
1572 1597
1573 if (expect_true (prev != next)) 1598 if (ecb_expect_true (prev != next))
1574 { 1599 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1600 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 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,");
1577 1602
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1603 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 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,");
1580 1605
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1606#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1607 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 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,");
1584#endif 1609#endif
1585 } 1610 }
1586} 1611}
1587 1612
1588/* always use the TRANSFER macro */ 1613/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1614static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1615transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1616{
1592 dSTACKLEVEL; 1617 dSTACKLEVEL;
1593 1618
1594 /* sometimes transfer is only called to set idle_sp */ 1619 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1620 if (ecb_expect_false (!prev))
1596 { 1621 {
1597 cctx_current->idle_sp = STACKLEVEL; 1622 cctx_current->idle_sp = STACKLEVEL;
1598 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 */
1599 } 1624 }
1600 else if (expect_true (prev != next)) 1625 else if (ecb_expect_true (prev != next))
1601 { 1626 {
1602 coro_cctx *cctx_prev; 1627 coro_cctx *cctx_prev;
1603 1628
1604 if (expect_false (prev->flags & CF_NEW)) 1629 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1630 {
1606 /* create a new empty/source context */ 1631 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1632 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1633 prev->flags |= CF_RUNNING;
1609 } 1634 }
… …
1612 next->flags |= CF_RUNNING; 1637 next->flags |= CF_RUNNING;
1613 1638
1614 /* first get rid of the old state */ 1639 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1640 save_perl (aTHX_ prev);
1616 1641
1617 if (expect_false (next->flags & CF_NEW)) 1642 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1643 {
1619 /* need to start coroutine */ 1644 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1645 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1646 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1647 init_perl (aTHX_ next);
1623 } 1648 }
1624 else 1649 else
1625 load_perl (aTHX_ next); 1650 load_perl (aTHX_ next);
1626 1651
1627 /* possibly untie and reuse the cctx */ 1652 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1653 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1654 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1655 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1656 && !force_cctx
1632 )) 1657 ))
1633 { 1658 {
1634 /* 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 */
1635 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));
1636 1661
1637 /* 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. */
1638 /* 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 */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1664 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1665 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1666 next->cctx = cctx_get (aTHX);
1642 1667
1643 cctx_put (cctx_current); 1668 cctx_put (cctx_current);
1644 } 1669 }
1645 else 1670 else
1646 prev->cctx = cctx_current; 1671 prev->cctx = cctx_current;
1647 1672
1648 ++next->usecount; 1673 ++next->usecount;
1649 1674
1650 cctx_prev = cctx_current; 1675 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1676 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1677
1653 next->cctx = 0; 1678 next->cctx = 0;
1654 1679
1655 if (expect_false (cctx_prev != cctx_current)) 1680 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1681 {
1657 cctx_prev->top_env = PL_top_env; 1682 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1683 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1684 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1685 }
… …
1666#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))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1692#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1693
1669/** high level stuff ********************************************************/ 1694/** high level stuff ********************************************************/
1670 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 */
1671static int 1698static void
1699coro_call_on_destroy (pTHX_ struct coro *coro);
1700
1701static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1702coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1703{
1674 if (coro->flags & CF_DESTROYED) 1704 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1705 return;
1676 1706
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1707 slf_destroy (aTHX_ coro);
1679 1708
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1709 coro->flags |= CF_ZOMBIE;
1689 1710
1690 if (coro->flags & CF_READY) 1711 if (coro->flags & CF_READY)
1691 { 1712 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1713 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1714 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1715 --coro_nready;
1695 } 1716 }
1696 else 1717 else
1697 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;
1698 1723
1699 if (coro->mainstack 1724 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1725 && coro->mainstack != main_mainstack
1701 && coro->slot 1726 && coro->slot
1702 && !PL_dirty) 1727 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1728 destroy_perl (aTHX_ coro);
1704 1729
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1730 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1731 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1732 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1733 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1734 SvREFCNT_dec (CORO_THROW);
1714 1735
1715 return 1; 1736 coro_call_on_destroy (aTHX_ coro);
1737
1738 /* more destruction mayhem in coro_state_free */
1716} 1739}
1717 1740
1718static int 1741static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1742coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1743{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1744 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1745 mg->mg_ptr = 0;
1723 1746
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1747 coro_state_destroy (aTHX_ coro);
1748 SvREFCNT_dec (coro->on_destroy);
1749 SvREFCNT_dec (coro->status);
1750
1729 Safefree (coro); 1751 Safefree (coro);
1730 }
1731 1752
1732 return 0; 1753 return 0;
1733} 1754}
1734 1755
1735static int 1756static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1757coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1758{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1759 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1760 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1761 mg->mg_ptr = 0;
1762 mg->mg_virtual = 0;
1741 1763
1742 return 0; 1764 return 0;
1743} 1765}
1744 1766
1745static MGVTBL coro_state_vtbl = { 1767static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1792 TRANSFER (ta, 1);
1771} 1793}
1772 1794
1773/** Coro ********************************************************************/ 1795/** Coro ********************************************************************/
1774 1796
1775INLINE void 1797ECB_INLINE void
1776coro_enq (pTHX_ struct coro *coro) 1798coro_enq (pTHX_ struct coro *coro)
1777{ 1799{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1800 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1801
1780 SvREFCNT_inc_NN (coro->hv); 1802 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1804 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1805 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1806 ready [1] = coro;
1785} 1807}
1786 1808
1787INLINE struct coro * 1809ECB_INLINE struct coro *
1788coro_deq (pTHX) 1810coro_deq (pTHX)
1789{ 1811{
1790 int prio; 1812 int prio;
1791 1813
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1814 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1867{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1868 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1869}
1848 1870
1849/* expects to own a reference to next->hv */ 1871/* expects to own a reference to next->hv */
1850INLINE void 1872ECB_INLINE void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1873prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1874{
1853 SV *prev_sv = SvRV (coro_current); 1875 SV *prev_sv = SvRV (coro_current);
1854 1876
1855 ta->prev = SvSTATE_hv (prev_sv); 1877 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1890{
1869 for (;;) 1891 for (;;)
1870 { 1892 {
1871 struct coro *next = coro_deq (aTHX); 1893 struct coro *next = coro_deq (aTHX);
1872 1894
1873 if (expect_true (next)) 1895 if (ecb_expect_true (next))
1874 { 1896 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1897 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1898 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 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 */
1878 else 1900 else
1879 { 1901 {
1880 next->flags &= ~CF_READY; 1902 next->flags &= ~CF_READY;
1881 --coro_nready; 1903 --coro_nready;
… …
1914 } 1936 }
1915 } 1937 }
1916 } 1938 }
1917} 1939}
1918 1940
1919INLINE void 1941ECB_INLINE void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 1942prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 1943{
1922 api_ready (aTHX_ coro_current); 1944 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 1945 prepare_schedule (aTHX_ ta);
1924} 1946}
1925 1947
1926INLINE void 1948ECB_INLINE void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1949prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 1950{
1929 SV *prev = SvRV (coro_current); 1951 SV *prev = SvRV (coro_current);
1930 1952
1931 if (coro_nready) 1953 if (coro_nready)
… …
1961{ 1983{
1962 struct coro_transfer_args ta; 1984 struct coro_transfer_args ta;
1963 1985
1964 prepare_cede (aTHX_ &ta); 1986 prepare_cede (aTHX_ &ta);
1965 1987
1966 if (expect_true (ta.prev != ta.next)) 1988 if (ecb_expect_true (ta.prev != ta.next))
1967 { 1989 {
1968 TRANSFER (ta, 1); 1990 TRANSFER (ta, 1);
1969 return 1; 1991 return 1;
1970 } 1992 }
1971 else 1993 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2036 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2037 }
2016} 2038}
2017 2039
2018static 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
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2117coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2118{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2119 AV *od = coro->on_destroy;
2022 2120
2023 if (on_destroyp) 2121 if (!od)
2024 { 2122 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2123
2029 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
2030 { 2132 {
2031 dSP; /* don't disturb outer sp */ 2133 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2134 PUSHMARK (SP);
2035 2135
2036 if (statusp) 2136 if (coro->status)
2037 { 2137 {
2038 int i; 2138 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2139 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2140 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2141 }
2044 2142
2045 PUTBACK; 2143 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2144 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2145 }
2048 } 2146 }
2049} 2147}
2050 2148
2051static void 2149static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2151{
2054 AV *av = newAV (); 2152 AV *av;
2153
2154 if (coro->status)
2155 {
2156 av = coro->status;
2157 av_clear (av);
2158 }
2159 else
2160 av = coro->status = newAV ();
2055 2161
2056 /* items are actually not so common, so optimise for this case */ 2162 /* items are actually not so common, so optimise for this case */
2057 if (items) 2163 if (items)
2058 { 2164 {
2059 int i; 2165 int i;
… …
2061 av_extend (av, items - 1); 2167 av_extend (av, items - 1);
2062 2168
2063 for (i = 0; i < items; ++i) 2169 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2170 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2171 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2172}
2069 2173
2070static void 2174static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2175slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2176{
… …
2084static void 2188static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2189slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2190{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2191 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2192
2089 coro_set_status (coro_hv, arg, items); 2193 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2194 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2195}
2092 2196
2093static void 2197static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2198slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2199{
… …
2100 croak ("Coro::cancel called without coro object,"); 2204 croak ("Coro::cancel called without coro object,");
2101 2205
2102 coro = SvSTATE (arg [0]); 2206 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2207 coro_hv = coro->hv;
2104 2208
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2209 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2210
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2211 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2212 {
2109 /* coro currently busy cancelling something, so just notify it */ 2213 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2214 coro->slf_frame.data = (void *)coro;
2111 2215
2112 frame->prepare = prepare_nop; 2216 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2217 frame->check = slf_check_nop;
2114 } 2218 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2219 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2220 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2221 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2222 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2223 }
2120 else 2224 else
2121 { 2225 {
2122 struct coro *self = SvSTATE_current; 2226 struct coro *self = SvSTATE_current;
2123 2227
… …
2127 * this is ugly, and hopefully fully worth the extra speed. 2231 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2232 * besides, I can't get the slow-but-safe version working...
2129 */ 2233 */
2130 slf_frame.data = 0; 2234 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2235 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2236 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2237 self->flags &= ~CF_NOCANCEL;
2137 2238
2138 if (slf_frame.data) 2239 if (slf_frame.data)
2139 { 2240 {
2140 /* while we were busy we have been cancelled, so terminate */ 2241 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2242 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2243 }
2143 else 2244 else
2144 { 2245 {
2145 frame->prepare = prepare_nop; 2246 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2247 frame->check = slf_check_nop;
2147 } 2248 }
2148 } 2249 }
2149} 2250}
2150 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;
2289}
2290
2151/*****************************************************************************/ 2291/*****************************************************************************/
2152/* async pool handler */ 2292/* async pool handler */
2153 2293
2154static int 2294static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2295slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_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)
2185{ 2325{
2186 HV *hv = (HV *)SvRV (coro_current); 2326 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2327 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2328
2189 if (expect_true (coro->saved_deffh)) 2329 if (ecb_expect_true (coro->saved_deffh))
2190 { 2330 {
2191 /* subsequent iteration */ 2331 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2332 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2333 coro->saved_deffh = 0;
2194 2334
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2335 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2336 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2337 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2338 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2339 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2340 }
2203 else 2341 else
2204 { 2342 {
2205 av_clear (GvAV (PL_defgv)); 2343 av_clear (GvAV (PL_defgv));
2206 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);
… …
2429static void 2567static void
2430slf_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)
2431{ 2569{
2432 frame->prepare = prepare_cede_notself; 2570 frame->prepare = prepare_cede_notself;
2433 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;
2434} 2589}
2435 2590
2436/* 2591/*
2437 * these not obviously related functions are all rolled into one 2592 * these not obviously related functions are all rolled into one
2438 * 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
… …
2445 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 */
2446 2601
2447 /* 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 */
2448 /* the latter happens when a new coro has been started */ 2603 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2604 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2605 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2606 {
2452 /* first iteration */ 2607 /* first iteration */
2453 dSP; 2608 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2609 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2610 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2651 while (slf_frame.check (aTHX_ &slf_frame));
2497 2652
2498 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 */
2499 2654
2500 /* exception handling */ 2655 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2656 if (ecb_expect_false (CORO_THROW))
2502 { 2657 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2658 SV *exception = sv_2mortal (CORO_THROW);
2504 2659
2505 CORO_THROW = 0; 2660 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2661 sv_setsv (ERRSV, exception);
2507 croak (0); 2662 croak (0);
2508 } 2663 }
2509 2664
2510 /* return value handling - mostly like entersub */ 2665 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2666 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2667 if (GIMME_V == G_SCALAR
2668 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2669 {
2514 dSP; 2670 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2671 SV **bot = PL_stack_base + checkmark;
2516 2672
2517 if (sp == bot) /* too few, push undef */ 2673 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2674 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2675 else /* too many, take last one */
2520 bot [1] = *sp; 2676 bot [1] = *sp;
2521 2677
2522 SP = bot + 1; 2678 SP = bot + 1;
2523 2679
2524 PUTBACK; 2680 PUTBACK;
… …
2631{ 2787{
2632 PerlIOBuf base; 2788 PerlIOBuf base;
2633 NV next, every; 2789 NV next, every;
2634} PerlIOCede; 2790} PerlIOCede;
2635 2791
2636static IV 2792static IV ecb_cold
2637PerlIOCede_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)
2638{ 2794{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2795 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2796
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2797 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2798 self->next = nvtime () + self->every;
2643 2799
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2800 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2801}
2646 2802
2647static SV * 2803static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2804PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2805{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2806 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2807
2652 return newSVnv (self->every); 2808 return newSVnv (self->every);
… …
2764 SvREFCNT_dec (cb); 2920 SvREFCNT_dec (cb);
2765 } 2921 }
2766} 2922}
2767 2923
2768static void 2924static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2925coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 2926{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2927 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2928 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 2929}
2774 2930
2775static int 2931static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2932slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 2933{
2778 AV *av = (AV *)frame->data; 2934 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 2935 SV *count_sv = AvARRAY (av)[0];
2936 SV *coro_hv = SvRV (coro_current);
2780 2937
2781 /* 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 */
2782 if (CORO_THROW) 2939 if (CORO_THROW)
2783 return 0; 2940 return 0;
2784 else if (SvIVX (count_sv) > 0) 2941 else if (SvIVX (count_sv) > 0)
2785 { 2942 {
2786 SvSTATE_current->on_destroy = 0; 2943 frame->destroy = 0;
2787 2944
2788 if (acquire) 2945 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2946 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 2947 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 2948 coro_semaphore_adjust (aTHX_ av, 0);
… …
2796 { 2953 {
2797 int i; 2954 int i;
2798 /* 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 */
2799 /* 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 */
2800 /* this avoids some degenerate memory usage cases */ 2957 /* this avoids some degenerate memory usage cases */
2801 2958 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 2959 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 2960 return 1;
2805 2961
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2962 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 2963 return 1;
2808 } 2964 }
2809} 2965}
2810 2966
2811static int 2967static int
… …
2834 { 2990 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2991 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 2992
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2993 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 2994 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 2995 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2996 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2997 frame->destroy = coro_semaphore_destroy;
2843 } 2998 }
2844} 2999}
2845 3000
2846static void 3001static void
2847slf_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)
… …
3065 dSP; 3220 dSP;
3066 3221
3067 static SV *prio_cv; 3222 static SV *prio_cv;
3068 static SV *prio_sv; 3223 static SV *prio_sv;
3069 3224
3070 if (expect_false (!prio_cv)) 3225 if (ecb_expect_false (!prio_cv))
3071 { 3226 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3227 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3228 prio_sv = newSViv (0);
3074 } 3229 }
3075 3230
… …
3181 } 3336 }
3182 3337
3183 return coro_sv; 3338 return coro_sv;
3184} 3339}
3185 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_4uv (pTHX_ UV a, UV b, UV c, UV d)
3349{
3350 dSP;
3351 AV *av = newAV ();
3352
3353 av_store (av, 3, newSVuv (d));
3354 av_store (av, 2, newSVuv (c));
3355 av_store (av, 1, newSVuv (b));
3356 av_store (av, 0, newSVuv (a));
3357
3358 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3359
3360 PUTBACK;
3361}
3362
3363static void ecb_noinline ecb_cold
3364jit_init (pTHX)
3365{
3366 dSP;
3367 SV *load, *save;
3368 char *map_base;
3369 char *load_ptr, *save_ptr;
3370 STRLEN load_len, save_len, map_len;
3371 int count;
3372
3373 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3374
3375 PUSHMARK (SP);
3376#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3377# include "state.h"
3378#undef VARx
3379 count = call_pv ("Coro::State::_jit", G_ARRAY);
3380 SPAGAIN;
3381
3382 save = POPs; save_ptr = SvPVbyte (save, save_len);
3383 load = POPs; load_ptr = SvPVbyte (load, load_len);
3384
3385 map_len = load_len + save_len + 16;
3386
3387 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3388
3389 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3390
3391 load_perl_slots = (load_save_perl_slots_type)map_base;
3392 memcpy (map_base, load_ptr, load_len);
3393
3394 map_base += (load_len + 15) & ~15;
3395
3396 save_perl_slots = (load_save_perl_slots_type)map_base;
3397 memcpy (map_base, save_ptr, save_len);
3398
3399 /* we are good citizens and try to make the page read-only, so the evil evil */
3400 /* hackers might have it a bit more difficult */
3401 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3402
3403 PUTBACK;
3404 eval_pv ("undef &Coro::State::_jit", 1);
3405}
3406
3407#endif
3408
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3409MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3410
3188PROTOTYPES: DISABLE 3411PROTOTYPES: DISABLE
3189 3412
3190BOOT: 3413BOOT:
… …
3194 coro_thx = PERL_GET_CONTEXT; 3417 coro_thx = PERL_GET_CONTEXT;
3195# endif 3418# endif
3196#endif 3419#endif
3197 BOOT_PAGESIZE; 3420 BOOT_PAGESIZE;
3198 3421
3422 /* perl defines these to check for existance first, but why it doesn't */
3423 /* just create them one at init time is not clear to me, except for */
3424 /* programs trying to delete them, but... */
3425 /* anyway, we declare this as invalid and make sure they are initialised here */
3426 DEFSV;
3427 ERRSV;
3428
3199 cctx_current = cctx_new_empty (); 3429 cctx_current = cctx_new_empty ();
3200 3430
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3431 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3432 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3203 3433
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3475 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3476
3247 time_init (aTHX); 3477 time_init (aTHX);
3248 3478
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3479 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3480#if CORO_JIT
3481 PUTBACK;
3482 jit_init (aTHX);
3483 SPAGAIN;
3484#endif
3250} 3485}
3251 3486
3252SV * 3487SV *
3253new (SV *klass, ...) 3488new (SV *klass, ...)
3254 ALIAS: 3489 ALIAS:
… …
3396 PROTOTYPE: $ 3631 PROTOTYPE: $
3397 ALIAS: 3632 ALIAS:
3398 is_ready = CF_READY 3633 is_ready = CF_READY
3399 is_running = CF_RUNNING 3634 is_running = CF_RUNNING
3400 is_new = CF_NEW 3635 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3636 is_destroyed = CF_ZOMBIE
3637 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3638 is_suspended = CF_SUSPENDED
3403 CODE: 3639 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3640 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3641 OUTPUT:
3406 RETVAL 3642 RETVAL
… …
3501times (Coro::State self) 3737times (Coro::State self)
3502 PPCODE: 3738 PPCODE:
3503{ 3739{
3504 struct coro *current = SvSTATE (coro_current); 3740 struct coro *current = SvSTATE (coro_current);
3505 3741
3506 if (expect_false (current == self)) 3742 if (ecb_expect_false (current == self))
3507 { 3743 {
3508 coro_times_update (); 3744 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3745 coro_times_add (SvSTATE (coro_current));
3510 } 3746 }
3511 3747
3512 EXTEND (SP, 2); 3748 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3749 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3750 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3751
3516 if (expect_false (current == self)) 3752 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3753 coro_times_sub (SvSTATE (coro_current));
3518} 3754}
3519 3755
3520void 3756void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3757swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3542BOOT: 3778BOOT:
3543{ 3779{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3780 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3781 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3782 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3783 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3784 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3785 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3786 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3787 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3595void 3830void
3596_destroy (Coro::State coro) 3831_destroy (Coro::State coro)
3597 CODE: 3832 CODE:
3598 /* used by the manager thread */ 3833 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 3834 coro_state_destroy (aTHX_ coro);
3835
3836void
3837on_destroy (Coro::State coro, SV *cb)
3838 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 3839 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3840
3841void
3842join (...)
3843 CODE:
3844 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 3845
3602void 3846void
3603terminate (...) 3847terminate (...)
3604 CODE: 3848 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3849 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606 3850
3607void 3851void
3608cancel (...) 3852cancel (...)
3609 CODE: 3853 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3854 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3855
3856int
3857safe_cancel (Coro::State self, ...)
3858 C_ARGS: aTHX_ self, &ST (1), items - 1
3611 3859
3612void 3860void
3613schedule (...) 3861schedule (...)
3614 CODE: 3862 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3863 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3891} 4139}
3892 4140
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4141MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4142
3895void 4143void
3896_may_delete (SV *sem, int count, int extra_refs) 4144_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4145 PPCODE:
3898{ 4146{
3899 AV *av = (AV *)SvRV (sem); 4147 AV *av = (AV *)SvRV (sem);
3900 4148
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4149 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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