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.427 by root, Wed Dec 5 14:35:34 2012 UTC vs.
Revision 1.434 by root, Sat Nov 2 19:48:50 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
… …
26#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif 28#endif
29 29
30#ifdef PadARRAY 30#ifdef PadARRAY
31# define NEWPADAPI 31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 33#else
34typedef AV PADNAMELIST; 34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 36typedef AV PADLIST;
… …
52# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
53#else 53#else
54# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
55#endif 55#endif
56 56
57#if HAVE_MMAP
58# include <unistd.h>
59# include <sys/mman.h>
60# ifndef MAP_ANONYMOUS
61# ifdef MAP_ANON
62# define MAP_ANONYMOUS MAP_ANON
63# else
64# undef HAVE_MMAP
65# endif
66# endif
67# include <limits.h>
68# ifndef PAGESIZE
69# define PAGESIZE pagesize
70# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
71static long pagesize;
72# else
73# define BOOT_PAGESIZE (void)0
74# endif
75#else
76# define PAGESIZE 0
77# define BOOT_PAGESIZE (void)0
78#endif
79
80#if CORO_USE_VALGRIND
81# include <valgrind/valgrind.h>
82#endif
83
84/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
85static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
86 59
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1 61# define HAS_SCOPESTACK_NAME 1
89#endif
90
91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
92# undef CORO_STACKGUARD
93#endif
94
95#ifndef CORO_STACKGUARD
96# define CORO_STACKGUARD 0
97#endif 62#endif
98 63
99/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
100#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
101# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
192typedef struct coro_cctx 157typedef struct coro_cctx
193{ 158{
194 struct coro_cctx *next; 159 struct coro_cctx *next;
195 160
196 /* the stack */ 161 /* the stack */
197 void *sptr; 162 struct coro_stack stack;
198 size_t ssize;
199 163
200 /* cpu state */ 164 /* cpu state */
201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG 166#ifndef NDEBUG
203 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
312#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
313 277
314/** JIT *********************************************************************/ 278/** JIT *********************************************************************/
315 279
316#if CORO_JIT 280#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */ 281 /* APPLE doesn't have mmap though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE 283 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY 284 #if ECB_AMD64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix" 285 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY 286 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix" 287 #define CORO_JIT_TYPE "x86-unix"
324 #endif 288 #endif
325 #endif 289 #endif
326#endif 290#endif
327 291
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
329 #undef CORO_JIT 293 #undef CORO_JIT
330#endif 294#endif
331 295
332#if CORO_JIT 296#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *); 297 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
547coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
548{ 512{
549 PADLIST *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
550 PADLIST *newpadlist; 514 PADLIST *newpadlist;
551 PAD *newpad; 515 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1; 516 PADOFFSET off = PadlistMAX (padlist) + 1;
553 517
554 newPADLIST(newpadlist); 518#if NEWPADAPI
555#if !PERL_VERSION_ATLEAST(5,15,3) 519
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 520 while (!PadlistARRAY (padlist)[off - 1])
557 AvREAL_off (newpadlist); 521 --off;
558#endif 522
523 Perl_pad_push (aTHX_ padlist, off);
524 newpad = PadlistARRAY (padlist)[off];
525 PadlistARRAY (padlist)[off] = 0;
526
527#else
528
559#if PERL_VERSION_ATLEAST (5,10,0) 529#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off); 530 Perl_pad_push (aTHX_ padlist, off);
561#else 531#else
562 Perl_pad_push (aTHX_ padlist, off, 1); 532 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif 533#endif
534
564 newpad = PadlistARRAY (padlist)[off]; 535 newpad = PadlistARRAY (padlist)[off];
565 PadlistMAX (padlist) = off - 1; 536 PadlistMAX (padlist) = off - 1;
537
538#endif
539
540 newPADLIST (newpadlist);
541#if !PERL_VERSION_ATLEAST(5,15,3)
542 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
543 AvREAL_off (newpadlist);
544#endif
566 545
567 /* Already extended to 2 elements by newPADLIST. */ 546 /* Already extended to 2 elements by newPADLIST. */
568 PadlistMAX (newpadlist) = 1; 547 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 548 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad; 549 PadlistARRAY (newpadlist)[1] = newpad;
… …
593 SvREFCNT_dec (pad); 572 SvREFCNT_dec (pad);
594 } 573 }
595 574
596 SvREFCNT_dec (PadlistNAMES (padlist)); 575 SvREFCNT_dec (PadlistNAMES (padlist));
597 576
598#ifdef NEWPADAPI 577#if NEWPADAPI
599 Safefree (PadlistARRAY (padlist)); 578 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist); 579 Safefree (padlist);
601#else 580#else
602 AvFILLp (padlist) = -1; 581 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist); 582 AvREAL_off (padlist);
… …
1519static coro_cctx * 1498static coro_cctx *
1520cctx_new_empty (void) 1499cctx_new_empty (void)
1521{ 1500{
1522 coro_cctx *cctx = cctx_new (); 1501 coro_cctx *cctx = cctx_new ();
1523 1502
1524 cctx->sptr = 0; 1503 cctx->stack.sptr = 0;
1525 coro_create (&cctx->cctx, 0, 0, 0, 0); 1504 coro_create (&cctx->cctx, 0, 0, 0, 0);
1526 1505
1527 return cctx; 1506 return cctx;
1528} 1507}
1529 1508
1530/* create a new cctx suitable as destination/running a perl interpreter */ 1509/* create a new cctx suitable as destination/running a perl interpreter */
1531static coro_cctx * 1510static coro_cctx *
1532cctx_new_run (void) 1511cctx_new_run (void)
1533{ 1512{
1534 coro_cctx *cctx = cctx_new (); 1513 coro_cctx *cctx = cctx_new ();
1535 void *stack_start;
1536 size_t stack_size;
1537 1514
1538#if CORO_FIBER 1515 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1545 #if HAVE_MMAP
1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1547 /* mmap supposedly does allocate-on-write for us */
1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1549
1550 if (cctx->sptr != (void *)-1)
1551 { 1516 {
1552 #if CORO_STACKGUARD
1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1554 #endif
1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1557 cctx->flags |= CC_MAPPED;
1558 }
1559 else
1560 #endif
1561 {
1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1563 New (0, cctx->sptr, cctx_stacksize, long);
1564
1565 if (!cctx->sptr)
1566 {
1567 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1517 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1568 _exit (EXIT_FAILURE); 1518 _exit (EXIT_FAILURE);
1569 }
1570
1571 stack_start = cctx->sptr;
1572 stack_size = cctx->ssize;
1573 } 1519 }
1574 #endif
1575 1520
1576 #if CORO_USE_VALGRIND
1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1578 #endif
1579
1580 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1521 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1581 1522
1582 return cctx; 1523 return cctx;
1583} 1524}
1584 1525
1585static void 1526static void
… …
1591 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1532 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1592 1533
1593 --cctx_count; 1534 --cctx_count;
1594 coro_destroy (&cctx->cctx); 1535 coro_destroy (&cctx->cctx);
1595 1536
1596 /* coro_transfer creates new, empty cctx's */ 1537 coro_stack_free (&cctx->stack);
1597 if (cctx->sptr)
1598 {
1599 #if CORO_USE_VALGRIND
1600 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1601 #endif
1602
1603#if HAVE_MMAP
1604 if (cctx->flags & CC_MAPPED)
1605 munmap (cctx->sptr, cctx->ssize);
1606 else
1607#endif
1608 Safefree (cctx->sptr);
1609 }
1610 1538
1611 Safefree (cctx); 1539 Safefree (cctx);
1612} 1540}
1613 1541
1614/* wether this cctx should be destructed */ 1542/* wether this cctx should be destructed */
… …
1633} 1561}
1634 1562
1635static void 1563static void
1636cctx_put (coro_cctx *cctx) 1564cctx_put (coro_cctx *cctx)
1637{ 1565{
1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1566 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1639 1567
1640 /* free another cctx if overlimit */ 1568 /* free another cctx if overlimit */
1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1569 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1642 { 1570 {
1643 coro_cctx *first = cctx_first; 1571 coro_cctx *first = cctx_first;
… …
2182{ 2110{
2183 AV *od = coro->on_destroy; 2111 AV *od = coro->on_destroy;
2184 2112
2185 if (!od) 2113 if (!od)
2186 return; 2114 return;
2115
2116 coro->on_destroy = 0;
2117 sv_2mortal ((SV *)od);
2187 2118
2188 while (AvFILLp (od) >= 0) 2119 while (AvFILLp (od) >= 0)
2189 { 2120 {
2190 SV *cb = sv_2mortal (av_pop (od)); 2121 SV *cb = sv_2mortal (av_pop (od));
2191 2122
… …
3235 /* it quickly returns */ 3166 /* it quickly returns */
3236 if (CORO_THROW) 3167 if (CORO_THROW)
3237 return 0; 3168 return 0;
3238 3169
3239 /* one element that is an RV? repeat! */ 3170 /* one element that is an RV? repeat! */
3240 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3171 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3241 return 1; 3172 return 1;
3242 3173
3243 /* restore status */ 3174 /* restore status */
3244 { 3175 {
3245 SV *data_sv = av_pop (state); 3176 SV *data_sv = av_pop (state);
… …
3478#ifdef USE_ITHREADS 3409#ifdef USE_ITHREADS
3479# if CORO_PTHREAD 3410# if CORO_PTHREAD
3480 coro_thx = PERL_GET_CONTEXT; 3411 coro_thx = PERL_GET_CONTEXT;
3481# endif 3412# endif
3482#endif 3413#endif
3483 BOOT_PAGESIZE;
3484
3485 /* perl defines these to check for existance first, but why it doesn't */ 3414 /* perl defines these to check for existance first, but why it doesn't */
3486 /* just create them one at init time is not clear to me, except for */ 3415 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */ 3416 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */ 3417 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV; 3418 DEFSV;
… …
3559void 3488void
3560transfer (...) 3489transfer (...)
3561 PROTOTYPE: $$ 3490 PROTOTYPE: $$
3562 CODE: 3491 CODE:
3563 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3492 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3564
3565void
3566_exit (int code)
3567 PROTOTYPE: $
3568 CODE:
3569 _exit (code);
3570 3493
3571SV * 3494SV *
3572clone (Coro::State coro) 3495clone (Coro::State coro)
3573 CODE: 3496 CODE:
3574{ 3497{
… …
4326 { 4249 {
4327 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4250 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4328 coro_old_pp_sselect = 0; 4251 coro_old_pp_sselect = 0;
4329 } 4252 }
4330 4253
4254MODULE = Coro::State PACKAGE = Coro::Util
4255
4256void
4257_exit (int code)
4258 CODE:
4259 _exit (code);
4260
4261NV
4262time ()
4263 CODE:
4264 RETVAL = nvtime (aTHX);
4265 OUTPUT:
4266 RETVAL
4267
4268NV
4269gettimeofday ()
4270 PPCODE:
4271{
4272 UV tv [2];
4273 u2time (aTHX_ tv);
4274 EXTEND (SP, 2);
4275 PUSHs (sv_2mortal (newSVuv (tv [0])));
4276 PUSHs (sv_2mortal (newSVuv (tv [1])));
4277}
4278

Diff Legend

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