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.418 by root, Mon Feb 20 00:03:07 2012 UTC

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

Diff Legend

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