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.404 by root, Fri Jun 10 12:27:02 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
… …
174 void *sptr; 197 void *sptr;
175 size_t ssize; 198 size_t ssize;
176 199
177 /* cpu state */ 200 /* cpu state */
178 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
179 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
180 JMPENV *top_env; 205 JMPENV *top_env;
181 coro_context cctx; 206 coro_context cctx;
182 207
183 U32 gen; 208 U32 gen;
184#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
… …
204}; 229};
205 230
206/* 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 */
207typedef struct 232typedef struct
208{ 233{
209 SV *defsv;
210 AV *defav;
211 SV *errsv;
212 SV *irsgv;
213 HV *hinthv;
214#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
215# include "state.h" 235 #include "state.h"
216#undef VAR
217} perl_slots; 236} perl_slots;
218 237
219// how many context stack entries do we need for perl_slots 238/* how many context stack entries do we need for perl_slots */
220#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))
221 240
222/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
223struct coro 242struct coro
224{ 243{
… …
290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
291static CV *cv_coro_run; 310static CV *cv_coro_run;
292static struct coro *coro_first; 311static struct coro *coro_first;
293#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
294 313
314/** JIT *********************************************************************/
315
316#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix"
324 #endif
325 #endif
326#endif
327
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
329 #undef CORO_JIT
330#endif
331
332#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *);
334 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
335#endif
336
295/** Coro::Select ************************************************************/ 337/** Coro::Select ************************************************************/
296 338
297static OP *(*coro_old_pp_sselect) (pTHX); 339static OP *(*coro_old_pp_sselect) (pTHX);
298static SV *coro_select_select; 340static SV *coro_select_select;
299 341
… …
314 356
315/** time stuff **************************************************************/ 357/** time stuff **************************************************************/
316 358
317#ifdef HAS_GETTIMEOFDAY 359#ifdef HAS_GETTIMEOFDAY
318 360
319ECB_INLINE void 361ecb_inline void
320coro_u2time (pTHX_ UV ret[2]) 362coro_u2time (pTHX_ UV ret[2])
321{ 363{
322 struct timeval tv; 364 struct timeval tv;
323 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
324 366
325 ret [0] = tv.tv_sec; 367 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec; 368 ret [1] = tv.tv_usec;
327} 369}
328 370
329ECB_INLINE double 371ecb_inline double
330coro_nvtime () 372coro_nvtime (void)
331{ 373{
332 struct timeval tv; 374 struct timeval tv;
333 gettimeofday (&tv, 0); 375 gettimeofday (&tv, 0);
334 376
335 return tv.tv_sec + tv.tv_usec * 1e-6; 377 return tv.tv_sec + tv.tv_usec * 1e-6;
336} 378}
337 379
338ECB_INLINE void 380ecb_inline void
339time_init (pTHX) 381time_init (pTHX)
340{ 382{
341 nvtime = coro_nvtime; 383 nvtime = coro_nvtime;
342 u2time = coro_u2time; 384 u2time = coro_u2time;
343} 385}
344 386
345#else 387#else
346 388
347ECB_INLINE void 389ecb_inline void
348time_init (pTHX) 390time_init (pTHX)
349{ 391{
350 SV **svp; 392 SV **svp;
351 393
352 require_pv ("Time/HiRes.pm"); 394 require_pv ("Time/HiRes.pm");
353 395
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355 397
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 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");
358 400
… …
394 get_hv (name, create); 436 get_hv (name, create);
395#endif 437#endif
396 return get_hv (name, create); 438 return get_hv (name, create);
397} 439}
398 440
399ECB_INLINE void 441ecb_inline void
400coro_times_update () 442coro_times_update (void)
401{ 443{
402#ifdef coro_clock_gettime 444#ifdef coro_clock_gettime
403 struct timespec ts; 445 struct timespec ts;
404 446
405 ts.tv_sec = ts.tv_nsec = 0; 447 ts.tv_sec = ts.tv_nsec = 0;
… …
417 time_real [0] = tv [0]; 459 time_real [0] = tv [0];
418 time_real [1] = tv [1] * 1000; 460 time_real [1] = tv [1] * 1000;
419#endif 461#endif
420} 462}
421 463
422ECB_INLINE void 464ecb_inline void
423coro_times_add (struct coro *c) 465coro_times_add (struct coro *c)
424{ 466{
425 c->t_real [1] += time_real [1]; 467 c->t_real [1] += time_real [1];
426 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]; }
427 c->t_real [0] += time_real [0]; 469 c->t_real [0] += time_real [0];
… …
429 c->t_cpu [1] += time_cpu [1]; 471 c->t_cpu [1] += time_cpu [1];
430 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]; }
431 c->t_cpu [0] += time_cpu [0]; 473 c->t_cpu [0] += time_cpu [0];
432} 474}
433 475
434ECB_INLINE void 476ecb_inline void
435coro_times_sub (struct coro *c) 477coro_times_sub (struct coro *c)
436{ 478{
437 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]; }
438 c->t_real [1] -= time_real [1]; 480 c->t_real [1] -= time_real [1];
439 c->t_real [0] -= time_real [0]; 481 c->t_real [0] -= time_real [0];
… …
460 : 0) 502 : 0)
461 503
462#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)
463#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)
464 506
465ECB_INLINE MAGIC * 507ecb_inline MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro) 508SvSTATEhv_p (pTHX_ SV *coro)
467{ 509{
468 MAGIC *mg; 510 MAGIC *mg;
469 511
470 if (ecb_expect_true ( 512 if (ecb_expect_true (
… …
475 return mg; 517 return mg;
476 518
477 return 0; 519 return 0;
478} 520}
479 521
480ECB_INLINE struct coro * 522ecb_inline struct coro *
481SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
482{ 524{
483 MAGIC *mg; 525 MAGIC *mg;
484 526
485 if (SvROK (coro)) 527 if (SvROK (coro))
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 542
501/*****************************************************************************/ 543/*****************************************************************************/
502/* padlist management and caching */ 544/* padlist management and caching */
503 545
504ECB_INLINE AV * 546ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
506{ 548{
507 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
509 553
510 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. */
511 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
512#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
514#else 561#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
516#endif 563#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
518 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
519 566
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
522 571
523 return newpadlist; 572 return newpadlist;
524} 573}
525 574
526ECB_INLINE void 575ecb_inline void
527free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
528{ 577{
529 /* may be during global destruction */ 578 /* may be during global destruction */
530 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
531 { 580 {
532 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
533 582
534 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
535 { 584 {
536 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
539 588
540 while (j >= 0) 589 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 591
543 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
545 } 594 }
546 595
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
548 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
549 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
551 } 606 }
552} 607}
553 608
554static int 609static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 611{
557 AV *padlist; 612 PADLIST *padlist;
558 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;
559 615
560 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
562 return 0; 618 return 0;
563 619
564 /* casting is fun. */ 620 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 622
570 return 0; 623 return 0;
571} 624}
572 625
573static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 627 0, 0, 0, 0,
575 coro_cv_free 628 coro_cv_free
576}; 629};
577 630
578/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
579ECB_INLINE void 632ecb_inline void
580get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
581{ 634{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 636 size_t *lenp;
584 637
585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 640 else
588 { 641 {
589#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 651#endif
599 } 652 }
600} 653}
601 654
602ECB_INLINE void 655ecb_inline void
603put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
604{ 657{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 659
608 if (ecb_expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
609 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);
610 670
611 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 672}
618 673
619/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
620 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
621/* swap sv heads, at least logically */ 714/* swap sv heads, at least logically */
622static void 715static void
623swap_svs (pTHX_ Coro__State c) 716swap_svs (pTHX_ Coro__State c)
624{ 717{
625 int i; 718 int i;
626 719
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 722}
667 723
668#define SWAP_SVS(coro) \ 724#define SWAP_SVS(coro) \
669 if (ecb_expect_false ((coro)->swap_sv)) \ 725 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 726 swap_svs (aTHX_ (coro))
… …
678 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
679 c->slot = 0; 735 c->slot = 0;
680 736
681 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
682 738
683 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 741#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 743 #include "state.h"
691 #undef VAR 744#endif
692 745
693 { 746 {
694 dSP; 747 dSP;
695 748
696 CV *cv; 749 CV *cv;
… …
698 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
699 while (ecb_expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
700 { 753 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 757 }
705 758
706 PUTBACK; 759 PUTBACK;
707 } 760 }
708 761
… …
798 851
799 PUTBACK; 852 PUTBACK;
800 } 853 }
801 854
802 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 { 857 {
805 unsigned int i; 858 unsigned int i;
806 859
807 for (i = 0; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 861 CXINC;
… …
813 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
814 867
815 { 868 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 870
818 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
819 slot->defsv = DEFSV; 872 save_perl_slots (slot);
820 slot->errsv = ERRSV; 873#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 875 #include "state.h"
826 #undef VAR 876#endif
827 } 877 }
828} 878}
829 879
830/* 880/*
831 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
862#endif 912#endif
863 913
864 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
866 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
867 920
868 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 923 PL_savestack_max = 24;
871 924
… …
899 } 952 }
900 953
901 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 955 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
904 Safefree (PL_savestack); 960 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 962 Safefree (PL_retstack);
907#endif 963#endif
908} 964}
… …
968 { 1024 {
969 SV **svp = 0; 1025 SV **svp = 0;
970 1026
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1029
974 if (svp) 1030 if (svp)
975 { 1031 {
976 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);
977 return 0; 1042 return 0;
978 } 1043 }
979 } 1044 }
980 1045
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1075 PL_hints = 0; 1140 PL_hints = 0;
1076 1141
1077 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
1078 PL_diehook = SvREFCNT_inc (rv_diehook); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1145
1081 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
1084 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);
1085 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
1173 /* restore swapped sv's */ 1238 /* restore swapped sv's */
1174 SWAP_SVS (coro); 1239 SWAP_SVS (coro);
1175 1240
1176 coro_destruct_stacks (aTHX); 1241 coro_destruct_stacks (aTHX);
1177 1242
1178 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1179 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1180 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1181 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1182 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1183 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1203 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1204 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1205 } 1270 }
1206} 1271}
1207 1272
1208ECB_INLINE void 1273ecb_inline void
1209free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1210{ 1275{
1211 if (ecb_expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1212 { 1277 {
1213 SvREFCNT_dec ((SV *)coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
… …
1372 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1373 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1374} 1439}
1375 1440
1376/* 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 */
1377ECB_INLINE void 1442ecb_inline void
1378transfer_tail (pTHX) 1443transfer_tail (pTHX)
1379{ 1444{
1380 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);
1381} 1458}
1382 1459
1383/* 1460/*
1384 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1385 */ 1462 */
… …
1414 */ 1491 */
1415 1492
1416 /* 1493 /*
1417 * 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
1418 * 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)
1419 * 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
1420 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1421 * coroutine as Coro has no such concept.
1422 * This actually isn't valid with the pthread backend, but OSes requiring
1423 * that backend are too broken to do it in a standards-compliant way.
1424 */ 1498 */
1425 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1426 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1427 } 1500 }
1428} 1501}
1429 1502
1430static coro_cctx * 1503static coro_cctx *
1431cctx_new () 1504cctx_new (void)
1432{ 1505{
1433 coro_cctx *cctx; 1506 coro_cctx *cctx;
1434 1507
1435 ++cctx_count; 1508 ++cctx_count;
1436 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1442 return cctx; 1515 return cctx;
1443} 1516}
1444 1517
1445/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1446static coro_cctx * 1519static coro_cctx *
1447cctx_new_empty () 1520cctx_new_empty (void)
1448{ 1521{
1449 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1450 1523
1451 cctx->sptr = 0; 1524 cctx->sptr = 0;
1452 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1454 return cctx; 1527 return cctx;
1455} 1528}
1456 1529
1457/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1458static coro_cctx * 1531static coro_cctx *
1459cctx_new_run () 1532cctx_new_run (void)
1460{ 1533{
1461 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1462 void *stack_start; 1535 void *stack_start;
1463 size_t stack_size; 1536 size_t stack_size;
1464 1537
1465#if HAVE_MMAP 1538#if HAVE_MMAP
1466 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;
1467 /* mmap supposedly does allocate-on-write for us */ 1540 /* mmap supposedly does allocate-on-write for us */
1468 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);
1469 1542
1470 if (cctx->sptr != (void *)-1) 1543 if (cctx->sptr != (void *)-1)
1471 { 1544 {
1472 #if CORO_STACKGUARD 1545 #if CORO_STACKGUARD
1473 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1688 return; 1761 return;
1689 1762
1690 slf_destroy (aTHX_ coro); 1763 slf_destroy (aTHX_ coro);
1691 1764
1692 coro->flags |= CF_ZOMBIE; 1765 coro->flags |= CF_ZOMBIE;
1693 1766
1694 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1695 { 1768 {
1696 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1769 /* reduce nready, as destroying a ready coro effectively unreadies it */
1697 /* alternative: look through all ready queues and remove the coro */ 1770 /* alternative: look through all ready queues and remove the coro */
1698 --coro_nready; 1771 --coro_nready;
… …
1775 TRANSFER (ta, 1); 1848 TRANSFER (ta, 1);
1776} 1849}
1777 1850
1778/** Coro ********************************************************************/ 1851/** Coro ********************************************************************/
1779 1852
1780ECB_INLINE void 1853ecb_inline void
1781coro_enq (pTHX_ struct coro *coro) 1854coro_enq (pTHX_ struct coro *coro)
1782{ 1855{
1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1856 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1784 1857
1785 SvREFCNT_inc_NN (coro->hv); 1858 SvREFCNT_inc_NN (coro->hv);
… …
1787 coro->next_ready = 0; 1860 coro->next_ready = 0;
1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1861 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1789 ready [1] = coro; 1862 ready [1] = coro;
1790} 1863}
1791 1864
1792ECB_INLINE struct coro * 1865ecb_inline struct coro *
1793coro_deq (pTHX) 1866coro_deq (pTHX)
1794{ 1867{
1795 int prio; 1868 int prio;
1796 1869
1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1870 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1850{ 1923{
1851 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1924 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1852} 1925}
1853 1926
1854/* expects to own a reference to next->hv */ 1927/* expects to own a reference to next->hv */
1855ECB_INLINE void 1928ecb_inline void
1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1929prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1857{ 1930{
1858 SV *prev_sv = SvRV (coro_current); 1931 SV *prev_sv = SvRV (coro_current);
1859 1932
1860 ta->prev = SvSTATE_hv (prev_sv); 1933 ta->prev = SvSTATE_hv (prev_sv);
… …
1919 } 1992 }
1920 } 1993 }
1921 } 1994 }
1922} 1995}
1923 1996
1924ECB_INLINE void 1997ecb_inline void
1925prepare_cede (pTHX_ struct coro_transfer_args *ta) 1998prepare_cede (pTHX_ struct coro_transfer_args *ta)
1926{ 1999{
1927 api_ready (aTHX_ coro_current); 2000 api_ready (aTHX_ coro_current);
1928 prepare_schedule (aTHX_ ta); 2001 prepare_schedule (aTHX_ ta);
1929} 2002}
1930 2003
1931ECB_INLINE void 2004ecb_inline void
1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1933{ 2006{
1934 SV *prev = SvRV (coro_current); 2007 SV *prev = SvRV (coro_current);
1935 2008
1936 if (coro_nready) 2009 if (coro_nready)
… …
2131 2204
2132static void 2205static void
2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2206coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2134{ 2207{
2135 AV *av; 2208 AV *av;
2136 2209
2137 if (coro->status) 2210 if (coro->status)
2138 { 2211 {
2139 av = coro->status; 2212 av = coro->status;
2140 av_clear (av); 2213 av_clear (av);
2141 } 2214 }
… …
2188 2261
2189 coro = SvSTATE (arg [0]); 2262 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv; 2263 coro_hv = coro->hv;
2191 2264
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2265 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193 2266
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2267 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 { 2268 {
2196 /* coro currently busy cancelling something, so just notify it */ 2269 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro; 2270 coro->slf_frame.data = (void *)coro;
2198 2271
… …
2377 2450
2378static int 2451static int
2379slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2452slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2380{ 2453{
2381 SV *data = (SV *)frame->data; 2454 SV *data = (SV *)frame->data;
2382 2455
2383 if (CORO_THROW) 2456 if (CORO_THROW)
2384 return 0; 2457 return 0;
2385 2458
2386 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2459 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2387 return 1; 2460 return 1;
… …
2423 cb = sv_2mortal (coro->rouse_cb); 2496 cb = sv_2mortal (coro->rouse_cb);
2424 coro->rouse_cb = 0; 2497 coro->rouse_cb = 0;
2425 } 2498 }
2426 2499
2427 if (!SvROK (cb) 2500 if (!SvROK (cb)
2428 || SvTYPE (SvRV (cb)) != SVt_PVCV 2501 || SvTYPE (SvRV (cb)) != SVt_PVCV
2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2502 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2430 croak ("Coro::rouse_wait called with illegal callback argument,"); 2503 croak ("Coro::rouse_wait called with illegal callback argument,");
2431 2504
2432 { 2505 {
2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2936 { 3009 {
2937 int i; 3010 int i;
2938 /* 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 */
2939 /* 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 */
2940 /* this avoids some degenerate memory usage cases */ 3013 /* this avoids some degenerate memory usage cases */
2941 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 */
2942 if (AvARRAY (av)[i] == coro_hv) 3015 if (AvARRAY (av)[i] == coro_hv)
2943 return 1; 3016 return 1;
2944 3017
2945 av_push (av, SvREFCNT_inc (coro_hv)); 3018 av_push (av, SvREFCNT_inc (coro_hv));
2946 return 1; 3019 return 1;
… …
3323 3396
3324#ifndef __cplusplus 3397#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State); 3398ecb_cold XS(boot_Coro__State);
3326#endif 3399#endif
3327 3400
3401#if CORO_JIT
3402
3403static void ecb_noinline ecb_cold
3404pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3405{
3406 dSP;
3407 AV *av = newAV ();
3408
3409 av_store (av, 3, newSVuv (d));
3410 av_store (av, 2, newSVuv (c));
3411 av_store (av, 1, newSVuv (b));
3412 av_store (av, 0, newSVuv (a));
3413
3414 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3415
3416 PUTBACK;
3417}
3418
3419static void ecb_noinline ecb_cold
3420jit_init (pTHX)
3421{
3422 dSP;
3423 SV *load, *save;
3424 char *map_base;
3425 char *load_ptr, *save_ptr;
3426 STRLEN load_len, save_len, map_len;
3427 int count;
3428
3429 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3430
3431 PUSHMARK (SP);
3432 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3433 #include "state.h"
3434 count = call_pv ("Coro::State::_jit", G_ARRAY);
3435 SPAGAIN;
3436
3437 save = POPs; save_ptr = SvPVbyte (save, save_len);
3438 load = POPs; load_ptr = SvPVbyte (load, load_len);
3439
3440 map_len = load_len + save_len + 16;
3441
3442 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3443
3444 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3445
3446 load_perl_slots = (load_save_perl_slots_type)map_base;
3447 memcpy (map_base, load_ptr, load_len);
3448
3449 map_base += (load_len + 15) & ~15;
3450
3451 save_perl_slots = (load_save_perl_slots_type)map_base;
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);
3460}
3461
3462#endif
3463
3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3464MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3329 3465
3330PROTOTYPES: DISABLE 3466PROTOTYPES: DISABLE
3331 3467
3332BOOT: 3468BOOT:
… …
3335# if CORO_PTHREAD 3471# if CORO_PTHREAD
3336 coro_thx = PERL_GET_CONTEXT; 3472 coro_thx = PERL_GET_CONTEXT;
3337# endif 3473# endif
3338#endif 3474#endif
3339 BOOT_PAGESIZE; 3475 BOOT_PAGESIZE;
3476
3477 /* perl defines these to check for existance first, but why it doesn't */
3478 /* just create them one at init time is not clear to me, except for */
3479 /* programs trying to delete them, but... */
3480 /* anyway, we declare this as invalid and make sure they are initialised here */
3481 DEFSV;
3482 ERRSV;
3340 3483
3341 cctx_current = cctx_new_empty (); 3484 cctx_current = cctx_new_empty ();
3342 3485
3343 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3344 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3387 coroapi.prepare_cede_notself = prepare_cede_notself; 3530 coroapi.prepare_cede_notself = prepare_cede_notself;
3388 3531
3389 time_init (aTHX); 3532 time_init (aTHX);
3390 3533
3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3534 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3535#if CORO_JIT
3536 PUTBACK;
3537 jit_init (aTHX);
3538 SPAGAIN;
3539#endif
3392} 3540}
3393 3541
3394SV * 3542SV *
3395new (SV *klass, ...) 3543new (SV *klass, ...)
3396 ALIAS: 3544 ALIAS:
… …
3547 RETVAL = boolSV (coro->flags & ix); 3695 RETVAL = boolSV (coro->flags & ix);
3548 OUTPUT: 3696 OUTPUT:
3549 RETVAL 3697 RETVAL
3550 3698
3551void 3699void
3552throw (Coro::State self, SV *exception = &PL_sv_undef) 3700throw (SV *self, SV *exception = &PL_sv_undef)
3553 PROTOTYPE: $;$ 3701 PROTOTYPE: $;$
3554 CODE: 3702 CODE:
3555{ 3703{
3704 struct coro *coro = SvSTATE (self);
3556 struct coro *current = SvSTATE_current; 3705 struct coro *current = SvSTATE_current;
3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3706 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3558 SvREFCNT_dec (*exceptionp); 3707 SvREFCNT_dec (*exceptionp);
3559 SvGETMAGIC (exception); 3708 SvGETMAGIC (exception);
3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3709 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3710
3711 api_ready (aTHX_ self);
3561} 3712}
3562 3713
3563void 3714void
3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3715api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3565 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
… …
3695 3846
3696 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);
3697 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3848 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3698 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);
3699 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 */
3700 3851
3701 coro_stash = gv_stashpv ("Coro", TRUE); 3852 coro_stash = gv_stashpv ("Coro", TRUE);
3702 3853
3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3854 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3855 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3856 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4046} 4197}
4047 4198
4048MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4199MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4049 4200
4050void 4201void
4051_may_delete (SV *sem, int count, int extra_refs) 4202_may_delete (SV *sem, int count, unsigned int extra_refs)
4052 PPCODE: 4203 PPCODE:
4053{ 4204{
4054 AV *av = (AV *)SvRV (sem); 4205 AV *av = (AV *)SvRV (sem);
4055 4206
4056 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