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.417 by root, Sun Feb 19 11:14:45 2012 UTC vs.
Revision 1.431 by root, Fri Feb 8 22:29:18 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
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#if HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
67 59
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 61# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
73# undef CORO_STACKGUARD
74#endif
75
76#ifndef CORO_STACKGUARD
77# define CORO_STACKGUARD 0
78#endif 62#endif
79 63
80/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
101# if CORO_PTHREAD 85# if CORO_PTHREAD
102static void *coro_thx; 86static void *coro_thx;
103# endif 87# endif
104#endif 88#endif
105 89
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 90#ifdef __linux
110# include <time.h> /* for timespec */ 91# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 92# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 93# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 94# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
176typedef struct coro_cctx 157typedef struct coro_cctx
177{ 158{
178 struct coro_cctx *next; 159 struct coro_cctx *next;
179 160
180 /* the stack */ 161 /* the stack */
181 void *sptr; 162 struct coro_stack stack;
182 size_t ssize;
183 163
184 /* cpu state */ 164 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG 166#ifndef NDEBUG
187 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
213}; 193};
214 194
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 196typedef struct
217{ 197{
218#define VARx(name,expr,type) type name; 198 #define VARx(name,expr,type) type name;
219# include "state.h" 199 #include "state.h"
220#undef VARx
221} perl_slots; 200} perl_slots;
222 201
223/* how many context stack entries do we need for perl_slots */ 202/* how many context stack entries do we need for perl_slots */
224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
225 204
… …
297#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
298 277
299/** JIT *********************************************************************/ 278/** JIT *********************************************************************/
300 279
301#if CORO_JIT 280#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */ 281 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE 283 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY 284 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix" 285 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY 286 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix" 287 #define CORO_JIT_TYPE "x86-unix"
309 #endif 288 #endif
310 #endif 289 #endif
311#endif 290#endif
312 291
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT 293 #undef CORO_JIT
315#endif 294#endif
316 295
317#if CORO_JIT 296#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *); 297 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
375time_init (pTHX) 354time_init (pTHX)
376{ 355{
377 SV **svp; 356 SV **svp;
378 357
379 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
380 359
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382 361
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385 364
… …
526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
527 506
528/*****************************************************************************/ 507/*****************************************************************************/
529/* padlist management and caching */ 508/* padlist management and caching */
530 509
531ecb_inline AV * 510ecb_inline PADLIST *
532coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
533{ 512{
534 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
535 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
536 517
537 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
538 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
539#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
541#else 525#else
542 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif 527#endif
544 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
545 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
546 530
547 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
548 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
549 535
550 return newpadlist; 536 return newpadlist;
551} 537}
552 538
553ecb_inline void 539ecb_inline void
554free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
555{ 541{
556 /* may be during global destruction */ 542 /* may be during global destruction */
557 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
558 { 544 {
559 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
560 546
561 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
562 { 548 {
563 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
564 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
565 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
566 552
567 while (j >= 0) 553 while (j >= 0)
568 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
569 555
570 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
571 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
572 } 558 }
573 559
574 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
575 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
576 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
577 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
578 } 570 }
579} 571}
580 572
581static int 573static int
582coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
583{ 575{
584 AV *padlist; 576 PADLIST *padlist;
585 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
586 579
587 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
588 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
589 return 0; 582 return 0;
590 583
591 /* casting is fun. */ 584 while (len--)
592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
593 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
594
595 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
596 586
597 return 0; 587 return 0;
598} 588}
599 589
600static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
… …
605/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
606ecb_inline void 596ecb_inline void
607get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
608{ 598{
609 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
610 AV *av; 600 size_t *lenp;
611 601
612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
614 else 604 else
615 { 605 {
616#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
617 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
618 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
628 618
629ecb_inline void 619ecb_inline void
630put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
631{ 621{
632 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
633 AV *av;
634 623
635 if (ecb_expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
637 634
638 av = (AV *)mg->mg_obj; 635 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
639
640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
641 av_extend (av, AvFILLp (av) + 1);
642
643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
644} 636}
645 637
646/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
647 639
648ecb_inline void 640ecb_inline void
… …
710 702
711#if CORO_JIT 703#if CORO_JIT
712 load_perl_slots (slot); 704 load_perl_slots (slot);
713#else 705#else
714 #define VARx(name,expr,type) expr = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
715 # include "state.h" 707 #include "state.h"
716 #undef VARx
717#endif 708#endif
718 709
719 { 710 {
720 dSP; 711 dSP;
721 712
… …
724 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
725 while (ecb_expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
726 { 717 {
727 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
728 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
729 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
730 } 721 }
731 722
732 PUTBACK; 723 PUTBACK;
733 } 724 }
734 725
… …
843 834
844#if CORO_JIT 835#if CORO_JIT
845 save_perl_slots (slot); 836 save_perl_slots (slot);
846#else 837#else
847 #define VARx(name,expr,type) slot->name = expr; 838 #define VARx(name,expr,type) slot->name = expr;
848 # include "state.h" 839 #include "state.h"
849 #undef VARx
850#endif 840#endif
851 } 841 }
852} 842}
853 843
854/* 844/*
… …
998 { 988 {
999 SV **svp = 0; 989 SV **svp = 0;
1000 990
1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1003 993
1004 if (svp) 994 if (svp)
1005 { 995 {
1006 SV *ssv; 996 SV *ssv;
1007 997
1008 if (!*svp) 998 if (!*svp)
… …
1114 PL_hints = 0; 1104 PL_hints = 0;
1115 1105
1116 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1117 PL_diehook = SvREFCNT_inc (rv_diehook); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1118 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1119 1109
1120 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1121 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1122 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1124 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1410 1400
1411 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1412 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1413} 1403}
1414 1404
1405/* the tail of transfer: execute stuff we can only do after a transfer */
1406ecb_inline void
1407transfer_tail (pTHX)
1408{
1409 free_coro_mortal (aTHX);
1410}
1411
1415/* try to exit the same way perl's main function would do */ 1412/* try to exit the same way perl's main function would do */
1416/* we do not bother resetting the environment or other things *7 1413/* we do not bother resetting the environment or other things *7
1417/* that are not, uhm, essential */ 1414/* that are not, uhm, essential */
1418/* this obviously also doesn't work when perl is embedded */ 1415/* this obviously also doesn't work when perl is embedded */
1419static void ecb_noinline ecb_cold 1416static void ecb_noinline ecb_cold
1420perlish_exit (void) 1417perlish_exit (pTHX)
1421{ 1418{
1422 int exitstatus = perl_destruct (PL_curinterp); 1419 int exitstatus = perl_destruct (PL_curinterp);
1423 perl_free (PL_curinterp); 1420 perl_free (PL_curinterp);
1424 exit (exitstatus); 1421 exit (exitstatus);
1425}
1426
1427/* the tail of transfer: execute stuff we can only do after a transfer */
1428ecb_inline void
1429transfer_tail (pTHX)
1430{
1431 free_coro_mortal (aTHX);
1432} 1422}
1433 1423
1434/* 1424/*
1435 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1436 */ 1426 */
… …
1468 * If perl-run returns we assume exit() was being called or the coro 1458 * If perl-run returns we assume exit() was being called or the coro
1469 * fell off the end, which seems to be the only valid (non-bug) 1459 * fell off the end, which seems to be the only valid (non-bug)
1470 * reason for perl_run to return. We try to mimic whatever perl is normally 1460 * reason for perl_run to return. We try to mimic whatever perl is normally
1471 * doing in that case. YMMV. 1461 * doing in that case. YMMV.
1472 */ 1462 */
1473 perlish_exit (); 1463 perlish_exit (aTHX);
1474 } 1464 }
1475} 1465}
1476 1466
1477static coro_cctx * 1467static coro_cctx *
1478cctx_new (void) 1468cctx_new (void)
… …
1493static coro_cctx * 1483static coro_cctx *
1494cctx_new_empty (void) 1484cctx_new_empty (void)
1495{ 1485{
1496 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1497 1487
1498 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1499 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1500 1490
1501 return cctx; 1491 return cctx;
1502} 1492}
1503 1493
1504/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1505static coro_cctx * 1495static coro_cctx *
1506cctx_new_run (void) 1496cctx_new_run (void)
1507{ 1497{
1508 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1509 void *stack_start;
1510 size_t stack_size;
1511 1499
1512#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1513 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1514 /* mmap supposedly does allocate-on-write for us */
1515 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1516
1517 if (cctx->sptr != (void *)-1)
1518 {
1519 #if CORO_STACKGUARD
1520 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1521 #endif
1522 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1523 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1524 cctx->flags |= CC_MAPPED;
1525 } 1501 {
1526 else
1527#endif
1528 {
1529 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1530 New (0, cctx->sptr, cctx_stacksize, long);
1531
1532 if (!cctx->sptr)
1533 {
1534 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1535 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1536 }
1537
1538 stack_start = cctx->sptr;
1539 stack_size = cctx->ssize;
1540 } 1504 }
1541 1505
1542 #if CORO_USE_VALGRIND
1543 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1544 #endif
1545
1546 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1547 1507
1548 return cctx; 1508 return cctx;
1549} 1509}
1550 1510
1551static void 1511static void
… …
1557 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1558 1518
1559 --cctx_count; 1519 --cctx_count;
1560 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1561 1521
1562 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1563 if (cctx->sptr)
1564 {
1565 #if CORO_USE_VALGRIND
1566 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1567 #endif
1568
1569#if HAVE_MMAP
1570 if (cctx->flags & CC_MAPPED)
1571 munmap (cctx->sptr, cctx->ssize);
1572 else
1573#endif
1574 Safefree (cctx->sptr);
1575 }
1576 1523
1577 Safefree (cctx); 1524 Safefree (cctx);
1578} 1525}
1579 1526
1580/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
… …
1599} 1546}
1600 1547
1601static void 1548static void
1602cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1603{ 1550{
1604 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1605 1552
1606 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1607 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1608 { 1555 {
1609 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
… …
1735 return; 1682 return;
1736 1683
1737 slf_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1738 1685
1739 coro->flags |= CF_ZOMBIE; 1686 coro->flags |= CF_ZOMBIE;
1740 1687
1741 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1742 { 1689 {
1743 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1744 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1745 --coro_nready; 1692 --coro_nready;
… …
2178 2125
2179static void 2126static void
2180coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2181{ 2128{
2182 AV *av; 2129 AV *av;
2183 2130
2184 if (coro->status) 2131 if (coro->status)
2185 { 2132 {
2186 av = coro->status; 2133 av = coro->status;
2187 av_clear (av); 2134 av_clear (av);
2188 } 2135 }
… …
2235 2182
2236 coro = SvSTATE (arg [0]); 2183 coro = SvSTATE (arg [0]);
2237 coro_hv = coro->hv; 2184 coro_hv = coro->hv;
2238 2185
2239 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2240 2187
2241 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2242 { 2189 {
2243 /* coro currently busy cancelling something, so just notify it */ 2190 /* coro currently busy cancelling something, so just notify it */
2244 coro->slf_frame.data = (void *)coro; 2191 coro->slf_frame.data = (void *)coro;
2245 2192
… …
2424 2371
2425static int 2372static int
2426slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2427{ 2374{
2428 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2429 2376
2430 if (CORO_THROW) 2377 if (CORO_THROW)
2431 return 0; 2378 return 0;
2432 2379
2433 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2434 return 1; 2381 return 1;
… …
2470 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2471 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2472 } 2419 }
2473 2420
2474 if (!SvROK (cb) 2421 if (!SvROK (cb)
2475 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2476 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2477 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2478 2425
2479 { 2426 {
2480 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3401 int count; 3348 int count;
3402 3349
3403 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3404 3351
3405 PUSHMARK (SP); 3352 PUSHMARK (SP);
3406#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3407# include "state.h" 3354 #include "state.h"
3408#undef VARx
3409 count = call_pv ("Coro::State::_jit", G_ARRAY); 3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3410 SPAGAIN; 3356 SPAGAIN;
3411 3357
3412 save = POPs; save_ptr = SvPVbyte (save, save_len); 3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3413 load = POPs; load_ptr = SvPVbyte (load, load_len); 3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3445#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3446# if CORO_PTHREAD 3392# if CORO_PTHREAD
3447 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3448# endif 3394# endif
3449#endif 3395#endif
3450 BOOT_PAGESIZE;
3451
3452 /* perl defines these to check for existance first, but why it doesn't */ 3396 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */ 3397 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */ 3398 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */ 3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV; 3400 DEFSV;
… …
3526void 3470void
3527transfer (...) 3471transfer (...)
3528 PROTOTYPE: $$ 3472 PROTOTYPE: $$
3529 CODE: 3473 CODE:
3530 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3474 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3531
3532void
3533_exit (int code)
3534 PROTOTYPE: $
3535 CODE:
3536 _exit (code);
3537 3475
3538SV * 3476SV *
3539clone (Coro::State coro) 3477clone (Coro::State coro)
3540 CODE: 3478 CODE:
3541{ 3479{
… …
3596void 3534void
3597list () 3535list ()
3598 PROTOTYPE: 3536 PROTOTYPE:
3599 PPCODE: 3537 PPCODE:
3600{ 3538{
3601 struct coro *coro; 3539 struct coro *coro;
3602 for (coro = coro_first; coro; coro = coro->next) 3540 for (coro = coro_first; coro; coro = coro->next)
3603 if (coro->hv) 3541 if (coro->hv)
3604 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3542 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3605} 3543}
3606 3544
… …
3670 RETVAL = boolSV (coro->flags & ix); 3608 RETVAL = boolSV (coro->flags & ix);
3671 OUTPUT: 3609 OUTPUT:
3672 RETVAL 3610 RETVAL
3673 3611
3674void 3612void
3675throw (Coro::State self, SV *exception = &PL_sv_undef) 3613throw (SV *self, SV *exception = &PL_sv_undef)
3676 PROTOTYPE: $;$ 3614 PROTOTYPE: $;$
3677 CODE: 3615 CODE:
3678{ 3616{
3617 struct coro *coro = SvSTATE (self);
3679 struct coro *current = SvSTATE_current; 3618 struct coro *current = SvSTATE_current;
3680 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3619 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3681 SvREFCNT_dec (*exceptionp); 3620 SvREFCNT_dec (*exceptionp);
3682 SvGETMAGIC (exception); 3621 SvGETMAGIC (exception);
3683 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3622 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3623
3624 api_ready (aTHX_ self);
3684} 3625}
3685 3626
3686void 3627void
3687api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3628api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3688 PROTOTYPE: $;$ 3629 PROTOTYPE: $;$
… …
3765 3706
3766void 3707void
3767times (Coro::State self) 3708times (Coro::State self)
3768 PPCODE: 3709 PPCODE:
3769{ 3710{
3770 struct coro *current = SvSTATE (coro_current); 3711 struct coro *current = SvSTATE (coro_current);
3771 3712
3772 if (ecb_expect_false (current == self)) 3713 if (ecb_expect_false (current == self))
3773 { 3714 {
3774 coro_times_update (); 3715 coro_times_update ();
3775 coro_times_add (SvSTATE (coro_current)); 3716 coro_times_add (SvSTATE (coro_current));
… …
3818 3759
3819 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3760 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3820 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3761 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3821 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3762 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3822 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3763 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3823 3764
3824 coro_stash = gv_stashpv ("Coro", TRUE); 3765 coro_stash = gv_stashpv ("Coro", TRUE);
3825 3766
3826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3767 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3768 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3769 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4050 on_leave = 1 3991 on_leave = 1
4051 PROTOTYPE: & 3992 PROTOTYPE: &
4052 CODE: 3993 CODE:
4053{ 3994{
4054 struct coro *coro = SvSTATE_current; 3995 struct coro *coro = SvSTATE_current;
4055 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3996 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4056 3997
4057 block = s_get_cv_croak (block); 3998 block = s_get_cv_croak (block);
4058 3999
4059 if (!*avp) 4000 if (!*avp)
4060 *avp = newAV (); 4001 *avp = newAV ();
… …
4080 4021
4081SV * 4022SV *
4082new (SV *klass, SV *count = 0) 4023new (SV *klass, SV *count = 0)
4083 CODE: 4024 CODE:
4084{ 4025{
4085 int semcnt = 1; 4026 int semcnt = 1;
4086 4027
4087 if (count) 4028 if (count)
4088 { 4029 {
4089 SvGETMAGIC (count); 4030 SvGETMAGIC (count);
4090 4031
… …
4150 XSRETURN_NO; 4091 XSRETURN_NO;
4151} 4092}
4152 4093
4153void 4094void
4154waiters (SV *self) 4095waiters (SV *self)
4155 PPCODE: 4096 PPCODE:
4156{ 4097{
4157 AV *av = (AV *)SvRV (self); 4098 AV *av = (AV *)SvRV (self);
4158 int wcount = AvFILLp (av) + 1 - 1; 4099 int wcount = AvFILLp (av) + 1 - 1;
4159 4100
4160 if (GIMME_V == G_SCALAR) 4101 if (GIMME_V == G_SCALAR)
… …
4172 4113
4173void 4114void
4174_may_delete (SV *sem, int count, unsigned int extra_refs) 4115_may_delete (SV *sem, int count, unsigned int extra_refs)
4175 PPCODE: 4116 PPCODE:
4176{ 4117{
4177 AV *av = (AV *)SvRV (sem); 4118 AV *av = (AV *)SvRV (sem);
4178 4119
4179 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4120 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4180 && AvFILLp (av) == 0 /* no waiters, just count */ 4121 && AvFILLp (av) == 0 /* no waiters, just count */
4181 && SvIV (AvARRAY (av)[0]) == count) 4122 && SvIV (AvARRAY (av)[0]) == count)
4182 XSRETURN_YES; 4123 XSRETURN_YES;
… …
4203 4144
4204void 4145void
4205broadcast (SV *self) 4146broadcast (SV *self)
4206 CODE: 4147 CODE:
4207{ 4148{
4208 AV *av = (AV *)SvRV (self); 4149 AV *av = (AV *)SvRV (self);
4209 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4150 coro_signal_wake (aTHX_ av, AvFILLp (av));
4210} 4151}
4211 4152
4212void 4153void
4213send (SV *self) 4154send (SV *self)
… …
4221 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4162 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4222} 4163}
4223 4164
4224IV 4165IV
4225awaited (SV *self) 4166awaited (SV *self)
4226 CODE: 4167 CODE:
4227 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4168 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4228 OUTPUT: 4169 OUTPUT:
4229 RETVAL 4170 RETVAL
4230 4171
4231 4172
… …
4236 4177
4237void 4178void
4238_schedule (...) 4179_schedule (...)
4239 CODE: 4180 CODE:
4240{ 4181{
4241 static int incede; 4182 static int incede;
4242 4183
4243 api_cede_notself (aTHX); 4184 api_cede_notself (aTHX);
4244 4185
4245 ++incede; 4186 ++incede;
4246 while (coro_nready >= incede && api_cede (aTHX)) 4187 while (coro_nready >= incede && api_cede (aTHX))
… …
4290 { 4231 {
4291 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4232 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4292 coro_old_pp_sselect = 0; 4233 coro_old_pp_sselect = 0;
4293 } 4234 }
4294 4235
4236MODULE = Coro::State PACKAGE = Coro::Util
4237
4238void
4239_exit (int code)
4240 CODE:
4241 _exit (code);
4242
4243NV
4244time ()
4245 CODE:
4246 RETVAL = nvtime (aTHX);
4247 OUTPUT:
4248 RETVAL
4249
4250NV
4251gettimeofday ()
4252 PPCODE:
4253{
4254 UV tv [2];
4255 u2time (aTHX_ tv);
4256 EXTEND (SP, 2);
4257 PUSHs (sv_2mortal (newSVuv (tv [0])));
4258 PUSHs (sv_2mortal (newSVuv (tv [1])));
4259}
4260

Diff Legend

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