ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines