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.460 by root, Fri Jun 17 05:28:22 2016 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
154 140
155static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
156static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
157static SV *rv_diehook; 143static SV *rv_diehook;
158static SV *rv_warnhook; 144static SV *rv_warnhook;
159static HV *hv_sig; /* %SIG */
160 145
161/* async_pool helper stuff */ 146/* async_pool helper stuff */
162static SV *sv_pool_rss; 147static SV *sv_pool_rss;
163static SV *sv_pool_size; 148static SV *sv_pool_size;
164static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
192typedef struct coro_cctx 177typedef struct coro_cctx
193{ 178{
194 struct coro_cctx *next; 179 struct coro_cctx *next;
195 180
196 /* the stack */ 181 /* the stack */
197 void *sptr; 182 struct coro_stack stack;
198 size_t ssize;
199 183
200 /* cpu state */ 184 /* cpu state */
201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG 186#ifndef NDEBUG
203 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
271 SV *saved_deffh; 255 SV *saved_deffh;
272 SV *invoke_cb; 256 SV *invoke_cb;
273 AV *invoke_av; 257 AV *invoke_av;
274 258
275 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
276 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
277 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
278 262
279 /* swap_sv */ 263 /* swap_sv */
280 AV *swap_sv; 264 AV *swap_sv;
281 265
282 /* times */ 266 /* times */
312#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
313 297
314/** JIT *********************************************************************/ 298/** JIT *********************************************************************/
315 299
316#if CORO_JIT 300#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */ 301 /* APPLE doesn't have mmap though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE 303 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY 304 #if ECB_AMD64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix" 305 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY 306 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix" 307 #define CORO_JIT_TYPE "x86-unix"
324 #endif 308 #endif
325 #endif 309 #endif
326#endif 310#endif
327 311
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
329 #undef CORO_JIT 313 #undef CORO_JIT
330#endif 314#endif
331 315
332#if CORO_JIT 316#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *); 317 typedef void (*load_save_perl_slots_type)(perl_slots *);
518 502
519 return 0; 503 return 0;
520} 504}
521 505
522ecb_inline struct coro * 506ecb_inline struct coro *
523SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
524{ 508{
525 MAGIC *mg; 509 MAGIC *mg;
526 510
527 if (SvROK (coro)) 511 if (SvROK (coro_sv))
528 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
529 513
530 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
531 if (!mg) 515 if (!mg)
532 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
533 517
534 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
535} 519}
546ecb_inline PADLIST * 530ecb_inline PADLIST *
547coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
548{ 532{
549 PADLIST *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
550 PADLIST *newpadlist; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
551 PAD *newpad; 536 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1; 537 PADOFFSET off = PadlistMAX (padlist) + 1;
553 538
554 newPADLIST(newpadlist); 539#if NEWPADAPI
555#if !PERL_VERSION_ATLEAST(5,15,3) 540
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
557 AvREAL_off (newpadlist); 542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
558#endif 543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
559#if PERL_VERSION_ATLEAST (5,10,0) 553#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off); 554 Perl_pad_push (aTHX_ padlist, off);
561#else 555#else
562 Perl_pad_push (aTHX_ padlist, off, 1); 556 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif 557#endif
558
564 newpad = PadlistARRAY (padlist)[off]; 559 newpad = PadlistARRAY (padlist)[off];
565 PadlistMAX (padlist) = off - 1; 560 PadlistMAX (padlist) = off - 1;
566 561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
567 AvREAL_off (newpadlist);
568#endif
569
567 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
568 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
570 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
571 578
572 return newpadlist; 579 return newpadlist;
573} 580}
574 581
582 589
583 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
584 { 591 {
585 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
586 PAD *pad = PadlistARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
594
595 if (pad)
596 {
587 I32 j = PadMAX (pad); 597 I32 j = PadMAX (pad);
588 598
589 while (j >= 0) 599 while (j >= 0)
590 SvREFCNT_dec (PadARRAY (pad)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
591 601
592 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
593 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
604 }
594 } 605 }
595 606
596 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
597 608
598#ifdef NEWPADAPI 609#if NEWPADAPI
599 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist); 611 Safefree (padlist);
601#else 612#else
602 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist); 614 AvREAL_off (padlist);
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698 709
699 /* if SvANY points to the head, we need to adjust the pointers, 710 /* 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. 711 * as the pointer for a still points to b, and maybe vice versa.
701 */ 712 */
702 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
703 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
704 719
705 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707 722
708 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
711#endif 726#endif
712} 727}
713 728
714/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
715static void 730static void
716swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
717{ 732{
718 int i; 733 int i;
719 734
720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
722} 737}
723 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
724#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
725 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
726 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
727 755
728static void 756static void
729on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
730 758
731static void 759static void
776 804
777 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
779 } 807 }
780 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
781 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
782} 818}
783 819
784static void 820static void
785save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
786{ 822{
787 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
788 832
789 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
790 { 834 {
791 int i; 835 int i;
792 836
1145 1189
1146 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1147 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1148 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1193 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1150 GvHV (PL_hintgv) = 0; 1194 GvHV (PL_hintgv) = newHV ();
1195#if PERL_VERSION_ATLEAST (5,10,0)
1196 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1197#endif
1151 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1152 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1153 1200
1154 { 1201 {
1155 dSP; 1202 dSP;
1183 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1184 1231
1185 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1186 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1187 1234
1188 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1189 1236
1190 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1191 { 1238 {
1192 coro_times_update (); 1239 coro_times_update ();
1193 coro_times_sub (coro); 1240 coro_times_sub (coro);
1231 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1232 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1233 1280
1234 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1235 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1236 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240 1287
1241 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1242 1289
1243 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1244 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
1265 1312
1266 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1267 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1268 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1269 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
1317 SvREFCNT_dec (coro->on_enter_xs);
1318 SvREFCNT_dec (coro->on_leave_xs);
1270 } 1319 }
1271} 1320}
1272 1321
1273ecb_inline void 1322ecb_inline void
1274free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
1337 1386
1338 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1339 { 1388 {
1340 SV **cb; 1389 SV **cb;
1341 1390
1342 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1343 { 1392 {
1344 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1345 1394
1346 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1347 { 1396 {
1519static coro_cctx * 1568static coro_cctx *
1520cctx_new_empty (void) 1569cctx_new_empty (void)
1521{ 1570{
1522 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1523 1572
1524 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1525 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1526 1575
1527 return cctx; 1576 return cctx;
1528} 1577}
1529 1578
1530/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1531static coro_cctx * 1580static coro_cctx *
1532cctx_new_run (void) 1581cctx_new_run (void)
1533{ 1582{
1534 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1535 void *stack_start;
1536 size_t stack_size;
1537 1584
1538#if CORO_FIBER 1585 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 { 1586 {
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."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1568 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1569 }
1570
1571 stack_start = cctx->sptr;
1572 stack_size = cctx->ssize;
1573 } 1589 }
1574 #endif
1575 1590
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); 1591 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1581 1592
1582 return cctx; 1593 return cctx;
1583} 1594}
1584 1595
1585static void 1596static void
1591 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1592 1603
1593 --cctx_count; 1604 --cctx_count;
1594 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1595 1606
1596 /* coro_transfer creates new, empty cctx's */ 1607 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 1608
1611 Safefree (cctx); 1609 Safefree (cctx);
1612} 1610}
1613 1611
1614/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1633} 1631}
1634 1632
1635static void 1633static void
1636cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1637{ 1635{
1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1636 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1639 1637
1640 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1642 { 1640 {
1643 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1975 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1976 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1977 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1978 { 1976 {
1979 if (SvRV (sv_idle) == SvRV (coro_current)) 1977 if (SvRV (sv_idle) == SvRV (coro_current))
1978 {
1979 require_pv ("Carp");
1980
1981 {
1982 dSP;
1983
1984 ENTER;
1985 SAVETMPS;
1986
1987 PUSHMARK (SP);
1980 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1988 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1989 PUTBACK;
1990 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1991
1992 FREETMPS;
1993 LEAVE;
1994 }
1995 }
1981 1996
1982 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1997 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1983 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1984 --coro_nready; 1999 --coro_nready;
1985 } 2000 }
2183 AV *od = coro->on_destroy; 2198 AV *od = coro->on_destroy;
2184 2199
2185 if (!od) 2200 if (!od)
2186 return; 2201 return;
2187 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
2188 while (AvFILLp (od) >= 0) 2206 while (AvFILLp (od) >= 0)
2189 { 2207 {
2190 SV *cb = sv_2mortal (av_pop (od)); 2208 SV *cb = sv_2mortal (av_pop (od));
2191 2209
2192 /* coro hv's (and only hv's at the moment) are supported as well */ 2210 /* coro hv's (and only hv's at the moment) are supported as well */
2286 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2287 } 2305 }
2288 else 2306 else
2289 { 2307 {
2290 struct coro *self = SvSTATE_current; 2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2291 2312
2292 /* otherwise we cancel directly, purely for speed reasons 2313 /* otherwise we cancel directly, purely for speed reasons
2293 * unfortunately, this requires some magic trickery, as 2314 * unfortunately, this requires some magic trickery, as
2294 * somebody else could cancel us, so we have to fight the cancellation. 2315 * somebody else could cancel us, so we have to fight the cancellation.
2295 * this is ugly, and hopefully fully worth the extra speed. 2316 * this is ugly, and hopefully fully worth the extra speed.
2405 else 2426 else
2406 { 2427 {
2407 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2408 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2429 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2409 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 swap_svs_leave (coro);
2434 SvREFCNT_dec_NN (coro->swap_sv);
2435 coro->swap_sv = 0;
2436 }
2437
2410 coro->prio = 0; 2438 coro->prio = 0;
2411 2439
2412 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2413 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
2414 2442
2415 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
2416 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
2417 } 2445 }
2637 2665
2638/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2666/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2639static void 2667static void
2640slf_destroy (pTHX_ struct coro *coro) 2668slf_destroy (pTHX_ struct coro *coro)
2641{ 2669{
2642 /* this callback is reserved for slf functions needing to do cleanup */ 2670 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 2671
2646 /* 2672 /*
2647 * The on_destroy above most likely is from an SLF call. 2673 * The on_destroy below most likely is from an SLF call.
2648 * Since by definition the SLF call will not finish when we destroy 2674 * Since by definition the SLF call will not finish when we destroy
2649 * the coro, we will have to force-finish it here, otherwise 2675 * the coro, we will have to force-finish it here, otherwise
2650 * cleanup functions cannot call SLF functions. 2676 * cleanup functions cannot call SLF functions.
2651 */ 2677 */
2652 coro->slf_frame.prepare = 0; 2678 coro->slf_frame.prepare = 0;
2679
2680 /* this callback is reserved for slf functions needing to do cleanup */
2681 if (frame.destroy && frame.prepare && !PL_dirty)
2682 frame.destroy (aTHX_ &frame);
2653} 2683}
2654 2684
2655/* 2685/*
2656 * these not obviously related functions are all rolled into one 2686 * these not obviously related functions are all rolled into one
2657 * function to increase chances that they all will call transfer with the same 2687 * function to increase chances that they all will call transfer with the same
2840static void 2870static void
2841coro_pop_on_leave (pTHX_ void *coro) 2871coro_pop_on_leave (pTHX_ void *coro)
2842{ 2872{
2843 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2873 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2844 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2874 on_enterleave_call (aTHX_ sv_2mortal (cb));
2875}
2876
2877static void
2878enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2879{
2880 if (!hook)
2881 return;
2882
2883 if (!*avp)
2884 {
2885 *avp = newAV ();
2886 AvREAL_off (*avp);
2887 }
2888
2889 av_push (*avp, (SV *)hook);
2890 av_push (*avp, (SV *)arg);
2891}
2892
2893static void
2894enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2895{
2896 AV *av = *avp;
2897 int i;
2898
2899 if (!av)
2900 return;
2901
2902 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2903 if (AvARRAY (av)[i] == (SV *)hook)
2904 {
2905 if (execute)
2906 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2907
2908 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2909 av_pop (av);
2910 av_pop (av);
2911 break;
2912 }
2913
2914 if (AvFILLp (av) >= 0)
2915 {
2916 *avp = 0;
2917 SvREFCNT_dec_NN (av);
2918 }
2919}
2920
2921static void
2922api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2923{
2924 struct coro *coro = SvSTATE (coro_sv);
2925
2926 if (SvSTATE_current == coro)
2927 if (enter)
2928 enter (aTHX_ enter_arg);
2929
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2931 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2932}
2933
2934static void
2935api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2936{
2937 struct coro *coro = SvSTATE (coro_sv);
2938
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2940 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2941}
2942
2943static void
2944savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2945{
2946 struct coro *coro = SvSTATE_current;
2947
2948 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2949}
2950
2951static void
2952savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE_current;
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2957}
2958
2959static void
2960api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2961{
2962 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2963
2964 /* this ought to be much cheaper than malloc + a single destructor call */
2965 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2966 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2845} 2967}
2846 2968
2847/*****************************************************************************/ 2969/*****************************************************************************/
2848/* PerlIO::cede */ 2970/* PerlIO::cede */
2849 2971
2979 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3101 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2980 PUTBACK; 3102 PUTBACK;
2981 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3103 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2982 } 3104 }
2983 3105
2984 SvREFCNT_dec (cb); 3106 SvREFCNT_dec_NN (cb);
2985 } 3107 }
2986} 3108}
2987 3109
2988static void 3110static void
2989coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3111coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2997{ 3119{
2998 AV *av = (AV *)frame->data; 3120 AV *av = (AV *)frame->data;
2999 SV *count_sv = AvARRAY (av)[0]; 3121 SV *count_sv = AvARRAY (av)[0];
3000 SV *coro_hv = SvRV (coro_current); 3122 SV *coro_hv = SvRV (coro_current);
3001 3123
3124 frame->destroy = 0;
3125
3002 /* if we are about to throw, don't actually acquire the lock, just throw */ 3126 /* if we are about to throw, don't actually acquire the lock, just throw */
3003 if (CORO_THROW) 3127 if (ecb_expect_false (CORO_THROW))
3128 {
3129 /* we still might be responsible for the semaphore, so wake up others */
3130 coro_semaphore_adjust (aTHX_ av, 0);
3131
3004 return 0; 3132 return 0;
3133 }
3005 else if (SvIVX (count_sv) > 0) 3134 else if (SvIVX (count_sv) > 0)
3006 { 3135 {
3007 frame->destroy = 0;
3008
3009 if (acquire) 3136 if (acquire)
3010 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3137 SvIVX (count_sv) = SvIVX (count_sv) - 1;
3011 else 3138 else
3012 coro_semaphore_adjust (aTHX_ av, 0); 3139 coro_semaphore_adjust (aTHX_ av, 0);
3013 3140
3124 { 3251 {
3125 api_ready (aTHX_ cb); 3252 api_ready (aTHX_ cb);
3126 sv_setiv (cb, 0); /* signal waiter */ 3253 sv_setiv (cb, 0); /* signal waiter */
3127 } 3254 }
3128 3255
3129 SvREFCNT_dec (cb); 3256 SvREFCNT_dec_NN (cb);
3130 3257
3131 --count; 3258 --count;
3132 } 3259 }
3133} 3260}
3134 3261
3219 } 3346 }
3220 3347
3221 av_push (state, data_sv); 3348 av_push (state, data_sv);
3222 3349
3223 api_ready (aTHX_ coro); 3350 api_ready (aTHX_ coro);
3224 SvREFCNT_dec (coro); 3351 SvREFCNT_dec_NN (coro);
3225 SvREFCNT_dec ((AV *)state); 3352 SvREFCNT_dec_NN ((AV *)state);
3226} 3353}
3227 3354
3228static int 3355static int
3229slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3356slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3230{ 3357{
3235 /* it quickly returns */ 3362 /* it quickly returns */
3236 if (CORO_THROW) 3363 if (CORO_THROW)
3237 return 0; 3364 return 0;
3238 3365
3239 /* one element that is an RV? repeat! */ 3366 /* one element that is an RV? repeat! */
3240 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3367 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3241 return 1; 3368 return 1;
3242 3369
3243 /* restore status */ 3370 /* restore status */
3244 { 3371 {
3245 SV *data_sv = av_pop (state); 3372 SV *data_sv = av_pop (state);
3248 errno = data->errorno; 3375 errno = data->errorno;
3249 PL_laststype = data->laststype; 3376 PL_laststype = data->laststype;
3250 PL_laststatval = data->laststatval; 3377 PL_laststatval = data->laststatval;
3251 PL_statcache = data->statcache; 3378 PL_statcache = data->statcache;
3252 3379
3253 SvREFCNT_dec (data_sv); 3380 SvREFCNT_dec_NN (data_sv);
3254 } 3381 }
3255 3382
3256 /* push result values */ 3383 /* push result values */
3257 { 3384 {
3258 dSP; 3385 dSP;
3473 3600
3474PROTOTYPES: DISABLE 3601PROTOTYPES: DISABLE
3475 3602
3476BOOT: 3603BOOT:
3477{ 3604{
3605#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3606#include "state.h"
3478#ifdef USE_ITHREADS 3607#ifdef USE_ITHREADS
3479# if CORO_PTHREAD 3608# if CORO_PTHREAD
3480 coro_thx = PERL_GET_CONTEXT; 3609 coro_thx = PERL_GET_CONTEXT;
3481# endif 3610# endif
3482#endif 3611#endif
3483 BOOT_PAGESIZE;
3484
3485 /* perl defines these to check for existance first, but why it doesn't */ 3612 /* 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 */ 3613 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */ 3614 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */ 3615 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV; 3616 DEFSV;
3496 3623
3497 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3624 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3498 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3625 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3499 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3626 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3500 3627
3501 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3502 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3628 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3503 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3629 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3504 3630
3505 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3631 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3506 3632
3559void 3685void
3560transfer (...) 3686transfer (...)
3561 PROTOTYPE: $$ 3687 PROTOTYPE: $$
3562 CODE: 3688 CODE:
3563 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3689 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3564
3565void
3566_exit (int code)
3567 PROTOTYPE: $
3568 CODE:
3569 _exit (code);
3570 3690
3571SV * 3691SV *
3572clone (Coro::State coro) 3692clone (Coro::State coro)
3573 CODE: 3693 CODE:
3574{ 3694{
3818 if (ecb_expect_false (current == self)) 3938 if (ecb_expect_false (current == self))
3819 coro_times_sub (SvSTATE (coro_current)); 3939 coro_times_sub (SvSTATE (coro_current));
3820} 3940}
3821 3941
3822void 3942void
3823swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3824 CODE: 3944 CODE:
3825{ 3945{
3826 struct coro *current = SvSTATE_current; 3946 struct coro *current = SvSTATE_current;
3947 AV *swap_sv;
3948 int i;
3949
3950 sva = SvRV (sva);
3951 svb = SvRV (svb);
3827 3952
3828 if (current == coro) 3953 if (current == coro)
3829 SWAP_SVS (current); 3954 SWAP_SVS_LEAVE (current);
3830 3955
3831 if (!coro->swap_sv) 3956 if (!coro->swap_sv)
3832 coro->swap_sv = newAV (); 3957 coro->swap_sv = newAV ();
3833 3958
3959 swap_sv = coro->swap_sv;
3960
3961 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3962 {
3963 SV *a = AvARRAY (swap_sv)[i ];
3964 SV *b = AvARRAY (swap_sv)[i + 1];
3965
3966 if (a == sva && b == svb)
3967 {
3968 SvREFCNT_dec_NN (a);
3969 SvREFCNT_dec_NN (b);
3970
3971 for (; i <= AvFILLp (swap_sv) - 2; i++)
3972 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3973
3974 AvFILLp (swap_sv) -= 2;
3975
3976 goto removed;
3977 }
3978 }
3979
3834 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3835 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3836 3984
3837 if (current == coro) 3985 if (current == coro)
3838 SWAP_SVS (current); 3986 SWAP_SVS_ENTER (current);
3839} 3987}
3840 3988
3841 3989
3842MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3843 3991
3844BOOT: 3992BOOT:
3845{ 3993{
3994 if (SVt_LAST > 32)
3995 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3996
3846 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3997 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3847 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3998 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3848 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3999 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3849 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4000 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3850 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3876 coroapi.ready = api_ready; 4027 coroapi.ready = api_ready;
3877 coroapi.is_ready = api_is_ready; 4028 coroapi.is_ready = api_is_ready;
3878 coroapi.nready = coro_nready; 4029 coroapi.nready = coro_nready;
3879 coroapi.current = coro_current; 4030 coroapi.current = coro_current;
3880 4031
4032 coroapi.enterleave_hook = api_enterleave_hook;
4033 coroapi.enterleave_unhook = api_enterleave_unhook;
4034 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4035
3881 /*GCoroAPI = &coroapi;*/ 4036 /*GCoroAPI = &coroapi;*/
3882 sv_setiv (sv, (IV)&coroapi); 4037 sv_setiv (sv, (IV)&coroapi);
3883 SvREADONLY_on (sv); 4038 SvREADONLY_on (sv);
3884 } 4039 }
3885} 4040}
3950 4105
3951void 4106void
3952_set_current (SV *current) 4107_set_current (SV *current)
3953 PROTOTYPE: $ 4108 PROTOTYPE: $
3954 CODE: 4109 CODE:
3955 SvREFCNT_dec (SvRV (coro_current)); 4110 SvREFCNT_dec_NN (SvRV (coro_current));
3956 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4111 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3957 4112
3958void 4113void
3959_set_readyhook (SV *hook) 4114_set_readyhook (SV *hook)
3960 PROTOTYPE: $ 4115 PROTOTYPE: $
4044 4199
4045 if ((SV *)hv == &PL_sv_undef) 4200 if ((SV *)hv == &PL_sv_undef)
4046 { 4201 {
4047 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4202 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4048 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4203 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4049 SvREFCNT_dec (sv); 4204 SvREFCNT_dec_NN (sv);
4050 } 4205 }
4051 4206
4052 { 4207 {
4053 struct coro *coro = SvSTATE_hv (hv); 4208 struct coro *coro = SvSTATE_hv (hv);
4054 4209
4061 api_ready (aTHX_ (SV *)hv); 4216 api_ready (aTHX_ (SV *)hv);
4062 4217
4063 if (GIMME_V != G_VOID) 4218 if (GIMME_V != G_VOID)
4064 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4219 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4065 else 4220 else
4066 SvREFCNT_dec (hv); 4221 SvREFCNT_dec_NN (hv);
4067} 4222}
4068 4223
4069SV * 4224SV *
4070rouse_cb () 4225rouse_cb ()
4071 PROTOTYPE: 4226 PROTOTYPE:
4150 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4151 OUTPUT: 4306 OUTPUT:
4152 RETVAL 4307 RETVAL
4153 4308
4154void 4309void
4155up (SV *self, int adjust = 1) 4310up (SV *self)
4156 ALIAS:
4157 adjust = 1
4158 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
4159 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4160 4318
4161void 4319void
4162down (...) 4320down (...)
4163 CODE: 4321 CODE:
4164 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4322 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4326 { 4484 {
4327 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4485 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4328 coro_old_pp_sselect = 0; 4486 coro_old_pp_sselect = 0;
4329 } 4487 }
4330 4488
4489MODULE = Coro::State PACKAGE = Coro::Util
4490
4491void
4492_exit (int code)
4493 CODE:
4494 _exit (code);
4495
4496NV
4497time ()
4498 CODE:
4499 RETVAL = nvtime (aTHX);
4500 OUTPUT:
4501 RETVAL
4502
4503NV
4504gettimeofday ()
4505 PPCODE:
4506{
4507 UV tv [2];
4508 u2time (aTHX_ tv);
4509 EXTEND (SP, 2);
4510 PUSHs (sv_2mortal (newSVuv (tv [0])));
4511 PUSHs (sv_2mortal (newSVuv (tv [1])));
4512}
4513

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines