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.409 by root, Sun Jun 12 04:29:15 2011 UTC vs.
Revision 1.427 by root, Wed Dec 5 14:35:34 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 x x x x
305 #undef CORO_JIT
306 #endif 324 #endif
307 #endif 325 #endif
308#endif 326#endif
309 327
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
329 #undef CORO_JIT
330#endif
331
310#if CORO_JIT 332#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *);
311static load_save_perl_slots_type load_perl_slots, save_perl_slots; 334 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif 335#endif
313 336
314/** Coro::Select ************************************************************/ 337/** Coro::Select ************************************************************/
315 338
316static OP *(*coro_old_pp_sselect) (pTHX); 339static OP *(*coro_old_pp_sselect) (pTHX);
… …
333 356
334/** time stuff **************************************************************/ 357/** time stuff **************************************************************/
335 358
336#ifdef HAS_GETTIMEOFDAY 359#ifdef HAS_GETTIMEOFDAY
337 360
338ECB_INLINE void 361ecb_inline void
339coro_u2time (pTHX_ UV ret[2]) 362coro_u2time (pTHX_ UV ret[2])
340{ 363{
341 struct timeval tv; 364 struct timeval tv;
342 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
343 366
344 ret [0] = tv.tv_sec; 367 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec; 368 ret [1] = tv.tv_usec;
346} 369}
347 370
348ECB_INLINE double 371ecb_inline double
349coro_nvtime () 372coro_nvtime (void)
350{ 373{
351 struct timeval tv; 374 struct timeval tv;
352 gettimeofday (&tv, 0); 375 gettimeofday (&tv, 0);
353 376
354 return tv.tv_sec + tv.tv_usec * 1e-6; 377 return tv.tv_sec + tv.tv_usec * 1e-6;
355} 378}
356 379
357ECB_INLINE void 380ecb_inline void
358time_init (pTHX) 381time_init (pTHX)
359{ 382{
360 nvtime = coro_nvtime; 383 nvtime = coro_nvtime;
361 u2time = coro_u2time; 384 u2time = coro_u2time;
362} 385}
363 386
364#else 387#else
365 388
366ECB_INLINE void 389ecb_inline void
367time_init (pTHX) 390time_init (pTHX)
368{ 391{
369 SV **svp; 392 SV **svp;
370 393
371 require_pv ("Time/HiRes.pm"); 394 require_pv ("Time/HiRes.pm");
372 395
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374 397
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 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");
377 400
… …
413 get_hv (name, create); 436 get_hv (name, create);
414#endif 437#endif
415 return get_hv (name, create); 438 return get_hv (name, create);
416} 439}
417 440
418ECB_INLINE void 441ecb_inline void
419coro_times_update () 442coro_times_update (void)
420{ 443{
421#ifdef coro_clock_gettime 444#ifdef coro_clock_gettime
422 struct timespec ts; 445 struct timespec ts;
423 446
424 ts.tv_sec = ts.tv_nsec = 0; 447 ts.tv_sec = ts.tv_nsec = 0;
… …
436 time_real [0] = tv [0]; 459 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000; 460 time_real [1] = tv [1] * 1000;
438#endif 461#endif
439} 462}
440 463
441ECB_INLINE void 464ecb_inline void
442coro_times_add (struct coro *c) 465coro_times_add (struct coro *c)
443{ 466{
444 c->t_real [1] += time_real [1]; 467 c->t_real [1] += time_real [1];
445 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]; }
446 c->t_real [0] += time_real [0]; 469 c->t_real [0] += time_real [0];
… …
448 c->t_cpu [1] += time_cpu [1]; 471 c->t_cpu [1] += time_cpu [1];
449 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]; }
450 c->t_cpu [0] += time_cpu [0]; 473 c->t_cpu [0] += time_cpu [0];
451} 474}
452 475
453ECB_INLINE void 476ecb_inline void
454coro_times_sub (struct coro *c) 477coro_times_sub (struct coro *c)
455{ 478{
456 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]; }
457 c->t_real [1] -= time_real [1]; 480 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0]; 481 c->t_real [0] -= time_real [0];
… …
479 : 0) 502 : 0)
480 503
481#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)
482#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)
483 506
484ECB_INLINE MAGIC * 507ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro) 508SvSTATEhv_p (pTHX_ SV *coro)
486{ 509{
487 MAGIC *mg; 510 MAGIC *mg;
488 511
489 if (ecb_expect_true ( 512 if (ecb_expect_true (
… …
494 return mg; 517 return mg;
495 518
496 return 0; 519 return 0;
497} 520}
498 521
499ECB_INLINE struct coro * 522ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
501{ 524{
502 MAGIC *mg; 525 MAGIC *mg;
503 526
504 if (SvROK (coro)) 527 if (SvROK (coro))
… …
518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
519 542
520/*****************************************************************************/ 543/*****************************************************************************/
521/* padlist management and caching */ 544/* padlist management and caching */
522 545
523ECB_INLINE AV * 546ecb_inline PADLIST *
524coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
525{ 548{
526 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
527 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
528 553
529 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. */
530 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
531#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
532 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
533#else 561#else
534 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
535#endif 563#endif
536 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
537 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
538 566
539 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
540 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
541 571
542 return newpadlist; 572 return newpadlist;
543} 573}
544 574
545ECB_INLINE void 575ecb_inline void
546free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
547{ 577{
548 /* may be during global destruction */ 578 /* may be during global destruction */
549 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
550 { 580 {
551 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
552 582
553 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
554 { 584 {
555 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
556 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
557 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
558 588
559 while (j >= 0) 589 while (j >= 0)
560 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
561 591
562 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
563 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
564 } 594 }
565 595
566 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
567 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
568 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
569 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
570 } 606 }
571} 607}
572 608
573static int 609static int
574coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
575{ 611{
576 AV *padlist; 612 PADLIST *padlist;
577 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;
578 615
579 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
580 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
581 return 0; 618 return 0;
582 619
583 /* casting is fun. */ 620 while (len--)
584 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
585 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
586
587 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
588 622
589 return 0; 623 return 0;
590} 624}
591 625
592static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
593 0, 0, 0, 0, 627 0, 0, 0, 0,
594 coro_cv_free 628 coro_cv_free
595}; 629};
596 630
597/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
598ECB_INLINE void 632ecb_inline void
599get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
600{ 634{
601 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
602 AV *av; 636 size_t *lenp;
603 637
604 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
605 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
606 else 640 else
607 { 641 {
608#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
609 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
610 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
616 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
617#endif 651#endif
618 } 652 }
619} 653}
620 654
621ECB_INLINE void 655ecb_inline void
622put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
623{ 657{
624 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
625 AV *av;
626 659
627 if (ecb_expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
628 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);
629 670
630 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
631
632 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
633 av_extend (av, AvFILLp (av) + 1);
634
635 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
636} 672}
637 673
638/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
639 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
640/* swap sv heads, at least logically */ 714/* swap sv heads, at least logically */
641static void 715static void
642swap_svs (pTHX_ Coro__State c) 716swap_svs (pTHX_ Coro__State c)
643{ 717{
644 int i; 718 int i;
645 719
646 for (i = 0; i <= AvFILLp (c->swap_sv); ) 720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
647 { 721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
648 SV *a = AvARRAY (c->swap_sv)[i++];
649 SV *b = AvARRAY (c->swap_sv)[i++];
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 complicates this _quite_ a bit, but it also is
664 * 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} 722}
686 723
687#define SWAP_SVS(coro) \ 724#define SWAP_SVS(coro) \
688 if (ecb_expect_false ((coro)->swap_sv)) \ 725 if (ecb_expect_false ((coro)->swap_sv)) \
689 swap_svs (aTHX_ (coro)) 726 swap_svs (aTHX_ (coro))
… …
701 738
702#if CORO_JIT 739#if CORO_JIT
703 load_perl_slots (slot); 740 load_perl_slots (slot);
704#else 741#else
705 #define VARx(name,expr,type) expr = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
706 # include "state.h" 743 #include "state.h"
707 #undef VARx
708#endif 744#endif
709 745
710 { 746 {
711 dSP; 747 dSP;
712 748
… …
715 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
716 while (ecb_expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
717 { 753 {
718 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
719 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
720 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
721 } 757 }
722 758
723 PUTBACK; 759 PUTBACK;
724 } 760 }
725 761
… …
815 851
816 PUTBACK; 852 PUTBACK;
817 } 853 }
818 854
819 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
820 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
821 { 857 {
822 unsigned int i; 858 unsigned int i;
823 859
824 for (i = 0; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
825 CXINC; 861 CXINC;
… …
834 870
835#if CORO_JIT 871#if CORO_JIT
836 save_perl_slots (slot); 872 save_perl_slots (slot);
837#else 873#else
838 #define VARx(name,expr,type) slot->name = expr; 874 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 875 #include "state.h"
840 #undef VARx
841#endif 876#endif
842 } 877 }
843} 878}
844 879
845/* 880/*
… …
877#endif 912#endif
878 913
879 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
880 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
881 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
882 920
883 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
884 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
885 PL_savestack_max = 24; 923 PL_savestack_max = 24;
886 924
… …
914 } 952 }
915 953
916 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
917 Safefree (PL_markstack); 955 Safefree (PL_markstack);
918 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
919 Safefree (PL_savestack); 960 Safefree (PL_savestack);
920#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
921 Safefree (PL_retstack); 962 Safefree (PL_retstack);
922#endif 963#endif
923} 964}
… …
983 { 1024 {
984 SV **svp = 0; 1025 SV **svp = 0;
985 1026
986 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
987 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
988 1029
989 if (svp) 1030 if (svp)
990 { 1031 {
991 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);
992 return 0; 1042 return 0;
993 } 1043 }
994 } 1044 }
995 1045
996 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1090 PL_hints = 0; 1140 PL_hints = 0;
1091 1141
1092 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
1093 PL_diehook = SvREFCNT_inc (rv_diehook); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
1094 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1095 1145
1096 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
1097 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
1098 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
1099 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);
1100 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
1188 /* restore swapped sv's */ 1238 /* restore swapped sv's */
1189 SWAP_SVS (coro); 1239 SWAP_SVS (coro);
1190 1240
1191 coro_destruct_stacks (aTHX); 1241 coro_destruct_stacks (aTHX);
1192 1242
1193 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1194 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1195 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1196 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1197 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1198 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1218 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1219 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1220 } 1270 }
1221} 1271}
1222 1272
1223ECB_INLINE void 1273ecb_inline void
1224free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1225{ 1275{
1226 if (ecb_expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1227 { 1277 {
1228 SvREFCNT_dec ((SV *)coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
… …
1387 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1388 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1389} 1439}
1390 1440
1391/* 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 */
1392ECB_INLINE void 1442ecb_inline void
1393transfer_tail (pTHX) 1443transfer_tail (pTHX)
1394{ 1444{
1395 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);
1396} 1458}
1397 1459
1398/* 1460/*
1399 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1400 */ 1462 */
… …
1429 */ 1491 */
1430 1492
1431 /* 1493 /*
1432 * 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
1433 * 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)
1434 * 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
1435 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1436 * coroutine as Coro has no such concept.
1437 * This actually isn't valid with the pthread backend, but OSes requiring
1438 * that backend are too broken to do it in a standards-compliant way.
1439 */ 1498 */
1440 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1441 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1442 } 1500 }
1443} 1501}
1444 1502
1445static coro_cctx * 1503static coro_cctx *
1446cctx_new () 1504cctx_new (void)
1447{ 1505{
1448 coro_cctx *cctx; 1506 coro_cctx *cctx;
1449 1507
1450 ++cctx_count; 1508 ++cctx_count;
1451 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1457 return cctx; 1515 return cctx;
1458} 1516}
1459 1517
1460/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1461static coro_cctx * 1519static coro_cctx *
1462cctx_new_empty () 1520cctx_new_empty (void)
1463{ 1521{
1464 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1465 1523
1466 cctx->sptr = 0; 1524 cctx->sptr = 0;
1467 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1469 return cctx; 1527 return cctx;
1470} 1528}
1471 1529
1472/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1473static coro_cctx * 1531static coro_cctx *
1474cctx_new_run () 1532cctx_new_run (void)
1475{ 1533{
1476 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1477 void *stack_start; 1535 void *stack_start;
1478 size_t stack_size; 1536 size_t stack_size;
1479 1537
1538#if CORO_FIBER
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1480#if HAVE_MMAP 1545 #if HAVE_MMAP
1481 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1482 /* mmap supposedly does allocate-on-write for us */ 1547 /* mmap supposedly does allocate-on-write for us */
1483 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1484 1549
1485 if (cctx->sptr != (void *)-1) 1550 if (cctx->sptr != (void *)-1)
1486 { 1551 {
1487 #if CORO_STACKGUARD 1552 #if CORO_STACKGUARD
1488 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1489 #endif 1554 #endif
1490 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE; 1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1491 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1492 cctx->flags |= CC_MAPPED; 1557 cctx->flags |= CC_MAPPED;
1493 } 1558 }
1494 else 1559 else
1495#endif 1560 #endif
1496 { 1561 {
1497 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1498 New (0, cctx->sptr, cctx_stacksize, long); 1563 New (0, cctx->sptr, cctx_stacksize, long);
1499 1564
1500 if (!cctx->sptr) 1565 if (!cctx->sptr)
1501 { 1566 {
1502 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1567 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1503 _exit (EXIT_FAILURE); 1568 _exit (EXIT_FAILURE);
1504 } 1569 }
1505 1570
1506 stack_start = cctx->sptr; 1571 stack_start = cctx->sptr;
1507 stack_size = cctx->ssize; 1572 stack_size = cctx->ssize;
1508 } 1573 }
1574 #endif
1509 1575
1510 #if CORO_USE_VALGRIND 1576 #if CORO_USE_VALGRIND
1511 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size); 1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1512 #endif 1578 #endif
1513 1579
… …
1703 return; 1769 return;
1704 1770
1705 slf_destroy (aTHX_ coro); 1771 slf_destroy (aTHX_ coro);
1706 1772
1707 coro->flags |= CF_ZOMBIE; 1773 coro->flags |= CF_ZOMBIE;
1708 1774
1709 if (coro->flags & CF_READY) 1775 if (coro->flags & CF_READY)
1710 { 1776 {
1711 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1777 /* reduce nready, as destroying a ready coro effectively unreadies it */
1712 /* alternative: look through all ready queues and remove the coro */ 1778 /* alternative: look through all ready queues and remove the coro */
1713 --coro_nready; 1779 --coro_nready;
… …
1790 TRANSFER (ta, 1); 1856 TRANSFER (ta, 1);
1791} 1857}
1792 1858
1793/** Coro ********************************************************************/ 1859/** Coro ********************************************************************/
1794 1860
1795ECB_INLINE void 1861ecb_inline void
1796coro_enq (pTHX_ struct coro *coro) 1862coro_enq (pTHX_ struct coro *coro)
1797{ 1863{
1798 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1864 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1799 1865
1800 SvREFCNT_inc_NN (coro->hv); 1866 SvREFCNT_inc_NN (coro->hv);
… …
1802 coro->next_ready = 0; 1868 coro->next_ready = 0;
1803 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1869 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1804 ready [1] = coro; 1870 ready [1] = coro;
1805} 1871}
1806 1872
1807ECB_INLINE struct coro * 1873ecb_inline struct coro *
1808coro_deq (pTHX) 1874coro_deq (pTHX)
1809{ 1875{
1810 int prio; 1876 int prio;
1811 1877
1812 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1878 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1865{ 1931{
1866 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1932 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1867} 1933}
1868 1934
1869/* expects to own a reference to next->hv */ 1935/* expects to own a reference to next->hv */
1870ECB_INLINE void 1936ecb_inline void
1871prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1937prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1872{ 1938{
1873 SV *prev_sv = SvRV (coro_current); 1939 SV *prev_sv = SvRV (coro_current);
1874 1940
1875 ta->prev = SvSTATE_hv (prev_sv); 1941 ta->prev = SvSTATE_hv (prev_sv);
… …
1934 } 2000 }
1935 } 2001 }
1936 } 2002 }
1937} 2003}
1938 2004
1939ECB_INLINE void 2005ecb_inline void
1940prepare_cede (pTHX_ struct coro_transfer_args *ta) 2006prepare_cede (pTHX_ struct coro_transfer_args *ta)
1941{ 2007{
1942 api_ready (aTHX_ coro_current); 2008 api_ready (aTHX_ coro_current);
1943 prepare_schedule (aTHX_ ta); 2009 prepare_schedule (aTHX_ ta);
1944} 2010}
1945 2011
1946ECB_INLINE void 2012ecb_inline void
1947prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2013prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1948{ 2014{
1949 SV *prev = SvRV (coro_current); 2015 SV *prev = SvRV (coro_current);
1950 2016
1951 if (coro_nready) 2017 if (coro_nready)
… …
2146 2212
2147static void 2213static void
2148coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2214coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2149{ 2215{
2150 AV *av; 2216 AV *av;
2151 2217
2152 if (coro->status) 2218 if (coro->status)
2153 { 2219 {
2154 av = coro->status; 2220 av = coro->status;
2155 av_clear (av); 2221 av_clear (av);
2156 } 2222 }
… …
2203 2269
2204 coro = SvSTATE (arg [0]); 2270 coro = SvSTATE (arg [0]);
2205 coro_hv = coro->hv; 2271 coro_hv = coro->hv;
2206 2272
2207 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2273 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2208 2274
2209 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2275 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2210 { 2276 {
2211 /* coro currently busy cancelling something, so just notify it */ 2277 /* coro currently busy cancelling something, so just notify it */
2212 coro->slf_frame.data = (void *)coro; 2278 coro->slf_frame.data = (void *)coro;
2213 2279
… …
2392 2458
2393static int 2459static int
2394slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2460slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2395{ 2461{
2396 SV *data = (SV *)frame->data; 2462 SV *data = (SV *)frame->data;
2397 2463
2398 if (CORO_THROW) 2464 if (CORO_THROW)
2399 return 0; 2465 return 0;
2400 2466
2401 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2402 return 1; 2468 return 1;
… …
2438 cb = sv_2mortal (coro->rouse_cb); 2504 cb = sv_2mortal (coro->rouse_cb);
2439 coro->rouse_cb = 0; 2505 coro->rouse_cb = 0;
2440 } 2506 }
2441 2507
2442 if (!SvROK (cb) 2508 if (!SvROK (cb)
2443 || SvTYPE (SvRV (cb)) != SVt_PVCV 2509 || SvTYPE (SvRV (cb)) != SVt_PVCV
2444 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2510 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2445 croak ("Coro::rouse_wait called with illegal callback argument,"); 2511 croak ("Coro::rouse_wait called with illegal callback argument,");
2446 2512
2447 { 2513 {
2448 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2514 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2951 { 3017 {
2952 int i; 3018 int i;
2953 /* if we were woken up but can't down, we look through the whole */ 3019 /* if we were woken up but can't down, we look through the whole */
2954 /* waiters list and only add us if we aren't in there already */ 3020 /* waiters list and only add us if we aren't in there already */
2955 /* this avoids some degenerate memory usage cases */ 3021 /* this avoids some degenerate memory usage cases */
2956 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3022 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2957 if (AvARRAY (av)[i] == coro_hv) 3023 if (AvARRAY (av)[i] == coro_hv)
2958 return 1; 3024 return 1;
2959 3025
2960 av_push (av, SvREFCNT_inc (coro_hv)); 3026 av_push (av, SvREFCNT_inc (coro_hv));
2961 return 1; 3027 return 1;
… …
3341#endif 3407#endif
3342 3408
3343#if CORO_JIT 3409#if CORO_JIT
3344 3410
3345static void ecb_noinline ecb_cold 3411static void ecb_noinline ecb_cold
3346pushav_3uv (pTHX_ UV a, UV b, UV c) 3412pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3347{ 3413{
3348 dSP; 3414 dSP;
3349 AV *av = newAV (); 3415 AV *av = newAV ();
3350 3416
3417 av_store (av, 3, newSVuv (d));
3351 av_store (av, 2, newSVuv (c)); 3418 av_store (av, 2, newSVuv (c));
3352 av_store (av, 1, newSVuv (b)); 3419 av_store (av, 1, newSVuv (b));
3353 av_store (av, 0, newSVuv (a)); 3420 av_store (av, 0, newSVuv (a));
3354 3421
3355 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3422 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3362{ 3429{
3363 dSP; 3430 dSP;
3364 SV *load, *save; 3431 SV *load, *save;
3365 char *map_base; 3432 char *map_base;
3366 char *load_ptr, *save_ptr; 3433 char *load_ptr, *save_ptr;
3367 STRLEN load_len, save_len; 3434 STRLEN load_len, save_len, map_len;
3368 int count; 3435 int count;
3369 3436
3370 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3437 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3371 3438
3372 PUSHMARK (SP); 3439 PUSHMARK (SP);
3373#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3440 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3374# include "state.h" 3441 #include "state.h"
3375#undef VARx
3376 count = call_pv ("Coro::State::_jit", G_ARRAY); 3442 count = call_pv ("Coro::State::_jit", G_ARRAY);
3377 SPAGAIN; 3443 SPAGAIN;
3378 3444
3379 save = POPs; save_ptr = SvPVbyte (save, save_len); 3445 save = POPs; save_ptr = SvPVbyte (save, save_len);
3380 load = POPs; load_ptr = SvPVbyte (load, load_len); 3446 load = POPs; load_ptr = SvPVbyte (load, load_len);
3381 3447
3448 map_len = load_len + save_len + 16;
3449
3382 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3450 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3383 3451
3384 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3452 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3385 3453
3386 load_perl_slots = (load_save_perl_slots_type)map_base; 3454 load_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, load_ptr, load_len); 3455 memcpy (map_base, load_ptr, load_len);
3388 3456
3389 map_base += (load_len + 15) & ~15; 3457 map_base += (load_len + 15) & ~15;
3390 3458
3391 save_perl_slots = (load_save_perl_slots_type)map_base; 3459 save_perl_slots = (load_save_perl_slots_type)map_base;
3392 memcpy (map_base, save_ptr, save_len); 3460 memcpy (map_base, save_ptr, save_len);
3461
3462 /* we are good citizens and try to make the page read-only, so the evil evil */
3463 /* hackers might have it a bit more difficult */
3464 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3393 3465
3394 PUTBACK; 3466 PUTBACK;
3395 eval_pv ("undef &Coro::State::_jit", 1); 3467 eval_pv ("undef &Coro::State::_jit", 1);
3396} 3468}
3397 3469
… …
3557void 3629void
3558list () 3630list ()
3559 PROTOTYPE: 3631 PROTOTYPE:
3560 PPCODE: 3632 PPCODE:
3561{ 3633{
3562 struct coro *coro; 3634 struct coro *coro;
3563 for (coro = coro_first; coro; coro = coro->next) 3635 for (coro = coro_first; coro; coro = coro->next)
3564 if (coro->hv) 3636 if (coro->hv)
3565 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3637 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3566} 3638}
3567 3639
… …
3631 RETVAL = boolSV (coro->flags & ix); 3703 RETVAL = boolSV (coro->flags & ix);
3632 OUTPUT: 3704 OUTPUT:
3633 RETVAL 3705 RETVAL
3634 3706
3635void 3707void
3636throw (Coro::State self, SV *exception = &PL_sv_undef) 3708throw (SV *self, SV *exception = &PL_sv_undef)
3637 PROTOTYPE: $;$ 3709 PROTOTYPE: $;$
3638 CODE: 3710 CODE:
3639{ 3711{
3712 struct coro *coro = SvSTATE (self);
3640 struct coro *current = SvSTATE_current; 3713 struct coro *current = SvSTATE_current;
3641 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3714 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3642 SvREFCNT_dec (*exceptionp); 3715 SvREFCNT_dec (*exceptionp);
3643 SvGETMAGIC (exception); 3716 SvGETMAGIC (exception);
3644 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3717 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3718
3719 api_ready (aTHX_ self);
3645} 3720}
3646 3721
3647void 3722void
3648api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3723api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3649 PROTOTYPE: $;$ 3724 PROTOTYPE: $;$
… …
3726 3801
3727void 3802void
3728times (Coro::State self) 3803times (Coro::State self)
3729 PPCODE: 3804 PPCODE:
3730{ 3805{
3731 struct coro *current = SvSTATE (coro_current); 3806 struct coro *current = SvSTATE (coro_current);
3732 3807
3733 if (ecb_expect_false (current == self)) 3808 if (ecb_expect_false (current == self))
3734 { 3809 {
3735 coro_times_update (); 3810 coro_times_update ();
3736 coro_times_add (SvSTATE (coro_current)); 3811 coro_times_add (SvSTATE (coro_current));
… …
3779 3854
3780 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3855 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3781 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3856 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3782 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3857 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3783 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3858 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3784 3859
3785 coro_stash = gv_stashpv ("Coro", TRUE); 3860 coro_stash = gv_stashpv ("Coro", TRUE);
3786 3861
3787 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3862 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3788 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3863 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3789 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3864 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4011 on_leave = 1 4086 on_leave = 1
4012 PROTOTYPE: & 4087 PROTOTYPE: &
4013 CODE: 4088 CODE:
4014{ 4089{
4015 struct coro *coro = SvSTATE_current; 4090 struct coro *coro = SvSTATE_current;
4016 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4091 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4017 4092
4018 block = s_get_cv_croak (block); 4093 block = s_get_cv_croak (block);
4019 4094
4020 if (!*avp) 4095 if (!*avp)
4021 *avp = newAV (); 4096 *avp = newAV ();
… …
4041 4116
4042SV * 4117SV *
4043new (SV *klass, SV *count = 0) 4118new (SV *klass, SV *count = 0)
4044 CODE: 4119 CODE:
4045{ 4120{
4046 int semcnt = 1; 4121 int semcnt = 1;
4047 4122
4048 if (count) 4123 if (count)
4049 { 4124 {
4050 SvGETMAGIC (count); 4125 SvGETMAGIC (count);
4051 4126
… …
4111 XSRETURN_NO; 4186 XSRETURN_NO;
4112} 4187}
4113 4188
4114void 4189void
4115waiters (SV *self) 4190waiters (SV *self)
4116 PPCODE: 4191 PPCODE:
4117{ 4192{
4118 AV *av = (AV *)SvRV (self); 4193 AV *av = (AV *)SvRV (self);
4119 int wcount = AvFILLp (av) + 1 - 1; 4194 int wcount = AvFILLp (av) + 1 - 1;
4120 4195
4121 if (GIMME_V == G_SCALAR) 4196 if (GIMME_V == G_SCALAR)
… …
4130} 4205}
4131 4206
4132MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4207MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4133 4208
4134void 4209void
4135_may_delete (SV *sem, int count, int extra_refs) 4210_may_delete (SV *sem, int count, unsigned int extra_refs)
4136 PPCODE: 4211 PPCODE:
4137{ 4212{
4138 AV *av = (AV *)SvRV (sem); 4213 AV *av = (AV *)SvRV (sem);
4139 4214
4140 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4215 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4141 && AvFILLp (av) == 0 /* no waiters, just count */ 4216 && AvFILLp (av) == 0 /* no waiters, just count */
4142 && SvIV (AvARRAY (av)[0]) == count) 4217 && SvIV (AvARRAY (av)[0]) == count)
4143 XSRETURN_YES; 4218 XSRETURN_YES;
… …
4164 4239
4165void 4240void
4166broadcast (SV *self) 4241broadcast (SV *self)
4167 CODE: 4242 CODE:
4168{ 4243{
4169 AV *av = (AV *)SvRV (self); 4244 AV *av = (AV *)SvRV (self);
4170 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4245 coro_signal_wake (aTHX_ av, AvFILLp (av));
4171} 4246}
4172 4247
4173void 4248void
4174send (SV *self) 4249send (SV *self)
… …
4182 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4257 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4183} 4258}
4184 4259
4185IV 4260IV
4186awaited (SV *self) 4261awaited (SV *self)
4187 CODE: 4262 CODE:
4188 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4263 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4189 OUTPUT: 4264 OUTPUT:
4190 RETVAL 4265 RETVAL
4191 4266
4192 4267
… …
4197 4272
4198void 4273void
4199_schedule (...) 4274_schedule (...)
4200 CODE: 4275 CODE:
4201{ 4276{
4202 static int incede; 4277 static int incede;
4203 4278
4204 api_cede_notself (aTHX); 4279 api_cede_notself (aTHX);
4205 4280
4206 ++incede; 4281 ++incede;
4207 while (coro_nready >= incede && api_cede (aTHX)) 4282 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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