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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines