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.259 by root, Mon Nov 10 00:02:29 2008 UTC vs.
Revision 1.269 by root, Fri Nov 14 06:50: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
… …
181static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
182static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
183static JMPENV *main_top_env; 183static JMPENV *main_top_env;
184static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
185static 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 char next_has_throw; /* speedup flag for next->throw check */ 186static volatile struct coro *transfer_next;
187
188struct transfer_args
189{
190 struct coro *prev, *next;
191};
187 192
188static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
189static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
190static SV *rv_diehook; 195static SV *rv_diehook;
191static SV *rv_warnhook; 196static SV *rv_warnhook;
… …
408 : 0 413 : 0
409 414
410#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)
411#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)
412 417
413static struct coro * 418INLINE struct coro *
414SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
415{ 420{
416 HV *stash; 421 HV *stash;
417 MAGIC *mg; 422 MAGIC *mg;
418 423
… …
709 } 714 }
710 715
711 return rss; 716 return rss;
712} 717}
713 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
714/** coroutine stack handling ************************************************/ 746/** coroutine stack handling ************************************************/
715 747
716static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 748static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
717static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 749static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
718static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg); 750static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
… …
835 PL_rs = newSVsv (GvSV (irsgv)); 867 PL_rs = newSVsv (GvSV (irsgv));
836 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
837 869
838 { 870 {
839 dSP; 871 dSP;
840 LOGOP myop; 872 UNOP myop;
841 873
842 Zero (&myop, 1, LOGOP); 874 Zero (&myop, 1, UNOP);
843 myop.op_next = Nullop; 875 myop.op_next = Nullop;
844 myop.op_flags = OPf_WANT_VOID; 876 myop.op_flags = OPf_WANT_VOID;
845 877
846 PUSHMARK (SP); 878 PUSHMARK (SP);
847 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
850 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
851 SPAGAIN; 883 SPAGAIN;
852 } 884 }
853 885
854 /* 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
855 * likely was suspended in set_stacklevel, called from entersub. 887 * likely was suspended in set_stacklevel, called from pp_set_stacklevel,
856 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 888 * so we have to emulate entering pp_set_stacklevel here.
857 * so we ENTER here for symmetry
858 */ 889 */
859 ENTER; 890 SLF_HEAD;
860} 891}
861 892
862static void 893static void
863coro_destruct (pTHX_ struct coro *coro) 894coro_destruct (pTHX_ struct coro *coro)
864{ 895{
… …
893 SvREFCNT_dec (coro->throw); 924 SvREFCNT_dec (coro->throw);
894 925
895 coro_destruct_stacks (aTHX); 926 coro_destruct_stacks (aTHX);
896} 927}
897 928
898static void 929INLINE void
899free_coro_mortal (pTHX) 930free_coro_mortal (pTHX)
900{ 931{
901 if (expect_true (coro_mortal)) 932 if (expect_true (coro_mortal))
902 { 933 {
903 SvREFCNT_dec (coro_mortal); 934 SvREFCNT_dec (coro_mortal);
… …
1027 1058
1028 TAINT_NOT; 1059 TAINT_NOT;
1029 return 0; 1060 return 0;
1030} 1061}
1031 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
1032/* 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 */
1033/* _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 */
1034/* during execution of a perl program */ 1072/* during execution of a perl program */
1035/* also initialises PL_top_env */ 1073/* also initialises PL_top_env */
1036static void NOINLINE 1074static void NOINLINE
1037cctx_prepare (pTHX_ coro_cctx *cctx) 1075cctx_prepare (pTHX_ coro_cctx *cctx)
1038{ 1076{
1039 dSP; 1077 dSP;
1040 LOGOP myop; 1078 UNOP myop;
1041 1079
1042 PL_top_env = &PL_start_env; 1080 PL_top_env = &PL_start_env;
1043 1081
1044 if (cctx->flags & CC_TRACE) 1082 if (cctx->flags & CC_TRACE)
1045 PL_runops = runops_trace; 1083 PL_runops = runops_trace;
1046 1084
1047 Zero (&myop, 1, LOGOP); 1085 Zero (&myop, 1, UNOP);
1048 myop.op_next = PL_op; 1086 myop.op_next = PL_op;
1049 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1087 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1050 1088
1051 PUSHMARK (SP); 1089 PUSHMARK (SP);
1052 EXTEND (SP, 2); 1090 EXTEND (SP, 2);
1053 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1091 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1054 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1092 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1055 PUTBACK; 1093 PUTBACK;
1056 PL_op = (OP *)&myop; 1094 PL_op = (OP *)&myop;
1057 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1095 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1058 SPAGAIN; 1096 SPAGAIN;
1059} 1097}
1060 1098
1061/* the tail of transfer: execute stuff we can onyl do afetr a transfer */ 1099/* the tail of transfer: execute stuff we can only do after a transfer */
1062static void 1100INLINE void
1063transfer_tail (void) 1101transfer_tail (pTHX)
1064{ 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);
1065 UNLOCK; 1108 UNLOCK;
1066 1109
1067 if (expect_false (next_has_throw)) 1110 if (expect_false (next->throw))
1068 { 1111 {
1069 struct coro *coro = SvSTATE (coro_current);
1070
1071 if (coro->throw)
1072 {
1073 SV *exception = coro->throw; 1112 SV *exception = sv_2mortal (next->throw);
1113
1074 coro->throw = 0; 1114 next->throw = 0;
1075 sv_setsv (ERRSV, exception); 1115 sv_setsv (ERRSV, exception);
1076 croak (0); 1116 croak (0);
1077 }
1078 } 1117 }
1079} 1118}
1080 1119
1081/* 1120/*
1082 * this is a _very_ stripped down perl interpreter ;) 1121 * this is a _very_ stripped down perl interpreter ;)
… …
1090# endif 1129# endif
1091#endif 1130#endif
1092 { 1131 {
1093 dTHX; 1132 dTHX;
1094 1133
1134 /* we are the alternative tail to pp_set_stacklevel */
1135 /* so do the same things here */
1136 SLF_TAIL;
1137
1095 /* we now skip the entersub that lead to transfer () */ 1138 /* we now skip the op that did lead to transfer() */
1096 PL_op = PL_op->op_next; 1139 PL_op = PL_op->op_next;
1097 1140
1098 /* inject a fake subroutine call to cctx_init */ 1141 /* inject a fake subroutine call to cctx_init */
1099 cctx_prepare (aTHX_ (coro_cctx *)arg); 1142 cctx_prepare (aTHX_ (coro_cctx *)arg);
1100 1143
1101 /* cctx_run is the alternative tail of transfer () */ 1144 /* cctx_run is the alternative tail of transfer() */
1102 transfer_tail (); 1145 transfer_tail (aTHX);
1103 1146
1104 /* 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 */
1105 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1106 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1107 1150
… …
1125 ++cctx_count; 1168 ++cctx_count;
1126 New (0, cctx, 1, coro_cctx); 1169 New (0, cctx, 1, coro_cctx);
1127 1170
1128 cctx->gen = cctx_gen; 1171 cctx->gen = cctx_gen;
1129 cctx->flags = 0; 1172 cctx->flags = 0;
1130 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel */ 1173 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1131 1174
1132 return cctx; 1175 return cctx;
1133} 1176}
1134 1177
1135/* create a new cctx only suitable as source */ 1178/* create a new cctx only suitable as source */
… …
1157 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1158 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);
1159 1202
1160 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1161 { 1204 {
1162# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1163 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1164# endif 1207 #endif
1165 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1166 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1167 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1168 } 1211 }
1169 else 1212 else
1170#endif 1213#endif
1171 { 1214 {
1172 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1173 New (0, cctx->sptr, cctx_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1174 1217
1175 if (!cctx->sptr) 1218 if (!cctx->sptr)
1176 { 1219 {
1177 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1178 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1179 } 1222 }
1180 1223
1181 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1182 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1183 } 1226 }
1184 1227
1185 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
1186 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);
1187 1233
1188 return cctx; 1234 return cctx;
1189} 1235}
1190 1236
… …
1198 coro_destroy (&cctx->cctx); 1244 coro_destroy (&cctx->cctx);
1199 1245
1200 /* coro_transfer creates new, empty cctx's */ 1246 /* coro_transfer creates new, empty cctx's */
1201 if (cctx->sptr) 1247 if (cctx->sptr)
1202 { 1248 {
1203#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1204 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1205#endif 1251 #endif
1206 1252
1207#if HAVE_MMAP 1253#if HAVE_MMAP
1208 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1209 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1210 else 1256 else
… …
1237} 1283}
1238 1284
1239static void 1285static void
1240cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1241{ 1287{
1242 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));
1243 1289
1244 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1245 if (expect_false (cctx_idle >= cctx_max_idle)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1246 { 1292 {
1247 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
… …
1286 dSTACKLEVEL; 1332 dSTACKLEVEL;
1287 1333
1288 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1289 if (expect_false (!next)) 1335 if (expect_false (!next))
1290 { 1336 {
1291 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1292 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 */
1293 } 1339 }
1294 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1295 { 1341 {
1296 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
… …
1321 else 1367 else
1322 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1323 1369
1324 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1325 1371
1326 if (prev__cctx->idle_sp == STACKLEVEL) asm volatile("");//D
1327
1328 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1329 if (expect_true ( 1373 if (expect_true (
1330 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1331 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1332 && !force_cctx 1376 && !force_cctx
1333 )) 1377 ))
1334 { 1378 {
1335 /* 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 */
1336 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));
1337 1381
1338 prev->cctx = 0; 1382 prev->cctx = 0;
1339 1383
1340 /* 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 */
1341 /* 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 */
… …
1349 ++next->usecount; 1393 ++next->usecount;
1350 1394
1351 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1352 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1353 1397
1354 next_has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1355 1400
1356 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1357 { 1402 {
1358 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1359 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1360 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1361 } 1406 }
1362 1407
1363 free_coro_mortal (aTHX);
1364 UNLOCK;
1365
1366 transfer_tail (); 1408 transfer_tail (aTHX);
1367 } 1409 }
1368} 1410}
1369
1370struct transfer_args
1371{
1372 struct coro *prev, *next;
1373};
1374 1411
1375#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))
1376#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1377 1414
1378/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
… …
1551 1588
1552static int 1589static int
1553api_is_ready (SV *coro_sv) 1590api_is_ready (SV *coro_sv)
1554{ 1591{
1555 dTHX; 1592 dTHX;
1593
1556 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1594 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1557} 1595}
1558 1596
1559static void 1597INLINE void
1560prepare_schedule (pTHX_ struct transfer_args *ta) 1598prepare_schedule (pTHX_ struct transfer_args *ta)
1561{ 1599{
1562 SV *prev_sv, *next_sv; 1600 SV *prev_sv, *next_sv;
1563 1601
1564 for (;;) 1602 for (;;)
… …
1590 /* cannot transfer to destroyed coros, skip and look for next */ 1628 /* cannot transfer to destroyed coros, skip and look for next */
1591 if (expect_false (ta->next->flags & CF_DESTROYED)) 1629 if (expect_false (ta->next->flags & CF_DESTROYED))
1592 { 1630 {
1593 UNLOCK; 1631 UNLOCK;
1594 SvREFCNT_dec (next_sv); 1632 SvREFCNT_dec (next_sv);
1595 /* coro_nready is already taken care of by destroy */ 1633 /* coro_nready has already been taken care of by destroy */
1596 continue; 1634 continue;
1597 } 1635 }
1598 1636
1599 --coro_nready; 1637 --coro_nready;
1600 UNLOCK; 1638 UNLOCK;
… …
1603 1641
1604 /* free this only after the transfer */ 1642 /* free this only after the transfer */
1605 prev_sv = SvRV (coro_current); 1643 prev_sv = SvRV (coro_current);
1606 ta->prev = SvSTATE (prev_sv); 1644 ta->prev = SvSTATE (prev_sv);
1607 TRANSFER_CHECK (*ta); 1645 TRANSFER_CHECK (*ta);
1608 assert (ta->next->flags & CF_READY); 1646 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1609 ta->next->flags &= ~CF_READY; 1647 ta->next->flags &= ~CF_READY;
1610 SvRV_set (coro_current, next_sv); 1648 SvRV_set (coro_current, next_sv);
1611 1649
1612 LOCK; 1650 LOCK;
1613 free_coro_mortal (aTHX); 1651 free_coro_mortal (aTHX);
1614 coro_mortal = prev_sv; 1652 coro_mortal = prev_sv;
1615 UNLOCK; 1653 UNLOCK;
1616} 1654}
1617 1655
1618static void 1656INLINE void
1619prepare_cede (pTHX_ struct transfer_args *ta) 1657prepare_cede (pTHX_ struct transfer_args *ta)
1620{ 1658{
1621 api_ready (coro_current); 1659 api_ready (coro_current);
1622 prepare_schedule (aTHX_ ta); 1660 prepare_schedule (aTHX_ ta);
1623} 1661}
1624 1662
1625static int 1663static void
1626prepare_cede_notself (pTHX_ struct transfer_args *ta) 1664prepare_cede_notself (pTHX_ struct transfer_args *ta)
1627{ 1665{
1666 SV *prev = SvRV (coro_current);
1667
1628 if (coro_nready) 1668 if (coro_nready)
1629 { 1669 {
1630 SV *prev = SvRV (coro_current);
1631 prepare_schedule (aTHX_ ta); 1670 prepare_schedule (aTHX_ ta);
1632 api_ready (prev); 1671 api_ready (prev);
1672 }
1673 else
1674 ta->prev = ta->next = SvSTATE (prev);
1675}
1676
1677static void
1678api_schedule (void)
1679{
1680 dTHX;
1681 struct transfer_args ta;
1682
1683 prepare_schedule (aTHX_ &ta);
1684 TRANSFER (ta, 1);
1685}
1686
1687static int
1688api_cede (void)
1689{
1690 dTHX;
1691 struct transfer_args ta;
1692
1693 prepare_cede (aTHX_ &ta);
1694
1695 if (expect_true (ta.prev != ta.next))
1696 {
1697 TRANSFER (ta, 1);
1633 return 1; 1698 return 1;
1634 } 1699 }
1635 else 1700 else
1636 return 0; 1701 return 0;
1637} 1702}
1638 1703
1639static void
1640api_schedule (void)
1641{
1642 dTHX;
1643 struct transfer_args ta;
1644
1645 prepare_schedule (aTHX_ &ta);
1646 TRANSFER (ta, 1);
1647}
1648
1649static int
1650api_cede (void)
1651{
1652 dTHX;
1653 struct transfer_args ta;
1654
1655 prepare_cede (aTHX_ &ta);
1656
1657 if (expect_true (ta.prev != ta.next))
1658 {
1659 TRANSFER (ta, 1);
1660 return 1;
1661 }
1662 else
1663 return 0;
1664}
1665
1666static int 1704static int
1667api_cede_notself (void) 1705api_cede_notself (void)
1668{ 1706{
1707 if (coro_nready)
1708 {
1669 dTHX; 1709 dTHX;
1670 struct transfer_args ta; 1710 struct transfer_args ta;
1671 1711
1672 if (prepare_cede_notself (aTHX_ &ta)) 1712 prepare_cede_notself (aTHX_ &ta);
1673 {
1674 TRANSFER (ta, 1); 1713 TRANSFER (ta, 1);
1675 return 1; 1714 return 1;
1676 } 1715 }
1677 else 1716 else
1678 return 0; 1717 return 0;
… …
1795 PerlIOBuf_get_ptr, 1834 PerlIOBuf_get_ptr,
1796 PerlIOBuf_get_cnt, 1835 PerlIOBuf_get_cnt,
1797 PerlIOBuf_set_ptrcnt, 1836 PerlIOBuf_set_ptrcnt,
1798}; 1837};
1799 1838
1839/*****************************************************************************/
1840
1841static const CV *slf_cv; /* for quick consistency check */
1842
1843static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1844static SV *slf_arg0;
1845static SV *slf_arg1;
1846
1847/* this restores the stack in the case we patched the entersub, to */
1848/* recreate the stack frame as perl will on following calls */
1849/* since entersub cleared the stack */
1850static OP *
1851pp_restore (pTHX)
1852{
1853 dSP;
1854
1855 PUSHMARK (SP);
1856
1857 EXTEND (SP, 3);
1858 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1859 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1860 PUSHs ((SV *)CvGV (slf_cv));
1861
1862 RETURNOP (slf_restore.op_first);
1863}
1864
1865#define OPpENTERSUB_SLF 15 /* the part of op_private entersub hopefully doesn't use */
1866
1867/* declare prototype */
1868XS(XS_Coro__State__set_stacklevel);
1869
1870/*
1871 * these not obviously related functions are all rolled into one
1872 * function to increase chances that they all will call transfer with the same
1873 * stack offset
1874 * SLF stands for "schedule-like-function".
1875 */
1876static OP *
1877pp_slf (pTHX)
1878{
1879 dSP;
1880 struct transfer_args ta;
1881 SV **arg = PL_stack_base + TOPMARK + 1;
1882 int items = SP - arg; /* args without function object */
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 switch (PL_op->op_private & OPpENTERSUB_SLF)
1902 {
1903 case 0:
1904 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1905 break;
1906
1907 case 1:
1908 if (items != 2)
1909 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1910
1911 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1912 break;
1913
1914 case 2:
1915 prepare_schedule (aTHX_ &ta);
1916 break;
1917
1918 case 3:
1919 prepare_cede (aTHX_ &ta);
1920 break;
1921
1922 case 4:
1923 prepare_cede_notself (aTHX_ &ta);
1924 break;
1925
1926 case 5:
1927 abort ();
1928
1929 default:
1930 abort ();
1931 }
1932
1933 TRANSFER (ta, 0);
1934 SPAGAIN;
1935
1936 PUTBACK;
1937 SLF_TAIL;
1938 SPAGAIN;
1939 RETURN;
1940}
1941
1942static void
1943coro_slf_patch (pTHX_ CV *cv, int ix, SV **args, int items)
1944{
1945 assert (("FATAL: SLF call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_slf));
1946
1947 assert (("FATAL: SLF call with illegal CV value", CvGV (cv)));
1948 slf_cv = cv;
1949
1950 /* we patch the op, and then re-run the whole call */
1951 /* we have to put the same argument on the stack for this to work */
1952 /* and this will be done by pp_restore */
1953 slf_restore.op_next = (OP *)&slf_restore;
1954 slf_restore.op_type = OP_NULL;
1955 slf_restore.op_ppaddr = pp_restore;
1956 slf_restore.op_first = PL_op;
1957
1958 slf_arg0 = items > 0 ? SvREFCNT_inc (args [0]) : 0;
1959 slf_arg1 = items > 1 ? SvREFCNT_inc (args [1]) : 0;
1960
1961 PL_op->op_ppaddr = pp_slf;
1962 PL_op->op_private = PL_op->op_private & ~OPpENTERSUB_SLF | ix; /* we potentially share our private flags with entersub */
1963
1964 PL_op = (OP *)&slf_restore;
1965}
1800 1966
1801MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1967MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1802 1968
1803PROTOTYPES: DISABLE 1969PROTOTYPES: DISABLE
1804 1970
… …
1879 av_push (coro->args, newSVsv (ST (i))); 2045 av_push (coro->args, newSVsv (ST (i)));
1880} 2046}
1881 OUTPUT: 2047 OUTPUT:
1882 RETVAL 2048 RETVAL
1883 2049
1884# these not obviously related functions are all rolled into the same xs
1885# function to increase chances that they all will call transfer with the same
1886# stack offset
1887void 2050void
1888_set_stacklevel (...) 2051_set_stacklevel (...)
1889 ALIAS: 2052 ALIAS:
1890 Coro::State::transfer = 1 2053 Coro::State::transfer = 1
1891 Coro::schedule = 2 2054 Coro::schedule = 2
1892 Coro::cede = 3 2055 Coro::cede = 3
1893 Coro::cede_notself = 4 2056 Coro::cede_notself = 4
1894 CODE: 2057 CODE:
1895{ 2058 coro_slf_patch (aTHX_ cv, ix, &ST (0), items);
1896 struct transfer_args ta;
1897
1898 PUTBACK;
1899 switch (ix)
1900 {
1901 case 0:
1902 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1903 ta.next = 0;
1904 break;
1905
1906 case 1:
1907 if (items != 2)
1908 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1909
1910 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1911 break;
1912
1913 case 2:
1914 prepare_schedule (aTHX_ &ta);
1915 break;
1916
1917 case 3:
1918 prepare_cede (aTHX_ &ta);
1919 break;
1920
1921 case 4:
1922 if (!prepare_cede_notself (aTHX_ &ta))
1923 XSRETURN_EMPTY;
1924
1925 break;
1926 }
1927 SPAGAIN;
1928
1929 BARRIER;
1930 PUTBACK;
1931 TRANSFER (ta, 0);
1932 SPAGAIN; /* might be the sp of a different coroutine now */
1933 /* be extra careful not to ever do anything after TRANSFER */
1934}
1935 2059
1936bool 2060bool
1937_destroy (SV *coro_sv) 2061_destroy (SV *coro_sv)
1938 CODE: 2062 CODE:
1939 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2063 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
… …
2047 is_destroyed = CF_DESTROYED 2171 is_destroyed = CF_DESTROYED
2048 CODE: 2172 CODE:
2049 RETVAL = boolSV (coro->flags & ix); 2173 RETVAL = boolSV (coro->flags & ix);
2050 OUTPUT: 2174 OUTPUT:
2051 RETVAL 2175 RETVAL
2176
2177void
2178throw (Coro::State self, SV *throw = &PL_sv_undef)
2179 PROTOTYPE: $;$
2180 CODE:
2181 SvREFCNT_dec (self->throw);
2182 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2052 2183
2053void 2184void
2054api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2185api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2055 2186
2056SV * 2187SV *
… …
2129 2260
2130 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2261 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2131 coro_ready[i] = newAV (); 2262 coro_ready[i] = newAV ();
2132 2263
2133 { 2264 {
2134 SV *sv = perl_get_sv ("Coro::API", TRUE); 2265 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2135 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2136 2266
2137 coroapi.schedule = api_schedule; 2267 coroapi.schedule = api_schedule;
2138 coroapi.cede = api_cede; 2268 coroapi.cede = api_cede;
2139 coroapi.cede_notself = api_cede_notself; 2269 coroapi.cede_notself = api_cede_notself;
2140 coroapi.ready = api_ready; 2270 coroapi.ready = api_ready;
… …
2200 CODE: 2330 CODE:
2201 RETVAL = coro_nready; 2331 RETVAL = coro_nready;
2202 OUTPUT: 2332 OUTPUT:
2203 RETVAL 2333 RETVAL
2204 2334
2205void
2206throw (Coro::State self, SV *throw = &PL_sv_undef)
2207 PROTOTYPE: $;$
2208 CODE:
2209 SvREFCNT_dec (self->throw);
2210 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2211
2212# for async_pool speedup 2335# for async_pool speedup
2213void 2336void
2214_pool_1 (SV *cb) 2337_pool_1 (SV *cb)
2215 CODE: 2338 CODE:
2216{ 2339{
… …
2415 2538
2416MODULE = Coro::State PACKAGE = PerlIO::cede 2539MODULE = Coro::State PACKAGE = PerlIO::cede
2417 2540
2418BOOT: 2541BOOT:
2419 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2542 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2543

Diff Legend

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