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.408 by root, Sat Jun 11 16:58:40 2011 UTC vs.
Revision 1.423 by root, Mon Oct 8 23:13:36 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
18#define ECB_NO_THREADS 1
17#include "ecb.h" 19#include "ecb.h"
18 20
19#include <stddef.h> 21#include <stddef.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <errno.h> 23#include <errno.h>
… …
33# define setjmp _setjmp /* deep magic */ 35# define setjmp _setjmp /* deep magic */
34#else 36#else
35# include <inttypes.h> /* most portable stdint.h */ 37# include <inttypes.h> /* most portable stdint.h */
36#endif 38#endif
37 39
38#ifdef HAVE_MMAP 40#if HAVE_MMAP
39# include <unistd.h> 41# include <unistd.h>
40# include <sys/mman.h> 42# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS 43# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON 44# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON 45# define MAP_ANONYMOUS MAP_ANON
… …
63#endif 65#endif
64 66
65/* the maximum number of idle cctx that will be pooled */ 67/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 68static int cctx_max_idle = 4;
67 69
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1
72#endif
73
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 74#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
69# undef CORO_STACKGUARD 75# undef CORO_STACKGUARD
70#endif 76#endif
71 77
72#ifndef CORO_STACKGUARD 78#ifndef CORO_STACKGUARD
… …
97# if CORO_PTHREAD 103# if CORO_PTHREAD
98static void *coro_thx; 104static void *coro_thx;
99# endif 105# endif
100#endif 106#endif
101 107
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 108#ifdef __linux
106# include <time.h> /* for timespec */ 109# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 110# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 111# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 112# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
177 void *sptr; 180 void *sptr;
178 size_t ssize; 181 size_t ssize;
179 182
180 /* cpu state */ 183 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 186 JMPENV *idle_te; /* same as idle_sp, but for top_env */
187#endif
183 JMPENV *top_env; 188 JMPENV *top_env;
184 coro_context cctx; 189 coro_context cctx;
185 190
186 U32 gen; 191 U32 gen;
187#if CORO_USE_VALGRIND 192#if CORO_USE_VALGRIND
… …
207}; 212};
208 213
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 215typedef struct
211{ 216{
212#define VARx(name,expr,type) type name; 217 #define VARx(name,expr,type) type name;
213# include "state.h" 218 #include "state.h"
214#undef VARx
215} perl_slots; 219} perl_slots;
216 220
217// how many context stack entries do we need for perl_slots 221/* how many context stack entries do we need for perl_slots */
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 223
220/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
221struct coro 225struct coro
222{ 226{
… …
291#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
292 296
293/** JIT *********************************************************************/ 297/** JIT *********************************************************************/
294 298
295#if CORO_JIT 299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 302 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 303 #if __x86_64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 304 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 305 #elif __i386 && CORO_JIT_UNIXY
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix" 306 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif 307 #endif
306 #endif 308 #endif
307#endif 309#endif
308 310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
309#if CORO_JIT 315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
310static load_save_perl_slots_type load_perl_slots, save_perl_slots; 317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif 318#endif
312 319
313/** Coro::Select ************************************************************/ 320/** Coro::Select ************************************************************/
314 321
315static OP *(*coro_old_pp_sselect) (pTHX); 322static OP *(*coro_old_pp_sselect) (pTHX);
… …
332 339
333/** time stuff **************************************************************/ 340/** time stuff **************************************************************/
334 341
335#ifdef HAS_GETTIMEOFDAY 342#ifdef HAS_GETTIMEOFDAY
336 343
337ECB_INLINE void 344ecb_inline void
338coro_u2time (pTHX_ UV ret[2]) 345coro_u2time (pTHX_ UV ret[2])
339{ 346{
340 struct timeval tv; 347 struct timeval tv;
341 gettimeofday (&tv, 0); 348 gettimeofday (&tv, 0);
342 349
343 ret [0] = tv.tv_sec; 350 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec; 351 ret [1] = tv.tv_usec;
345} 352}
346 353
347ECB_INLINE double 354ecb_inline double
348coro_nvtime () 355coro_nvtime (void)
349{ 356{
350 struct timeval tv; 357 struct timeval tv;
351 gettimeofday (&tv, 0); 358 gettimeofday (&tv, 0);
352 359
353 return tv.tv_sec + tv.tv_usec * 1e-6; 360 return tv.tv_sec + tv.tv_usec * 1e-6;
354} 361}
355 362
356ECB_INLINE void 363ecb_inline void
357time_init (pTHX) 364time_init (pTHX)
358{ 365{
359 nvtime = coro_nvtime; 366 nvtime = coro_nvtime;
360 u2time = coro_u2time; 367 u2time = coro_u2time;
361} 368}
362 369
363#else 370#else
364 371
365ECB_INLINE void 372ecb_inline void
366time_init (pTHX) 373time_init (pTHX)
367{ 374{
368 SV **svp; 375 SV **svp;
369 376
370 require_pv ("Time/HiRes.pm"); 377 require_pv ("Time/HiRes.pm");
… …
412 get_hv (name, create); 419 get_hv (name, create);
413#endif 420#endif
414 return get_hv (name, create); 421 return get_hv (name, create);
415} 422}
416 423
417ECB_INLINE void 424ecb_inline void
418coro_times_update () 425coro_times_update (void)
419{ 426{
420#ifdef coro_clock_gettime 427#ifdef coro_clock_gettime
421 struct timespec ts; 428 struct timespec ts;
422 429
423 ts.tv_sec = ts.tv_nsec = 0; 430 ts.tv_sec = ts.tv_nsec = 0;
… …
435 time_real [0] = tv [0]; 442 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000; 443 time_real [1] = tv [1] * 1000;
437#endif 444#endif
438} 445}
439 446
440ECB_INLINE void 447ecb_inline void
441coro_times_add (struct coro *c) 448coro_times_add (struct coro *c)
442{ 449{
443 c->t_real [1] += time_real [1]; 450 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0]; 452 c->t_real [0] += time_real [0];
… …
447 c->t_cpu [1] += time_cpu [1]; 454 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0]; 456 c->t_cpu [0] += time_cpu [0];
450} 457}
451 458
452ECB_INLINE void 459ecb_inline void
453coro_times_sub (struct coro *c) 460coro_times_sub (struct coro *c)
454{ 461{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 462 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
456 c->t_real [1] -= time_real [1]; 463 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0]; 464 c->t_real [0] -= time_real [0];
… …
478 : 0) 485 : 0)
479 486
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 487#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482 489
483ECB_INLINE MAGIC * 490ecb_inline MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro) 491SvSTATEhv_p (pTHX_ SV *coro)
485{ 492{
486 MAGIC *mg; 493 MAGIC *mg;
487 494
488 if (ecb_expect_true ( 495 if (ecb_expect_true (
… …
493 return mg; 500 return mg;
494 501
495 return 0; 502 return 0;
496} 503}
497 504
498ECB_INLINE struct coro * 505ecb_inline struct coro *
499SvSTATE_ (pTHX_ SV *coro) 506SvSTATE_ (pTHX_ SV *coro)
500{ 507{
501 MAGIC *mg; 508 MAGIC *mg;
502 509
503 if (SvROK (coro)) 510 if (SvROK (coro))
… …
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518 525
519/*****************************************************************************/ 526/*****************************************************************************/
520/* padlist management and caching */ 527/* padlist management and caching */
521 528
522ECB_INLINE AV * 529ecb_inline AV *
523coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
524{ 531{
525 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
526 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
527 534
… …
539 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
540 547
541 return newpadlist; 548 return newpadlist;
542} 549}
543 550
544ECB_INLINE void 551ecb_inline void
545free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
546{ 553{
547 /* may be during global destruction */ 554 /* may be during global destruction */
548 if (!IN_DESTRUCT) 555 if (!IN_DESTRUCT)
549 { 556 {
… …
592 0, 0, 0, 0, 599 0, 0, 0, 0,
593 coro_cv_free 600 coro_cv_free
594}; 601};
595 602
596/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
597ECB_INLINE void 604ecb_inline void
598get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
599{ 606{
600 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
601 AV *av; 608 AV *av;
602 609
… …
615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
616#endif 623#endif
617 } 624 }
618} 625}
619 626
620ECB_INLINE void 627ecb_inline void
621put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
622{ 629{
623 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
624 AV *av; 631 AV *av;
625 632
… …
634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
635} 642}
636 643
637/** load & save, init *******************************************************/ 644/** load & save, init *******************************************************/
638 645
646ecb_inline void
647swap_sv (SV *a, SV *b)
648{
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 and later complicates this _quite_ a bit, but it also
662 * is much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682}
683
639/* swap sv heads, at least logically */ 684/* swap sv heads, at least logically */
640static void 685static void
641swap_svs (pTHX_ Coro__State c) 686swap_svs (pTHX_ Coro__State c)
642{ 687{
643 int i; 688 int i;
644 689
645 for (i = 0; i <= AvFILLp (c->swap_sv); ) 690 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
646 { 691 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
647 SV *a = AvARRAY (c->swap_sv)[i++];
648 SV *b = AvARRAY (c->swap_sv)[i++];
649
650 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
651 SV tmp;
652
653 /* swap sv_any */
654 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
655
656 /* swap sv_flags */
657 SvFLAGS (&tmp) = SvFLAGS (a);
658 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
659 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
660
661#if PERL_VERSION_ATLEAST (5,10,0)
662 /* perl 5.10 complicates this _quite_ a bit, but it also is
663 * much faster, so no quarrels here. alternatively, we could
664 * sv_upgrade to avoid this.
665 */
666 {
667 /* swap sv_u */
668 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
669
670 /* if SvANY points to the head, we need to adjust the pointers,
671 * as the pointer for a still points to b, and maybe vice versa.
672 */
673 #define svany_in_head(type) \
674 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
675
676 if (svany_in_head (SvTYPE (a)))
677 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
678
679 if (svany_in_head (SvTYPE (b)))
680 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
681 }
682#endif
683 }
684} 692}
685 693
686#define SWAP_SVS(coro) \ 694#define SWAP_SVS(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \ 695 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro)) 696 swap_svs (aTHX_ (coro))
… …
700 708
701#if CORO_JIT 709#if CORO_JIT
702 load_perl_slots (slot); 710 load_perl_slots (slot);
703#else 711#else
704 #define VARx(name,expr,type) expr = slot->name; 712 #define VARx(name,expr,type) expr = slot->name;
705 # include "state.h" 713 #include "state.h"
706 #undef VARx
707#endif 714#endif
708 715
709 { 716 {
710 dSP; 717 dSP;
711 718
… …
814 821
815 PUTBACK; 822 PUTBACK;
816 } 823 }
817 824
818 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
820 { 827 {
821 unsigned int i; 828 unsigned int i;
822 829
823 for (i = 0; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
824 CXINC; 831 CXINC;
… …
833 840
834#if CORO_JIT 841#if CORO_JIT
835 save_perl_slots (slot); 842 save_perl_slots (slot);
836#else 843#else
837 #define VARx(name,expr,type) slot->name = expr; 844 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 845 #include "state.h"
839 #undef VARx
840#endif 846#endif
841 } 847 }
842} 848}
843 849
844/* 850/*
… …
876#endif 882#endif
877 883
878 New(54,PL_scopestack,8,I32); 884 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 885 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 886 PL_scopestack_max = 8;
887#if HAS_SCOPESTACK_NAME
888 New(54,PL_scopestack_name,8,const char*);
889#endif
881 890
882 New(54,PL_savestack,24,ANY); 891 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 892 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 893 PL_savestack_max = 24;
885 894
… …
913 } 922 }
914 923
915 Safefree (PL_tmps_stack); 924 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 925 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 926 Safefree (PL_scopestack);
927#if HAS_SCOPESTACK_NAME
928 Safefree (PL_scopestack_name);
929#endif
918 Safefree (PL_savestack); 930 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 931#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 932 Safefree (PL_retstack);
921#endif 933#endif
922} 934}
… …
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 999
988 if (svp) 1000 if (svp)
989 { 1001 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1002 SV *ssv;
1003
1004 if (!*svp)
1005 ssv = &PL_sv_undef;
1006 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1007 ssv = sv_2mortal (newRV_inc (*svp));
1008 else
1009 ssv = *svp;
1010
1011 sv_setsv (sv, ssv);
991 return 0; 1012 return 0;
992 } 1013 }
993 } 1014 }
994 1015
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1187 /* restore swapped sv's */ 1208 /* restore swapped sv's */
1188 SWAP_SVS (coro); 1209 SWAP_SVS (coro);
1189 1210
1190 coro_destruct_stacks (aTHX); 1211 coro_destruct_stacks (aTHX);
1191 1212
1192 // now save some sv's to be free'd later 1213 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1214 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1215 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1216 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1217 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1218 svf [4] = PL_rs;
… …
1217 SvREFCNT_dec (coro->invoke_cb); 1238 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1239 SvREFCNT_dec (coro->invoke_av);
1219 } 1240 }
1220} 1241}
1221 1242
1222ECB_INLINE void 1243ecb_inline void
1223free_coro_mortal (pTHX) 1244free_coro_mortal (pTHX)
1224{ 1245{
1225 if (ecb_expect_true (coro_mortal)) 1246 if (ecb_expect_true (coro_mortal))
1226 { 1247 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1248 SvREFCNT_dec ((SV *)coro_mortal);
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1407 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1408 slf_frame.check = slf_check_set_stacklevel;
1388} 1409}
1389 1410
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1411/* the tail of transfer: execute stuff we can only do after a transfer */
1391ECB_INLINE void 1412ecb_inline void
1392transfer_tail (pTHX) 1413transfer_tail (pTHX)
1393{ 1414{
1394 free_coro_mortal (aTHX); 1415 free_coro_mortal (aTHX);
1416}
1417
1418/* try to exit the same way perl's main function would do */
1419/* we do not bother resetting the environment or other things *7
1420/* that are not, uhm, essential */
1421/* this obviously also doesn't work when perl is embedded */
1422static void ecb_noinline ecb_cold
1423perlish_exit (pTHX)
1424{
1425 int exitstatus = perl_destruct (PL_curinterp);
1426 perl_free (PL_curinterp);
1427 exit (exitstatus);
1395} 1428}
1396 1429
1397/* 1430/*
1398 * this is a _very_ stripped down perl interpreter ;) 1431 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1432 */
… …
1428 */ 1461 */
1429 1462
1430 /* 1463 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1464 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1465 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1466 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1467 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1468 */
1439 PL_top_env = main_top_env; 1469 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1470 }
1442} 1471}
1443 1472
1444static coro_cctx * 1473static coro_cctx *
1445cctx_new () 1474cctx_new (void)
1446{ 1475{
1447 coro_cctx *cctx; 1476 coro_cctx *cctx;
1448 1477
1449 ++cctx_count; 1478 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1479 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1485 return cctx;
1457} 1486}
1458 1487
1459/* create a new cctx only suitable as source */ 1488/* create a new cctx only suitable as source */
1460static coro_cctx * 1489static coro_cctx *
1461cctx_new_empty () 1490cctx_new_empty (void)
1462{ 1491{
1463 coro_cctx *cctx = cctx_new (); 1492 coro_cctx *cctx = cctx_new ();
1464 1493
1465 cctx->sptr = 0; 1494 cctx->sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1495 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1468 return cctx; 1497 return cctx;
1469} 1498}
1470 1499
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1500/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1501static coro_cctx *
1473cctx_new_run () 1502cctx_new_run (void)
1474{ 1503{
1475 coro_cctx *cctx = cctx_new (); 1504 coro_cctx *cctx = cctx_new ();
1476 void *stack_start; 1505 void *stack_start;
1477 size_t stack_size; 1506 size_t stack_size;
1478 1507
1479#if HAVE_MMAP 1508#if HAVE_MMAP
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1509 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */ 1510 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1511 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1483 1512
1484 if (cctx->sptr != (void *)-1) 1513 if (cctx->sptr != (void *)-1)
1485 { 1514 {
1486 #if CORO_STACKGUARD 1515 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1516 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1789 TRANSFER (ta, 1); 1818 TRANSFER (ta, 1);
1790} 1819}
1791 1820
1792/** Coro ********************************************************************/ 1821/** Coro ********************************************************************/
1793 1822
1794ECB_INLINE void 1823ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1824coro_enq (pTHX_ struct coro *coro)
1796{ 1825{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1826 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1827
1799 SvREFCNT_inc_NN (coro->hv); 1828 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1830 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1831 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1832 ready [1] = coro;
1804} 1833}
1805 1834
1806ECB_INLINE struct coro * 1835ecb_inline struct coro *
1807coro_deq (pTHX) 1836coro_deq (pTHX)
1808{ 1837{
1809 int prio; 1838 int prio;
1810 1839
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1840 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1893{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1894 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1895}
1867 1896
1868/* expects to own a reference to next->hv */ 1897/* expects to own a reference to next->hv */
1869ECB_INLINE void 1898ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1899prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1900{
1872 SV *prev_sv = SvRV (coro_current); 1901 SV *prev_sv = SvRV (coro_current);
1873 1902
1874 ta->prev = SvSTATE_hv (prev_sv); 1903 ta->prev = SvSTATE_hv (prev_sv);
… …
1933 } 1962 }
1934 } 1963 }
1935 } 1964 }
1936} 1965}
1937 1966
1938ECB_INLINE void 1967ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 1969{
1941 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1943} 1972}
1944 1973
1945ECB_INLINE void 1974ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 1976{
1948 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1949 1978
1950 if (coro_nready) 1979 if (coro_nready)
… …
2950 { 2979 {
2951 int i; 2980 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 2981 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 2982 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 2983 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2984 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 2985 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 2986 return 1;
2958 2987
2959 av_push (av, SvREFCNT_inc (coro_hv)); 2988 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 2989 return 1;
… …
3340#endif 3369#endif
3341 3370
3342#if CORO_JIT 3371#if CORO_JIT
3343 3372
3344static void ecb_noinline ecb_cold 3373static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c) 3374pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3346{ 3375{
3347 dSP; 3376 dSP;
3348 AV *av = newAV (); 3377 AV *av = newAV ();
3349 3378
3379 av_store (av, 3, newSVuv (d));
3350 av_store (av, 2, newSVuv (c)); 3380 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b)); 3381 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a)); 3382 av_store (av, 0, newSVuv (a));
3353 3383
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3361{ 3391{
3362 dSP; 3392 dSP;
3363 SV *load, *save; 3393 SV *load, *save;
3364 char *map_base; 3394 char *map_base;
3365 char *load_ptr, *save_ptr; 3395 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len; 3396 STRLEN load_len, save_len, map_len;
3367 int count; 3397 int count;
3368 3398
3399 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3400
3369 PUSHMARK (SP); 3401 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3402 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h" 3403 #include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY); 3404 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN; 3405 SPAGAIN;
3376 3406
3377 save = POPs; save_ptr = SvPVbyte (save, save_len); 3407 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len); 3408 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379 3409
3410 map_len = load_len + save_len + 16;
3411
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3412 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381 3413
3382 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3414 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383 3415
3384 load_perl_slots = (load_save_perl_slots_type)map_base; 3416 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len); 3417 memcpy (map_base, load_ptr, load_len);
3386 3418
3387 map_base += (load_len + 15) & ~15; 3419 map_base += (load_len + 15) & ~15;
3388 3420
3389 save_perl_slots = (load_save_perl_slots_type)map_base; 3421 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len); 3422 memcpy (map_base, save_ptr, save_len);
3423
3424 /* we are good citizens and try to make the page read-only, so the evil evil */
3425 /* hackers might have it a bit more difficult */
3426 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3427
3428 PUTBACK;
3429 eval_pv ("undef &Coro::State::_jit", 1);
3391} 3430}
3392 3431
3393#endif 3432#endif
3394 3433
3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3434MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
… …
3463 time_init (aTHX); 3502 time_init (aTHX);
3464 3503
3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3504 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT 3505#if CORO_JIT
3467 PUTBACK; 3506 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX); 3507 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN; 3508 SPAGAIN;
3472#endif 3509#endif
3473} 3510}
3474 3511
3475SV * 3512SV *
… …
3628 RETVAL = boolSV (coro->flags & ix); 3665 RETVAL = boolSV (coro->flags & ix);
3629 OUTPUT: 3666 OUTPUT:
3630 RETVAL 3667 RETVAL
3631 3668
3632void 3669void
3633throw (Coro::State self, SV *exception = &PL_sv_undef) 3670throw (SV *self, SV *exception = &PL_sv_undef)
3634 PROTOTYPE: $;$ 3671 PROTOTYPE: $;$
3635 CODE: 3672 CODE:
3636{ 3673{
3674 struct coro *coro = SvSTATE (self);
3637 struct coro *current = SvSTATE_current; 3675 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3676 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3639 SvREFCNT_dec (*exceptionp); 3677 SvREFCNT_dec (*exceptionp);
3640 SvGETMAGIC (exception); 3678 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3679 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3680
3681 api_ready (aTHX_ self);
3642} 3682}
3643 3683
3644void 3684void
3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3685api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3646 PROTOTYPE: $;$ 3686 PROTOTYPE: $;$
… …
4127} 4167}
4128 4168
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4169MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130 4170
4131void 4171void
4132_may_delete (SV *sem, int count, int extra_refs) 4172_may_delete (SV *sem, int count, unsigned int extra_refs)
4133 PPCODE: 4173 PPCODE:
4134{ 4174{
4135 AV *av = (AV *)SvRV (sem); 4175 AV *av = (AV *)SvRV (sem);
4136 4176
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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