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.255 by root, Sat Nov 8 04:52:01 2008 UTC vs.
Revision 1.264 by root, Fri Nov 14 02:29:09 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
… …
126 123
127#define IN_DESTRUCT (PL_main_cv == Nullcv) 124#define IN_DESTRUCT (PL_main_cv == Nullcv)
128 125
129#if __GNUC__ >= 3 126#if __GNUC__ >= 3
130# define attribute(x) __attribute__(x) 127# define attribute(x) __attribute__(x)
131# define BARRIER __asm__ __volatile__ ("" : : : "memory")
132# define expect(expr,value) __builtin_expect ((expr),(value)) 128# define expect(expr,value) __builtin_expect ((expr),(value))
129# define INLINE static inline
133#else 130#else
134# define attribute(x) 131# define attribute(x)
135# define BARRIER
136# define expect(expr,value) (expr) 132# define expect(expr,value) (expr)
133# define INLINE static
137#endif 134#endif
138 135
139#define expect_false(expr) expect ((expr) != 0, 0) 136#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1) 137#define expect_true(expr) expect ((expr) != 0, 1)
141 138
142#define NOINLINE attribute ((noinline)) 139#define NOINLINE attribute ((noinline))
143 140
144#include "CoroAPI.h" 141#include "CoroAPI.h"
145 142
146#ifdef USE_ITHREADS 143#ifdef USE_ITHREADS
144
147static perl_mutex coro_lock; 145static perl_mutex coro_lock;
148# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0) 146# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
149# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0) 147# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
148# if CORO_PTHREAD
149static void *coro_thx;
150# endif
151
150#else 152#else
153
151# define LOCK (void)0 154# define LOCK (void)0
152# define UNLOCK (void)0 155# define UNLOCK (void)0
156
153#endif 157#endif
158
159# undef LOCK
160# define LOCK (void)0
161# undef UNLOCK
162# define UNLOCK (void)0
154 163
155/* helper storage struct for Coro::AIO */ 164/* helper storage struct for Coro::AIO */
156struct io_state 165struct io_state
157{ 166{
158 AV *res; 167 AV *res;
… …
169static struct CoroAPI coroapi; 178static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 179static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 180static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 181static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 182static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
183static volatile struct coro *transfer_next;
184
185struct transfer_args
186{
187 struct coro *prev, *next;
188};
174 189
175static GV *irsgv; /* $/ */ 190static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 191static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 192static SV *rv_diehook;
178static SV *rv_warnhook; 193static SV *rv_warnhook;
… …
280#define PRIO_MIN -4 295#define PRIO_MIN -4
281 296
282/* for Coro.pm */ 297/* for Coro.pm */
283static SV *coro_current; 298static SV *coro_current;
284static SV *coro_readyhook; 299static SV *coro_readyhook;
285static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 300static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
286static int coro_nready; 301static int coro_nready;
287static struct coro *coro_first; 302static struct coro *coro_first;
288 303
289/** lowlevel stuff **********************************************************/ 304/** lowlevel stuff **********************************************************/
290 305
… …
395 : 0 410 : 0
396 411
397#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 412#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) 413#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
399 414
400static struct coro * 415INLINE struct coro *
401SvSTATE_ (pTHX_ SV *coro) 416SvSTATE_ (pTHX_ SV *coro)
402{ 417{
403 HV *stash; 418 HV *stash;
404 MAGIC *mg; 419 MAGIC *mg;
405 420
… …
709#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 724#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
710 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 725 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
711 (const char*)(mg)->mg_ptr) 726 (const char*)(mg)->mg_ptr)
712#endif 727#endif
713 728
729/* we sometimes need to create the effect of entersub calling us */
730#define SSL_HEAD (void)0
731/* we somtimes need to create the effect of leaving via entersub */
732#define SSL_TAIL (void)0
733
714/* 734/*
715 * This overrides the default magic get method of %SIG elements. 735 * This overrides the default magic get method of %SIG elements.
716 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 736 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
717 * and instead of tryign to save and restore the hash elements, we just provide 737 * and instead of tryign to save and restore the hash elements, we just provide
718 * readback here. 738 * readback here.
… …
822 PL_rs = newSVsv (GvSV (irsgv)); 842 PL_rs = newSVsv (GvSV (irsgv));
823 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 843 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
824 844
825 { 845 {
826 dSP; 846 dSP;
827 LOGOP myop; 847 UNOP myop;
828 848
829 Zero (&myop, 1, LOGOP); 849 Zero (&myop, 1, UNOP);
830 myop.op_next = Nullop; 850 myop.op_next = Nullop;
831 myop.op_flags = OPf_WANT_VOID; 851 myop.op_flags = OPf_WANT_VOID;
832 852
833 PUSHMARK (SP); 853 PUSHMARK (SP);
834 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 854 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
838 SPAGAIN; 858 SPAGAIN;
839 } 859 }
840 860
841 /* this newly created coroutine might be run on an existing cctx which most 861 /* this newly created coroutine might be run on an existing cctx which most
842 * likely was suspended in set_stacklevel, called from entersub. 862 * likely was suspended in set_stacklevel, called from entersub.
843 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 863 * set_stacklevel doesn't do anything on return, but entersub does LEAVE,
844 * so we ENTER here for symmetry 864 * so we ENTER here for symmetry.
845 */ 865 */
846 ENTER; 866 SSL_HEAD;
847} 867}
848 868
849static void 869static void
850coro_destruct (pTHX_ struct coro *coro) 870coro_destruct (pTHX_ struct coro *coro)
851{ 871{
… …
880 SvREFCNT_dec (coro->throw); 900 SvREFCNT_dec (coro->throw);
881 901
882 coro_destruct_stacks (aTHX); 902 coro_destruct_stacks (aTHX);
883} 903}
884 904
885static void 905INLINE void
886free_coro_mortal (pTHX) 906free_coro_mortal (pTHX)
887{ 907{
888 if (expect_true (coro_mortal)) 908 if (expect_true (coro_mortal))
889 { 909 {
890 SvREFCNT_dec (coro_mortal); 910 SvREFCNT_dec (coro_mortal);
… …
1014 1034
1015 TAINT_NOT; 1035 TAINT_NOT;
1016 return 0; 1036 return 0;
1017} 1037}
1018 1038
1039static void
1040prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx)
1041{
1042 ta->prev = (struct coro *)cctx;
1043 ta->next = 0;
1044}
1045
1019/* inject a fake call to Coro::State::_cctx_init into the execution */ 1046/* 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 */ 1047/* _cctx_init should be careful, as it could be called at almost any time */
1021/* during execution of a perl program */ 1048/* during execution of a perl program */
1049/* also initialises PL_top_env */
1022static void NOINLINE 1050static void NOINLINE
1023cctx_prepare (pTHX_ coro_cctx *cctx) 1051cctx_prepare (pTHX_ coro_cctx *cctx)
1024{ 1052{
1025 dSP; 1053 dSP;
1026 LOGOP myop; 1054 UNOP myop;
1027 1055
1028 PL_top_env = &PL_start_env; 1056 PL_top_env = &PL_start_env;
1029 1057
1030 if (cctx->flags & CC_TRACE) 1058 if (cctx->flags & CC_TRACE)
1031 PL_runops = runops_trace; 1059 PL_runops = runops_trace;
1032 1060
1033 Zero (&myop, 1, LOGOP); 1061 Zero (&myop, 1, UNOP);
1034 myop.op_next = PL_op; 1062 myop.op_next = PL_op;
1035 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1063 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1036 1064
1037 PUSHMARK (SP); 1065 PUSHMARK (SP);
1038 EXTEND (SP, 2); 1066 EXTEND (SP, 2);
1039 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1067 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1040 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1068 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1041 PUTBACK; 1069 PUTBACK;
1042 PL_op = (OP *)&myop; 1070 PL_op = (OP *)&myop;
1043 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1071 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1044 SPAGAIN; 1072 SPAGAIN;
1045} 1073}
1046 1074
1075/* the tail of transfer: execute stuff we can only do after a transfer */
1076INLINE void
1077transfer_tail (pTHX)
1078{
1079 struct coro *next = (struct coro *)transfer_next;
1080 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1081 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1082
1083 free_coro_mortal (aTHX);
1084 UNLOCK;
1085
1086 if (expect_false (next->throw))
1087 {
1088 SV *exception = sv_2mortal (next->throw);
1089
1090 next->throw = 0;
1091 sv_setsv (ERRSV, exception);
1092 croak (0);
1093 }
1094}
1095
1047/* 1096/*
1048 * this is a _very_ stripped down perl interpreter ;) 1097 * this is a _very_ stripped down perl interpreter ;)
1049 */ 1098 */
1050static void 1099static void
1051cctx_run (void *arg) 1100cctx_run (void *arg)
1052{ 1101{
1102#ifdef USE_ITHREADS
1103# if CORO_PTHREAD
1104 PERL_SET_CONTEXT (coro_thx);
1105# endif
1106#endif
1107 {
1053 dTHX; 1108 dTHX;
1054 1109
1055 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1110 /* entersub called ENTER, but we never 'returned', undo that here */
1056 UNLOCK; 1111 SSL_TAIL;
1057 1112
1058 /* we now skip the entersub that lead to transfer() */ 1113 /* we now skip the op that did lead to transfer() */
1059 PL_op = PL_op->op_next; 1114 PL_op = PL_op->op_next;
1060 1115
1061 /* inject a fake subroutine call to cctx_init */ 1116 /* inject a fake subroutine call to cctx_init */
1062 cctx_prepare (aTHX_ (coro_cctx *)arg); 1117 cctx_prepare (aTHX_ (coro_cctx *)arg);
1063 1118
1119 /* cctx_run is the alternative tail of transfer() */
1120 transfer_tail (aTHX);
1121
1064 /* somebody or something will hit me for both perl_run and PL_restartop */ 1122 /* somebody or something will hit me for both perl_run and PL_restartop */
1065 PL_restartop = PL_op; 1123 PL_restartop = PL_op;
1066 perl_run (PL_curinterp); 1124 perl_run (PL_curinterp);
1067 1125
1068 /* 1126 /*
1069 * If perl-run returns we assume exit() was being called or the coro 1127 * 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) 1128 * 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 1129 * 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" 1130 * bootstrap-time "top" top_env, as we cannot restore the "main"
1073 * coroutine as Coro has no such concept 1131 * coroutine as Coro has no such concept
1074 */ 1132 */
1075 PL_top_env = main_top_env; 1133 PL_top_env = main_top_env;
1076 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1134 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1135 }
1077} 1136}
1078 1137
1079static coro_cctx * 1138static coro_cctx *
1080cctx_new () 1139cctx_new ()
1081{ 1140{
1082 coro_cctx *cctx; 1141 coro_cctx *cctx;
1142
1143 ++cctx_count;
1144 New (0, cctx, 1, coro_cctx);
1145
1146 cctx->gen = cctx_gen;
1147 cctx->flags = 0;
1148 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1149
1150 return cctx;
1151}
1152
1153/* create a new cctx only suitable as source */
1154static coro_cctx *
1155cctx_new_empty ()
1156{
1157 coro_cctx *cctx = cctx_new ();
1158
1159 cctx->sptr = 0;
1160 coro_create (&cctx->cctx, 0, 0, 0, 0);
1161
1162 return cctx;
1163}
1164
1165/* create a new cctx suitable as destination/running a perl interpreter */
1166static coro_cctx *
1167cctx_new_run ()
1168{
1169 coro_cctx *cctx = cctx_new ();
1083 void *stack_start; 1170 void *stack_start;
1084 size_t stack_size; 1171 size_t stack_size;
1085
1086 ++cctx_count;
1087 Newz (0, cctx, 1, coro_cctx);
1088
1089 cctx->gen = cctx_gen;
1090 1172
1091#if HAVE_MMAP 1173#if HAVE_MMAP
1092 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1174 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1093 /* mmap supposedly does allocate-on-write for us */ 1175 /* 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); 1176 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1095 1177
1096 if (cctx->sptr != (void *)-1) 1178 if (cctx->sptr != (void *)-1)
1097 { 1179 {
1098# if CORO_STACKGUARD 1180 #if CORO_STACKGUARD
1099 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1181 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1100# endif 1182 #endif
1101 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1183 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1102 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1184 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1103 cctx->flags |= CC_MAPPED; 1185 cctx->flags |= CC_MAPPED;
1104 } 1186 }
1105 else 1187 else
1106#endif 1188#endif
1107 { 1189 {
1108 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1190 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1109 New (0, cctx->sptr, cctx_stacksize, long); 1191 New (0, cctx->sptr, cctx_stacksize, long);
1110 1192
1111 if (!cctx->sptr) 1193 if (!cctx->sptr)
1112 { 1194 {
1113 perror ("FATAL: unable to allocate stack for coroutine"); 1195 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1114 _exit (EXIT_FAILURE); 1196 _exit (EXIT_FAILURE);
1115 } 1197 }
1116 1198
1117 stack_start = cctx->sptr; 1199 stack_start = cctx->sptr;
1118 stack_size = cctx->ssize; 1200 stack_size = cctx->ssize;
1119 } 1201 }
1120 1202
1121 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1203 #if CORO_USE_VALGRIND
1204 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1205 #endif
1206
1122 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1207 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1123 1208
1124 return cctx; 1209 return cctx;
1125} 1210}
1126 1211
… …
1134 coro_destroy (&cctx->cctx); 1219 coro_destroy (&cctx->cctx);
1135 1220
1136 /* coro_transfer creates new, empty cctx's */ 1221 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr) 1222 if (cctx->sptr)
1138 { 1223 {
1139#if CORO_USE_VALGRIND 1224 #if CORO_USE_VALGRIND
1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1225 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1141#endif 1226 #endif
1142 1227
1143#if HAVE_MMAP 1228#if HAVE_MMAP
1144 if (cctx->flags & CC_MAPPED) 1229 if (cctx->flags & CC_MAPPED)
1145 munmap (cctx->sptr, cctx->ssize); 1230 munmap (cctx->sptr, cctx->ssize);
1146 else 1231 else
… …
1167 return cctx; 1252 return cctx;
1168 1253
1169 cctx_destroy (cctx); 1254 cctx_destroy (cctx);
1170 } 1255 }
1171 1256
1172 return cctx_new (); 1257 return cctx_new_run ();
1173} 1258}
1174 1259
1175static void 1260static void
1176cctx_put (coro_cctx *cctx) 1261cctx_put (coro_cctx *cctx)
1177{ 1262{
1178 assert (("cctx_put called on non-initialised cctx", cctx->sptr)); 1263 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1179 1264
1180 /* free another cctx if overlimit */ 1265 /* free another cctx if overlimit */
1181 if (expect_false (cctx_idle >= cctx_max_idle)) 1266 if (expect_false (cctx_idle >= cctx_max_idle))
1182 { 1267 {
1183 coro_cctx *first = cctx_first; 1268 coro_cctx *first = cctx_first;
… …
1227 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1312 ((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 */ 1313 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1229 } 1314 }
1230 else if (expect_true (prev != next)) 1315 else if (expect_true (prev != next))
1231 { 1316 {
1232 static volatile int has_throw;
1233 coro_cctx *prev__cctx; 1317 coro_cctx *prev__cctx;
1234 1318
1235 if (expect_false (prev->flags & CF_NEW)) 1319 if (expect_false (prev->flags & CF_NEW))
1236 { 1320 {
1237 /* create a new empty/source context */ 1321 /* create a new empty/source context */
1238 ++cctx_count; 1322 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; 1323 prev->flags &= ~CF_NEW;
1244 prev->flags |= CF_RUNNING; 1324 prev->flags |= CF_RUNNING;
1245 } 1325 }
1246 1326
1247 prev->flags &= ~CF_RUNNING; 1327 prev->flags &= ~CF_RUNNING;
… …
1262 else 1342 else
1263 load_perl (aTHX_ next); 1343 load_perl (aTHX_ next);
1264 1344
1265 prev__cctx = prev->cctx; 1345 prev__cctx = prev->cctx;
1266 1346
1267 /* possibly "free" the cctx */ 1347 /* possibly untie and reuse the cctx */
1268 if (expect_true ( 1348 if (expect_true (
1269 prev__cctx->idle_sp == STACKLEVEL 1349 prev__cctx->idle_sp == STACKLEVEL
1270 && !(prev__cctx->flags & CC_TRACE) 1350 && !(prev__cctx->flags & CC_TRACE)
1271 && !force_cctx 1351 && !force_cctx
1272 )) 1352 ))
1273 { 1353 {
1274 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1354 /* 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)); 1355 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1276 1356
1277 prev->cctx = 0; 1357 prev->cctx = 0;
1278 1358
1279 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1359 /* 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 */ 1360 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1288 ++next->usecount; 1368 ++next->usecount;
1289 1369
1290 if (expect_true (!next->cctx)) 1370 if (expect_true (!next->cctx))
1291 next->cctx = cctx_get (aTHX); 1371 next->cctx = cctx_get (aTHX);
1292 1372
1293 has_throw = !!next->throw; 1373 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1374 transfer_next = next;
1294 1375
1295 if (expect_false (prev__cctx != next->cctx)) 1376 if (expect_false (prev__cctx != next->cctx))
1296 { 1377 {
1297 prev__cctx->top_env = PL_top_env; 1378 prev__cctx->top_env = PL_top_env;
1298 PL_top_env = next->cctx->top_env; 1379 PL_top_env = next->cctx->top_env;
1299 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1380 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1300 } 1381 }
1301 1382
1302 free_coro_mortal (aTHX); 1383 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 } 1384 }
1318} 1385}
1319
1320struct transfer_args
1321{
1322 struct coro *prev, *next;
1323};
1324 1386
1325#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1387#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) 1388#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1327 1389
1328/** high level stuff ********************************************************/ 1390/** high level stuff ********************************************************/
… …
1501 1563
1502static int 1564static int
1503api_is_ready (SV *coro_sv) 1565api_is_ready (SV *coro_sv)
1504{ 1566{
1505 dTHX; 1567 dTHX;
1568
1506 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1569 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1507} 1570}
1508 1571
1509static void 1572INLINE void
1510prepare_schedule (pTHX_ struct transfer_args *ta) 1573prepare_schedule (pTHX_ struct transfer_args *ta)
1511{ 1574{
1512 SV *prev_sv, *next_sv; 1575 SV *prev_sv, *next_sv;
1513 1576
1514 for (;;) 1577 for (;;)
… …
1540 /* cannot transfer to destroyed coros, skip and look for next */ 1603 /* cannot transfer to destroyed coros, skip and look for next */
1541 if (expect_false (ta->next->flags & CF_DESTROYED)) 1604 if (expect_false (ta->next->flags & CF_DESTROYED))
1542 { 1605 {
1543 UNLOCK; 1606 UNLOCK;
1544 SvREFCNT_dec (next_sv); 1607 SvREFCNT_dec (next_sv);
1545 /* coro_nready is already taken care of by destroy */ 1608 /* coro_nready has already been taken care of by destroy */
1546 continue; 1609 continue;
1547 } 1610 }
1548 1611
1549 --coro_nready; 1612 --coro_nready;
1550 UNLOCK; 1613 UNLOCK;
… …
1553 1616
1554 /* free this only after the transfer */ 1617 /* free this only after the transfer */
1555 prev_sv = SvRV (coro_current); 1618 prev_sv = SvRV (coro_current);
1556 ta->prev = SvSTATE (prev_sv); 1619 ta->prev = SvSTATE (prev_sv);
1557 TRANSFER_CHECK (*ta); 1620 TRANSFER_CHECK (*ta);
1558 assert (ta->next->flags & CF_READY); 1621 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1559 ta->next->flags &= ~CF_READY; 1622 ta->next->flags &= ~CF_READY;
1560 SvRV_set (coro_current, next_sv); 1623 SvRV_set (coro_current, next_sv);
1561 1624
1562 LOCK; 1625 LOCK;
1563 free_coro_mortal (aTHX); 1626 free_coro_mortal (aTHX);
1564 coro_mortal = prev_sv; 1627 coro_mortal = prev_sv;
1565 UNLOCK; 1628 UNLOCK;
1566} 1629}
1567 1630
1568static void 1631INLINE void
1569prepare_cede (pTHX_ struct transfer_args *ta) 1632prepare_cede (pTHX_ struct transfer_args *ta)
1570{ 1633{
1571 api_ready (coro_current); 1634 api_ready (coro_current);
1572 prepare_schedule (aTHX_ ta); 1635 prepare_schedule (aTHX_ ta);
1573} 1636}
… …
1635 struct coro *coro = SvSTATE (coro_sv); 1698 struct coro *coro = SvSTATE (coro_sv);
1636 1699
1637 if (flags & CC_TRACE) 1700 if (flags & CC_TRACE)
1638 { 1701 {
1639 if (!coro->cctx) 1702 if (!coro->cctx)
1640 coro->cctx = cctx_new (); 1703 coro->cctx = cctx_new_run ();
1641 else if (!(coro->cctx->flags & CC_TRACE)) 1704 else if (!(coro->cctx->flags & CC_TRACE))
1642 croak ("cannot enable tracing on coroutine with custom stack"); 1705 croak ("cannot enable tracing on coroutine with custom stack");
1643 1706
1644 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1707 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1645 } 1708 }
… …
1745 PerlIOBuf_get_ptr, 1808 PerlIOBuf_get_ptr,
1746 PerlIOBuf_get_cnt, 1809 PerlIOBuf_get_cnt,
1747 PerlIOBuf_set_ptrcnt, 1810 PerlIOBuf_set_ptrcnt,
1748}; 1811};
1749 1812
1813/*****************************************************************************/
1814
1815static const CV *ssl_cv; /* for quick consistency check */
1816
1817static UNOP ssl_restore; /* restore stack as entersub did, for first-re-run */
1818static SV *ssl_arg0;
1819static SV *ssl_arg1;
1820
1821/* this restores the stack in the case we patched the entersub, to */
1822/* recreate the stack frame as perl will on following calls */
1823/* since entersub cleared the stack */
1824static OP *
1825pp_restore (pTHX)
1826{
1827 dSP;
1828
1829 PUSHMARK (SP);
1830
1831 EXTEND (SP, 3);
1832 if (ssl_arg0) PUSHs (sv_2mortal (ssl_arg0)), ssl_arg0 = 0;
1833 if (ssl_arg1) PUSHs (sv_2mortal (ssl_arg1)), ssl_arg1 = 0;
1834 PUSHs ((SV *)CvGV (ssl_cv));
1835
1836 RETURNOP (ssl_restore.op_first);
1837}
1838
1839/* declare prototype */
1840XS(XS_Coro__State__set_stacklevel);
1841
1842static OP *
1843pp_set_stacklevel (pTHX)
1844{
1845 dSP;
1846 struct transfer_args ta;
1847 SV **arg = PL_stack_base + TOPMARK + 1;
1848 int items = SP - arg; /* args without function object */
1849
1850 /* do a quick consistency check on the "function" object, and if it isn't */
1851 /* for us, divert to the real entersub */
1852 if (SvTYPE (*sp) != SVt_PVGV || CvXSUB (GvCV (*sp)) != XS_Coro__State__set_stacklevel)
1853 return PL_ppaddr[OP_ENTERSUB](aTHX);
1854
1855 /* pop args */
1856 SP = PL_stack_base + POPMARK;
1857
1858 if (!(PL_op->op_flags & OPf_STACKED))
1859 {
1860 /* ampersand-form of call, use @_ instead of stack */
1861 AV *av = GvAV (PL_defgv);
1862 arg = AvARRAY (av);
1863 items = AvFILLp (av) + 1;
1864 }
1865
1866 PUTBACK;
1867 switch (PL_op->op_private & 7)
1868 {
1869 case 0:
1870 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1871 break;
1872
1873 case 1:
1874 if (items != 2)
1875 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1876
1877 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1878 break;
1879
1880 case 2:
1881 prepare_schedule (aTHX_ &ta);
1882 break;
1883
1884 case 3:
1885 prepare_cede (aTHX_ &ta);
1886 break;
1887
1888 case 4:
1889 if (!prepare_cede_notself (aTHX_ &ta))
1890 RETURN;
1891
1892 break;
1893 }
1894
1895 TRANSFER (ta, 0);
1896 SPAGAIN;
1897
1898skip:
1899
1900 RETURN;
1901}
1750 1902
1751MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1903MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1752 1904
1753PROTOTYPES: DISABLE 1905PROTOTYPES: DISABLE
1754
1755BOOT:
1756{
1757#ifdef USE_ITHREADS
1758 MUTEX_INIT (&coro_lock);
1759#endif
1760 BOOT_PAGESIZE;
1761
1762 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1763 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1764
1765 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1766 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1767 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1768
1769 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1770 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1771 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1772
1773 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1774
1775 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1776 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1777 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1778 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1779
1780 main_mainstack = PL_mainstack;
1781 main_top_env = PL_top_env;
1782
1783 while (main_top_env->je_prev)
1784 main_top_env = main_top_env->je_prev;
1785
1786 coroapi.ver = CORO_API_VERSION;
1787 coroapi.rev = CORO_API_REVISION;
1788 coroapi.transfer = api_transfer;
1789
1790 {
1791 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1792
1793 if (!svp) croak ("Time::HiRes is required");
1794 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1795
1796 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1797 }
1798
1799 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1800}
1801
1802SV *
1803new (char *klass, ...)
1804 CODE:
1805{
1806 struct coro *coro;
1807 MAGIC *mg;
1808 HV *hv;
1809 int i;
1810
1811 Newz (0, coro, 1, struct coro);
1812 coro->args = newAV ();
1813 coro->flags = CF_NEW;
1814
1815 if (coro_first) coro_first->prev = coro;
1816 coro->next = coro_first;
1817 coro_first = coro;
1818
1819 coro->hv = hv = newHV ();
1820 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1821 mg->mg_flags |= MGf_DUP;
1822 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1823
1824 av_extend (coro->args, items - 1);
1825 for (i = 1; i < items; i++)
1826 av_push (coro->args, newSVsv (ST (i)));
1827}
1828 OUTPUT:
1829 RETVAL
1830 1906
1831# these not obviously related functions are all rolled into the same xs 1907# these not obviously related functions are all rolled into the same xs
1832# function to increase chances that they all will call transfer with the same 1908# function to increase chances that they all will call transfer with the same
1833# stack offset 1909# stack offset
1834void 1910void
… …
1838 Coro::schedule = 2 1914 Coro::schedule = 2
1839 Coro::cede = 3 1915 Coro::cede = 3
1840 Coro::cede_notself = 4 1916 Coro::cede_notself = 4
1841 CODE: 1917 CODE:
1842{ 1918{
1843 struct transfer_args ta; 1919 assert (("FATAL: ssl call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_set_stacklevel));
1844 1920
1845 PUTBACK; 1921 /* we patch the op, and then re-run the whole call */
1846 switch (ix) 1922 /* we have to put some dummy argument on the stack for this to work */
1923 /* TODO: walk back the opcode chain (but how?), nuke the pp_gv etc. */
1924 ssl_restore.op_next = (OP *)&ssl_restore;
1925 ssl_restore.op_type = OP_NULL;
1926 ssl_restore.op_ppaddr = pp_restore;
1927 ssl_restore.op_first = PL_op;
1928
1929 ssl_arg0 = items > 0 ? SvREFCNT_inc (ST (0)) : 0;
1930 ssl_arg1 = items > 1 ? SvREFCNT_inc (ST (1)) : 0;
1931
1932 PL_op->op_ppaddr = pp_set_stacklevel;
1933 PL_op->op_private = PL_op->op_private & ~7 | ix; /* we potentially share our private flags with entersub */
1934
1935 PL_op = (OP *)&ssl_restore;
1936}
1937
1938BOOT:
1939{
1940#ifdef USE_ITHREADS
1941 MUTEX_INIT (&coro_lock);
1942# if CORO_PTHREAD
1943 coro_thx = PERL_GET_CONTEXT;
1944# endif
1945#endif
1946 BOOT_PAGESIZE;
1947
1948 ssl_cv = get_cv ("Coro::State::_set_stacklevel", 0);
1949
1950 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1951 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1952
1953 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1954 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1955 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1956
1957 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1958 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1959 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1960
1961 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1962
1963 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1964 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1965 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1966 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1967
1968 main_mainstack = PL_mainstack;
1969 main_top_env = PL_top_env;
1970
1971 while (main_top_env->je_prev)
1972 main_top_env = main_top_env->je_prev;
1973
1974 coroapi.ver = CORO_API_VERSION;
1975 coroapi.rev = CORO_API_REVISION;
1976 coroapi.transfer = api_transfer;
1977
1847 { 1978 {
1848 case 0: 1979 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1849 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1850 ta.next = 0;
1851 break;
1852 1980
1853 case 1: 1981 if (!svp) croak ("Time::HiRes is required");
1854 if (items != 2) 1982 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1855 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1856 1983
1857 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1984 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1858 break;
1859
1860 case 2:
1861 prepare_schedule (aTHX_ &ta);
1862 break;
1863
1864 case 3:
1865 prepare_cede (aTHX_ &ta);
1866 break;
1867
1868 case 4:
1869 if (!prepare_cede_notself (aTHX_ &ta))
1870 XSRETURN_EMPTY;
1871
1872 break;
1873 } 1985 }
1874 SPAGAIN;
1875 1986
1876 BARRIER; 1987 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1877 PUTBACK;
1878 TRANSFER (ta, 0);
1879 SPAGAIN; /* might be the sp of a different coroutine now */
1880 /* be extra careful not to ever do anything after TRANSFER */
1881} 1988}
1989
1990SV *
1991new (char *klass, ...)
1992 CODE:
1993{
1994 struct coro *coro;
1995 MAGIC *mg;
1996 HV *hv;
1997 int i;
1998
1999 Newz (0, coro, 1, struct coro);
2000 coro->args = newAV ();
2001 coro->flags = CF_NEW;
2002
2003 if (coro_first) coro_first->prev = coro;
2004 coro->next = coro_first;
2005 coro_first = coro;
2006
2007 coro->hv = hv = newHV ();
2008 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2009 mg->mg_flags |= MGf_DUP;
2010 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2011
2012 av_extend (coro->args, items - 1);
2013 for (i = 1; i < items; i++)
2014 av_push (coro->args, newSVsv (ST (i)));
2015}
2016 OUTPUT:
2017 RETVAL
1882 2018
1883bool 2019bool
1884_destroy (SV *coro_sv) 2020_destroy (SV *coro_sv)
1885 CODE: 2021 CODE:
1886 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2022 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
… …
1994 is_destroyed = CF_DESTROYED 2130 is_destroyed = CF_DESTROYED
1995 CODE: 2131 CODE:
1996 RETVAL = boolSV (coro->flags & ix); 2132 RETVAL = boolSV (coro->flags & ix);
1997 OUTPUT: 2133 OUTPUT:
1998 RETVAL 2134 RETVAL
2135
2136void
2137throw (Coro::State self, SV *throw = &PL_sv_undef)
2138 PROTOTYPE: $;$
2139 CODE:
2140 SvREFCNT_dec (self->throw);
2141 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1999 2142
2000void 2143void
2001api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2144api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2002 2145
2003SV * 2146SV *
… …
2076 2219
2077 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2220 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2078 coro_ready[i] = newAV (); 2221 coro_ready[i] = newAV ();
2079 2222
2080 { 2223 {
2081 SV *sv = perl_get_sv ("Coro::API", TRUE); 2224 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2082 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2083 2225
2084 coroapi.schedule = api_schedule; 2226 coroapi.schedule = api_schedule;
2085 coroapi.cede = api_cede; 2227 coroapi.cede = api_cede;
2086 coroapi.cede_notself = api_cede_notself; 2228 coroapi.cede_notself = api_cede_notself;
2087 coroapi.ready = api_ready; 2229 coroapi.ready = api_ready;
… …
2147 CODE: 2289 CODE:
2148 RETVAL = coro_nready; 2290 RETVAL = coro_nready;
2149 OUTPUT: 2291 OUTPUT:
2150 RETVAL 2292 RETVAL
2151 2293
2152void
2153throw (Coro::State self, SV *throw = &PL_sv_undef)
2154 PROTOTYPE: $;$
2155 CODE:
2156 SvREFCNT_dec (self->throw);
2157 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2158
2159# for async_pool speedup 2294# for async_pool speedup
2160void 2295void
2161_pool_1 (SV *cb) 2296_pool_1 (SV *cb)
2162 CODE: 2297 CODE:
2163{ 2298{
… …
2362 2497
2363MODULE = Coro::State PACKAGE = PerlIO::cede 2498MODULE = Coro::State PACKAGE = PerlIO::cede
2364 2499
2365BOOT: 2500BOOT:
2366 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2501 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2502

Diff Legend

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