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.131 by root, Fri Dec 29 11:37:49 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines