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.254 by root, Fri Nov 7 20:27:47 2008 UTC vs.
Revision 1.270 by root, Fri Nov 14 07:22:11 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 */
57static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
58 55
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? */
169static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 183static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
173static 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};
174 192
175static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 195static SV *rv_diehook;
178static SV *rv_warnhook; 196static SV *rv_warnhook;
280#define PRIO_MIN -4 298#define PRIO_MIN -4
281 299
282/* for Coro.pm */ 300/* for Coro.pm */
283static SV *coro_current; 301static SV *coro_current;
284static SV *coro_readyhook; 302static SV *coro_readyhook;
285static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
286static int coro_nready;
287static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
288 306
289/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
290 308
291static SV * 309static SV *
292coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
395 : 0 413 : 0
396 414
397#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)
398#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)
399 417
400static struct coro * 418INLINE struct coro *
401SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
402{ 420{
403 HV *stash; 421 HV *stash;
404 MAGIC *mg; 422 MAGIC *mg;
405 423
696 } 714 }
697 715
698 return rss; 716 return rss;
699} 717}
700 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;
744}
745
701/** coroutine stack handling ************************************************/ 746/** coroutine stack handling ************************************************/
702 747
703static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 748static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
704static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 749static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
705static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg); 750static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
822 PL_rs = newSVsv (GvSV (irsgv)); 867 PL_rs = newSVsv (GvSV (irsgv));
823 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
824 869
825 { 870 {
826 dSP; 871 dSP;
827 LOGOP myop; 872 UNOP myop;
828 873
829 Zero (&myop, 1, LOGOP); 874 Zero (&myop, 1, UNOP);
830 myop.op_next = Nullop; 875 myop.op_next = Nullop;
831 myop.op_flags = OPf_WANT_VOID; 876 myop.op_flags = OPf_WANT_VOID;
832 877
833 PUSHMARK (SP); 878 PUSHMARK (SP);
834 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
837 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
838 SPAGAIN; 883 SPAGAIN;
839 } 884 }
840 885
841 /* 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
842 * likely was suspended in set_stacklevel, called from entersub. 887 * likely was suspended in set_stacklevel, called from pp_set_stacklevel,
843 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 888 * so we have to emulate entering pp_set_stacklevel here.
844 * so we ENTER here for symmetry
845 */ 889 */
846 ENTER; 890 SLF_HEAD;
847} 891}
848 892
849static void 893static void
850coro_destruct (pTHX_ struct coro *coro) 894coro_destruct (pTHX_ struct coro *coro)
851{ 895{
880 SvREFCNT_dec (coro->throw); 924 SvREFCNT_dec (coro->throw);
881 925
882 coro_destruct_stacks (aTHX); 926 coro_destruct_stacks (aTHX);
883} 927}
884 928
885static void 929INLINE void
886free_coro_mortal (pTHX) 930free_coro_mortal (pTHX)
887{ 931{
888 if (expect_true (coro_mortal)) 932 if (expect_true (coro_mortal))
889 { 933 {
890 SvREFCNT_dec (coro_mortal); 934 SvREFCNT_dec (coro_mortal);
1014 1058
1015 TAINT_NOT; 1059 TAINT_NOT;
1016 return 0; 1060 return 0;
1017} 1061}
1018 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
1019/* 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 */
1020/* _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 */
1021/* during execution of a perl program */ 1072/* during execution of a perl program */
1073/* also initialises PL_top_env */
1022static void NOINLINE 1074static void NOINLINE
1023cctx_prepare (pTHX_ coro_cctx *cctx) 1075cctx_prepare (pTHX_ coro_cctx *cctx)
1024{ 1076{
1025 dSP; 1077 dSP;
1026 LOGOP myop; 1078 UNOP myop;
1027 1079
1028 PL_top_env = &PL_start_env; 1080 PL_top_env = &PL_start_env;
1029 1081
1030 if (cctx->flags & CC_TRACE) 1082 if (cctx->flags & CC_TRACE)
1031 PL_runops = runops_trace; 1083 PL_runops = runops_trace;
1032 1084
1033 Zero (&myop, 1, LOGOP); 1085 Zero (&myop, 1, UNOP);
1034 myop.op_next = PL_op; 1086 myop.op_next = PL_op;
1035 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1087 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1036 1088
1037 PUSHMARK (SP); 1089 PUSHMARK (SP);
1038 EXTEND (SP, 2); 1090 EXTEND (SP, 2);
1039 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1091 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1040 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1092 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1041 PUTBACK; 1093 PUTBACK;
1042 PL_op = (OP *)&myop; 1094 PL_op = (OP *)&myop;
1043 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1095 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1044 SPAGAIN; 1096 SPAGAIN;
1045} 1097}
1046 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
1047/* 1120/*
1048 * this is a _very_ stripped down perl interpreter ;) 1121 * this is a _very_ stripped down perl interpreter ;)
1049 */ 1122 */
1050static void 1123static void
1051cctx_run (void *arg) 1124cctx_run (void *arg)
1052{ 1125{
1126#ifdef USE_ITHREADS
1127# if CORO_PTHREAD
1128 PERL_SET_CONTEXT (coro_thx);
1129# endif
1130#endif
1131 {
1053 dTHX; 1132 dTHX;
1054 1133
1055 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1134 /* we are the alternative tail to pp_set_stacklevel */
1056 UNLOCK; 1135 /* so do the same things here */
1136 SLF_TAIL;
1057 1137
1058 /* we now skip the entersub that lead to transfer() */ 1138 /* we now skip the op that did lead to transfer() */
1059 PL_op = PL_op->op_next; 1139 PL_op = PL_op->op_next;
1060 1140
1061 /* inject a fake subroutine call to cctx_init */ 1141 /* inject a fake subroutine call to cctx_init */
1062 cctx_prepare (aTHX_ (coro_cctx *)arg); 1142 cctx_prepare (aTHX_ (coro_cctx *)arg);
1063 1143
1144 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX);
1146
1064 /* 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 */
1065 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1066 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1067 1150
1068 /* 1151 /*
1069 * 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
1070 * 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)
1071 * 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
1072 * bootstrap-time "top" top_env, as we cannot restore the "main" 1155 * bootstrap-time "top" top_env, as we cannot restore the "main"
1073 * coroutine as Coro has no such concept 1156 * coroutine as Coro has no such concept
1074 */ 1157 */
1075 PL_top_env = main_top_env; 1158 PL_top_env = main_top_env;
1076 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 }
1077} 1161}
1078 1162
1079static coro_cctx * 1163static coro_cctx *
1080cctx_new () 1164cctx_new ()
1081{ 1165{
1082 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 ();
1083 void *stack_start; 1195 void *stack_start;
1084 size_t stack_size; 1196 size_t stack_size;
1085
1086 ++cctx_count;
1087 Newz (0, cctx, 1, coro_cctx);
1088
1089 cctx->gen = cctx_gen;
1090 1197
1091#if HAVE_MMAP 1198#if HAVE_MMAP
1092 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1199 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1093 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1094 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);
1095 1202
1096 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1097 { 1204 {
1098# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1099 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1100# endif 1207 #endif
1101 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1102 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1103 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1104 } 1211 }
1105 else 1212 else
1106#endif 1213#endif
1107 { 1214 {
1108 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1109 New (0, cctx->sptr, cctx_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1110 1217
1111 if (!cctx->sptr) 1218 if (!cctx->sptr)
1112 { 1219 {
1113 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1114 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1115 } 1222 }
1116 1223
1117 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1118 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1119 } 1226 }
1120 1227
1121 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
1122 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);
1123 1233
1124 return cctx; 1234 return cctx;
1125} 1235}
1126 1236
1134 coro_destroy (&cctx->cctx); 1244 coro_destroy (&cctx->cctx);
1135 1245
1136 /* coro_transfer creates new, empty cctx's */ 1246 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr) 1247 if (cctx->sptr)
1138 { 1248 {
1139#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1141#endif 1251 #endif
1142 1252
1143#if HAVE_MMAP 1253#if HAVE_MMAP
1144 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1145 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1146 else 1256 else
1167 return cctx; 1277 return cctx;
1168 1278
1169 cctx_destroy (cctx); 1279 cctx_destroy (cctx);
1170 } 1280 }
1171 1281
1172 return cctx_new (); 1282 return cctx_new_run ();
1173} 1283}
1174 1284
1175static void 1285static void
1176cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1177{ 1287{
1178 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));
1179 1289
1180 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1181 if (expect_false (cctx_idle >= cctx_max_idle)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1182 { 1292 {
1183 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
1222 dSTACKLEVEL; 1332 dSTACKLEVEL;
1223 1333
1224 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1225 if (expect_false (!next)) 1335 if (expect_false (!next))
1226 { 1336 {
1227 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1228 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 */
1229 } 1339 }
1230 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1231 { 1341 {
1232 static volatile int has_throw;
1233 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1234 1343
1235 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1236 { 1345 {
1237 /* create a new empty/source context */ 1346 /* create a new empty/source context */
1238 ++cctx_count; 1347 prev->cctx = cctx_new_empty ();
1239 New (0, prev->cctx, 1, coro_cctx);
1240 prev->cctx->sptr = 0;
1241 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1242
1243 prev->flags &= ~CF_NEW; 1348 prev->flags &= ~CF_NEW;
1244 prev->flags |= CF_RUNNING; 1349 prev->flags |= CF_RUNNING;
1245 } 1350 }
1246 1351
1247 prev->flags &= ~CF_RUNNING; 1352 prev->flags &= ~CF_RUNNING;
1262 else 1367 else
1263 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1264 1369
1265 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1266 1371
1267 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1268 if (expect_true ( 1373 if (expect_true (
1269 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1270 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1271 && !force_cctx 1376 && !force_cctx
1272 )) 1377 ))
1273 { 1378 {
1274 /* 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 */
1275 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));
1276 1381
1277 prev->cctx = 0; 1382 prev->cctx = 0;
1278 1383
1279 /* 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 */
1280 /* 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 */
1288 ++next->usecount; 1393 ++next->usecount;
1289 1394
1290 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1291 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1292 1397
1293 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1294 1400
1295 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1296 { 1402 {
1297 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1298 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1299 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1300 } 1406 }
1301 1407
1302 free_coro_mortal (aTHX); 1408 transfer_tail (aTHX);
1303 UNLOCK;
1304
1305 if (expect_false (has_throw))
1306 {
1307 struct coro *coro = SvSTATE (coro_current);
1308
1309 if (coro->throw)
1310 {
1311 SV *exception = coro->throw;
1312 coro->throw = 0;
1313 sv_setsv (ERRSV, exception);
1314 croak (0);
1315 }
1316 }
1317 } 1409 }
1318} 1410}
1319
1320struct transfer_args
1321{
1322 struct coro *prev, *next;
1323};
1324 1411
1325#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))
1326#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1327 1414
1328/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
1418 ta->next = SvSTATE (next_sv); 1505 ta->next = SvSTATE (next_sv);
1419 TRANSFER_CHECK (*ta); 1506 TRANSFER_CHECK (*ta);
1420} 1507}
1421 1508
1422static void 1509static void
1423api_transfer (SV *prev_sv, SV *next_sv) 1510api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1424{ 1511{
1425 dTHX;
1426 struct transfer_args ta; 1512 struct transfer_args ta;
1427 1513
1428 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1514 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1429 TRANSFER (ta, 1); 1515 TRANSFER (ta, 1);
1430} 1516}
1448 1534
1449 return 0; 1535 return 0;
1450} 1536}
1451 1537
1452static int 1538static int
1453api_ready (SV *coro_sv) 1539api_ready (pTHX_ SV *coro_sv)
1454{ 1540{
1455 dTHX;
1456 struct coro *coro; 1541 struct coro *coro;
1457 SV *sv_hook; 1542 SV *sv_hook;
1458 void (*xs_hook)(void); 1543 void (*xs_hook)(void);
1459 1544
1460 if (SvROK (coro_sv)) 1545 if (SvROK (coro_sv))
1498 1583
1499 return 1; 1584 return 1;
1500} 1585}
1501 1586
1502static int 1587static int
1503api_is_ready (SV *coro_sv) 1588api_is_ready (pTHX_ SV *coro_sv)
1504{ 1589{
1505 dTHX;
1506 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1590 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1507} 1591}
1508 1592
1509static void 1593INLINE void
1510prepare_schedule (pTHX_ struct transfer_args *ta) 1594prepare_schedule (pTHX_ struct transfer_args *ta)
1511{ 1595{
1512 SV *prev_sv, *next_sv; 1596 SV *prev_sv, *next_sv;
1513 1597
1514 for (;;) 1598 for (;;)
1540 /* cannot transfer to destroyed coros, skip and look for next */ 1624 /* cannot transfer to destroyed coros, skip and look for next */
1541 if (expect_false (ta->next->flags & CF_DESTROYED)) 1625 if (expect_false (ta->next->flags & CF_DESTROYED))
1542 { 1626 {
1543 UNLOCK; 1627 UNLOCK;
1544 SvREFCNT_dec (next_sv); 1628 SvREFCNT_dec (next_sv);
1545 /* coro_nready is already taken care of by destroy */ 1629 /* coro_nready has already been taken care of by destroy */
1546 continue; 1630 continue;
1547 } 1631 }
1548 1632
1549 --coro_nready; 1633 --coro_nready;
1550 UNLOCK; 1634 UNLOCK;
1553 1637
1554 /* free this only after the transfer */ 1638 /* free this only after the transfer */
1555 prev_sv = SvRV (coro_current); 1639 prev_sv = SvRV (coro_current);
1556 ta->prev = SvSTATE (prev_sv); 1640 ta->prev = SvSTATE (prev_sv);
1557 TRANSFER_CHECK (*ta); 1641 TRANSFER_CHECK (*ta);
1558 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));
1559 ta->next->flags &= ~CF_READY; 1643 ta->next->flags &= ~CF_READY;
1560 SvRV_set (coro_current, next_sv); 1644 SvRV_set (coro_current, next_sv);
1561 1645
1562 LOCK; 1646 LOCK;
1563 free_coro_mortal (aTHX); 1647 free_coro_mortal (aTHX);
1564 coro_mortal = prev_sv; 1648 coro_mortal = prev_sv;
1565 UNLOCK; 1649 UNLOCK;
1566} 1650}
1567 1651
1652INLINE void
1653prepare_cede (pTHX_ struct transfer_args *ta)
1654{
1655 api_ready (aTHX_ coro_current);
1656 prepare_schedule (aTHX_ ta);
1657}
1658
1568static void 1659static void
1569prepare_cede (pTHX_ struct transfer_args *ta) 1660prepare_cede_notself (pTHX_ struct transfer_args *ta)
1570{ 1661{
1571 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
1572 prepare_schedule (aTHX_ ta); 1678 prepare_schedule (aTHX_ &ta);
1679 TRANSFER (ta, 1);
1573} 1680}
1574 1681
1575static int 1682static int
1576prepare_cede_notself (pTHX_ struct transfer_args *ta) 1683api_cede (pTHX)
1577{ 1684{
1578 if (coro_nready) 1685 struct transfer_args ta;
1579 { 1686
1580 SV *prev = SvRV (coro_current);
1581 prepare_schedule (aTHX_ ta); 1687 prepare_cede (aTHX_ &ta);
1582 api_ready (prev); 1688
1689 if (expect_true (ta.prev != ta.next))
1690 {
1691 TRANSFER (ta, 1);
1583 return 1; 1692 return 1;
1584 } 1693 }
1585 else 1694 else
1586 return 0; 1695 return 0;
1587} 1696}
1588 1697
1589static void
1590api_schedule (void)
1591{
1592 dTHX;
1593 struct transfer_args ta;
1594
1595 prepare_schedule (aTHX_ &ta);
1596 TRANSFER (ta, 1);
1597}
1598
1599static int 1698static int
1600api_cede (void) 1699api_cede_notself (pTHX)
1601{ 1700{
1602 dTHX; 1701 if (coro_nready)
1702 {
1603 struct transfer_args ta; 1703 struct transfer_args ta;
1604 1704
1605 prepare_cede (aTHX_ &ta); 1705 prepare_cede_notself (aTHX_ &ta);
1606
1607 if (expect_true (ta.prev != ta.next))
1608 {
1609 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1610 return 1; 1707 return 1;
1611 } 1708 }
1612 else 1709 else
1613 return 0; 1710 return 0;
1614} 1711}
1615 1712
1616static int
1617api_cede_notself (void)
1618{
1619 dTHX;
1620 struct transfer_args ta;
1621
1622 if (prepare_cede_notself (aTHX_ &ta))
1623 {
1624 TRANSFER (ta, 1);
1625 return 1;
1626 }
1627 else
1628 return 0;
1629}
1630
1631static void 1713static void
1632api_trace (SV *coro_sv, int flags) 1714api_trace (pTHX_ SV *coro_sv, int flags)
1633{ 1715{
1634 dTHX;
1635 struct coro *coro = SvSTATE (coro_sv); 1716 struct coro *coro = SvSTATE (coro_sv);
1636 1717
1637 if (flags & CC_TRACE) 1718 if (flags & CC_TRACE)
1638 { 1719 {
1639 if (!coro->cctx) 1720 if (!coro->cctx)
1640 coro->cctx = cctx_new (); 1721 coro->cctx = cctx_new_run ();
1641 else if (!(coro->cctx->flags & CC_TRACE)) 1722 else if (!(coro->cctx->flags & CC_TRACE))
1642 croak ("cannot enable tracing on coroutine with custom stack"); 1723 croak ("cannot enable tracing on coroutine with custom stack");
1643 1724
1644 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1725 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1645 } 1726 }
1652 else 1733 else
1653 coro->slot->runops = RUNOPS_DEFAULT; 1734 coro->slot->runops = RUNOPS_DEFAULT;
1654 } 1735 }
1655} 1736}
1656 1737
1738#if 0
1657static int 1739static int
1658coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1740coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1659{ 1741{
1660 AV *padlist; 1742 AV *padlist;
1661 AV *av = (AV *)mg->mg_obj; 1743 AV *av = (AV *)mg->mg_obj;
1667 1749
1668static MGVTBL coro_gensub_vtbl = { 1750static MGVTBL coro_gensub_vtbl = {
1669 0, 0, 0, 0, 1751 0, 0, 0, 0,
1670 coro_gensub_free 1752 coro_gensub_free
1671}; 1753};
1754#endif
1672 1755
1673/*****************************************************************************/ 1756/*****************************************************************************/
1674/* PerlIO::cede */ 1757/* PerlIO::cede */
1675 1758
1676typedef struct 1759typedef struct
1704 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1787 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1705 double now = nvtime (); 1788 double now = nvtime ();
1706 1789
1707 if (now >= self->next) 1790 if (now >= self->next)
1708 { 1791 {
1709 api_cede (); 1792 api_cede (aTHX);
1710 self->next = now + self->every; 1793 self->next = now + self->every;
1711 } 1794 }
1712 1795
1713 return PerlIOBuf_flush (aTHX_ f); 1796 return PerlIOBuf_flush (aTHX_ f);
1714} 1797}
1743 PerlIOBuf_get_ptr, 1826 PerlIOBuf_get_ptr,
1744 PerlIOBuf_get_cnt, 1827 PerlIOBuf_get_cnt,
1745 PerlIOBuf_set_ptrcnt, 1828 PerlIOBuf_set_ptrcnt,
1746}; 1829};
1747 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
1884 /* do a quick consistency check on the "function" object, and if it isn't */
1885 /* for us, divert to the real entersub */
1886 if (SvTYPE (*sp) != SVt_PVGV || CvXSUB (GvCV (*sp)) != XS_Coro__State__set_stacklevel)
1887 return PL_ppaddr[OP_ENTERSUB](aTHX);
1888
1889 /* pop args */
1890 SP = PL_stack_base + POPMARK;
1891
1892 if (!(PL_op->op_flags & OPf_STACKED))
1893 {
1894 /* ampersand-form of call, use @_ instead of stack */
1895 AV *av = GvAV (PL_defgv);
1896 arg = AvARRAY (av);
1897 items = AvFILLp (av) + 1;
1898 }
1899
1900 PUTBACK;
1901
1902 if (!ix)
1903 {
1904 slf = (struct CoroSLF *)CvSTART (GvCV (*sp));
1905 ix = slf->prepare (aTHX_ arg, items);
1906 }
1907
1908 switch (ix)
1909 {
1910 case CORO_SLF_SET_STACKLEVEL:
1911 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1912 break;
1913
1914 case CORO_SLF_TRANSFER:
1915 if (items != 2)
1916 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1917
1918 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1919 break;
1920
1921 case CORO_SLF_SCHEDULE:
1922 prepare_schedule (aTHX_ &ta);
1923 break;
1924
1925 case CORO_SLF_CEDE:
1926 prepare_cede (aTHX_ &ta);
1927 break;
1928
1929 case CORO_SLF_CEDE_NOTSELF:
1930 prepare_cede_notself (aTHX_ &ta);
1931 break;
1932
1933 default:
1934 abort ();
1935 }
1936
1937 do
1938 TRANSFER (ta, 0);
1939 while (slf && slf->check (aTHX));
1940
1941 SPAGAIN;
1942
1943 PUTBACK;
1944 SLF_TAIL;
1945 SPAGAIN;
1946 RETURN;
1947}
1948
1949static void
1950coro_slf_patch (pTHX_ CV *cv, int ix, SV **args, int items)
1951{
1952 assert (("FATAL: SLF call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_slf));
1953
1954 assert (("FATAL: SLF call with illegal CV value", CvGV (cv)));
1955 slf_cv = cv;
1956
1957 /* we patch the op, and then re-run the whole call */
1958 /* we have to put the same argument on the stack for this to work */
1959 /* and this will be done by pp_restore */
1960 slf_restore.op_next = (OP *)&slf_restore;
1961 slf_restore.op_type = OP_NULL;
1962 slf_restore.op_ppaddr = pp_restore;
1963 slf_restore.op_first = PL_op;
1964
1965 slf_arg0 = items > 0 ? SvREFCNT_inc (args [0]) : 0;
1966 slf_arg1 = items > 1 ? SvREFCNT_inc (args [1]) : 0;
1967
1968 PL_op->op_ppaddr = pp_slf;
1969 PL_op->op_private = PL_op->op_private & ~OPpENTERSUB_SLF | ix; /* we potentially share our private flags with entersub */
1970
1971 PL_op = (OP *)&slf_restore;
1972}
1748 1973
1749MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1974MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1750 1975
1751PROTOTYPES: DISABLE 1976PROTOTYPES: DISABLE
1752 1977
1753BOOT: 1978BOOT:
1754{ 1979{
1755#ifdef USE_ITHREADS 1980#ifdef USE_ITHREADS
1756 MUTEX_INIT (&coro_lock); 1981 MUTEX_INIT (&coro_lock);
1982# if CORO_PTHREAD
1983 coro_thx = PERL_GET_CONTEXT;
1984# endif
1757#endif 1985#endif
1758 BOOT_PAGESIZE; 1986 BOOT_PAGESIZE;
1759 1987
1760 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1988 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1761 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1989 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1824 av_push (coro->args, newSVsv (ST (i))); 2052 av_push (coro->args, newSVsv (ST (i)));
1825} 2053}
1826 OUTPUT: 2054 OUTPUT:
1827 RETVAL 2055 RETVAL
1828 2056
1829# these not obviously related functions are all rolled into the same xs
1830# function to increase chances that they all will call transfer with the same
1831# stack offset
1832void 2057void
1833_set_stacklevel (...) 2058_set_stacklevel (...)
1834 ALIAS: 2059 ALIAS:
2060 _set_stacklevel = CORO_SLF_SET_STACKLEVEL
1835 Coro::State::transfer = 1 2061 Coro::State::transfer = CORO_SLF_TRANSFER
1836 Coro::schedule = 2 2062 Coro::schedule = CORO_SLF_SCHEDULE
1837 Coro::cede = 3 2063 Coro::cede = CORO_SLF_CEDE
1838 Coro::cede_notself = 4 2064 Coro::cede_notself = CORO_SLF_CEDE_NOTSELF
1839 CODE: 2065 CODE:
1840{ 2066 coro_slf_patch (aTHX_ cv, ix, &ST (0), items);
1841 struct transfer_args ta;
1842
1843 PUTBACK;
1844 switch (ix)
1845 {
1846 case 0:
1847 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1848 ta.next = 0;
1849 break;
1850
1851 case 1:
1852 if (items != 2)
1853 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1854
1855 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1856 break;
1857
1858 case 2:
1859 prepare_schedule (aTHX_ &ta);
1860 break;
1861
1862 case 3:
1863 prepare_cede (aTHX_ &ta);
1864 break;
1865
1866 case 4:
1867 if (!prepare_cede_notself (aTHX_ &ta))
1868 XSRETURN_EMPTY;
1869
1870 break;
1871 }
1872 SPAGAIN;
1873
1874 BARRIER;
1875 PUTBACK;
1876 TRANSFER (ta, 0);
1877 SPAGAIN; /* might be the sp of a different coroutine now */
1878 /* be extra careful not to ever do anything after TRANSFER */
1879}
1880 2067
1881bool 2068bool
1882_destroy (SV *coro_sv) 2069_destroy (SV *coro_sv)
1883 CODE: 2070 CODE:
1884 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2071 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1994 RETVAL = boolSV (coro->flags & ix); 2181 RETVAL = boolSV (coro->flags & ix);
1995 OUTPUT: 2182 OUTPUT:
1996 RETVAL 2183 RETVAL
1997 2184
1998void 2185void
2186throw (Coro::State self, SV *throw = &PL_sv_undef)
2187 PROTOTYPE: $;$
2188 CODE:
2189 SvREFCNT_dec (self->throw);
2190 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2191
2192void
1999api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2193api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2194 C_ARGS: aTHX_ coro, flags
2000 2195
2001SV * 2196SV *
2002has_cctx (Coro::State coro) 2197has_cctx (Coro::State coro)
2003 PROTOTYPE: $ 2198 PROTOTYPE: $
2004 CODE: 2199 CODE:
2012 CODE: 2207 CODE:
2013 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2208 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
2014 OUTPUT: 2209 OUTPUT:
2015 RETVAL 2210 RETVAL
2016 2211
2017IV 2212UV
2018rss (Coro::State coro) 2213rss (Coro::State coro)
2019 PROTOTYPE: $ 2214 PROTOTYPE: $
2020 ALIAS: 2215 ALIAS:
2021 usecount = 1 2216 usecount = 1
2022 CODE: 2217 CODE:
2074 2269
2075 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2270 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2076 coro_ready[i] = newAV (); 2271 coro_ready[i] = newAV ();
2077 2272
2078 { 2273 {
2079 SV *sv = perl_get_sv ("Coro::API", TRUE); 2274 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2080 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2081 2275
2082 coroapi.schedule = api_schedule; 2276 coroapi.schedule = api_schedule;
2083 coroapi.cede = api_cede; 2277 coroapi.cede = api_cede;
2084 coroapi.cede_notself = api_cede_notself; 2278 coroapi.cede_notself = api_cede_notself;
2085 coroapi.ready = api_ready; 2279 coroapi.ready = api_ready;
2086 coroapi.is_ready = api_is_ready; 2280 coroapi.is_ready = api_is_ready;
2087 coroapi.nready = &coro_nready; 2281 coroapi.nready = coro_nready;
2088 coroapi.current = coro_current; 2282 coroapi.current = coro_current;
2089 2283
2090 GCoroAPI = &coroapi; 2284 GCoroAPI = &coroapi;
2091 sv_setiv (sv, (IV)&coroapi); 2285 sv_setiv (sv, (IV)&coroapi);
2092 SvREADONLY_on (sv); 2286 SvREADONLY_on (sv);
2133 2327
2134SV * 2328SV *
2135ready (SV *self) 2329ready (SV *self)
2136 PROTOTYPE: $ 2330 PROTOTYPE: $
2137 CODE: 2331 CODE:
2138 RETVAL = boolSV (api_ready (self)); 2332 RETVAL = boolSV (api_ready (aTHX_ self));
2139 OUTPUT: 2333 OUTPUT:
2140 RETVAL 2334 RETVAL
2141 2335
2142int 2336int
2143nready (...) 2337nready (...)
2145 CODE: 2339 CODE:
2146 RETVAL = coro_nready; 2340 RETVAL = coro_nready;
2147 OUTPUT: 2341 OUTPUT:
2148 RETVAL 2342 RETVAL
2149 2343
2150void
2151throw (Coro::State self, SV *throw = &PL_sv_undef)
2152 PROTOTYPE: $;$
2153 CODE:
2154 SvREFCNT_dec (self->throw);
2155 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2156
2157# for async_pool speedup 2344# for async_pool speedup
2158void 2345void
2159_pool_1 (SV *cb) 2346_pool_1 (SV *cb)
2160 CODE: 2347 CODE:
2161{ 2348{
2204 sv_setsv (cb, &PL_sv_undef); 2391 sv_setsv (cb, &PL_sv_undef);
2205 2392
2206 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2393 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2207 coro->saved_deffh = 0; 2394 coro->saved_deffh = 0;
2208 2395
2209 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2396 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2210 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2397 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2211 { 2398 {
2212 SV *old = PL_diehook; 2399 SV *old = PL_diehook;
2213 PL_diehook = 0; 2400 PL_diehook = 0;
2214 SvREFCNT_dec (old); 2401 SvREFCNT_dec (old);
2220 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2407 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2221 2408
2222 coro->prio = 0; 2409 coro->prio = 0;
2223 2410
2224 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2411 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2225 api_trace (coro_current, 0); 2412 api_trace (aTHX_ coro_current, 0);
2226 2413
2227 av_push (av_async_pool, newSVsv (coro_current)); 2414 av_push (av_async_pool, newSVsv (coro_current));
2228} 2415}
2229 2416
2230#if 0 2417#if 0
2302 2489
2303 av_push (av, data_sv); 2490 av_push (av, data_sv);
2304 2491
2305 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 2492 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2306 2493
2307 api_ready (self); 2494 api_ready (aTHX_ self);
2308} 2495}
2309 2496
2310void 2497void
2311_set_state (SV *state) 2498_set_state (SV *state)
2312 PROTOTYPE: $ 2499 PROTOTYPE: $
2337 PROTOTYPE: @ 2524 PROTOTYPE: @
2338 CODE: 2525 CODE:
2339{ 2526{
2340 static int incede; 2527 static int incede;
2341 2528
2342 api_cede_notself (); 2529 api_cede_notself (aTHX);
2343 2530
2344 ++incede; 2531 ++incede;
2345 while (coro_nready >= incede && api_cede ()) 2532 while (coro_nready >= incede && api_cede (aTHX))
2346 ; 2533 ;
2347 2534
2348 sv_setsv (sv_activity, &PL_sv_undef); 2535 sv_setsv (sv_activity, &PL_sv_undef);
2349 if (coro_nready >= incede) 2536 if (coro_nready >= incede)
2350 { 2537 {
2360 2547
2361MODULE = Coro::State PACKAGE = PerlIO::cede 2548MODULE = Coro::State PACKAGE = PerlIO::cede
2362 2549
2363BOOT: 2550BOOT:
2364 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2551 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2552

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines