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.92 by root, Sun Nov 26 02:16:19 2006 UTC vs.
Revision 1.123 by root, Mon Dec 4 21:56:00 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c" 1#include "libcoro/coro.c"
4 2
5#include "EXTERN.h" 3#include "EXTERN.h"
6#include "perl.h" 4#include "perl.h"
7#include "XSUB.h" 5#include "XSUB.h"
8 6
9#include "patchlevel.h" 7#include "patchlevel.h"
10 8
11#if PERL_VERSION < 6 9#if USE_VALGRIND
10# include <valgrind/valgrind.h>
11#endif
12
13/* the maximum number of idle cctx that will be pooled */
14#define MAX_IDLE_CCTX 8
15
16#define PERL_VERSION_ATLEAST(a,b,c) \
17 (PERL_REVISION > (a) \
18 || (PERL_REVISION == (a) \
19 && (PERL_VERSION > (b) \
20 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
21
22#if !PERL_VERSION_ATLEAST (5,6,0)
12# ifndef PL_ppaddr 23# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr 24# define PL_ppaddr ppaddr
14# endif 25# endif
15# ifndef call_sv 26# ifndef call_sv
16# define call_sv perl_call_sv 27# define call_sv perl_call_sv
54# ifndef PAGESIZE 65# ifndef PAGESIZE
55# define PAGESIZE pagesize 66# define PAGESIZE pagesize
56# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE) 67# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
57static long pagesize; 68static long pagesize;
58# else 69# else
59# define BOOT_PAGESIZE 70# define BOOT_PAGESIZE (void)0
60# endif 71# endif
72#else
73# define PAGESIZE 0
74# define BOOT_PAGESIZE (void)0
61#endif 75#endif
62 76
63/* The next macro should declare a variable stacklevel that contains and approximation 77/* The next macro should declare a variable stacklevel that contains and approximation
64 * to the current C stack pointer. Its property is that it changes with each call 78 * to the current C stack pointer. Its property is that it changes with each call
65 * and should be unique. */ 79 * and should be unique. */
66#define dSTACKLEVEL int stacklevel 80#define dSTACKLEVEL int stacklevel
67#define STACKLEVEL ((void *)&stacklevel) 81#define STACKLEVEL ((void *)&stacklevel)
68 82
69#define IN_DESTRUCT (PL_main_cv == Nullcv) 83#define IN_DESTRUCT (PL_main_cv == Nullcv)
70 84
71#define labs(l) ((l) >= 0 ? (l) : -(l)) 85#if __GNUC__ >= 3
86# define attribute(x) __attribute__(x)
87#else
88# define attribute(x)
89#endif
90
91#define NOINLINE attribute ((noinline))
72 92
73#include "CoroAPI.h" 93#include "CoroAPI.h"
74
75#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
76 94
77#ifdef USE_ITHREADS 95#ifdef USE_ITHREADS
78static perl_mutex coro_mutex; 96static perl_mutex coro_mutex;
79# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 97# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
80# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 98# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
81#else 99#else
82# define LOCK (void)0 100# define LOCK (void)0
83# define UNLOCK (void)0 101# define UNLOCK (void)0
84#endif 102#endif
85 103
104struct io_state
105{
106 int errorno;
107 I32 laststype;
108 int laststatval;
109 Stat_t statcache;
110};
111
86static struct CoroAPI coroapi; 112static struct CoroAPI coroapi;
87static AV *main_mainstack; /* used to differentiate between $main and others */ 113static AV *main_mainstack; /* used to differentiate between $main and others */
88static HV *coro_state_stash, *coro_stash; 114static HV *coro_state_stash, *coro_stash;
89static SV *coro_mortal; /* will be freed after next transfer */ 115static SV *coro_mortal; /* will be freed after next transfer */
90 116
117static struct coro_cctx *cctx_first;
118static int cctx_count, cctx_idle;
119
91/* this is a structure representing a c-level coroutine */ 120/* this is a structure representing a c-level coroutine */
92typedef struct coro_stack { 121typedef struct coro_cctx {
93 struct coro_stack *next; 122 struct coro_cctx *next;
94 123
95 void *idle_sp; /* original stacklevel when coroutine was created */ 124 /* the stack */
96 void *sptr; 125 void *sptr;
97 long ssize; /* positive == mmap, otherwise malloc */ 126 long ssize; /* positive == mmap, otherwise malloc */
98 127
99 /* cpu state */ 128 /* cpu state */
129 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
130 JMPENV *top_env;
100 coro_context cctx; 131 coro_context cctx;
101 JMPENV *top_env;
102} coro_stack;
103 132
104/* the (fake) coro_stack representing the main program */ 133 int inuse;
105static coro_stack *main_stack; 134
135#if USE_VALGRIND
136 int valgrind_id;
137#endif
138} coro_cctx;
139
140enum {
141 CF_RUNNING = 0x0001, /* coroutine is running */
142 CF_READY = 0x0002, /* coroutine is ready */
143 CF_NEW = 0x0004, /* ahs never been switched to */
144};
106 145
107/* this is a structure representing a perl-level coroutine */ 146/* this is a structure representing a perl-level coroutine */
108struct coro { 147struct coro {
109 /* the c coroutine allocated to this perl coroutine, if any */ 148 /* the c coroutine allocated to this perl coroutine, if any */
110 coro_stack *stack; 149 coro_cctx *cctx;
111 150
112 /* data associated with this coroutine (initial args) */ 151 /* data associated with this coroutine (initial args) */
113 AV *args; 152 AV *args;
114 int refcnt; 153 int refcnt;
154 int save; /* CORO_SAVE flags */
155 int flags; /* CF_ flags */
115 156
116 /* optionally saved, might be zero */ 157 /* optionally saved, might be zero */
117 AV *defav; 158 AV *defav; /* @_ */
118 SV *defsv; 159 SV *defsv; /* $_ */
119 SV *errsv; 160 SV *errsv; /* $@ */
161 SV *irssv; /* $/ */
162 SV *irssv_sv; /* real $/ cache */
120 163
121 /* saved global state not related to stacks */ 164#define VAR(name,type) type name;
122 U8 dowarn; 165# include "state.h"
123 I32 in_eval; 166#undef VAR
124
125 /* the stacks and related info (callchain etc..) */
126 PERL_SI *curstackinfo;
127 AV *curstack;
128 AV *mainstack;
129 SV **stack_sp;
130 OP *op;
131 SV **curpad;
132 AV *comppad;
133 CV *compcv;
134 SV **stack_base;
135 SV **stack_max;
136 SV **tmps_stack;
137 I32 tmps_floor;
138 I32 tmps_ix;
139 I32 tmps_max;
140 I32 *markstack;
141 I32 *markstack_ptr;
142 I32 *markstack_max;
143 I32 *scopestack;
144 I32 scopestack_ix;
145 I32 scopestack_max;
146 ANY *savestack;
147 I32 savestack_ix;
148 I32 savestack_max;
149 OP **retstack;
150 I32 retstack_ix;
151 I32 retstack_max;
152 PMOP *curpm;
153 COP *curcop;
154 167
155 /* coro process data */ 168 /* coro process data */
156 int prio; 169 int prio;
157}; 170};
158 171
159typedef struct coro *Coro__State; 172typedef struct coro *Coro__State;
160typedef struct coro *Coro__State_or_hashref; 173typedef struct coro *Coro__State_or_hashref;
161 174
162static AV * 175static AV *
163coro_clone_padlist (pTHX_ CV *cv) 176coro_clone_padlist (CV *cv)
164{ 177{
165 AV *padlist = CvPADLIST (cv); 178 AV *padlist = CvPADLIST (cv);
166 AV *newpadlist, *newpad; 179 AV *newpadlist, *newpad;
167 180
168 newpadlist = newAV (); 181 newpadlist = newAV ();
169 AvREAL_off (newpadlist); 182 AvREAL_off (newpadlist);
170#if PERL_VERSION < 9 183#if PERL_VERSION_ATLEAST (5,9,0)
184 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
185#else
171 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 186 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
172#else
173 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
174#endif 187#endif
175 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 188 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
176 --AvFILLp (padlist); 189 --AvFILLp (padlist);
177 190
178 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 191 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
180 193
181 return newpadlist; 194 return newpadlist;
182} 195}
183 196
184static void 197static void
185free_padlist (pTHX_ AV *padlist) 198free_padlist (AV *padlist)
186{ 199{
187 /* may be during global destruction */ 200 /* may be during global destruction */
188 if (SvREFCNT (padlist)) 201 if (SvREFCNT (padlist))
189 { 202 {
190 I32 i = AvFILLp (padlist); 203 I32 i = AvFILLp (padlist);
211 AV *padlist; 224 AV *padlist;
212 AV *av = (AV *)mg->mg_obj; 225 AV *av = (AV *)mg->mg_obj;
213 226
214 /* casting is fun. */ 227 /* casting is fun. */
215 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 228 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
216 free_padlist (aTHX_ padlist); 229 free_padlist (padlist);
217 230
218 SvREFCNT_dec (av); 231 SvREFCNT_dec (av);
219 232
220 return 0; 233 return 0;
221} 234}
222 235
223#define PERL_MAGIC_coro PERL_MAGIC_ext 236#define PERL_MAGIC_coro PERL_MAGIC_ext
224 237
225static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 238static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
226 239
240#define CORO_MAGIC(cv) \
241 SvMAGIC (cv) \
242 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
243 ? SvMAGIC (cv) \
244 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
245 : 0
246
227/* the next two functions merely cache the padlists */ 247/* the next two functions merely cache the padlists */
228static void 248static void
229get_padlist (pTHX_ CV *cv) 249get_padlist (CV *cv)
230{ 250{
231 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 251 MAGIC *mg = CORO_MAGIC (cv);
252 AV *av;
232 253
233 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 254 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
234 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 255 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
235 else 256 else
236 { 257 {
237#if 0 258#if 0
238 /* this should work - but it doesn't :( */ 259 /* this is probably cleaner, but also slower? */
239 CV *cp = Perl_cv_clone (aTHX_ cv); 260 CV *cp = Perl_cv_clone (cv);
240 CvPADLIST (cv) = CvPADLIST (cp); 261 CvPADLIST (cv) = CvPADLIST (cp);
241 CvPADLIST (cp) = 0; 262 CvPADLIST (cp) = 0;
242 SvREFCNT_dec (cp); 263 SvREFCNT_dec (cp);
243#else 264#else
244 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 265 CvPADLIST (cv) = coro_clone_padlist (cv);
245#endif 266#endif
246 } 267 }
247} 268}
248 269
249static void 270static void
250put_padlist (pTHX_ CV *cv) 271put_padlist (CV *cv)
251{ 272{
252 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 273 MAGIC *mg = CORO_MAGIC (cv);
274 AV *av;
253 275
254 if (!mg) 276 if (!mg)
255 { 277 {
256 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 278 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
257 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 279 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
258 mg->mg_virtual = &vtbl_coro; 280 mg->mg_virtual = &vtbl_coro;
259 mg->mg_obj = (SV *)newAV (); 281 mg->mg_obj = (SV *)newAV ();
260 } 282 }
261 283
262 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv)); 284 av = (AV *)mg->mg_obj;
285
286 if (AvFILLp (av) >= AvMAX (av))
287 av_extend (av, AvMAX (av) + 1);
288
289 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
263} 290}
264 291
265#define SB do { 292#define SB do {
266#define SE } while (0) 293#define SE } while (0)
267 294
268#define LOAD(state) load_state(aTHX_ (state));
269#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
270
271#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 295#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
272 296
273static void 297static void
274load_state(pTHX_ Coro__State c) 298load_perl (Coro__State c)
275{ 299{
276 PL_dowarn = c->dowarn; 300#define VAR(name,type) PL_ ## name = c->name;
277 PL_in_eval = c->in_eval; 301# include "state.h"
278 302#undef VAR
279 PL_curstackinfo = c->curstackinfo;
280 PL_curstack = c->curstack;
281 PL_mainstack = c->mainstack;
282 PL_stack_sp = c->stack_sp;
283 PL_op = c->op;
284 PL_curpad = c->curpad;
285 PL_comppad = c->comppad;
286 PL_compcv = c->compcv;
287 PL_stack_base = c->stack_base;
288 PL_stack_max = c->stack_max;
289 PL_tmps_stack = c->tmps_stack;
290 PL_tmps_floor = c->tmps_floor;
291 PL_tmps_ix = c->tmps_ix;
292 PL_tmps_max = c->tmps_max;
293 PL_markstack = c->markstack;
294 PL_markstack_ptr = c->markstack_ptr;
295 PL_markstack_max = c->markstack_max;
296 PL_scopestack = c->scopestack;
297 PL_scopestack_ix = c->scopestack_ix;
298 PL_scopestack_max = c->scopestack_max;
299 PL_savestack = c->savestack;
300 PL_savestack_ix = c->savestack_ix;
301 PL_savestack_max = c->savestack_max;
302#if PERL_VERSION < 9
303 PL_retstack = c->retstack;
304 PL_retstack_ix = c->retstack_ix;
305 PL_retstack_max = c->retstack_max;
306#endif
307 PL_curpm = c->curpm;
308 PL_curcop = c->curcop;
309 303
310 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 304 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
311 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 305 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
312 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 306 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
307 if (c->irssv)
308 {
309 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
310 SvREFCNT_dec (c->irssv);
311 else
312 {
313 REPLACE_SV (PL_rs, c->irssv);
314 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
315 sv_setsv (c->irssv_sv, PL_rs);
316 }
317 }
313 318
314 { 319 {
315 dSP; 320 dSP;
316 CV *cv; 321 CV *cv;
317 322
318 /* now do the ugly restore mess */ 323 /* now do the ugly restore mess */
319 while ((cv = (CV *)POPs)) 324 while ((cv = (CV *)POPs))
320 { 325 {
321 AV *padlist = (AV *)POPs;
322
323 if (padlist)
324 {
325 put_padlist (aTHX_ cv); /* mark this padlist as available */ 326 put_padlist (cv); /* mark this padlist as available */
326 CvPADLIST(cv) = padlist; 327 CvDEPTH (cv) = PTR2IV (POPs);
327 } 328 CvPADLIST (cv) = (AV *)POPs;
328
329 ++CvDEPTH(cv);
330 } 329 }
331 330
332 PUTBACK; 331 PUTBACK;
333 } 332 }
334} 333}
335 334
336static void 335static void
337save_state(pTHX_ Coro__State c, int flags) 336save_perl (Coro__State c)
338{ 337{
339 { 338 {
340 dSP; 339 dSP;
341 I32 cxix = cxstack_ix; 340 I32 cxix = cxstack_ix;
342 PERL_CONTEXT *ccstk = cxstack; 341 PERL_CONTEXT *ccstk = cxstack;
353 { 352 {
354 while (cxix >= 0) 353 while (cxix >= 0)
355 { 354 {
356 PERL_CONTEXT *cx = &ccstk[cxix--]; 355 PERL_CONTEXT *cx = &ccstk[cxix--];
357 356
358 if (CxTYPE(cx) == CXt_SUB) 357 if (CxTYPE (cx) == CXt_SUB)
359 { 358 {
360 CV *cv = cx->blk_sub.cv; 359 CV *cv = cx->blk_sub.cv;
360
361 if (CvDEPTH(cv)) 361 if (CvDEPTH (cv))
362 { 362 {
363 EXTEND (SP, CvDEPTH(cv)*2); 363 EXTEND (SP, 3);
364 364
365 while (--CvDEPTH(cv))
366 {
367 /* this tells the restore code to increment CvDEPTH */
368 PUSHs (Nullsv);
369 PUSHs ((SV *)cv);
370 }
371
372 PUSHs ((SV *)CvPADLIST(cv)); 365 PUSHs ((SV *)CvPADLIST (cv));
366 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
373 PUSHs ((SV *)cv); 367 PUSHs ((SV *)cv);
374 368
369 CvDEPTH (cv) = 0;
375 get_padlist (aTHX_ cv); 370 get_padlist (cv);
376 } 371 }
377 } 372 }
378#ifdef CXt_FORMAT 373#ifdef CXt_FORMAT
379 else if (CxTYPE(cx) == CXt_FORMAT) 374 else if (CxTYPE (cx) == CXt_FORMAT)
380 { 375 {
381 /* I never used formats, so how should I know how these are implemented? */ 376 /* I never used formats, so how should I know how these are implemented? */
382 /* my bold guess is as a simple, plain sub... */ 377 /* my bold guess is as a simple, plain sub... */
383 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 378 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
384 } 379 }
394 } 389 }
395 390
396 PUTBACK; 391 PUTBACK;
397 } 392 }
398 393
399 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 394 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
400 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 395 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
401 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 396 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
397 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
402 398
403 c->dowarn = PL_dowarn; 399#define VAR(name,type)c->name = PL_ ## name;
404 c->in_eval = PL_in_eval; 400# include "state.h"
405 401#undef VAR
406 c->curstackinfo = PL_curstackinfo;
407 c->curstack = PL_curstack;
408 c->mainstack = PL_mainstack;
409 c->stack_sp = PL_stack_sp;
410 c->op = PL_op;
411 c->curpad = PL_curpad;
412 c->comppad = PL_comppad;
413 c->compcv = PL_compcv;
414 c->stack_base = PL_stack_base;
415 c->stack_max = PL_stack_max;
416 c->tmps_stack = PL_tmps_stack;
417 c->tmps_floor = PL_tmps_floor;
418 c->tmps_ix = PL_tmps_ix;
419 c->tmps_max = PL_tmps_max;
420 c->markstack = PL_markstack;
421 c->markstack_ptr = PL_markstack_ptr;
422 c->markstack_max = PL_markstack_max;
423 c->scopestack = PL_scopestack;
424 c->scopestack_ix = PL_scopestack_ix;
425 c->scopestack_max = PL_scopestack_max;
426 c->savestack = PL_savestack;
427 c->savestack_ix = PL_savestack_ix;
428 c->savestack_max = PL_savestack_max;
429#if PERL_VERSION < 9
430 c->retstack = PL_retstack;
431 c->retstack_ix = PL_retstack_ix;
432 c->retstack_max = PL_retstack_max;
433#endif
434 c->curpm = PL_curpm;
435 c->curcop = PL_curcop;
436} 402}
437 403
438/* 404/*
439 * allocate various perl stacks. This is an exact copy 405 * allocate various perl stacks. This is an exact copy
440 * of perl.c:init_stacks, except that it uses less memory 406 * of perl.c:init_stacks, except that it uses less memory
441 * on the (sometimes correct) assumption that coroutines do 407 * on the (sometimes correct) assumption that coroutines do
442 * not usually need a lot of stackspace. 408 * not usually need a lot of stackspace.
443 */ 409 */
444static void 410static void
445coro_init_stacks (pTHX) 411coro_init_stacks ()
446{ 412{
447 LOCK;
448
449 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 413 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
450 PL_curstackinfo->si_type = PERLSI_MAIN; 414 PL_curstackinfo->si_type = PERLSI_MAIN;
451 PL_curstack = PL_curstackinfo->si_stack; 415 PL_curstack = PL_curstackinfo->si_stack;
452 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 416 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
453 417
454 PL_stack_base = AvARRAY(PL_curstack); 418 PL_stack_base = AvARRAY(PL_curstack);
455 PL_stack_sp = PL_stack_base; 419 PL_stack_sp = PL_stack_base;
456 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 420 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
457 421
458 New(50,PL_tmps_stack,96,SV*); 422 New(50,PL_tmps_stack,128,SV*);
459 PL_tmps_floor = -1; 423 PL_tmps_floor = -1;
460 PL_tmps_ix = -1; 424 PL_tmps_ix = -1;
461 PL_tmps_max = 96; 425 PL_tmps_max = 128;
462 426
463 New(54,PL_markstack,16,I32); 427 New(54,PL_markstack,32,I32);
464 PL_markstack_ptr = PL_markstack; 428 PL_markstack_ptr = PL_markstack;
465 PL_markstack_max = PL_markstack + 16; 429 PL_markstack_max = PL_markstack + 32;
466 430
467#ifdef SET_MARK_OFFSET 431#ifdef SET_MARK_OFFSET
468 SET_MARK_OFFSET; 432 SET_MARK_OFFSET;
469#endif 433#endif
470 434
471 New(54,PL_scopestack,16,I32); 435 New(54,PL_scopestack,32,I32);
472 PL_scopestack_ix = 0; 436 PL_scopestack_ix = 0;
473 PL_scopestack_max = 16; 437 PL_scopestack_max = 32;
474 438
475 New(54,PL_savestack,96,ANY); 439 New(54,PL_savestack,64,ANY);
476 PL_savestack_ix = 0; 440 PL_savestack_ix = 0;
477 PL_savestack_max = 96; 441 PL_savestack_max = 64;
478 442
479#if PERL_VERSION < 9 443#if !PERL_VERSION_ATLEAST (5,9,0)
480 New(54,PL_retstack,8,OP*); 444 New(54,PL_retstack,16,OP*);
481 PL_retstack_ix = 0; 445 PL_retstack_ix = 0;
482 PL_retstack_max = 8; 446 PL_retstack_max = 16;
483#endif 447#endif
484
485 UNLOCK;
486} 448}
487 449
488/* 450/*
489 * destroy the stacks, the callchain etc... 451 * destroy the stacks, the callchain etc...
490 */ 452 */
491static void 453static void
492destroy_stacks(pTHX) 454coro_destroy_stacks ()
493{ 455{
494 if (!IN_DESTRUCT) 456 if (!IN_DESTRUCT)
495 { 457 {
496 /* is this ugly, I ask? */ 458 /* is this ugly, I ask? */
497 LEAVE_SCOPE (0); 459 LEAVE_SCOPE (0);
528 490
529 Safefree (PL_tmps_stack); 491 Safefree (PL_tmps_stack);
530 Safefree (PL_markstack); 492 Safefree (PL_markstack);
531 Safefree (PL_scopestack); 493 Safefree (PL_scopestack);
532 Safefree (PL_savestack); 494 Safefree (PL_savestack);
533#if PERL_VERSION < 9 495#if !PERL_VERSION_ATLEAST (5,9,0)
534 Safefree (PL_retstack); 496 Safefree (PL_retstack);
535#endif 497#endif
536} 498}
537 499
538static void 500static void
539setup_coro (struct coro *coro) 501setup_coro (struct coro *coro)
540{ 502{
541 /* 503 /*
542 * emulate part of the perl startup here. 504 * emulate part of the perl startup here.
543 */ 505 */
544 dTHX;
545 dSP;
546 UNOP myop;
547 SV *sub_init = (SV *)get_cv ("Coro::State::coro_init", FALSE);
548 506
549 coro_init_stacks (aTHX); 507 coro_init_stacks ();
550 /*PL_curcop = 0;*/ 508
551 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 509 PL_curcop = &PL_compiling;
510 PL_in_eval = EVAL_NULL;
511 PL_curpm = 0;
512 PL_localizing = 0;
513 PL_dirty = 0;
514 PL_restartop = 0;
515
516 {
517 dSP;
518 LOGOP myop;
519
552 SvREFCNT_dec (GvAV (PL_defgv)); 520 SvREFCNT_dec (GvAV (PL_defgv));
553 GvAV (PL_defgv) = coro->args; coro->args = 0; 521 GvAV (PL_defgv) = coro->args; coro->args = 0;
554 522
555 SPAGAIN;
556
557 Zero (&myop, 1, UNOP); 523 Zero (&myop, 1, LOGOP);
558 myop.op_next = Nullop; 524 myop.op_next = Nullop;
559 myop.op_flags = OPf_WANT_VOID; 525 myop.op_flags = OPf_WANT_VOID;
560 526
527 PUSHMARK (SP);
528 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
529 PUTBACK;
561 PL_op = (OP *)&myop; 530 PL_op = (OP *)&myop;
562
563 PUSHMARK(SP);
564 XPUSHs (sub_init);
565 PUTBACK;
566 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 531 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
567 SPAGAIN; 532 SPAGAIN;
533 }
568 534
569 ENTER; /* necessary e.g. for dounwind */ 535 ENTER; /* necessary e.g. for dounwind */
570} 536}
571 537
572static void 538static void
577 SvREFCNT_dec (coro_mortal); 543 SvREFCNT_dec (coro_mortal);
578 coro_mortal = 0; 544 coro_mortal = 0;
579 } 545 }
580} 546}
581 547
548/* inject a fake call to Coro::State::_cctx_init into the execution */
549static void NOINLINE
550prepare_cctx (coro_cctx *cctx)
551{
552 dSP;
553 LOGOP myop;
554
555 Zero (&myop, 1, LOGOP);
556 myop.op_next = PL_op;
557 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
558
559 PUSHMARK (SP);
560 EXTEND (SP, 2);
561 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
562 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
563 PUTBACK;
564 PL_op = (OP *)&myop;
565 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
566 SPAGAIN;
567}
568
582static void 569static void
583coro_run (void *arg) 570coro_run (void *arg)
584{ 571{
572 /* coro_run is the alternative tail of transfer(), so unlock here. */
573 UNLOCK;
574
585 /* 575 /*
586 * this is a _very_ stripped down perl interpreter ;) 576 * this is a _very_ stripped down perl interpreter ;)
587 */ 577 */
588 dTHX;
589 PL_top_env = &PL_start_env; 578 PL_top_env = &PL_start_env;
590 579
591 UNLOCK; 580 /* inject call to cctx_init */
581 prepare_cctx ((coro_cctx *)arg);
592 582
593 sv_setiv (get_sv ("Coro::State::cctx_stack", FALSE), PTR2IV ((coro_stack *)arg));
594 sv_setiv (get_sv ("Coro::State::cctx_restartop", FALSE), PTR2IV (PL_op));
595 PL_restartop = CvSTART (get_cv ("Coro::State::cctx_init", FALSE));
596
597 /* somebody will hit me for both perl_run and PL_restart_op */ 583 /* somebody will hit me for both perl_run and PL_restartop */
598 perl_run (aTHX_ PERL_GET_CONTEXT); 584 PL_restartop = PL_op;
585 perl_run (PL_curinterp);
599 586
587 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
600 abort (); 588 abort ();
601} 589}
602 590
603static coro_stack * 591static coro_cctx *
604stack_new () 592cctx_new ()
605{ 593{
606 coro_stack *stack; 594 coro_cctx *cctx;
607 595
596 ++cctx_count;
597
608 New (0, stack, 1, coro_stack); 598 New (0, cctx, 1, coro_cctx);
609 599
610#if HAVE_MMAP 600#if HAVE_MMAP
611 601
612 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */ 602 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
603 /* mmap supposedly does allocate-on-write for us */
613 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 604 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
614 605
615 if (stack->sptr == (void *)-1) 606 if (cctx->sptr == (void *)-1)
616 { 607 {
617 perror ("FATAL: unable to mmap stack for coroutine"); 608 perror ("FATAL: unable to mmap stack for coroutine");
618 _exit (EXIT_FAILURE); 609 _exit (EXIT_FAILURE);
619 } 610 }
620 611
612# if STACKGUARD
621 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 613 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
614# endif
622 615
623#else 616#else
624 617
625 stack->ssize = STACKSIZE * (long)sizeof (long); 618 cctx->ssize = STACKSIZE * (long)sizeof (long);
626 New (0, stack->sptr, STACKSIZE, long); 619 New (0, cctx->sptr, STACKSIZE, long);
627 620
628 if (!stack->sptr) 621 if (!cctx->sptr)
629 { 622 {
630 perror (stderr, "FATAL: unable to malloc stack for coroutine"); 623 perror ("FATAL: unable to malloc stack for coroutine");
631 _exit (EXIT_FAILURE); 624 _exit (EXIT_FAILURE);
632 } 625 }
633 626
634#endif 627#endif
635 628
629#if USE_VALGRIND
630 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
631 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
632 cctx->ssize + (char *)cctx->sptr
633 );
634#endif
635
636 coro_create (&stack->cctx, coro_run, (void *)stack, stack->sptr, stack->ssize); 636 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);
637 637
638 return stack; 638 return cctx;
639} 639}
640 640
641static void 641static void
642stack_free (coro_stack *stack) 642cctx_destroy (coro_cctx *cctx)
643{ 643{
644 if (!stack || stack == main_stack) 644 if (!cctx)
645 return; 645 return;
646 646
647 --cctx_count;
648
649#if USE_VALGRIND
650 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
651#endif
652
647#if HAVE_MMAP 653#if HAVE_MMAP
648 munmap (stack->sptr, stack->ssize); 654 munmap (cctx->sptr, cctx->ssize);
649#else 655#else
650 Safefree (stack->sptr); 656 Safefree (cctx->sptr);
651#endif 657#endif
652 658
653 Safefree (stack); 659 Safefree (cctx);
654} 660}
655 661
656static coro_stack *stack_first;
657
658static coro_stack * 662static coro_cctx *
659stack_get () 663cctx_get ()
660{ 664{
661 coro_stack *stack; 665 coro_cctx *cctx;
662 666
663 if (stack_first) 667 if (cctx_first)
664 { 668 {
665 stack = stack_first; 669 cctx = cctx_first;
666 stack_first = stack->next; 670 cctx_first = cctx->next;
671 --cctx_idle;
667 } 672 }
668 else 673 else
669 { 674 {
670 stack = stack_new (); 675 cctx = cctx_new ();
671 PL_op = PL_op->op_next; 676 PL_op = PL_op->op_next;
672 } 677 }
673 678
674 return stack; 679 return cctx;
675} 680}
676 681
677static void 682static void
678stack_put (coro_stack *stack) 683cctx_put (coro_cctx *cctx)
679{ 684{
680 stack->next = stack_first; 685 /* free another cctx if overlimit */
681 stack_first = stack; 686 if (cctx_idle >= MAX_IDLE_CCTX)
687 {
688 coro_cctx *first = cctx_first;
689 cctx_first = first->next;
690 --cctx_idle;
691
692 assert (!first->inuse);
693 cctx_destroy (first);
694 }
695
696 ++cctx_idle;
697 cctx->next = cctx_first;
698 cctx_first = cctx;
682} 699}
683 700
684/* never call directly, always through the coro_state_transfer global variable */ 701/* never call directly, always through the coro_state_transfer global variable */
685static void 702static void NOINLINE
686transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags) 703transfer (struct coro *prev, struct coro *next)
687{ 704{
688 dSTACKLEVEL; 705 dSTACKLEVEL;
689 706
690 /* sometimes transfer is only called to set idle_sp */ 707 /* sometimes transfer is only called to set idle_sp */
691 if (flags == TRANSFER_SET_STACKLEVEL) 708 if (!next)
692 ((coro_stack *)prev)->idle_sp = STACKLEVEL; 709 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
693 else if (prev != next) 710 else if (prev != next)
694 { 711 {
695 coro_stack *prev__stack; 712 coro_cctx *prev__cctx;
713
714 if (prev->flags & CF_NEW)
715 {
716 /* create a new empty context */
717 Newz (0, prev->cctx, 1, coro_cctx);
718 prev->cctx->inuse = 1;
719 prev->flags &= ~CF_NEW;
720 prev->flags |= CF_RUNNING;
721 }
722
723 /*TODO: must not croak here */
724 if (!prev->flags & CF_RUNNING)
725 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
726
727 if (next->flags & CF_RUNNING)
728 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
729
730 prev->flags &= ~CF_RUNNING;
731 next->flags |= CF_RUNNING;
696 732
697 LOCK; 733 LOCK;
698 734
699 if (next->mainstack) 735 if (next->flags & CF_NEW)
700 { 736 {
701 /* coroutine already started */ 737 /* need to start coroutine */
702 SAVE (prev, flags); 738 next->flags &= ~CF_NEW;
703 LOAD (next); 739 /* first get rid of the old state */
740 save_perl (prev);
741 /* setup coroutine call */
742 setup_coro (next);
743 /* need a new stack */
744 assert (!next->stack);
704 } 745 }
705 else 746 else
706 { 747 {
707 /* need to start coroutine */ 748 /* coroutine already started */
708 /* first get rid of the old state */ 749 save_perl (prev);
709 SAVE (prev, -1); 750 load_perl (next);
710 /* setup coroutine call */
711 setup_coro (next);
712 /* need a stack */
713 next->stack = 0;
714 } 751 }
715 752
716 prev__stack = prev->stack; 753 prev__cctx = prev->cctx;
717 754
718 /* possibly "free" the stack */ 755 /* possibly "free" the cctx */
719 if (prev__stack->idle_sp == STACKLEVEL) 756 if (prev__cctx->idle_sp == STACKLEVEL)
720 { 757 {
721 stack_put (prev__stack); 758 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
759 assert (PL_top_env == prev__cctx->top_env);
760
722 prev->stack = 0; 761 prev->cctx = 0;
762
763 cctx_put (prev__cctx);
764 prev__cctx->inuse = 0;
723 } 765 }
724 766
725 if (!next->stack) 767 if (!next->cctx)
726 next->stack = stack_get ();
727
728 if (prev__stack != next->stack)
729 { 768 {
769 next->cctx = cctx_get ();
770 assert (!next->cctx->inuse);
771 next->cctx->inuse = 1;
772 }
773
774 if (prev__cctx != next->cctx)
775 {
730 prev__stack->top_env = PL_top_env; 776 prev__cctx->top_env = PL_top_env;
731 PL_top_env = next->stack->top_env; 777 PL_top_env = next->cctx->top_env;
732 coro_transfer (&prev__stack->cctx, &next->stack->cctx); 778 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
733 } 779 }
734 780
735 free_coro_mortal (); 781 free_coro_mortal ();
736 782
737 UNLOCK; 783 UNLOCK;
738 } 784 }
739} 785}
740 786
741/* use this function pointer to call the above function */
742/* this is done to increase chances of the compiler not inlining the call */
743/* not static to make it even harder for the compiler (and theoretically impossible in most cases */
744void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
745
746struct transfer_args 787struct transfer_args
747{ 788{
748 struct coro *prev, *next; 789 struct coro *prev, *next;
749 int flags;
750}; 790};
751 791
752#define TRANSFER(ta) coro_state_transfer ((ta).prev, (ta).next, (ta).flags) 792#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
753 793
754static void 794static void
755coro_state_destroy (struct coro *coro) 795coro_state_destroy (struct coro *coro)
756{ 796{
757 if (coro->refcnt--) 797 if (coro->refcnt--)
758 return; 798 return;
759 799
760 if (coro->mainstack && coro->mainstack != main_mainstack) 800 if (coro->mainstack && coro->mainstack != main_mainstack)
761 { 801 {
762 struct coro temp; 802 struct coro temp;
803 Zero (&temp, 1, struct coro);
804 temp.save = CORO_SAVE_ALL;
763 805
764 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL); 806 if (coro->flags & CF_RUNNING)
765 LOAD (aTHX_ coro); 807 croak ("FATAL: tried to destroy currently running coroutine");
766 808
809 save_perl (&temp);
810 load_perl (coro);
811
767 destroy_stacks (aTHX); 812 coro_destroy_stacks ();
768 813
769 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 814 load_perl (&temp); /* this will get rid of defsv etc.. */
770 815
771 coro->mainstack = 0; 816 coro->mainstack = 0;
772 } 817 }
773 818
774 stack_free (coro->stack); 819 cctx_destroy (coro->cctx);
775 SvREFCNT_dec (coro->args); 820 SvREFCNT_dec (coro->args);
776 Safefree (coro); 821 Safefree (coro);
777} 822}
778 823
779static int 824static int
780coro_state_clear (SV *sv, MAGIC *mg) 825coro_state_clear (pTHX_ SV *sv, MAGIC *mg)
781{ 826{
782 struct coro *coro = (struct coro *)mg->mg_ptr; 827 struct coro *coro = (struct coro *)mg->mg_ptr;
783 mg->mg_ptr = 0; 828 mg->mg_ptr = 0;
784 829
785 coro_state_destroy (coro); 830 coro_state_destroy (coro);
786 831
787 return 0; 832 return 0;
788} 833}
789 834
790static int 835static int
791coro_state_dup (MAGIC *mg, CLONE_PARAMS *params) 836coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
792{ 837{
793 struct coro *coro = (struct coro *)mg->mg_ptr; 838 struct coro *coro = (struct coro *)mg->mg_ptr;
794 839
795 ++coro->refcnt; 840 ++coro->refcnt;
796 841
797 return 0; 842 return 0;
798} 843}
799 844
800static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, coro_state_clear, 0, coro_state_dup, 0 }; 845static MGVTBL coro_state_vtbl = {
846 0, 0, 0, 0,
847 coro_state_clear,
848 0,
849#ifdef MGf_DUP
850 coro_state_dup,
851#else
852# define MGf_DUP 0
853#endif
854};
801 855
802static struct coro * 856static struct coro *
803SvSTATE (SV *coro) 857SvSTATE (SV *coro)
804{ 858{
805 HV *stash; 859 HV *stash;
820 assert (mg->mg_type == PERL_MAGIC_ext); 874 assert (mg->mg_type == PERL_MAGIC_ext);
821 return (struct coro *)mg->mg_ptr; 875 return (struct coro *)mg->mg_ptr;
822} 876}
823 877
824static void 878static void
825prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev, SV *next, int flags) 879prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
826{ 880{
827 ta->prev = SvSTATE (prev); 881 ta->prev = SvSTATE (prev_sv);
828 ta->next = SvSTATE (next); 882 ta->next = SvSTATE (next_sv);
829 ta->flags = flags;
830} 883}
831 884
832static void 885static void
833api_transfer (SV *prev, SV *next, int flags) 886api_transfer (SV *prev_sv, SV *next_sv)
834{ 887{
835 dTHX;
836 struct transfer_args ta; 888 struct transfer_args ta;
837 889
838 prepare_transfer (aTHX_ &ta, prev, next, flags); 890 prepare_transfer (&ta, prev_sv, next_sv);
839 TRANSFER (ta); 891 TRANSFER (ta);
892}
893
894static int
895api_save (SV *coro_sv, int new_save)
896{
897 struct coro *coro = SvSTATE (coro_sv);
898 int old_save = coro->save;
899
900 if (new_save >= 0)
901 coro->save = new_save;
902
903 return old_save;
840} 904}
841 905
842/** Coro ********************************************************************/ 906/** Coro ********************************************************************/
843 907
844#define PRIO_MAX 3 908#define PRIO_MAX 3
847#define PRIO_LOW -1 911#define PRIO_LOW -1
848#define PRIO_IDLE -3 912#define PRIO_IDLE -3
849#define PRIO_MIN -4 913#define PRIO_MIN -4
850 914
851/* for Coro.pm */ 915/* for Coro.pm */
852static GV *coro_current, *coro_idle; 916static SV *coro_current;
853static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 917static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
854static int coro_nready; 918static int coro_nready;
855 919
856static void 920static void
857coro_enq (pTHX_ SV *sv) 921coro_enq (SV *coro_sv)
858{ 922{
859 int prio;
860
861 if (SvTYPE (sv) != SVt_PVHV)
862 croak ("Coro::ready tried to enqueue something that is not a coroutine");
863
864 prio = SvSTATE (sv)->prio;
865
866 av_push (coro_ready [prio - PRIO_MIN], sv); 923 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
867 coro_nready++; 924 coro_nready++;
868} 925}
869 926
870static SV * 927static SV *
871coro_deq (pTHX_ int min_prio) 928coro_deq (int min_prio)
872{ 929{
873 int prio = PRIO_MAX - PRIO_MIN; 930 int prio = PRIO_MAX - PRIO_MIN;
874 931
875 min_prio -= PRIO_MIN; 932 min_prio -= PRIO_MIN;
876 if (min_prio < 0) 933 if (min_prio < 0)
884 } 941 }
885 942
886 return 0; 943 return 0;
887} 944}
888 945
889static void 946static int
890api_ready (SV *coro) 947api_ready (SV *coro_sv)
891{ 948{
892 dTHX; 949 struct coro *coro;
893 950
894 if (SvROK (coro)) 951 if (SvROK (coro_sv))
895 coro = SvRV (coro); 952 coro_sv = SvRV (coro_sv);
953
954 coro = SvSTATE (coro_sv);
955
956 if (coro->flags & CF_READY)
957 return 0;
958
959#if 0 /* this is actually harmless */
960 if (coro->flags & CF_RUNNING)
961 croak ("Coro::ready called on currently running coroutine");
962#endif
963
964 coro->flags |= CF_READY;
896 965
897 LOCK; 966 LOCK;
898 coro_enq (aTHX_ SvREFCNT_inc (coro)); 967 coro_enq (SvREFCNT_inc (coro_sv));
899 UNLOCK; 968 UNLOCK;
900}
901 969
970 return 1;
971}
972
902static void 973static int
974api_is_ready (SV *coro_sv)
975{
976 return !!SvSTATE (coro_sv)->flags & CF_READY;
977}
978
979static void
903prepare_schedule (aTHX_ struct transfer_args *ta) 980prepare_schedule (struct transfer_args *ta)
904{ 981{
905 SV *current, *prev, *next; 982 SV *prev, *next;
906
907 LOCK;
908
909 current = GvSV (coro_current);
910 983
911 for (;;) 984 for (;;)
912 { 985 {
913 LOCK; 986 LOCK;
914
915 next = coro_deq (aTHX_ PRIO_MIN); 987 next = coro_deq (PRIO_MIN);
988 UNLOCK;
916 989
917 if (next) 990 if (next)
918 break; 991 break;
919 992
920 UNLOCK;
921
922 { 993 {
923 dSP; 994 dSP;
924 995
925 ENTER; 996 ENTER;
926 SAVETMPS; 997 SAVETMPS;
927 998
928 PUSHMARK (SP); 999 PUSHMARK (SP);
929 PUTBACK; 1000 PUTBACK;
930 call_sv (GvSV (coro_idle), G_DISCARD); 1001 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
931 1002
932 FREETMPS; 1003 FREETMPS;
933 LEAVE; 1004 LEAVE;
934 } 1005 }
935 } 1006 }
936 1007
937 prev = SvRV (current); 1008 prev = SvRV (coro_current);
938 SvRV (current) = next; 1009 SvRV_set (coro_current, next);
939 1010
940 /* free this only after the transfer */ 1011 /* free this only after the transfer */
1012 LOCK;
941 free_coro_mortal (); 1013 free_coro_mortal ();
1014 UNLOCK;
942 coro_mortal = prev; 1015 coro_mortal = prev;
943 1016
1017 assert (!SvROK(prev));//D
1018 assert (!SvROK(next));//D
1019
944 ta->prev = SvSTATE (prev); 1020 ta->prev = SvSTATE (prev);
945 ta->next = SvSTATE (next); 1021 ta->next = SvSTATE (next);
946 ta->flags = TRANSFER_SAVE_ALL;
947 1022
948 UNLOCK; 1023 assert (ta->next->flags & CF_READY);
1024 ta->next->flags &= ~CF_READY;
949} 1025}
950 1026
951static void 1027static void
952prepare_cede (aTHX_ struct transfer_args *ta) 1028prepare_cede (struct transfer_args *ta)
953{ 1029{
954 LOCK; 1030 api_ready (coro_current);
955 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
956 UNLOCK;
957 1031
958 prepare_schedule (ta); 1032 prepare_schedule (ta);
959} 1033}
960 1034
961static void 1035static void
962api_schedule (void) 1036api_schedule (void)
963{ 1037{
964 dTHX;
965 struct transfer_args ta; 1038 struct transfer_args ta;
966 1039
967 prepare_schedule (&ta); 1040 prepare_schedule (&ta);
968 TRANSFER (ta); 1041 TRANSFER (ta);
969} 1042}
970 1043
971static void 1044static void
972api_cede (void) 1045api_cede (void)
973{ 1046{
974 dTHX;
975 struct transfer_args ta; 1047 struct transfer_args ta;
976 1048
977 prepare_cede (&ta); 1049 prepare_cede (&ta);
978 TRANSFER (ta); 1050 TRANSFER (ta);
979} 1051}
989#endif 1061#endif
990 BOOT_PAGESIZE; 1062 BOOT_PAGESIZE;
991 1063
992 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1064 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
993 1065
994 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1066 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
995 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1067 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
996 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1068 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1069 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1070 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
997 1071
998 main_mainstack = PL_mainstack; 1072 main_mainstack = PL_mainstack;
999 1073
1000 coroapi.ver = CORO_API_VERSION; 1074 coroapi.ver = CORO_API_VERSION;
1001 coroapi.transfer = api_transfer; 1075 coroapi.transfer = api_transfer;
1002
1003 Newz (0, main_stack, 1, coro_stack);
1004 main_stack->idle_sp = (void *)-1;
1005 1076
1006 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1077 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1007} 1078}
1008 1079
1009SV * 1080SV *
1014 HV *hv; 1085 HV *hv;
1015 int i; 1086 int i;
1016 1087
1017 Newz (0, coro, 1, struct coro); 1088 Newz (0, coro, 1, struct coro);
1018 coro->args = newAV (); 1089 coro->args = newAV ();
1090 coro->save = CORO_SAVE_ALL;
1091 coro->flags = CF_NEW;
1019 1092
1020 hv = newHV (); 1093 hv = newHV ();
1021 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1094 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1022 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1095 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1023 1096
1024 for (i = 1; i < items; i++) 1097 for (i = 1; i < items; i++)
1025 av_push (coro->args, newSVsv (ST (i))); 1098 av_push (coro->args, newSVsv (ST (i)));
1026
1027 coro->stack = main_stack;
1028 /*coro->mainstack = 0; *//*actual work is done inside transfer */
1029 /*coro->stack = 0;*/
1030} 1099}
1031 OUTPUT: 1100 OUTPUT:
1032 RETVAL 1101 RETVAL
1033 1102
1103int
1104save (SV *coro, int new_save = -1)
1105 CODE:
1106 RETVAL = api_save (coro, new_save);
1107 OUTPUT:
1108 RETVAL
1109
1034void 1110void
1035transfer (...) 1111_set_stacklevel (...)
1036 ALIAS: 1112 ALIAS:
1037 Coro::schedule = 1 1113 Coro::State::transfer = 1
1038 Coro::cede = 2 1114 Coro::schedule = 2
1039 _set_stacklevel = 3 1115 Coro::cede = 3
1040 CODE: 1116 CODE:
1041{ 1117{
1042 struct transfer_args ta; 1118 struct transfer_args ta;
1043 1119
1044 switch (ix) 1120 switch (ix)
1045 { 1121 {
1046 case 0: 1122 case 0:
1047 if (items != 3) 1123 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1048 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1124 ta.next = 0;
1049
1050 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2)));
1051 break; 1125 break;
1052 1126
1053 case 1: 1127 case 1:
1128 if (items != 2)
1129 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1130
1131 prepare_transfer (&ta, ST (0), ST (1));
1132 break;
1133
1134 case 2:
1054 prepare_schedule (&ta); 1135 prepare_schedule (&ta);
1055 break; 1136 break;
1056 1137
1057 case 2: 1138 case 3:
1058 prepare_cede (&ta); 1139 prepare_cede (&ta);
1059 break;
1060
1061 case 3:
1062 ta.prev = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0)));
1063 ta.next = 0;
1064 ta.flags = TRANSFER_SET_STACKLEVEL;
1065 break; 1140 break;
1066 } 1141 }
1067 1142
1068 TRANSFER (ta); 1143 TRANSFER (ta);
1069} 1144}
1077 sv_unmagic (SvRV (dst), PERL_MAGIC_ext); 1152 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1078 1153
1079 ++coro_src->refcnt; 1154 ++coro_src->refcnt;
1080 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP; 1155 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1081} 1156}
1082
1083void
1084_nonlocal_goto (IV nextop)
1085 CODE:
1086 /* uuh, somebody will kill me again for this */
1087 PL_op->op_next = INT2PTR (OP *, nextop);
1088 1157
1089void 1158void
1090_exit (code) 1159_exit (code)
1091 int code 1160 int code
1092 PROTOTYPE: $ 1161 PROTOTYPE: $
1093 CODE: 1162 CODE:
1094 _exit (code); 1163 _exit (code);
1095 1164
1096MODULE = Coro::State PACKAGE = Coro::Cont 1165int
1166cctx_count ()
1167 CODE:
1168 RETVAL = cctx_count;
1169 OUTPUT:
1170 RETVAL
1097 1171
1098void 1172int
1099yield (...) 1173cctx_idle ()
1100 PROTOTYPE: @ 1174 CODE:
1101 CODE: 1175 RETVAL = cctx_idle;
1102{ 1176 OUTPUT:
1103 SV *yieldstack; 1177 RETVAL
1104 SV *sv;
1105 AV *defav = GvAV (PL_defgv);
1106 struct coro *prev, *next;
1107
1108 yieldstack = *hv_fetch (
1109 (HV *)SvRV (GvSV (coro_current)),
1110 "yieldstack", sizeof ("yieldstack") - 1,
1111 0
1112 );
1113
1114 /* set up @_ -- ugly */
1115 av_clear (defav);
1116 av_fill (defav, items - 1);
1117 while (items--)
1118 av_store (defav, items, SvREFCNT_inc (ST(items)));
1119
1120 sv = av_pop ((AV *)SvRV (yieldstack));
1121 prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1122 next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1123 SvREFCNT_dec (sv);
1124
1125 coro_state_transfer (aTHX_ prev, next, 0);
1126}
1127 1178
1128MODULE = Coro::State PACKAGE = Coro 1179MODULE = Coro::State PACKAGE = Coro
1129 1180
1130BOOT: 1181BOOT:
1131{ 1182{
1138 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1189 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1139 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1190 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1140 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1191 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1141 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1192 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1142 1193
1143 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1194 coro_current = get_sv ("Coro::current", FALSE);
1144 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1195 SvREADONLY_on (coro_current);
1145 1196
1146 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1197 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1147 coro_ready[i] = newAV (); 1198 coro_ready[i] = newAV ();
1148 1199
1149 { 1200 {
1150 SV *sv = perl_get_sv("Coro::API", 1); 1201 SV *sv = perl_get_sv("Coro::API", 1);
1151 1202
1152 coroapi.schedule = api_schedule; 1203 coroapi.schedule = api_schedule;
1204 coroapi.save = api_save;
1153 coroapi.cede = api_cede; 1205 coroapi.cede = api_cede;
1154 coroapi.ready = api_ready; 1206 coroapi.ready = api_ready;
1207 coroapi.is_ready = api_is_ready;
1155 coroapi.nready = &coro_nready; 1208 coroapi.nready = &coro_nready;
1156 coroapi.current = coro_current; 1209 coroapi.current = coro_current;
1157 1210
1158 GCoroAPI = &coroapi; 1211 GCoroAPI = &coroapi;
1159 sv_setiv (sv, (IV)&coroapi); 1212 sv_setiv (sv, (IV)&coroapi);
1160 SvREADONLY_on (sv); 1213 SvREADONLY_on (sv);
1161 } 1214 }
1162} 1215}
1216
1217void
1218_set_current (SV *current)
1219 PROTOTYPE: $
1220 CODE:
1221 SvREFCNT_dec (SvRV (coro_current));
1222 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1163 1223
1164int 1224int
1165prio (Coro::State coro, int newprio = 0) 1225prio (Coro::State coro, int newprio = 0)
1166 ALIAS: 1226 ALIAS:
1167 nice = 1 1227 nice = 1
1179 1239
1180 coro->prio = newprio; 1240 coro->prio = newprio;
1181 } 1241 }
1182} 1242}
1183 1243
1184void 1244SV *
1185ready (SV *self) 1245ready (SV *self)
1186 PROTOTYPE: $ 1246 PROTOTYPE: $
1187 CODE: 1247 CODE:
1188 api_ready (self); 1248 RETVAL = boolSV (api_ready (self));
1249 OUTPUT:
1250 RETVAL
1251
1252SV *
1253is_ready (SV *self)
1254 PROTOTYPE: $
1255 CODE:
1256 RETVAL = boolSV (api_is_ready (self));
1257 OUTPUT:
1258 RETVAL
1189 1259
1190int 1260int
1191nready (...) 1261nready (...)
1192 PROTOTYPE: 1262 PROTOTYPE:
1193 CODE: 1263 CODE:
1199 1269
1200SV * 1270SV *
1201_get_state () 1271_get_state ()
1202 CODE: 1272 CODE:
1203{ 1273{
1204 struct { 1274 struct io_state *data;
1205 int errorno;
1206 int laststype;
1207 int laststatval;
1208 Stat_t statcache;
1209 } data;
1210 1275
1276 RETVAL = newSV (sizeof (struct io_state));
1277 data = (struct io_state *)SvPVX (RETVAL);
1278 SvCUR_set (RETVAL, sizeof (struct io_state));
1279 SvPOK_only (RETVAL);
1280
1211 data.errorno = errno; 1281 data->errorno = errno;
1212 data.laststype = PL_laststype; 1282 data->laststype = PL_laststype;
1213 data.laststatval = PL_laststatval; 1283 data->laststatval = PL_laststatval;
1214 data.statcache = PL_statcache; 1284 data->statcache = PL_statcache;
1215
1216 RETVAL = newSVpvn ((char *)&data, sizeof data);
1217} 1285}
1218 OUTPUT: 1286 OUTPUT:
1219 RETVAL 1287 RETVAL
1220 1288
1221void 1289void
1222_set_state (char *data_) 1290_set_state (char *data_)
1223 PROTOTYPE: $ 1291 PROTOTYPE: $
1224 CODE: 1292 CODE:
1225{ 1293{
1226 struct { 1294 struct io_state *data = (void *)data_;
1227 int errorno;
1228 int laststype;
1229 int laststatval;
1230 Stat_t statcache;
1231 } *data = (void *)data_;
1232 1295
1233 errno = data->errorno; 1296 errno = data->errorno;
1234 PL_laststype = data->laststype; 1297 PL_laststype = data->laststype;
1235 PL_laststatval = data->laststatval; 1298 PL_laststatval = data->laststatval;
1236 PL_statcache = data->statcache; 1299 PL_statcache = data->statcache;
1237} 1300}
1301

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines