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.116 by root, Fri Dec 1 14:01:43 2006 UTC vs.
Revision 1.134 by root, Thu Jan 4 23:49:27 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines