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.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 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;
… …
249#undef VAR 252#undef VAR
250} perl_slots; 253} perl_slots;
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
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
254/* this is a structure representing a perl-level coroutine */ 266/* this is a structure representing a perl-level coroutine */
255struct coro { 267struct coro {
256 /* the c coroutine allocated to this perl coroutine, if any */ 268 /* the C coroutine allocated to this perl coroutine, if any */
257 coro_cctx *cctx; 269 coro_cctx *cctx;
258 270
259 /* process data */ 271 /* process data */
272 struct slf_frame slf_frame; /* saved slf frame */
273 void *slf_data;
260 AV *mainstack; 274 AV *mainstack;
261 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
262 276
263 AV *args; /* data associated with this coroutine (initial args) */ 277 AV *args; /* data associated with this coroutine (initial args) */
264 int refcnt; /* coroutines are refcounted, yes */ 278 int refcnt; /* coroutines are refcounted, yes */
… …
279 struct coro *next, *prev; 293 struct coro *next, *prev;
280}; 294};
281 295
282typedef struct coro *Coro__State; 296typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 297typedef struct coro *Coro__State_or_hashref;
298
299static struct slf_frame slf_frame; /* the current slf frame */
284 300
285/** Coro ********************************************************************/ 301/** Coro ********************************************************************/
286 302
287#define PRIO_MAX 3 303#define PRIO_MAX 3
288#define PRIO_HIGH 1 304#define PRIO_HIGH 1
… …
293 309
294/* for Coro.pm */ 310/* for Coro.pm */
295static SV *coro_current; 311static SV *coro_current;
296static SV *coro_readyhook; 312static SV *coro_readyhook;
297static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 313static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
298static int coro_nready;
299static struct coro *coro_first; 314static struct coro *coro_first;
315#define coro_nready coroapi.nready
300 316
301/** lowlevel stuff **********************************************************/ 317/** lowlevel stuff **********************************************************/
302 318
303static SV * 319static SV *
304coro_get_sv (pTHX_ const char *name, int create) 320coro_get_sv (pTHX_ const char *name, int create)
… …
407 : 0 423 : 0
408 424
409#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)
410#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)
411 427
412static struct coro * 428INLINE struct coro *
413SvSTATE_ (pTHX_ SV *coro) 429SvSTATE_ (pTHX_ SV *coro)
414{ 430{
415 HV *stash; 431 HV *stash;
416 MAGIC *mg; 432 MAGIC *mg;
417 433
… …
508 CvPADLIST (cv) = (AV *)POPs; 524 CvPADLIST (cv) = (AV *)POPs;
509 } 525 }
510 526
511 PUTBACK; 527 PUTBACK;
512 } 528 }
529
530 slf_frame = c->slf_frame;
531 coroapi.slf_data = c->slf_data;
513} 532}
514 533
515static void 534static void
516save_perl (pTHX_ Coro__State c) 535save_perl (pTHX_ Coro__State c)
517{ 536{
537 c->slf_data = coroapi.slf_data;
538 c->slf_frame = slf_frame;
539
518 { 540 {
519 dSP; 541 dSP;
520 I32 cxix = cxstack_ix; 542 I32 cxix = cxstack_ix;
521 PERL_CONTEXT *ccstk = cxstack; 543 PERL_CONTEXT *ccstk = cxstack;
522 PERL_SI *top_si = PL_curstackinfo; 544 PERL_SI *top_si = PL_curstackinfo;
… …
589 #undef VAR 611 #undef VAR
590 } 612 }
591} 613}
592 614
593/* 615/*
594 * allocate various perl stacks. This is an exact copy 616 * allocate various perl stacks. This is almost an exact copy
595 * of perl.c:init_stacks, except that it uses less memory 617 * of perl.c:init_stacks, except that it uses less memory
596 * on the (sometimes correct) assumption that coroutines do 618 * on the (sometimes correct) assumption that coroutines do
597 * not usually need a lot of stackspace. 619 * not usually need a lot of stackspace.
598 */ 620 */
599#if CORO_PREFER_PERL_FUNCTIONS 621#if CORO_PREFER_PERL_FUNCTIONS
… …
801 823
802 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 824 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
803} 825}
804 826
805static 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
806coro_setup (pTHX_ struct coro *coro) 841coro_setup (pTHX_ struct coro *coro)
807{ 842{
808 /* 843 /*
809 * emulate part of the perl startup here. 844 * emulate part of the perl startup here.
810 */ 845 */
… …
834 PL_rs = newSVsv (GvSV (irsgv)); 869 PL_rs = newSVsv (GvSV (irsgv));
835 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 870 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
836 871
837 { 872 {
838 dSP; 873 dSP;
839 LOGOP myop; 874 UNOP myop;
840 875
841 Zero (&myop, 1, LOGOP); 876 Zero (&myop, 1, UNOP);
842 myop.op_next = Nullop; 877 myop.op_next = Nullop;
843 myop.op_flags = OPf_WANT_VOID; 878 myop.op_flags = OPf_WANT_VOID;
844 879
845 PUSHMARK (SP); 880 PUSHMARK (SP);
846 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 881 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
849 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 884 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
850 SPAGAIN; 885 SPAGAIN;
851 } 886 }
852 887
853 /* 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
854 * 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.
855 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
856 * so we ENTER here for symmetry
857 */ 890 */
858 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 */
859} 893}
860 894
861static void 895static void
862coro_destruct (pTHX_ struct coro *coro) 896coro_destruct (pTHX_ struct coro *coro)
863{ 897{
… …
892 SvREFCNT_dec (coro->throw); 926 SvREFCNT_dec (coro->throw);
893 927
894 coro_destruct_stacks (aTHX); 928 coro_destruct_stacks (aTHX);
895} 929}
896 930
897static void 931INLINE void
898free_coro_mortal (pTHX) 932free_coro_mortal (pTHX)
899{ 933{
900 if (expect_true (coro_mortal)) 934 if (expect_true (coro_mortal))
901 { 935 {
902 SvREFCNT_dec (coro_mortal); 936 SvREFCNT_dec (coro_mortal);
… …
1026 1060
1027 TAINT_NOT; 1061 TAINT_NOT;
1028 return 0; 1062 return 0;
1029} 1063}
1030 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
1031/* 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 */
1032/* _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 */
1033/* during execution of a perl program */ 1074/* during execution of a perl program */
1075/* also initialises PL_top_env */
1034static void NOINLINE 1076static void NOINLINE
1035cctx_prepare (pTHX_ coro_cctx *cctx) 1077cctx_prepare (pTHX_ coro_cctx *cctx)
1036{ 1078{
1037 dSP; 1079 dSP;
1038 LOGOP myop; 1080 UNOP myop;
1039 1081
1040 PL_top_env = &PL_start_env; 1082 PL_top_env = &PL_start_env;
1041 1083
1042 if (cctx->flags & CC_TRACE) 1084 if (cctx->flags & CC_TRACE)
1043 PL_runops = runops_trace; 1085 PL_runops = runops_trace;
1044 1086
1045 Zero (&myop, 1, LOGOP); 1087 Zero (&myop, 1, UNOP);
1046 myop.op_next = PL_op; 1088 myop.op_next = PL_op;
1047 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1089 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
1048 1090
1049 PUSHMARK (SP); 1091 PUSHMARK (SP);
1050 EXTEND (SP, 2); 1092 EXTEND (SP, 2);
1051 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1093 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
1052 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1094 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
1053 PUTBACK; 1095 PUTBACK;
1054 PL_op = (OP *)&myop; 1096 PL_op = (OP *)&myop;
1055 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1097 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1056 SPAGAIN; 1098 SPAGAIN;
1057} 1099}
1058 1100
1101/* the tail of transfer: execute stuff we can only do after a transfer */
1102INLINE void
1103transfer_tail (pTHX)
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);
1110 UNLOCK;
1111
1112 if (expect_false (next->throw))
1113 {
1114 SV *exception = sv_2mortal (next->throw);
1115
1116 next->throw = 0;
1117 sv_setsv (ERRSV, exception);
1118 croak (0);
1119 }
1120}
1121
1059/* 1122/*
1060 * this is a _very_ stripped down perl interpreter ;) 1123 * this is a _very_ stripped down perl interpreter ;)
1061 */ 1124 */
1062static void 1125static void
1063cctx_run (void *arg) 1126cctx_run (void *arg)
… …
1068# endif 1131# endif
1069#endif 1132#endif
1070 { 1133 {
1071 dTHX; 1134 dTHX;
1072 1135
1073 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1136 /* normally we would need to skip the entersub here */
1074 UNLOCK; 1137 /* 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; 1138 /* PL_nop = PL_nop->op_next */
1078 1139
1079 /* inject a fake subroutine call to cctx_init */ 1140 /* inject a fake subroutine call to cctx_init */
1080 cctx_prepare (aTHX_ (coro_cctx *)arg); 1141 cctx_prepare (aTHX_ (coro_cctx *)arg);
1142
1143 /* cctx_run is the alternative tail of transfer() */
1144 /* TODO: throwing an exception here might be deadly, VERIFY */
1145 transfer_tail (aTHX);
1081 1146
1082 /* somebody or something will hit me for both perl_run and PL_restartop */ 1147 /* somebody or something will hit me for both perl_run and PL_restartop */
1083 PL_restartop = PL_op; 1148 PL_restartop = PL_op;
1084 perl_run (PL_curinterp); 1149 perl_run (PL_curinterp);
1085 1150
… …
1097 1162
1098static coro_cctx * 1163static coro_cctx *
1099cctx_new () 1164cctx_new ()
1100{ 1165{
1101 coro_cctx *cctx; 1166 coro_cctx *cctx;
1167
1168 ++cctx_count;
1169 New (0, cctx, 1, coro_cctx);
1170
1171 cctx->gen = cctx_gen;
1172 cctx->flags = 0;
1173 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx only suitable as source */
1179static coro_cctx *
1180cctx_new_empty ()
1181{
1182 coro_cctx *cctx = cctx_new ();
1183
1184 cctx->sptr = 0;
1185 coro_create (&cctx->cctx, 0, 0, 0, 0);
1186
1187 return cctx;
1188}
1189
1190/* create a new cctx suitable as destination/running a perl interpreter */
1191static coro_cctx *
1192cctx_new_run ()
1193{
1194 coro_cctx *cctx = cctx_new ();
1102 void *stack_start; 1195 void *stack_start;
1103 size_t stack_size; 1196 size_t stack_size;
1104
1105 ++cctx_count;
1106 Newz (0, cctx, 1, coro_cctx);
1107
1108 cctx->gen = cctx_gen;
1109 1197
1110#if HAVE_MMAP 1198#if HAVE_MMAP
1111 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1199 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1112 /* mmap supposedly does allocate-on-write for us */ 1200 /* 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); 1201 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1114 1202
1115 if (cctx->sptr != (void *)-1) 1203 if (cctx->sptr != (void *)-1)
1116 { 1204 {
1117# if CORO_STACKGUARD 1205 #if CORO_STACKGUARD
1118 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1206 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1119# endif 1207 #endif
1120 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1208 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1121 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1209 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1122 cctx->flags |= CC_MAPPED; 1210 cctx->flags |= CC_MAPPED;
1123 } 1211 }
1124 else 1212 else
1125#endif 1213#endif
1126 { 1214 {
1127 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1215 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1128 New (0, cctx->sptr, cctx_stacksize, long); 1216 New (0, cctx->sptr, cctx_stacksize, long);
1129 1217
1130 if (!cctx->sptr) 1218 if (!cctx->sptr)
1131 { 1219 {
1132 perror ("FATAL: unable to allocate stack for coroutine"); 1220 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1133 _exit (EXIT_FAILURE); 1221 _exit (EXIT_FAILURE);
1134 } 1222 }
1135 1223
1136 stack_start = cctx->sptr; 1224 stack_start = cctx->sptr;
1137 stack_size = cctx->ssize; 1225 stack_size = cctx->ssize;
1138 } 1226 }
1139 1227
1140 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
1141 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);
1142 1233
1143 return cctx; 1234 return cctx;
1144} 1235}
1145 1236
… …
1153 coro_destroy (&cctx->cctx); 1244 coro_destroy (&cctx->cctx);
1154 1245
1155 /* coro_transfer creates new, empty cctx's */ 1246 /* coro_transfer creates new, empty cctx's */
1156 if (cctx->sptr) 1247 if (cctx->sptr)
1157 { 1248 {
1158#if CORO_USE_VALGRIND 1249 #if CORO_USE_VALGRIND
1159 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1250 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1160#endif 1251 #endif
1161 1252
1162#if HAVE_MMAP 1253#if HAVE_MMAP
1163 if (cctx->flags & CC_MAPPED) 1254 if (cctx->flags & CC_MAPPED)
1164 munmap (cctx->sptr, cctx->ssize); 1255 munmap (cctx->sptr, cctx->ssize);
1165 else 1256 else
… …
1186 return cctx; 1277 return cctx;
1187 1278
1188 cctx_destroy (cctx); 1279 cctx_destroy (cctx);
1189 } 1280 }
1190 1281
1191 return cctx_new (); 1282 return cctx_new_run ();
1192} 1283}
1193 1284
1194static void 1285static void
1195cctx_put (coro_cctx *cctx) 1286cctx_put (coro_cctx *cctx)
1196{ 1287{
1197 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));
1198 1289
1199 /* free another cctx if overlimit */ 1290 /* free another cctx if overlimit */
1200 if (expect_false (cctx_idle >= cctx_max_idle)) 1291 if (expect_false (cctx_idle >= cctx_max_idle))
1201 { 1292 {
1202 coro_cctx *first = cctx_first; 1293 coro_cctx *first = cctx_first;
… …
1241 dSTACKLEVEL; 1332 dSTACKLEVEL;
1242 1333
1243 /* sometimes transfer is only called to set idle_sp */ 1334 /* sometimes transfer is only called to set idle_sp */
1244 if (expect_false (!next)) 1335 if (expect_false (!next))
1245 { 1336 {
1246 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1337 ((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 */ 1338 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1248 } 1339 }
1249 else if (expect_true (prev != next)) 1340 else if (expect_true (prev != next))
1250 { 1341 {
1251 static volatile int has_throw;
1252 coro_cctx *prev__cctx; 1342 coro_cctx *prev__cctx;
1253 1343
1254 if (expect_false (prev->flags & CF_NEW)) 1344 if (expect_false (prev->flags & CF_NEW))
1255 { 1345 {
1256 /* create a new empty/source context */ 1346 /* create a new empty/source context */
1257 ++cctx_count; 1347 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; 1348 prev->flags &= ~CF_NEW;
1263 prev->flags |= CF_RUNNING; 1349 prev->flags |= CF_RUNNING;
1264 } 1350 }
1265 1351
1266 prev->flags &= ~CF_RUNNING; 1352 prev->flags &= ~CF_RUNNING;
… …
1281 else 1367 else
1282 load_perl (aTHX_ next); 1368 load_perl (aTHX_ next);
1283 1369
1284 prev__cctx = prev->cctx; 1370 prev__cctx = prev->cctx;
1285 1371
1286 /* possibly "free" the cctx */ 1372 /* possibly untie and reuse the cctx */
1287 if (expect_true ( 1373 if (expect_true (
1288 prev__cctx->idle_sp == STACKLEVEL 1374 prev__cctx->idle_sp == stacklevel
1289 && !(prev__cctx->flags & CC_TRACE) 1375 && !(prev__cctx->flags & CC_TRACE)
1290 && !force_cctx 1376 && !force_cctx
1291 )) 1377 ))
1292 { 1378 {
1293 /* 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 */
1294 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));
1295 1381
1296 prev->cctx = 0; 1382 prev->cctx = 0;
1297 1383
1298 /* 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 */
1299 /* 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 */
… …
1307 ++next->usecount; 1393 ++next->usecount;
1308 1394
1309 if (expect_true (!next->cctx)) 1395 if (expect_true (!next->cctx))
1310 next->cctx = cctx_get (aTHX); 1396 next->cctx = cctx_get (aTHX);
1311 1397
1312 has_throw = !!next->throw; 1398 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1399 transfer_next = next;
1313 1400
1314 if (expect_false (prev__cctx != next->cctx)) 1401 if (expect_false (prev__cctx != next->cctx))
1315 { 1402 {
1316 prev__cctx->top_env = PL_top_env; 1403 prev__cctx->top_env = PL_top_env;
1317 PL_top_env = next->cctx->top_env; 1404 PL_top_env = next->cctx->top_env;
1318 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1319 } 1406 }
1320 1407
1321 free_coro_mortal (aTHX); 1408 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 } 1409 }
1337} 1410}
1338
1339struct transfer_args
1340{
1341 struct coro *prev, *next;
1342};
1343 1411
1344#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))
1345#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1413#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1346 1414
1347/** high level stuff ********************************************************/ 1415/** high level stuff ********************************************************/
… …
1429# define MGf_DUP 0 1497# define MGf_DUP 0
1430#endif 1498#endif
1431}; 1499};
1432 1500
1433static void 1501static void
1434prepare_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)
1435{ 1503{
1436 ta->prev = SvSTATE (prev_sv); 1504 ta->prev = SvSTATE (prev_sv);
1437 ta->next = SvSTATE (next_sv); 1505 ta->next = SvSTATE (next_sv);
1438 TRANSFER_CHECK (*ta); 1506 TRANSFER_CHECK (*ta);
1439} 1507}
1440 1508
1441static void 1509static void
1442api_transfer (SV *prev_sv, SV *next_sv) 1510api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1443{ 1511{
1444 dTHX;
1445 struct transfer_args ta; 1512 struct coro_transfer_args ta;
1446 1513
1447 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1514 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1448 TRANSFER (ta, 1); 1515 TRANSFER (ta, 1);
1449} 1516}
1450 1517
… …
1467 1534
1468 return 0; 1535 return 0;
1469} 1536}
1470 1537
1471static int 1538static int
1472api_ready (SV *coro_sv) 1539api_ready (pTHX_ SV *coro_sv)
1473{ 1540{
1474 dTHX;
1475 struct coro *coro; 1541 struct coro *coro;
1476 SV *sv_hook; 1542 SV *sv_hook;
1477 void (*xs_hook)(void); 1543 void (*xs_hook)(void);
1478 1544
1479 if (SvROK (coro_sv)) 1545 if (SvROK (coro_sv))
… …
1517 1583
1518 return 1; 1584 return 1;
1519} 1585}
1520 1586
1521static int 1587static int
1522api_is_ready (SV *coro_sv) 1588api_is_ready (pTHX_ SV *coro_sv)
1523{ 1589{
1524 dTHX;
1525 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1590 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1526} 1591}
1527 1592
1528static void 1593INLINE void
1529prepare_schedule (pTHX_ struct transfer_args *ta) 1594prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1530{ 1595{
1531 SV *prev_sv, *next_sv; 1596 SV *prev_sv, *next_sv;
1532 1597
1533 for (;;) 1598 for (;;)
1534 { 1599 {
… …
1559 /* cannot transfer to destroyed coros, skip and look for next */ 1624 /* cannot transfer to destroyed coros, skip and look for next */
1560 if (expect_false (ta->next->flags & CF_DESTROYED)) 1625 if (expect_false (ta->next->flags & CF_DESTROYED))
1561 { 1626 {
1562 UNLOCK; 1627 UNLOCK;
1563 SvREFCNT_dec (next_sv); 1628 SvREFCNT_dec (next_sv);
1564 /* coro_nready is already taken care of by destroy */ 1629 /* coro_nready has already been taken care of by destroy */
1565 continue; 1630 continue;
1566 } 1631 }
1567 1632
1568 --coro_nready; 1633 --coro_nready;
1569 UNLOCK; 1634 UNLOCK;
… …
1572 1637
1573 /* free this only after the transfer */ 1638 /* free this only after the transfer */
1574 prev_sv = SvRV (coro_current); 1639 prev_sv = SvRV (coro_current);
1575 ta->prev = SvSTATE (prev_sv); 1640 ta->prev = SvSTATE (prev_sv);
1576 TRANSFER_CHECK (*ta); 1641 TRANSFER_CHECK (*ta);
1577 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));
1578 ta->next->flags &= ~CF_READY; 1643 ta->next->flags &= ~CF_READY;
1579 SvRV_set (coro_current, next_sv); 1644 SvRV_set (coro_current, next_sv);
1580 1645
1581 LOCK; 1646 LOCK;
1582 free_coro_mortal (aTHX); 1647 free_coro_mortal (aTHX);
1583 coro_mortal = prev_sv; 1648 coro_mortal = prev_sv;
1584 UNLOCK; 1649 UNLOCK;
1585} 1650}
1586 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
1587static void 1673static void
1588prepare_cede (pTHX_ struct transfer_args *ta) 1674api_schedule (pTHX)
1589{ 1675{
1590 api_ready (coro_current); 1676 struct coro_transfer_args ta;
1677
1591 prepare_schedule (aTHX_ ta); 1678 prepare_schedule (aTHX_ &ta);
1679 TRANSFER (ta, 1);
1592} 1680}
1593 1681
1594static int 1682static int
1595prepare_cede_notself (pTHX_ struct transfer_args *ta) 1683api_cede (pTHX)
1596{ 1684{
1597 if (coro_nready) 1685 struct coro_transfer_args ta;
1598 { 1686
1599 SV *prev = SvRV (coro_current);
1600 prepare_schedule (aTHX_ ta); 1687 prepare_cede (aTHX_ &ta);
1601 api_ready (prev); 1688
1689 if (expect_true (ta.prev != ta.next))
1690 {
1691 TRANSFER (ta, 1);
1602 return 1; 1692 return 1;
1603 } 1693 }
1604 else 1694 else
1605 return 0; 1695 return 0;
1606} 1696}
1607 1697
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 1698static int
1619api_cede (void) 1699api_cede_notself (pTHX)
1620{ 1700{
1621 dTHX; 1701 if (coro_nready)
1702 {
1622 struct transfer_args ta; 1703 struct coro_transfer_args ta;
1623 1704
1624 prepare_cede (aTHX_ &ta); 1705 prepare_cede_notself (aTHX_ &ta);
1625
1626 if (expect_true (ta.prev != ta.next))
1627 {
1628 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1629 return 1; 1707 return 1;
1630 } 1708 }
1631 else 1709 else
1632 return 0; 1710 return 0;
1633} 1711}
1634 1712
1635static int
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 1713static void
1651api_trace (SV *coro_sv, int flags) 1714api_trace (pTHX_ SV *coro_sv, int flags)
1652{ 1715{
1653 dTHX;
1654 struct coro *coro = SvSTATE (coro_sv); 1716 struct coro *coro = SvSTATE (coro_sv);
1655 1717
1656 if (flags & CC_TRACE) 1718 if (flags & CC_TRACE)
1657 { 1719 {
1658 if (!coro->cctx) 1720 if (!coro->cctx)
1659 coro->cctx = cctx_new (); 1721 coro->cctx = cctx_new_run ();
1660 else if (!(coro->cctx->flags & CC_TRACE)) 1722 else if (!(coro->cctx->flags & CC_TRACE))
1661 croak ("cannot enable tracing on coroutine with custom stack"); 1723 croak ("cannot enable tracing on coroutine with custom stack");
1662 1724
1663 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1725 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1664 } 1726 }
… …
1725 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1787 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1726 double now = nvtime (); 1788 double now = nvtime ();
1727 1789
1728 if (now >= self->next) 1790 if (now >= self->next)
1729 { 1791 {
1730 api_cede (); 1792 api_cede (aTHX);
1731 self->next = now + self->every; 1793 self->next = now + self->every;
1732 } 1794 }
1733 1795
1734 return PerlIOBuf_flush (aTHX_ f); 1796 return PerlIOBuf_flush (aTHX_ f);
1735} 1797}
… …
1764 PerlIOBuf_get_ptr, 1826 PerlIOBuf_get_ptr,
1765 PerlIOBuf_get_cnt, 1827 PerlIOBuf_get_cnt,
1766 PerlIOBuf_set_ptrcnt, 1828 PerlIOBuf_set_ptrcnt,
1767}; 1829};
1768 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}
1769 2008
1770MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2009MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1771 2010
1772PROTOTYPES: DISABLE 2011PROTOTYPES: DISABLE
1773 2012
… …
1803 main_top_env = PL_top_env; 2042 main_top_env = PL_top_env;
1804 2043
1805 while (main_top_env->je_prev) 2044 while (main_top_env->je_prev)
1806 main_top_env = main_top_env->je_prev; 2045 main_top_env = main_top_env->je_prev;
1807 2046
1808 coroapi.ver = CORO_API_VERSION; 2047 coroapi.ver = CORO_API_VERSION;
1809 coroapi.rev = CORO_API_REVISION; 2048 coroapi.rev = CORO_API_REVISION;
1810 coroapi.transfer = api_transfer; 2049 coroapi.transfer = api_transfer;
2050 coroapi.execute_slf = api_execute_slf;
2051 coroapi.sv_state = SvSTATE_;
1811 2052
1812 { 2053 {
1813 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2054 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1814 2055
1815 if (!svp) croak ("Time::HiRes is required"); 2056 if (!svp) croak ("Time::HiRes is required");
… …
1848 av_push (coro->args, newSVsv (ST (i))); 2089 av_push (coro->args, newSVsv (ST (i)));
1849} 2090}
1850 OUTPUT: 2091 OUTPUT:
1851 RETVAL 2092 RETVAL
1852 2093
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 2094void
1857_set_stacklevel (...) 2095_set_stacklevel (...)
1858 ALIAS: 2096 CODE:
1859 Coro::State::transfer = 1
1860 Coro::schedule = 2
1861 Coro::cede = 3
1862 Coro::cede_notself = 4
1863 CODE:
1864{ 2097{
1865 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}
1866 2101
1867 PUTBACK; 2102void
1868 switch (ix) 2103transfer (...)
1869 { 2104 CODE:
1870 case 0: 2105{
1871 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2106 static struct CoroSLF slf = { slf_init_transfer, slf_prepare_transfer, slf_check_nop };
1872 ta.next = 0; 2107 api_execute_slf (aTHX_ cv, &slf, &ST (0), items);
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} 2108}
1904 2109
1905bool 2110bool
1906_destroy (SV *coro_sv) 2111_destroy (SV *coro_sv)
1907 CODE: 2112 CODE:
… …
2018 RETVAL = boolSV (coro->flags & ix); 2223 RETVAL = boolSV (coro->flags & ix);
2019 OUTPUT: 2224 OUTPUT:
2020 RETVAL 2225 RETVAL
2021 2226
2022void 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
2023api_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
2024 2237
2025SV * 2238SV *
2026has_cctx (Coro::State coro) 2239has_cctx (Coro::State coro)
2027 PROTOTYPE: $ 2240 PROTOTYPE: $
2028 CODE: 2241 CODE:
… …
2098 2311
2099 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2312 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2100 coro_ready[i] = newAV (); 2313 coro_ready[i] = newAV ();
2101 2314
2102 { 2315 {
2103 SV *sv = perl_get_sv ("Coro::API", TRUE); 2316 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2104 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2105 2317
2106 coroapi.schedule = api_schedule; 2318 coroapi.schedule = api_schedule;
2107 coroapi.cede = api_cede; 2319 coroapi.cede = api_cede;
2108 coroapi.cede_notself = api_cede_notself; 2320 coroapi.cede_notself = api_cede_notself;
2109 coroapi.ready = api_ready; 2321 coroapi.ready = api_ready;
2110 coroapi.is_ready = api_is_ready; 2322 coroapi.is_ready = api_is_ready;
2111 coroapi.nready = &coro_nready; 2323 coroapi.nready = coro_nready;
2112 coroapi.current = coro_current; 2324 coroapi.current = coro_current;
2113 2325
2114 GCoroAPI = &coroapi; 2326 GCoroAPI = &coroapi;
2115 sv_setiv (sv, (IV)&coroapi); 2327 sv_setiv (sv, (IV)&coroapi);
2116 SvREADONLY_on (sv); 2328 SvREADONLY_on (sv);
2117 } 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);
2118} 2354}
2119 2355
2120void 2356void
2121_set_current (SV *current) 2357_set_current (SV *current)
2122 PROTOTYPE: $ 2358 PROTOTYPE: $
… …
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