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.272 by root, Fri Nov 14 20:35:49 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;
250#undef VAR 252#undef VAR
251} perl_slots; 253} perl_slots;
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
257/* this is the per-perl-coro slf frame info */
258/* it is treated like other "global" interpreter data */
259/* and unfortunately is copied around, so kepe it small */
260struct slf_frame
261{
262 void (*prepare) (struct coro_transfer_args *ta); /* 0 means not yet initialised */
263 int (*check) (pTHX);
264};
265
255/* this is a structure representing a perl-level coroutine */ 266/* this is a structure representing a perl-level coroutine */
256struct coro { 267struct coro {
257 /* the c coroutine allocated to this perl coroutine, if any */ 268 /* the C coroutine allocated to this perl coroutine, if any */
258 coro_cctx *cctx; 269 coro_cctx *cctx;
259 270
260 /* process data */ 271 /* process data */
272 struct slf_frame slf_frame; /* saved slf frame */
273 void *slf_data;
261 AV *mainstack; 274 AV *mainstack;
262 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
263 276
264 AV *args; /* data associated with this coroutine (initial args) */ 277 AV *args; /* data associated with this coroutine (initial args) */
265 int refcnt; /* coroutines are refcounted, yes */ 278 int refcnt; /* coroutines are refcounted, yes */
280 struct coro *next, *prev; 293 struct coro *next, *prev;
281}; 294};
282 295
283typedef struct coro *Coro__State; 296typedef struct coro *Coro__State;
284typedef struct coro *Coro__State_or_hashref; 297typedef struct coro *Coro__State_or_hashref;
298
299static struct slf_frame slf_frame; /* the current slf frame */
285 300
286/** Coro ********************************************************************/ 301/** Coro ********************************************************************/
287 302
288#define PRIO_MAX 3 303#define PRIO_MAX 3
289#define PRIO_HIGH 1 304#define PRIO_HIGH 1
294 309
295/* for Coro.pm */ 310/* for Coro.pm */
296static SV *coro_current; 311static SV *coro_current;
297static SV *coro_readyhook; 312static SV *coro_readyhook;
298static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 313static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
299static int coro_nready;
300static struct coro *coro_first; 314static struct coro *coro_first;
315#define coro_nready coroapi.nready
301 316
302/** lowlevel stuff **********************************************************/ 317/** lowlevel stuff **********************************************************/
303 318
304static SV * 319static SV *
305coro_get_sv (pTHX_ const char *name, int create) 320coro_get_sv (pTHX_ const char *name, int create)
408 : 0 423 : 0
409 424
410#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 425#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) 426#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
412 427
413static struct coro * 428INLINE struct coro *
414SvSTATE_ (pTHX_ SV *coro) 429SvSTATE_ (pTHX_ SV *coro)
415{ 430{
416 HV *stash; 431 HV *stash;
417 MAGIC *mg; 432 MAGIC *mg;
418 433
509 CvPADLIST (cv) = (AV *)POPs; 524 CvPADLIST (cv) = (AV *)POPs;
510 } 525 }
511 526
512 PUTBACK; 527 PUTBACK;
513 } 528 }
529
530 slf_frame = c->slf_frame;
531 coroapi.slf_data = c->slf_data;
514} 532}
515 533
516static void 534static void
517save_perl (pTHX_ Coro__State c) 535save_perl (pTHX_ Coro__State c)
518{ 536{
537 c->slf_data = coroapi.slf_data;
538 c->slf_frame = slf_frame;
539
519 { 540 {
520 dSP; 541 dSP;
521 I32 cxix = cxstack_ix; 542 I32 cxix = cxstack_ix;
522 PERL_CONTEXT *ccstk = cxstack; 543 PERL_CONTEXT *ccstk = cxstack;
523 PERL_SI *top_si = PL_curstackinfo; 544 PERL_SI *top_si = PL_curstackinfo;
590 #undef VAR 611 #undef VAR
591 } 612 }
592} 613}
593 614
594/* 615/*
595 * allocate various perl stacks. This is an exact copy 616 * allocate various perl stacks. This is almost an exact copy
596 * of perl.c:init_stacks, except that it uses less memory 617 * of perl.c:init_stacks, except that it uses less memory
597 * on the (sometimes correct) assumption that coroutines do 618 * on the (sometimes correct) assumption that coroutines do
598 * not usually need a lot of stackspace. 619 * not usually need a lot of stackspace.
599 */ 620 */
600#if CORO_PREFER_PERL_FUNCTIONS 621#if CORO_PREFER_PERL_FUNCTIONS
802 823
803 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 824 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
804} 825}
805 826
806static void 827static void
828prepare_nop (aTHX_ struct coro_transfer_args *ta)
829{
830 /* kind of mega-hacky, but works */
831 ta->next = ta->prev = (struct coro *)ta;
832}
833
834static int
835slf_check_nop (aTHX)
836{
837 return 0;
838}
839
840static void
807coro_setup (pTHX_ struct coro *coro) 841coro_setup (pTHX_ struct coro *coro)
808{ 842{
809 /* 843 /*
810 * emulate part of the perl startup here. 844 * emulate part of the perl startup here.
811 */ 845 */
835 PL_rs = newSVsv (GvSV (irsgv)); 869 PL_rs = newSVsv (GvSV (irsgv));
836 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 870 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
837 871
838 { 872 {
839 dSP; 873 dSP;
840 LOGOP myop; 874 UNOP myop;
841 875
842 Zero (&myop, 1, LOGOP); 876 Zero (&myop, 1, UNOP);
843 myop.op_next = Nullop; 877 myop.op_next = Nullop;
844 myop.op_flags = OPf_WANT_VOID; 878 myop.op_flags = OPf_WANT_VOID;
845 879
846 PUSHMARK (SP); 880 PUSHMARK (SP);
847 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 881 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
850 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 884 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
851 SPAGAIN; 885 SPAGAIN;
852 } 886 }
853 887
854 /* this newly created coroutine might be run on an existing cctx which most 888 /* this newly created coroutine might be run on an existing cctx which most
855 * likely was suspended in set_stacklevel, called from entersub. 889 * 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 */ 890 */
859 ENTER; 891 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
892 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
860} 893}
861 894
862static void 895static void
863coro_destruct (pTHX_ struct coro *coro) 896coro_destruct (pTHX_ struct coro *coro)
864{ 897{
893 SvREFCNT_dec (coro->throw); 926 SvREFCNT_dec (coro->throw);
894 927
895 coro_destruct_stacks (aTHX); 928 coro_destruct_stacks (aTHX);
896} 929}
897 930
898static void 931INLINE void
899free_coro_mortal (pTHX) 932free_coro_mortal (pTHX)
900{ 933{
901 if (expect_true (coro_mortal)) 934 if (expect_true (coro_mortal))
902 { 935 {
903 SvREFCNT_dec (coro_mortal); 936 SvREFCNT_dec (coro_mortal);
1027 1060
1028 TAINT_NOT; 1061 TAINT_NOT;
1029 return 0; 1062 return 0;
1030} 1063}
1031 1064
1065static void
1066prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1067{
1068 ta->prev = (struct coro *)cctx;
1069 ta->next = 0;
1070}
1071
1032/* inject a fake call to Coro::State::_cctx_init into the execution */ 1072/* 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 */ 1073/* _cctx_init should be careful, as it could be called at almost any time */
1034/* during execution of a perl program */ 1074/* during execution of a perl program */
1035/* also initialises PL_top_env */ 1075/* also initialises PL_top_env */
1036static void NOINLINE 1076static void NOINLINE
1037cctx_prepare (pTHX_ coro_cctx *cctx) 1077cctx_prepare (pTHX_ coro_cctx *cctx)
1038{ 1078{
1039 dSP; 1079 dSP;
1040 LOGOP myop; 1080 UNOP myop;
1041 1081
1042 PL_top_env = &PL_start_env; 1082 PL_top_env = &PL_start_env;
1043 1083
1044 if (cctx->flags & CC_TRACE) 1084 if (cctx->flags & CC_TRACE)
1045 PL_runops = runops_trace; 1085 PL_runops = runops_trace;
1046 1086
1047 Zero (&myop, 1, LOGOP); 1087 Zero (&myop, 1, UNOP);
1048 myop.op_next = PL_op; 1088 myop.op_next = PL_op;
1049 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1089 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1050 1090
1051 PUSHMARK (SP); 1091 PUSHMARK (SP);
1052 EXTEND (SP, 2); 1092 EXTEND (SP, 2);
1053 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1093 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1054 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1094 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1055 PUTBACK; 1095 PUTBACK;
1056 PL_op = (OP *)&myop; 1096 PL_op = (OP *)&myop;
1057 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1097 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1058 SPAGAIN; 1098 SPAGAIN;
1059} 1099}
1060 1100
1061/* the tail of transfer: execute stuff we can onyl do afetr a transfer */ 1101/* the tail of transfer: execute stuff we can only do after a transfer */
1062static void 1102INLINE void
1063transfer_tail (void) 1103transfer_tail (pTHX)
1064{ 1104{
1105 struct coro *next = (struct coro *)transfer_next;
1106 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1107 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1108
1109 free_coro_mortal (aTHX);
1065 UNLOCK; 1110 UNLOCK;
1066 1111
1067 if (expect_false (next_has_throw)) 1112 if (expect_false (next->throw))
1068 { 1113 {
1069 struct coro *coro = SvSTATE (coro_current);
1070
1071 if (coro->throw)
1072 {
1073 SV *exception = coro->throw; 1114 SV *exception = sv_2mortal (next->throw);
1115
1074 coro->throw = 0; 1116 next->throw = 0;
1075 sv_setsv (ERRSV, exception); 1117 sv_setsv (ERRSV, exception);
1076 croak (0); 1118 croak (0);
1077 }
1078 } 1119 }
1079} 1120}
1080 1121
1081/* 1122/*
1082 * this is a _very_ stripped down perl interpreter ;) 1123 * this is a _very_ stripped down perl interpreter ;)
1090# endif 1131# endif
1091#endif 1132#endif
1092 { 1133 {
1093 dTHX; 1134 dTHX;
1094 1135
1095 /* we now skip the entersub that lead to transfer () */ 1136 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */
1096 PL_op = PL_op->op_next; 1138 /* PL_nop = PL_nop->op_next */
1097 1139
1098 /* inject a fake subroutine call to cctx_init */ 1140 /* inject a fake subroutine call to cctx_init */
1099 cctx_prepare (aTHX_ (coro_cctx *)arg); 1141 cctx_prepare (aTHX_ (coro_cctx *)arg);
1100 1142
1101 /* cctx_run is the alternative tail of transfer () */ 1143 /* cctx_run is the alternative tail of transfer() */
1144 /* TODO: throwing an exception here might be deadly, VERIFY */
1102 transfer_tail (); 1145 transfer_tail (aTHX);
1103 1146
1104 /* somebody or something will hit me for both perl_run and PL_restartop */ 1147 /* somebody or something will hit me for both perl_run and PL_restartop */
1105 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1106 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1107 1150
1125 ++cctx_count; 1168 ++cctx_count;
1126 New (0, cctx, 1, coro_cctx); 1169 New (0, cctx, 1, coro_cctx);
1127 1170
1128 cctx->gen = cctx_gen; 1171 cctx->gen = cctx_gen;
1129 cctx->flags = 0; 1172 cctx->flags = 0;
1130 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel */ 1173 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1131 1174
1132 return cctx; 1175 return cctx;
1133} 1176}
1134 1177
1135/* create a new cctx only suitable as source */ 1178/* create a new cctx only suitable as source */
1157 /* mmap supposedly does allocate-on-write for us */ 1200 /* mmap supposedly does allocate-on-write for us */
1158 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1201 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1159 1202
1160 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1161 { 1204 {
1162# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1163 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1164# endif 1207 #endif
1165 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1166 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1167 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1168 } 1211 }
1169 else 1212 else
1170#endif 1213#endif
1171 { 1214 {
1172 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1173 New (0, cctx->sptr, cctx_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1174 1217
1175 if (!cctx->sptr) 1218 if (!cctx->sptr)
1176 { 1219 {
1177 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1178 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1179 } 1222 }
1180 1223
1181 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1182 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1183 } 1226 }
1184 1227
1185 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1228 #if CORO_USE_VALGRIND
1229 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1230 #endif
1231
1186 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1232 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1187 1233
1188 return cctx; 1234 return cctx;
1189} 1235}
1190 1236
1198 coro_destroy (&cctx->cctx); 1244 coro_destroy (&cctx->cctx);
1199 1245
1200 /* coro_transfer creates new, empty cctx's */ 1246 /* coro_transfer creates new, empty cctx's */
1201 if (cctx->sptr) 1247 if (cctx->sptr)
1202 { 1248 {
1203#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1204 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1205#endif 1251 #endif
1206 1252
1207#if HAVE_MMAP 1253#if HAVE_MMAP
1208 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1209 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1210 else 1256 else
1237} 1283}
1238 1284
1239static void 1285static void
1240cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1241{ 1287{
1242 assert (("cctx_put called on non-initialised cctx", cctx->sptr)); 1288 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1243 1289
1244 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1245 if (expect_false (cctx_idle >= cctx_max_idle)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1246 { 1292 {
1247 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
1286 dSTACKLEVEL; 1332 dSTACKLEVEL;
1287 1333
1288 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1289 if (expect_false (!next)) 1335 if (expect_false (!next))
1290 { 1336 {
1291 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((coro_cctx *)prev)->idle_sp = stacklevel;
1292 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1338 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1293 } 1339 }
1294 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1295 { 1341 {
1296 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1321 else 1367 else
1322 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1323 1369
1324 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1325 1371
1326 if (prev__cctx->idle_sp == STACKLEVEL) asm volatile("");//D
1327
1328 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1329 if (expect_true ( 1373 if (expect_true (
1330 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1331 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1332 && !force_cctx 1376 && !force_cctx
1333 )) 1377 ))
1334 { 1378 {
1335 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1379 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1336 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1380 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1337 1381
1338 prev->cctx = 0; 1382 prev->cctx = 0;
1339 1383
1340 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1384 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1341 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1385 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1349 ++next->usecount; 1393 ++next->usecount;
1350 1394
1351 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1352 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1353 1397
1354 next_has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1355 1400
1356 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1357 { 1402 {
1358 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1359 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1360 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1361 } 1406 }
1362 1407
1363 free_coro_mortal (aTHX);
1364 UNLOCK;
1365
1366 transfer_tail (); 1408 transfer_tail (aTHX);
1367 } 1409 }
1368} 1410}
1369
1370struct transfer_args
1371{
1372 struct coro *prev, *next;
1373};
1374 1411
1375#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1412#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1376#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1377 1414
1378/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
1460# define MGf_DUP 0 1497# define MGf_DUP 0
1461#endif 1498#endif
1462}; 1499};
1463 1500
1464static void 1501static void
1465prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1502prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1466{ 1503{
1467 ta->prev = SvSTATE (prev_sv); 1504 ta->prev = SvSTATE (prev_sv);
1468 ta->next = SvSTATE (next_sv); 1505 ta->next = SvSTATE (next_sv);
1469 TRANSFER_CHECK (*ta); 1506 TRANSFER_CHECK (*ta);
1470} 1507}
1471 1508
1472static void 1509static void
1473api_transfer (SV *prev_sv, SV *next_sv) 1510api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1474{ 1511{
1475 dTHX;
1476 struct transfer_args ta; 1512 struct coro_transfer_args ta;
1477 1513
1478 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1514 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1479 TRANSFER (ta, 1); 1515 TRANSFER (ta, 1);
1480} 1516}
1481 1517
1498 1534
1499 return 0; 1535 return 0;
1500} 1536}
1501 1537
1502static int 1538static int
1503api_ready (SV *coro_sv) 1539api_ready (pTHX_ SV *coro_sv)
1504{ 1540{
1505 dTHX;
1506 struct coro *coro; 1541 struct coro *coro;
1507 SV *sv_hook; 1542 SV *sv_hook;
1508 void (*xs_hook)(void); 1543 void (*xs_hook)(void);
1509 1544
1510 if (SvROK (coro_sv)) 1545 if (SvROK (coro_sv))
1548 1583
1549 return 1; 1584 return 1;
1550} 1585}
1551 1586
1552static int 1587static int
1553api_is_ready (SV *coro_sv) 1588api_is_ready (pTHX_ SV *coro_sv)
1554{ 1589{
1555 dTHX;
1556 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1590 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1557} 1591}
1558 1592
1559static void 1593INLINE void
1560prepare_schedule (pTHX_ struct transfer_args *ta) 1594prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1561{ 1595{
1562 SV *prev_sv, *next_sv; 1596 SV *prev_sv, *next_sv;
1563 1597
1564 for (;;) 1598 for (;;)
1565 { 1599 {
1590 /* cannot transfer to destroyed coros, skip and look for next */ 1624 /* cannot transfer to destroyed coros, skip and look for next */
1591 if (expect_false (ta->next->flags & CF_DESTROYED)) 1625 if (expect_false (ta->next->flags & CF_DESTROYED))
1592 { 1626 {
1593 UNLOCK; 1627 UNLOCK;
1594 SvREFCNT_dec (next_sv); 1628 SvREFCNT_dec (next_sv);
1595 /* coro_nready is already taken care of by destroy */ 1629 /* coro_nready has already been taken care of by destroy */
1596 continue; 1630 continue;
1597 } 1631 }
1598 1632
1599 --coro_nready; 1633 --coro_nready;
1600 UNLOCK; 1634 UNLOCK;
1603 1637
1604 /* free this only after the transfer */ 1638 /* free this only after the transfer */
1605 prev_sv = SvRV (coro_current); 1639 prev_sv = SvRV (coro_current);
1606 ta->prev = SvSTATE (prev_sv); 1640 ta->prev = SvSTATE (prev_sv);
1607 TRANSFER_CHECK (*ta); 1641 TRANSFER_CHECK (*ta);
1608 assert (ta->next->flags & CF_READY); 1642 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1609 ta->next->flags &= ~CF_READY; 1643 ta->next->flags &= ~CF_READY;
1610 SvRV_set (coro_current, next_sv); 1644 SvRV_set (coro_current, next_sv);
1611 1645
1612 LOCK; 1646 LOCK;
1613 free_coro_mortal (aTHX); 1647 free_coro_mortal (aTHX);
1614 coro_mortal = prev_sv; 1648 coro_mortal = prev_sv;
1615 UNLOCK; 1649 UNLOCK;
1616} 1650}
1617 1651
1652INLINE void
1653prepare_cede (pTHX_ struct coro_transfer_args *ta)
1654{
1655 api_ready (aTHX_ coro_current);
1656 prepare_schedule (aTHX_ ta);
1657}
1658
1659INLINE void
1660prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1661{
1662 SV *prev = SvRV (coro_current);
1663
1664 if (coro_nready)
1665 {
1666 prepare_schedule (aTHX_ ta);
1667 api_ready (aTHX_ prev);
1668 }
1669 else
1670 prepare_nop (aTHX_ ta);
1671}
1672
1618static void 1673static void
1619prepare_cede (pTHX_ struct transfer_args *ta) 1674api_schedule (pTHX)
1620{ 1675{
1621 api_ready (coro_current); 1676 struct coro_transfer_args ta;
1677
1622 prepare_schedule (aTHX_ ta); 1678 prepare_schedule (aTHX_ &ta);
1679 TRANSFER (ta, 1);
1623} 1680}
1624 1681
1625static int 1682static int
1626prepare_cede_notself (pTHX_ struct transfer_args *ta) 1683api_cede (pTHX)
1627{ 1684{
1628 if (coro_nready) 1685 struct coro_transfer_args ta;
1629 { 1686
1630 SV *prev = SvRV (coro_current);
1631 prepare_schedule (aTHX_ ta); 1687 prepare_cede (aTHX_ &ta);
1632 api_ready (prev); 1688
1689 if (expect_true (ta.prev != ta.next))
1690 {
1691 TRANSFER (ta, 1);
1633 return 1; 1692 return 1;
1634 } 1693 }
1635 else 1694 else
1636 return 0; 1695 return 0;
1637} 1696}
1638 1697
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 1698static int
1650api_cede (void) 1699api_cede_notself (pTHX)
1651{ 1700{
1652 dTHX; 1701 if (coro_nready)
1702 {
1653 struct transfer_args ta; 1703 struct coro_transfer_args ta;
1654 1704
1655 prepare_cede (aTHX_ &ta); 1705 prepare_cede_notself (aTHX_ &ta);
1656
1657 if (expect_true (ta.prev != ta.next))
1658 {
1659 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1660 return 1; 1707 return 1;
1661 } 1708 }
1662 else 1709 else
1663 return 0; 1710 return 0;
1664} 1711}
1665 1712
1666static int
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 1713static void
1682api_trace (SV *coro_sv, int flags) 1714api_trace (pTHX_ SV *coro_sv, int flags)
1683{ 1715{
1684 dTHX;
1685 struct coro *coro = SvSTATE (coro_sv); 1716 struct coro *coro = SvSTATE (coro_sv);
1686 1717
1687 if (flags & CC_TRACE) 1718 if (flags & CC_TRACE)
1688 { 1719 {
1689 if (!coro->cctx) 1720 if (!coro->cctx)
1756 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1787 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1757 double now = nvtime (); 1788 double now = nvtime ();
1758 1789
1759 if (now >= self->next) 1790 if (now >= self->next)
1760 { 1791 {
1761 api_cede (); 1792 api_cede (aTHX);
1762 self->next = now + self->every; 1793 self->next = now + self->every;
1763 } 1794 }
1764 1795
1765 return PerlIOBuf_flush (aTHX_ f); 1796 return PerlIOBuf_flush (aTHX_ f);
1766} 1797}
1795 PerlIOBuf_get_ptr, 1826 PerlIOBuf_get_ptr,
1796 PerlIOBuf_get_cnt, 1827 PerlIOBuf_get_cnt,
1797 PerlIOBuf_set_ptrcnt, 1828 PerlIOBuf_set_ptrcnt,
1798}; 1829};
1799 1830
1831/*****************************************************************************/
1832
1833static const CV *slf_cv; /* for quick consistency check */
1834
1835static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1836static SV *slf_arg0;
1837static SV *slf_arg1;
1838
1839/* this restores the stack in the case we patched the entersub, to */
1840/* recreate the stack frame as perl will on following calls */
1841/* since entersub cleared the stack */
1842static OP *
1843pp_restore (pTHX)
1844{
1845 dSP;
1846
1847 PUSHMARK (SP);
1848
1849 EXTEND (SP, 3);
1850 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1851 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1852 PUSHs ((SV *)CvGV (slf_cv));
1853
1854 RETURNOP (slf_restore.op_first);
1855}
1856
1857static void
1858slf_init_set_stacklevel (pTHX_ SV **arg, int items)
1859{
1860 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1861 CORO_SLF_DATA = (void *)SvIV (arg [0]);
1862}
1863
1864static void
1865slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1866{
1867 prepare_set_stacklevel (ta, (struct coro_cctx *)CORO_SLF_DATA);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1875
1876 CORO_SLF_DATA = (void *)arg; /* let's hope it will stay valid */
1877}
1878
1879static void
1880slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1881{
1882 SV **arg = (SV **)CORO_SLF_DATA;
1883
1884 prepare_transfer (ta, arg [0], arg [1]);
1885}
1886
1887static void
1888slf_init_nop (pTHX_ SV **arg, int items)
1889{
1890}
1891
1892/* slf_prepare_schedule == prepare_schedule */
1893/* slf_prepare_cede == prepare_cede */
1894/* slf_prepare_notself == prepare_notself */
1895
1896/* we hijack an hopefully unused CV flag for our purposes */
1897#define CVf_SLF 0x4000
1898
1899/*
1900 * these not obviously related functions are all rolled into one
1901 * function to increase chances that they all will call transfer with the same
1902 * stack offset
1903 * SLF stands for "schedule-like-function".
1904 */
1905static OP *
1906pp_slf (pTHX)
1907{
1908 I32 checkmark; /* mark SP to see how many elements check has pushed */
1909
1910 if (expect_true (!slf_frame.prepare))
1911 {
1912 /* first iteration */
1913 dSP;
1914 SV **arg = PL_stack_base + TOPMARK + 1;
1915 int items = SP - arg; /* args without function object */
1916 SV *gv = *sp;
1917 struct CoroSLF *slf;
1918
1919 /* do a quick consistency check on the "function" object, and if it isn't */
1920 /* for us, divert to the real entersub */
1921 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1922 return PL_ppaddr[OP_ENTERSUB](aTHX);
1923
1924 /* pop args */
1925 SP = PL_stack_base + POPMARK;
1926
1927 if (!(PL_op->op_flags & OPf_STACKED))
1928 {
1929 /* ampersand-form of call, use @_ instead of stack */
1930 AV *av = GvAV (PL_defgv);
1931 arg = AvARRAY (av);
1932 items = AvFILLp (av) + 1;
1933 }
1934
1935 PUTBACK;
1936
1937 slf = (struct CoroSLF *)CvXSUBANY (GvCV (gv)).any_ptr;
1938 slf_frame.prepare = slf->prepare;
1939 slf_frame.check = slf->check;
1940 slf->init (aTHX_ arg, items);
1941 }
1942
1943 /* now interpret the slf_frame */
1944 /* we use a callback system not to make the code needlessly */
1945 /* complicated, but so we can run multiple perl coros from one cctx */
1946
1947 do
1948 {
1949 struct coro_transfer_args ta;
1950
1951 slf_frame.prepare (aTHX_ &ta);
1952 TRANSFER (ta, 0);
1953
1954 checkmark = PL_stack_sp - PL_stack_base;
1955 }
1956 while (slf_frame.check (aTHX));
1957
1958 {
1959 dSP;
1960 SV **bot = PL_stack_base + checkmark;
1961 int gimme = GIMME_V;
1962
1963 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1964
1965 /* make sure we put something on the stack in scalar context */
1966 if (gimme == G_SCALAR)
1967 {
1968 if (sp == bot)
1969 XPUSHs (&PL_sv_undef);
1970
1971 SP = bot + 1;
1972 }
1973
1974 PUTBACK;
1975 }
1976
1977 return NORMAL;
1978}
1979
1980static void
1981api_execute_slf (pTHX_ CV *cv, const struct CoroSLF *slf, SV **arg, int items)
1982{
1983 assert (("FATAL: SLF call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_slf));
1984 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1985
1986 if (items > 2)
1987 croak ("Coro only supports a max of two arguments to SLF functions.");
1988
1989 CvFLAGS (cv) |= CVf_SLF;
1990 CvXSUBANY (cv).any_ptr = (void *)slf;
1991 slf_cv = cv;
1992
1993 /* we patch the op, and then re-run the whole call */
1994 /* we have to put the same argument on the stack for this to work */
1995 /* and this will be done by pp_restore */
1996 slf_restore.op_next = (OP *)&slf_restore;
1997 slf_restore.op_type = OP_NULL;
1998 slf_restore.op_ppaddr = pp_restore;
1999 slf_restore.op_first = PL_op;
2000
2001 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
2002 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2003
2004 PL_op->op_ppaddr = pp_slf;
2005
2006 PL_op = (OP *)&slf_restore;
2007}
1800 2008
1801MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2009MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1802 2010
1803PROTOTYPES: DISABLE 2011PROTOTYPES: DISABLE
1804 2012
1834 main_top_env = PL_top_env; 2042 main_top_env = PL_top_env;
1835 2043
1836 while (main_top_env->je_prev) 2044 while (main_top_env->je_prev)
1837 main_top_env = main_top_env->je_prev; 2045 main_top_env = main_top_env->je_prev;
1838 2046
1839 coroapi.ver = CORO_API_VERSION; 2047 coroapi.ver = CORO_API_VERSION;
1840 coroapi.rev = CORO_API_REVISION; 2048 coroapi.rev = CORO_API_REVISION;
1841 coroapi.transfer = api_transfer; 2049 coroapi.transfer = api_transfer;
2050 coroapi.execute_slf = api_execute_slf;
2051 coroapi.sv_state = SvSTATE_;
1842 2052
1843 { 2053 {
1844 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2054 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1845 2055
1846 if (!svp) croak ("Time::HiRes is required"); 2056 if (!svp) croak ("Time::HiRes is required");
1879 av_push (coro->args, newSVsv (ST (i))); 2089 av_push (coro->args, newSVsv (ST (i)));
1880} 2090}
1881 OUTPUT: 2091 OUTPUT:
1882 RETVAL 2092 RETVAL
1883 2093
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 2094void
1888_set_stacklevel (...) 2095_set_stacklevel (...)
1889 ALIAS: 2096 CODE:
1890 Coro::State::transfer = 1
1891 Coro::schedule = 2
1892 Coro::cede = 3
1893 Coro::cede_notself = 4
1894 CODE:
1895{ 2097{
1896 struct transfer_args ta; 2098 static struct CoroSLF slf = { slf_init_set_stacklevel, slf_prepare_set_stacklevel, slf_check_nop };
2099 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2100}
1897 2101
1898 PUTBACK; 2102void
1899 switch (ix) 2103transfer (...)
1900 { 2104 CODE:
1901 case 0: 2105{
1902 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2106 static struct CoroSLF slf = { slf_init_transfer, slf_prepare_transfer, slf_check_nop };
1903 ta.next = 0; 2107 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
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} 2108}
1935 2109
1936bool 2110bool
1937_destroy (SV *coro_sv) 2111_destroy (SV *coro_sv)
1938 CODE: 2112 CODE:
2049 RETVAL = boolSV (coro->flags & ix); 2223 RETVAL = boolSV (coro->flags & ix);
2050 OUTPUT: 2224 OUTPUT:
2051 RETVAL 2225 RETVAL
2052 2226
2053void 2227void
2228throw (Coro::State self, SV *throw = &PL_sv_undef)
2229 PROTOTYPE: $;$
2230 CODE:
2231 SvREFCNT_dec (self->throw);
2232 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2233
2234void
2054api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2235api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2236 C_ARGS: aTHX_ coro, flags
2055 2237
2056SV * 2238SV *
2057has_cctx (Coro::State coro) 2239has_cctx (Coro::State coro)
2058 PROTOTYPE: $ 2240 PROTOTYPE: $
2059 CODE: 2241 CODE:
2129 2311
2130 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2312 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2131 coro_ready[i] = newAV (); 2313 coro_ready[i] = newAV ();
2132 2314
2133 { 2315 {
2134 SV *sv = perl_get_sv ("Coro::API", TRUE); 2316 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2135 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2136 2317
2137 coroapi.schedule = api_schedule; 2318 coroapi.schedule = api_schedule;
2138 coroapi.cede = api_cede; 2319 coroapi.cede = api_cede;
2139 coroapi.cede_notself = api_cede_notself; 2320 coroapi.cede_notself = api_cede_notself;
2140 coroapi.ready = api_ready; 2321 coroapi.ready = api_ready;
2141 coroapi.is_ready = api_is_ready; 2322 coroapi.is_ready = api_is_ready;
2142 coroapi.nready = &coro_nready; 2323 coroapi.nready = coro_nready;
2143 coroapi.current = coro_current; 2324 coroapi.current = coro_current;
2144 2325
2145 GCoroAPI = &coroapi; 2326 GCoroAPI = &coroapi;
2146 sv_setiv (sv, (IV)&coroapi); 2327 sv_setiv (sv, (IV)&coroapi);
2147 SvREADONLY_on (sv); 2328 SvREADONLY_on (sv);
2148 } 2329 }
2330}
2331
2332void
2333schedule (...)
2334 CODE:
2335{
2336 static struct CoroSLF slf = { slf_init_nop, prepare_schedule, slf_check_nop };
2337 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2338}
2339
2340void
2341cede (...)
2342 CODE:
2343{
2344 static struct CoroSLF slf = { slf_init_nop, prepare_cede, slf_check_nop };
2345 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2346}
2347
2348void
2349cede_notself (...)
2350 CODE:
2351{
2352 static struct CoroSLF slf = { slf_init_nop, prepare_cede_notself, slf_check_nop };
2353 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
2149} 2354}
2150 2355
2151void 2356void
2152_set_current (SV *current) 2357_set_current (SV *current)
2153 PROTOTYPE: $ 2358 PROTOTYPE: $
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