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.106 by root, Mon Nov 27 02:08:55 2006 UTC vs.
Revision 1.132 by root, Fri Dec 29 13:03:05 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines