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.398 by root, Sat May 7 14:11:10 2011 UTC vs.
Revision 1.422 by root, Sat Oct 6 21:25:24 2012 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
… …
61#endif 63#endif
62 64
63/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
65 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
67# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
68#endif 74#endif
69 75
70#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
86# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
87#endif 93#endif
88 94
89#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
90 96
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" 97#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
108 99
109#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
110# if CORO_PTHREAD 101# if CORO_PTHREAD
… …
166static char times_valid; 157static char times_valid;
167 158
168static struct coro_cctx *cctx_first; 159static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 160static int cctx_count, cctx_idle;
170 161
171enum { 162enum
163{
172 CC_MAPPED = 0x01, 164 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 165 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 166 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 167 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 168 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
186 void *sptr; 178 void *sptr;
187 size_t ssize; 179 size_t ssize;
188 180
189 /* cpu state */ 181 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 184 JMPENV *idle_te; /* same as idle_sp, but for top_env */
185#endif
192 JMPENV *top_env; 186 JMPENV *top_env;
193 coro_context cctx; 187 coro_context cctx;
194 188
195 U32 gen; 189 U32 gen;
196#if CORO_USE_VALGRIND 190#if CORO_USE_VALGRIND
… …
201 195
202static coro_cctx *cctx_current; /* the currently running cctx */ 196static coro_cctx *cctx_current; /* the currently running cctx */
203 197
204/*****************************************************************************/ 198/*****************************************************************************/
205 199
200static MGVTBL coro_state_vtbl;
201
206enum { 202enum
203{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 204 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 205 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 206 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 207 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 208 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 209 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 210};
214 211
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 213typedef struct
217{ 214{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 215 #define VARx(name,expr,type) type name;
224# include "state.h" 216 #include "state.h"
225#undef VAR
226} perl_slots; 217} perl_slots;
227 218
228// how many context stack entries do we need for perl_slots 219/* how many context stack entries do we need for perl_slots */
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 221
231/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
232struct coro { 223struct coro
224{
233 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 226 coro_cctx *cctx;
235 227
236 /* ready queue */ 228 /* ready queue */
237 struct coro *next_ready; 229 struct coro *next_ready;
… …
239 /* state data */ 231 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 233 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
243 235
244 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
245 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
246 int refcnt; /* coroutines are refcounted, yes */
247 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
248 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
249 240
250 /* statistics */ 241 /* statistics */
251 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
252 243
253 /* coro process data */ 244 /* coro process data */
254 int prio; 245 int prio;
255 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
256 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
257 250
258 /* async_pool */ 251 /* async_pool */
259 SV *saved_deffh; 252 SV *saved_deffh;
260 SV *invoke_cb; 253 SV *invoke_cb;
261 AV *invoke_av; 254 AV *invoke_av;
… …
297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
298static CV *cv_coro_run; 291static CV *cv_coro_run;
299static struct coro *coro_first; 292static struct coro *coro_first;
300#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
301 294
295/** JIT *********************************************************************/
296
297#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix"
305 #endif
306 #endif
307#endif
308
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
310 #undef CORO_JIT
311#endif
312
313#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *);
315 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
316#endif
317
302/** Coro::Select ************************************************************/ 318/** Coro::Select ************************************************************/
303 319
304static OP *(*coro_old_pp_sselect) (pTHX); 320static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select; 321static SV *coro_select_select;
306 322
… …
321 337
322/** time stuff **************************************************************/ 338/** time stuff **************************************************************/
323 339
324#ifdef HAS_GETTIMEOFDAY 340#ifdef HAS_GETTIMEOFDAY
325 341
326static void 342ecb_inline void
327coro_u2time (pTHX_ UV ret[2]) 343coro_u2time (pTHX_ UV ret[2])
328{ 344{
329 struct timeval tv; 345 struct timeval tv;
330 gettimeofday (&tv, 0); 346 gettimeofday (&tv, 0);
331 347
332 ret [0] = tv.tv_sec; 348 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec; 349 ret [1] = tv.tv_usec;
334} 350}
335 351
336static double 352ecb_inline double
337coro_nvtime () 353coro_nvtime (void)
338{ 354{
339 struct timeval tv; 355 struct timeval tv;
340 gettimeofday (&tv, 0); 356 gettimeofday (&tv, 0);
341 357
342 return tv.tv_sec + tv.tv_usec * 1e-6; 358 return tv.tv_sec + tv.tv_usec * 1e-6;
343} 359}
344 360
345static void 361ecb_inline void
346time_init (pTHX) 362time_init (pTHX)
347{ 363{
348 nvtime = coro_nvtime; 364 nvtime = coro_nvtime;
349 u2time = coro_u2time; 365 u2time = coro_u2time;
350} 366}
351 367
352#else 368#else
353 369
354static void 370ecb_inline void
355time_init (pTHX) 371time_init (pTHX)
356{ 372{
357 SV **svp; 373 SV **svp;
358 374
359 require_pv ("Time/HiRes.pm"); 375 require_pv ("Time/HiRes.pm");
… …
371 387
372#endif 388#endif
373 389
374/** lowlevel stuff **********************************************************/ 390/** lowlevel stuff **********************************************************/
375 391
376static SV * 392static SV * ecb_noinline
377coro_get_sv (pTHX_ const char *name, int create) 393coro_get_sv (pTHX_ const char *name, int create)
378{ 394{
379#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
380 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
381 get_sv (name, create); 397 get_sv (name, create);
382#endif 398#endif
383 return get_sv (name, create); 399 return get_sv (name, create);
384} 400}
385 401
386static AV * 402static AV * ecb_noinline
387coro_get_av (pTHX_ const char *name, int create) 403coro_get_av (pTHX_ const char *name, int create)
388{ 404{
389#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
391 get_av (name, create); 407 get_av (name, create);
392#endif 408#endif
393 return get_av (name, create); 409 return get_av (name, create);
394} 410}
395 411
396static HV * 412static HV * ecb_noinline
397coro_get_hv (pTHX_ const char *name, int create) 413coro_get_hv (pTHX_ const char *name, int create)
398{ 414{
399#if PERL_VERSION_ATLEAST (5,10,0) 415#if PERL_VERSION_ATLEAST (5,10,0)
400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 416 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
401 get_hv (name, create); 417 get_hv (name, create);
402#endif 418#endif
403 return get_hv (name, create); 419 return get_hv (name, create);
404} 420}
405 421
406INLINE void 422ecb_inline void
407coro_times_update () 423coro_times_update (void)
408{ 424{
409#ifdef coro_clock_gettime 425#ifdef coro_clock_gettime
410 struct timespec ts; 426 struct timespec ts;
411 427
412 ts.tv_sec = ts.tv_nsec = 0; 428 ts.tv_sec = ts.tv_nsec = 0;
… …
424 time_real [0] = tv [0]; 440 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000; 441 time_real [1] = tv [1] * 1000;
426#endif 442#endif
427} 443}
428 444
429INLINE void 445ecb_inline void
430coro_times_add (struct coro *c) 446coro_times_add (struct coro *c)
431{ 447{
432 c->t_real [1] += time_real [1]; 448 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 449 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0]; 450 c->t_real [0] += time_real [0];
… …
436 c->t_cpu [1] += time_cpu [1]; 452 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 453 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0]; 454 c->t_cpu [0] += time_cpu [0];
439} 455}
440 456
441INLINE void 457ecb_inline void
442coro_times_sub (struct coro *c) 458coro_times_sub (struct coro *c)
443{ 459{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 460 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
445 c->t_real [1] -= time_real [1]; 461 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0]; 462 c->t_real [0] -= time_real [0];
… …
454/* magic glue */ 470/* magic glue */
455 471
456#define CORO_MAGIC_type_cv 26 472#define CORO_MAGIC_type_cv 26
457#define CORO_MAGIC_type_state PERL_MAGIC_ext 473#define CORO_MAGIC_type_state PERL_MAGIC_ext
458 474
459#define CORO_MAGIC_NN(sv, type) \ 475#define CORO_MAGIC_NN(sv, type) \
460 (expect_true (SvMAGIC (sv)->mg_type == type) \ 476 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
461 ? SvMAGIC (sv) \ 477 ? SvMAGIC (sv) \
462 : mg_find (sv, type)) 478 : mg_find (sv, type))
463 479
464#define CORO_MAGIC(sv, type) \ 480#define CORO_MAGIC(sv, type) \
465 (expect_true (SvMAGIC (sv)) \ 481 (ecb_expect_true (SvMAGIC (sv)) \
466 ? CORO_MAGIC_NN (sv, type) \ 482 ? CORO_MAGIC_NN (sv, type) \
467 : 0) 483 : 0)
468 484
469#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 485#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
470#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 486#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
471 487
472INLINE struct coro * 488ecb_inline MAGIC *
489SvSTATEhv_p (pTHX_ SV *coro)
490{
491 MAGIC *mg;
492
493 if (ecb_expect_true (
494 SvTYPE (coro) == SVt_PVHV
495 && (mg = CORO_MAGIC_state (coro))
496 && mg->mg_virtual == &coro_state_vtbl
497 ))
498 return mg;
499
500 return 0;
501}
502
503ecb_inline struct coro *
473SvSTATE_ (pTHX_ SV *coro) 504SvSTATE_ (pTHX_ SV *coro)
474{ 505{
475 HV *stash;
476 MAGIC *mg; 506 MAGIC *mg;
477 507
478 if (SvROK (coro)) 508 if (SvROK (coro))
479 coro = SvRV (coro); 509 coro = SvRV (coro);
480 510
481 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 511 mg = SvSTATEhv_p (aTHX_ coro);
512 if (!mg)
482 croak ("Coro::State object required"); 513 croak ("Coro::State object required");
483 514
484 stash = SvSTASH (coro);
485 if (expect_false (stash != coro_stash && stash != coro_state_stash))
486 {
487 /* very slow, but rare, check */
488 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
489 croak ("Coro::State object required");
490 }
491
492 mg = CORO_MAGIC_state (coro);
493 return (struct coro *)mg->mg_ptr; 515 return (struct coro *)mg->mg_ptr;
494} 516}
495 517
496#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 518#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
497 519
… …
500#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
501 523
502/*****************************************************************************/ 524/*****************************************************************************/
503/* padlist management and caching */ 525/* padlist management and caching */
504 526
505static AV * 527ecb_inline AV *
506coro_derive_padlist (pTHX_ CV *cv) 528coro_derive_padlist (pTHX_ CV *cv)
507{ 529{
508 AV *padlist = CvPADLIST (cv); 530 AV *padlist = CvPADLIST (cv);
509 AV *newpadlist, *newpad; 531 AV *newpadlist, *newpad;
510 532
… …
522 av_store (newpadlist, 1, (SV *)newpad); 544 av_store (newpadlist, 1, (SV *)newpad);
523 545
524 return newpadlist; 546 return newpadlist;
525} 547}
526 548
527static void 549ecb_inline void
528free_padlist (pTHX_ AV *padlist) 550free_padlist (pTHX_ AV *padlist)
529{ 551{
530 /* may be during global destruction */ 552 /* may be during global destruction */
531 if (!IN_DESTRUCT) 553 if (!IN_DESTRUCT)
532 { 554 {
… …
575 0, 0, 0, 0, 597 0, 0, 0, 0,
576 coro_cv_free 598 coro_cv_free
577}; 599};
578 600
579/* the next two functions merely cache the padlists */ 601/* the next two functions merely cache the padlists */
580static void 602ecb_inline void
581get_padlist (pTHX_ CV *cv) 603get_padlist (pTHX_ CV *cv)
582{ 604{
583 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
584 AV *av; 606 AV *av;
585 607
586 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
587 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
588 else 610 else
589 { 611 {
590#if CORO_PREFER_PERL_FUNCTIONS 612#if CORO_PREFER_PERL_FUNCTIONS
591 /* this is probably cleaner? but also slower! */ 613 /* this is probably cleaner? but also slower! */
… …
598 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 620 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
599#endif 621#endif
600 } 622 }
601} 623}
602 624
603static void 625ecb_inline void
604put_padlist (pTHX_ CV *cv) 626put_padlist (pTHX_ CV *cv)
605{ 627{
606 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
607 AV *av; 629 AV *av;
608 630
609 if (expect_false (!mg)) 631 if (ecb_expect_false (!mg))
610 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
611 633
612 av = (AV *)mg->mg_obj; 634 av = (AV *)mg->mg_obj;
613 635
614 if (expect_false (AvFILLp (av) >= AvMAX (av))) 636 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
615 av_extend (av, AvFILLp (av) + 1); 637 av_extend (av, AvFILLp (av) + 1);
616 638
617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 639 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
618} 640}
619 641
620/** load & save, init *******************************************************/ 642/** load & save, init *******************************************************/
621 643
644ecb_inline void
645swap_sv (SV *a, SV *b)
646{
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 and later complicates this _quite_ a bit, but it also
660 * is much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680}
681
622/* swap sv heads, at least logically */ 682/* swap sv heads, at least logically */
623static void 683static void
624swap_svs (pTHX_ Coro__State c) 684swap_svs (pTHX_ Coro__State c)
625{ 685{
626 int i; 686 int i;
627 687
628 for (i = 0; i <= AvFILLp (c->swap_sv); ) 688 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
629 { 689 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667} 690}
668 691
669#define SWAP_SVS(coro) \ 692#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \ 693 if (ecb_expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro)) 694 swap_svs (aTHX_ (coro))
672 695
673static void 696static void
674on_enterleave_call (pTHX_ SV *cb); 697on_enterleave_call (pTHX_ SV *cb);
675 698
… …
679 perl_slots *slot = c->slot; 702 perl_slots *slot = c->slot;
680 c->slot = 0; 703 c->slot = 0;
681 704
682 PL_mainstack = c->mainstack; 705 PL_mainstack = c->mainstack;
683 706
684 GvSV (PL_defgv) = slot->defsv; 707#if CORO_JIT
685 GvAV (PL_defgv) = slot->defav; 708 load_perl_slots (slot);
686 GvSV (PL_errgv) = slot->errsv; 709#else
687 GvSV (irsgv) = slot->irsgv;
688 GvHV (PL_hintgv) = slot->hinthv;
689
690 #define VAR(name,type) PL_ ## name = slot->name; 710 #define VARx(name,expr,type) expr = slot->name;
691 # include "state.h" 711 #include "state.h"
692 #undef VAR 712#endif
693 713
694 { 714 {
695 dSP; 715 dSP;
696 716
697 CV *cv; 717 CV *cv;
698 718
699 /* now do the ugly restore mess */ 719 /* now do the ugly restore mess */
700 while (expect_true (cv = (CV *)POPs)) 720 while (ecb_expect_true (cv = (CV *)POPs))
701 { 721 {
702 put_padlist (aTHX_ cv); /* mark this padlist as available */ 722 put_padlist (aTHX_ cv); /* mark this padlist as available */
703 CvDEPTH (cv) = PTR2IV (POPs); 723 CvDEPTH (cv) = PTR2IV (POPs);
704 CvPADLIST (cv) = (AV *)POPs; 724 CvPADLIST (cv) = (AV *)POPs;
705 } 725 }
… …
708 } 728 }
709 729
710 slf_frame = c->slf_frame; 730 slf_frame = c->slf_frame;
711 CORO_THROW = c->except; 731 CORO_THROW = c->except;
712 732
713 if (expect_false (enable_times)) 733 if (ecb_expect_false (enable_times))
714 { 734 {
715 if (expect_false (!times_valid)) 735 if (ecb_expect_false (!times_valid))
716 coro_times_update (); 736 coro_times_update ();
717 737
718 coro_times_sub (c); 738 coro_times_sub (c);
719 } 739 }
720 740
721 if (expect_false (c->on_enter)) 741 if (ecb_expect_false (c->on_enter))
722 { 742 {
723 int i; 743 int i;
724 744
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 745 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 746 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
732static void 752static void
733save_perl (pTHX_ Coro__State c) 753save_perl (pTHX_ Coro__State c)
734{ 754{
735 SWAP_SVS (c); 755 SWAP_SVS (c);
736 756
737 if (expect_false (c->on_leave)) 757 if (ecb_expect_false (c->on_leave))
738 { 758 {
739 int i; 759 int i;
740 760
741 for (i = AvFILLp (c->on_leave); i >= 0; --i) 761 for (i = AvFILLp (c->on_leave); i >= 0; --i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 762 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 } 763 }
744 764
745 times_valid = 0; 765 times_valid = 0;
746 766
747 if (expect_false (enable_times)) 767 if (ecb_expect_false (enable_times))
748 { 768 {
749 coro_times_update (); times_valid = 1; 769 coro_times_update (); times_valid = 1;
750 coro_times_add (c); 770 coro_times_add (c);
751 } 771 }
752 772
… …
766 786
767 XPUSHs (Nullsv); 787 XPUSHs (Nullsv);
768 /* this loop was inspired by pp_caller */ 788 /* this loop was inspired by pp_caller */
769 for (;;) 789 for (;;)
770 { 790 {
771 while (expect_true (cxix >= 0)) 791 while (ecb_expect_true (cxix >= 0))
772 { 792 {
773 PERL_CONTEXT *cx = &ccstk[cxix--]; 793 PERL_CONTEXT *cx = &ccstk[cxix--];
774 794
775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 795 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
776 { 796 {
777 CV *cv = cx->blk_sub.cv; 797 CV *cv = cx->blk_sub.cv;
778 798
779 if (expect_true (CvDEPTH (cv))) 799 if (ecb_expect_true (CvDEPTH (cv)))
780 { 800 {
781 EXTEND (SP, 3); 801 EXTEND (SP, 3);
782 PUSHs ((SV *)CvPADLIST (cv)); 802 PUSHs ((SV *)CvPADLIST (cv));
783 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 803 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
784 PUSHs ((SV *)cv); 804 PUSHs ((SV *)cv);
… …
787 get_padlist (aTHX_ cv); 807 get_padlist (aTHX_ cv);
788 } 808 }
789 } 809 }
790 } 810 }
791 811
792 if (expect_true (top_si->si_type == PERLSI_MAIN)) 812 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
793 break; 813 break;
794 814
795 top_si = top_si->si_prev; 815 top_si = top_si->si_prev;
796 ccstk = top_si->si_cxstack; 816 ccstk = top_si->si_cxstack;
797 cxix = top_si->si_cxix; 817 cxix = top_si->si_cxix;
… …
799 819
800 PUTBACK; 820 PUTBACK;
801 } 821 }
802 822
803 /* allocate some space on the context stack for our purposes */ 823 /* allocate some space on the context stack for our purposes */
804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 824 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
805 { 825 {
806 unsigned int i; 826 unsigned int i;
807 827
808 for (i = 0; i < SLOT_COUNT; ++i) 828 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 829 CXINC;
… …
814 c->mainstack = PL_mainstack; 834 c->mainstack = PL_mainstack;
815 835
816 { 836 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 837 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 838
819 slot->defav = GvAV (PL_defgv); 839#if CORO_JIT
820 slot->defsv = DEFSV; 840 save_perl_slots (slot);
821 slot->errsv = ERRSV; 841#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 842 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 843 #include "state.h"
827 #undef VAR 844#endif
828 } 845 }
829} 846}
830 847
831/* 848/*
832 * allocate various perl stacks. This is almost an exact copy 849 * allocate various perl stacks. This is almost an exact copy
… …
863#endif 880#endif
864 881
865 New(54,PL_scopestack,8,I32); 882 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 883 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 884 PL_scopestack_max = 8;
885#if HAS_SCOPESTACK_NAME
886 New(54,PL_scopestack_name,8,const char*);
887#endif
868 888
869 New(54,PL_savestack,24,ANY); 889 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 890 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 891 PL_savestack_max = 24;
872 892
… …
900 } 920 }
901 921
902 Safefree (PL_tmps_stack); 922 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 923 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 924 Safefree (PL_scopestack);
925#if HAS_SCOPESTACK_NAME
926 Safefree (PL_scopestack_name);
927#endif
905 Safefree (PL_savestack); 928 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 929#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 930 Safefree (PL_retstack);
908#endif 931#endif
909} 932}
… …
955#endif 978#endif
956 979
957/* 980/*
958 * This overrides the default magic get method of %SIG elements. 981 * 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 982 * 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 983 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 984 * we just provide our own readback here.
962 */ 985 */
963static int 986static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 987coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 988{
966 const char *s = MgPV_nolen_const (mg); 989 const char *s = MgPV_nolen_const (mg);
967 990
968 if (*s == '_') 991 if (*s == '_')
… …
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 997
975 if (svp) 998 if (svp)
976 { 999 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1000 SV *ssv;
1001
1002 if (!*svp)
1003 ssv = &PL_sv_undef;
1004 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1005 ssv = sv_2mortal (newRV_inc (*svp));
1006 else
1007 ssv = *svp;
1008
1009 sv_setsv (sv, ssv);
978 return 0; 1010 return 0;
979 } 1011 }
980 } 1012 }
981 1013
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1014 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1015}
984 1016
985static int 1017static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1018coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1019{
988 const char *s = MgPV_nolen_const (mg); 1020 const char *s = MgPV_nolen_const (mg);
989 1021
990 if (*s == '_') 1022 if (*s == '_')
… …
1004 } 1036 }
1005 1037
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1039}
1008 1040
1009static int 1041static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1043{
1012 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
1013 1045
1014 if (*s == '_') 1046 if (*s == '_')
… …
1049 return 1; 1081 return 1;
1050} 1082}
1051 1083
1052static UNOP init_perl_op; 1084static UNOP init_perl_op;
1053 1085
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1086ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1087init_perl (pTHX_ struct coro *coro)
1056{ 1088{
1057 /* 1089 /*
1058 * emulate part of the perl startup here. 1090 * emulate part of the perl startup here.
1059 */ 1091 */
… …
1074 PL_parser = 0; 1106 PL_parser = 0;
1075#endif 1107#endif
1076 PL_hints = 0; 1108 PL_hints = 0;
1077 1109
1078 /* recreate the die/warn hooks */ 1110 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1111 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1112 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1113
1082 GvSV (PL_defgv) = newSV (0); 1114 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1115 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1116 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1138 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1139 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1140 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1141 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1142 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1143 slf_frame.destroy = 0;
1111 1144
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1145 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1146 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1147 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1148 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1153 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1154 CORO_THROW = coro->except;
1122 1155
1123 SWAP_SVS (coro); 1156 SWAP_SVS (coro);
1124 1157
1125 if (expect_false (enable_times)) 1158 if (ecb_expect_false (enable_times))
1126 { 1159 {
1127 coro_times_update (); 1160 coro_times_update ();
1128 coro_times_sub (coro); 1161 coro_times_sub (coro);
1129 } 1162 }
1130} 1163}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1200 SvRV_set (coro_current, (SV *)coro->hv);
1168 1201
1169 load_perl (aTHX_ coro); 1202 load_perl (aTHX_ coro);
1170 1203
1171 coro_unwind_stacks (aTHX); 1204 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1205
1174 /* restore swapped sv's */ 1206 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1207 SWAP_SVS (coro);
1176 1208
1209 coro_destruct_stacks (aTHX);
1210
1177 // now save some sv's to be free'd later 1211 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1212 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1213 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1214 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1215 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1216 svf [4] = PL_rs;
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1236 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1237 SvREFCNT_dec (coro->invoke_av);
1204 } 1238 }
1205} 1239}
1206 1240
1207INLINE void 1241ecb_inline void
1208free_coro_mortal (pTHX) 1242free_coro_mortal (pTHX)
1209{ 1243{
1210 if (expect_true (coro_mortal)) 1244 if (ecb_expect_true (coro_mortal))
1211 { 1245 {
1212 SvREFCNT_dec (coro_mortal); 1246 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1247 coro_mortal = 0;
1214 } 1248 }
1215} 1249}
1216 1250
1217static int 1251static int
… …
1350 1384
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1385 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1386}
1353 1387
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1388/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1389static void ecb_noinline
1356cctx_prepare (pTHX) 1390cctx_prepare (pTHX)
1357{ 1391{
1358 PL_top_env = &PL_start_env; 1392 PL_top_env = &PL_start_env;
1359 1393
1360 if (cctx_current->flags & CC_TRACE) 1394 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1405 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1406 slf_frame.check = slf_check_set_stacklevel;
1373} 1407}
1374 1408
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1409/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1410ecb_inline void
1377transfer_tail (pTHX) 1411transfer_tail (pTHX)
1378{ 1412{
1379 free_coro_mortal (aTHX); 1413 free_coro_mortal (aTHX);
1414}
1415
1416/* try to exit the same way perl's main function would do */
1417/* we do not bother resetting the environment or other things *7
1418/* that are not, uhm, essential */
1419/* this obviously also doesn't work when perl is embedded */
1420static void ecb_noinline ecb_cold
1421perlish_exit (pTHX)
1422{
1423 int exitstatus = perl_destruct (PL_curinterp);
1424 perl_free (PL_curinterp);
1425 exit (exitstatus);
1380} 1426}
1381 1427
1382/* 1428/*
1383 * this is a _very_ stripped down perl interpreter ;) 1429 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1430 */
… …
1413 */ 1459 */
1414 1460
1415 /* 1461 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1462 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1463 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1464 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1465 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1466 */
1424 PL_top_env = main_top_env; 1467 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1468 }
1427} 1469}
1428 1470
1429static coro_cctx * 1471static coro_cctx *
1430cctx_new () 1472cctx_new (void)
1431{ 1473{
1432 coro_cctx *cctx; 1474 coro_cctx *cctx;
1433 1475
1434 ++cctx_count; 1476 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1477 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1483 return cctx;
1442} 1484}
1443 1485
1444/* create a new cctx only suitable as source */ 1486/* create a new cctx only suitable as source */
1445static coro_cctx * 1487static coro_cctx *
1446cctx_new_empty () 1488cctx_new_empty (void)
1447{ 1489{
1448 coro_cctx *cctx = cctx_new (); 1490 coro_cctx *cctx = cctx_new ();
1449 1491
1450 cctx->sptr = 0; 1492 cctx->sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1493 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1453 return cctx; 1495 return cctx;
1454} 1496}
1455 1497
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1498/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1499static coro_cctx *
1458cctx_new_run () 1500cctx_new_run (void)
1459{ 1501{
1460 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1461 void *stack_start; 1503 void *stack_start;
1462 size_t stack_size; 1504 size_t stack_size;
1463 1505
1464#if HAVE_MMAP 1506#if HAVE_MMAP
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1507 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */ 1508 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1509 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1468 1510
1469 if (cctx->sptr != (void *)-1) 1511 if (cctx->sptr != (void *)-1)
1470 { 1512 {
1471 #if CORO_STACKGUARD 1513 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1575#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1576
1535static coro_cctx * 1577static coro_cctx *
1536cctx_get (pTHX) 1578cctx_get (pTHX)
1537{ 1579{
1538 while (expect_true (cctx_first)) 1580 while (ecb_expect_true (cctx_first))
1539 { 1581 {
1540 coro_cctx *cctx = cctx_first; 1582 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1583 cctx_first = cctx->next;
1542 --cctx_idle; 1584 --cctx_idle;
1543 1585
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1586 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1587 return cctx;
1546 1588
1547 cctx_destroy (cctx); 1589 cctx_destroy (cctx);
1548 } 1590 }
1549 1591
… …
1554cctx_put (coro_cctx *cctx) 1596cctx_put (coro_cctx *cctx)
1555{ 1597{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1557 1599
1558 /* free another cctx if overlimit */ 1600 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1602 {
1561 coro_cctx *first = cctx_first; 1603 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1604 cctx_first = first->next;
1563 --cctx_idle; 1605 --cctx_idle;
1564 1606
… …
1575static void 1617static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1618transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1619{
1578 /* TODO: throwing up here is considered harmful */ 1620 /* TODO: throwing up here is considered harmful */
1579 1621
1580 if (expect_true (prev != next)) 1622 if (ecb_expect_true (prev != next))
1581 { 1623 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1624 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1625 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1626
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1627 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1628 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1629
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1630#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1631 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1632 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1633#endif
1592 } 1634 }
1593} 1635}
1594 1636
1595/* always use the TRANSFER macro */ 1637/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1638static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1639transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1640{
1599 dSTACKLEVEL; 1641 dSTACKLEVEL;
1600 1642
1601 /* sometimes transfer is only called to set idle_sp */ 1643 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1644 if (ecb_expect_false (!prev))
1603 { 1645 {
1604 cctx_current->idle_sp = STACKLEVEL; 1646 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1647 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1648 }
1607 else if (expect_true (prev != next)) 1649 else if (ecb_expect_true (prev != next))
1608 { 1650 {
1609 coro_cctx *cctx_prev; 1651 coro_cctx *cctx_prev;
1610 1652
1611 if (expect_false (prev->flags & CF_NEW)) 1653 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1654 {
1613 /* create a new empty/source context */ 1655 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1656 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1657 prev->flags |= CF_RUNNING;
1616 } 1658 }
… …
1619 next->flags |= CF_RUNNING; 1661 next->flags |= CF_RUNNING;
1620 1662
1621 /* first get rid of the old state */ 1663 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1664 save_perl (aTHX_ prev);
1623 1665
1624 if (expect_false (next->flags & CF_NEW)) 1666 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1667 {
1626 /* need to start coroutine */ 1668 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1669 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1670 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1671 init_perl (aTHX_ next);
1630 } 1672 }
1631 else 1673 else
1632 load_perl (aTHX_ next); 1674 load_perl (aTHX_ next);
1633 1675
1634 /* possibly untie and reuse the cctx */ 1676 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1677 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1678 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1679 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1680 && !force_cctx
1639 )) 1681 ))
1640 { 1682 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1683 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1684 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1685
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1686 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1687 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1688 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1689 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1690 next->cctx = cctx_get (aTHX);
1649 1691
1650 cctx_put (cctx_current); 1692 cctx_put (cctx_current);
1651 } 1693 }
1652 else 1694 else
1653 prev->cctx = cctx_current; 1695 prev->cctx = cctx_current;
1654 1696
1655 ++next->usecount; 1697 ++next->usecount;
1656 1698
1657 cctx_prev = cctx_current; 1699 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1700 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1701
1660 next->cctx = 0; 1702 next->cctx = 0;
1661 1703
1662 if (expect_false (cctx_prev != cctx_current)) 1704 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1705 {
1664 cctx_prev->top_env = PL_top_env; 1706 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1707 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1708 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1709 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1715#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1716#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1717
1676/** high level stuff ********************************************************/ 1718/** high level stuff ********************************************************/
1677 1719
1720/* this function is actually Coro, not Coro::State, but we call it from here */
1721/* because it is convenient - but it hasn't been declared yet for that reason */
1722static void
1723coro_call_on_destroy (pTHX_ struct coro *coro);
1724
1678static void 1725static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1726coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1727{
1681 if (coro->flags & CF_DESTROYED) 1728 if (coro->flags & CF_ZOMBIE)
1682 return; 1729 return;
1683 1730
1684 slf_destroy (aTHX_ coro); 1731 slf_destroy (aTHX_ coro);
1685 1732
1686 coro->flags |= CF_DESTROYED; 1733 coro->flags |= CF_ZOMBIE;
1687 1734
1688 if (coro->flags & CF_READY) 1735 if (coro->flags & CF_READY)
1689 { 1736 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1737 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1738 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1739 --coro_nready;
1693 } 1740 }
1694 else 1741 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1742 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1743
1744 if (coro->next) coro->next->prev = coro->prev;
1745 if (coro->prev) coro->prev->next = coro->next;
1746 if (coro == coro_first) coro_first = coro->next;
1696 1747
1697 if (coro->mainstack 1748 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1749 && coro->mainstack != main_mainstack
1699 && coro->slot 1750 && coro->slot
1700 && !PL_dirty) 1751 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1752 destroy_perl (aTHX_ coro);
1702 1753
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1754 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1755 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1756 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1757 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1758 SvREFCNT_dec (CORO_THROW);
1759
1760 coro_call_on_destroy (aTHX_ coro);
1761
1762 /* more destruction mayhem in coro_state_free */
1712} 1763}
1713 1764
1714static int 1765static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1766coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1767{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1769 mg->mg_ptr = 0;
1719 1770
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1771 coro_state_destroy (aTHX_ coro);
1772 SvREFCNT_dec (coro->on_destroy);
1773 SvREFCNT_dec (coro->status);
1774
1725 Safefree (coro); 1775 Safefree (coro);
1726 }
1727 1776
1728 return 0; 1777 return 0;
1729} 1778}
1730 1779
1731static int 1780static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1781coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1782{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1783 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1784 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1785 mg->mg_ptr = 0;
1786 mg->mg_virtual = 0;
1737 1787
1738 return 0; 1788 return 0;
1739} 1789}
1740 1790
1741static MGVTBL coro_state_vtbl = { 1791static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1816 TRANSFER (ta, 1);
1767} 1817}
1768 1818
1769/** Coro ********************************************************************/ 1819/** Coro ********************************************************************/
1770 1820
1771INLINE void 1821ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1822coro_enq (pTHX_ struct coro *coro)
1773{ 1823{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1824 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1825
1776 SvREFCNT_inc_NN (coro->hv); 1826 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1828 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1829 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1830 ready [1] = coro;
1781} 1831}
1782 1832
1783INLINE struct coro * 1833ecb_inline struct coro *
1784coro_deq (pTHX) 1834coro_deq (pTHX)
1785{ 1835{
1786 int prio; 1836 int prio;
1787 1837
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1838 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1891{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1892 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1893}
1844 1894
1845/* expects to own a reference to next->hv */ 1895/* expects to own a reference to next->hv */
1846INLINE void 1896ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1897prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1898{
1849 SV *prev_sv = SvRV (coro_current); 1899 SV *prev_sv = SvRV (coro_current);
1850 1900
1851 ta->prev = SvSTATE_hv (prev_sv); 1901 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1914{
1865 for (;;) 1915 for (;;)
1866 { 1916 {
1867 struct coro *next = coro_deq (aTHX); 1917 struct coro *next = coro_deq (aTHX);
1868 1918
1869 if (expect_true (next)) 1919 if (ecb_expect_true (next))
1870 { 1920 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1921 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1922 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1923 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1924 else
1875 { 1925 {
1876 next->flags &= ~CF_READY; 1926 next->flags &= ~CF_READY;
1877 --coro_nready; 1927 --coro_nready;
… …
1910 } 1960 }
1911 } 1961 }
1912 } 1962 }
1913} 1963}
1914 1964
1915INLINE void 1965ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1966prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1967{
1918 api_ready (aTHX_ coro_current); 1968 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1969 prepare_schedule (aTHX_ ta);
1920} 1970}
1921 1971
1922INLINE void 1972ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1973prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1974{
1925 SV *prev = SvRV (coro_current); 1975 SV *prev = SvRV (coro_current);
1926 1976
1927 if (coro_nready) 1977 if (coro_nready)
… …
1957{ 2007{
1958 struct coro_transfer_args ta; 2008 struct coro_transfer_args ta;
1959 2009
1960 prepare_cede (aTHX_ &ta); 2010 prepare_cede (aTHX_ &ta);
1961 2011
1962 if (expect_true (ta.prev != ta.next)) 2012 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2013 {
1964 TRANSFER (ta, 1); 2014 TRANSFER (ta, 1);
1965 return 1; 2015 return 1;
1966 } 2016 }
1967 else 2017 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2060 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2061 }
2012} 2062}
2013 2063
2014static void 2064static void
2065coro_push_av (pTHX_ AV *av, I32 gimme_v)
2066{
2067 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2068 {
2069 dSP;
2070
2071 if (gimme_v == G_SCALAR)
2072 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2073 else
2074 {
2075 int i;
2076 EXTEND (SP, AvFILLp (av) + 1);
2077
2078 for (i = 0; i <= AvFILLp (av); ++i)
2079 PUSHs (AvARRAY (av)[i]);
2080 }
2081
2082 PUTBACK;
2083 }
2084}
2085
2086static void
2087coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2088{
2089 if (!coro->on_destroy)
2090 coro->on_destroy = newAV ();
2091
2092 av_push (coro->on_destroy, cb);
2093}
2094
2095static void
2096slf_destroy_join (pTHX_ struct CoroSLF *frame)
2097{
2098 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2099}
2100
2101static int
2102slf_check_join (pTHX_ struct CoroSLF *frame)
2103{
2104 struct coro *coro = (struct coro *)frame->data;
2105
2106 if (!coro->status)
2107 return 1;
2108
2109 frame->destroy = 0;
2110
2111 coro_push_av (aTHX_ coro->status, GIMME_V);
2112
2113 SvREFCNT_dec ((SV *)coro->hv);
2114
2115 return 0;
2116}
2117
2118static void
2119slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2120{
2121 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2122
2123 if (items > 1)
2124 croak ("join called with too many arguments");
2125
2126 if (coro->status)
2127 frame->prepare = prepare_nop;
2128 else
2129 {
2130 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2131 frame->prepare = prepare_schedule;
2132 }
2133
2134 frame->check = slf_check_join;
2135 frame->destroy = slf_destroy_join;
2136 frame->data = (void *)coro;
2137 SvREFCNT_inc (coro->hv);
2138}
2139
2140static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2141coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2142{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2143 AV *od = coro->on_destroy;
2018 2144
2019 if (on_destroyp) 2145 if (!od)
2020 { 2146 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2147
2025 while (AvFILLp (on_destroy) >= 0) 2148 while (AvFILLp (od) >= 0)
2149 {
2150 SV *cb = sv_2mortal (av_pop (od));
2151
2152 /* coro hv's (and only hv's at the moment) are supported as well */
2153 if (SvSTATEhv_p (aTHX_ cb))
2154 api_ready (aTHX_ cb);
2155 else
2026 { 2156 {
2027 dSP; /* don't disturb outer sp */ 2157 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2158 PUSHMARK (SP);
2031 2159
2032 if (statusp) 2160 if (coro->status)
2033 { 2161 {
2034 int i; 2162 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2163 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2164 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2165 }
2040 2166
2041 PUTBACK; 2167 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2168 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2169 }
2044 } 2170 }
2045} 2171}
2046 2172
2047static void 2173static void
2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items) 2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2175{
2050 AV *av = newAV (); 2176 AV *av;
2177
2178 if (coro->status)
2179 {
2180 av = coro->status;
2181 av_clear (av);
2182 }
2183 else
2184 av = coro->status = newAV ();
2051 2185
2052 /* items are actually not so common, so optimise for this case */ 2186 /* items are actually not so common, so optimise for this case */
2053 if (items) 2187 if (items)
2054 { 2188 {
2055 int i; 2189 int i;
… …
2057 av_extend (av, items - 1); 2191 av_extend (av, items - 1);
2058 2192
2059 for (i = 0; i < items; ++i) 2193 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2194 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2195 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2196}
2065 2197
2066static void 2198static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2199slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2200{
… …
2080static void 2212static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2213slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2214{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2215 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2216
2085 coro_set_status (aTHX_ coro_hv, arg, items); 2217 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2219}
2088 2220
2089static void 2221static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2222slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2096 croak ("Coro::cancel called without coro object,"); 2228 croak ("Coro::cancel called without coro object,");
2097 2229
2098 coro = SvSTATE (arg [0]); 2230 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2231 coro_hv = coro->hv;
2100 2232
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1); 2233 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2234
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2236 {
2105 /* coro currently busy cancelling something, so just notify it */ 2237 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2238 coro->slf_frame.data = (void *)coro;
2107 2239
2108 frame->prepare = prepare_nop; 2240 frame->prepare = prepare_nop;
… …
2123 * this is ugly, and hopefully fully worth the extra speed. 2255 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2256 * besides, I can't get the slow-but-safe version working...
2125 */ 2257 */
2126 slf_frame.data = 0; 2258 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2259 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2260 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2261 self->flags &= ~CF_NOCANCEL;
2133 2262
2134 if (slf_frame.data) 2263 if (slf_frame.data)
2135 { 2264 {
2136 /* while we were busy we have been cancelled, so terminate */ 2265 /* while we were busy we have been cancelled, so terminate */
… …
2161 if (coro->cctx) 2290 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2291 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2292
2164 if (coro->flags & CF_NEW) 2293 if (coro->flags & CF_NEW)
2165 { 2294 {
2166 coro_set_status (aTHX_ coro->hv, arg, items); 2295 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2296 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2297 }
2170 else 2298 else
2171 { 2299 {
2172 if (!coro->slf_frame.prepare) 2300 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2301 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2302
2175 slf_destroy (aTHX_ coro); 2303 slf_destroy (aTHX_ coro);
2176 2304
2177 coro_set_status (aTHX_ coro->hv, arg, items); 2305 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2306 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2307 coro->slf_frame.check = slf_check_safe_cancel;
2180 2308
2181 api_ready (aTHX_ coro->hv); 2309 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2310 }
2183 2311
2184 return 1; 2312 return 1;
2185} 2313}
2186 2314
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2348slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2349{
2222 HV *hv = (HV *)SvRV (coro_current); 2350 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2351 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2352
2225 if (expect_true (coro->saved_deffh)) 2353 if (ecb_expect_true (coro->saved_deffh))
2226 { 2354 {
2227 /* subsequent iteration */ 2355 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2356 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2357 coro->saved_deffh = 0;
2230 2358
… …
2471static void 2599static void
2472slf_destroy (pTHX_ struct coro *coro) 2600slf_destroy (pTHX_ struct coro *coro)
2473{ 2601{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2602 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty) 2603 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro); 2604 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2477 2605
2478 /* 2606 /*
2479 * The on_destroy above most likely is from an SLF call. 2607 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2608 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2609 * the coro, we will have to force-finish it here, otherwise
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2624 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2625
2498 /* set up the slf frame, unless it has already been set-up */ 2626 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2627 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2628 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2629 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2630 {
2503 /* first iteration */ 2631 /* first iteration */
2504 dSP; 2632 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2633 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2634 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2675 while (slf_frame.check (aTHX_ &slf_frame));
2548 2676
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2677 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2678
2551 /* exception handling */ 2679 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2680 if (ecb_expect_false (CORO_THROW))
2553 { 2681 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2682 SV *exception = sv_2mortal (CORO_THROW);
2555 2683
2556 CORO_THROW = 0; 2684 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2685 sv_setsv (ERRSV, exception);
2558 croak (0); 2686 croak (0);
2559 } 2687 }
2560 2688
2561 /* return value handling - mostly like entersub */ 2689 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2690 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2691 if (GIMME_V == G_SCALAR
2692 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2693 {
2565 dSP; 2694 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2695 SV **bot = PL_stack_base + checkmark;
2567 2696
2568 if (sp == bot) /* too few, push undef */ 2697 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2698 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2699 else /* too many, take last one */
2571 bot [1] = *sp; 2700 bot [1] = *sp;
2572 2701
2573 SP = bot + 1; 2702 SP = bot + 1;
2574 2703
2575 PUTBACK; 2704 PUTBACK;
… …
2682{ 2811{
2683 PerlIOBuf base; 2812 PerlIOBuf base;
2684 NV next, every; 2813 NV next, every;
2685} PerlIOCede; 2814} PerlIOCede;
2686 2815
2687static IV 2816static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2817PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2818{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2819 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2820
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2821 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2822 self->next = nvtime () + self->every;
2694 2823
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2824 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2825}
2697 2826
2698static SV * 2827static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2828PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2829{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2830 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2831
2703 return newSVnv (self->every); 2832 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2944 SvREFCNT_dec (cb);
2816 } 2945 }
2817} 2946}
2818 2947
2819static void 2948static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2949coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2950{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2951 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2952 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2953}
2825 2954
2826static int 2955static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2956slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2957{
2829 AV *av = (AV *)frame->data; 2958 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2959 SV *count_sv = AvARRAY (av)[0];
2960 SV *coro_hv = SvRV (coro_current);
2831 2961
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2962 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2963 if (CORO_THROW)
2834 return 0; 2964 return 0;
2835 else if (SvIVX (count_sv) > 0) 2965 else if (SvIVX (count_sv) > 0)
… …
2847 { 2977 {
2848 int i; 2978 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 2979 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 2980 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 2981 /* this avoids some degenerate memory usage cases */
2852 2982 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 2983 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 2984 return 1;
2856 2985
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2986 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 2987 return 1;
2859 } 2988 }
2860} 2989}
2861 2990
2862static int 2991static int
… …
3115 dSP; 3244 dSP;
3116 3245
3117 static SV *prio_cv; 3246 static SV *prio_cv;
3118 static SV *prio_sv; 3247 static SV *prio_sv;
3119 3248
3120 if (expect_false (!prio_cv)) 3249 if (ecb_expect_false (!prio_cv))
3121 { 3250 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3251 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3252 prio_sv = newSViv (0);
3124 } 3253 }
3125 3254
… …
3231 } 3360 }
3232 3361
3233 return coro_sv; 3362 return coro_sv;
3234} 3363}
3235 3364
3365#ifndef __cplusplus
3366ecb_cold XS(boot_Coro__State);
3367#endif
3368
3369#if CORO_JIT
3370
3371static void ecb_noinline ecb_cold
3372pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3373{
3374 dSP;
3375 AV *av = newAV ();
3376
3377 av_store (av, 3, newSVuv (d));
3378 av_store (av, 2, newSVuv (c));
3379 av_store (av, 1, newSVuv (b));
3380 av_store (av, 0, newSVuv (a));
3381
3382 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3383
3384 PUTBACK;
3385}
3386
3387static void ecb_noinline ecb_cold
3388jit_init (pTHX)
3389{
3390 dSP;
3391 SV *load, *save;
3392 char *map_base;
3393 char *load_ptr, *save_ptr;
3394 STRLEN load_len, save_len, map_len;
3395 int count;
3396
3397 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3398
3399 PUSHMARK (SP);
3400 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3401 #include "state.h"
3402 count = call_pv ("Coro::State::_jit", G_ARRAY);
3403 SPAGAIN;
3404
3405 save = POPs; save_ptr = SvPVbyte (save, save_len);
3406 load = POPs; load_ptr = SvPVbyte (load, load_len);
3407
3408 map_len = load_len + save_len + 16;
3409
3410 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3411
3412 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3413
3414 load_perl_slots = (load_save_perl_slots_type)map_base;
3415 memcpy (map_base, load_ptr, load_len);
3416
3417 map_base += (load_len + 15) & ~15;
3418
3419 save_perl_slots = (load_save_perl_slots_type)map_base;
3420 memcpy (map_base, save_ptr, save_len);
3421
3422 /* we are good citizens and try to make the page read-only, so the evil evil */
3423 /* hackers might have it a bit more difficult */
3424 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3425
3426 PUTBACK;
3427 eval_pv ("undef &Coro::State::_jit", 1);
3428}
3429
3430#endif
3431
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3432MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3433
3238PROTOTYPES: DISABLE 3434PROTOTYPES: DISABLE
3239 3435
3240BOOT: 3436BOOT:
… …
3243# if CORO_PTHREAD 3439# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3440 coro_thx = PERL_GET_CONTEXT;
3245# endif 3441# endif
3246#endif 3442#endif
3247 BOOT_PAGESIZE; 3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV;
3450 ERRSV;
3248 3451
3249 cctx_current = cctx_new_empty (); 3452 cctx_current = cctx_new_empty ();
3250 3453
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3454 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3455 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3498 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3499
3297 time_init (aTHX); 3500 time_init (aTHX);
3298 3501
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3502 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3503#if CORO_JIT
3504 PUTBACK;
3505 jit_init (aTHX);
3506 SPAGAIN;
3507#endif
3300} 3508}
3301 3509
3302SV * 3510SV *
3303new (SV *klass, ...) 3511new (SV *klass, ...)
3304 ALIAS: 3512 ALIAS:
… …
3446 PROTOTYPE: $ 3654 PROTOTYPE: $
3447 ALIAS: 3655 ALIAS:
3448 is_ready = CF_READY 3656 is_ready = CF_READY
3449 is_running = CF_RUNNING 3657 is_running = CF_RUNNING
3450 is_new = CF_NEW 3658 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3659 is_destroyed = CF_ZOMBIE
3660 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3661 is_suspended = CF_SUSPENDED
3453 CODE: 3662 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3663 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3664 OUTPUT:
3456 RETVAL 3665 RETVAL
3457 3666
3458void 3667void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3668throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3669 PROTOTYPE: $;$
3461 CODE: 3670 CODE:
3462{ 3671{
3672 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3673 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3674 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3675 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3676 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3677 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3678
3679 api_ready (aTHX_ self);
3468} 3680}
3469 3681
3470void 3682void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3683api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3684 PROTOTYPE: $;$
… …
3551times (Coro::State self) 3763times (Coro::State self)
3552 PPCODE: 3764 PPCODE:
3553{ 3765{
3554 struct coro *current = SvSTATE (coro_current); 3766 struct coro *current = SvSTATE (coro_current);
3555 3767
3556 if (expect_false (current == self)) 3768 if (ecb_expect_false (current == self))
3557 { 3769 {
3558 coro_times_update (); 3770 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3771 coro_times_add (SvSTATE (coro_current));
3560 } 3772 }
3561 3773
3562 EXTEND (SP, 2); 3774 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3775 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3776 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3777
3566 if (expect_false (current == self)) 3778 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3779 coro_times_sub (SvSTATE (coro_current));
3568} 3780}
3569 3781
3570void 3782void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3783swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3644void 3856void
3645_destroy (Coro::State coro) 3857_destroy (Coro::State coro)
3646 CODE: 3858 CODE:
3647 /* used by the manager thread */ 3859 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3860 coro_state_destroy (aTHX_ coro);
3861
3862void
3863on_destroy (Coro::State coro, SV *cb)
3864 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3865 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3866
3867void
3868join (...)
3869 CODE:
3870 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3871
3651void 3872void
3652terminate (...) 3873terminate (...)
3653 CODE: 3874 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3875 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3944} 4165}
3945 4166
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4167MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4168
3948void 4169void
3949_may_delete (SV *sem, int count, int extra_refs) 4170_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4171 PPCODE:
3951{ 4172{
3952 AV *av = (AV *)SvRV (sem); 4173 AV *av = (AV *)SvRV (sem);
3953 4174
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4175 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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