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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines