ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.254 by root, Fri Nov 7 20:27:47 2008 UTC vs.
Revision 1.273 by root, Fri Nov 14 23:48:10 2008 UTC

46# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
47#endif 47#endif
48 48
49#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
51# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
52#else
53# define REGISTER_STACK(cctx,start,end)
54#endif 51#endif
55 52
56/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
57static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
58 55
119# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
120#endif 117#endif
121 118
122/* The next macros try to return the current stack pointer, in an as 119/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 120 * portable way as possible. */
124#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
125#define STACKLEVEL ((void *)&stacklevel) 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
126 126
127#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
128 128
129#if __GNUC__ >= 3 129#if __GNUC__ >= 3
130# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
131# define BARRIER __asm__ __volatile__ ("" : : : "memory")
132# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
133#else 133#else
134# define attribute(x) 134# define attribute(x)
135# define BARRIER
136# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
137#endif 137#endif
138 138
139#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
141 141
142#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
143 143
144#include "CoroAPI.h" 144#include "CoroAPI.h"
145 145
146#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
147static perl_mutex coro_lock; 148static perl_mutex coro_lock;
148# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
149# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
150#else 155#else
156
151# define LOCK (void)0 157# define LOCK (void)0
152# define UNLOCK (void)0 158# define UNLOCK (void)0
159
153#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
154 166
155/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
156struct io_state 168struct io_state
157{ 169{
158 AV *res; 170 AV *res;
159 int errorno; 171 int errorno;
160 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
161 int laststatval; 173 int laststatval;
162 Stat_t statcache; 174 Stat_t statcache;
163}; 175};
164 176
165static double (*nvtime)(); /* so why doesn't it take void? */ 177static double (*nvtime)(); /* so why doesn't it take void? */
169static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 183static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next;
174 187
175static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 190static SV *rv_diehook;
178static SV *rv_warnhook; 191static SV *rv_warnhook;
197 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
198 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
199}; 212};
200 213
201/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
202typedef struct coro_cctx { 215typedef struct coro_cctx
216{
203 struct coro_cctx *next; 217 struct coro_cctx *next;
204 218
205 /* the stack */ 219 /* the stack */
206 void *sptr; 220 void *sptr;
207 size_t ssize; 221 size_t ssize;
225 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
226 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
227}; 241};
228 242
229/* the structure where most of the perl state is stored, overlaid on the cxstack */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
230typedef struct { 244typedef struct
245{
231 SV *defsv; 246 SV *defsv;
232 AV *defav; 247 AV *defav;
233 SV *errsv; 248 SV *errsv;
234 SV *irsgv; 249 SV *irsgv;
235#define VAR(name,type) type name; 250#define VAR(name,type) type name;
239 254
240#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
241 256
242/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
243struct coro { 258struct coro {
244 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
245 coro_cctx *cctx; 260 coro_cctx *cctx;
246 261
247 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 264 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
250 266
251 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
267 struct coro *next, *prev; 283 struct coro *next, *prev;
268}; 284};
269 285
270typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
271typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
272 290
273/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
274 292
275#define PRIO_MAX 3 293#define PRIO_MAX 3
276#define PRIO_HIGH 1 294#define PRIO_HIGH 1
280#define PRIO_MIN -4 298#define PRIO_MIN -4
281 299
282/* for Coro.pm */ 300/* for Coro.pm */
283static SV *coro_current; 301static SV *coro_current;
284static SV *coro_readyhook; 302static SV *coro_readyhook;
285static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
286static int coro_nready;
287static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
288 306
289/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
290 308
291static SV * 309static SV *
292coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
395 : 0 413 : 0
396 414
397#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
398#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
399 417
400static struct coro * 418INLINE struct coro *
401SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
402{ 420{
403 HV *stash; 421 HV *stash;
404 MAGIC *mg; 422 MAGIC *mg;
405 423
496 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
497 } 515 }
498 516
499 PUTBACK; 517 PUTBACK;
500 } 518 }
519
520 slf_frame = c->slf_frame;
501} 521}
502 522
503static void 523static void
504save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
505{ 525{
526 c->slf_frame = slf_frame;
527
506 { 528 {
507 dSP; 529 dSP;
508 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
509 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
510 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
577 #undef VAR 599 #undef VAR
578 } 600 }
579} 601}
580 602
581/* 603/*
582 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
583 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
584 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
585 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
586 */ 608 */
587#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
789 811
790 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
791} 813}
792 814
793static void 815static void
816prepare_nop (aTHX_ struct coro_transfer_args *ta)
817{
818 /* kind of mega-hacky, but works */
819 ta->next = ta->prev = (struct coro *)ta;
820}
821
822static int
823slf_check_nop (aTHX)
824{
825 return 0;
826}
827
828static void
794coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
795{ 830{
796 /* 831 /*
797 * emulate part of the perl startup here. 832 * emulate part of the perl startup here.
798 */ 833 */
822 PL_rs = newSVsv (GvSV (irsgv)); 857 PL_rs = newSVsv (GvSV (irsgv));
823 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
824 859
825 { 860 {
826 dSP; 861 dSP;
827 LOGOP myop; 862 UNOP myop;
828 863
829 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
830 myop.op_next = Nullop; 865 myop.op_next = Nullop;
831 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
832 867
833 PUSHMARK (SP); 868 PUSHMARK (SP);
834 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
837 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
838 SPAGAIN; 873 SPAGAIN;
839 } 874 }
840 875
841 /* this newly created coroutine might be run on an existing cctx which most 876 /* this newly created coroutine might be run on an existing cctx which most
842 * likely was suspended in set_stacklevel, called from entersub. 877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
843 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
844 * so we ENTER here for symmetry
845 */ 878 */
846 ENTER; 879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
847} 881}
848 882
849static void 883static void
850coro_destruct (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
851{ 885{
880 SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
881 915
882 coro_destruct_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
883} 917}
884 918
885static void 919INLINE void
886free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
887{ 921{
888 if (expect_true (coro_mortal)) 922 if (expect_true (coro_mortal))
889 { 923 {
890 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
1014 1048
1015 TAINT_NOT; 1049 TAINT_NOT;
1016 return 0; 1050 return 0;
1017} 1051}
1018 1052
1053static void
1054prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1055{
1056 ta->prev = (struct coro *)cctx;
1057 ta->next = 0;
1058}
1059
1019/* inject a fake call to Coro::State::_cctx_init into the execution */ 1060/* inject a fake call to Coro::State::_cctx_init into the execution */
1020/* _cctx_init should be careful, as it could be called at almost any time */ 1061/* _cctx_init should be careful, as it could be called at almost any time */
1021/* during execution of a perl program */ 1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
1022static void NOINLINE 1064static void NOINLINE
1023cctx_prepare (pTHX_ coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
1024{ 1066{
1025 dSP; 1067 dSP;
1026 LOGOP myop; 1068 UNOP myop;
1027 1069
1028 PL_top_env = &PL_start_env; 1070 PL_top_env = &PL_start_env;
1029 1071
1030 if (cctx->flags & CC_TRACE) 1072 if (cctx->flags & CC_TRACE)
1031 PL_runops = runops_trace; 1073 PL_runops = runops_trace;
1032 1074
1033 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
1034 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
1035 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1036 1078
1037 PUSHMARK (SP); 1079 PUSHMARK (SP);
1038 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
1039 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1040 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1041 PUTBACK; 1083 PUTBACK;
1042 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
1043 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1044 SPAGAIN; 1086 SPAGAIN;
1045} 1087}
1046 1088
1089/* the tail of transfer: execute stuff we can only do after a transfer */
1090INLINE void
1091transfer_tail (pTHX)
1092{
1093 struct coro *next = (struct coro *)transfer_next;
1094 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1095 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1096
1097 free_coro_mortal (aTHX);
1098 UNLOCK;
1099
1100 if (expect_false (next->throw))
1101 {
1102 SV *exception = sv_2mortal (next->throw);
1103
1104 next->throw = 0;
1105 sv_setsv (ERRSV, exception);
1106 croak (0);
1107 }
1108}
1109
1047/* 1110/*
1048 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
1049 */ 1112 */
1050static void 1113static void
1051cctx_run (void *arg) 1114cctx_run (void *arg)
1052{ 1115{
1116#ifdef USE_ITHREADS
1117# if CORO_PTHREAD
1118 PERL_SET_CONTEXT (coro_thx);
1119# endif
1120#endif
1121 {
1053 dTHX; 1122 dTHX;
1054 1123
1055 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1124 /* normally we would need to skip the entersub here */
1056 UNLOCK; 1125 /* not doing so will re-execute it, which is exactly what we want */
1057
1058 /* we now skip the entersub that lead to transfer() */
1059 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
1060 1127
1061 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
1062 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
1063 1130
1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1133 transfer_tail (aTHX);
1134
1064 /* somebody or something will hit me for both perl_run and PL_restartop */ 1135 /* somebody or something will hit me for both perl_run and PL_restartop */
1065 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
1066 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
1067 1138
1068 /* 1139 /*
1069 * If perl-run returns we assume exit() was being called or the coro 1140 * If perl-run returns we assume exit() was being called or the coro
1070 * fell off the end, which seems to be the only valid (non-bug) 1141 * fell off the end, which seems to be the only valid (non-bug)
1071 * reason for perl_run to return. We try to exit by jumping to the 1142 * reason for perl_run to return. We try to exit by jumping to the
1072 * bootstrap-time "top" top_env, as we cannot restore the "main" 1143 * bootstrap-time "top" top_env, as we cannot restore the "main"
1073 * coroutine as Coro has no such concept 1144 * coroutine as Coro has no such concept
1074 */ 1145 */
1075 PL_top_env = main_top_env; 1146 PL_top_env = main_top_env;
1076 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1147 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1148 }
1077} 1149}
1078 1150
1079static coro_cctx * 1151static coro_cctx *
1080cctx_new () 1152cctx_new ()
1081{ 1153{
1082 coro_cctx *cctx; 1154 coro_cctx *cctx;
1155
1156 ++cctx_count;
1157 New (0, cctx, 1, coro_cctx);
1158
1159 cctx->gen = cctx_gen;
1160 cctx->flags = 0;
1161 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1162
1163 return cctx;
1164}
1165
1166/* create a new cctx only suitable as source */
1167static coro_cctx *
1168cctx_new_empty ()
1169{
1170 coro_cctx *cctx = cctx_new ();
1171
1172 cctx->sptr = 0;
1173 coro_create (&cctx->cctx, 0, 0, 0, 0);
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx suitable as destination/running a perl interpreter */
1179static coro_cctx *
1180cctx_new_run ()
1181{
1182 coro_cctx *cctx = cctx_new ();
1083 void *stack_start; 1183 void *stack_start;
1084 size_t stack_size; 1184 size_t stack_size;
1085
1086 ++cctx_count;
1087 Newz (0, cctx, 1, coro_cctx);
1088
1089 cctx->gen = cctx_gen;
1090 1185
1091#if HAVE_MMAP 1186#if HAVE_MMAP
1092 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1187 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1093 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
1094 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1189 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1095 1190
1096 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
1097 { 1192 {
1098# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
1099 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1100# endif 1195 #endif
1101 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1102 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1103 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
1104 } 1199 }
1105 else 1200 else
1106#endif 1201#endif
1107 { 1202 {
1108 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1109 New (0, cctx->sptr, cctx_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
1110 1205
1111 if (!cctx->sptr) 1206 if (!cctx->sptr)
1112 { 1207 {
1113 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1114 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
1115 } 1210 }
1116 1211
1117 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
1118 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
1119 } 1214 }
1120 1215
1121 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1216 #if CORO_USE_VALGRIND
1217 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1218 #endif
1219
1122 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1220 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1123 1221
1124 return cctx; 1222 return cctx;
1125} 1223}
1126 1224
1134 coro_destroy (&cctx->cctx); 1232 coro_destroy (&cctx->cctx);
1135 1233
1136 /* coro_transfer creates new, empty cctx's */ 1234 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr) 1235 if (cctx->sptr)
1138 { 1236 {
1139#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1141#endif 1239 #endif
1142 1240
1143#if HAVE_MMAP 1241#if HAVE_MMAP
1144 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
1145 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
1146 else 1244 else
1167 return cctx; 1265 return cctx;
1168 1266
1169 cctx_destroy (cctx); 1267 cctx_destroy (cctx);
1170 } 1268 }
1171 1269
1172 return cctx_new (); 1270 return cctx_new_run ();
1173} 1271}
1174 1272
1175static void 1273static void
1176cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
1177{ 1275{
1178 assert (("cctx_put called on non-initialised cctx", cctx->sptr)); 1276 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1179 1277
1180 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
1181 if (expect_false (cctx_idle >= cctx_max_idle)) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
1182 { 1280 {
1183 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
1198transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1199{ 1297{
1200 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1201 { 1299 {
1202 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1203 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1301 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1204 1302
1205 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1206 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1304 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1207 1305
1208 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1209 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1307 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1210 1308
1211#if !PERL_VERSION_ATLEAST (5,10,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1212 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1213 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version"); 1311 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1214#endif 1312#endif
1215 } 1313 }
1216} 1314}
1217 1315
1218/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1222 dSTACKLEVEL; 1320 dSTACKLEVEL;
1223 1321
1224 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
1225 if (expect_false (!next)) 1323 if (expect_false (!next))
1226 { 1324 {
1227 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = stacklevel;
1228 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1326 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1229 } 1327 }
1230 else if (expect_true (prev != next)) 1328 else if (expect_true (prev != next))
1231 { 1329 {
1232 static volatile int has_throw;
1233 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
1234 1331
1235 if (expect_false (prev->flags & CF_NEW)) 1332 if (expect_false (prev->flags & CF_NEW))
1236 { 1333 {
1237 /* create a new empty/source context */ 1334 /* create a new empty/source context */
1238 ++cctx_count; 1335 prev->cctx = cctx_new_empty ();
1239 New (0, prev->cctx, 1, coro_cctx);
1240 prev->cctx->sptr = 0;
1241 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1242
1243 prev->flags &= ~CF_NEW; 1336 prev->flags &= ~CF_NEW;
1244 prev->flags |= CF_RUNNING; 1337 prev->flags |= CF_RUNNING;
1245 } 1338 }
1246 1339
1247 prev->flags &= ~CF_RUNNING; 1340 prev->flags &= ~CF_RUNNING;
1262 else 1355 else
1263 load_perl (aTHX_ next); 1356 load_perl (aTHX_ next);
1264 1357
1265 prev__cctx = prev->cctx; 1358 prev__cctx = prev->cctx;
1266 1359
1267 /* possibly "free" the cctx */ 1360 /* possibly untie and reuse the cctx */
1268 if (expect_true ( 1361 if (expect_true (
1269 prev__cctx->idle_sp == STACKLEVEL 1362 prev__cctx->idle_sp == stacklevel
1270 && !(prev__cctx->flags & CC_TRACE) 1363 && !(prev__cctx->flags & CC_TRACE)
1271 && !force_cctx 1364 && !force_cctx
1272 )) 1365 ))
1273 { 1366 {
1274 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1367 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1275 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1368 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1276 1369
1277 prev->cctx = 0; 1370 prev->cctx = 0;
1278 1371
1279 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1372 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1280 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1373 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1288 ++next->usecount; 1381 ++next->usecount;
1289 1382
1290 if (expect_true (!next->cctx)) 1383 if (expect_true (!next->cctx))
1291 next->cctx = cctx_get (aTHX); 1384 next->cctx = cctx_get (aTHX);
1292 1385
1293 has_throw = !!next->throw; 1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1294 1388
1295 if (expect_false (prev__cctx != next->cctx)) 1389 if (expect_false (prev__cctx != next->cctx))
1296 { 1390 {
1297 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1298 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1299 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1300 } 1394 }
1301 1395
1302 free_coro_mortal (aTHX); 1396 transfer_tail (aTHX);
1303 UNLOCK;
1304
1305 if (expect_false (has_throw))
1306 {
1307 struct coro *coro = SvSTATE (coro_current);
1308
1309 if (coro->throw)
1310 {
1311 SV *exception = coro->throw;
1312 coro->throw = 0;
1313 sv_setsv (ERRSV, exception);
1314 croak (0);
1315 }
1316 }
1317 } 1397 }
1318} 1398}
1319
1320struct transfer_args
1321{
1322 struct coro *prev, *next;
1323};
1324 1399
1325#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1400#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1326#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1327 1402
1328/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
1348 1423
1349 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1350 { 1425 {
1351 struct coro temp; 1426 struct coro temp;
1352 1427
1353 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1354 croak ("FATAL: tried to destroy currently running coroutine");
1355 1429
1356 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1357 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1358 1432
1359 coro_destruct (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1410# define MGf_DUP 0 1484# define MGf_DUP 0
1411#endif 1485#endif
1412}; 1486};
1413 1487
1414static void 1488static void
1415prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1489prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1416{ 1490{
1417 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1418 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1419 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1420} 1494}
1421 1495
1422static void 1496static void
1423api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1424{ 1498{
1425 dTHX;
1426 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1427 1500
1428 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1429 TRANSFER (ta, 1); 1502 TRANSFER (ta, 1);
1430} 1503}
1431 1504
1448 1521
1449 return 0; 1522 return 0;
1450} 1523}
1451 1524
1452static int 1525static int
1453api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1454{ 1527{
1455 dTHX;
1456 struct coro *coro; 1528 struct coro *coro;
1457 SV *sv_hook; 1529 SV *sv_hook;
1458 void (*xs_hook)(void); 1530 void (*xs_hook)(void);
1459 1531
1460 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1498 1570
1499 return 1; 1571 return 1;
1500} 1572}
1501 1573
1502static int 1574static int
1503api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1504{ 1576{
1505 dTHX;
1506 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1507} 1578}
1508 1579
1509static void 1580INLINE void
1510prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1511{ 1582{
1512 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1513 1584
1514 for (;;) 1585 for (;;)
1515 { 1586 {
1540 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1541 if (expect_false (ta->next->flags & CF_DESTROYED)) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1542 { 1613 {
1543 UNLOCK; 1614 UNLOCK;
1544 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1545 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1546 continue; 1617 continue;
1547 } 1618 }
1548 1619
1549 --coro_nready; 1620 --coro_nready;
1550 UNLOCK; 1621 UNLOCK;
1553 1624
1554 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1555 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1556 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1557 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1558 assert (ta->next->flags & CF_READY); 1629 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1559 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1560 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1561 1632
1562 LOCK; 1633 LOCK;
1563 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1564 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1565 UNLOCK; 1636 UNLOCK;
1566} 1637}
1567 1638
1568static void 1639INLINE void
1569prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1570{ 1641{
1571 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1572 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1573} 1644}
1574 1645
1646INLINE void
1647prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1648{
1649 SV *prev = SvRV (coro_current);
1650
1651 if (coro_nready)
1652 {
1653 prepare_schedule (aTHX_ ta);
1654 api_ready (aTHX_ prev);
1655 }
1656 else
1657 prepare_nop (aTHX_ ta);
1658}
1659
1660static void
1661api_schedule (pTHX)
1662{
1663 struct coro_transfer_args ta;
1664
1665 prepare_schedule (aTHX_ &ta);
1666 TRANSFER (ta, 1);
1667}
1668
1575static int 1669static int
1576prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1577{ 1671{
1578 if (coro_nready) 1672 struct coro_transfer_args ta;
1579 { 1673
1580 SV *prev = SvRV (coro_current);
1581 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1582 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1583 return 1; 1679 return 1;
1584 } 1680 }
1585 else 1681 else
1586 return 0; 1682 return 0;
1587} 1683}
1588 1684
1589static void
1590api_schedule (void)
1591{
1592 dTHX;
1593 struct transfer_args ta;
1594
1595 prepare_schedule (aTHX_ &ta);
1596 TRANSFER (ta, 1);
1597}
1598
1599static int 1685static int
1600api_cede (void) 1686api_cede_notself (pTHX)
1601{ 1687{
1602 dTHX; 1688 if (coro_nready)
1689 {
1603 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1604 1691
1605 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1606
1607 if (expect_true (ta.prev != ta.next))
1608 {
1609 TRANSFER (ta, 1); 1693 TRANSFER (ta, 1);
1610 return 1; 1694 return 1;
1611 } 1695 }
1612 else 1696 else
1613 return 0; 1697 return 0;
1614} 1698}
1615 1699
1616static int 1700static void
1617api_cede_notself (void)
1618{
1619 dTHX;
1620 struct transfer_args ta;
1621
1622 if (prepare_cede_notself (aTHX_ &ta))
1623 {
1624 TRANSFER (ta, 1);
1625 return 1;
1626 }
1627 else
1628 return 0;
1629}
1630
1631static void
1632api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1633{ 1702{
1634 dTHX;
1635 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1636 1704
1637 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1638 { 1706 {
1639 if (!coro->cctx) 1707 if (!coro->cctx)
1640 coro->cctx = cctx_new (); 1708 coro->cctx = cctx_new_run ();
1641 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1642 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1643 1711
1644 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1645 } 1713 }
1646 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1647 { 1715 {
1652 else 1720 else
1653 coro->slot->runops = RUNOPS_DEFAULT; 1721 coro->slot->runops = RUNOPS_DEFAULT;
1654 } 1722 }
1655} 1723}
1656 1724
1725#if 0
1657static int 1726static int
1658coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1727coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1659{ 1728{
1660 AV *padlist; 1729 AV *padlist;
1661 AV *av = (AV *)mg->mg_obj; 1730 AV *av = (AV *)mg->mg_obj;
1667 1736
1668static MGVTBL coro_gensub_vtbl = { 1737static MGVTBL coro_gensub_vtbl = {
1669 0, 0, 0, 0, 1738 0, 0, 0, 0,
1670 coro_gensub_free 1739 coro_gensub_free
1671}; 1740};
1741#endif
1672 1742
1673/*****************************************************************************/ 1743/*****************************************************************************/
1674/* PerlIO::cede */ 1744/* PerlIO::cede */
1675 1745
1676typedef struct 1746typedef struct
1704 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1774 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1705 double now = nvtime (); 1775 double now = nvtime ();
1706 1776
1707 if (now >= self->next) 1777 if (now >= self->next)
1708 { 1778 {
1709 api_cede (); 1779 api_cede (aTHX);
1710 self->next = now + self->every; 1780 self->next = now + self->every;
1711 } 1781 }
1712 1782
1713 return PerlIOBuf_flush (aTHX_ f); 1783 return PerlIOBuf_flush (aTHX_ f);
1714} 1784}
1743 PerlIOBuf_get_ptr, 1813 PerlIOBuf_get_ptr,
1744 PerlIOBuf_get_cnt, 1814 PerlIOBuf_get_cnt,
1745 PerlIOBuf_set_ptrcnt, 1815 PerlIOBuf_set_ptrcnt,
1746}; 1816};
1747 1817
1818/*****************************************************************************/
1819
1820static const CV *slf_cv; /* for quick consistency check */
1821
1822static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1823static SV *slf_arg0;
1824static SV *slf_arg1;
1825static SV *slf_arg2;
1826
1827/* this restores the stack in the case we patched the entersub, to */
1828/* recreate the stack frame as perl will on following calls */
1829/* since entersub cleared the stack */
1830static OP *
1831pp_restore (pTHX)
1832{
1833 dSP;
1834
1835 PUSHMARK (SP);
1836
1837 EXTEND (SP, 3);
1838 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1839 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1840 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1841 PUSHs ((SV *)CvGV (slf_cv));
1842
1843 RETURNOP (slf_restore.op_first);
1844}
1845
1846static void
1847slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1848{
1849 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1850}
1851
1852static void
1853slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1854{
1855 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1856
1857 frame->prepare = slf_prepare_set_stacklevel;
1858 frame->check = slf_check_nop;
1859 frame->data = (void *)SvIV (arg [0]);
1860}
1861
1862static void
1863slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1864{
1865 SV **arg = (SV **)slf_frame.data;
1866
1867 prepare_transfer (ta, arg [0], arg [1]);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1875
1876 frame->prepare = slf_prepare_transfer;
1877 frame->check = slf_check_nop;
1878 frame->data = (void *)arg; /* let's hope it will stay valid */
1879}
1880
1881static void
1882slf_init_schedule (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1883{
1884 frame->prepare = prepare_schedule;
1885 frame->check = slf_check_nop;
1886}
1887
1888static void
1889slf_init_cede (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1890{
1891 frame->prepare = prepare_cede;
1892 frame->check = slf_check_nop;
1893}
1894
1895static void
1896slf_init_cede_notself (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1897{
1898 frame->prepare = prepare_cede_notself;
1899 frame->check = slf_check_nop;
1900}
1901
1902/* we hijack an hopefully unused CV flag for our purposes */
1903#define CVf_SLF 0x4000
1904
1905/*
1906 * these not obviously related functions are all rolled into one
1907 * function to increase chances that they all will call transfer with the same
1908 * stack offset
1909 * SLF stands for "schedule-like-function".
1910 */
1911static OP *
1912pp_slf (pTHX)
1913{
1914 I32 checkmark; /* mark SP to see how many elements check has pushed */
1915
1916 /* set up the slf frame, unless it has already been set-up */
1917 /* the latter happens when a new coro has been started */
1918 /* or when a new cctx was attached to an existing coroutine */
1919 if (expect_true (!slf_frame.prepare))
1920 {
1921 /* first iteration */
1922 dSP;
1923 SV **arg = PL_stack_base + TOPMARK + 1;
1924 int items = SP - arg; /* args without function object */
1925 SV *gv = *sp;
1926
1927 /* do a quick consistency check on the "function" object, and if it isn't */
1928 /* for us, divert to the real entersub */
1929 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1930 return PL_ppaddr[OP_ENTERSUB](aTHX);
1931
1932 /* pop args */
1933 SP = PL_stack_base + POPMARK;
1934
1935 if (!(PL_op->op_flags & OPf_STACKED))
1936 {
1937 /* ampersand-form of call, use @_ instead of stack */
1938 AV *av = GvAV (PL_defgv);
1939 arg = AvARRAY (av);
1940 items = AvFILLp (av) + 1;
1941 }
1942
1943 PUTBACK;
1944
1945 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr) (aTHX_ &slf_frame, arg, items);
1946 }
1947
1948 /* now interpret the slf_frame */
1949 /* we use a callback system not to make the code needlessly */
1950 /* complicated, but so we can run multiple perl coros from one cctx */
1951
1952 do
1953 {
1954 struct coro_transfer_args ta;
1955
1956 slf_frame.prepare (aTHX_ &ta);
1957 TRANSFER (ta, 0);
1958
1959 checkmark = PL_stack_sp - PL_stack_base;
1960 }
1961 while (slf_frame.check (aTHX_ &slf_frame));
1962
1963 {
1964 dSP;
1965 SV **bot = PL_stack_base + checkmark;
1966 int gimme = GIMME_V;
1967
1968 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1969
1970 /* make sure we put something on the stack in scalar context */
1971 if (gimme == G_SCALAR)
1972 {
1973 if (sp == bot)
1974 XPUSHs (&PL_sv_undef);
1975
1976 SP = bot + 1;
1977 }
1978
1979 PUTBACK;
1980 }
1981
1982 return NORMAL;
1983}
1984
1985static void
1986api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, SV **arg, int items)
1987{
1988 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1989
1990 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1991 && PL_op->op_ppaddr != pp_slf)
1992 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or other means, caught");
1993
1994 if (items > 3)
1995 croak ("Coro only supports up to three arguments to SLF functions currently, caught");
1996
1997 CvFLAGS (cv) |= CVf_SLF;
1998 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1999 slf_cv = cv;
2000
2001 /* we patch the op, and then re-run the whole call */
2002 /* we have to put the same argument on the stack for this to work */
2003 /* and this will be done by pp_restore */
2004 slf_restore.op_next = (OP *)&slf_restore;
2005 slf_restore.op_type = OP_NULL;
2006 slf_restore.op_ppaddr = pp_restore;
2007 slf_restore.op_first = PL_op;
2008
2009 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
2010 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2011 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
2012
2013 PL_op->op_ppaddr = pp_slf;
2014
2015 PL_op = (OP *)&slf_restore;
2016}
1748 2017
1749MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1750 2019
1751PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1752 2021
1753BOOT: 2022BOOT:
1754{ 2023{
1755#ifdef USE_ITHREADS 2024#ifdef USE_ITHREADS
1756 MUTEX_INIT (&coro_lock); 2025 MUTEX_INIT (&coro_lock);
2026# if CORO_PTHREAD
2027 coro_thx = PERL_GET_CONTEXT;
2028# endif
1757#endif 2029#endif
1758 BOOT_PAGESIZE; 2030 BOOT_PAGESIZE;
1759 2031
1760 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2032 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1761 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2033 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1779 main_top_env = PL_top_env; 2051 main_top_env = PL_top_env;
1780 2052
1781 while (main_top_env->je_prev) 2053 while (main_top_env->je_prev)
1782 main_top_env = main_top_env->je_prev; 2054 main_top_env = main_top_env->je_prev;
1783 2055
1784 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
1785 coroapi.rev = CORO_API_REVISION; 2057 coroapi.rev = CORO_API_REVISION;
2058
1786 coroapi.transfer = api_transfer; 2059 coroapi.transfer = api_transfer;
2060
2061 coroapi.sv_state = SvSTATE_;
2062 coroapi.execute_slf = api_execute_slf;
2063 coroapi.prepare_nop = prepare_nop;
2064 coroapi.prepare_schedule = prepare_schedule;
2065 coroapi.prepare_cede = prepare_cede;
2066 coroapi.prepare_cede_notself = prepare_cede_notself;
1787 2067
1788 { 2068 {
1789 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2069 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1790 2070
1791 if (!svp) croak ("Time::HiRes is required"); 2071 if (!svp) croak ("Time::HiRes is required");
1824 av_push (coro->args, newSVsv (ST (i))); 2104 av_push (coro->args, newSVsv (ST (i)));
1825} 2105}
1826 OUTPUT: 2106 OUTPUT:
1827 RETVAL 2107 RETVAL
1828 2108
1829# these not obviously related functions are all rolled into the same xs
1830# function to increase chances that they all will call transfer with the same
1831# stack offset
1832void 2109void
1833_set_stacklevel (...) 2110_set_stacklevel (...)
1834 ALIAS: 2111 CODE:
1835 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1836 Coro::schedule = 2
1837 Coro::cede = 3
1838 Coro::cede_notself = 4
1839 CODE:
1840{
1841 struct transfer_args ta;
1842 2113
1843 PUTBACK; 2114void
1844 switch (ix) 2115transfer (...)
1845 { 2116 CODE:
1846 case 0: 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1847 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1848 ta.next = 0;
1849 break;
1850
1851 case 1:
1852 if (items != 2)
1853 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1854
1855 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1856 break;
1857
1858 case 2:
1859 prepare_schedule (aTHX_ &ta);
1860 break;
1861
1862 case 3:
1863 prepare_cede (aTHX_ &ta);
1864 break;
1865
1866 case 4:
1867 if (!prepare_cede_notself (aTHX_ &ta))
1868 XSRETURN_EMPTY;
1869
1870 break;
1871 }
1872 SPAGAIN;
1873
1874 BARRIER;
1875 PUTBACK;
1876 TRANSFER (ta, 0);
1877 SPAGAIN; /* might be the sp of a different coroutine now */
1878 /* be extra careful not to ever do anything after TRANSFER */
1879}
1880 2118
1881bool 2119bool
1882_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
1883 CODE: 2121 CODE:
1884 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1994 RETVAL = boolSV (coro->flags & ix); 2232 RETVAL = boolSV (coro->flags & ix);
1995 OUTPUT: 2233 OUTPUT:
1996 RETVAL 2234 RETVAL
1997 2235
1998void 2236void
2237throw (Coro::State self, SV *throw = &PL_sv_undef)
2238 PROTOTYPE: $;$
2239 CODE:
2240 SvREFCNT_dec (self->throw);
2241 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2242
2243void
1999api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2244api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2245 C_ARGS: aTHX_ coro, flags
2000 2246
2001SV * 2247SV *
2002has_cctx (Coro::State coro) 2248has_cctx (Coro::State coro)
2003 PROTOTYPE: $ 2249 PROTOTYPE: $
2004 CODE: 2250 CODE:
2012 CODE: 2258 CODE:
2013 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2259 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
2014 OUTPUT: 2260 OUTPUT:
2015 RETVAL 2261 RETVAL
2016 2262
2017IV 2263UV
2018rss (Coro::State coro) 2264rss (Coro::State coro)
2019 PROTOTYPE: $ 2265 PROTOTYPE: $
2020 ALIAS: 2266 ALIAS:
2021 usecount = 1 2267 usecount = 1
2022 CODE: 2268 CODE:
2039 PROTOTYPE: $ 2285 PROTOTYPE: $
2040 ALIAS: 2286 ALIAS:
2041 swap_defav = 1 2287 swap_defav = 1
2042 CODE: 2288 CODE:
2043 if (!self->slot) 2289 if (!self->slot)
2044 croak ("cannot swap state with coroutine that has no saved state"); 2290 croak ("cannot swap state with coroutine that has no saved state,");
2045 else 2291 else
2046 { 2292 {
2047 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv); 2293 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2048 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2294 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2049 2295
2074 2320
2075 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2321 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2076 coro_ready[i] = newAV (); 2322 coro_ready[i] = newAV ();
2077 2323
2078 { 2324 {
2079 SV *sv = perl_get_sv ("Coro::API", TRUE); 2325 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2080 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2081 2326
2082 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
2083 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
2084 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
2085 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
2086 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
2087 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
2088 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
2089 2334
2090 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
2091 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
2092 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
2093 } 2338 }
2094} 2339}
2340
2341void
2342schedule (...)
2343 CODE:
2344 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), items);
2345
2346void
2347cede (...)
2348 CODE:
2349 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), items);
2350
2351void
2352cede_notself (...)
2353 CODE:
2354 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), items);
2095 2355
2096void 2356void
2097_set_current (SV *current) 2357_set_current (SV *current)
2098 PROTOTYPE: $ 2358 PROTOTYPE: $
2099 CODE: 2359 CODE:
2133 2393
2134SV * 2394SV *
2135ready (SV *self) 2395ready (SV *self)
2136 PROTOTYPE: $ 2396 PROTOTYPE: $
2137 CODE: 2397 CODE:
2138 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
2139 OUTPUT: 2399 OUTPUT:
2140 RETVAL 2400 RETVAL
2141 2401
2142int 2402int
2143nready (...) 2403nready (...)
2145 CODE: 2405 CODE:
2146 RETVAL = coro_nready; 2406 RETVAL = coro_nready;
2147 OUTPUT: 2407 OUTPUT:
2148 RETVAL 2408 RETVAL
2149 2409
2150void
2151throw (Coro::State self, SV *throw = &PL_sv_undef)
2152 PROTOTYPE: $;$
2153 CODE:
2154 SvREFCNT_dec (self->throw);
2155 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2156
2157# for async_pool speedup 2410# for async_pool speedup
2158void 2411void
2159_pool_1 (SV *cb) 2412_pool_1 (SV *cb)
2160 CODE: 2413 CODE:
2161{ 2414{
2204 sv_setsv (cb, &PL_sv_undef); 2457 sv_setsv (cb, &PL_sv_undef);
2205 2458
2206 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2207 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
2208 2461
2209 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2210 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2211 { 2464 {
2212 SV *old = PL_diehook; 2465 SV *old = PL_diehook;
2213 PL_diehook = 0; 2466 PL_diehook = 0;
2214 SvREFCNT_dec (old); 2467 SvREFCNT_dec (old);
2220 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2221 2474
2222 coro->prio = 0; 2475 coro->prio = 0;
2223 2476
2224 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2225 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
2226 2479
2227 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
2228} 2481}
2229 2482
2230#if 0 2483#if 0
2302 2555
2303 av_push (av, data_sv); 2556 av_push (av, data_sv);
2304 2557
2305 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2306 2559
2307 api_ready (self); 2560 api_ready (aTHX_ self);
2308} 2561}
2309 2562
2310void 2563void
2311_set_state (SV *state) 2564_set_state (SV *state)
2312 PROTOTYPE: $ 2565 PROTOTYPE: $
2337 PROTOTYPE: @ 2590 PROTOTYPE: @
2338 CODE: 2591 CODE:
2339{ 2592{
2340 static int incede; 2593 static int incede;
2341 2594
2342 api_cede_notself (); 2595 api_cede_notself (aTHX);
2343 2596
2344 ++incede; 2597 ++incede;
2345 while (coro_nready >= incede && api_cede ()) 2598 while (coro_nready >= incede && api_cede (aTHX))
2346 ; 2599 ;
2347 2600
2348 sv_setsv (sv_activity, &PL_sv_undef); 2601 sv_setsv (sv_activity, &PL_sv_undef);
2349 if (coro_nready >= incede) 2602 if (coro_nready >= incede)
2350 { 2603 {
2360 2613
2361MODULE = Coro::State PACKAGE = PerlIO::cede 2614MODULE = Coro::State PACKAGE = PerlIO::cede
2362 2615
2363BOOT: 2616BOOT:
2364 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2617 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2618

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines