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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines