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.428 by root, Wed Dec 5 16:34:12 2012 UTC vs.
Revision 1.451 by root, Mon Jun 29 23:49:34 2015 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
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
24#include <assert.h> 25#include <assert.h>
25 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
26#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
28#endif 37#endif
29 38
30#ifdef PadARRAY 39#ifdef PadARRAY
31# define NEWPADAPI 40# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 42#else
34typedef AV PADNAMELIST; 43typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 44# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 45typedef AV PADLIST;
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 52# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
46 67
47#if defined(_WIN32) 68#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
49# undef setjmp 70# undef setjmp
50# undef longjmp 71# undef longjmp
52# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
53#else 74#else
54# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
55#endif 76#endif
56 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
85static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
86 80
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1 82# 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 83#endif
98 84
99/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
100#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
101# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
192typedef struct coro_cctx 178typedef struct coro_cctx
193{ 179{
194 struct coro_cctx *next; 180 struct coro_cctx *next;
195 181
196 /* the stack */ 182 /* the stack */
197 void *sptr; 183 struct coro_stack stack;
198 size_t ssize;
199 184
200 /* cpu state */ 185 /* cpu state */
201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG 187#ifndef NDEBUG
203 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
271 SV *saved_deffh; 256 SV *saved_deffh;
272 SV *invoke_cb; 257 SV *invoke_cb;
273 AV *invoke_av; 258 AV *invoke_av;
274 259
275 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
276 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
277 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
278 263
279 /* swap_sv */ 264 /* swap_sv */
280 AV *swap_sv; 265 AV *swap_sv;
281 266
282 /* times */ 267 /* times */
312#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
313 298
314/** JIT *********************************************************************/ 299/** JIT *********************************************************************/
315 300
316#if CORO_JIT 301#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */ 302 /* APPLE doesn't have mmap though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE 304 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY 305 #if ECB_AMD64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix" 306 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY 307 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix" 308 #define CORO_JIT_TYPE "x86-unix"
324 #endif 309 #endif
325 #endif 310 #endif
326#endif 311#endif
327 312
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
329 #undef CORO_JIT 314 #undef CORO_JIT
330#endif 315#endif
331 316
332#if CORO_JIT 317#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *); 318 typedef void (*load_save_perl_slots_type)(perl_slots *);
518 503
519 return 0; 504 return 0;
520} 505}
521 506
522ecb_inline struct coro * 507ecb_inline struct coro *
523SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
524{ 509{
525 MAGIC *mg; 510 MAGIC *mg;
526 511
527 if (SvROK (coro)) 512 if (SvROK (coro_sv))
528 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
529 514
530 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
531 if (!mg) 516 if (!mg)
532 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
533 518
534 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
535} 520}
546ecb_inline PADLIST * 531ecb_inline PADLIST *
547coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
548{ 533{
549 PADLIST *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
550 PADLIST *newpadlist; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
551 PAD *newpad; 537 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1; 538 PADOFFSET off = PadlistMAX (padlist) + 1;
553 539
554 newPADLIST(newpadlist); 540#if NEWPADAPI
555#if !PERL_VERSION_ATLEAST(5,15,3) 541
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
557 AvREAL_off (newpadlist); 543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
558#endif 544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
559#if PERL_VERSION_ATLEAST (5,10,0) 554#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off); 555 Perl_pad_push (aTHX_ padlist, off);
561#else 556#else
562 Perl_pad_push (aTHX_ padlist, off, 1); 557 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif 558#endif
559
564 newpad = PadlistARRAY (padlist)[off]; 560 newpad = PadlistARRAY (padlist)[off];
565 PadlistMAX (padlist) = off - 1; 561 PadlistMAX (padlist) = off - 1;
566 562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
568 AvREAL_off (newpadlist);
569#endif
570
567 /* Already extended to 2 elements by newPADLIST. */ 571 /* Already extended to 2 elements by newPADLIST. */
568 PadlistMAX (newpadlist) = 1; 572 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
570 PadlistARRAY (newpadlist)[1] = newpad; 578 PadlistARRAY (newpadlist)[1] = newpad;
571 579
572 return newpadlist; 580 return newpadlist;
573} 581}
574 582
582 590
583 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
584 { 592 {
585 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
586 PAD *pad = PadlistARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
595
596 if (pad)
597 {
587 I32 j = PadMAX (pad); 598 I32 j = PadMAX (pad);
588 599
589 while (j >= 0) 600 while (j >= 0)
590 SvREFCNT_dec (PadARRAY (pad)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
591 602
592 PadMAX (pad) = -1; 603 PadMAX (pad) = -1;
593 SvREFCNT_dec (pad); 604 SvREFCNT_dec (pad);
605 }
594 } 606 }
595 607
596 SvREFCNT_dec (PadlistNAMES (padlist)); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
597 609
598#ifdef NEWPADAPI 610#if NEWPADAPI
599 Safefree (PadlistARRAY (padlist)); 611 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist); 612 Safefree (padlist);
601#else 613#else
602 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist); 615 AvREAL_off (padlist);
776 788
777 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
779 } 791 }
780 792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
781 SWAP_SVS (c); 801 SWAP_SVS (c);
782} 802}
783 803
784static void 804static void
785save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
786{ 806{
787 SWAP_SVS (c); 807 SWAP_SVS (c);
808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
788 816
789 if (ecb_expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
790 { 818 {
791 int i; 819 int i;
792 820
1145 1173
1146 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
1147 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
1148 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1150 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
1151 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
1152 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1153 1184
1154 { 1185 {
1155 dSP; 1186 dSP;
1265 1296
1266 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1267 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1268 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1269 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
1301 SvREFCNT_dec (coro->on_enter_xs);
1302 SvREFCNT_dec (coro->on_leave_xs);
1270 } 1303 }
1271} 1304}
1272 1305
1273ecb_inline void 1306ecb_inline void
1274free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1337 1370
1338 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1339 { 1372 {
1340 SV **cb; 1373 SV **cb;
1341 1374
1342 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1343 { 1376 {
1344 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1345 1378
1346 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1347 { 1380 {
1519static coro_cctx * 1552static coro_cctx *
1520cctx_new_empty (void) 1553cctx_new_empty (void)
1521{ 1554{
1522 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1523 1556
1524 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1525 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1526 1559
1527 return cctx; 1560 return cctx;
1528} 1561}
1529 1562
1530/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1531static coro_cctx * 1564static coro_cctx *
1532cctx_new_run (void) 1565cctx_new_run (void)
1533{ 1566{
1534 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1535 void *stack_start;
1536 size_t stack_size;
1537 1568
1538#if CORO_FIBER 1569 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 { 1570 {
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."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1568 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1569 }
1570
1571 stack_start = cctx->sptr;
1572 stack_size = cctx->ssize;
1573 } 1573 }
1574 #endif
1575 1574
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); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1581 1576
1582 return cctx; 1577 return cctx;
1583} 1578}
1584 1579
1585static void 1580static void
1591 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1592 1587
1593 --cctx_count; 1588 --cctx_count;
1594 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1595 1590
1596 /* coro_transfer creates new, empty cctx's */ 1591 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 1592
1611 Safefree (cctx); 1593 Safefree (cctx);
1612} 1594}
1613 1595
1614/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1633} 1615}
1634 1616
1635static void 1617static void
1636cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1637{ 1619{
1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1639 1621
1640 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1642 { 1624 {
1643 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1975 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1976 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1977 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1978 { 1960 {
1979 if (SvRV (sv_idle) == SvRV (coro_current)) 1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1980 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1981 1980
1982 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1983 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1984 --coro_nready; 1983 --coro_nready;
1985 } 1984 }
2183 AV *od = coro->on_destroy; 2182 AV *od = coro->on_destroy;
2184 2183
2185 if (!od) 2184 if (!od)
2186 return; 2185 return;
2187 2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2189
2188 while (AvFILLp (od) >= 0) 2190 while (AvFILLp (od) >= 0)
2189 { 2191 {
2190 SV *cb = sv_2mortal (av_pop (od)); 2192 SV *cb = sv_2mortal (av_pop (od));
2191 2193
2192 /* coro hv's (and only hv's at the moment) are supported as well */ 2194 /* coro hv's (and only hv's at the moment) are supported as well */
2286 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2287 } 2289 }
2288 else 2290 else
2289 { 2291 {
2290 struct coro *self = SvSTATE_current; 2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2291 2296
2292 /* otherwise we cancel directly, purely for speed reasons 2297 /* otherwise we cancel directly, purely for speed reasons
2293 * unfortunately, this requires some magic trickery, as 2298 * unfortunately, this requires some magic trickery, as
2294 * somebody else could cancel us, so we have to fight the cancellation. 2299 * somebody else could cancel us, so we have to fight the cancellation.
2295 * this is ugly, and hopefully fully worth the extra speed. 2300 * this is ugly, and hopefully fully worth the extra speed.
2637 2642
2638/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2639static void 2644static void
2640slf_destroy (pTHX_ struct coro *coro) 2645slf_destroy (pTHX_ struct coro *coro)
2641{ 2646{
2642 /* this callback is reserved for slf functions needing to do cleanup */ 2647 struct CoroSLF frame = coro->slf_frame;
2643 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2644 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2645 2648
2646 /* 2649 /*
2647 * The on_destroy above most likely is from an SLF call. 2650 * The on_destroy below most likely is from an SLF call.
2648 * Since by definition the SLF call will not finish when we destroy 2651 * Since by definition the SLF call will not finish when we destroy
2649 * the coro, we will have to force-finish it here, otherwise 2652 * the coro, we will have to force-finish it here, otherwise
2650 * cleanup functions cannot call SLF functions. 2653 * cleanup functions cannot call SLF functions.
2651 */ 2654 */
2652 coro->slf_frame.prepare = 0; 2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2653} 2660}
2654 2661
2655/* 2662/*
2656 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2657 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
2840static void 2847static void
2841coro_pop_on_leave (pTHX_ void *coro) 2848coro_pop_on_leave (pTHX_ void *coro)
2842{ 2849{
2843 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2844 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2852}
2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook ((void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2845} 2944}
2846 2945
2847/*****************************************************************************/ 2946/*****************************************************************************/
2848/* PerlIO::cede */ 2947/* PerlIO::cede */
2849 2948
2979 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2980 PUTBACK; 3079 PUTBACK;
2981 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2982 } 3081 }
2983 3082
2984 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2985 } 3084 }
2986} 3085}
2987 3086
2988static void 3087static void
2989coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2997{ 3096{
2998 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2999 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
3000 SV *coro_hv = SvRV (coro_current); 3099 SV *coro_hv = SvRV (coro_current);
3001 3100
3101 frame->destroy = 0;
3102
3002 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
3003 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
3004 return 0; 3109 return 0;
3110 }
3005 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
3006 { 3112 {
3007 frame->destroy = 0;
3008
3009 if (acquire) 3113 if (acquire)
3010 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
3011 else 3115 else
3012 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
3013 3117
3124 { 3228 {
3125 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
3126 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3127 } 3231 }
3128 3232
3129 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
3130 3234
3131 --count; 3235 --count;
3132 } 3236 }
3133} 3237}
3134 3238
3219 } 3323 }
3220 3324
3221 av_push (state, data_sv); 3325 av_push (state, data_sv);
3222 3326
3223 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3224 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3225 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3226} 3330}
3227 3331
3228static int 3332static int
3229slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3230{ 3334{
3235 /* it quickly returns */ 3339 /* it quickly returns */
3236 if (CORO_THROW) 3340 if (CORO_THROW)
3237 return 0; 3341 return 0;
3238 3342
3239 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
3240 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3241 return 1; 3345 return 1;
3242 3346
3243 /* restore status */ 3347 /* restore status */
3244 { 3348 {
3245 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
3248 errno = data->errorno; 3352 errno = data->errorno;
3249 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3250 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3251 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3252 3356
3253 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3254 } 3358 }
3255 3359
3256 /* push result values */ 3360 /* push result values */
3257 { 3361 {
3258 dSP; 3362 dSP;
3473 3577
3474PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
3475 3579
3476BOOT: 3580BOOT:
3477{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
3478#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
3479# if CORO_PTHREAD 3585# if CORO_PTHREAD
3480 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
3481# endif 3587# endif
3482#endif 3588#endif
3483 BOOT_PAGESIZE;
3484
3485 /* perl defines these to check for existance first, but why it doesn't */ 3589 /* 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 */ 3590 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */ 3591 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */ 3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV; 3593 DEFSV;
3559void 3663void
3560transfer (...) 3664transfer (...)
3561 PROTOTYPE: $$ 3665 PROTOTYPE: $$
3562 CODE: 3666 CODE:
3563 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3564
3565void
3566_exit (int code)
3567 PROTOTYPE: $
3568 CODE:
3569 _exit (code);
3570 3668
3571SV * 3669SV *
3572clone (Coro::State coro) 3670clone (Coro::State coro)
3573 CODE: 3671 CODE:
3574{ 3672{
3876 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3877 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3878 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3879 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3880 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3881 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3882 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3883 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3884 } 3986 }
3885} 3987}
3950 4052
3951void 4053void
3952_set_current (SV *current) 4054_set_current (SV *current)
3953 PROTOTYPE: $ 4055 PROTOTYPE: $
3954 CODE: 4056 CODE:
3955 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3956 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3957 4059
3958void 4060void
3959_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3960 PROTOTYPE: $ 4062 PROTOTYPE: $
4044 4146
4045 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
4046 { 4148 {
4047 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4048 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4049 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
4050 } 4152 }
4051 4153
4052 { 4154 {
4053 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
4054 4156
4061 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
4062 4164
4063 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
4064 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4065 else 4167 else
4066 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
4067} 4169}
4068 4170
4069SV * 4171SV *
4070rouse_cb () 4172rouse_cb ()
4071 PROTOTYPE: 4173 PROTOTYPE:
4326 { 4428 {
4327 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4328 coro_old_pp_sselect = 0; 4430 coro_old_pp_sselect = 0;
4329 } 4431 }
4330 4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines