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.274 by root, Sat Nov 15 00:08:30 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 187
188static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
189static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
190static SV *rv_diehook; 190static SV *rv_diehook;
191static SV *rv_warnhook; 191static SV *rv_warnhook;
210 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
212}; 212};
213 213
214/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
215typedef struct coro_cctx { 215typedef struct coro_cctx
216{
216 struct coro_cctx *next; 217 struct coro_cctx *next;
217 218
218 /* the stack */ 219 /* the stack */
219 void *sptr; 220 void *sptr;
220 size_t ssize; 221 size_t ssize;
238 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
239 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
240}; 241};
241 242
242/* 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 */
243typedef struct { 244typedef struct
245{
244 SV *defsv; 246 SV *defsv;
245 AV *defav; 247 AV *defav;
246 SV *errsv; 248 SV *errsv;
247 SV *irsgv; 249 SV *irsgv;
248#define VAR(name,type) type name; 250#define VAR(name,type) type name;
252 254
253#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))
254 256
255/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
256struct coro { 258struct coro {
257 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
258 coro_cctx *cctx; 260 coro_cctx *cctx;
259 261
260 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
261 AV *mainstack; 264 AV *mainstack;
262 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
263 266
264 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
265 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
280 struct coro *next, *prev; 283 struct coro *next, *prev;
281}; 284};
282 285
283typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
284typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
285 290
286/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
287 292
288#define PRIO_MAX 3 293#define PRIO_MAX 3
289#define PRIO_HIGH 1 294#define PRIO_HIGH 1
294 299
295/* for Coro.pm */ 300/* for Coro.pm */
296static SV *coro_current; 301static SV *coro_current;
297static SV *coro_readyhook; 302static SV *coro_readyhook;
298static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
299static int coro_nready;
300static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
301 306
302/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
303 308
304static SV * 309static SV *
305coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
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
509 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
510 } 515 }
511 516
512 PUTBACK; 517 PUTBACK;
513 } 518 }
519
520 slf_frame = c->slf_frame;
514} 521}
515 522
516static void 523static void
517save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
518{ 525{
526 c->slf_frame = slf_frame;
527
519 { 528 {
520 dSP; 529 dSP;
521 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
522 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
523 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
590 #undef VAR 599 #undef VAR
591 } 600 }
592} 601}
593 602
594/* 603/*
595 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
596 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
597 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
598 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
599 */ 608 */
600#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
802 811
803 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
804} 813}
805 814
806static 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
807coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
808{ 830{
809 /* 831 /*
810 * emulate part of the perl startup here. 832 * emulate part of the perl startup here.
811 */ 833 */
835 PL_rs = newSVsv (GvSV (irsgv)); 857 PL_rs = newSVsv (GvSV (irsgv));
836 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
837 859
838 { 860 {
839 dSP; 861 dSP;
840 LOGOP myop; 862 UNOP myop;
841 863
842 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
843 myop.op_next = Nullop; 865 myop.op_next = Nullop;
844 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
845 867
846 PUSHMARK (SP); 868 PUSHMARK (SP);
847 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
850 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
851 SPAGAIN; 873 SPAGAIN;
852 } 874 }
853 875
854 /* 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
855 * 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.
856 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
857 * so we ENTER here for symmetry
858 */ 878 */
859 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 */
860} 881}
861 882
862static void 883static void
863coro_destruct (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
864{ 885{
893 SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
894 915
895 coro_destruct_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
896} 917}
897 918
898static void 919INLINE void
899free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
900{ 921{
901 if (expect_true (coro_mortal)) 922 if (expect_true (coro_mortal))
902 { 923 {
903 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
1027 1048
1028 TAINT_NOT; 1049 TAINT_NOT;
1029 return 0; 1050 return 0;
1030} 1051}
1031 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
1032/* 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 */
1033/* _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 */
1034/* during execution of a perl program */ 1062/* during execution of a perl program */
1035/* also initialises PL_top_env */ 1063/* also initialises PL_top_env */
1036static void NOINLINE 1064static void NOINLINE
1037cctx_prepare (pTHX_ coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
1038{ 1066{
1039 dSP; 1067 dSP;
1040 LOGOP myop; 1068 UNOP myop;
1041 1069
1042 PL_top_env = &PL_start_env; 1070 PL_top_env = &PL_start_env;
1043 1071
1044 if (cctx->flags & CC_TRACE) 1072 if (cctx->flags & CC_TRACE)
1045 PL_runops = runops_trace; 1073 PL_runops = runops_trace;
1046 1074
1047 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
1048 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
1049 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1050 1078
1051 PUSHMARK (SP); 1079 PUSHMARK (SP);
1052 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
1053 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1054 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1055 PUTBACK; 1083 PUTBACK;
1056 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
1057 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1058 SPAGAIN; 1086 SPAGAIN;
1059} 1087}
1060 1088
1061/* the tail of transfer: execute stuff we can onyl do afetr a transfer */ 1089/* the tail of transfer: execute stuff we can only do after a transfer */
1062static void 1090INLINE void
1063transfer_tail (void) 1091transfer_tail (pTHX)
1064{ 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);
1065 UNLOCK; 1098 UNLOCK;
1066 1099
1067 if (expect_false (next_has_throw)) 1100 if (expect_false (next->throw))
1068 { 1101 {
1069 struct coro *coro = SvSTATE (coro_current);
1070
1071 if (coro->throw)
1072 {
1073 SV *exception = coro->throw; 1102 SV *exception = sv_2mortal (next->throw);
1103
1074 coro->throw = 0; 1104 next->throw = 0;
1075 sv_setsv (ERRSV, exception); 1105 sv_setsv (ERRSV, exception);
1076 croak (0); 1106 croak (0);
1077 }
1078 } 1107 }
1079} 1108}
1080 1109
1081/* 1110/*
1082 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
1090# endif 1119# endif
1091#endif 1120#endif
1092 { 1121 {
1093 dTHX; 1122 dTHX;
1094 1123
1095 /* we now skip the entersub that lead to transfer () */ 1124 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */
1096 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
1097 1127
1098 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
1099 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
1100 1130
1101 /* cctx_run is the alternative tail of transfer () */ 1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1102 transfer_tail (); 1133 transfer_tail (aTHX);
1103 1134
1104 /* 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 */
1105 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
1106 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
1107 1138
1125 ++cctx_count; 1156 ++cctx_count;
1126 New (0, cctx, 1, coro_cctx); 1157 New (0, cctx, 1, coro_cctx);
1127 1158
1128 cctx->gen = cctx_gen; 1159 cctx->gen = cctx_gen;
1129 cctx->flags = 0; 1160 cctx->flags = 0;
1130 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel */ 1161 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1131 1162
1132 return cctx; 1163 return cctx;
1133} 1164}
1134 1165
1135/* create a new cctx only suitable as source */ 1166/* create a new cctx only suitable as source */
1157 /* mmap supposedly does allocate-on-write for us */ 1188 /* 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); 1189 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1159 1190
1160 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
1161 { 1192 {
1162# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
1163 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1164# endif 1195 #endif
1165 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1166 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1167 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
1168 } 1199 }
1169 else 1200 else
1170#endif 1201#endif
1171 { 1202 {
1172 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1173 New (0, cctx->sptr, cctx_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
1174 1205
1175 if (!cctx->sptr) 1206 if (!cctx->sptr)
1176 { 1207 {
1177 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1178 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
1179 } 1210 }
1180 1211
1181 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
1182 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
1183 } 1214 }
1184 1215
1185 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
1186 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);
1187 1221
1188 return cctx; 1222 return cctx;
1189} 1223}
1190 1224
1198 coro_destroy (&cctx->cctx); 1232 coro_destroy (&cctx->cctx);
1199 1233
1200 /* coro_transfer creates new, empty cctx's */ 1234 /* coro_transfer creates new, empty cctx's */
1201 if (cctx->sptr) 1235 if (cctx->sptr)
1202 { 1236 {
1203#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
1204 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1205#endif 1239 #endif
1206 1240
1207#if HAVE_MMAP 1241#if HAVE_MMAP
1208 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
1209 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
1210 else 1244 else
1237} 1271}
1238 1272
1239static void 1273static void
1240cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
1241{ 1275{
1242 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));
1243 1277
1244 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
1245 if (expect_false (cctx_idle >= cctx_max_idle)) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
1246 { 1280 {
1247 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
1262transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1263{ 1297{
1264 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1265 { 1299 {
1266 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1267 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,");
1268 1302
1269 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1270 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,");
1271 1305
1272 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1273 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,");
1274 1308
1275#if !PERL_VERSION_ATLEAST (5,10,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1276 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1277 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,");
1278#endif 1312#endif
1279 } 1313 }
1280} 1314}
1281 1315
1282/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1286 dSTACKLEVEL; 1320 dSTACKLEVEL;
1287 1321
1288 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
1289 if (expect_false (!next)) 1323 if (expect_false (!next))
1290 { 1324 {
1291 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((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 */ 1326 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1293 } 1327 }
1294 else if (expect_true (prev != next)) 1328 else if (expect_true (prev != next))
1295 { 1329 {
1296 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
1321 else 1355 else
1322 load_perl (aTHX_ next); 1356 load_perl (aTHX_ next);
1323 1357
1324 prev__cctx = prev->cctx; 1358 prev__cctx = prev->cctx;
1325 1359
1326 if (prev__cctx->idle_sp == STACKLEVEL) asm volatile("");//D
1327
1328 /* possibly "free" the cctx */ 1360 /* possibly untie and reuse the cctx */
1329 if (expect_true ( 1361 if (expect_true (
1330 prev__cctx->idle_sp == STACKLEVEL 1362 prev__cctx->idle_sp == stacklevel
1331 && !(prev__cctx->flags & CC_TRACE) 1363 && !(prev__cctx->flags & CC_TRACE)
1332 && !force_cctx 1364 && !force_cctx
1333 )) 1365 ))
1334 { 1366 {
1335 /* 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 */
1336 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));
1337 1369
1338 prev->cctx = 0; 1370 prev->cctx = 0;
1339 1371
1340 /* 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 */
1341 /* 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 */
1349 ++next->usecount; 1381 ++next->usecount;
1350 1382
1351 if (expect_true (!next->cctx)) 1383 if (expect_true (!next->cctx))
1352 next->cctx = cctx_get (aTHX); 1384 next->cctx = cctx_get (aTHX);
1353 1385
1354 next_has_throw = !!next->throw; 1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1355 1388
1356 if (expect_false (prev__cctx != next->cctx)) 1389 if (expect_false (prev__cctx != next->cctx))
1357 { 1390 {
1358 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1359 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1360 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1361 } 1394 }
1362 1395
1363 free_coro_mortal (aTHX);
1364 UNLOCK;
1365
1366 transfer_tail (); 1396 transfer_tail (aTHX);
1367 } 1397 }
1368} 1398}
1369
1370struct transfer_args
1371{
1372 struct coro *prev, *next;
1373};
1374 1399
1375#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))
1376#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1377 1402
1378/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
1398 1423
1399 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1400 { 1425 {
1401 struct coro temp; 1426 struct coro temp;
1402 1427
1403 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1404 croak ("FATAL: tried to destroy currently running coroutine");
1405 1429
1406 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1407 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1408 1432
1409 coro_destruct (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1460# define MGf_DUP 0 1484# define MGf_DUP 0
1461#endif 1485#endif
1462}; 1486};
1463 1487
1464static void 1488static void
1465prepare_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)
1466{ 1490{
1467 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1468 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1469 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1470} 1494}
1471 1495
1472static void 1496static void
1473api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1474{ 1498{
1475 dTHX;
1476 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1477 1500
1478 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1479 TRANSFER (ta, 1); 1502 TRANSFER (ta, 1);
1480} 1503}
1481 1504
1498 1521
1499 return 0; 1522 return 0;
1500} 1523}
1501 1524
1502static int 1525static int
1503api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1504{ 1527{
1505 dTHX;
1506 struct coro *coro; 1528 struct coro *coro;
1507 SV *sv_hook; 1529 SV *sv_hook;
1508 void (*xs_hook)(void); 1530 void (*xs_hook)(void);
1509 1531
1510 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1548 1570
1549 return 1; 1571 return 1;
1550} 1572}
1551 1573
1552static int 1574static int
1553api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1554{ 1576{
1555 dTHX;
1556 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1557} 1578}
1558 1579
1559static void 1580INLINE void
1560prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1561{ 1582{
1562 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1563 1584
1564 for (;;) 1585 for (;;)
1565 { 1586 {
1590 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1591 if (expect_false (ta->next->flags & CF_DESTROYED)) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1592 { 1613 {
1593 UNLOCK; 1614 UNLOCK;
1594 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1595 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1596 continue; 1617 continue;
1597 } 1618 }
1598 1619
1599 --coro_nready; 1620 --coro_nready;
1600 UNLOCK; 1621 UNLOCK;
1603 1624
1604 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1605 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1606 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1607 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1608 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));
1609 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1610 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1611 1632
1612 LOCK; 1633 LOCK;
1613 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1614 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1615 UNLOCK; 1636 UNLOCK;
1616} 1637}
1617 1638
1618static void 1639INLINE void
1619prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1620{ 1641{
1621 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1622 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1623} 1644}
1624 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
1625static int 1669static int
1626prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1627{ 1671{
1628 if (coro_nready) 1672 struct coro_transfer_args ta;
1629 { 1673
1630 SV *prev = SvRV (coro_current);
1631 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1632 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1633 return 1; 1679 return 1;
1634 } 1680 }
1635 else 1681 else
1636 return 0; 1682 return 0;
1637} 1683}
1638 1684
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 1685static int
1650api_cede (void) 1686api_cede_notself (pTHX)
1651{ 1687{
1652 dTHX; 1688 if (coro_nready)
1689 {
1653 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1654 1691
1655 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1656
1657 if (expect_true (ta.prev != ta.next))
1658 {
1659 TRANSFER (ta, 1); 1693 TRANSFER (ta, 1);
1660 return 1; 1694 return 1;
1661 } 1695 }
1662 else 1696 else
1663 return 0; 1697 return 0;
1664} 1698}
1665 1699
1666static int 1700static void
1667api_cede_notself (void)
1668{
1669 dTHX;
1670 struct transfer_args ta;
1671
1672 if (prepare_cede_notself (aTHX_ &ta))
1673 {
1674 TRANSFER (ta, 1);
1675 return 1;
1676 }
1677 else
1678 return 0;
1679}
1680
1681static void
1682api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1683{ 1702{
1684 dTHX;
1685 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1686 1704
1687 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1688 { 1706 {
1689 if (!coro->cctx) 1707 if (!coro->cctx)
1690 coro->cctx = cctx_new_run (); 1708 coro->cctx = cctx_new_run ();
1691 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1692 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1693 1711
1694 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1695 } 1713 }
1696 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1697 { 1715 {
1756 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1774 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1757 double now = nvtime (); 1775 double now = nvtime ();
1758 1776
1759 if (now >= self->next) 1777 if (now >= self->next)
1760 { 1778 {
1761 api_cede (); 1779 api_cede (aTHX);
1762 self->next = now + self->every; 1780 self->next = now + self->every;
1763 } 1781 }
1764 1782
1765 return PerlIOBuf_flush (aTHX_ f); 1783 return PerlIOBuf_flush (aTHX_ f);
1766} 1784}
1795 PerlIOBuf_get_ptr, 1813 PerlIOBuf_get_ptr,
1796 PerlIOBuf_get_cnt, 1814 PerlIOBuf_get_cnt,
1797 PerlIOBuf_set_ptrcnt, 1815 PerlIOBuf_set_ptrcnt,
1798}; 1816};
1799 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 any 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}
1800 2017
1801MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1802 2019
1803PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1804 2021
1834 main_top_env = PL_top_env; 2051 main_top_env = PL_top_env;
1835 2052
1836 while (main_top_env->je_prev) 2053 while (main_top_env->je_prev)
1837 main_top_env = main_top_env->je_prev; 2054 main_top_env = main_top_env->je_prev;
1838 2055
1839 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
1840 coroapi.rev = CORO_API_REVISION; 2057 coroapi.rev = CORO_API_REVISION;
2058
1841 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;
1842 2067
1843 { 2068 {
1844 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2069 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1845 2070
1846 if (!svp) croak ("Time::HiRes is required"); 2071 if (!svp) croak ("Time::HiRes is required");
1879 av_push (coro->args, newSVsv (ST (i))); 2104 av_push (coro->args, newSVsv (ST (i)));
1880} 2105}
1881 OUTPUT: 2106 OUTPUT:
1882 RETVAL 2107 RETVAL
1883 2108
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 2109void
1888_set_stacklevel (...) 2110_set_stacklevel (...)
1889 ALIAS: 2111 CODE:
1890 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1891 Coro::schedule = 2
1892 Coro::cede = 3
1893 Coro::cede_notself = 4
1894 CODE:
1895{
1896 struct transfer_args ta;
1897 2113
1898 PUTBACK; 2114void
1899 switch (ix) 2115transfer (...)
1900 { 2116 CODE:
1901 case 0: 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
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 2118
1936bool 2119bool
1937_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
1938 CODE: 2121 CODE:
1939 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2049 RETVAL = boolSV (coro->flags & ix); 2232 RETVAL = boolSV (coro->flags & ix);
2050 OUTPUT: 2233 OUTPUT:
2051 RETVAL 2234 RETVAL
2052 2235
2053void 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
2054api_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
2055 2246
2056SV * 2247SV *
2057has_cctx (Coro::State coro) 2248has_cctx (Coro::State coro)
2058 PROTOTYPE: $ 2249 PROTOTYPE: $
2059 CODE: 2250 CODE:
2094 PROTOTYPE: $ 2285 PROTOTYPE: $
2095 ALIAS: 2286 ALIAS:
2096 swap_defav = 1 2287 swap_defav = 1
2097 CODE: 2288 CODE:
2098 if (!self->slot) 2289 if (!self->slot)
2099 croak ("cannot swap state with coroutine that has no saved state"); 2290 croak ("cannot swap state with coroutine that has no saved state,");
2100 else 2291 else
2101 { 2292 {
2102 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv); 2293 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2103 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2294 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2104 2295
2129 2320
2130 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2321 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2131 coro_ready[i] = newAV (); 2322 coro_ready[i] = newAV ();
2132 2323
2133 { 2324 {
2134 SV *sv = perl_get_sv ("Coro::API", TRUE); 2325 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2135 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2136 2326
2137 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
2138 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
2139 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
2140 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
2141 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
2142 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
2143 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
2144 2334
2145 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
2146 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
2147 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
2148 } 2338 }
2149} 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);
2150 2355
2151void 2356void
2152_set_current (SV *current) 2357_set_current (SV *current)
2153 PROTOTYPE: $ 2358 PROTOTYPE: $
2154 CODE: 2359 CODE:
2188 2393
2189SV * 2394SV *
2190ready (SV *self) 2395ready (SV *self)
2191 PROTOTYPE: $ 2396 PROTOTYPE: $
2192 CODE: 2397 CODE:
2193 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
2194 OUTPUT: 2399 OUTPUT:
2195 RETVAL 2400 RETVAL
2196 2401
2197int 2402int
2198nready (...) 2403nready (...)
2199 PROTOTYPE: 2404 PROTOTYPE:
2200 CODE: 2405 CODE:
2201 RETVAL = coro_nready; 2406 RETVAL = coro_nready;
2202 OUTPUT: 2407 OUTPUT:
2203 RETVAL 2408 RETVAL
2204
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 2409
2212# for async_pool speedup 2410# for async_pool speedup
2213void 2411void
2214_pool_1 (SV *cb) 2412_pool_1 (SV *cb)
2215 CODE: 2413 CODE:
2275 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2276 2474
2277 coro->prio = 0; 2475 coro->prio = 0;
2278 2476
2279 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2280 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
2281 2479
2282 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
2283} 2481}
2284 2482
2285#if 0 2483#if 0
2357 2555
2358 av_push (av, data_sv); 2556 av_push (av, data_sv);
2359 2557
2360 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2361 2559
2362 api_ready (self); 2560 api_ready (aTHX_ self);
2363} 2561}
2364 2562
2365void 2563void
2366_set_state (SV *state) 2564_set_state (SV *state)
2367 PROTOTYPE: $ 2565 PROTOTYPE: $
2392 PROTOTYPE: @ 2590 PROTOTYPE: @
2393 CODE: 2591 CODE:
2394{ 2592{
2395 static int incede; 2593 static int incede;
2396 2594
2397 api_cede_notself (); 2595 api_cede_notself (aTHX);
2398 2596
2399 ++incede; 2597 ++incede;
2400 while (coro_nready >= incede && api_cede ()) 2598 while (coro_nready >= incede && api_cede (aTHX))
2401 ; 2599 ;
2402 2600
2403 sv_setsv (sv_activity, &PL_sv_undef); 2601 sv_setsv (sv_activity, &PL_sv_undef);
2404 if (coro_nready >= incede) 2602 if (coro_nready >= incede)
2405 { 2603 {
2415 2613
2416MODULE = Coro::State PACKAGE = PerlIO::cede 2614MODULE = Coro::State PACKAGE = PerlIO::cede
2417 2615
2418BOOT: 2616BOOT:
2419 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2617 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2618

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines