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.258 by root, Sun Nov 9 23:08:49 2008 UTC vs.
Revision 1.265 by root, Fri Nov 14 02:42:26 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
… …
181static struct CoroAPI coroapi; 178static struct CoroAPI coroapi;
182static AV *main_mainstack; /* used to differentiate between $main and others */ 179static AV *main_mainstack; /* used to differentiate between $main and others */
183static JMPENV *main_top_env; 180static JMPENV *main_top_env;
184static HV *coro_state_stash, *coro_stash; 181static HV *coro_state_stash, *coro_stash;
185static 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};
186 189
187static GV *irsgv; /* $/ */ 190static GV *irsgv; /* $/ */
188static GV *stdoutgv; /* *STDOUT */ 191static GV *stdoutgv; /* *STDOUT */
189static SV *rv_diehook; 192static SV *rv_diehook;
190static SV *rv_warnhook; 193static SV *rv_warnhook;
… …
407 : 0 410 : 0
408 411
409#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)
410#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)
411 414
412static struct coro * 415INLINE struct coro *
413SvSTATE_ (pTHX_ SV *coro) 416SvSTATE_ (pTHX_ SV *coro)
414{ 417{
415 HV *stash; 418 HV *stash;
416 MAGIC *mg; 419 MAGIC *mg;
417 420
… …
708 } 711 }
709 712
710 return rss; 713 return rss;
711} 714}
712 715
716/** set stacklevel support **************************************************/
717
718/* we sometimes need to create the effect of pp_set_stacklevel calling us */
719#define SSL_HEAD (void)0
720/* we somtimes need to create the effect of leaving via pp_set_stacklevel */
721#define SSL_TAIL set_stacklevel_tail (aTHX)
722
723INLINE void
724set_stacklevel_tail (pTHX)
725{
726 dSP;
727 int gimme = GIMME_V;
728
729 if (gimme == G_SCALAR)
730 XPUSHs (&PL_sv_undef);
731
732 PUTBACK;
733}
734
713/** coroutine stack handling ************************************************/ 735/** coroutine stack handling ************************************************/
714 736
715static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 737static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
716static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 738static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
717static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg); 739static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
… …
834 PL_rs = newSVsv (GvSV (irsgv)); 856 PL_rs = newSVsv (GvSV (irsgv));
835 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
836 858
837 { 859 {
838 dSP; 860 dSP;
839 LOGOP myop; 861 UNOP myop;
840 862
841 Zero (&myop, 1, LOGOP); 863 Zero (&myop, 1, UNOP);
842 myop.op_next = Nullop; 864 myop.op_next = Nullop;
843 myop.op_flags = OPf_WANT_VOID; 865 myop.op_flags = OPf_WANT_VOID;
844 866
845 PUSHMARK (SP); 867 PUSHMARK (SP);
846 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
849 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
850 SPAGAIN; 872 SPAGAIN;
851 } 873 }
852 874
853 /* this newly created coroutine might be run on an existing cctx which most 875 /* this newly created coroutine might be run on an existing cctx which most
854 * likely was suspended in set_stacklevel, called from entersub. 876 * likely was suspended in set_stacklevel, called from pp_set_stacklevel,
855 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 877 * so we have to emulate entering pp_set_stacklevel here.
856 * so we ENTER here for symmetry
857 */ 878 */
858 ENTER; 879 SSL_HEAD;
859} 880}
860 881
861static void 882static void
862coro_destruct (pTHX_ struct coro *coro) 883coro_destruct (pTHX_ struct coro *coro)
863{ 884{
… …
892 SvREFCNT_dec (coro->throw); 913 SvREFCNT_dec (coro->throw);
893 914
894 coro_destruct_stacks (aTHX); 915 coro_destruct_stacks (aTHX);
895} 916}
896 917
897static void 918INLINE void
898free_coro_mortal (pTHX) 919free_coro_mortal (pTHX)
899{ 920{
900 if (expect_true (coro_mortal)) 921 if (expect_true (coro_mortal))
901 { 922 {
902 SvREFCNT_dec (coro_mortal); 923 SvREFCNT_dec (coro_mortal);
… …
1026 1047
1027 TAINT_NOT; 1048 TAINT_NOT;
1028 return 0; 1049 return 0;
1029} 1050}
1030 1051
1052static void
1053prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx)
1054{
1055 ta->prev = (struct coro *)cctx;
1056 ta->next = 0;
1057}
1058
1031/* inject a fake call to Coro::State::_cctx_init into the execution */ 1059/* inject a fake call to Coro::State::_cctx_init into the execution */
1032/* _cctx_init should be careful, as it could be called at almost any time */ 1060/* _cctx_init should be careful, as it could be called at almost any time */
1033/* during execution of a perl program */ 1061/* during execution of a perl program */
1062/* also initialises PL_top_env */
1034static void NOINLINE 1063static void NOINLINE
1035cctx_prepare (pTHX_ coro_cctx *cctx) 1064cctx_prepare (pTHX_ coro_cctx *cctx)
1036{ 1065{
1037 dSP; 1066 dSP;
1038 LOGOP myop; 1067 UNOP myop;
1039 1068
1040 PL_top_env = &PL_start_env; 1069 PL_top_env = &PL_start_env;
1041 1070
1042 if (cctx->flags & CC_TRACE) 1071 if (cctx->flags & CC_TRACE)
1043 PL_runops = runops_trace; 1072 PL_runops = runops_trace;
1044 1073
1045 Zero (&myop, 1, LOGOP); 1074 Zero (&myop, 1, UNOP);
1046 myop.op_next = PL_op; 1075 myop.op_next = PL_op;
1047 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1076 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1048 1077
1049 PUSHMARK (SP); 1078 PUSHMARK (SP);
1050 EXTEND (SP, 2); 1079 EXTEND (SP, 2);
1051 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1080 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1052 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1081 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1053 PUTBACK; 1082 PUTBACK;
1054 PL_op = (OP *)&myop; 1083 PL_op = (OP *)&myop;
1055 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1084 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1056 SPAGAIN; 1085 SPAGAIN;
1057} 1086}
1058 1087
1088/* the tail of transfer: execute stuff we can only do after a transfer */
1089INLINE void
1090transfer_tail (pTHX)
1091{
1092 struct coro *next = (struct coro *)transfer_next;
1093 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1094 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1095
1096 free_coro_mortal (aTHX);
1097 UNLOCK;
1098
1099 if (expect_false (next->throw))
1100 {
1101 SV *exception = sv_2mortal (next->throw);
1102
1103 next->throw = 0;
1104 sv_setsv (ERRSV, exception);
1105 croak (0);
1106 }
1107}
1108
1059/* 1109/*
1060 * this is a _very_ stripped down perl interpreter ;) 1110 * this is a _very_ stripped down perl interpreter ;)
1061 */ 1111 */
1062static void 1112static void
1063cctx_run (void *arg) 1113cctx_run (void *arg)
… …
1068# endif 1118# endif
1069#endif 1119#endif
1070 { 1120 {
1071 dTHX; 1121 dTHX;
1072 1122
1073 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1123 /* we are the alternative tail to pp_set_stacklevel */
1074 UNLOCK; 1124 /* so do the same things here */
1125 SSL_TAIL;
1075 1126
1076 /* we now skip the entersub that lead to transfer() */ 1127 /* we now skip the op that did lead to transfer() */
1077 PL_op = PL_op->op_next; 1128 PL_op = PL_op->op_next;
1078 1129
1079 /* inject a fake subroutine call to cctx_init */ 1130 /* inject a fake subroutine call to cctx_init */
1080 cctx_prepare (aTHX_ (coro_cctx *)arg); 1131 cctx_prepare (aTHX_ (coro_cctx *)arg);
1132
1133 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX);
1081 1135
1082 /* somebody or something will hit me for both perl_run and PL_restartop */ 1136 /* somebody or something will hit me for both perl_run and PL_restartop */
1083 PL_restartop = PL_op; 1137 PL_restartop = PL_op;
1084 perl_run (PL_curinterp); 1138 perl_run (PL_curinterp);
1085 1139
… …
1101 coro_cctx *cctx; 1155 coro_cctx *cctx;
1102 1156
1103 ++cctx_count; 1157 ++cctx_count;
1104 New (0, cctx, 1, coro_cctx); 1158 New (0, cctx, 1, coro_cctx);
1105 1159
1106 cctx->gen = cctx_gen; 1160 cctx->gen = cctx_gen;
1107 cctx->flags = 0; 1161 cctx->flags = 0;
1162 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1108 1163
1109 return cctx; 1164 return cctx;
1110} 1165}
1111 1166
1112/* create a new cctx only suitable as source */ 1167/* create a new cctx only suitable as source */
1113static coro_cctx * 1168static coro_cctx *
1114cctx_new_empty () 1169cctx_new_empty ()
1115{ 1170{
1116 coro_cctx *cctx = cctx_new (); 1171 coro_cctx *cctx = cctx_new ();
1117 1172
1118 cctx->sptr = 0; 1173 cctx->sptr = 0;
1119 cctx->idle_sp = 0; /* should never be a valid address */
1120 coro_create (&cctx->cctx, 0, 0, 0, 0); 1174 coro_create (&cctx->cctx, 0, 0, 0, 0);
1121 1175
1122 return cctx; 1176 return cctx;
1123} 1177}
1124 1178
… …
1135 /* mmap supposedly does allocate-on-write for us */ 1189 /* mmap supposedly does allocate-on-write for us */
1136 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1190 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1137 1191
1138 if (cctx->sptr != (void *)-1) 1192 if (cctx->sptr != (void *)-1)
1139 { 1193 {
1140# if CORO_STACKGUARD 1194 #if CORO_STACKGUARD
1141 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1195 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1142# endif 1196 #endif
1143 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1197 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1144 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1198 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1145 cctx->flags |= CC_MAPPED; 1199 cctx->flags |= CC_MAPPED;
1146 } 1200 }
1147 else 1201 else
1148#endif 1202#endif
1149 { 1203 {
1150 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1204 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1151 New (0, cctx->sptr, cctx_stacksize, long); 1205 New (0, cctx->sptr, cctx_stacksize, long);
1152 1206
1153 if (!cctx->sptr) 1207 if (!cctx->sptr)
1154 { 1208 {
1155 perror ("FATAL: unable to allocate stack for coroutine"); 1209 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1156 _exit (EXIT_FAILURE); 1210 _exit (EXIT_FAILURE);
1157 } 1211 }
1158 1212
1159 stack_start = cctx->sptr; 1213 stack_start = cctx->sptr;
1160 stack_size = cctx->ssize; 1214 stack_size = cctx->ssize;
1161 } 1215 }
1162 1216
1163 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1217 #if CORO_USE_VALGRIND
1218 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1219 #endif
1220
1164 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1221 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1165 1222
1166 return cctx; 1223 return cctx;
1167} 1224}
1168 1225
… …
1176 coro_destroy (&cctx->cctx); 1233 coro_destroy (&cctx->cctx);
1177 1234
1178 /* coro_transfer creates new, empty cctx's */ 1235 /* coro_transfer creates new, empty cctx's */
1179 if (cctx->sptr) 1236 if (cctx->sptr)
1180 { 1237 {
1181#if CORO_USE_VALGRIND 1238 #if CORO_USE_VALGRIND
1182 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1239 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1183#endif 1240 #endif
1184 1241
1185#if HAVE_MMAP 1242#if HAVE_MMAP
1186 if (cctx->flags & CC_MAPPED) 1243 if (cctx->flags & CC_MAPPED)
1187 munmap (cctx->sptr, cctx->ssize); 1244 munmap (cctx->sptr, cctx->ssize);
1188 else 1245 else
… …
1215} 1272}
1216 1273
1217static void 1274static void
1218cctx_put (coro_cctx *cctx) 1275cctx_put (coro_cctx *cctx)
1219{ 1276{
1220 assert (("cctx_put called on non-initialised cctx", cctx->sptr)); 1277 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1221 1278
1222 /* free another cctx if overlimit */ 1279 /* free another cctx if overlimit */
1223 if (expect_false (cctx_idle >= cctx_max_idle)) 1280 if (expect_false (cctx_idle >= cctx_max_idle))
1224 { 1281 {
1225 coro_cctx *first = cctx_first; 1282 coro_cctx *first = cctx_first;
… …
1269 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1270 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1271 } 1328 }
1272 else if (expect_true (prev != next)) 1329 else if (expect_true (prev != next))
1273 { 1330 {
1274 static volatile int has_throw;
1275 coro_cctx *prev__cctx; 1331 coro_cctx *prev__cctx;
1276 1332
1277 if (expect_false (prev->flags & CF_NEW)) 1333 if (expect_false (prev->flags & CF_NEW))
1278 { 1334 {
1279 /* create a new empty/source context */ 1335 /* create a new empty/source context */
… …
1300 else 1356 else
1301 load_perl (aTHX_ next); 1357 load_perl (aTHX_ next);
1302 1358
1303 prev__cctx = prev->cctx; 1359 prev__cctx = prev->cctx;
1304 1360
1305 /* possibly "free" the cctx */ 1361 /* possibly untie and reuse the cctx */
1306 if (expect_true ( 1362 if (expect_true (
1307 prev__cctx->idle_sp == STACKLEVEL 1363 prev__cctx->idle_sp == STACKLEVEL
1308 && !(prev__cctx->flags & CC_TRACE) 1364 && !(prev__cctx->flags & CC_TRACE)
1309 && !force_cctx 1365 && !force_cctx
1310 )) 1366 ))
1311 { 1367 {
1312 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1368 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1313 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1314 1370
1315 prev->cctx = 0; 1371 prev->cctx = 0;
1316 1372
1317 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1318 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1326 ++next->usecount; 1382 ++next->usecount;
1327 1383
1328 if (expect_true (!next->cctx)) 1384 if (expect_true (!next->cctx))
1329 next->cctx = cctx_get (aTHX); 1385 next->cctx = cctx_get (aTHX);
1330 1386
1331 has_throw = !!next->throw; 1387 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1388 transfer_next = next;
1332 1389
1333 if (expect_false (prev__cctx != next->cctx)) 1390 if (expect_false (prev__cctx != next->cctx))
1334 { 1391 {
1335 prev__cctx->top_env = PL_top_env; 1392 prev__cctx->top_env = PL_top_env;
1336 PL_top_env = next->cctx->top_env; 1393 PL_top_env = next->cctx->top_env;
1337 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1394 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1338 } 1395 }
1339 1396
1340 free_coro_mortal (aTHX); 1397 transfer_tail (aTHX);
1341 UNLOCK;
1342
1343 if (expect_false (has_throw))
1344 {
1345 struct coro *coro = SvSTATE (coro_current);
1346
1347 if (coro->throw)
1348 {
1349 SV *exception = coro->throw;
1350 coro->throw = 0;
1351 sv_setsv (ERRSV, exception);
1352 croak (0);
1353 }
1354 }
1355 } 1398 }
1356} 1399}
1357
1358struct transfer_args
1359{
1360 struct coro *prev, *next;
1361};
1362 1400
1363#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1401#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1364#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1402#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1365 1403
1366/** high level stuff ********************************************************/ 1404/** high level stuff ********************************************************/
… …
1539 1577
1540static int 1578static int
1541api_is_ready (SV *coro_sv) 1579api_is_ready (SV *coro_sv)
1542{ 1580{
1543 dTHX; 1581 dTHX;
1582
1544 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1583 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1545} 1584}
1546 1585
1547static void 1586INLINE void
1548prepare_schedule (pTHX_ struct transfer_args *ta) 1587prepare_schedule (pTHX_ struct transfer_args *ta)
1549{ 1588{
1550 SV *prev_sv, *next_sv; 1589 SV *prev_sv, *next_sv;
1551 1590
1552 for (;;) 1591 for (;;)
… …
1578 /* cannot transfer to destroyed coros, skip and look for next */ 1617 /* cannot transfer to destroyed coros, skip and look for next */
1579 if (expect_false (ta->next->flags & CF_DESTROYED)) 1618 if (expect_false (ta->next->flags & CF_DESTROYED))
1580 { 1619 {
1581 UNLOCK; 1620 UNLOCK;
1582 SvREFCNT_dec (next_sv); 1621 SvREFCNT_dec (next_sv);
1583 /* coro_nready is already taken care of by destroy */ 1622 /* coro_nready has already been taken care of by destroy */
1584 continue; 1623 continue;
1585 } 1624 }
1586 1625
1587 --coro_nready; 1626 --coro_nready;
1588 UNLOCK; 1627 UNLOCK;
… …
1591 1630
1592 /* free this only after the transfer */ 1631 /* free this only after the transfer */
1593 prev_sv = SvRV (coro_current); 1632 prev_sv = SvRV (coro_current);
1594 ta->prev = SvSTATE (prev_sv); 1633 ta->prev = SvSTATE (prev_sv);
1595 TRANSFER_CHECK (*ta); 1634 TRANSFER_CHECK (*ta);
1596 assert (ta->next->flags & CF_READY); 1635 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1597 ta->next->flags &= ~CF_READY; 1636 ta->next->flags &= ~CF_READY;
1598 SvRV_set (coro_current, next_sv); 1637 SvRV_set (coro_current, next_sv);
1599 1638
1600 LOCK; 1639 LOCK;
1601 free_coro_mortal (aTHX); 1640 free_coro_mortal (aTHX);
1602 coro_mortal = prev_sv; 1641 coro_mortal = prev_sv;
1603 UNLOCK; 1642 UNLOCK;
1604} 1643}
1605 1644
1606static void 1645INLINE void
1607prepare_cede (pTHX_ struct transfer_args *ta) 1646prepare_cede (pTHX_ struct transfer_args *ta)
1608{ 1647{
1609 api_ready (coro_current); 1648 api_ready (coro_current);
1610 prepare_schedule (aTHX_ ta); 1649 prepare_schedule (aTHX_ ta);
1611} 1650}
… …
1783 PerlIOBuf_get_ptr, 1822 PerlIOBuf_get_ptr,
1784 PerlIOBuf_get_cnt, 1823 PerlIOBuf_get_cnt,
1785 PerlIOBuf_set_ptrcnt, 1824 PerlIOBuf_set_ptrcnt,
1786}; 1825};
1787 1826
1827/*****************************************************************************/
1828
1829static const CV *ssl_cv; /* for quick consistency check */
1830
1831static UNOP ssl_restore; /* restore stack as entersub did, for first-re-run */
1832static SV *ssl_arg0;
1833static SV *ssl_arg1;
1834
1835/* this restores the stack in the case we patched the entersub, to */
1836/* recreate the stack frame as perl will on following calls */
1837/* since entersub cleared the stack */
1838static OP *
1839pp_restore (pTHX)
1840{
1841 dSP;
1842
1843 PUSHMARK (SP);
1844
1845 EXTEND (SP, 3);
1846 if (ssl_arg0) PUSHs (sv_2mortal (ssl_arg0)), ssl_arg0 = 0;
1847 if (ssl_arg1) PUSHs (sv_2mortal (ssl_arg1)), ssl_arg1 = 0;
1848 PUSHs ((SV *)CvGV (ssl_cv));
1849
1850 RETURNOP (ssl_restore.op_first);
1851}
1852
1853/* declare prototype */
1854XS(XS_Coro__State__set_stacklevel);
1855
1856static OP *
1857pp_set_stacklevel (pTHX)
1858{
1859 dSP;
1860 struct transfer_args ta;
1861 SV **arg = PL_stack_base + TOPMARK + 1;
1862 int items = SP - arg; /* args without function object */
1863
1864 /* do a quick consistency check on the "function" object, and if it isn't */
1865 /* for us, divert to the real entersub */
1866 if (SvTYPE (*sp) != SVt_PVGV || CvXSUB (GvCV (*sp)) != XS_Coro__State__set_stacklevel)
1867 return PL_ppaddr[OP_ENTERSUB](aTHX);
1868
1869 /* pop args */
1870 SP = PL_stack_base + POPMARK;
1871
1872 if (!(PL_op->op_flags & OPf_STACKED))
1873 {
1874 /* ampersand-form of call, use @_ instead of stack */
1875 AV *av = GvAV (PL_defgv);
1876 arg = AvARRAY (av);
1877 items = AvFILLp (av) + 1;
1878 }
1879
1880 PUTBACK;
1881 switch (PL_op->op_private & 7)
1882 {
1883 case 0:
1884 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1885 break;
1886
1887 case 1:
1888 if (items != 2)
1889 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1890
1891 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1892 break;
1893
1894 case 2:
1895 prepare_schedule (aTHX_ &ta);
1896 break;
1897
1898 case 3:
1899 prepare_cede (aTHX_ &ta);
1900 break;
1901
1902 case 4:
1903 if (!prepare_cede_notself (aTHX_ &ta))
1904 goto skip;
1905
1906 break;
1907 }
1908
1909 TRANSFER (ta, 0);
1910 SPAGAIN;
1911
1912skip:
1913 PUTBACK;
1914 SSL_TAIL;
1915 SPAGAIN;
1916 RETURN;
1917}
1788 1918
1789MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1919MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1790 1920
1791PROTOTYPES: DISABLE 1921PROTOTYPES: DISABLE
1792
1793BOOT:
1794{
1795#ifdef USE_ITHREADS
1796 MUTEX_INIT (&coro_lock);
1797# if CORO_PTHREAD
1798 coro_thx = PERL_GET_CONTEXT;
1799# endif
1800#endif
1801 BOOT_PAGESIZE;
1802
1803 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1804 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1805
1806 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1807 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1808 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1809
1810 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1811 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1812 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1813
1814 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1815
1816 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1817 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1818 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1819 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1820
1821 main_mainstack = PL_mainstack;
1822 main_top_env = PL_top_env;
1823
1824 while (main_top_env->je_prev)
1825 main_top_env = main_top_env->je_prev;
1826
1827 coroapi.ver = CORO_API_VERSION;
1828 coroapi.rev = CORO_API_REVISION;
1829 coroapi.transfer = api_transfer;
1830
1831 {
1832 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1833
1834 if (!svp) croak ("Time::HiRes is required");
1835 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1836
1837 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1838 }
1839
1840 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1841}
1842
1843SV *
1844new (char *klass, ...)
1845 CODE:
1846{
1847 struct coro *coro;
1848 MAGIC *mg;
1849 HV *hv;
1850 int i;
1851
1852 Newz (0, coro, 1, struct coro);
1853 coro->args = newAV ();
1854 coro->flags = CF_NEW;
1855
1856 if (coro_first) coro_first->prev = coro;
1857 coro->next = coro_first;
1858 coro_first = coro;
1859
1860 coro->hv = hv = newHV ();
1861 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1862 mg->mg_flags |= MGf_DUP;
1863 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1864
1865 av_extend (coro->args, items - 1);
1866 for (i = 1; i < items; i++)
1867 av_push (coro->args, newSVsv (ST (i)));
1868}
1869 OUTPUT:
1870 RETVAL
1871 1922
1872# these not obviously related functions are all rolled into the same xs 1923# these not obviously related functions are all rolled into the same xs
1873# function to increase chances that they all will call transfer with the same 1924# function to increase chances that they all will call transfer with the same
1874# stack offset 1925# stack offset
1875void 1926void
… …
1879 Coro::schedule = 2 1930 Coro::schedule = 2
1880 Coro::cede = 3 1931 Coro::cede = 3
1881 Coro::cede_notself = 4 1932 Coro::cede_notself = 4
1882 CODE: 1933 CODE:
1883{ 1934{
1884 struct transfer_args ta; 1935 assert (("FATAL: ssl call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_set_stacklevel));
1885 1936
1886 PUTBACK; 1937 /* we patch the op, and then re-run the whole call */
1887 switch (ix) 1938 /* we have to put some dummy argument on the stack for this to work */
1939 /* TODO: walk back the opcode chain (but how?), nuke the pp_gv etc. */
1940 ssl_restore.op_next = (OP *)&ssl_restore;
1941 ssl_restore.op_type = OP_NULL;
1942 ssl_restore.op_ppaddr = pp_restore;
1943 ssl_restore.op_first = PL_op;
1944
1945 ssl_arg0 = items > 0 ? SvREFCNT_inc (ST (0)) : 0;
1946 ssl_arg1 = items > 1 ? SvREFCNT_inc (ST (1)) : 0;
1947
1948 PL_op->op_ppaddr = pp_set_stacklevel;
1949 PL_op->op_private = PL_op->op_private & ~7 | ix; /* we potentially share our private flags with entersub */
1950
1951 PL_op = (OP *)&ssl_restore;
1952}
1953
1954BOOT:
1955{
1956#ifdef USE_ITHREADS
1957 MUTEX_INIT (&coro_lock);
1958# if CORO_PTHREAD
1959 coro_thx = PERL_GET_CONTEXT;
1960# endif
1961#endif
1962 BOOT_PAGESIZE;
1963
1964 ssl_cv = get_cv ("Coro::State::_set_stacklevel", 0);
1965
1966 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1967 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1968
1969 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1970 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1971 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1972
1973 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1974 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1975 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1976
1977 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1978
1979 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1980 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1981 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1982 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1983
1984 main_mainstack = PL_mainstack;
1985 main_top_env = PL_top_env;
1986
1987 while (main_top_env->je_prev)
1988 main_top_env = main_top_env->je_prev;
1989
1990 coroapi.ver = CORO_API_VERSION;
1991 coroapi.rev = CORO_API_REVISION;
1992 coroapi.transfer = api_transfer;
1993
1888 { 1994 {
1889 case 0: 1995 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1890 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1891 ta.next = 0;
1892 break;
1893 1996
1894 case 1: 1997 if (!svp) croak ("Time::HiRes is required");
1895 if (items != 2) 1998 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1896 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1897 1999
1898 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 2000 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1899 break;
1900
1901 case 2:
1902 prepare_schedule (aTHX_ &ta);
1903 break;
1904
1905 case 3:
1906 prepare_cede (aTHX_ &ta);
1907 break;
1908
1909 case 4:
1910 if (!prepare_cede_notself (aTHX_ &ta))
1911 XSRETURN_EMPTY;
1912
1913 break;
1914 } 2001 }
1915 SPAGAIN;
1916 2002
1917 BARRIER; 2003 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1918 PUTBACK;
1919 TRANSFER (ta, 0);
1920 SPAGAIN; /* might be the sp of a different coroutine now */
1921 /* be extra careful not to ever do anything after TRANSFER */
1922} 2004}
2005
2006SV *
2007new (char *klass, ...)
2008 CODE:
2009{
2010 struct coro *coro;
2011 MAGIC *mg;
2012 HV *hv;
2013 int i;
2014
2015 Newz (0, coro, 1, struct coro);
2016 coro->args = newAV ();
2017 coro->flags = CF_NEW;
2018
2019 if (coro_first) coro_first->prev = coro;
2020 coro->next = coro_first;
2021 coro_first = coro;
2022
2023 coro->hv = hv = newHV ();
2024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2025 mg->mg_flags |= MGf_DUP;
2026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2027
2028 av_extend (coro->args, items - 1);
2029 for (i = 1; i < items; i++)
2030 av_push (coro->args, newSVsv (ST (i)));
2031}
2032 OUTPUT:
2033 RETVAL
1923 2034
1924bool 2035bool
1925_destroy (SV *coro_sv) 2036_destroy (SV *coro_sv)
1926 CODE: 2037 CODE:
1927 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2038 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
… …
2035 is_destroyed = CF_DESTROYED 2146 is_destroyed = CF_DESTROYED
2036 CODE: 2147 CODE:
2037 RETVAL = boolSV (coro->flags & ix); 2148 RETVAL = boolSV (coro->flags & ix);
2038 OUTPUT: 2149 OUTPUT:
2039 RETVAL 2150 RETVAL
2151
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;
2040 2158
2041void 2159void
2042api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2160api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2043 2161
2044SV * 2162SV *
… …
2117 2235
2118 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2236 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2119 coro_ready[i] = newAV (); 2237 coro_ready[i] = newAV ();
2120 2238
2121 { 2239 {
2122 SV *sv = perl_get_sv ("Coro::API", TRUE); 2240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2123 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2124 2241
2125 coroapi.schedule = api_schedule; 2242 coroapi.schedule = api_schedule;
2126 coroapi.cede = api_cede; 2243 coroapi.cede = api_cede;
2127 coroapi.cede_notself = api_cede_notself; 2244 coroapi.cede_notself = api_cede_notself;
2128 coroapi.ready = api_ready; 2245 coroapi.ready = api_ready;
… …
2188 CODE: 2305 CODE:
2189 RETVAL = coro_nready; 2306 RETVAL = coro_nready;
2190 OUTPUT: 2307 OUTPUT:
2191 RETVAL 2308 RETVAL
2192 2309
2193void
2194throw (Coro::State self, SV *throw = &PL_sv_undef)
2195 PROTOTYPE: $;$
2196 CODE:
2197 SvREFCNT_dec (self->throw);
2198 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2199
2200# for async_pool speedup 2310# for async_pool speedup
2201void 2311void
2202_pool_1 (SV *cb) 2312_pool_1 (SV *cb)
2203 CODE: 2313 CODE:
2204{ 2314{
… …
2403 2513
2404MODULE = Coro::State PACKAGE = PerlIO::cede 2514MODULE = Coro::State PACKAGE = PerlIO::cede
2405 2515
2406BOOT: 2516BOOT:
2407 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2517 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2518

Diff Legend

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