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.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 struct coro *transfer_next;
187
188struct transfer_args
189{
190 struct coro *prev, *next;
191};
186 192
187static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
188static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
189static SV *rv_diehook; 195static SV *rv_diehook;
190static SV *rv_warnhook; 196static SV *rv_warnhook;
… …
407 : 0 413 : 0
408 414
409#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)
410#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)
411 417
412static struct coro * 418INLINE struct coro *
413SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
414{ 420{
415 HV *stash; 421 HV *stash;
416 MAGIC *mg; 422 MAGIC *mg;
417 423
… …
708 } 714 }
709 715
710 return rss; 716 return rss;
711} 717}
712 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
713/** coroutine stack handling ************************************************/ 746/** coroutine stack handling ************************************************/
714 747
715static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 748static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
716static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 749static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
717static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg); 750static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
… …
834 PL_rs = newSVsv (GvSV (irsgv)); 867 PL_rs = newSVsv (GvSV (irsgv));
835 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
836 869
837 { 870 {
838 dSP; 871 dSP;
839 LOGOP myop; 872 UNOP myop;
840 873
841 Zero (&myop, 1, LOGOP); 874 Zero (&myop, 1, UNOP);
842 myop.op_next = Nullop; 875 myop.op_next = Nullop;
843 myop.op_flags = OPf_WANT_VOID; 876 myop.op_flags = OPf_WANT_VOID;
844 877
845 PUSHMARK (SP); 878 PUSHMARK (SP);
846 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
849 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
850 SPAGAIN; 883 SPAGAIN;
851 } 884 }
852 885
853 /* 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
854 * likely was suspended in set_stacklevel, called from entersub. 887 * likely was suspended in set_stacklevel, called from pp_set_stacklevel,
855 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 888 * so we have to emulate entering pp_set_stacklevel here.
856 * so we ENTER here for symmetry
857 */ 889 */
858 ENTER; 890 SLF_HEAD;
859} 891}
860 892
861static void 893static void
862coro_destruct (pTHX_ struct coro *coro) 894coro_destruct (pTHX_ struct coro *coro)
863{ 895{
… …
892 SvREFCNT_dec (coro->throw); 924 SvREFCNT_dec (coro->throw);
893 925
894 coro_destruct_stacks (aTHX); 926 coro_destruct_stacks (aTHX);
895} 927}
896 928
897static void 929INLINE void
898free_coro_mortal (pTHX) 930free_coro_mortal (pTHX)
899{ 931{
900 if (expect_true (coro_mortal)) 932 if (expect_true (coro_mortal))
901 { 933 {
902 SvREFCNT_dec (coro_mortal); 934 SvREFCNT_dec (coro_mortal);
… …
1026 1058
1027 TAINT_NOT; 1059 TAINT_NOT;
1028 return 0; 1060 return 0;
1029} 1061}
1030 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
1031/* 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 */
1032/* _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 */
1033/* during execution of a perl program */ 1072/* during execution of a perl program */
1073/* also initialises PL_top_env */
1034static void NOINLINE 1074static void NOINLINE
1035cctx_prepare (pTHX_ coro_cctx *cctx) 1075cctx_prepare (pTHX_ coro_cctx *cctx)
1036{ 1076{
1037 dSP; 1077 dSP;
1038 LOGOP myop; 1078 UNOP myop;
1039 1079
1040 PL_top_env = &PL_start_env; 1080 PL_top_env = &PL_start_env;
1041 1081
1042 if (cctx->flags & CC_TRACE) 1082 if (cctx->flags & CC_TRACE)
1043 PL_runops = runops_trace; 1083 PL_runops = runops_trace;
1044 1084
1045 Zero (&myop, 1, LOGOP); 1085 Zero (&myop, 1, UNOP);
1046 myop.op_next = PL_op; 1086 myop.op_next = PL_op;
1047 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1087 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1048 1088
1049 PUSHMARK (SP); 1089 PUSHMARK (SP);
1050 EXTEND (SP, 2); 1090 EXTEND (SP, 2);
1051 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1091 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1052 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1092 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1053 PUTBACK; 1093 PUTBACK;
1054 PL_op = (OP *)&myop; 1094 PL_op = (OP *)&myop;
1055 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1095 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1056 SPAGAIN; 1096 SPAGAIN;
1057} 1097}
1058 1098
1099/* the tail of transfer: execute stuff we can only do after a transfer */
1100INLINE void
1101transfer_tail (pTHX)
1102{
1103 struct coro *next = (struct coro *)transfer_next;
1104 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1105 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1106
1107 free_coro_mortal (aTHX);
1108 UNLOCK;
1109
1110 if (expect_false (next->throw))
1111 {
1112 SV *exception = sv_2mortal (next->throw);
1113
1114 next->throw = 0;
1115 sv_setsv (ERRSV, exception);
1116 croak (0);
1117 }
1118}
1119
1059/* 1120/*
1060 * this is a _very_ stripped down perl interpreter ;) 1121 * this is a _very_ stripped down perl interpreter ;)
1061 */ 1122 */
1062static void 1123static void
1063cctx_run (void *arg) 1124cctx_run (void *arg)
… …
1068# endif 1129# endif
1069#endif 1130#endif
1070 { 1131 {
1071 dTHX; 1132 dTHX;
1072 1133
1073 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1134 /* we are the alternative tail to pp_set_stacklevel */
1074 UNLOCK; 1135 /* so do the same things here */
1136 SLF_TAIL;
1075 1137
1076 /* we now skip the entersub that lead to transfer() */ 1138 /* we now skip the op that did lead to transfer() */
1077 PL_op = PL_op->op_next; 1139 PL_op = PL_op->op_next;
1078 1140
1079 /* inject a fake subroutine call to cctx_init */ 1141 /* inject a fake subroutine call to cctx_init */
1080 cctx_prepare (aTHX_ (coro_cctx *)arg); 1142 cctx_prepare (aTHX_ (coro_cctx *)arg);
1143
1144 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX);
1081 1146
1082 /* 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 */
1083 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1084 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1085 1150
… …
1101 coro_cctx *cctx; 1166 coro_cctx *cctx;
1102 1167
1103 ++cctx_count; 1168 ++cctx_count;
1104 New (0, cctx, 1, coro_cctx); 1169 New (0, cctx, 1, coro_cctx);
1105 1170
1106 cctx->gen = cctx_gen; 1171 cctx->gen = cctx_gen;
1107 cctx->flags = 0; 1172 cctx->flags = 0;
1173 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1108 1174
1109 return cctx; 1175 return cctx;
1110} 1176}
1111 1177
1112/* create a new cctx only suitable as source */ 1178/* create a new cctx only suitable as source */
1113static coro_cctx * 1179static coro_cctx *
1114cctx_new_empty () 1180cctx_new_empty ()
1115{ 1181{
1116 coro_cctx *cctx = cctx_new (); 1182 coro_cctx *cctx = cctx_new ();
1117 1183
1118 cctx->sptr = 0; 1184 cctx->sptr = 0;
1119 cctx->idle_sp = 0; /* should never be a valid address */
1120 coro_create (&cctx->cctx, 0, 0, 0, 0); 1185 coro_create (&cctx->cctx, 0, 0, 0, 0);
1121 1186
1122 return cctx; 1187 return cctx;
1123} 1188}
1124 1189
… …
1135 /* mmap supposedly does allocate-on-write for us */ 1200 /* 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); 1201 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1137 1202
1138 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1139 { 1204 {
1140# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1141 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1142# endif 1207 #endif
1143 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1144 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1145 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1146 } 1211 }
1147 else 1212 else
1148#endif 1213#endif
1149 { 1214 {
1150 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1151 New (0, cctx->sptr, cctx_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1152 1217
1153 if (!cctx->sptr) 1218 if (!cctx->sptr)
1154 { 1219 {
1155 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1156 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1157 } 1222 }
1158 1223
1159 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1160 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1161 } 1226 }
1162 1227
1163 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
1164 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);
1165 1233
1166 return cctx; 1234 return cctx;
1167} 1235}
1168 1236
… …
1176 coro_destroy (&cctx->cctx); 1244 coro_destroy (&cctx->cctx);
1177 1245
1178 /* coro_transfer creates new, empty cctx's */ 1246 /* coro_transfer creates new, empty cctx's */
1179 if (cctx->sptr) 1247 if (cctx->sptr)
1180 { 1248 {
1181#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1182 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1183#endif 1251 #endif
1184 1252
1185#if HAVE_MMAP 1253#if HAVE_MMAP
1186 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1187 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1188 else 1256 else
… …
1215} 1283}
1216 1284
1217static void 1285static void
1218cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1219{ 1287{
1220 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));
1221 1289
1222 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1223 if (expect_false (cctx_idle >= cctx_max_idle)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1224 { 1292 {
1225 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
… …
1264 dSTACKLEVEL; 1332 dSTACKLEVEL;
1265 1333
1266 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1267 if (expect_false (!next)) 1335 if (expect_false (!next))
1268 { 1336 {
1269 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((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 */ 1338 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1271 } 1339 }
1272 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1273 { 1341 {
1274 static volatile int has_throw;
1275 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1276 1343
1277 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1278 { 1345 {
1279 /* create a new empty/source context */ 1346 /* create a new empty/source context */
… …
1300 else 1367 else
1301 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1302 1369
1303 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1304 1371
1305 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1306 if (expect_true ( 1373 if (expect_true (
1307 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1308 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1309 && !force_cctx 1376 && !force_cctx
1310 )) 1377 ))
1311 { 1378 {
1312 /* 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 */
1313 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));
1314 1381
1315 prev->cctx = 0; 1382 prev->cctx = 0;
1316 1383
1317 /* 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 */
1318 /* 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 */
… …
1326 ++next->usecount; 1393 ++next->usecount;
1327 1394
1328 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1329 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1330 1397
1331 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1332 1400
1333 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1334 { 1402 {
1335 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1336 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1337 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1338 } 1406 }
1339 1407
1340 free_coro_mortal (aTHX); 1408 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 } 1409 }
1356} 1410}
1357
1358struct transfer_args
1359{
1360 struct coro *prev, *next;
1361};
1362 1411
1363#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))
1364#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1365 1414
1366/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
… …
1539 1588
1540static int 1589static int
1541api_is_ready (SV *coro_sv) 1590api_is_ready (SV *coro_sv)
1542{ 1591{
1543 dTHX; 1592 dTHX;
1593
1544 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1594 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1545} 1595}
1546 1596
1547static void 1597INLINE void
1548prepare_schedule (pTHX_ struct transfer_args *ta) 1598prepare_schedule (pTHX_ struct transfer_args *ta)
1549{ 1599{
1550 SV *prev_sv, *next_sv; 1600 SV *prev_sv, *next_sv;
1551 1601
1552 for (;;) 1602 for (;;)
… …
1578 /* cannot transfer to destroyed coros, skip and look for next */ 1628 /* cannot transfer to destroyed coros, skip and look for next */
1579 if (expect_false (ta->next->flags & CF_DESTROYED)) 1629 if (expect_false (ta->next->flags & CF_DESTROYED))
1580 { 1630 {
1581 UNLOCK; 1631 UNLOCK;
1582 SvREFCNT_dec (next_sv); 1632 SvREFCNT_dec (next_sv);
1583 /* coro_nready is already taken care of by destroy */ 1633 /* coro_nready has already been taken care of by destroy */
1584 continue; 1634 continue;
1585 } 1635 }
1586 1636
1587 --coro_nready; 1637 --coro_nready;
1588 UNLOCK; 1638 UNLOCK;
… …
1591 1641
1592 /* free this only after the transfer */ 1642 /* free this only after the transfer */
1593 prev_sv = SvRV (coro_current); 1643 prev_sv = SvRV (coro_current);
1594 ta->prev = SvSTATE (prev_sv); 1644 ta->prev = SvSTATE (prev_sv);
1595 TRANSFER_CHECK (*ta); 1645 TRANSFER_CHECK (*ta);
1596 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));
1597 ta->next->flags &= ~CF_READY; 1647 ta->next->flags &= ~CF_READY;
1598 SvRV_set (coro_current, next_sv); 1648 SvRV_set (coro_current, next_sv);
1599 1649
1600 LOCK; 1650 LOCK;
1601 free_coro_mortal (aTHX); 1651 free_coro_mortal (aTHX);
1602 coro_mortal = prev_sv; 1652 coro_mortal = prev_sv;
1603 UNLOCK; 1653 UNLOCK;
1604} 1654}
1605 1655
1606static void 1656INLINE void
1607prepare_cede (pTHX_ struct transfer_args *ta) 1657prepare_cede (pTHX_ struct transfer_args *ta)
1608{ 1658{
1609 api_ready (coro_current); 1659 api_ready (coro_current);
1610 prepare_schedule (aTHX_ ta); 1660 prepare_schedule (aTHX_ ta);
1611} 1661}
1612 1662
1613static int 1663static void
1614prepare_cede_notself (pTHX_ struct transfer_args *ta) 1664prepare_cede_notself (pTHX_ struct transfer_args *ta)
1615{ 1665{
1666 SV *prev = SvRV (coro_current);
1667
1616 if (coro_nready) 1668 if (coro_nready)
1617 { 1669 {
1618 SV *prev = SvRV (coro_current);
1619 prepare_schedule (aTHX_ ta); 1670 prepare_schedule (aTHX_ ta);
1620 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);
1621 return 1; 1698 return 1;
1622 } 1699 }
1623 else 1700 else
1624 return 0; 1701 return 0;
1625} 1702}
1626 1703
1627static void
1628api_schedule (void)
1629{
1630 dTHX;
1631 struct transfer_args ta;
1632
1633 prepare_schedule (aTHX_ &ta);
1634 TRANSFER (ta, 1);
1635}
1636
1637static int
1638api_cede (void)
1639{
1640 dTHX;
1641 struct transfer_args ta;
1642
1643 prepare_cede (aTHX_ &ta);
1644
1645 if (expect_true (ta.prev != ta.next))
1646 {
1647 TRANSFER (ta, 1);
1648 return 1;
1649 }
1650 else
1651 return 0;
1652}
1653
1654static int 1704static int
1655api_cede_notself (void) 1705api_cede_notself (void)
1656{ 1706{
1707 if (coro_nready)
1708 {
1657 dTHX; 1709 dTHX;
1658 struct transfer_args ta; 1710 struct transfer_args ta;
1659 1711
1660 if (prepare_cede_notself (aTHX_ &ta)) 1712 prepare_cede_notself (aTHX_ &ta);
1661 {
1662 TRANSFER (ta, 1); 1713 TRANSFER (ta, 1);
1663 return 1; 1714 return 1;
1664 } 1715 }
1665 else 1716 else
1666 return 0; 1717 return 0;
… …
1783 PerlIOBuf_get_ptr, 1834 PerlIOBuf_get_ptr,
1784 PerlIOBuf_get_cnt, 1835 PerlIOBuf_get_cnt,
1785 PerlIOBuf_set_ptrcnt, 1836 PerlIOBuf_set_ptrcnt,
1786}; 1837};
1787 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}
1788 1966
1789MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1967MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1790 1968
1791PROTOTYPES: DISABLE 1969PROTOTYPES: DISABLE
1792 1970
… …
1867 av_push (coro->args, newSVsv (ST (i))); 2045 av_push (coro->args, newSVsv (ST (i)));
1868} 2046}
1869 OUTPUT: 2047 OUTPUT:
1870 RETVAL 2048 RETVAL
1871 2049
1872# 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
1874# stack offset
1875void 2050void
1876_set_stacklevel (...) 2051_set_stacklevel (...)
1877 ALIAS: 2052 ALIAS:
1878 Coro::State::transfer = 1 2053 Coro::State::transfer = 1
1879 Coro::schedule = 2 2054 Coro::schedule = 2
1880 Coro::cede = 3 2055 Coro::cede = 3
1881 Coro::cede_notself = 4 2056 Coro::cede_notself = 4
1882 CODE: 2057 CODE:
1883{ 2058 coro_slf_patch (aTHX_ cv, ix, &ST (0), items);
1884 struct transfer_args ta;
1885
1886 PUTBACK;
1887 switch (ix)
1888 {
1889 case 0:
1890 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1891 ta.next = 0;
1892 break;
1893
1894 case 1:
1895 if (items != 2)
1896 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1897
1898 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
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 }
1915 SPAGAIN;
1916
1917 BARRIER;
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}
1923 2059
1924bool 2060bool
1925_destroy (SV *coro_sv) 2061_destroy (SV *coro_sv)
1926 CODE: 2062 CODE:
1927 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2063 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
… …
2035 is_destroyed = CF_DESTROYED 2171 is_destroyed = CF_DESTROYED
2036 CODE: 2172 CODE:
2037 RETVAL = boolSV (coro->flags & ix); 2173 RETVAL = boolSV (coro->flags & ix);
2038 OUTPUT: 2174 OUTPUT:
2039 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;
2040 2183
2041void 2184void
2042api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2185api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2043 2186
2044SV * 2187SV *
… …
2117 2260
2118 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2261 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2119 coro_ready[i] = newAV (); 2262 coro_ready[i] = newAV ();
2120 2263
2121 { 2264 {
2122 SV *sv = perl_get_sv ("Coro::API", TRUE); 2265 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2123 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2124 2266
2125 coroapi.schedule = api_schedule; 2267 coroapi.schedule = api_schedule;
2126 coroapi.cede = api_cede; 2268 coroapi.cede = api_cede;
2127 coroapi.cede_notself = api_cede_notself; 2269 coroapi.cede_notself = api_cede_notself;
2128 coroapi.ready = api_ready; 2270 coroapi.ready = api_ready;
… …
2188 CODE: 2330 CODE:
2189 RETVAL = coro_nready; 2331 RETVAL = coro_nready;
2190 OUTPUT: 2332 OUTPUT:
2191 RETVAL 2333 RETVAL
2192 2334
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 2335# for async_pool speedup
2201void 2336void
2202_pool_1 (SV *cb) 2337_pool_1 (SV *cb)
2203 CODE: 2338 CODE:
2204{ 2339{
… …
2403 2538
2404MODULE = Coro::State PACKAGE = PerlIO::cede 2539MODULE = Coro::State PACKAGE = PerlIO::cede
2405 2540
2406BOOT: 2541BOOT:
2407 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2542 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2543

Diff Legend

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