ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.92 by root, Sun Nov 26 02:16:19 2006 UTC vs.
Revision 1.118 by root, Fri Dec 1 19:58:53 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines