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.246 by root, Wed Sep 24 21:20:05 2008 UTC vs.
Revision 1.271 by root, Fri Nov 14 07:35:32 2008 UTC

46# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
47#endif 47#endif
48 48
49#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
51# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
52#else
53# define REGISTER_STACK(cctx,start,end)
54#endif 51#endif
55 52
56/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
57#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
58 55
59#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
60 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
61 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
62 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
81# ifndef IS_PADCONST 78# ifndef IS_PADCONST
82# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
83# endif 80# endif
84#endif 81#endif
85 82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
86/* 5.8.8 */ 93/* 5.8.8 */
87#ifndef GV_NOTQUAL 94#ifndef GV_NOTQUAL
88# define GV_NOTQUAL 0 95# define GV_NOTQUAL 0
89#endif 96#endif
90#ifndef newSV 97#ifndef newSV
91# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
92#endif 99#endif
93 100
94/* 5.11 */
95#ifndef CxHASARGS
96# define CxHASARGS(cx) (cx)->blk_sub.hasargs
97#endif
98
99/* 5.8.7 */ 101/* 5.8.7 */
100#ifndef SvRV_set 102#ifndef SvRV_set
101# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
102#endif 104#endif
103 105
114# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
115#endif 117#endif
116 118
117/* The next macros try to return the current stack pointer, in an as 119/* The next macros try to return the current stack pointer, in an as
118 * portable way as possible. */ 120 * portable way as possible. */
119#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
120#define STACKLEVEL ((void *)&stacklevel) 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
121 126
122#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
123 128
124#if __GNUC__ >= 3 129#if __GNUC__ >= 3
125# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
126# define BARRIER __asm__ __volatile__ ("" : : : "memory")
127# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
128#else 133#else
129# define attribute(x) 134# define attribute(x)
130# define BARRIER
131# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
132#endif 137#endif
133 138
134#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
135#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
136 141
137#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
138 143
139#include "CoroAPI.h" 144#include "CoroAPI.h"
140 145
141#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
142static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
143# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
144# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
145#else 155#else
156
146# define LOCK (void)0 157# define LOCK (void)0
147# define UNLOCK (void)0 158# define UNLOCK (void)0
159
148#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
149 166
150/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
151struct io_state 168struct io_state
152{ 169{
170 AV *res;
153 int errorno; 171 int errorno;
154 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
155 int laststatval; 173 int laststatval;
156 Stat_t statcache; 174 Stat_t statcache;
157}; 175};
158 176
159static double (*nvtime)(); /* so why doesn't it take void? */ 177static double (*nvtime)(); /* so why doesn't it take void? */
160 178
179static U32 cctx_gen;
161static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
162static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
163static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
164static JMPENV *main_top_env; 183static JMPENV *main_top_env;
165static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
166static volatile SV *coro_mortal; /* will be freed after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next;
187
188struct transfer_args
189{
190 struct coro *prev, *next;
191};
167 192
168static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
169static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
170static SV *rv_diehook; 195static SV *rv_diehook;
171static SV *rv_warnhook; 196static SV *rv_warnhook;
203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 228 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 229 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
205 JMPENV *top_env; 230 JMPENV *top_env;
206 coro_context cctx; 231 coro_context cctx;
207 232
233 U32 gen;
208#if CORO_USE_VALGRIND 234#if CORO_USE_VALGRIND
209 int valgrind_id; 235 int valgrind_id;
210#endif 236#endif
211 unsigned char flags; 237 unsigned char flags;
212} coro_cctx; 238} coro_cctx;
272#define PRIO_MIN -4 298#define PRIO_MIN -4
273 299
274/* for Coro.pm */ 300/* for Coro.pm */
275static SV *coro_current; 301static SV *coro_current;
276static SV *coro_readyhook; 302static SV *coro_readyhook;
277static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
278static int coro_nready;
279static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
280 306
281/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
282 308
283static SV * 309static SV *
284coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
324 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
325#endif 351#endif
326 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
327 --AvFILLp (padlist); 353 --AvFILLp (padlist);
328 354
329 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
330 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
331 357
332 return newpadlist; 358 return newpadlist;
333} 359}
334 360
377static MGVTBL coro_cv_vtbl = { 403static MGVTBL coro_cv_vtbl = {
378 0, 0, 0, 0, 404 0, 0, 0, 0,
379 coro_cv_free 405 coro_cv_free
380}; 406};
381 407
382#define CORO_MAGIC(sv,type) \ 408#define CORO_MAGIC(sv, type) \
383 SvMAGIC (sv) \ 409 SvMAGIC (sv) \
384 ? SvMAGIC (sv)->mg_type == type \ 410 ? SvMAGIC (sv)->mg_type == type \
385 ? SvMAGIC (sv) \ 411 ? SvMAGIC (sv) \
386 : mg_find (sv, type) \ 412 : mg_find (sv, type) \
387 : 0 413 : 0
388 414
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
391 417
392static struct coro * 418INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
394{ 420{
395 HV *stash; 421 HV *stash;
396 MAGIC *mg; 422 MAGIC *mg;
397 423
622 648
623/* 649/*
624 * destroy the stacks, the callchain etc... 650 * destroy the stacks, the callchain etc...
625 */ 651 */
626static void 652static void
627coro_destroy_stacks (pTHX) 653coro_destruct_stacks (pTHX)
628{ 654{
629 while (PL_curstackinfo->si_next) 655 while (PL_curstackinfo->si_next)
630 PL_curstackinfo = PL_curstackinfo->si_next; 656 PL_curstackinfo = PL_curstackinfo->si_next;
631 657
632 while (PL_curstackinfo) 658 while (PL_curstackinfo)
686#endif 712#endif
687 } 713 }
688 } 714 }
689 715
690 return rss; 716 return rss;
717}
718
719/** set stacklevel support **************************************************/
720
721/* we sometimes need to create the effect of pp_slf calling us */
722#define SLF_HEAD (void)0
723/* we sometimes need to create the effect of leaving via pp_slf */
724#define SLF_TAIL slf_tail (aTHX)
725
726INLINE void
727slf_tail (pTHX)
728{
729 dSP;
730 SV **bot = SP;
731
732 int gimme = GIMME_V;
733
734 /* make sure we put something on the stack in scalar context */
735 if (gimme == G_SCALAR)
736 {
737 if (sp == bot)
738 XPUSHs (&PL_sv_undef);
739
740 SP = bot + 1;
741 }
742
743 PUTBACK;
691} 744}
692 745
693/** coroutine stack handling ************************************************/ 746/** coroutine stack handling ************************************************/
694 747
695static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 748static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
810 GvSV (PL_defgv) = newSV (0); 863 GvSV (PL_defgv) = newSV (0);
811 GvAV (PL_defgv) = coro->args; coro->args = 0; 864 GvAV (PL_defgv) = coro->args; coro->args = 0;
812 GvSV (PL_errgv) = newSV (0); 865 GvSV (PL_errgv) = newSV (0);
813 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
814 PL_rs = newSVsv (GvSV (irsgv)); 867 PL_rs = newSVsv (GvSV (irsgv));
815 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
816 869
817 { 870 {
818 dSP; 871 dSP;
819 LOGOP myop; 872 UNOP myop;
820 873
821 Zero (&myop, 1, LOGOP); 874 Zero (&myop, 1, UNOP);
822 myop.op_next = Nullop; 875 myop.op_next = Nullop;
823 myop.op_flags = OPf_WANT_VOID; 876 myop.op_flags = OPf_WANT_VOID;
824 877
825 PUSHMARK (SP); 878 PUSHMARK (SP);
826 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
829 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
830 SPAGAIN; 883 SPAGAIN;
831 } 884 }
832 885
833 /* this newly created coroutine might be run on an existing cctx which most 886 /* this newly created coroutine might be run on an existing cctx which most
834 * likely was suspended in set_stacklevel, called from entersub. 887 * likely was suspended in set_stacklevel, called from pp_set_stacklevel,
835 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 888 * so we have to emulate entering pp_set_stacklevel here.
836 * so we ENTER here for symmetry
837 */ 889 */
838 ENTER; 890 SLF_HEAD;
839} 891}
840 892
841static void 893static void
842coro_destroy (pTHX_ struct coro *coro) 894coro_destruct (pTHX_ struct coro *coro)
843{ 895{
844 if (!IN_DESTRUCT) 896 if (!IN_DESTRUCT)
845 { 897 {
846 /* restore all saved variables and stuff */ 898 /* restore all saved variables and stuff */
847 LEAVE_SCOPE (0); 899 LEAVE_SCOPE (0);
869 SvREFCNT_dec (PL_warnhook); 921 SvREFCNT_dec (PL_warnhook);
870 922
871 SvREFCNT_dec (coro->saved_deffh); 923 SvREFCNT_dec (coro->saved_deffh);
872 SvREFCNT_dec (coro->throw); 924 SvREFCNT_dec (coro->throw);
873 925
874 coro_destroy_stacks (aTHX); 926 coro_destruct_stacks (aTHX);
875} 927}
876 928
877static void 929INLINE void
878free_coro_mortal (pTHX) 930free_coro_mortal (pTHX)
879{ 931{
880 if (expect_true (coro_mortal)) 932 if (expect_true (coro_mortal))
881 { 933 {
882 SvREFCNT_dec (coro_mortal); 934 SvREFCNT_dec (coro_mortal);
916 : cx->blk_gimme == G_SCALAR ? bot + 1 968 : cx->blk_gimme == G_SCALAR ? bot + 1
917 : bot; 969 : bot;
918 970
919 av_extend (av, top - bot); 971 av_extend (av, top - bot);
920 while (bot < top) 972 while (bot < top)
921 av_push (av, SvREFCNT_inc (*bot++)); 973 av_push (av, SvREFCNT_inc_NN (*bot++));
922 974
923 PL_runops = RUNOPS_DEFAULT; 975 PL_runops = RUNOPS_DEFAULT;
924 ENTER; 976 ENTER;
925 SAVETMPS; 977 SAVETMPS;
926 EXTEND (SP, 3); 978 EXTEND (SP, 3);
1006 1058
1007 TAINT_NOT; 1059 TAINT_NOT;
1008 return 0; 1060 return 0;
1009} 1061}
1010 1062
1063static void
1064prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx)
1065{
1066 ta->prev = (struct coro *)cctx;
1067 ta->next = 0;
1068}
1069
1011/* inject a fake call to Coro::State::_cctx_init into the execution */ 1070/* inject a fake call to Coro::State::_cctx_init into the execution */
1012/* _cctx_init should be careful, as it could be called at almost any time */ 1071/* _cctx_init should be careful, as it could be called at almost any time */
1013/* during execution of a perl program */ 1072/* during execution of a perl program */
1073/* also initialises PL_top_env */
1014static void NOINLINE 1074static void NOINLINE
1015cctx_prepare (pTHX_ coro_cctx *cctx) 1075cctx_prepare (pTHX_ coro_cctx *cctx)
1016{ 1076{
1017 dSP; 1077 dSP;
1018 LOGOP myop; 1078 UNOP myop;
1019 1079
1020 PL_top_env = &PL_start_env; 1080 PL_top_env = &PL_start_env;
1021 1081
1022 if (cctx->flags & CC_TRACE) 1082 if (cctx->flags & CC_TRACE)
1023 PL_runops = runops_trace; 1083 PL_runops = runops_trace;
1024 1084
1025 Zero (&myop, 1, LOGOP); 1085 Zero (&myop, 1, UNOP);
1026 myop.op_next = PL_op; 1086 myop.op_next = PL_op;
1027 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1087 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1028 1088
1029 PUSHMARK (SP); 1089 PUSHMARK (SP);
1030 EXTEND (SP, 2); 1090 EXTEND (SP, 2);
1031 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1091 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1032 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1092 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1033 PUTBACK; 1093 PUTBACK;
1034 PL_op = (OP *)&myop; 1094 PL_op = (OP *)&myop;
1035 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1095 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1036 SPAGAIN; 1096 SPAGAIN;
1037} 1097}
1038 1098
1099/* the tail of transfer: execute stuff we can only do after a transfer */
1100INLINE void
1101transfer_tail (pTHX)
1102{
1103 struct coro *next = (struct coro *)transfer_next;
1104 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1105 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1106
1107 free_coro_mortal (aTHX);
1108 UNLOCK;
1109
1110 if (expect_false (next->throw))
1111 {
1112 SV *exception = sv_2mortal (next->throw);
1113
1114 next->throw = 0;
1115 sv_setsv (ERRSV, exception);
1116 croak (0);
1117 }
1118}
1119
1039/* 1120/*
1040 * this is a _very_ stripped down perl interpreter ;) 1121 * this is a _very_ stripped down perl interpreter ;)
1041 */ 1122 */
1042static void 1123static void
1043cctx_run (void *arg) 1124cctx_run (void *arg)
1044{ 1125{
1126#ifdef USE_ITHREADS
1127# if CORO_PTHREAD
1128 PERL_SET_CONTEXT (coro_thx);
1129# endif
1130#endif
1131 {
1045 dTHX; 1132 dTHX;
1046 1133
1047 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1134 /* we are the alternative tail to pp_set_stacklevel */
1048 UNLOCK; 1135 /* so do the same things here */
1136 SLF_TAIL;
1049 1137
1050 /* we now skip the entersub that lead to transfer() */ 1138 /* we now skip the op that did lead to transfer() */
1051 PL_op = PL_op->op_next; 1139 PL_op = PL_op->op_next;
1052 1140
1053 /* inject a fake subroutine call to cctx_init */ 1141 /* inject a fake subroutine call to cctx_init */
1054 cctx_prepare (aTHX_ (coro_cctx *)arg); 1142 cctx_prepare (aTHX_ (coro_cctx *)arg);
1055 1143
1144 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX);
1146
1056 /* somebody or something will hit me for both perl_run and PL_restartop */ 1147 /* somebody or something will hit me for both perl_run and PL_restartop */
1057 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1058 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1059 1150
1060 /* 1151 /*
1061 * If perl-run returns we assume exit() was being called or the coro 1152 * If perl-run returns we assume exit() was being called or the coro
1062 * fell off the end, which seems to be the only valid (non-bug) 1153 * fell off the end, which seems to be the only valid (non-bug)
1063 * reason for perl_run to return. We try to exit by jumping to the 1154 * reason for perl_run to return. We try to exit by jumping to the
1064 * bootstrap-time "top" top_env, as we cannot restore the "main" 1155 * bootstrap-time "top" top_env, as we cannot restore the "main"
1065 * coroutine as Coro has no such concept 1156 * coroutine as Coro has no such concept
1066 */ 1157 */
1067 PL_top_env = main_top_env; 1158 PL_top_env = main_top_env;
1068 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1159 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1160 }
1069} 1161}
1070 1162
1071static coro_cctx * 1163static coro_cctx *
1072cctx_new () 1164cctx_new ()
1073{ 1165{
1074 coro_cctx *cctx; 1166 coro_cctx *cctx;
1167
1168 ++cctx_count;
1169 New (0, cctx, 1, coro_cctx);
1170
1171 cctx->gen = cctx_gen;
1172 cctx->flags = 0;
1173 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx only suitable as source */
1179static coro_cctx *
1180cctx_new_empty ()
1181{
1182 coro_cctx *cctx = cctx_new ();
1183
1184 cctx->sptr = 0;
1185 coro_create (&cctx->cctx, 0, 0, 0, 0);
1186
1187 return cctx;
1188}
1189
1190/* create a new cctx suitable as destination/running a perl interpreter */
1191static coro_cctx *
1192cctx_new_run ()
1193{
1194 coro_cctx *cctx = cctx_new ();
1075 void *stack_start; 1195 void *stack_start;
1076 size_t stack_size; 1196 size_t stack_size;
1077 1197
1078 ++cctx_count;
1079
1080 Newz (0, cctx, 1, coro_cctx);
1081
1082#if HAVE_MMAP 1198#if HAVE_MMAP
1083 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1199 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1084 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1085 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1201 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1086 1202
1087 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1088 { 1204 {
1089# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1090 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1091# endif 1207 #endif
1092 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1093 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1094 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1095 } 1211 }
1096 else 1212 else
1097#endif 1213#endif
1098 { 1214 {
1099 cctx->ssize = coro_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1100 New (0, cctx->sptr, coro_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1101 1217
1102 if (!cctx->sptr) 1218 if (!cctx->sptr)
1103 { 1219 {
1104 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1105 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1106 } 1222 }
1107 1223
1108 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1109 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1110 } 1226 }
1111 1227
1112 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1228 #if CORO_USE_VALGRIND
1229 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1230 #endif
1231
1113 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1232 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1114 1233
1115 return cctx; 1234 return cctx;
1116} 1235}
1117 1236
1120{ 1239{
1121 if (!cctx) 1240 if (!cctx)
1122 return; 1241 return;
1123 1242
1124 --cctx_count; 1243 --cctx_count;
1244 coro_destroy (&cctx->cctx);
1125 1245
1246 /* coro_transfer creates new, empty cctx's */
1247 if (cctx->sptr)
1248 {
1126#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1127 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1128#endif 1251 #endif
1129 1252
1130#if HAVE_MMAP 1253#if HAVE_MMAP
1131 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1132 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1133 else 1256 else
1134#endif 1257#endif
1135 Safefree (cctx->sptr); 1258 Safefree (cctx->sptr);
1259 }
1136 1260
1137 Safefree (cctx); 1261 Safefree (cctx);
1138} 1262}
1139 1263
1140/* wether this cctx should be destructed */ 1264/* wether this cctx should be destructed */
1141#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1265#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1142 1266
1143static coro_cctx * 1267static coro_cctx *
1144cctx_get (pTHX) 1268cctx_get (pTHX)
1145{ 1269{
1146 while (expect_true (cctx_first)) 1270 while (expect_true (cctx_first))
1153 return cctx; 1277 return cctx;
1154 1278
1155 cctx_destroy (cctx); 1279 cctx_destroy (cctx);
1156 } 1280 }
1157 1281
1158 return cctx_new (); 1282 return cctx_new_run ();
1159} 1283}
1160 1284
1161static void 1285static void
1162cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1163{ 1287{
1288 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1289
1164 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1165 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1166 { 1292 {
1167 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
1168 cctx_first = first->next; 1294 cctx_first = first->next;
1169 --cctx_idle; 1295 --cctx_idle;
1170 1296
1202/* always use the TRANSFER macro */ 1328/* always use the TRANSFER macro */
1203static void NOINLINE 1329static void NOINLINE
1204transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1330transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1205{ 1331{
1206 dSTACKLEVEL; 1332 dSTACKLEVEL;
1207 static volatile int has_throw;
1208 1333
1209 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1210 if (expect_false (!next)) 1335 if (expect_false (!next))
1211 { 1336 {
1212 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1213 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1338 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1214 } 1339 }
1215 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1216 { 1341 {
1217 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1218 1343
1219 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1220 { 1345 {
1221 /* create a new empty context */ 1346 /* create a new empty/source context */
1222 Newz (0, prev->cctx, 1, coro_cctx); 1347 prev->cctx = cctx_new_empty ();
1223 prev->flags &= ~CF_NEW; 1348 prev->flags &= ~CF_NEW;
1224 prev->flags |= CF_RUNNING; 1349 prev->flags |= CF_RUNNING;
1225 } 1350 }
1226 1351
1227 prev->flags &= ~CF_RUNNING; 1352 prev->flags &= ~CF_RUNNING;
1242 else 1367 else
1243 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1244 1369
1245 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1246 1371
1247 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1248 if (expect_true ( 1373 if (expect_true (
1249 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1250 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1251 && !force_cctx 1376 && !force_cctx
1252 )) 1377 ))
1253 { 1378 {
1254 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1379 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1255 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1380 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1256 1381
1257 prev->cctx = 0; 1382 prev->cctx = 0;
1258 1383
1259 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1384 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1260 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1385 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1268 ++next->usecount; 1393 ++next->usecount;
1269 1394
1270 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1271 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1272 1397
1273 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1274 1400
1275 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1276 { 1402 {
1277 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1278 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1279 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1280 } 1406 }
1281 1407
1282 free_coro_mortal (aTHX); 1408 transfer_tail (aTHX);
1283 UNLOCK;
1284
1285 if (expect_false (has_throw))
1286 {
1287 struct coro *coro = SvSTATE (coro_current);
1288
1289 if (coro->throw)
1290 {
1291 SV *exception = coro->throw;
1292 coro->throw = 0;
1293 sv_setsv (ERRSV, exception);
1294 croak (0);
1295 }
1296 }
1297 } 1409 }
1298} 1410}
1299
1300struct transfer_args
1301{
1302 struct coro *prev, *next;
1303};
1304 1411
1305#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1412#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1306#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1307 1414
1308/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
1334 croak ("FATAL: tried to destroy currently running coroutine"); 1441 croak ("FATAL: tried to destroy currently running coroutine");
1335 1442
1336 save_perl (aTHX_ &temp); 1443 save_perl (aTHX_ &temp);
1337 load_perl (aTHX_ coro); 1444 load_perl (aTHX_ coro);
1338 1445
1339 coro_destroy (aTHX_ coro); 1446 coro_destruct (aTHX_ coro);
1340 1447
1341 load_perl (aTHX_ &temp); 1448 load_perl (aTHX_ &temp);
1342 1449
1343 coro->slot = 0; 1450 coro->slot = 0;
1344 } 1451 }
1398 ta->next = SvSTATE (next_sv); 1505 ta->next = SvSTATE (next_sv);
1399 TRANSFER_CHECK (*ta); 1506 TRANSFER_CHECK (*ta);
1400} 1507}
1401 1508
1402static void 1509static void
1403api_transfer (SV *prev_sv, SV *next_sv) 1510api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1404{ 1511{
1405 dTHX;
1406 struct transfer_args ta; 1512 struct transfer_args ta;
1407 1513
1408 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1514 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1409 TRANSFER (ta, 1); 1515 TRANSFER (ta, 1);
1410} 1516}
1428 1534
1429 return 0; 1535 return 0;
1430} 1536}
1431 1537
1432static int 1538static int
1433api_ready (SV *coro_sv) 1539api_ready (pTHX_ SV *coro_sv)
1434{ 1540{
1435 dTHX;
1436 struct coro *coro; 1541 struct coro *coro;
1437 SV *sv_hook; 1542 SV *sv_hook;
1438 void (*xs_hook)(void); 1543 void (*xs_hook)(void);
1439 1544
1440 if (SvROK (coro_sv)) 1545 if (SvROK (coro_sv))
1450 LOCK; 1555 LOCK;
1451 1556
1452 sv_hook = coro_nready ? 0 : coro_readyhook; 1557 sv_hook = coro_nready ? 0 : coro_readyhook;
1453 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1558 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1454 1559
1455 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1560 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1456 ++coro_nready; 1561 ++coro_nready;
1457 1562
1458 UNLOCK; 1563 UNLOCK;
1459 1564
1460 if (sv_hook) 1565 if (sv_hook)
1478 1583
1479 return 1; 1584 return 1;
1480} 1585}
1481 1586
1482static int 1587static int
1483api_is_ready (SV *coro_sv) 1588api_is_ready (pTHX_ SV *coro_sv)
1484{ 1589{
1485 dTHX;
1486 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1590 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1487} 1591}
1488 1592
1489static void 1593INLINE void
1490prepare_schedule (pTHX_ struct transfer_args *ta) 1594prepare_schedule (pTHX_ struct transfer_args *ta)
1491{ 1595{
1492 SV *prev_sv, *next_sv; 1596 SV *prev_sv, *next_sv;
1493 1597
1494 for (;;) 1598 for (;;)
1520 /* cannot transfer to destroyed coros, skip and look for next */ 1624 /* cannot transfer to destroyed coros, skip and look for next */
1521 if (expect_false (ta->next->flags & CF_DESTROYED)) 1625 if (expect_false (ta->next->flags & CF_DESTROYED))
1522 { 1626 {
1523 UNLOCK; 1627 UNLOCK;
1524 SvREFCNT_dec (next_sv); 1628 SvREFCNT_dec (next_sv);
1525 /* coro_nready is already taken care of by destroy */ 1629 /* coro_nready has already been taken care of by destroy */
1526 continue; 1630 continue;
1527 } 1631 }
1528 1632
1529 --coro_nready; 1633 --coro_nready;
1530 UNLOCK; 1634 UNLOCK;
1533 1637
1534 /* free this only after the transfer */ 1638 /* free this only after the transfer */
1535 prev_sv = SvRV (coro_current); 1639 prev_sv = SvRV (coro_current);
1536 ta->prev = SvSTATE (prev_sv); 1640 ta->prev = SvSTATE (prev_sv);
1537 TRANSFER_CHECK (*ta); 1641 TRANSFER_CHECK (*ta);
1538 assert (ta->next->flags & CF_READY); 1642 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1539 ta->next->flags &= ~CF_READY; 1643 ta->next->flags &= ~CF_READY;
1540 SvRV_set (coro_current, next_sv); 1644 SvRV_set (coro_current, next_sv);
1541 1645
1542 LOCK; 1646 LOCK;
1543 free_coro_mortal (aTHX); 1647 free_coro_mortal (aTHX);
1544 coro_mortal = prev_sv; 1648 coro_mortal = prev_sv;
1545 UNLOCK; 1649 UNLOCK;
1546} 1650}
1547 1651
1652INLINE void
1653prepare_cede (pTHX_ struct transfer_args *ta)
1654{
1655 api_ready (aTHX_ coro_current);
1656 prepare_schedule (aTHX_ ta);
1657}
1658
1548static void 1659static void
1549prepare_cede (pTHX_ struct transfer_args *ta) 1660prepare_cede_notself (pTHX_ struct transfer_args *ta)
1550{ 1661{
1551 api_ready (coro_current); 1662 SV *prev = SvRV (coro_current);
1663
1664 if (coro_nready)
1665 {
1666 prepare_schedule (aTHX_ ta);
1667 api_ready (aTHX_ prev);
1668 }
1669 else
1670 ta->prev = ta->next = SvSTATE (prev);
1671}
1672
1673static void
1674api_schedule (pTHX)
1675{
1676 struct transfer_args ta;
1677
1552 prepare_schedule (aTHX_ ta); 1678 prepare_schedule (aTHX_ &ta);
1679 TRANSFER (ta, 1);
1553} 1680}
1554 1681
1555static int 1682static int
1556prepare_cede_notself (pTHX_ struct transfer_args *ta) 1683api_cede (pTHX)
1557{ 1684{
1558 if (coro_nready) 1685 struct transfer_args ta;
1559 { 1686
1560 SV *prev = SvRV (coro_current);
1561 prepare_schedule (aTHX_ ta); 1687 prepare_cede (aTHX_ &ta);
1562 api_ready (prev); 1688
1689 if (expect_true (ta.prev != ta.next))
1690 {
1691 TRANSFER (ta, 1);
1563 return 1; 1692 return 1;
1564 } 1693 }
1565 else 1694 else
1566 return 0; 1695 return 0;
1567} 1696}
1568 1697
1569static void
1570api_schedule (void)
1571{
1572 dTHX;
1573 struct transfer_args ta;
1574
1575 prepare_schedule (aTHX_ &ta);
1576 TRANSFER (ta, 1);
1577}
1578
1579static int 1698static int
1580api_cede (void) 1699api_cede_notself (pTHX)
1581{ 1700{
1582 dTHX; 1701 if (coro_nready)
1702 {
1583 struct transfer_args ta; 1703 struct transfer_args ta;
1584 1704
1585 prepare_cede (aTHX_ &ta); 1705 prepare_cede_notself (aTHX_ &ta);
1586
1587 if (expect_true (ta.prev != ta.next))
1588 {
1589 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1590 return 1; 1707 return 1;
1591 } 1708 }
1592 else 1709 else
1593 return 0; 1710 return 0;
1594} 1711}
1595 1712
1596static int
1597api_cede_notself (void)
1598{
1599 dTHX;
1600 struct transfer_args ta;
1601
1602 if (prepare_cede_notself (aTHX_ &ta))
1603 {
1604 TRANSFER (ta, 1);
1605 return 1;
1606 }
1607 else
1608 return 0;
1609}
1610
1611static void 1713static void
1612api_trace (SV *coro_sv, int flags) 1714api_trace (pTHX_ SV *coro_sv, int flags)
1613{ 1715{
1614 dTHX;
1615 struct coro *coro = SvSTATE (coro_sv); 1716 struct coro *coro = SvSTATE (coro_sv);
1616 1717
1617 if (flags & CC_TRACE) 1718 if (flags & CC_TRACE)
1618 { 1719 {
1619 if (!coro->cctx) 1720 if (!coro->cctx)
1620 coro->cctx = cctx_new (); 1721 coro->cctx = cctx_new_run ();
1621 else if (!(coro->cctx->flags & CC_TRACE)) 1722 else if (!(coro->cctx->flags & CC_TRACE))
1622 croak ("cannot enable tracing on coroutine with custom stack"); 1723 croak ("cannot enable tracing on coroutine with custom stack");
1623 1724
1624 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1725 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1625 } 1726 }
1632 else 1733 else
1633 coro->slot->runops = RUNOPS_DEFAULT; 1734 coro->slot->runops = RUNOPS_DEFAULT;
1634 } 1735 }
1635} 1736}
1636 1737
1738#if 0
1637static int 1739static int
1638coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1740coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1741{
1640 AV *padlist; 1742 AV *padlist;
1641 AV *av = (AV *)mg->mg_obj; 1743 AV *av = (AV *)mg->mg_obj;
1647 1749
1648static MGVTBL coro_gensub_vtbl = { 1750static MGVTBL coro_gensub_vtbl = {
1649 0, 0, 0, 0, 1751 0, 0, 0, 0,
1650 coro_gensub_free 1752 coro_gensub_free
1651}; 1753};
1754#endif
1652 1755
1653/*****************************************************************************/ 1756/*****************************************************************************/
1654/* PerlIO::cede */ 1757/* PerlIO::cede */
1655 1758
1656typedef struct 1759typedef struct
1662static IV 1765static IV
1663PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 1766PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1664{ 1767{
1665 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1768 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1666 1769
1667 self->every = SvNV (arg); 1770 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1668 self->next = nvtime () + self->every; 1771 self->next = nvtime () + self->every;
1669 1772
1670 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 1773 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1671} 1774}
1672 1775
1684 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1787 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1685 double now = nvtime (); 1788 double now = nvtime ();
1686 1789
1687 if (now >= self->next) 1790 if (now >= self->next)
1688 { 1791 {
1689 api_cede (); 1792 api_cede (aTHX);
1690 self->next = now + self->every; 1793 self->next = now + self->every;
1691 } 1794 }
1692 1795
1693 return PerlIOBuf_flush (f); 1796 return PerlIOBuf_flush (aTHX_ f);
1694} 1797}
1695 1798
1696static PerlIO_funcs PerlIO_cede = 1799static PerlIO_funcs PerlIO_cede =
1697{ 1800{
1698 sizeof(PerlIO_funcs), 1801 sizeof(PerlIO_funcs),
1723 PerlIOBuf_get_ptr, 1826 PerlIOBuf_get_ptr,
1724 PerlIOBuf_get_cnt, 1827 PerlIOBuf_get_cnt,
1725 PerlIOBuf_set_ptrcnt, 1828 PerlIOBuf_set_ptrcnt,
1726}; 1829};
1727 1830
1831/*****************************************************************************/
1832
1833static const CV *slf_cv; /* for quick consistency check */
1834
1835static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1836static SV *slf_arg0;
1837static SV *slf_arg1;
1838
1839/* this restores the stack in the case we patched the entersub, to */
1840/* recreate the stack frame as perl will on following calls */
1841/* since entersub cleared the stack */
1842static OP *
1843pp_restore (pTHX)
1844{
1845 dSP;
1846
1847 PUSHMARK (SP);
1848
1849 EXTEND (SP, 3);
1850 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1851 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1852 PUSHs ((SV *)CvGV (slf_cv));
1853
1854 RETURNOP (slf_restore.op_first);
1855}
1856
1857#define OPpENTERSUB_SLF 15 /* the part of op_private entersub hopefully doesn't use */
1858
1859enum {
1860 CORO_SLF_CUSTOM = 0,
1861 CORO_SLF_SET_STACKLEVEL = 1,
1862 CORO_SLF_TRANSFER = 2
1863};
1864
1865/* declare prototype */
1866XS(XS_Coro__State__set_stacklevel);
1867
1868/*
1869 * these not obviously related functions are all rolled into one
1870 * function to increase chances that they all will call transfer with the same
1871 * stack offset
1872 * SLF stands for "schedule-like-function".
1873 */
1874static OP *
1875pp_slf (pTHX)
1876{
1877 dSP;
1878 struct transfer_args ta;
1879 SV **arg = PL_stack_base + TOPMARK + 1;
1880 int items = SP - arg; /* args without function object */
1881 int ix = PL_op->op_private & OPpENTERSUB_SLF;
1882 struct CoroSLF *slf = 0;
1883 SV *gv = *sp;
1884
1885 /* do a quick consistency check on the "function" object, and if it isn't */
1886 /* for us, divert to the real entersub */
1887 if (SvTYPE (gv) != SVt_PVGV || CvXSUB (GvCV (gv)) != XS_Coro__State__set_stacklevel)
1888 return PL_ppaddr[OP_ENTERSUB](aTHX);
1889
1890 /* pop args */
1891 SP = PL_stack_base + POPMARK;
1892
1893 if (!(PL_op->op_flags & OPf_STACKED))
1894 {
1895 /* ampersand-form of call, use @_ instead of stack */
1896 AV *av = GvAV (PL_defgv);
1897 arg = AvARRAY (av);
1898 items = AvFILLp (av) + 1;
1899 }
1900
1901 PUTBACK;
1902
1903 if (!ix)
1904 {
1905 slf = (struct CoroSLF *)CvXSUBANY (GvCV (gv)).any_ptr;
1906 ix = slf->prepare (aTHX_ arg, items);
1907 }
1908
1909 switch (ix)
1910 {
1911 case CORO_SLF_SET_STACKLEVEL:
1912 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1913 break;
1914
1915 case CORO_SLF_TRANSFER:
1916 if (items != 2)
1917 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1918
1919 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1920 break;
1921
1922 case CORO_SLF_SCHEDULE:
1923 prepare_schedule (aTHX_ &ta);
1924 break;
1925
1926 case CORO_SLF_CEDE:
1927 prepare_cede (aTHX_ &ta);
1928 break;
1929
1930 case CORO_SLF_CEDE_NOTSELF:
1931 prepare_cede_notself (aTHX_ &ta);
1932 break;
1933
1934 default:
1935 abort ();
1936 }
1937
1938 do
1939 TRANSFER (ta, 0);
1940 while (slf && slf->check (aTHX));
1941
1942 SPAGAIN;
1943
1944 PUTBACK;
1945 SLF_TAIL;
1946 SPAGAIN;
1947 RETURN;
1948}
1949
1950static void
1951coro_slf_patch (pTHX_ CV *cv, int ix, SV **args, int items)
1952{
1953 assert (("FATAL: SLF call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_slf));
1954
1955 assert (("FATAL: SLF call with illegal CV value", CvGV (cv)));
1956 slf_cv = cv;
1957
1958 /* we patch the op, and then re-run the whole call */
1959 /* we have to put the same argument on the stack for this to work */
1960 /* and this will be done by pp_restore */
1961 slf_restore.op_next = (OP *)&slf_restore;
1962 slf_restore.op_type = OP_NULL;
1963 slf_restore.op_ppaddr = pp_restore;
1964 slf_restore.op_first = PL_op;
1965
1966 slf_arg0 = items > 0 ? SvREFCNT_inc (args [0]) : 0;
1967 slf_arg1 = items > 1 ? SvREFCNT_inc (args [1]) : 0;
1968
1969 PL_op->op_ppaddr = pp_slf;
1970 PL_op->op_private = PL_op->op_private & ~OPpENTERSUB_SLF | ix; /* we potentially share our private flags with entersub */
1971
1972 PL_op = (OP *)&slf_restore;
1973}
1974
1975static void
1976api_execute_slf (pTHX_ CV *cv, const struct CoroSLF *slf, SV **arg, int items)
1977{
1978 CvXSUBANY (cv).any_ptr = (void *)slf;
1979 coro_slf_patch (aTHX_ cv, CORO_SLF_CUSTOM, arg, items);
1980}
1728 1981
1729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1982MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1730 1983
1731PROTOTYPES: DISABLE 1984PROTOTYPES: DISABLE
1732 1985
1733BOOT: 1986BOOT:
1734{ 1987{
1735#ifdef USE_ITHREADS 1988#ifdef USE_ITHREADS
1736 MUTEX_INIT (&coro_mutex); 1989 MUTEX_INIT (&coro_lock);
1990# if CORO_PTHREAD
1991 coro_thx = PERL_GET_CONTEXT;
1992# endif
1737#endif 1993#endif
1738 BOOT_PAGESIZE; 1994 BOOT_PAGESIZE;
1739 1995
1740 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1996 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1741 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1997 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1759 main_top_env = PL_top_env; 2015 main_top_env = PL_top_env;
1760 2016
1761 while (main_top_env->je_prev) 2017 while (main_top_env->je_prev)
1762 main_top_env = main_top_env->je_prev; 2018 main_top_env = main_top_env->je_prev;
1763 2019
1764 coroapi.ver = CORO_API_VERSION; 2020 coroapi.ver = CORO_API_VERSION;
1765 coroapi.rev = CORO_API_REVISION; 2021 coroapi.rev = CORO_API_REVISION;
1766 coroapi.transfer = api_transfer; 2022 coroapi.transfer = api_transfer;
2023 coroapi.execute_slf = api_execute_slf;
1767 2024
1768 { 2025 {
1769 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2026 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1770 2027
1771 if (!svp) croak ("Time::HiRes is required"); 2028 if (!svp) croak ("Time::HiRes is required");
1804 av_push (coro->args, newSVsv (ST (i))); 2061 av_push (coro->args, newSVsv (ST (i)));
1805} 2062}
1806 OUTPUT: 2063 OUTPUT:
1807 RETVAL 2064 RETVAL
1808 2065
1809# these not obviously related functions are all rolled into the same xs
1810# function to increase chances that they all will call transfer with the same
1811# stack offset
1812void 2066void
1813_set_stacklevel (...) 2067_set_stacklevel (...)
1814 ALIAS: 2068 ALIAS:
2069 _set_stacklevel = CORO_SLF_SET_STACKLEVEL
1815 Coro::State::transfer = 1 2070 Coro::State::transfer = CORO_SLF_TRANSFER
1816 Coro::schedule = 2 2071 Coro::schedule = CORO_SLF_SCHEDULE
1817 Coro::cede = 3 2072 Coro::cede = CORO_SLF_CEDE
1818 Coro::cede_notself = 4 2073 Coro::cede_notself = CORO_SLF_CEDE_NOTSELF
1819 CODE: 2074 CODE:
1820{ 2075 coro_slf_patch (aTHX_ cv, ix, &ST (0), items);
1821 struct transfer_args ta;
1822
1823 PUTBACK;
1824 switch (ix)
1825 {
1826 case 0:
1827 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1828 ta.next = 0;
1829 break;
1830
1831 case 1:
1832 if (items != 2)
1833 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1834
1835 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1836 break;
1837
1838 case 2:
1839 prepare_schedule (aTHX_ &ta);
1840 break;
1841
1842 case 3:
1843 prepare_cede (aTHX_ &ta);
1844 break;
1845
1846 case 4:
1847 if (!prepare_cede_notself (aTHX_ &ta))
1848 XSRETURN_EMPTY;
1849
1850 break;
1851 }
1852 SPAGAIN;
1853
1854 BARRIER;
1855 PUTBACK;
1856 TRANSFER (ta, 0);
1857 SPAGAIN; /* might be the sp of a different coroutine now */
1858 /* be extra careful not to ever do anything after TRANSFER */
1859}
1860 2076
1861bool 2077bool
1862_destroy (SV *coro_sv) 2078_destroy (SV *coro_sv)
1863 CODE: 2079 CODE:
1864 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2080 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1872 _exit (code); 2088 _exit (code);
1873 2089
1874int 2090int
1875cctx_stacksize (int new_stacksize = 0) 2091cctx_stacksize (int new_stacksize = 0)
1876 CODE: 2092 CODE:
1877 RETVAL = coro_stacksize; 2093 RETVAL = cctx_stacksize;
1878 if (new_stacksize) 2094 if (new_stacksize)
2095 {
1879 coro_stacksize = new_stacksize; 2096 cctx_stacksize = new_stacksize;
2097 ++cctx_gen;
2098 }
2099 OUTPUT:
2100 RETVAL
2101
2102int
2103cctx_max_idle (int max_idle = 0)
2104 CODE:
2105 RETVAL = cctx_max_idle;
2106 if (max_idle > 1)
2107 cctx_max_idle = max_idle;
1880 OUTPUT: 2108 OUTPUT:
1881 RETVAL 2109 RETVAL
1882 2110
1883int 2111int
1884cctx_count () 2112cctx_count ()
1962 RETVAL = boolSV (coro->flags & ix); 2190 RETVAL = boolSV (coro->flags & ix);
1963 OUTPUT: 2191 OUTPUT:
1964 RETVAL 2192 RETVAL
1965 2193
1966void 2194void
2195throw (Coro::State self, SV *throw = &PL_sv_undef)
2196 PROTOTYPE: $;$
2197 CODE:
2198 SvREFCNT_dec (self->throw);
2199 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2200
2201void
1967api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2202api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2203 C_ARGS: aTHX_ coro, flags
1968 2204
1969SV * 2205SV *
1970has_cctx (Coro::State coro) 2206has_cctx (Coro::State coro)
1971 PROTOTYPE: $ 2207 PROTOTYPE: $
1972 CODE: 2208 CODE:
1980 CODE: 2216 CODE:
1981 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2217 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1982 OUTPUT: 2218 OUTPUT:
1983 RETVAL 2219 RETVAL
1984 2220
1985IV 2221UV
1986rss (Coro::State coro) 2222rss (Coro::State coro)
1987 PROTOTYPE: $ 2223 PROTOTYPE: $
1988 ALIAS: 2224 ALIAS:
1989 usecount = 1 2225 usecount = 1
1990 CODE: 2226 CODE:
2001 CODE: 2237 CODE:
2002 struct coro *coro = SvSTATE (coro_current); 2238 struct coro *coro = SvSTATE (coro_current);
2003 coro->cctx->idle_sp = 0; 2239 coro->cctx->idle_sp = 0;
2004 2240
2005void 2241void
2006throw (Coro::State self, SV *throw = &PL_sv_undef)
2007 PROTOTYPE: $;$
2008 CODE:
2009 SvREFCNT_dec (self->throw);
2010 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2011
2012void
2013swap_defsv (Coro::State self) 2242swap_defsv (Coro::State self)
2014 PROTOTYPE: $ 2243 PROTOTYPE: $
2015 ALIAS: 2244 ALIAS:
2016 swap_defav = 1 2245 swap_defav = 1
2017 CODE: 2246 CODE:
2049 2278
2050 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2279 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2051 coro_ready[i] = newAV (); 2280 coro_ready[i] = newAV ();
2052 2281
2053 { 2282 {
2054 SV *sv = perl_get_sv ("Coro::API", TRUE); 2283 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2055 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2056 2284
2057 coroapi.schedule = api_schedule; 2285 coroapi.schedule = api_schedule;
2058 coroapi.cede = api_cede; 2286 coroapi.cede = api_cede;
2059 coroapi.cede_notself = api_cede_notself; 2287 coroapi.cede_notself = api_cede_notself;
2060 coroapi.ready = api_ready; 2288 coroapi.ready = api_ready;
2061 coroapi.is_ready = api_is_ready; 2289 coroapi.is_ready = api_is_ready;
2062 coroapi.nready = &coro_nready; 2290 coroapi.nready = coro_nready;
2063 coroapi.current = coro_current; 2291 coroapi.current = coro_current;
2064 2292
2065 GCoroAPI = &coroapi; 2293 GCoroAPI = &coroapi;
2066 sv_setiv (sv, (IV)&coroapi); 2294 sv_setiv (sv, (IV)&coroapi);
2067 SvREADONLY_on (sv); 2295 SvREADONLY_on (sv);
2071void 2299void
2072_set_current (SV *current) 2300_set_current (SV *current)
2073 PROTOTYPE: $ 2301 PROTOTYPE: $
2074 CODE: 2302 CODE:
2075 SvREFCNT_dec (SvRV (coro_current)); 2303 SvREFCNT_dec (SvRV (coro_current));
2076 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2304 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2077 2305
2078void 2306void
2079_set_readyhook (SV *hook) 2307_set_readyhook (SV *hook)
2080 PROTOTYPE: $ 2308 PROTOTYPE: $
2081 CODE: 2309 CODE:
2108 2336
2109SV * 2337SV *
2110ready (SV *self) 2338ready (SV *self)
2111 PROTOTYPE: $ 2339 PROTOTYPE: $
2112 CODE: 2340 CODE:
2113 RETVAL = boolSV (api_ready (self)); 2341 RETVAL = boolSV (api_ready (aTHX_ self));
2114 OUTPUT: 2342 OUTPUT:
2115 RETVAL 2343 RETVAL
2116 2344
2117int 2345int
2118nready (...) 2346nready (...)
2141 SvREFCNT_dec (old); 2369 SvREFCNT_dec (old);
2142 croak ("\3async_pool terminate\2\n"); 2370 croak ("\3async_pool terminate\2\n");
2143 } 2371 }
2144 2372
2145 SvREFCNT_dec (coro->saved_deffh); 2373 SvREFCNT_dec (coro->saved_deffh);
2146 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2374 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2147 2375
2148 hv_store (hv, "desc", sizeof ("desc") - 1, 2376 hv_store (hv, "desc", sizeof ("desc") - 1,
2149 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2377 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2150 2378
2151 invoke_av = (AV *)SvRV (invoke); 2379 invoke_av = (AV *)SvRV (invoke);
2155 2383
2156 if (len > 0) 2384 if (len > 0)
2157 { 2385 {
2158 av_fill (defav, len - 1); 2386 av_fill (defav, len - 1);
2159 for (i = 0; i < len; ++i) 2387 for (i = 0; i < len; ++i)
2160 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2388 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2161 } 2389 }
2162 2390
2163 SvREFCNT_dec (invoke); 2391 SvREFCNT_dec (invoke);
2164} 2392}
2165 2393
2172 sv_setsv (cb, &PL_sv_undef); 2400 sv_setsv (cb, &PL_sv_undef);
2173 2401
2174 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2402 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2175 coro->saved_deffh = 0; 2403 coro->saved_deffh = 0;
2176 2404
2177 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2405 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2178 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2406 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2179 { 2407 {
2180 SV *old = PL_diehook; 2408 SV *old = PL_diehook;
2181 PL_diehook = 0; 2409 PL_diehook = 0;
2182 SvREFCNT_dec (old); 2410 SvREFCNT_dec (old);
2188 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2416 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2189 2417
2190 coro->prio = 0; 2418 coro->prio = 0;
2191 2419
2192 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2420 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2193 api_trace (coro_current, 0); 2421 api_trace (aTHX_ coro_current, 0);
2194 2422
2195 av_push (av_async_pool, newSVsv (coro_current)); 2423 av_push (av_async_pool, newSVsv (coro_current));
2196} 2424}
2197 2425
2198#if 0 2426#if 0
2244#endif 2472#endif
2245 2473
2246 2474
2247MODULE = Coro::State PACKAGE = Coro::AIO 2475MODULE = Coro::State PACKAGE = Coro::AIO
2248 2476
2249SV * 2477void
2250_get_state () 2478_get_state (SV *self)
2251 CODE: 2479 PPCODE:
2252{ 2480{
2253 struct io_state *data; 2481 AV *defav = GvAV (PL_defgv);
2254 2482 AV *av = newAV ();
2483 int i;
2255 RETVAL = newSV (sizeof (struct io_state)); 2484 SV *data_sv = newSV (sizeof (struct io_state));
2256 data = (struct io_state *)SvPVX (RETVAL); 2485 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2257 SvCUR_set (RETVAL, sizeof (struct io_state)); 2486 SvCUR_set (data_sv, sizeof (struct io_state));
2258 SvPOK_only (RETVAL); 2487 SvPOK_only (data_sv);
2259 2488
2260 data->errorno = errno; 2489 data->errorno = errno;
2261 data->laststype = PL_laststype; 2490 data->laststype = PL_laststype;
2262 data->laststatval = PL_laststatval; 2491 data->laststatval = PL_laststatval;
2263 data->statcache = PL_statcache; 2492 data->statcache = PL_statcache;
2493
2494 av_extend (av, AvFILLp (defav) + 1 + 1);
2495
2496 for (i = 0; i <= AvFILLp (defav); ++i)
2497 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2498
2499 av_push (av, data_sv);
2500
2501 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2502
2503 api_ready (aTHX_ self);
2264} 2504}
2265 OUTPUT:
2266 RETVAL
2267 2505
2268void 2506void
2269_set_state (char *data_) 2507_set_state (SV *state)
2270 PROTOTYPE: $ 2508 PROTOTYPE: $
2271 CODE: 2509 PPCODE:
2272{ 2510{
2273 struct io_state *data = (void *)data_; 2511 AV *av = (AV *)SvRV (state);
2512 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2513 int i;
2274 2514
2275 errno = data->errorno; 2515 errno = data->errorno;
2276 PL_laststype = data->laststype; 2516 PL_laststype = data->laststype;
2277 PL_laststatval = data->laststatval; 2517 PL_laststatval = data->laststatval;
2278 PL_statcache = data->statcache; 2518 PL_statcache = data->statcache;
2519
2520 EXTEND (SP, AvFILLp (av));
2521 for (i = 0; i < AvFILLp (av); ++i)
2522 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2279} 2523}
2280 2524
2281 2525
2282MODULE = Coro::State PACKAGE = Coro::AnyEvent 2526MODULE = Coro::State PACKAGE = Coro::AnyEvent
2283 2527
2289 PROTOTYPE: @ 2533 PROTOTYPE: @
2290 CODE: 2534 CODE:
2291{ 2535{
2292 static int incede; 2536 static int incede;
2293 2537
2294 api_cede_notself (); 2538 api_cede_notself (aTHX);
2295 2539
2296 ++incede; 2540 ++incede;
2297 while (coro_nready >= incede && api_cede ()) 2541 while (coro_nready >= incede && api_cede (aTHX))
2298 ; 2542 ;
2299 2543
2300 sv_setsv (sv_activity, &PL_sv_undef); 2544 sv_setsv (sv_activity, &PL_sv_undef);
2301 if (coro_nready >= incede) 2545 if (coro_nready >= incede)
2302 { 2546 {
2312 2556
2313MODULE = Coro::State PACKAGE = PerlIO::cede 2557MODULE = Coro::State PACKAGE = PerlIO::cede
2314 2558
2315BOOT: 2559BOOT:
2316 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2560 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2561

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines