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.407 by root, Sat Jun 11 15:30:21 2011 UTC vs.
Revision 1.425 by root, Wed Dec 5 00:14:22 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>
22#include <assert.h> 24#include <assert.h>
23 25
24#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
26#endif 45#endif
27 46
28#if defined(_WIN32) 47#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
30# undef setjmp 49# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
34#else 53#else
35# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
36#endif 55#endif
37 56
38#ifdef HAVE_MMAP 57#if HAVE_MMAP
39# include <unistd.h> 58# include <unistd.h>
40# include <sys/mman.h> 59# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS 60# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON 61# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON 62# define MAP_ANONYMOUS MAP_ANON
… …
63#endif 82#endif
64 83
65/* the maximum number of idle cctx that will be pooled */ 84/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 85static int cctx_max_idle = 4;
67 86
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1
89#endif
90
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
69# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
70#endif 93#endif
71 94
72#ifndef CORO_STACKGUARD 95#ifndef CORO_STACKGUARD
… …
97# if CORO_PTHREAD 120# if CORO_PTHREAD
98static void *coro_thx; 121static void *coro_thx;
99# endif 122# endif
100#endif 123#endif
101 124
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 125#ifdef __linux
106# include <time.h> /* for timespec */ 126# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 127# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 128# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 129# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
177 void *sptr; 197 void *sptr;
178 size_t ssize; 198 size_t ssize;
179 199
180 /* cpu state */ 200 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 203 JMPENV *idle_te; /* same as idle_sp, but for top_env */
204#endif
183 JMPENV *top_env; 205 JMPENV *top_env;
184 coro_context cctx; 206 coro_context cctx;
185 207
186 U32 gen; 208 U32 gen;
187#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
… …
207}; 229};
208 230
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 231/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 232typedef struct
211{ 233{
212#define VARx(name,expr,type) type name; 234 #define VARx(name,expr,type) type name;
213# include "state.h" 235 #include "state.h"
214#undef VARx
215} perl_slots; 236} perl_slots;
216 237
217// how many context stack entries do we need for perl_slots 238/* 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)) 239#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 240
220/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
221struct coro 242struct coro
222{ 243{
… …
291#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
292 313
293/** JIT *********************************************************************/ 314/** JIT *********************************************************************/
294 315
295#if CORO_JIT 316#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 319 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 320 #if __x86_64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 321 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 322 #elif __i386 && CORO_JIT_UNIXY
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix" 323 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif 324 #endif
306 #endif 325 #endif
307#endif 326#endif
308 327
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
329 #undef CORO_JIT
330#endif
331
309#if CORO_JIT 332#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *);
310static load_save_perl_slots_type load_perl_slots, save_perl_slots; 334 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif 335#endif
312 336
313/** Coro::Select ************************************************************/ 337/** Coro::Select ************************************************************/
314 338
315static OP *(*coro_old_pp_sselect) (pTHX); 339static OP *(*coro_old_pp_sselect) (pTHX);
… …
332 356
333/** time stuff **************************************************************/ 357/** time stuff **************************************************************/
334 358
335#ifdef HAS_GETTIMEOFDAY 359#ifdef HAS_GETTIMEOFDAY
336 360
337ECB_INLINE void 361ecb_inline void
338coro_u2time (pTHX_ UV ret[2]) 362coro_u2time (pTHX_ UV ret[2])
339{ 363{
340 struct timeval tv; 364 struct timeval tv;
341 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
342 366
343 ret [0] = tv.tv_sec; 367 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec; 368 ret [1] = tv.tv_usec;
345} 369}
346 370
347ECB_INLINE double 371ecb_inline double
348coro_nvtime () 372coro_nvtime (void)
349{ 373{
350 struct timeval tv; 374 struct timeval tv;
351 gettimeofday (&tv, 0); 375 gettimeofday (&tv, 0);
352 376
353 return tv.tv_sec + tv.tv_usec * 1e-6; 377 return tv.tv_sec + tv.tv_usec * 1e-6;
354} 378}
355 379
356ECB_INLINE void 380ecb_inline void
357time_init (pTHX) 381time_init (pTHX)
358{ 382{
359 nvtime = coro_nvtime; 383 nvtime = coro_nvtime;
360 u2time = coro_u2time; 384 u2time = coro_u2time;
361} 385}
362 386
363#else 387#else
364 388
365ECB_INLINE void 389ecb_inline void
366time_init (pTHX) 390time_init (pTHX)
367{ 391{
368 SV **svp; 392 SV **svp;
369 393
370 require_pv ("Time/HiRes.pm"); 394 require_pv ("Time/HiRes.pm");
371 395
372 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
373 397
374 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
375 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 399 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
376 400
… …
412 get_hv (name, create); 436 get_hv (name, create);
413#endif 437#endif
414 return get_hv (name, create); 438 return get_hv (name, create);
415} 439}
416 440
417ECB_INLINE void 441ecb_inline void
418coro_times_update () 442coro_times_update (void)
419{ 443{
420#ifdef coro_clock_gettime 444#ifdef coro_clock_gettime
421 struct timespec ts; 445 struct timespec ts;
422 446
423 ts.tv_sec = ts.tv_nsec = 0; 447 ts.tv_sec = ts.tv_nsec = 0;
… …
435 time_real [0] = tv [0]; 459 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000; 460 time_real [1] = tv [1] * 1000;
437#endif 461#endif
438} 462}
439 463
440ECB_INLINE void 464ecb_inline void
441coro_times_add (struct coro *c) 465coro_times_add (struct coro *c)
442{ 466{
443 c->t_real [1] += time_real [1]; 467 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 468 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0]; 469 c->t_real [0] += time_real [0];
… …
447 c->t_cpu [1] += time_cpu [1]; 471 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 472 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0]; 473 c->t_cpu [0] += time_cpu [0];
450} 474}
451 475
452ECB_INLINE void 476ecb_inline void
453coro_times_sub (struct coro *c) 477coro_times_sub (struct coro *c)
454{ 478{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 479 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]; 480 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0]; 481 c->t_real [0] -= time_real [0];
… …
478 : 0) 502 : 0)
479 503
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 504#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) 505#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482 506
483ECB_INLINE MAGIC * 507ecb_inline MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro) 508SvSTATEhv_p (pTHX_ SV *coro)
485{ 509{
486 MAGIC *mg; 510 MAGIC *mg;
487 511
488 if (ecb_expect_true ( 512 if (ecb_expect_true (
… …
493 return mg; 517 return mg;
494 518
495 return 0; 519 return 0;
496} 520}
497 521
498ECB_INLINE struct coro * 522ecb_inline struct coro *
499SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
500{ 524{
501 MAGIC *mg; 525 MAGIC *mg;
502 526
503 if (SvROK (coro)) 527 if (SvROK (coro))
… …
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518 542
519/*****************************************************************************/ 543/*****************************************************************************/
520/* padlist management and caching */ 544/* padlist management and caching */
521 545
522ECB_INLINE AV * 546ecb_inline PADLIST *
523coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
524{ 548{
525 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
526 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
527 553
528 newpadlist = newAV (); 554 newPADLIST(newpadlist);
555#if !PERL_VERSION_ATLEAST(5,15,3)
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
529 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
530#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
531 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
532#else 561#else
533 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
534#endif 563#endif
535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
536 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
537 566
538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
539 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
540 571
541 return newpadlist; 572 return newpadlist;
542} 573}
543 574
544ECB_INLINE void 575ecb_inline void
545free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
546{ 577{
547 /* may be during global destruction */ 578 /* may be during global destruction */
548 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
549 { 580 {
550 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
551 582
552 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
553 { 584 {
554 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
555 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
556 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
557 588
558 while (j >= 0) 589 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
560 591
561 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
562 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
563 } 594 }
564 595
565 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
566 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
567 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
568 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
569 } 606 }
570} 607}
571 608
572static int 609static int
573coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
574{ 611{
575 AV *padlist; 612 PADLIST *padlist;
576 AV *av = (AV *)mg->mg_obj; 613 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
614 size_t len = *(size_t *)mg->mg_ptr;
577 615
578 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
579 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
580 return 0; 618 return 0;
581 619
582 /* casting is fun. */ 620 while (len--)
583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
584 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
585
586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
587 622
588 return 0; 623 return 0;
589} 624}
590 625
591static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
592 0, 0, 0, 0, 627 0, 0, 0, 0,
593 coro_cv_free 628 coro_cv_free
594}; 629};
595 630
596/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
597ECB_INLINE void 632ecb_inline void
598get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
599{ 634{
600 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
601 AV *av; 636 size_t *lenp;
602 637
603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
605 else 640 else
606 { 641 {
607#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
608 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
609 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
616#endif 651#endif
617 } 652 }
618} 653}
619 654
620ECB_INLINE void 655ecb_inline void
621put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
622{ 657{
623 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
624 AV *av;
625 659
626 if (ecb_expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 662 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
663 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
664 mg->mg_len = 1; /* so mg_free frees mg_ptr */
665 }
666 else
667 Renew (mg->mg_ptr,
668 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
669 char);
628 670
629 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
630
631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
632 av_extend (av, AvFILLp (av) + 1);
633
634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
635} 672}
636 673
637/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
638 675
676ecb_inline void
677swap_sv (SV *a, SV *b)
678{
679 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
680 SV tmp;
681
682 /* swap sv_any */
683 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
684
685 /* swap sv_flags */
686 SvFLAGS (&tmp) = SvFLAGS (a);
687 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
688 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
689
690#if PERL_VERSION_ATLEAST (5,10,0)
691 /* perl 5.10 and later complicates this _quite_ a bit, but it also
692 * is much faster, so no quarrels here. alternatively, we could
693 * sv_upgrade to avoid this.
694 */
695 {
696 /* swap sv_u */
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698
699 /* if SvANY points to the head, we need to adjust the pointers,
700 * as the pointer for a still points to b, and maybe vice versa.
701 */
702 #define svany_in_head(type) \
703 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
704
705 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707
708 if (svany_in_head (SvTYPE (b)))
709 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
710 }
711#endif
712}
713
639/* swap sv heads, at least logically */ 714/* swap sv heads, at least logically */
640static void 715static void
641swap_svs (pTHX_ Coro__State c) 716swap_svs (pTHX_ Coro__State c)
642{ 717{
643 int i; 718 int i;
644 719
645 for (i = 0; i <= AvFILLp (c->swap_sv); ) 720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
646 { 721 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} 722}
685 723
686#define SWAP_SVS(coro) \ 724#define SWAP_SVS(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \ 725 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro)) 726 swap_svs (aTHX_ (coro))
… …
700 738
701#if CORO_JIT 739#if CORO_JIT
702 load_perl_slots (slot); 740 load_perl_slots (slot);
703#else 741#else
704 #define VARx(name,expr,type) expr = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
705 # include "state.h" 743 #include "state.h"
706 #undef VARx
707#endif 744#endif
708 745
709 { 746 {
710 dSP; 747 dSP;
711 748
… …
714 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
715 while (ecb_expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
716 { 753 {
717 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
718 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
719 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
720 } 757 }
721 758
722 PUTBACK; 759 PUTBACK;
723 } 760 }
724 761
… …
814 851
815 PUTBACK; 852 PUTBACK;
816 } 853 }
817 854
818 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
820 { 857 {
821 unsigned int i; 858 unsigned int i;
822 859
823 for (i = 0; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
824 CXINC; 861 CXINC;
… …
833 870
834#if CORO_JIT 871#if CORO_JIT
835 save_perl_slots (slot); 872 save_perl_slots (slot);
836#else 873#else
837 #define VARx(name,expr,type) slot->name = expr; 874 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 875 #include "state.h"
839 #undef VARx
840#endif 876#endif
841 } 877 }
842} 878}
843 879
844/* 880/*
… …
876#endif 912#endif
877 913
878 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 916 PL_scopestack_max = 8;
917#if HAS_SCOPESTACK_NAME
918 New(54,PL_scopestack_name,8,const char*);
919#endif
881 920
882 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 923 PL_savestack_max = 24;
885 924
… …
913 } 952 }
914 953
915 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 955 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
918 Safefree (PL_savestack); 960 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 962 Safefree (PL_retstack);
921#endif 963#endif
922} 964}
… …
982 { 1024 {
983 SV **svp = 0; 1025 SV **svp = 0;
984 1026
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 1029
988 if (svp) 1030 if (svp)
989 { 1031 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1032 SV *ssv;
1033
1034 if (!*svp)
1035 ssv = &PL_sv_undef;
1036 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1037 ssv = sv_2mortal (newRV_inc (*svp));
1038 else
1039 ssv = *svp;
1040
1041 sv_setsv (sv, ssv);
991 return 0; 1042 return 0;
992 } 1043 }
993 } 1044 }
994 1045
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1089 PL_hints = 0; 1140 PL_hints = 0;
1090 1141
1091 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1145
1095 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
1187 /* restore swapped sv's */ 1238 /* restore swapped sv's */
1188 SWAP_SVS (coro); 1239 SWAP_SVS (coro);
1189 1240
1190 coro_destruct_stacks (aTHX); 1241 coro_destruct_stacks (aTHX);
1191 1242
1192 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1217 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1219 } 1270 }
1220} 1271}
1221 1272
1222ECB_INLINE void 1273ecb_inline void
1223free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1224{ 1275{
1225 if (ecb_expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1226 { 1277 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1388} 1439}
1389 1440
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1441/* the tail of transfer: execute stuff we can only do after a transfer */
1391ECB_INLINE void 1442ecb_inline void
1392transfer_tail (pTHX) 1443transfer_tail (pTHX)
1393{ 1444{
1394 free_coro_mortal (aTHX); 1445 free_coro_mortal (aTHX);
1446}
1447
1448/* try to exit the same way perl's main function would do */
1449/* we do not bother resetting the environment or other things *7
1450/* that are not, uhm, essential */
1451/* this obviously also doesn't work when perl is embedded */
1452static void ecb_noinline ecb_cold
1453perlish_exit (pTHX)
1454{
1455 int exitstatus = perl_destruct (PL_curinterp);
1456 perl_free (PL_curinterp);
1457 exit (exitstatus);
1395} 1458}
1396 1459
1397/* 1460/*
1398 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1462 */
… …
1428 */ 1491 */
1429 1492
1430 /* 1493 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1494 * 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) 1495 * 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 1496 * 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" 1497 * 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 */ 1498 */
1439 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1500 }
1442} 1501}
1443 1502
1444static coro_cctx * 1503static coro_cctx *
1445cctx_new () 1504cctx_new (void)
1446{ 1505{
1447 coro_cctx *cctx; 1506 coro_cctx *cctx;
1448 1507
1449 ++cctx_count; 1508 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1515 return cctx;
1457} 1516}
1458 1517
1459/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1460static coro_cctx * 1519static coro_cctx *
1461cctx_new_empty () 1520cctx_new_empty (void)
1462{ 1521{
1463 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1464 1523
1465 cctx->sptr = 0; 1524 cctx->sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1468 return cctx; 1527 return cctx;
1469} 1528}
1470 1529
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1531static coro_cctx *
1473cctx_new_run () 1532cctx_new_run (void)
1474{ 1533{
1475 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1476 void *stack_start; 1535 void *stack_start;
1477 size_t stack_size; 1536 size_t stack_size;
1478 1537
1479#if HAVE_MMAP 1538#if HAVE_MMAP
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1539 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */ 1540 /* 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); 1541 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1483 1542
1484 if (cctx->sptr != (void *)-1) 1543 if (cctx->sptr != (void *)-1)
1485 { 1544 {
1486 #if CORO_STACKGUARD 1545 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1702 return; 1761 return;
1703 1762
1704 slf_destroy (aTHX_ coro); 1763 slf_destroy (aTHX_ coro);
1705 1764
1706 coro->flags |= CF_ZOMBIE; 1765 coro->flags |= CF_ZOMBIE;
1707 1766
1708 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1709 { 1768 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1769 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1770 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1771 --coro_nready;
… …
1789 TRANSFER (ta, 1); 1848 TRANSFER (ta, 1);
1790} 1849}
1791 1850
1792/** Coro ********************************************************************/ 1851/** Coro ********************************************************************/
1793 1852
1794ECB_INLINE void 1853ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1854coro_enq (pTHX_ struct coro *coro)
1796{ 1855{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1856 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1857
1799 SvREFCNT_inc_NN (coro->hv); 1858 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1860 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1861 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1862 ready [1] = coro;
1804} 1863}
1805 1864
1806ECB_INLINE struct coro * 1865ecb_inline struct coro *
1807coro_deq (pTHX) 1866coro_deq (pTHX)
1808{ 1867{
1809 int prio; 1868 int prio;
1810 1869
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1870 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1923{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1924 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1925}
1867 1926
1868/* expects to own a reference to next->hv */ 1927/* expects to own a reference to next->hv */
1869ECB_INLINE void 1928ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1929prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1930{
1872 SV *prev_sv = SvRV (coro_current); 1931 SV *prev_sv = SvRV (coro_current);
1873 1932
1874 ta->prev = SvSTATE_hv (prev_sv); 1933 ta->prev = SvSTATE_hv (prev_sv);
… …
1933 } 1992 }
1934 } 1993 }
1935 } 1994 }
1936} 1995}
1937 1996
1938ECB_INLINE void 1997ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 1998prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 1999{
1941 api_ready (aTHX_ coro_current); 2000 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2001 prepare_schedule (aTHX_ ta);
1943} 2002}
1944 2003
1945ECB_INLINE void 2004ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2006{
1948 SV *prev = SvRV (coro_current); 2007 SV *prev = SvRV (coro_current);
1949 2008
1950 if (coro_nready) 2009 if (coro_nready)
… …
2145 2204
2146static void 2205static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2206coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2207{
2149 AV *av; 2208 AV *av;
2150 2209
2151 if (coro->status) 2210 if (coro->status)
2152 { 2211 {
2153 av = coro->status; 2212 av = coro->status;
2154 av_clear (av); 2213 av_clear (av);
2155 } 2214 }
… …
2202 2261
2203 coro = SvSTATE (arg [0]); 2262 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2263 coro_hv = coro->hv;
2205 2264
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2265 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2266
2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2267 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2268 {
2210 /* coro currently busy cancelling something, so just notify it */ 2269 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2270 coro->slf_frame.data = (void *)coro;
2212 2271
… …
2391 2450
2392static int 2451static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2452slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2453{
2395 SV *data = (SV *)frame->data; 2454 SV *data = (SV *)frame->data;
2396 2455
2397 if (CORO_THROW) 2456 if (CORO_THROW)
2398 return 0; 2457 return 0;
2399 2458
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2459 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2460 return 1;
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2496 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2497 coro->rouse_cb = 0;
2439 } 2498 }
2440 2499
2441 if (!SvROK (cb) 2500 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2501 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2502 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2503 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2504
2446 { 2505 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2950 { 3009 {
2951 int i; 3010 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3011 /* 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 */ 3012 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3013 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3014 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3015 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3016 return 1;
2958 3017
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3018 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3019 return 1;
… …
3340#endif 3399#endif
3341 3400
3342#if CORO_JIT 3401#if CORO_JIT
3343 3402
3344static void ecb_noinline ecb_cold 3403static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c) 3404pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3346{ 3405{
3347 dSP; 3406 dSP;
3348 AV *av = newAV (); 3407 AV *av = newAV ();
3349 3408
3409 av_store (av, 3, newSVuv (d));
3350 av_store (av, 2, newSVuv (c)); 3410 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b)); 3411 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a)); 3412 av_store (av, 0, newSVuv (a));
3353 3413
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3414 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3361{ 3421{
3362 dSP; 3422 dSP;
3363 SV *load, *save; 3423 SV *load, *save;
3364 char *map_base; 3424 char *map_base;
3365 char *load_ptr, *save_ptr; 3425 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len; 3426 STRLEN load_len, save_len, map_len;
3367 int count; 3427 int count;
3368 3428
3429 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3430
3369 PUSHMARK (SP); 3431 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3432 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h" 3433 #include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY); 3434 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN; 3435 SPAGAIN;
3376 3436
3377 save = POPs; save_ptr = SvPVbyte (save, save_len); 3437 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len); 3438 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379 3439
3440 map_len = load_len + save_len + 16;
3441
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3442 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381 3443
3382 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3444 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383 3445
3384 load_perl_slots = (load_save_perl_slots_type)map_base; 3446 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len); 3447 memcpy (map_base, load_ptr, load_len);
3386 3448
3387 map_base += (load_len + 15) & ~15; 3449 map_base += (load_len + 15) & ~15;
3388 3450
3389 save_perl_slots = (load_save_perl_slots_type)map_base; 3451 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len); 3452 memcpy (map_base, save_ptr, save_len);
3453
3454 /* we are good citizens and try to make the page read-only, so the evil evil */
3455 /* hackers might have it a bit more difficult */
3456 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3457
3458 PUTBACK;
3459 eval_pv ("undef &Coro::State::_jit", 1);
3391} 3460}
3392 3461
3393#endif 3462#endif
3394 3463
3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3464MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
… …
3463 time_init (aTHX); 3532 time_init (aTHX);
3464 3533
3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3534 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT 3535#if CORO_JIT
3467 PUTBACK; 3536 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX); 3537 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN; 3538 SPAGAIN;
3472#endif 3539#endif
3473} 3540}
3474 3541
3475SV * 3542SV *
… …
3628 RETVAL = boolSV (coro->flags & ix); 3695 RETVAL = boolSV (coro->flags & ix);
3629 OUTPUT: 3696 OUTPUT:
3630 RETVAL 3697 RETVAL
3631 3698
3632void 3699void
3633throw (Coro::State self, SV *exception = &PL_sv_undef) 3700throw (SV *self, SV *exception = &PL_sv_undef)
3634 PROTOTYPE: $;$ 3701 PROTOTYPE: $;$
3635 CODE: 3702 CODE:
3636{ 3703{
3704 struct coro *coro = SvSTATE (self);
3637 struct coro *current = SvSTATE_current; 3705 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3706 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3639 SvREFCNT_dec (*exceptionp); 3707 SvREFCNT_dec (*exceptionp);
3640 SvGETMAGIC (exception); 3708 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3709 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3710
3711 api_ready (aTHX_ self);
3642} 3712}
3643 3713
3644void 3714void
3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3715api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3646 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
… …
3776 3846
3777 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3847 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3778 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3848 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3779 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3849 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3780 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3850 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3781 3851
3782 coro_stash = gv_stashpv ("Coro", TRUE); 3852 coro_stash = gv_stashpv ("Coro", TRUE);
3783 3853
3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3854 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3855 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3856 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4127} 4197}
4128 4198
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4199MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130 4200
4131void 4201void
4132_may_delete (SV *sem, int count, int extra_refs) 4202_may_delete (SV *sem, int count, unsigned int extra_refs)
4133 PPCODE: 4203 PPCODE:
4134{ 4204{
4135 AV *av = (AV *)SvRV (sem); 4205 AV *av = (AV *)SvRV (sem);
4136 4206
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4207 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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