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.103 by root, Mon Nov 27 01:33:30 2006 UTC vs.
Revision 1.139 by root, Sun Jan 14 21:13:41 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines