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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines