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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines