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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines