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.117 by root, Fri Dec 1 19:41:06 2006 UTC vs.
Revision 1.131 by root, Fri Dec 29 11:37:49 2006 UTC

4#include "perl.h" 4#include "perl.h"
5#include "XSUB.h" 5#include "XSUB.h"
6 6
7#include "patchlevel.h" 7#include "patchlevel.h"
8 8
9#if USE_VALGRIND
10# include <valgrind/valgrind.h>
11#endif
12
13/* 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
143 coro_cctx *cctx; 162 coro_cctx *cctx;
144 163
145 /* data associated with this coroutine (initial args) */ 164 /* data associated with this coroutine (initial args) */
146 AV *args; 165 AV *args;
147 int refcnt; 166 int refcnt;
148 int flags; 167 int save; /* CORO_SAVE flags */
168 int flags; /* CF_ flags */
149 169
150 /* optionally saved, might be zero */ 170 /* optionally saved, might be zero */
151 AV *defav; 171 AV *defav; /* @_ */
152 SV *defsv; 172 SV *defsv; /* $_ */
153 SV *errsv; 173 SV *errsv; /* $@ */
174 SV *irssv; /* $/ */
175 SV *irssv_sv; /* real $/ cache */
154 176
155#define VAR(name,type) type name; 177#define VAR(name,type) type name;
156# include "state.h" 178# include "state.h"
157#undef VAR 179#undef VAR
158 180
244 266
245 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 267 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
246 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 268 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
247 else 269 else
248 { 270 {
249#if 0 271#if PREFER_PERL_FUNCTIONS
250 /* this is probably cleaner, but also slower? */ 272 /* this is probably cleaner, but also slower? */
251 CV *cp = Perl_cv_clone (cv); 273 CV *cp = Perl_cv_clone (cv);
252 CvPADLIST (cv) = CvPADLIST (cp); 274 CvPADLIST (cv) = CvPADLIST (cp);
253 CvPADLIST (cp) = 0; 275 CvPADLIST (cp) = 0;
254 SvREFCNT_dec (cp); 276 SvREFCNT_dec (cp);
281} 303}
282 304
283#define SB do { 305#define SB do {
284#define SE } while (0) 306#define SE } while (0)
285 307
286#define LOAD(state) load_state ((state))
287#define SAVE(state,flags) save_state ((state),(flags))
288
289#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 308#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
290 309
291static void 310static void
292load_state (Coro__State c) 311load_perl (Coro__State c)
293{ 312{
294#define VAR(name,type) PL_ ## name = c->name; 313#define VAR(name,type) PL_ ## name = c->name;
295# include "state.h" 314# include "state.h"
296#undef VAR 315#undef VAR
297 316
298 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 317 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
299 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 318 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
300 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 319 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
320 if (c->irssv)
321 {
322 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
323 SvREFCNT_dec (c->irssv);
324 else
325 {
326 REPLACE_SV (PL_rs, c->irssv);
327 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
328 sv_setsv (c->irssv_sv, PL_rs);
329 }
330 }
301 331
302 { 332 {
303 dSP; 333 dSP;
304 CV *cv; 334 CV *cv;
305 335
314 PUTBACK; 344 PUTBACK;
315 } 345 }
316} 346}
317 347
318static void 348static void
319save_state (Coro__State c, int flags) 349save_perl (Coro__State c)
320{ 350{
321 { 351 {
322 dSP; 352 dSP;
323 I32 cxix = cxstack_ix; 353 I32 cxix = cxstack_ix;
324 PERL_CONTEXT *ccstk = cxstack; 354 PERL_CONTEXT *ccstk = cxstack;
327 /* 357 /*
328 * the worst thing you can imagine happens first - we have to save 358 * the worst thing you can imagine happens first - we have to save
329 * (and reinitialize) all cv's in the whole callchain :( 359 * (and reinitialize) all cv's in the whole callchain :(
330 */ 360 */
331 361
362 EXTEND (SP, 3 + 1);
332 PUSHs (Nullsv); 363 PUSHs (Nullsv);
333 /* this loop was inspired by pp_caller */ 364 /* this loop was inspired by pp_caller */
334 for (;;) 365 for (;;)
335 { 366 {
336 while (cxix >= 0) 367 while (cxix >= 0)
342 CV *cv = cx->blk_sub.cv; 373 CV *cv = cx->blk_sub.cv;
343 374
344 if (CvDEPTH (cv)) 375 if (CvDEPTH (cv))
345 { 376 {
346 EXTEND (SP, 3); 377 EXTEND (SP, 3);
347
348 PUSHs ((SV *)CvPADLIST (cv)); 378 PUSHs ((SV *)CvPADLIST (cv));
349 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 379 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
350 PUSHs ((SV *)cv); 380 PUSHs ((SV *)cv);
351 381
352 CvDEPTH (cv) = 0; 382 CvDEPTH (cv) = 0;
353 get_padlist (cv); 383 get_padlist (cv);
354 } 384 }
355 } 385 }
356#ifdef CXt_FORMAT
357 else if (CxTYPE (cx) == CXt_FORMAT)
358 {
359 /* I never used formats, so how should I know how these are implemented? */
360 /* my bold guess is as a simple, plain sub... */
361 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
362 }
363#endif
364 } 386 }
365 387
366 if (top_si->si_type == PERLSI_MAIN) 388 if (top_si->si_type == PERLSI_MAIN)
367 break; 389 break;
368 390
372 } 394 }
373 395
374 PUTBACK; 396 PUTBACK;
375 } 397 }
376 398
377 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 399 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
378 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 400 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
379 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 401 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
402 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
380 403
381#define VAR(name,type)c->name = PL_ ## name; 404#define VAR(name,type)c->name = PL_ ## name;
382# include "state.h" 405# include "state.h"
383#undef VAR 406#undef VAR
384} 407}
387 * allocate various perl stacks. This is an exact copy 410 * allocate various perl stacks. This is an exact copy
388 * of perl.c:init_stacks, except that it uses less memory 411 * of perl.c:init_stacks, except that it uses less memory
389 * on the (sometimes correct) assumption that coroutines do 412 * on the (sometimes correct) assumption that coroutines do
390 * not usually need a lot of stackspace. 413 * not usually need a lot of stackspace.
391 */ 414 */
415#if PREFER_PERL_FUNCTIONS
416# define coro_init_stacks init_stacks
417#else
392static void 418static void
393coro_init_stacks () 419coro_init_stacks ()
394{ 420{
395 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 421 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
396 PL_curstackinfo->si_type = PERLSI_MAIN; 422 PL_curstackinfo->si_type = PERLSI_MAIN;
426 New(54,PL_retstack,16,OP*); 452 New(54,PL_retstack,16,OP*);
427 PL_retstack_ix = 0; 453 PL_retstack_ix = 0;
428 PL_retstack_max = 16; 454 PL_retstack_max = 16;
429#endif 455#endif
430} 456}
457#endif
431 458
432/* 459/*
433 * destroy the stacks, the callchain etc... 460 * destroy the stacks, the callchain etc...
434 */ 461 */
435static void 462static void
436coro_destroy_stacks () 463coro_destroy_stacks ()
437{ 464{
438 if (!IN_DESTRUCT) 465 if (!IN_DESTRUCT)
439 { 466 {
440 /* is this ugly, I ask? */ 467 /* restore all saved variables and stuff */
441 LEAVE_SCOPE (0); 468 LEAVE_SCOPE (0);
469 assert (PL_tmps_floor == -1);
442 470
443 /* sure it is, but more important: is it correct?? :/ */ 471 /* free all temporaries */
444 FREETMPS; 472 FREETMPS;
473 assert (PL_tmps_ix == -1);
445 474
446 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 475 POPSTACK_TO (PL_mainstack);
447 } 476 }
448 477
449 while (PL_curstackinfo->si_next) 478 while (PL_curstackinfo->si_next)
450 PL_curstackinfo = PL_curstackinfo->si_next; 479 PL_curstackinfo = PL_curstackinfo->si_next;
451 480
452 while (PL_curstackinfo) 481 while (PL_curstackinfo)
453 { 482 {
454 PERL_SI *p = PL_curstackinfo->si_prev; 483 PERL_SI *p = PL_curstackinfo->si_prev;
455 484
456 { /*D*//*remove*/
457 dSP;
458 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
459 PUTBACK; /* possibly superfluous */
460 }
461
462 if (!IN_DESTRUCT) 485 if (!IN_DESTRUCT)
463 {
464 dounwind (-1);/*D*//*remove*/
465 SvREFCNT_dec (PL_curstackinfo->si_stack); 486 SvREFCNT_dec (PL_curstackinfo->si_stack);
466 }
467 487
468 Safefree (PL_curstackinfo->si_cxstack); 488 Safefree (PL_curstackinfo->si_cxstack);
469 Safefree (PL_curstackinfo); 489 Safefree (PL_curstackinfo);
470 PL_curstackinfo = p; 490 PL_curstackinfo = p;
471 } 491 }
497 517
498 { 518 {
499 dSP; 519 dSP;
500 LOGOP myop; 520 LOGOP myop;
501 521
502 /* I have no idea why this is needed, but it is */
503 PUSHMARK (SP);
504
505 SvREFCNT_dec (GvAV (PL_defgv)); 522 SvREFCNT_dec (GvAV (PL_defgv));
506 GvAV (PL_defgv) = coro->args; coro->args = 0; 523 GvAV (PL_defgv) = coro->args; coro->args = 0;
507 524
508 Zero (&myop, 1, LOGOP); 525 Zero (&myop, 1, LOGOP);
509 myop.op_next = Nullop; 526 myop.op_next = Nullop;
510 myop.op_flags = OPf_WANT_VOID; 527 myop.op_flags = OPf_WANT_VOID;
511 528
512 PL_op = (OP *)&myop;
513
514 PUSHMARK (SP); 529 PUSHMARK (SP);
515 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 530 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
516 PUTBACK; 531 PUTBACK;
532 PL_op = (OP *)&myop;
517 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 533 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
518 SPAGAIN; 534 SPAGAIN;
519 } 535 }
520 536
521 ENTER; /* necessary e.g. for dounwind */ 537 ENTER; /* necessary e.g. for dounwind */
529 SvREFCNT_dec (coro_mortal); 545 SvREFCNT_dec (coro_mortal);
530 coro_mortal = 0; 546 coro_mortal = 0;
531 } 547 }
532} 548}
533 549
550/* inject a fake call to Coro::State::_cctx_init into the execution */
534static void NOINLINE 551static void NOINLINE
535prepare_cctx (coro_cctx *cctx) 552prepare_cctx (coro_cctx *cctx)
536{ 553{
537 dSP; 554 dSP;
538 LOGOP myop; 555 LOGOP myop;
539 556
540 Zero (&myop, 1, LOGOP); 557 Zero (&myop, 1, LOGOP);
541 myop.op_next = PL_op; 558 myop.op_next = PL_op;
542 myop.op_flags = OPf_WANT_VOID; 559 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
543
544 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
545 560
546 PUSHMARK (SP); 561 PUSHMARK (SP);
562 EXTEND (SP, 2);
563 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
547 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 564 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
548 PUTBACK; 565 PUTBACK;
566 PL_op = (OP *)&myop;
549 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 567 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
550 SPAGAIN; 568 SPAGAIN;
551} 569}
552 570
553static void 571static void
554coro_run (void *arg) 572coro_run (void *arg)
555{ 573{
556 /* coro_run is the alternative epilogue of transfer() */ 574 /* coro_run is the alternative tail of transfer(), so unlock here. */
557 UNLOCK; 575 UNLOCK;
558 576
559 /* 577 /*
560 * this is a _very_ stripped down perl interpreter ;) 578 * this is a _very_ stripped down perl interpreter ;)
561 */ 579 */
563 581
564 /* inject call to cctx_init */ 582 /* inject call to cctx_init */
565 prepare_cctx ((coro_cctx *)arg); 583 prepare_cctx ((coro_cctx *)arg);
566 584
567 /* somebody will hit me for both perl_run and PL_restartop */ 585 /* somebody will hit me for both perl_run and PL_restartop */
586 PL_restartop = PL_op;
568 perl_run (PL_curinterp); 587 perl_run (PL_curinterp);
569 588
570 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 589 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
571 abort (); 590 abort ();
572} 591}
576{ 595{
577 coro_cctx *cctx; 596 coro_cctx *cctx;
578 597
579 ++cctx_count; 598 ++cctx_count;
580 599
581 New (0, cctx, 1, coro_cctx); 600 Newz (0, cctx, 1, coro_cctx);
582 601
583#if HAVE_MMAP 602#if HAVE_MMAP
584 603
585 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 604 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
586 /* mmap suppsedly does allocate-on-write for us */ 605 /* mmap supposedly does allocate-on-write for us */
587 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 606 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
588 607
589 if (cctx->sptr == (void *)-1) 608 if (cctx->sptr == (void *)-1)
590 { 609 {
591 perror ("FATAL: unable to mmap stack for coroutine"); 610 perror ("FATAL: unable to mmap stack for coroutine");
681 cctx_first = cctx; 700 cctx_first = cctx;
682} 701}
683 702
684/* never call directly, always through the coro_state_transfer global variable */ 703/* never call directly, always through the coro_state_transfer global variable */
685static void NOINLINE 704static void NOINLINE
686transfer (struct coro *prev, struct coro *next, int flags) 705transfer (struct coro *prev, struct coro *next)
687{ 706{
688 dSTACKLEVEL; 707 dSTACKLEVEL;
689 708
690 /* sometimes transfer is only called to set idle_sp */ 709 /* sometimes transfer is only called to set idle_sp */
691 if (flags == TRANSFER_SET_STACKLEVEL) 710 if (!next)
711 {
692 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 712 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
713 assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */
714 }
693 else if (prev != next) 715 else if (prev != next)
694 { 716 {
695 coro_cctx *prev__cctx; 717 coro_cctx *prev__cctx;
696 718
697 if (prev->flags & CF_NEW) 719 if (prev->flags & CF_NEW)
713 prev->flags &= ~CF_RUNNING; 735 prev->flags &= ~CF_RUNNING;
714 next->flags |= CF_RUNNING; 736 next->flags |= CF_RUNNING;
715 737
716 LOCK; 738 LOCK;
717 739
718 if (next->mainstack) 740 if (next->flags & CF_NEW)
719 { 741 {
720 /* coroutine already started */ 742 /* need to start coroutine */
721 SAVE (prev, flags); 743 next->flags &= ~CF_NEW;
722 LOAD (next); 744 /* first get rid of the old state */
745 save_perl (prev);
746 /* setup coroutine call */
747 setup_coro (next);
748 /* need a new stack */
749 assert (!next->cctx);
723 } 750 }
724 else 751 else
725 { 752 {
726 /* need to start coroutine */ 753 /* coroutine already started */
727 assert (next->flags & CF_NEW); 754 save_perl (prev);
728 next->flags &= ~CF_NEW; 755 load_perl (next);
729 /* first get rid of the old state */
730 SAVE (prev, -1);
731 /* setup coroutine call */
732 setup_coro (next);
733 /* need a new stack */
734 assert (!next->stack);
735 } 756 }
736 757
737 prev__cctx = prev->cctx; 758 prev__cctx = prev->cctx;
738 759
739 /* possibly "free" the cctx */ 760 /* possibly "free" the cctx */
740 if (prev__cctx->idle_sp == STACKLEVEL && 0) 761 if (prev__cctx->idle_sp == STACKLEVEL)
741 { 762 {
742 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 763 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
743 assert (PL_top_env == prev__cctx->top_env); 764 assert (PL_top_env == prev__cctx->top_env);
744 765
745 prev->cctx = 0; 766 prev->cctx = 0;
769} 790}
770 791
771struct transfer_args 792struct transfer_args
772{ 793{
773 struct coro *prev, *next; 794 struct coro *prev, *next;
774 int flags;
775}; 795};
776 796
777#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 797#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
778 798
779static void 799static void
780coro_state_destroy (struct coro *coro) 800coro_state_destroy (struct coro *coro)
781{ 801{
782 if (coro->refcnt--) 802 if (coro->refcnt--)
783 return; 803 return;
784 804
785 if (coro->mainstack && coro->mainstack != main_mainstack) 805 if (coro->mainstack && coro->mainstack != main_mainstack)
786 { 806 {
787 struct coro temp; 807 struct coro temp;
808 Zero (&temp, 1, struct coro);
809 temp.save = CORO_SAVE_ALL;
788 810
789 if (coro->flags & CF_RUNNING) 811 if (coro->flags & CF_RUNNING)
790 croak ("FATAL: tried to destroy currently running coroutine"); 812 croak ("FATAL: tried to destroy currently running coroutine");
791 813
792 SAVE ((&temp), TRANSFER_SAVE_ALL); 814 save_perl (&temp);
793 LOAD (coro); 815 load_perl (coro);
794 816
795 coro_destroy_stacks (); 817 coro_destroy_stacks ();
796 818
797 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 819 load_perl (&temp); /* this will get rid of defsv etc.. */
798 820
799 coro->mainstack = 0; 821 coro->mainstack = 0;
800 } 822 }
801 823
802 cctx_destroy (coro->cctx); 824 cctx_destroy (coro->cctx);
857 assert (mg->mg_type == PERL_MAGIC_ext); 879 assert (mg->mg_type == PERL_MAGIC_ext);
858 return (struct coro *)mg->mg_ptr; 880 return (struct coro *)mg->mg_ptr;
859} 881}
860 882
861static void 883static void
862prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 884prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
863{ 885{
864 ta->prev = SvSTATE (prev); 886 ta->prev = SvSTATE (prev_sv);
865 ta->next = SvSTATE (next); 887 ta->next = SvSTATE (next_sv);
866 ta->flags = flags;
867} 888}
868 889
869static void 890static void
870api_transfer (SV *prev, SV *next, int flags) 891api_transfer (SV *prev_sv, SV *next_sv)
871{ 892{
872 struct transfer_args ta; 893 struct transfer_args ta;
873 894
874 prepare_transfer (&ta, prev, next, flags); 895 prepare_transfer (&ta, prev_sv, next_sv);
875 TRANSFER (ta); 896 TRANSFER (ta);
897}
898
899static int
900api_save (SV *coro_sv, int new_save)
901{
902 struct coro *coro = SvSTATE (coro_sv);
903 int old_save = coro->save;
904
905 if (new_save >= 0)
906 coro->save = new_save;
907
908 return old_save;
876} 909}
877 910
878/** Coro ********************************************************************/ 911/** Coro ********************************************************************/
879 912
880#define PRIO_MAX 3 913#define PRIO_MAX 3
926 coro = SvSTATE (coro_sv); 959 coro = SvSTATE (coro_sv);
927 960
928 if (coro->flags & CF_READY) 961 if (coro->flags & CF_READY)
929 return 0; 962 return 0;
930 963
931#if 0 /* this is actually harmless */
932 if (coro->flags & CF_RUNNING)
933 croak ("Coro::ready called on currently running coroutine");
934#endif
935
936 coro->flags |= CF_READY; 964 coro->flags |= CF_READY;
937 965
938 LOCK; 966 LOCK;
939 coro_enq (SvREFCNT_inc (coro_sv)); 967 coro_enq (SvREFCNT_inc (coro_sv));
940 UNLOCK; 968 UNLOCK;
943} 971}
944 972
945static int 973static int
946api_is_ready (SV *coro_sv) 974api_is_ready (SV *coro_sv)
947{ 975{
948 return !!SvSTATE (coro_sv)->flags & CF_READY; 976 return !!(SvSTATE (coro_sv)->flags & CF_READY);
949} 977}
950 978
951static void 979static void
952prepare_schedule (struct transfer_args *ta) 980prepare_schedule (struct transfer_args *ta)
953{ 981{
989 assert (!SvROK(prev));//D 1017 assert (!SvROK(prev));//D
990 assert (!SvROK(next));//D 1018 assert (!SvROK(next));//D
991 1019
992 ta->prev = SvSTATE (prev); 1020 ta->prev = SvSTATE (prev);
993 ta->next = SvSTATE (next); 1021 ta->next = SvSTATE (next);
994 ta->flags = TRANSFER_SAVE_ALL;
995 1022
996 assert (ta->flags & CF_READY); 1023 assert (ta->next->flags & CF_READY);
997 ta->next->flags &= ~CF_READY; 1024 ta->next->flags &= ~CF_READY;
998} 1025}
999 1026
1000static void 1027static void
1001prepare_cede (struct transfer_args *ta) 1028prepare_cede (struct transfer_args *ta)
1002{ 1029{
1003 api_ready (coro_current); 1030 api_ready (coro_current);
1004
1005 prepare_schedule (ta); 1031 prepare_schedule (ta);
1032}
1033
1034static int
1035prepare_cede_notself (struct transfer_args *ta)
1036{
1037 if (coro_nready)
1038 {
1039 SV *prev = SvRV (coro_current);
1040 prepare_schedule (ta);
1041 api_ready (prev);
1042 return 1;
1043 }
1044 else
1045 return 0;
1006} 1046}
1007 1047
1008static void 1048static void
1009api_schedule (void) 1049api_schedule (void)
1010{ 1050{
1012 1052
1013 prepare_schedule (&ta); 1053 prepare_schedule (&ta);
1014 TRANSFER (ta); 1054 TRANSFER (ta);
1015} 1055}
1016 1056
1017static void 1057static int
1018api_cede (void) 1058api_cede (void)
1019{ 1059{
1020 struct transfer_args ta; 1060 struct transfer_args ta;
1021 1061
1022 prepare_cede (&ta); 1062 prepare_cede (&ta);
1063
1064 if (ta.prev != ta.next)
1065 {
1023 TRANSFER (ta); 1066 TRANSFER (ta);
1067 return 1;
1068 }
1069 else
1070 return 0;
1071}
1072
1073static int
1074api_cede_notself (void)
1075{
1076 struct transfer_args ta;
1077
1078 if (prepare_cede_notself (&ta))
1079 {
1080 TRANSFER (ta);
1081 return 1;
1082 }
1083 else
1084 return 0;
1024} 1085}
1025 1086
1026MODULE = Coro::State PACKAGE = Coro::State 1087MODULE = Coro::State PACKAGE = Coro::State
1027 1088
1028PROTOTYPES: DISABLE 1089PROTOTYPES: DISABLE
1034#endif 1095#endif
1035 BOOT_PAGESIZE; 1096 BOOT_PAGESIZE;
1036 1097
1037 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1098 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1038 1099
1039 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1100 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1040 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1101 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1041 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1102 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1103 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1104 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1042 1105
1043 main_mainstack = PL_mainstack; 1106 main_mainstack = PL_mainstack;
1044 1107
1045 coroapi.ver = CORO_API_VERSION; 1108 coroapi.ver = CORO_API_VERSION;
1046 coroapi.transfer = api_transfer; 1109 coroapi.transfer = api_transfer;
1056 HV *hv; 1119 HV *hv;
1057 int i; 1120 int i;
1058 1121
1059 Newz (0, coro, 1, struct coro); 1122 Newz (0, coro, 1, struct coro);
1060 coro->args = newAV (); 1123 coro->args = newAV ();
1124 coro->save = CORO_SAVE_ALL;
1061 coro->flags = CF_NEW; 1125 coro->flags = CF_NEW;
1062 1126
1063 hv = newHV (); 1127 hv = newHV ();
1064 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1128 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1065 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1129 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1066 1130
1067 for (i = 1; i < items; i++) 1131 for (i = 1; i < items; i++)
1068 av_push (coro->args, newSVsv (ST (i))); 1132 av_push (coro->args, newSVsv (ST (i)));
1069} 1133}
1070 OUTPUT: 1134 OUTPUT:
1135 RETVAL
1136
1137int
1138save (SV *coro, int new_save = -1)
1139 CODE:
1140 RETVAL = api_save (coro, new_save);
1141 OUTPUT:
1071 RETVAL 1142 RETVAL
1072 1143
1073void 1144void
1074_set_stacklevel (...) 1145_set_stacklevel (...)
1075 ALIAS: 1146 ALIAS:
1076 Coro::State::transfer = 1 1147 Coro::State::transfer = 1
1077 Coro::schedule = 2 1148 Coro::schedule = 2
1078 Coro::cede = 3 1149 Coro::cede = 3
1079 Coro::Cont::yield = 4 1150 Coro::cede_notself = 4
1080 CODE: 1151 CODE:
1081{ 1152{
1082 struct transfer_args ta; 1153 struct transfer_args ta;
1083 1154
1084 switch (ix) 1155 switch (ix)
1085 { 1156 {
1086 case 0: 1157 case 0:
1087 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1158 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1088 ta.next = 0; 1159 ta.next = 0;
1089 ta.flags = TRANSFER_SET_STACKLEVEL;
1090 break; 1160 break;
1091 1161
1092 case 1: 1162 case 1:
1093 if (items != 3) 1163 if (items != 2)
1094 croak ("Coro::State::transfer (prev,next,flags) expects three arguments, not %d", items); 1164 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1095 1165
1096 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1166 prepare_transfer (&ta, ST (0), ST (1));
1097 break; 1167 break;
1098 1168
1099 case 2: 1169 case 2:
1100 prepare_schedule (&ta); 1170 prepare_schedule (&ta);
1101 break; 1171 break;
1103 case 3: 1173 case 3:
1104 prepare_cede (&ta); 1174 prepare_cede (&ta);
1105 break; 1175 break;
1106 1176
1107 case 4: 1177 case 4:
1108 { 1178 if (!prepare_cede_notself (&ta))
1109 SV *yieldstack; 1179 XSRETURN_EMPTY;
1110 SV *sv;
1111 AV *defav = GvAV (PL_defgv);
1112 1180
1113 yieldstack = *hv_fetch (
1114 (HV *)SvRV (coro_current),
1115 "yieldstack", sizeof ("yieldstack") - 1,
1116 0
1117 );
1118
1119 /* set up @_ -- ugly */
1120 av_clear (defav);
1121 av_fill (defav, items - 1);
1122 while (items--)
1123 av_store (defav, items, SvREFCNT_inc (ST(items)));
1124
1125 sv = av_pop ((AV *)SvRV (yieldstack));
1126 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1127 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1128 ta.flags = 0;
1129 SvREFCNT_dec (sv);
1130 }
1131 break; 1181 break;
1132
1133 } 1182 }
1134 1183
1184 BARRIER;
1135 TRANSFER (ta); 1185 TRANSFER (ta);
1136} 1186}
1137 1187
1138void 1188void
1139_clone_state_from (SV *dst, SV *src) 1189_clone_state_from (SV *dst, SV *src)
1190 coro_ready[i] = newAV (); 1240 coro_ready[i] = newAV ();
1191 1241
1192 { 1242 {
1193 SV *sv = perl_get_sv("Coro::API", 1); 1243 SV *sv = perl_get_sv("Coro::API", 1);
1194 1244
1195 coroapi.schedule = api_schedule; 1245 coroapi.schedule = api_schedule;
1246 coroapi.save = api_save;
1196 coroapi.cede = api_cede; 1247 coroapi.cede = api_cede;
1248 coroapi.cede_notself = api_cede_notself;
1197 coroapi.ready = api_ready; 1249 coroapi.ready = api_ready;
1198 coroapi.is_ready = api_is_ready; 1250 coroapi.is_ready = api_is_ready;
1199 coroapi.nready = &coro_nready; 1251 coroapi.nready = &coro_nready;
1200 coroapi.current = coro_current; 1252 coroapi.current = coro_current;
1201 1253
1202 GCoroAPI = &coroapi; 1254 GCoroAPI = &coroapi;
1203 sv_setiv (sv, (IV)&coroapi); 1255 sv_setiv (sv, (IV)&coroapi);
1204 SvREADONLY_on (sv); 1256 SvREADONLY_on (sv);
1205 } 1257 }
1206} 1258}
1259
1260void
1261_set_current (SV *current)
1262 PROTOTYPE: $
1263 CODE:
1264 SvREFCNT_dec (SvRV (coro_current));
1265 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1207 1266
1208int 1267int
1209prio (Coro::State coro, int newprio = 0) 1268prio (Coro::State coro, int newprio = 0)
1210 ALIAS: 1269 ALIAS:
1211 nice = 1 1270 nice = 1
1214 RETVAL = coro->prio; 1273 RETVAL = coro->prio;
1215 1274
1216 if (items > 1) 1275 if (items > 1)
1217 { 1276 {
1218 if (ix) 1277 if (ix)
1219 newprio += coro->prio; 1278 newprio = coro->prio - newprio;
1220 1279
1221 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1280 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1222 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1281 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1223 1282
1224 coro->prio = newprio; 1283 coro->prio = newprio;
1225 } 1284 }
1226} 1285}
1286 OUTPUT:
1287 RETVAL
1227 1288
1228SV * 1289SV *
1229ready (SV *self) 1290ready (SV *self)
1230 PROTOTYPE: $ 1291 PROTOTYPE: $
1231 CODE: 1292 CODE:
1247 CODE: 1308 CODE:
1248 RETVAL = coro_nready; 1309 RETVAL = coro_nready;
1249 OUTPUT: 1310 OUTPUT:
1250 RETVAL 1311 RETVAL
1251 1312
1252void
1253_set_current (SV *current)
1254 PROTOTYPE: $
1255 CODE:
1256 SvREFCNT_dec (SvRV (coro_current));
1257 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1258
1259MODULE = Coro::State PACKAGE = Coro::AIO 1313MODULE = Coro::State PACKAGE = Coro::AIO
1260 1314
1261SV * 1315SV *
1262_get_state () 1316_get_state ()
1263 CODE: 1317 CODE:
1264{ 1318{
1265 struct { 1319 struct io_state *data;
1266 int errorno;
1267 int laststype;
1268 int laststatval;
1269 Stat_t statcache;
1270 } data;
1271 1320
1321 RETVAL = newSV (sizeof (struct io_state));
1322 data = (struct io_state *)SvPVX (RETVAL);
1323 SvCUR_set (RETVAL, sizeof (struct io_state));
1324 SvPOK_only (RETVAL);
1325
1272 data.errorno = errno; 1326 data->errorno = errno;
1273 data.laststype = PL_laststype; 1327 data->laststype = PL_laststype;
1274 data.laststatval = PL_laststatval; 1328 data->laststatval = PL_laststatval;
1275 data.statcache = PL_statcache; 1329 data->statcache = PL_statcache;
1276
1277 RETVAL = newSVpvn ((char *)&data, sizeof data);
1278} 1330}
1279 OUTPUT: 1331 OUTPUT:
1280 RETVAL 1332 RETVAL
1281 1333
1282void 1334void
1283_set_state (char *data_) 1335_set_state (char *data_)
1284 PROTOTYPE: $ 1336 PROTOTYPE: $
1285 CODE: 1337 CODE:
1286{ 1338{
1287 struct { 1339 struct io_state *data = (void *)data_;
1288 int errorno;
1289 int laststype;
1290 int laststatval;
1291 Stat_t statcache;
1292 } *data = (void *)data_;
1293 1340
1294 errno = data->errorno; 1341 errno = data->errorno;
1295 PL_laststype = data->laststype; 1342 PL_laststype = data->laststype;
1296 PL_laststatval = data->laststatval; 1343 PL_laststatval = data->laststatval;
1297 PL_statcache = data->statcache; 1344 PL_statcache = data->statcache;
1298} 1345}
1346

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines