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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines