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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines