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.260 by root, Mon Nov 10 04:37:23 2008 UTC vs.
Revision 1.273 by root, Fri Nov 14 23:48:10 2008 UTC

46# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
47#endif 47#endif
48 48
49#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
51# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
52#else
53# define REGISTER_STACK(cctx,start,end)
54#endif 51#endif
55 52
56/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
57static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
58 55
119# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
120#endif 117#endif
121 118
122/* The next macros try to return the current stack pointer, in an as 119/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 120 * portable way as possible. */
124#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
125#define STACKLEVEL ((void *)&stacklevel) 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
126 126
127#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
128 128
129#if __GNUC__ >= 3 129#if __GNUC__ >= 3
130# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
131# define BARRIER __asm__ __volatile__ ("" : : : "memory")
132# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
133#else 133#else
134# define attribute(x) 134# define attribute(x)
135# define BARRIER
136# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
137#endif 137#endif
138 138
139#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
141 141
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; 186static volatile struct coro *transfer_next;
187 187
188struct transfer_args
189{
190 struct coro *prev, *next;
191};
192
193static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
194static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
195static SV *rv_diehook; 190static SV *rv_diehook;
196static SV *rv_warnhook; 191static SV *rv_warnhook;
197static HV *hv_sig; /* %SIG */ 192static HV *hv_sig; /* %SIG */
215 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
216 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
217}; 212};
218 213
219/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
220typedef struct coro_cctx { 215typedef struct coro_cctx
216{
221 struct coro_cctx *next; 217 struct coro_cctx *next;
222 218
223 /* the stack */ 219 /* the stack */
224 void *sptr; 220 void *sptr;
225 size_t ssize; 221 size_t ssize;
243 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
244 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
245}; 241};
246 242
247/* 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 */
248typedef struct { 244typedef struct
245{
249 SV *defsv; 246 SV *defsv;
250 AV *defav; 247 AV *defav;
251 SV *errsv; 248 SV *errsv;
252 SV *irsgv; 249 SV *irsgv;
253#define VAR(name,type) type name; 250#define VAR(name,type) type name;
257 254
258#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))
259 256
260/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
261struct coro { 258struct coro {
262 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 260 coro_cctx *cctx;
264 261
265 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
266 AV *mainstack; 264 AV *mainstack;
267 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
268 266
269 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
270 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
285 struct coro *next, *prev; 283 struct coro *next, *prev;
286}; 284};
287 285
288typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
289typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
290 290
291/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
292 292
293#define PRIO_MAX 3 293#define PRIO_MAX 3
294#define PRIO_HIGH 1 294#define PRIO_HIGH 1
299 299
300/* for Coro.pm */ 300/* for Coro.pm */
301static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook; 302static SV *coro_readyhook;
303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
304static int coro_nready;
305static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
306 306
307/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
308 308
309static SV * 309static SV *
310coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
413 : 0 413 : 0
414 414
415#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)
416#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)
417 417
418static struct coro * 418INLINE struct coro *
419SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
420{ 420{
421 HV *stash; 421 HV *stash;
422 MAGIC *mg; 422 MAGIC *mg;
423 423
514 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
515 } 515 }
516 516
517 PUTBACK; 517 PUTBACK;
518 } 518 }
519
520 slf_frame = c->slf_frame;
519} 521}
520 522
521static void 523static void
522save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
523{ 525{
526 c->slf_frame = slf_frame;
527
524 { 528 {
525 dSP; 529 dSP;
526 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
527 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
528 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
595 #undef VAR 599 #undef VAR
596 } 600 }
597} 601}
598 602
599/* 603/*
600 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
601 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
602 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
603 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
604 */ 608 */
605#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
807 811
808 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
809} 813}
810 814
811static 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
812coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
813{ 830{
814 /* 831 /*
815 * emulate part of the perl startup here. 832 * emulate part of the perl startup here.
816 */ 833 */
855 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
856 SPAGAIN; 873 SPAGAIN;
857 } 874 }
858 875
859 /* 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
860 * 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.
861 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
862 * so we ENTER here for symmetry.
863 */ 878 */
864 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 */
865} 881}
866 882
867static void 883static void
868coro_destruct (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
869{ 885{
898 SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
899 915
900 coro_destruct_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
901} 917}
902 918
903static void 919INLINE void
904free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
905{ 921{
906 if (expect_true (coro_mortal)) 922 if (expect_true (coro_mortal))
907 { 923 {
908 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
1033 TAINT_NOT; 1049 TAINT_NOT;
1034 return 0; 1050 return 0;
1035} 1051}
1036 1052
1037static void 1053static void
1038prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx) 1054prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1039{ 1055{
1040 ta->prev = (struct coro *)cctx; 1056 ta->prev = (struct coro *)cctx;
1041 ta->next = 0; 1057 ta->next = 0;
1042} 1058}
1043 1059
1068 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
1069 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1070 SPAGAIN; 1086 SPAGAIN;
1071} 1087}
1072 1088
1073/* the tail of transfer: execute stuff we can onyl do afetr a transfer */ 1089/* the tail of transfer: execute stuff we can only do after a transfer */
1074static void 1090INLINE void
1075transfer_tail (void) 1091transfer_tail (pTHX)
1076{ 1092{
1077 struct coro *next = (struct coro *)transfer_next; 1093 struct coro *next = (struct coro *)transfer_next;
1078 transfer_next = 0; //D for temporary assertion in transfer 1094 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1079 assert (("FATAL ERROR: internal error 1067 in Coro module, please report", next));//D 1095 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1080 1096
1081 free_coro_mortal (aTHX); 1097 free_coro_mortal (aTHX);
1082 UNLOCK; 1098 UNLOCK;
1083 1099
1084 if (expect_false (next->throw)) 1100 if (expect_false (next->throw))
1103# endif 1119# endif
1104#endif 1120#endif
1105 { 1121 {
1106 dTHX; 1122 dTHX;
1107 1123
1108 /* entersub called ENTER, but we never 'returned', undo that here */ 1124 /* normally we would need to skip the entersub here */
1109 LEAVE; 1125 /* not doing so will re-execute it, which is exactly what we want */
1110
1111 /* we now skip the entersub that did lead to transfer() */
1112 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
1113 1127
1114 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
1115 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
1116 1130
1117 /* cctx_run is the alternative tail of transfer() */ 1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1118 transfer_tail (); 1133 transfer_tail (aTHX);
1119 1134
1120 /* 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 */
1121 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
1122 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
1123 1138
1173 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
1174 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);
1175 1190
1176 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
1177 { 1192 {
1178# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
1179 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1180# endif 1195 #endif
1181 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1182 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1183 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
1184 } 1199 }
1185 else 1200 else
1186#endif 1201#endif
1187 { 1202 {
1188 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1189 New (0, cctx->sptr, cctx_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
1190 1205
1191 if (!cctx->sptr) 1206 if (!cctx->sptr)
1192 { 1207 {
1193 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1194 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
1195 } 1210 }
1196 1211
1197 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
1198 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
1199 } 1214 }
1200 1215
1201 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
1202 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);
1203 1221
1204 return cctx; 1222 return cctx;
1205} 1223}
1206 1224
1214 coro_destroy (&cctx->cctx); 1232 coro_destroy (&cctx->cctx);
1215 1233
1216 /* coro_transfer creates new, empty cctx's */ 1234 /* coro_transfer creates new, empty cctx's */
1217 if (cctx->sptr) 1235 if (cctx->sptr)
1218 { 1236 {
1219#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
1220 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1221#endif 1239 #endif
1222 1240
1223#if HAVE_MMAP 1241#if HAVE_MMAP
1224 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
1225 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
1226 else 1244 else
1253} 1271}
1254 1272
1255static void 1273static void
1256cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
1257{ 1275{
1258 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));
1259 1277
1260 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
1261 if (expect_false (cctx_idle >= cctx_max_idle)) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
1262 { 1280 {
1263 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
1278transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1279{ 1297{
1280 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1281 { 1299 {
1282 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1283 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,");
1284 1302
1285 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1286 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,");
1287 1305
1288 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1289 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,");
1290 1308
1291#if !PERL_VERSION_ATLEAST (5,10,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1292 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1293 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,");
1294#endif 1312#endif
1295 } 1313 }
1296} 1314}
1297 1315
1298/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1302 dSTACKLEVEL; 1320 dSTACKLEVEL;
1303 1321
1304 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
1305 if (expect_false (!next)) 1323 if (expect_false (!next))
1306 { 1324 {
1307 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = stacklevel;
1308 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 */
1309 } 1327 }
1310 else if (expect_true (prev != next)) 1328 else if (expect_true (prev != next))
1311 { 1329 {
1312 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
1337 else 1355 else
1338 load_perl (aTHX_ next); 1356 load_perl (aTHX_ next);
1339 1357
1340 prev__cctx = prev->cctx; 1358 prev__cctx = prev->cctx;
1341 1359
1342 /* possibly "free" the cctx */ 1360 /* possibly untie and reuse the cctx */
1343 if (expect_true ( 1361 if (expect_true (
1344 prev__cctx->idle_sp == STACKLEVEL 1362 prev__cctx->idle_sp == stacklevel
1345 && !(prev__cctx->flags & CC_TRACE) 1363 && !(prev__cctx->flags & CC_TRACE)
1346 && !force_cctx 1364 && !force_cctx
1347 )) 1365 ))
1348 { 1366 {
1349 /* 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 */
1350 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));
1351 1369
1352 prev->cctx = 0; 1370 prev->cctx = 0;
1353 1371
1354 /* 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 */
1355 /* 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 */
1363 ++next->usecount; 1381 ++next->usecount;
1364 1382
1365 if (expect_true (!next->cctx)) 1383 if (expect_true (!next->cctx))
1366 next->cctx = cctx_get (aTHX); 1384 next->cctx = cctx_get (aTHX);
1367 1385
1368 assert (("FATAL ERROR: internal error 1352 in Coro, please report", !transfer_next));//D 1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1369 transfer_next = next; 1387 transfer_next = next;
1370 1388
1371 if (expect_false (prev__cctx != next->cctx)) 1389 if (expect_false (prev__cctx != next->cctx))
1372 { 1390 {
1373 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1374 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1375 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1376 } 1394 }
1377 1395
1378 transfer_tail (); 1396 transfer_tail (aTHX);
1379 } 1397 }
1380} 1398}
1381 1399
1382#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))
1383#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1405 1423
1406 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1407 { 1425 {
1408 struct coro temp; 1426 struct coro temp;
1409 1427
1410 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1411 croak ("FATAL: tried to destroy currently running coroutine");
1412 1429
1413 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1414 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1415 1432
1416 coro_destruct (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1467# define MGf_DUP 0 1484# define MGf_DUP 0
1468#endif 1485#endif
1469}; 1486};
1470 1487
1471static void 1488static void
1472prepare_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)
1473{ 1490{
1474 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1475 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1476 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1477} 1494}
1478 1495
1479static void 1496static void
1480api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1481{ 1498{
1482 dTHX;
1483 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1484 1500
1485 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1486 TRANSFER (ta, 1); 1502 TRANSFER (ta, 1);
1487} 1503}
1488 1504
1505 1521
1506 return 0; 1522 return 0;
1507} 1523}
1508 1524
1509static int 1525static int
1510api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1511{ 1527{
1512 dTHX;
1513 struct coro *coro; 1528 struct coro *coro;
1514 SV *sv_hook; 1529 SV *sv_hook;
1515 void (*xs_hook)(void); 1530 void (*xs_hook)(void);
1516 1531
1517 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1555 1570
1556 return 1; 1571 return 1;
1557} 1572}
1558 1573
1559static int 1574static int
1560api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1561{ 1576{
1562 dTHX;
1563 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1564} 1578}
1565 1579
1566static void 1580INLINE void
1567prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1568{ 1582{
1569 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1570 1584
1571 for (;;) 1585 for (;;)
1572 { 1586 {
1610 1624
1611 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1612 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1613 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1614 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1615 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));
1616 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1617 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1618 1632
1619 LOCK; 1633 LOCK;
1620 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1622 UNLOCK; 1636 UNLOCK;
1623} 1637}
1624 1638
1625static void 1639INLINE void
1626prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1627{ 1641{
1628 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1629 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1630} 1644}
1631 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
1632static int 1669static int
1633prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1634{ 1671{
1635 if (coro_nready) 1672 struct coro_transfer_args ta;
1636 { 1673
1637 SV *prev = SvRV (coro_current);
1638 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1639 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1640 return 1; 1679 return 1;
1641 } 1680 }
1642 else 1681 else
1643 return 0; 1682 return 0;
1644} 1683}
1645 1684
1646static void
1647api_schedule (void)
1648{
1649 dTHX;
1650 struct transfer_args ta;
1651
1652 prepare_schedule (aTHX_ &ta);
1653 TRANSFER (ta, 1);
1654}
1655
1656static int 1685static int
1657api_cede (void) 1686api_cede_notself (pTHX)
1658{ 1687{
1659 dTHX; 1688 if (coro_nready)
1689 {
1660 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1661 1691
1662 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1663
1664 if (expect_true (ta.prev != ta.next))
1665 {
1666 TRANSFER (ta, 1); 1693 TRANSFER (ta, 1);
1667 return 1; 1694 return 1;
1668 } 1695 }
1669 else 1696 else
1670 return 0; 1697 return 0;
1671} 1698}
1672 1699
1673static int 1700static void
1674api_cede_notself (void)
1675{
1676 dTHX;
1677 struct transfer_args ta;
1678
1679 if (prepare_cede_notself (aTHX_ &ta))
1680 {
1681 TRANSFER (ta, 1);
1682 return 1;
1683 }
1684 else
1685 return 0;
1686}
1687
1688static void
1689api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1690{ 1702{
1691 dTHX;
1692 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1693 1704
1694 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1695 { 1706 {
1696 if (!coro->cctx) 1707 if (!coro->cctx)
1697 coro->cctx = cctx_new_run (); 1708 coro->cctx = cctx_new_run ();
1698 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1699 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1700 1711
1701 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1702 } 1713 }
1703 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1704 { 1715 {
1763 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1774 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1764 double now = nvtime (); 1775 double now = nvtime ();
1765 1776
1766 if (now >= self->next) 1777 if (now >= self->next)
1767 { 1778 {
1768 api_cede (); 1779 api_cede (aTHX);
1769 self->next = now + self->every; 1780 self->next = now + self->every;
1770 } 1781 }
1771 1782
1772 return PerlIOBuf_flush (aTHX_ f); 1783 return PerlIOBuf_flush (aTHX_ f);
1773} 1784}
1802 PerlIOBuf_get_ptr, 1813 PerlIOBuf_get_ptr,
1803 PerlIOBuf_get_cnt, 1814 PerlIOBuf_get_cnt,
1804 PerlIOBuf_set_ptrcnt, 1815 PerlIOBuf_set_ptrcnt,
1805}; 1816};
1806 1817
1818/*****************************************************************************/
1819
1820static const CV *slf_cv; /* for quick consistency check */
1821
1822static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1823static SV *slf_arg0;
1824static SV *slf_arg1;
1825static SV *slf_arg2;
1826
1827/* this restores the stack in the case we patched the entersub, to */
1828/* recreate the stack frame as perl will on following calls */
1829/* since entersub cleared the stack */
1830static OP *
1831pp_restore (pTHX)
1832{
1833 dSP;
1834
1835 PUSHMARK (SP);
1836
1837 EXTEND (SP, 3);
1838 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1839 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1840 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1841 PUSHs ((SV *)CvGV (slf_cv));
1842
1843 RETURNOP (slf_restore.op_first);
1844}
1845
1846static void
1847slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1848{
1849 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1850}
1851
1852static void
1853slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1854{
1855 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1856
1857 frame->prepare = slf_prepare_set_stacklevel;
1858 frame->check = slf_check_nop;
1859 frame->data = (void *)SvIV (arg [0]);
1860}
1861
1862static void
1863slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1864{
1865 SV **arg = (SV **)slf_frame.data;
1866
1867 prepare_transfer (ta, arg [0], arg [1]);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1875
1876 frame->prepare = slf_prepare_transfer;
1877 frame->check = slf_check_nop;
1878 frame->data = (void *)arg; /* let's hope it will stay valid */
1879}
1880
1881static void
1882slf_init_schedule (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1883{
1884 frame->prepare = prepare_schedule;
1885 frame->check = slf_check_nop;
1886}
1887
1888static void
1889slf_init_cede (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1890{
1891 frame->prepare = prepare_cede;
1892 frame->check = slf_check_nop;
1893}
1894
1895static void
1896slf_init_cede_notself (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1897{
1898 frame->prepare = prepare_cede_notself;
1899 frame->check = slf_check_nop;
1900}
1901
1902/* we hijack an hopefully unused CV flag for our purposes */
1903#define CVf_SLF 0x4000
1904
1905/*
1906 * these not obviously related functions are all rolled into one
1907 * function to increase chances that they all will call transfer with the same
1908 * stack offset
1909 * SLF stands for "schedule-like-function".
1910 */
1911static OP *
1912pp_slf (pTHX)
1913{
1914 I32 checkmark; /* mark SP to see how many elements check has pushed */
1915
1916 /* set up the slf frame, unless it has already been set-up */
1917 /* the latter happens when a new coro has been started */
1918 /* or when a new cctx was attached to an existing coroutine */
1919 if (expect_true (!slf_frame.prepare))
1920 {
1921 /* first iteration */
1922 dSP;
1923 SV **arg = PL_stack_base + TOPMARK + 1;
1924 int items = SP - arg; /* args without function object */
1925 SV *gv = *sp;
1926
1927 /* do a quick consistency check on the "function" object, and if it isn't */
1928 /* for us, divert to the real entersub */
1929 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1930 return PL_ppaddr[OP_ENTERSUB](aTHX);
1931
1932 /* pop args */
1933 SP = PL_stack_base + POPMARK;
1934
1935 if (!(PL_op->op_flags & OPf_STACKED))
1936 {
1937 /* ampersand-form of call, use @_ instead of stack */
1938 AV *av = GvAV (PL_defgv);
1939 arg = AvARRAY (av);
1940 items = AvFILLp (av) + 1;
1941 }
1942
1943 PUTBACK;
1944
1945 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr) (aTHX_ &slf_frame, arg, items);
1946 }
1947
1948 /* now interpret the slf_frame */
1949 /* we use a callback system not to make the code needlessly */
1950 /* complicated, but so we can run multiple perl coros from one cctx */
1951
1952 do
1953 {
1954 struct coro_transfer_args ta;
1955
1956 slf_frame.prepare (aTHX_ &ta);
1957 TRANSFER (ta, 0);
1958
1959 checkmark = PL_stack_sp - PL_stack_base;
1960 }
1961 while (slf_frame.check (aTHX_ &slf_frame));
1962
1963 {
1964 dSP;
1965 SV **bot = PL_stack_base + checkmark;
1966 int gimme = GIMME_V;
1967
1968 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1969
1970 /* make sure we put something on the stack in scalar context */
1971 if (gimme == G_SCALAR)
1972 {
1973 if (sp == bot)
1974 XPUSHs (&PL_sv_undef);
1975
1976 SP = bot + 1;
1977 }
1978
1979 PUTBACK;
1980 }
1981
1982 return NORMAL;
1983}
1984
1985static void
1986api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, SV **arg, int items)
1987{
1988 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1989
1990 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1991 && PL_op->op_ppaddr != pp_slf)
1992 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or other means, caught");
1993
1994 if (items > 3)
1995 croak ("Coro only supports up to three arguments to SLF functions currently, caught");
1996
1997 CvFLAGS (cv) |= CVf_SLF;
1998 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1999 slf_cv = cv;
2000
2001 /* we patch the op, and then re-run the whole call */
2002 /* we have to put the same argument on the stack for this to work */
2003 /* and this will be done by pp_restore */
2004 slf_restore.op_next = (OP *)&slf_restore;
2005 slf_restore.op_type = OP_NULL;
2006 slf_restore.op_ppaddr = pp_restore;
2007 slf_restore.op_first = PL_op;
2008
2009 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
2010 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2011 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
2012
2013 PL_op->op_ppaddr = pp_slf;
2014
2015 PL_op = (OP *)&slf_restore;
2016}
1807 2017
1808MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1809 2019
1810PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1811 2021
1841 main_top_env = PL_top_env; 2051 main_top_env = PL_top_env;
1842 2052
1843 while (main_top_env->je_prev) 2053 while (main_top_env->je_prev)
1844 main_top_env = main_top_env->je_prev; 2054 main_top_env = main_top_env->je_prev;
1845 2055
1846 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
1847 coroapi.rev = CORO_API_REVISION; 2057 coroapi.rev = CORO_API_REVISION;
2058
1848 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;
1849 2067
1850 { 2068 {
1851 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2069 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1852 2070
1853 if (!svp) croak ("Time::HiRes is required"); 2071 if (!svp) croak ("Time::HiRes is required");
1886 av_push (coro->args, newSVsv (ST (i))); 2104 av_push (coro->args, newSVsv (ST (i)));
1887} 2105}
1888 OUTPUT: 2106 OUTPUT:
1889 RETVAL 2107 RETVAL
1890 2108
1891# these not obviously related functions are all rolled into the same xs
1892# function to increase chances that they all will call transfer with the same
1893# stack offset
1894void 2109void
1895_set_stacklevel (...) 2110_set_stacklevel (...)
1896 ALIAS: 2111 CODE:
1897 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1898 Coro::schedule = 2
1899 Coro::cede = 3
1900 Coro::cede_notself = 4
1901 CODE:
1902{
1903 struct transfer_args ta;
1904 2113
1905 PUTBACK; 2114void
1906 switch (ix) 2115transfer (...)
1907 { 2116 CODE:
1908 case 0: 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1909 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (ST (0)));
1910 break;
1911
1912 case 1:
1913 if (items != 2)
1914 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1915
1916 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1917 break;
1918
1919 case 2:
1920 prepare_schedule (aTHX_ &ta);
1921 break;
1922
1923 case 3:
1924 prepare_cede (aTHX_ &ta);
1925 break;
1926
1927 case 4:
1928 if (!prepare_cede_notself (aTHX_ &ta))
1929 XSRETURN_EMPTY;
1930
1931 break;
1932 }
1933 SPAGAIN;
1934
1935 BARRIER;
1936 PUTBACK;
1937 TRANSFER (ta, 0);
1938 SPAGAIN; /* might be the sp of a different coroutine now */
1939 /* be extra careful not to ever do anything after TRANSFER */
1940}
1941 2118
1942bool 2119bool
1943_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
1944 CODE: 2121 CODE:
1945 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2063 SvREFCNT_dec (self->throw); 2240 SvREFCNT_dec (self->throw);
2064 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 2241 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2065 2242
2066void 2243void
2067api_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
2068 2246
2069SV * 2247SV *
2070has_cctx (Coro::State coro) 2248has_cctx (Coro::State coro)
2071 PROTOTYPE: $ 2249 PROTOTYPE: $
2072 CODE: 2250 CODE:
2107 PROTOTYPE: $ 2285 PROTOTYPE: $
2108 ALIAS: 2286 ALIAS:
2109 swap_defav = 1 2287 swap_defav = 1
2110 CODE: 2288 CODE:
2111 if (!self->slot) 2289 if (!self->slot)
2112 croak ("cannot swap state with coroutine that has no saved state"); 2290 croak ("cannot swap state with coroutine that has no saved state,");
2113 else 2291 else
2114 { 2292 {
2115 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv); 2293 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2116 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2294 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2117 2295
2142 2320
2143 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2321 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2144 coro_ready[i] = newAV (); 2322 coro_ready[i] = newAV ();
2145 2323
2146 { 2324 {
2147 SV *sv = perl_get_sv ("Coro::API", TRUE); 2325 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2148 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
2149 2326
2150 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
2151 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
2152 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
2153 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
2154 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
2155 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
2156 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
2157 2334
2158 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
2159 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
2160 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
2161 } 2338 }
2162} 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);
2163 2355
2164void 2356void
2165_set_current (SV *current) 2357_set_current (SV *current)
2166 PROTOTYPE: $ 2358 PROTOTYPE: $
2167 CODE: 2359 CODE:
2201 2393
2202SV * 2394SV *
2203ready (SV *self) 2395ready (SV *self)
2204 PROTOTYPE: $ 2396 PROTOTYPE: $
2205 CODE: 2397 CODE:
2206 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
2207 OUTPUT: 2399 OUTPUT:
2208 RETVAL 2400 RETVAL
2209 2401
2210int 2402int
2211nready (...) 2403nready (...)
2281 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2282 2474
2283 coro->prio = 0; 2475 coro->prio = 0;
2284 2476
2285 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2286 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
2287 2479
2288 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
2289} 2481}
2290 2482
2291#if 0 2483#if 0
2363 2555
2364 av_push (av, data_sv); 2556 av_push (av, data_sv);
2365 2557
2366 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2367 2559
2368 api_ready (self); 2560 api_ready (aTHX_ self);
2369} 2561}
2370 2562
2371void 2563void
2372_set_state (SV *state) 2564_set_state (SV *state)
2373 PROTOTYPE: $ 2565 PROTOTYPE: $
2398 PROTOTYPE: @ 2590 PROTOTYPE: @
2399 CODE: 2591 CODE:
2400{ 2592{
2401 static int incede; 2593 static int incede;
2402 2594
2403 api_cede_notself (); 2595 api_cede_notself (aTHX);
2404 2596
2405 ++incede; 2597 ++incede;
2406 while (coro_nready >= incede && api_cede ()) 2598 while (coro_nready >= incede && api_cede (aTHX))
2407 ; 2599 ;
2408 2600
2409 sv_setsv (sv_activity, &PL_sv_undef); 2601 sv_setsv (sv_activity, &PL_sv_undef);
2410 if (coro_nready >= incede) 2602 if (coro_nready >= incede)
2411 { 2603 {
2421 2613
2422MODULE = Coro::State PACKAGE = PerlIO::cede 2614MODULE = Coro::State PACKAGE = PerlIO::cede
2423 2615
2424BOOT: 2616BOOT:
2425 PerlIO_define_layer (aTHX_ &PerlIO_cede); 2617 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2618

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines