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.257 by root, Sun Nov 9 15:35:44 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 struct coro *transfer_next;
186 187
187static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
188static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
189static SV *rv_diehook; 190static SV *rv_diehook;
190static SV *rv_warnhook; 191static SV *rv_warnhook;
209 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
210 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
211}; 212};
212 213
213/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
214typedef struct coro_cctx { 215typedef struct coro_cctx
216{
215 struct coro_cctx *next; 217 struct coro_cctx *next;
216 218
217 /* the stack */ 219 /* the stack */
218 void *sptr; 220 void *sptr;
219 size_t ssize; 221 size_t ssize;
237 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
238 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
239}; 241};
240 242
241/* 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 */
242typedef struct { 244typedef struct
245{
243 SV *defsv; 246 SV *defsv;
244 AV *defav; 247 AV *defav;
245 SV *errsv; 248 SV *errsv;
246 SV *irsgv; 249 SV *irsgv;
247#define VAR(name,type) type name; 250#define VAR(name,type) type name;
251 254
252#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))
253 256
254/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
255struct coro { 258struct coro {
256 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
257 coro_cctx *cctx; 260 coro_cctx *cctx;
258 261
259 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
260 AV *mainstack; 264 AV *mainstack;
261 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
262 266
263 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
264 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
279 struct coro *next, *prev; 283 struct coro *next, *prev;
280}; 284};
281 285
282typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
284 290
285/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
286 292
287#define PRIO_MAX 3 293#define PRIO_MAX 3
288#define PRIO_HIGH 1 294#define PRIO_HIGH 1
293 299
294/* for Coro.pm */ 300/* for Coro.pm */
295static SV *coro_current; 301static SV *coro_current;
296static SV *coro_readyhook; 302static SV *coro_readyhook;
297static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
298static int coro_nready;
299static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
300 306
301/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
302 308
303static SV * 309static SV *
304coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
407 : 0 413 : 0
408 414
409#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
410#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
411 417
412static struct coro * 418INLINE struct coro *
413SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
414{ 420{
415 HV *stash; 421 HV *stash;
416 MAGIC *mg; 422 MAGIC *mg;
417 423
508 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
509 } 515 }
510 516
511 PUTBACK; 517 PUTBACK;
512 } 518 }
519
520 slf_frame = c->slf_frame;
513} 521}
514 522
515static void 523static void
516save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
517{ 525{
526 c->slf_frame = slf_frame;
527
518 { 528 {
519 dSP; 529 dSP;
520 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
521 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
522 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
589 #undef VAR 599 #undef VAR
590 } 600 }
591} 601}
592 602
593/* 603/*
594 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
595 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
596 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
597 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
598 */ 608 */
599#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
801 811
802 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
803} 813}
804 814
805static 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
806coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
807{ 830{
808 /* 831 /*
809 * emulate part of the perl startup here. 832 * emulate part of the perl startup here.
810 */ 833 */
834 PL_rs = newSVsv (GvSV (irsgv)); 857 PL_rs = newSVsv (GvSV (irsgv));
835 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
836 859
837 { 860 {
838 dSP; 861 dSP;
839 LOGOP myop; 862 UNOP myop;
840 863
841 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
842 myop.op_next = Nullop; 865 myop.op_next = Nullop;
843 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
844 867
845 PUSHMARK (SP); 868 PUSHMARK (SP);
846 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
849 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
850 SPAGAIN; 873 SPAGAIN;
851 } 874 }
852 875
853 /* 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
854 * 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.
855 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
856 * so we ENTER here for symmetry
857 */ 878 */
858 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 */
859} 881}
860 882
861static void 883static void
862coro_destruct (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
863{ 885{
892 SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
893 915
894 coro_destruct_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
895} 917}
896 918
897static void 919INLINE void
898free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
899{ 921{
900 if (expect_true (coro_mortal)) 922 if (expect_true (coro_mortal))
901 { 923 {
902 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
1026 1048
1027 TAINT_NOT; 1049 TAINT_NOT;
1028 return 0; 1050 return 0;
1029} 1051}
1030 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
1031/* 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 */
1032/* _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 */
1033/* during execution of a perl program */ 1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
1034static void NOINLINE 1064static void NOINLINE
1035cctx_prepare (pTHX_ coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
1036{ 1066{
1037 dSP; 1067 dSP;
1038 LOGOP myop; 1068 UNOP myop;
1039 1069
1040 PL_top_env = &PL_start_env; 1070 PL_top_env = &PL_start_env;
1041 1071
1042 if (cctx->flags & CC_TRACE) 1072 if (cctx->flags & CC_TRACE)
1043 PL_runops = runops_trace; 1073 PL_runops = runops_trace;
1044 1074
1045 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
1046 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
1047 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1048 1078
1049 PUSHMARK (SP); 1079 PUSHMARK (SP);
1050 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
1051 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1052 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1053 PUTBACK; 1083 PUTBACK;
1054 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
1055 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1056 SPAGAIN; 1086 SPAGAIN;
1057} 1087}
1058 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
1059/* 1110/*
1060 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
1061 */ 1112 */
1062static void 1113static void
1063cctx_run (void *arg) 1114cctx_run (void *arg)
1068# endif 1119# endif
1069#endif 1120#endif
1070 { 1121 {
1071 dTHX; 1122 dTHX;
1072 1123
1073 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1124 /* normally we would need to skip the entersub here */
1074 UNLOCK; 1125 /* not doing so will re-execute it, which is exactly what we want */
1075
1076 /* we now skip the entersub that lead to transfer() */
1077 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
1078 1127
1079 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
1080 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
1130
1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1133 transfer_tail (aTHX);
1081 1134
1082 /* 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 */
1083 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
1084 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
1085 1138
1097 1150
1098static coro_cctx * 1151static coro_cctx *
1099cctx_new () 1152cctx_new ()
1100{ 1153{
1101 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 ();
1102 void *stack_start; 1183 void *stack_start;
1103 size_t stack_size; 1184 size_t stack_size;
1104
1105 ++cctx_count;
1106 Newz (0, cctx, 1, coro_cctx);
1107
1108 cctx->gen = cctx_gen;
1109 1185
1110#if HAVE_MMAP 1186#if HAVE_MMAP
1111 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;
1112 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
1113 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);
1114 1190
1115 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
1116 { 1192 {
1117# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
1118 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1119# endif 1195 #endif
1120 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1121 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1122 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
1123 } 1199 }
1124 else 1200 else
1125#endif 1201#endif
1126 { 1202 {
1127 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1128 New (0, cctx->sptr, cctx_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
1129 1205
1130 if (!cctx->sptr) 1206 if (!cctx->sptr)
1131 { 1207 {
1132 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1133 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
1134 } 1210 }
1135 1211
1136 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
1137 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
1138 } 1214 }
1139 1215
1140 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
1141 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);
1142 1221
1143 return cctx; 1222 return cctx;
1144} 1223}
1145 1224
1153 coro_destroy (&cctx->cctx); 1232 coro_destroy (&cctx->cctx);
1154 1233
1155 /* coro_transfer creates new, empty cctx's */ 1234 /* coro_transfer creates new, empty cctx's */
1156 if (cctx->sptr) 1235 if (cctx->sptr)
1157 { 1236 {
1158#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
1159 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1160#endif 1239 #endif
1161 1240
1162#if HAVE_MMAP 1241#if HAVE_MMAP
1163 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
1164 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
1165 else 1244 else
1186 return cctx; 1265 return cctx;
1187 1266
1188 cctx_destroy (cctx); 1267 cctx_destroy (cctx);
1189 } 1268 }
1190 1269
1191 return cctx_new (); 1270 return cctx_new_run ();
1192} 1271}
1193 1272
1194static void 1273static void
1195cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
1196{ 1275{
1197 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));
1198 1277
1199 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
1200 if (expect_false (cctx_idle >= cctx_max_idle)) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
1201 { 1280 {
1202 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
1217transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1218{ 1297{
1219 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1220 { 1299 {
1221 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1222 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,");
1223 1302
1224 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1225 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,");
1226 1305
1227 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1228 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,");
1229 1308
1230#if !PERL_VERSION_ATLEAST (5,10,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1231 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1232 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,");
1233#endif 1312#endif
1234 } 1313 }
1235} 1314}
1236 1315
1237/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1241 dSTACKLEVEL; 1320 dSTACKLEVEL;
1242 1321
1243 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
1244 if (expect_false (!next)) 1323 if (expect_false (!next))
1245 { 1324 {
1246 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = stacklevel;
1247 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 */
1248 } 1327 }
1249 else if (expect_true (prev != next)) 1328 else if (expect_true (prev != next))
1250 { 1329 {
1251 static volatile int has_throw;
1252 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
1253 1331
1254 if (expect_false (prev->flags & CF_NEW)) 1332 if (expect_false (prev->flags & CF_NEW))
1255 { 1333 {
1256 /* create a new empty/source context */ 1334 /* create a new empty/source context */
1257 ++cctx_count; 1335 prev->cctx = cctx_new_empty ();
1258 New (0, prev->cctx, 1, coro_cctx);
1259 prev->cctx->sptr = 0;
1260 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1261
1262 prev->flags &= ~CF_NEW; 1336 prev->flags &= ~CF_NEW;
1263 prev->flags |= CF_RUNNING; 1337 prev->flags |= CF_RUNNING;
1264 } 1338 }
1265 1339
1266 prev->flags &= ~CF_RUNNING; 1340 prev->flags &= ~CF_RUNNING;
1281 else 1355 else
1282 load_perl (aTHX_ next); 1356 load_perl (aTHX_ next);
1283 1357
1284 prev__cctx = prev->cctx; 1358 prev__cctx = prev->cctx;
1285 1359
1286 /* possibly "free" the cctx */ 1360 /* possibly untie and reuse the cctx */
1287 if (expect_true ( 1361 if (expect_true (
1288 prev__cctx->idle_sp == STACKLEVEL 1362 prev__cctx->idle_sp == stacklevel
1289 && !(prev__cctx->flags & CC_TRACE) 1363 && !(prev__cctx->flags & CC_TRACE)
1290 && !force_cctx 1364 && !force_cctx
1291 )) 1365 ))
1292 { 1366 {
1293 /* 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 */
1294 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));
1295 1369
1296 prev->cctx = 0; 1370 prev->cctx = 0;
1297 1371
1298 /* 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 */
1299 /* 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 */
1307 ++next->usecount; 1381 ++next->usecount;
1308 1382
1309 if (expect_true (!next->cctx)) 1383 if (expect_true (!next->cctx))
1310 next->cctx = cctx_get (aTHX); 1384 next->cctx = cctx_get (aTHX);
1311 1385
1312 has_throw = !!next->throw; 1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1313 1388
1314 if (expect_false (prev__cctx != next->cctx)) 1389 if (expect_false (prev__cctx != next->cctx))
1315 { 1390 {
1316 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1317 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1318 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1319 } 1394 }
1320 1395
1321 free_coro_mortal (aTHX); 1396 transfer_tail (aTHX);
1322 UNLOCK;
1323
1324 if (expect_false (has_throw))
1325 {
1326 struct coro *coro = SvSTATE (coro_current);
1327
1328 if (coro->throw)
1329 {
1330 SV *exception = coro->throw;
1331 coro->throw = 0;
1332 sv_setsv (ERRSV, exception);
1333 croak (0);
1334 }
1335 }
1336 } 1397 }
1337} 1398}
1338
1339struct transfer_args
1340{
1341 struct coro *prev, *next;
1342};
1343 1399
1344#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))
1345#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1346 1402
1347/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
1367 1423
1368 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1369 { 1425 {
1370 struct coro temp; 1426 struct coro temp;
1371 1427
1372 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1373 croak ("FATAL: tried to destroy currently running coroutine");
1374 1429
1375 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1376 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1377 1432
1378 coro_destruct (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1429# define MGf_DUP 0 1484# define MGf_DUP 0
1430#endif 1485#endif
1431}; 1486};
1432 1487
1433static void 1488static void
1434prepare_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)
1435{ 1490{
1436 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1437 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1438 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1439} 1494}
1440 1495
1441static void 1496static void
1442api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1443{ 1498{
1444 dTHX;
1445 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1446 1500
1447 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1448 TRANSFER (ta, 1); 1502 TRANSFER (ta, 1);
1449} 1503}
1450 1504
1467 1521
1468 return 0; 1522 return 0;
1469} 1523}
1470 1524
1471static int 1525static int
1472api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1473{ 1527{
1474 dTHX;
1475 struct coro *coro; 1528 struct coro *coro;
1476 SV *sv_hook; 1529 SV *sv_hook;
1477 void (*xs_hook)(void); 1530 void (*xs_hook)(void);
1478 1531
1479 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1517 1570
1518 return 1; 1571 return 1;
1519} 1572}
1520 1573
1521static int 1574static int
1522api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1523{ 1576{
1524 dTHX;
1525 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1526} 1578}
1527 1579
1528static void 1580INLINE void
1529prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1530{ 1582{
1531 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1532 1584
1533 for (;;) 1585 for (;;)
1534 { 1586 {
1559 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1560 if (expect_false (ta->next->flags & CF_DESTROYED)) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1561 { 1613 {
1562 UNLOCK; 1614 UNLOCK;
1563 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1564 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1565 continue; 1617 continue;
1566 } 1618 }
1567 1619
1568 --coro_nready; 1620 --coro_nready;
1569 UNLOCK; 1621 UNLOCK;
1572 1624
1573 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1574 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1575 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1576 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1577 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));
1578 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1579 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1580 1632
1581 LOCK; 1633 LOCK;
1582 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1583 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1584 UNLOCK; 1636 UNLOCK;
1585} 1637}
1586 1638
1587static void 1639INLINE void
1588prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1589{ 1641{
1590 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1591 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1592} 1644}
1593 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
1594static int 1669static int
1595prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1596{ 1671{
1597 if (coro_nready) 1672 struct coro_transfer_args ta;
1598 { 1673
1599 SV *prev = SvRV (coro_current);
1600 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1601 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1602 return 1; 1679 return 1;
1603 } 1680 }
1604 else 1681 else
1605 return 0; 1682 return 0;
1606} 1683}
1607 1684
1608static void
1609api_schedule (void)
1610{
1611 dTHX;
1612 struct transfer_args ta;
1613
1614 prepare_schedule (aTHX_ &ta);
1615 TRANSFER (ta, 1);
1616}
1617
1618static int 1685static int
1619api_cede (void) 1686api_cede_notself (pTHX)
1620{ 1687{
1621 dTHX; 1688 if (coro_nready)
1689 {
1622 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1623 1691
1624 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1625
1626 if (expect_true (ta.prev != ta.next))
1627 {
1628 TRANSFER (ta, 1); 1693 TRANSFER (ta, 1);
1629 return 1; 1694 return 1;
1630 } 1695 }
1631 else 1696 else
1632 return 0; 1697 return 0;
1633} 1698}
1634 1699
1635static int 1700static void
1636api_cede_notself (void)
1637{
1638 dTHX;
1639 struct transfer_args ta;
1640
1641 if (prepare_cede_notself (aTHX_ &ta))
1642 {
1643 TRANSFER (ta, 1);
1644 return 1;
1645 }
1646 else
1647 return 0;
1648}
1649
1650static void
1651api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1652{ 1702{
1653 dTHX;
1654 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1655 1704
1656 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1657 { 1706 {
1658 if (!coro->cctx) 1707 if (!coro->cctx)
1659 coro->cctx = cctx_new (); 1708 coro->cctx = cctx_new_run ();
1660 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1661 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1662 1711
1663 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1664 } 1713 }
1665 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1666 { 1715 {
1725 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1774 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1726 double now = nvtime (); 1775 double now = nvtime ();
1727 1776
1728 if (now >= self->next) 1777 if (now >= self->next)
1729 { 1778 {
1730 api_cede (); 1779 api_cede (aTHX);
1731 self->next = now + self->every; 1780 self->next = now + self->every;
1732 } 1781 }
1733 1782
1734 return PerlIOBuf_flush (aTHX_ f); 1783 return PerlIOBuf_flush (aTHX_ f);
1735} 1784}
1764 PerlIOBuf_get_ptr, 1813 PerlIOBuf_get_ptr,
1765 PerlIOBuf_get_cnt, 1814 PerlIOBuf_get_cnt,
1766 PerlIOBuf_set_ptrcnt, 1815 PerlIOBuf_set_ptrcnt,
1767}; 1816};
1768 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}
1769 2017
1770MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1771 2019
1772PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1773 2021
1803 main_top_env = PL_top_env; 2051 main_top_env = PL_top_env;
1804 2052
1805 while (main_top_env->je_prev) 2053 while (main_top_env->je_prev)
1806 main_top_env = main_top_env->je_prev; 2054 main_top_env = main_top_env->je_prev;
1807 2055
1808 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
1809 coroapi.rev = CORO_API_REVISION; 2057 coroapi.rev = CORO_API_REVISION;
2058
1810 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;
1811 2067
1812 { 2068 {
1813 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2069 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1814 2070
1815 if (!svp) croak ("Time::HiRes is required"); 2071 if (!svp) croak ("Time::HiRes is required");
1848 av_push (coro->args, newSVsv (ST (i))); 2104 av_push (coro->args, newSVsv (ST (i)));
1849} 2105}
1850 OUTPUT: 2106 OUTPUT:
1851 RETVAL 2107 RETVAL
1852 2108
1853# these not obviously related functions are all rolled into the same xs
1854# function to increase chances that they all will call transfer with the same
1855# stack offset
1856void 2109void
1857_set_stacklevel (...) 2110_set_stacklevel (...)
1858 ALIAS: 2111 CODE:
1859 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1860 Coro::schedule = 2
1861 Coro::cede = 3
1862 Coro::cede_notself = 4
1863 CODE:
1864{
1865 struct transfer_args ta;
1866 2113
1867 PUTBACK; 2114void
1868 switch (ix) 2115transfer (...)
1869 { 2116 CODE:
1870 case 0: 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1871 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1872 ta.next = 0;
1873 break;
1874
1875 case 1:
1876 if (items != 2)
1877 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1878
1879 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1880 break;
1881
1882 case 2:
1883 prepare_schedule (aTHX_ &ta);
1884 break;
1885
1886 case 3:
1887 prepare_cede (aTHX_ &ta);
1888 break;
1889
1890 case 4:
1891 if (!prepare_cede_notself (aTHX_ &ta))
1892 XSRETURN_EMPTY;
1893
1894 break;
1895 }
1896 SPAGAIN;
1897
1898 BARRIER;
1899 PUTBACK;
1900 TRANSFER (ta, 0);
1901 SPAGAIN; /* might be the sp of a different coroutine now */
1902 /* be extra careful not to ever do anything after TRANSFER */
1903}
1904 2118
1905bool 2119bool
1906_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
1907 CODE: 2121 CODE:
1908 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2018 RETVAL = boolSV (coro->flags & ix); 2232 RETVAL = boolSV (coro->flags & ix);
2019 OUTPUT: 2233 OUTPUT:
2020 RETVAL 2234 RETVAL
2021 2235
2022void 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
2023api_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
2024 2246
2025SV * 2247SV *
2026has_cctx (Coro::State coro) 2248has_cctx (Coro::State coro)
2027 PROTOTYPE: $ 2249 PROTOTYPE: $
2028 CODE: 2250 CODE:
2063 PROTOTYPE: $ 2285 PROTOTYPE: $
2064 ALIAS: 2286 ALIAS:
2065 swap_defav = 1 2287 swap_defav = 1
2066 CODE: 2288 CODE:
2067 if (!self->slot) 2289 if (!self->slot)
2068 croak ("cannot swap state with coroutine that has no saved state"); 2290 croak ("cannot swap state with coroutine that has no saved state,");
2069 else 2291 else
2070 { 2292 {
2071 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv); 2293 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2072 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2294 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2073 2295
2098 2320
2099 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2321 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2100 coro_ready[i] = newAV (); 2322 coro_ready[i] = newAV ();
2101 2323
2102 { 2324 {
2103 SV *sv = perl_get_sv ("Coro::API", TRUE); 2325 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2104 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2105 2326
2106 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
2107 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
2108 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
2109 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
2110 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
2111 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
2112 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
2113 2334
2114 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
2115 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
2116 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
2117 } 2338 }
2118} 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);
2119 2355
2120void 2356void
2121_set_current (SV *current) 2357_set_current (SV *current)
2122 PROTOTYPE: $ 2358 PROTOTYPE: $
2123 CODE: 2359 CODE:
2157 2393
2158SV * 2394SV *
2159ready (SV *self) 2395ready (SV *self)
2160 PROTOTYPE: $ 2396 PROTOTYPE: $
2161 CODE: 2397 CODE:
2162 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
2163 OUTPUT: 2399 OUTPUT:
2164 RETVAL 2400 RETVAL
2165 2401
2166int 2402int
2167nready (...) 2403nready (...)
2168 PROTOTYPE: 2404 PROTOTYPE:
2169 CODE: 2405 CODE:
2170 RETVAL = coro_nready; 2406 RETVAL = coro_nready;
2171 OUTPUT: 2407 OUTPUT:
2172 RETVAL 2408 RETVAL
2173
2174void
2175throw (Coro::State self, SV *throw = &PL_sv_undef)
2176 PROTOTYPE: $;$
2177 CODE:
2178 SvREFCNT_dec (self->throw);
2179 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2180 2409
2181# for async_pool speedup 2410# for async_pool speedup
2182void 2411void
2183_pool_1 (SV *cb) 2412_pool_1 (SV *cb)
2184 CODE: 2413 CODE:
2244 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2245 2474
2246 coro->prio = 0; 2475 coro->prio = 0;
2247 2476
2248 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2249 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
2250 2479
2251 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
2252} 2481}
2253 2482
2254#if 0 2483#if 0
2326 2555
2327 av_push (av, data_sv); 2556 av_push (av, data_sv);
2328 2557
2329 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2330 2559
2331 api_ready (self); 2560 api_ready (aTHX_ self);
2332} 2561}
2333 2562
2334void 2563void
2335_set_state (SV *state) 2564_set_state (SV *state)
2336 PROTOTYPE: $ 2565 PROTOTYPE: $
2361 PROTOTYPE: @ 2590 PROTOTYPE: @
2362 CODE: 2591 CODE:
2363{ 2592{
2364 static int incede; 2593 static int incede;
2365 2594
2366 api_cede_notself (); 2595 api_cede_notself (aTHX);
2367 2596
2368 ++incede; 2597 ++incede;
2369 while (coro_nready >= incede && api_cede ()) 2598 while (coro_nready >= incede && api_cede (aTHX))
2370 ; 2599 ;
2371 2600
2372 sv_setsv (sv_activity, &PL_sv_undef); 2601 sv_setsv (sv_activity, &PL_sv_undef);
2373 if (coro_nready >= incede) 2602 if (coro_nready >= incede)
2374 { 2603 {
2384 2613
2385MODULE = Coro::State PACKAGE = PerlIO::cede 2614MODULE = Coro::State PACKAGE = PerlIO::cede
2386 2615
2387BOOT: 2616BOOT:
2388 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2617 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2618

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines