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.253 by root, Fri Nov 7 20:12:26 2008 UTC vs.
Revision 1.268 by root, Fri Nov 14 06:41:41 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) \
… …
119# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
120#endif 117#endif
121 118
122/* 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
123 * portable way as possible. */ 120 * portable way as possible. */
124#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
125#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
126 126
127#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
128 128
129#if __GNUC__ >= 3 129#if __GNUC__ >= 3
130# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
131# define BARRIER __asm__ __volatile__ ("" : : : "memory")
132# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
133#else 133#else
134# define attribute(x) 134# define attribute(x)
135# define BARRIER
136# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
137#endif 137#endif
138 138
139#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
141 141
142#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
143 143
144#include "CoroAPI.h" 144#include "CoroAPI.h"
145 145
146#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
147static perl_mutex coro_lock; 148static perl_mutex coro_lock;
148# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
149# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
150#else 155#else
156
151# define LOCK (void)0 157# define LOCK (void)0
152# define UNLOCK (void)0 158# define UNLOCK (void)0
159
153#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
154 166
155/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
156struct io_state 168struct io_state
157{ 169{
158 AV *res; 170 AV *res;
159 int errorno; 171 int errorno;
160 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
161 int laststatval; 173 int laststatval;
162 Stat_t statcache; 174 Stat_t statcache;
163}; 175};
164 176
165static double (*nvtime)(); /* so why doesn't it take void? */ 177static double (*nvtime)(); /* so why doesn't it take void? */
166 178
179static U32 cctx_gen;
167static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
168static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
169static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
170static JMPENV *main_top_env; 183static JMPENV *main_top_env;
171static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
172static volatile SV *coro_mortal; /* will be freed/thrown 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};
173 192
174static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
175static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
176static SV *rv_diehook; 195static SV *rv_diehook;
177static SV *rv_warnhook; 196static SV *rv_warnhook;
… …
209 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 228 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
210 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 */
211 JMPENV *top_env; 230 JMPENV *top_env;
212 coro_context cctx; 231 coro_context cctx;
213 232
233 U32 gen;
214#if CORO_USE_VALGRIND 234#if CORO_USE_VALGRIND
215 int valgrind_id; 235 int valgrind_id;
216#endif 236#endif
217 unsigned char flags; 237 unsigned char flags;
218} coro_cctx; 238} coro_cctx;
… …
278#define PRIO_MIN -4 298#define PRIO_MIN -4
279 299
280/* for Coro.pm */ 300/* for Coro.pm */
281static SV *coro_current; 301static SV *coro_current;
282static SV *coro_readyhook; 302static SV *coro_readyhook;
283static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
284static int coro_nready; 304static int coro_nready;
285static struct coro *coro_first; 305static struct coro *coro_first;
286 306
287/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
288 308
… …
393 : 0 413 : 0
394 414
395#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)
396#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)
397 417
398static struct coro * 418INLINE struct coro *
399SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
400{ 420{
401 HV *stash; 421 HV *stash;
402 MAGIC *mg; 422 MAGIC *mg;
403 423
… …
694 } 714 }
695 715
696 return rss; 716 return rss;
697} 717}
698 718
719/** set stacklevel support **************************************************/
720
721/* we sometimes need to create the effect of pp_set_stacklevel calling us */
722#define SSL_HEAD (void)0
723/* we sometimes need to create the effect of leaving via pp_set_stacklevel */
724#define SSL_TAIL set_stacklevel_tail (aTHX)
725
726INLINE void
727set_stacklevel_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;
744}
745
699/** coroutine stack handling ************************************************/ 746/** coroutine stack handling ************************************************/
700 747
701static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 748static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
702static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 749static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
703static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg); 750static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
… …
820 PL_rs = newSVsv (GvSV (irsgv)); 867 PL_rs = newSVsv (GvSV (irsgv));
821 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
822 869
823 { 870 {
824 dSP; 871 dSP;
825 LOGOP myop; 872 UNOP myop;
826 873
827 Zero (&myop, 1, LOGOP); 874 Zero (&myop, 1, UNOP);
828 myop.op_next = Nullop; 875 myop.op_next = Nullop;
829 myop.op_flags = OPf_WANT_VOID; 876 myop.op_flags = OPf_WANT_VOID;
830 877
831 PUSHMARK (SP); 878 PUSHMARK (SP);
832 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
835 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
836 SPAGAIN; 883 SPAGAIN;
837 } 884 }
838 885
839 /* 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
840 * likely was suspended in set_stacklevel, called from entersub. 887 * likely was suspended in set_stacklevel, called from pp_set_stacklevel,
841 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 888 * so we have to emulate entering pp_set_stacklevel here.
842 * so we ENTER here for symmetry
843 */ 889 */
844 ENTER; 890 SSL_HEAD;
845} 891}
846 892
847static void 893static void
848coro_destruct (pTHX_ struct coro *coro) 894coro_destruct (pTHX_ struct coro *coro)
849{ 895{
… …
878 SvREFCNT_dec (coro->throw); 924 SvREFCNT_dec (coro->throw);
879 925
880 coro_destruct_stacks (aTHX); 926 coro_destruct_stacks (aTHX);
881} 927}
882 928
883static void 929INLINE void
884free_coro_mortal (pTHX) 930free_coro_mortal (pTHX)
885{ 931{
886 if (expect_true (coro_mortal)) 932 if (expect_true (coro_mortal))
887 { 933 {
888 SvREFCNT_dec (coro_mortal); 934 SvREFCNT_dec (coro_mortal);
… …
1012 1058
1013 TAINT_NOT; 1059 TAINT_NOT;
1014 return 0; 1060 return 0;
1015} 1061}
1016 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
1017/* 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 */
1018/* _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 */
1019/* during execution of a perl program */ 1072/* during execution of a perl program */
1073/* also initialises PL_top_env */
1020static void NOINLINE 1074static void NOINLINE
1021cctx_prepare (pTHX_ coro_cctx *cctx) 1075cctx_prepare (pTHX_ coro_cctx *cctx)
1022{ 1076{
1023 dSP; 1077 dSP;
1024 LOGOP myop; 1078 UNOP myop;
1025 1079
1026 PL_top_env = &PL_start_env; 1080 PL_top_env = &PL_start_env;
1027 1081
1028 if (cctx->flags & CC_TRACE) 1082 if (cctx->flags & CC_TRACE)
1029 PL_runops = runops_trace; 1083 PL_runops = runops_trace;
1030 1084
1031 Zero (&myop, 1, LOGOP); 1085 Zero (&myop, 1, UNOP);
1032 myop.op_next = PL_op; 1086 myop.op_next = PL_op;
1033 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1087 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1034 1088
1035 PUSHMARK (SP); 1089 PUSHMARK (SP);
1036 EXTEND (SP, 2); 1090 EXTEND (SP, 2);
1037 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1091 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1038 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1092 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1039 PUTBACK; 1093 PUTBACK;
1040 PL_op = (OP *)&myop; 1094 PL_op = (OP *)&myop;
1041 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1095 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1042 SPAGAIN; 1096 SPAGAIN;
1043} 1097}
1044 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
1045/* 1120/*
1046 * this is a _very_ stripped down perl interpreter ;) 1121 * this is a _very_ stripped down perl interpreter ;)
1047 */ 1122 */
1048static void 1123static void
1049cctx_run (void *arg) 1124cctx_run (void *arg)
1050{ 1125{
1126#ifdef USE_ITHREADS
1127# if CORO_PTHREAD
1128 PERL_SET_CONTEXT (coro_thx);
1129# endif
1130#endif
1131 {
1051 dTHX; 1132 dTHX;
1052 1133
1053 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1134 /* we are the alternative tail to pp_set_stacklevel */
1054 UNLOCK; 1135 /* so do the same things here */
1136 SSL_TAIL;
1055 1137
1056 /* we now skip the entersub that lead to transfer() */ 1138 /* we now skip the op that did lead to transfer() */
1057 PL_op = PL_op->op_next; 1139 PL_op = PL_op->op_next;
1058 1140
1059 /* inject a fake subroutine call to cctx_init */ 1141 /* inject a fake subroutine call to cctx_init */
1060 cctx_prepare (aTHX_ (coro_cctx *)arg); 1142 cctx_prepare (aTHX_ (coro_cctx *)arg);
1061 1143
1144 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX);
1146
1062 /* 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 */
1063 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1064 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1065 1150
1066 /* 1151 /*
1067 * 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
1068 * 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)
1069 * 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
1070 * bootstrap-time "top" top_env, as we cannot restore the "main" 1155 * bootstrap-time "top" top_env, as we cannot restore the "main"
1071 * coroutine as Coro has no such concept 1156 * coroutine as Coro has no such concept
1072 */ 1157 */
1073 PL_top_env = main_top_env; 1158 PL_top_env = main_top_env;
1074 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 }
1075} 1161}
1076 1162
1077static coro_cctx * 1163static coro_cctx *
1078cctx_new () 1164cctx_new ()
1079{ 1165{
1080 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 ();
1081 void *stack_start; 1195 void *stack_start;
1082 size_t stack_size; 1196 size_t stack_size;
1083 1197
1084 ++cctx_count;
1085 Newz (0, cctx, 1, coro_cctx);
1086
1087#if HAVE_MMAP 1198#if HAVE_MMAP
1088 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;
1089 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1090 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);
1091 1202
1092 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1093 { 1204 {
1094# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1095 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1096# endif 1207 #endif
1097 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1098 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1099 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1100 } 1211 }
1101 else 1212 else
1102#endif 1213#endif
1103 { 1214 {
1104 cctx->ssize = coro_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1105 New (0, cctx->sptr, coro_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1106 1217
1107 if (!cctx->sptr) 1218 if (!cctx->sptr)
1108 { 1219 {
1109 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1110 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1111 } 1222 }
1112 1223
1113 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1114 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1115 } 1226 }
1116 1227
1117 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
1118 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);
1119 1233
1120 return cctx; 1234 return cctx;
1121} 1235}
1122 1236
… …
1130 coro_destroy (&cctx->cctx); 1244 coro_destroy (&cctx->cctx);
1131 1245
1132 /* coro_transfer creates new, empty cctx's */ 1246 /* coro_transfer creates new, empty cctx's */
1133 if (cctx->sptr) 1247 if (cctx->sptr)
1134 { 1248 {
1135#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1136 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1137#endif 1251 #endif
1138 1252
1139#if HAVE_MMAP 1253#if HAVE_MMAP
1140 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1141 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1142 else 1256 else
… …
1146 1260
1147 Safefree (cctx); 1261 Safefree (cctx);
1148} 1262}
1149 1263
1150/* wether this cctx should be destructed */ 1264/* wether this cctx should be destructed */
1151#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))
1152 1266
1153static coro_cctx * 1267static coro_cctx *
1154cctx_get (pTHX) 1268cctx_get (pTHX)
1155{ 1269{
1156 while (expect_true (cctx_first)) 1270 while (expect_true (cctx_first))
… …
1163 return cctx; 1277 return cctx;
1164 1278
1165 cctx_destroy (cctx); 1279 cctx_destroy (cctx);
1166 } 1280 }
1167 1281
1168 return cctx_new (); 1282 return cctx_new_run ();
1169} 1283}
1170 1284
1171static void 1285static void
1172cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1173{ 1287{
1174 assert (("cctx_put called on non-initialised cctx", cctx->sptr)); 1288 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1175 1289
1176 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1177 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1178 { 1292 {
1179 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
1180 cctx_first = first->next; 1294 cctx_first = first->next;
1181 --cctx_idle; 1295 --cctx_idle;
1182 1296
… …
1218 dSTACKLEVEL; 1332 dSTACKLEVEL;
1219 1333
1220 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1221 if (expect_false (!next)) 1335 if (expect_false (!next))
1222 { 1336 {
1223 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1224 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 */
1225 } 1339 }
1226 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1227 { 1341 {
1228 static volatile int has_throw;
1229 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1230 1343
1231 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1232 { 1345 {
1233 /* create a new empty/source context */ 1346 /* create a new empty/source context */
1234 ++cctx_count; 1347 prev->cctx = cctx_new_empty ();
1235 New (0, prev->cctx, 1, coro_cctx);
1236 prev->cctx->sptr = 0;
1237 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1238
1239 prev->flags &= ~CF_NEW; 1348 prev->flags &= ~CF_NEW;
1240 prev->flags |= CF_RUNNING; 1349 prev->flags |= CF_RUNNING;
1241 } 1350 }
1242 1351
1243 prev->flags &= ~CF_RUNNING; 1352 prev->flags &= ~CF_RUNNING;
… …
1258 else 1367 else
1259 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1260 1369
1261 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1262 1371
1263 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1264 if (expect_true ( 1373 if (expect_true (
1265 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1266 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1267 && !force_cctx 1376 && !force_cctx
1268 )) 1377 ))
1269 { 1378 {
1270 /* 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 */
1271 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));
1272 1381
1273 prev->cctx = 0; 1382 prev->cctx = 0;
1274 1383
1275 /* 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 */
1276 /* 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 */
… …
1284 ++next->usecount; 1393 ++next->usecount;
1285 1394
1286 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1287 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1288 1397
1289 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1290 1400
1291 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1292 { 1402 {
1293 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1294 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1295 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1296 } 1406 }
1297 1407
1298 free_coro_mortal (aTHX); 1408 transfer_tail (aTHX);
1299 UNLOCK;
1300
1301 if (expect_false (has_throw))
1302 {
1303 struct coro *coro = SvSTATE (coro_current);
1304
1305 if (coro->throw)
1306 {
1307 SV *exception = coro->throw;
1308 coro->throw = 0;
1309 sv_setsv (ERRSV, exception);
1310 croak (0);
1311 }
1312 }
1313 } 1409 }
1314} 1410}
1315
1316struct transfer_args
1317{
1318 struct coro *prev, *next;
1319};
1320 1411
1321#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))
1322#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1323 1414
1324/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
… …
1497 1588
1498static int 1589static int
1499api_is_ready (SV *coro_sv) 1590api_is_ready (SV *coro_sv)
1500{ 1591{
1501 dTHX; 1592 dTHX;
1593
1502 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1594 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1503} 1595}
1504 1596
1505static void 1597INLINE void
1506prepare_schedule (pTHX_ struct transfer_args *ta) 1598prepare_schedule (pTHX_ struct transfer_args *ta)
1507{ 1599{
1508 SV *prev_sv, *next_sv; 1600 SV *prev_sv, *next_sv;
1509 1601
1510 for (;;) 1602 for (;;)
… …
1536 /* cannot transfer to destroyed coros, skip and look for next */ 1628 /* cannot transfer to destroyed coros, skip and look for next */
1537 if (expect_false (ta->next->flags & CF_DESTROYED)) 1629 if (expect_false (ta->next->flags & CF_DESTROYED))
1538 { 1630 {
1539 UNLOCK; 1631 UNLOCK;
1540 SvREFCNT_dec (next_sv); 1632 SvREFCNT_dec (next_sv);
1541 /* coro_nready is already taken care of by destroy */ 1633 /* coro_nready has already been taken care of by destroy */
1542 continue; 1634 continue;
1543 } 1635 }
1544 1636
1545 --coro_nready; 1637 --coro_nready;
1546 UNLOCK; 1638 UNLOCK;
… …
1549 1641
1550 /* free this only after the transfer */ 1642 /* free this only after the transfer */
1551 prev_sv = SvRV (coro_current); 1643 prev_sv = SvRV (coro_current);
1552 ta->prev = SvSTATE (prev_sv); 1644 ta->prev = SvSTATE (prev_sv);
1553 TRANSFER_CHECK (*ta); 1645 TRANSFER_CHECK (*ta);
1554 assert (ta->next->flags & CF_READY); 1646 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1555 ta->next->flags &= ~CF_READY; 1647 ta->next->flags &= ~CF_READY;
1556 SvRV_set (coro_current, next_sv); 1648 SvRV_set (coro_current, next_sv);
1557 1649
1558 LOCK; 1650 LOCK;
1559 free_coro_mortal (aTHX); 1651 free_coro_mortal (aTHX);
1560 coro_mortal = prev_sv; 1652 coro_mortal = prev_sv;
1561 UNLOCK; 1653 UNLOCK;
1562} 1654}
1563 1655
1564static void 1656INLINE void
1565prepare_cede (pTHX_ struct transfer_args *ta) 1657prepare_cede (pTHX_ struct transfer_args *ta)
1566{ 1658{
1567 api_ready (coro_current); 1659 api_ready (coro_current);
1568 prepare_schedule (aTHX_ ta); 1660 prepare_schedule (aTHX_ ta);
1569} 1661}
1570 1662
1571static int 1663static void
1572prepare_cede_notself (pTHX_ struct transfer_args *ta) 1664prepare_cede_notself (pTHX_ struct transfer_args *ta)
1573{ 1665{
1666 SV *prev = SvRV (coro_current);
1667
1574 if (coro_nready) 1668 if (coro_nready)
1575 { 1669 {
1576 SV *prev = SvRV (coro_current);
1577 prepare_schedule (aTHX_ ta); 1670 prepare_schedule (aTHX_ ta);
1578 api_ready (prev); 1671 api_ready (prev);
1672 }
1673 else
1674 ta->prev = ta->next = SvSTATE (prev);
1675}
1676
1677static void
1678api_schedule (void)
1679{
1680 dTHX;
1681 struct transfer_args ta;
1682
1683 prepare_schedule (aTHX_ &ta);
1684 TRANSFER (ta, 1);
1685}
1686
1687static int
1688api_cede (void)
1689{
1690 dTHX;
1691 struct transfer_args ta;
1692
1693 prepare_cede (aTHX_ &ta);
1694
1695 if (expect_true (ta.prev != ta.next))
1696 {
1697 TRANSFER (ta, 1);
1579 return 1; 1698 return 1;
1580 } 1699 }
1581 else 1700 else
1582 return 0; 1701 return 0;
1583} 1702}
1584 1703
1585static void
1586api_schedule (void)
1587{
1588 dTHX;
1589 struct transfer_args ta;
1590
1591 prepare_schedule (aTHX_ &ta);
1592 TRANSFER (ta, 1);
1593}
1594
1595static int 1704static int
1596api_cede (void) 1705api_cede_notself (void)
1597{ 1706{
1707 if (coro_nready)
1708 {
1598 dTHX; 1709 dTHX;
1599 struct transfer_args ta; 1710 struct transfer_args ta;
1600 1711
1601 prepare_cede (aTHX_ &ta); 1712 prepare_cede_notself (aTHX_ &ta);
1602
1603 if (expect_true (ta.prev != ta.next))
1604 {
1605 TRANSFER (ta, 1); 1713 TRANSFER (ta, 1);
1606 return 1; 1714 return 1;
1607 } 1715 }
1608 else 1716 else
1609 return 0; 1717 return 0;
1610} 1718}
1611 1719
1612static int
1613api_cede_notself (void)
1614{
1615 dTHX;
1616 struct transfer_args ta;
1617
1618 if (prepare_cede_notself (aTHX_ &ta))
1619 {
1620 TRANSFER (ta, 1);
1621 return 1;
1622 }
1623 else
1624 return 0;
1625}
1626
1627static void 1720static void
1628api_trace (SV *coro_sv, int flags) 1721api_trace (SV *coro_sv, int flags)
1629{ 1722{
1630 dTHX; 1723 dTHX;
1631 struct coro *coro = SvSTATE (coro_sv); 1724 struct coro *coro = SvSTATE (coro_sv);
1632 1725
1633 if (flags & CC_TRACE) 1726 if (flags & CC_TRACE)
1634 { 1727 {
1635 if (!coro->cctx) 1728 if (!coro->cctx)
1636 coro->cctx = cctx_new (); 1729 coro->cctx = cctx_new_run ();
1637 else if (!(coro->cctx->flags & CC_TRACE)) 1730 else if (!(coro->cctx->flags & CC_TRACE))
1638 croak ("cannot enable tracing on coroutine with custom stack"); 1731 croak ("cannot enable tracing on coroutine with custom stack");
1639 1732
1640 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1641 } 1734 }
… …
1648 else 1741 else
1649 coro->slot->runops = RUNOPS_DEFAULT; 1742 coro->slot->runops = RUNOPS_DEFAULT;
1650 } 1743 }
1651} 1744}
1652 1745
1746#if 0
1653static int 1747static int
1654coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1655{ 1749{
1656 AV *padlist; 1750 AV *padlist;
1657 AV *av = (AV *)mg->mg_obj; 1751 AV *av = (AV *)mg->mg_obj;
… …
1663 1757
1664static MGVTBL coro_gensub_vtbl = { 1758static MGVTBL coro_gensub_vtbl = {
1665 0, 0, 0, 0, 1759 0, 0, 0, 0,
1666 coro_gensub_free 1760 coro_gensub_free
1667}; 1761};
1762#endif
1668 1763
1669/*****************************************************************************/ 1764/*****************************************************************************/
1670/* PerlIO::cede */ 1765/* PerlIO::cede */
1671 1766
1672typedef struct 1767typedef struct
… …
1739 PerlIOBuf_get_ptr, 1834 PerlIOBuf_get_ptr,
1740 PerlIOBuf_get_cnt, 1835 PerlIOBuf_get_cnt,
1741 PerlIOBuf_set_ptrcnt, 1836 PerlIOBuf_set_ptrcnt,
1742}; 1837};
1743 1838
1839/*****************************************************************************/
1840
1841static const CV *ssl_cv; /* for quick consistency check */
1842
1843static UNOP ssl_restore; /* restore stack as entersub did, for first-re-run */
1844static SV *ssl_arg0;
1845static SV *ssl_arg1;
1846
1847/* this restores the stack in the case we patched the entersub, to */
1848/* recreate the stack frame as perl will on following calls */
1849/* since entersub cleared the stack */
1850static OP *
1851pp_restore (pTHX)
1852{
1853 dSP;
1854
1855 PUSHMARK (SP);
1856
1857 EXTEND (SP, 3);
1858 if (ssl_arg0) PUSHs (sv_2mortal (ssl_arg0)), ssl_arg0 = 0;
1859 if (ssl_arg1) PUSHs (sv_2mortal (ssl_arg1)), ssl_arg1 = 0;
1860 PUSHs ((SV *)CvGV (ssl_cv));
1861
1862 RETURNOP (ssl_restore.op_first);
1863}
1864
1865#define OPpENTERSUB_SSL 15 /* the part of op_private entersub hopefully doesn't use */
1866
1867/* declare prototype */
1868XS(XS_Coro__State__set_stacklevel);
1869
1870/*
1871 * these not obviously related functions are all rolled into one
1872 * function to increase chances that they all will call transfer with the same
1873 * stack offset
1874 */
1875static OP *
1876pp_set_stacklevel (pTHX)
1877{
1878 dSP;
1879 struct transfer_args ta;
1880 SV **arg = PL_stack_base + TOPMARK + 1;
1881 int items = SP - arg; /* args without function object */
1882
1883 /* do a quick consistency check on the "function" object, and if it isn't */
1884 /* for us, divert to the real entersub */
1885 if (SvTYPE (*sp) != SVt_PVGV || CvXSUB (GvCV (*sp)) != XS_Coro__State__set_stacklevel)
1886 return PL_ppaddr[OP_ENTERSUB](aTHX);
1887
1888 /* pop args */
1889 SP = PL_stack_base + POPMARK;
1890
1891 if (!(PL_op->op_flags & OPf_STACKED))
1892 {
1893 /* ampersand-form of call, use @_ instead of stack */
1894 AV *av = GvAV (PL_defgv);
1895 arg = AvARRAY (av);
1896 items = AvFILLp (av) + 1;
1897 }
1898
1899 PUTBACK;
1900 switch (PL_op->op_private & OPpENTERSUB_SSL)
1901 {
1902 case 0:
1903 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1904 break;
1905
1906 case 1:
1907 if (items != 2)
1908 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1909
1910 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1911 break;
1912
1913 case 2:
1914 prepare_schedule (aTHX_ &ta);
1915 break;
1916
1917 case 3:
1918 prepare_cede (aTHX_ &ta);
1919 break;
1920
1921 case 4:
1922 prepare_cede_notself (aTHX_ &ta);
1923 break;
1924 }
1925
1926 TRANSFER (ta, 0);
1927 SPAGAIN;
1928
1929skip:
1930 PUTBACK;
1931 SSL_TAIL;
1932 SPAGAIN;
1933 RETURN;
1934}
1935
1936static void
1937coro_ssl_patch (pTHX_ CV *cv, int ix, SV **args, int items)
1938{
1939 assert (("FATAL: ssl call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_set_stacklevel));
1940
1941 assert (("FATAL: ssl call with illegal CV value", CvGV (cv)));
1942 ssl_cv = cv;
1943
1944 /* we patch the op, and then re-run the whole call */
1945 /* we have to put some dummy argument on the stack for this to work */
1946 ssl_restore.op_next = (OP *)&ssl_restore;
1947 ssl_restore.op_type = OP_NULL;
1948 ssl_restore.op_ppaddr = pp_restore;
1949 ssl_restore.op_first = PL_op;
1950
1951 ssl_arg0 = items > 0 ? SvREFCNT_inc (args [0]) : 0;
1952 ssl_arg1 = items > 1 ? SvREFCNT_inc (args [1]) : 0;
1953
1954 PL_op->op_ppaddr = pp_set_stacklevel;
1955 PL_op->op_private = PL_op->op_private & ~OPpENTERSUB_SSL | ix; /* we potentially share our private flags with entersub */
1956
1957 PL_op = (OP *)&ssl_restore;
1958}
1744 1959
1745MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1960MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1746 1961
1747PROTOTYPES: DISABLE 1962PROTOTYPES: DISABLE
1748 1963
1749BOOT: 1964BOOT:
1750{ 1965{
1751#ifdef USE_ITHREADS 1966#ifdef USE_ITHREADS
1752 MUTEX_INIT (&coro_lock); 1967 MUTEX_INIT (&coro_lock);
1968# if CORO_PTHREAD
1969 coro_thx = PERL_GET_CONTEXT;
1970# endif
1753#endif 1971#endif
1754 BOOT_PAGESIZE; 1972 BOOT_PAGESIZE;
1755 1973
1756 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1974 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1757 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1975 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
1820 av_push (coro->args, newSVsv (ST (i))); 2038 av_push (coro->args, newSVsv (ST (i)));
1821} 2039}
1822 OUTPUT: 2040 OUTPUT:
1823 RETVAL 2041 RETVAL
1824 2042
1825# these not obviously related functions are all rolled into the same xs
1826# function to increase chances that they all will call transfer with the same
1827# stack offset
1828void 2043void
1829_set_stacklevel (...) 2044_set_stacklevel (...)
1830 ALIAS: 2045 ALIAS:
1831 Coro::State::transfer = 1 2046 Coro::State::transfer = 1
1832 Coro::schedule = 2 2047 Coro::schedule = 2
1833 Coro::cede = 3 2048 Coro::cede = 3
1834 Coro::cede_notself = 4 2049 Coro::cede_notself = 4
1835 CODE: 2050 CODE:
1836{ 2051 coro_ssl_patch (aTHX_ cv, ix, &ST (0), items);
1837 struct transfer_args ta;
1838
1839 PUTBACK;
1840 switch (ix)
1841 {
1842 case 0:
1843 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1844 ta.next = 0;
1845 break;
1846
1847 case 1:
1848 if (items != 2)
1849 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1850
1851 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1852 break;
1853
1854 case 2:
1855 prepare_schedule (aTHX_ &ta);
1856 break;
1857
1858 case 3:
1859 prepare_cede (aTHX_ &ta);
1860 break;
1861
1862 case 4:
1863 if (!prepare_cede_notself (aTHX_ &ta))
1864 XSRETURN_EMPTY;
1865
1866 break;
1867 }
1868 SPAGAIN;
1869
1870 BARRIER;
1871 PUTBACK;
1872 TRANSFER (ta, 0);
1873 SPAGAIN; /* might be the sp of a different coroutine now */
1874 /* be extra careful not to ever do anything after TRANSFER */
1875}
1876 2052
1877bool 2053bool
1878_destroy (SV *coro_sv) 2054_destroy (SV *coro_sv)
1879 CODE: 2055 CODE:
1880 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
… …
1888 _exit (code); 2064 _exit (code);
1889 2065
1890int 2066int
1891cctx_stacksize (int new_stacksize = 0) 2067cctx_stacksize (int new_stacksize = 0)
1892 CODE: 2068 CODE:
1893 RETVAL = coro_stacksize; 2069 RETVAL = cctx_stacksize;
1894 if (new_stacksize) 2070 if (new_stacksize)
2071 {
1895 coro_stacksize = new_stacksize; 2072 cctx_stacksize = new_stacksize;
2073 ++cctx_gen;
2074 }
2075 OUTPUT:
2076 RETVAL
2077
2078int
2079cctx_max_idle (int max_idle = 0)
2080 CODE:
2081 RETVAL = cctx_max_idle;
2082 if (max_idle > 1)
2083 cctx_max_idle = max_idle;
1896 OUTPUT: 2084 OUTPUT:
1897 RETVAL 2085 RETVAL
1898 2086
1899int 2087int
1900cctx_count () 2088cctx_count ()
… …
1978 RETVAL = boolSV (coro->flags & ix); 2166 RETVAL = boolSV (coro->flags & ix);
1979 OUTPUT: 2167 OUTPUT:
1980 RETVAL 2168 RETVAL
1981 2169
1982void 2170void
2171throw (Coro::State self, SV *throw = &PL_sv_undef)
2172 PROTOTYPE: $;$
2173 CODE:
2174 SvREFCNT_dec (self->throw);
2175 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2176
2177void
1983api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2178api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1984 2179
1985SV * 2180SV *
1986has_cctx (Coro::State coro) 2181has_cctx (Coro::State coro)
1987 PROTOTYPE: $ 2182 PROTOTYPE: $
… …
1996 CODE: 2191 CODE:
1997 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2192 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1998 OUTPUT: 2193 OUTPUT:
1999 RETVAL 2194 RETVAL
2000 2195
2001IV 2196UV
2002rss (Coro::State coro) 2197rss (Coro::State coro)
2003 PROTOTYPE: $ 2198 PROTOTYPE: $
2004 ALIAS: 2199 ALIAS:
2005 usecount = 1 2200 usecount = 1
2006 CODE: 2201 CODE:
… …
2058 2253
2059 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2254 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2060 coro_ready[i] = newAV (); 2255 coro_ready[i] = newAV ();
2061 2256
2062 { 2257 {
2063 SV *sv = perl_get_sv ("Coro::API", TRUE); 2258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2064 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2065 2259
2066 coroapi.schedule = api_schedule; 2260 coroapi.schedule = api_schedule;
2067 coroapi.cede = api_cede; 2261 coroapi.cede = api_cede;
2068 coroapi.cede_notself = api_cede_notself; 2262 coroapi.cede_notself = api_cede_notself;
2069 coroapi.ready = api_ready; 2263 coroapi.ready = api_ready;
… …
2129 CODE: 2323 CODE:
2130 RETVAL = coro_nready; 2324 RETVAL = coro_nready;
2131 OUTPUT: 2325 OUTPUT:
2132 RETVAL 2326 RETVAL
2133 2327
2134void
2135throw (Coro::State self, SV *throw = &PL_sv_undef)
2136 PROTOTYPE: $;$
2137 CODE:
2138 SvREFCNT_dec (self->throw);
2139 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2140
2141# for async_pool speedup 2328# for async_pool speedup
2142void 2329void
2143_pool_1 (SV *cb) 2330_pool_1 (SV *cb)
2144 CODE: 2331 CODE:
2145{ 2332{
… …
2188 sv_setsv (cb, &PL_sv_undef); 2375 sv_setsv (cb, &PL_sv_undef);
2189 2376
2190 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2377 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2191 coro->saved_deffh = 0; 2378 coro->saved_deffh = 0;
2192 2379
2193 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2380 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2194 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2381 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2195 { 2382 {
2196 SV *old = PL_diehook; 2383 SV *old = PL_diehook;
2197 PL_diehook = 0; 2384 PL_diehook = 0;
2198 SvREFCNT_dec (old); 2385 SvREFCNT_dec (old);
… …
2344 2531
2345MODULE = Coro::State PACKAGE = PerlIO::cede 2532MODULE = Coro::State PACKAGE = PerlIO::cede
2346 2533
2347BOOT: 2534BOOT:
2348 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2535 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2536

Diff Legend

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