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.124 by root, Tue Dec 5 12:50:04 2006 UTC vs.
Revision 1.139 by root, Sun Jan 14 21:13:41 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#include <assert.h> 11#include <assert.h>
46
47#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
48# undef STACKGUARD
49#endif
50
51#ifndef STACKGUARD
52# define STACKGUARD 0
53#endif
54 12
55#ifdef HAVE_MMAP 13#ifdef HAVE_MMAP
56# include <unistd.h> 14# include <unistd.h>
57# include <sys/mman.h> 15# include <sys/mman.h>
58# ifndef MAP_ANONYMOUS 16# ifndef MAP_ANONYMOUS
… …
73#else 31#else
74# define PAGESIZE 0 32# define PAGESIZE 0
75# define BOOT_PAGESIZE (void)0 33# define BOOT_PAGESIZE (void)0
76#endif 34#endif
77 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
78/* 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
79 * 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
80 * and should be unique. */ 90 * and should be unique. */
81#define dSTACKLEVEL int stacklevel 91#define dSTACKLEVEL int stacklevel
82#define STACKLEVEL ((void *)&stacklevel) 92#define STACKLEVEL ((void *)&stacklevel)
83 93
84#define IN_DESTRUCT (PL_main_cv == Nullcv) 94#define IN_DESTRUCT (PL_main_cv == Nullcv)
85 95
86#if __GNUC__ >= 3 96#if __GNUC__ >= 3
87# define attribute(x) __attribute__(x) 97# define attribute(x) __attribute__(x)
98# define BARRIER __asm__ __volatile__ ("" : : : "memory")
88#else 99#else
89# define attribute(x) 100# define attribute(x)
101# define BARRIER
90#endif 102#endif
91 103
92#define NOINLINE attribute ((noinline)) 104#define NOINLINE attribute ((noinline))
93 105
94#include "CoroAPI.h" 106#include "CoroAPI.h"
… …
100#else 112#else
101# define LOCK (void)0 113# define LOCK (void)0
102# define UNLOCK (void)0 114# define UNLOCK (void)0
103#endif 115#endif
104 116
117/* helper storage struct for Coro::AIO */
105struct io_state 118struct io_state
106{ 119{
107 int errorno; 120 int errorno;
108 I32 laststype; 121 I32 laststype;
109 int laststatval; 122 int laststatval;
… …
125 /* the stack */ 138 /* the stack */
126 void *sptr; 139 void *sptr;
127 long ssize; /* positive == mmap, otherwise malloc */ 140 long ssize; /* positive == mmap, otherwise malloc */
128 141
129 /* cpu state */ 142 /* cpu state */
130 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 143 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
144 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
131 JMPENV *top_env; 145 JMPENV *top_env;
132 coro_context cctx; 146 coro_context cctx;
133 147
134 int inuse; 148 int inuse;
135 149
… …
137 int valgrind_id; 151 int valgrind_id;
138#endif 152#endif
139} coro_cctx; 153} coro_cctx;
140 154
141enum { 155enum {
142 CF_RUNNING = 0x0001, /* coroutine is running */ 156 CF_RUNNING = 0x0001, /* coroutine is running */
143 CF_READY = 0x0002, /* coroutine is ready */ 157 CF_READY = 0x0002, /* coroutine is ready */
144 CF_NEW = 0x0004, /* ahs never been switched to */ 158 CF_NEW = 0x0004, /* has never been switched to */
159 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
145}; 160};
146 161
147/* this is a structure representing a perl-level coroutine */ 162/* this is a structure representing a perl-level coroutine */
148struct coro { 163struct coro {
149 /* the c coroutine allocated to this perl coroutine, if any */ 164 /* the c coroutine allocated to this perl coroutine, if any */
… …
171}; 186};
172 187
173typedef struct coro *Coro__State; 188typedef struct coro *Coro__State;
174typedef struct coro *Coro__State_or_hashref; 189typedef struct coro *Coro__State_or_hashref;
175 190
191/** Coro ********************************************************************/
192
193#define PRIO_MAX 3
194#define PRIO_HIGH 1
195#define PRIO_NORMAL 0
196#define PRIO_LOW -1
197#define PRIO_IDLE -3
198#define PRIO_MIN -4
199
200/* for Coro.pm */
201static SV *coro_current;
202static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
203static int coro_nready;
204
205/** lowlevel stuff **********************************************************/
206
176static AV * 207static AV *
177coro_clone_padlist (CV *cv) 208coro_clone_padlist (CV *cv)
178{ 209{
179 AV *padlist = CvPADLIST (cv); 210 AV *padlist = CvPADLIST (cv);
180 AV *newpadlist, *newpad; 211 AV *newpadlist, *newpad;
… …
254 285
255 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 286 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
256 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 287 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
257 else 288 else
258 { 289 {
259#if 0 290#if PREFER_PERL_FUNCTIONS
260 /* this is probably cleaner, but also slower? */ 291 /* this is probably cleaner, but also slower? */
261 CV *cp = Perl_cv_clone (cv); 292 CV *cp = Perl_cv_clone (cv);
262 CvPADLIST (cv) = CvPADLIST (cp); 293 CvPADLIST (cv) = CvPADLIST (cp);
263 CvPADLIST (cp) = 0; 294 CvPADLIST (cp) = 0;
264 SvREFCNT_dec (cp); 295 SvREFCNT_dec (cp);
… …
287 if (AvFILLp (av) >= AvMAX (av)) 318 if (AvFILLp (av) >= AvMAX (av))
288 av_extend (av, AvMAX (av) + 1); 319 av_extend (av, AvMAX (av) + 1);
289 320
290 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 321 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
291} 322}
323
324/** load & save, init *******************************************************/
292 325
293#define SB do { 326#define SB do {
294#define SE } while (0) 327#define SE } while (0)
295 328
296#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 329#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
… …
345 /* 378 /*
346 * the worst thing you can imagine happens first - we have to save 379 * the worst thing you can imagine happens first - we have to save
347 * (and reinitialize) all cv's in the whole callchain :( 380 * (and reinitialize) all cv's in the whole callchain :(
348 */ 381 */
349 382
383 EXTEND (SP, 3 + 1);
350 PUSHs (Nullsv); 384 PUSHs (Nullsv);
351 /* this loop was inspired by pp_caller */ 385 /* this loop was inspired by pp_caller */
352 for (;;) 386 for (;;)
353 { 387 {
354 while (cxix >= 0) 388 while (cxix >= 0)
… …
360 CV *cv = cx->blk_sub.cv; 394 CV *cv = cx->blk_sub.cv;
361 395
362 if (CvDEPTH (cv)) 396 if (CvDEPTH (cv))
363 { 397 {
364 EXTEND (SP, 3); 398 EXTEND (SP, 3);
365
366 PUSHs ((SV *)CvPADLIST (cv)); 399 PUSHs ((SV *)CvPADLIST (cv));
367 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 400 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
368 PUSHs ((SV *)cv); 401 PUSHs ((SV *)cv);
369 402
370 CvDEPTH (cv) = 0; 403 CvDEPTH (cv) = 0;
371 get_padlist (cv); 404 get_padlist (cv);
372 } 405 }
373 } 406 }
374#ifdef CXt_FORMAT
375 else if (CxTYPE (cx) == CXt_FORMAT)
376 {
377 /* I never used formats, so how should I know how these are implemented? */
378 /* my bold guess is as a simple, plain sub... */
379 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
380 }
381#endif
382 } 407 }
383 408
384 if (top_si->si_type == PERLSI_MAIN) 409 if (top_si->si_type == PERLSI_MAIN)
385 break; 410 break;
386 411
… …
406 * allocate various perl stacks. This is an exact copy 431 * allocate various perl stacks. This is an exact copy
407 * of perl.c:init_stacks, except that it uses less memory 432 * of perl.c:init_stacks, except that it uses less memory
408 * on the (sometimes correct) assumption that coroutines do 433 * on the (sometimes correct) assumption that coroutines do
409 * not usually need a lot of stackspace. 434 * not usually need a lot of stackspace.
410 */ 435 */
436#if PREFER_PERL_FUNCTIONS
437# define coro_init_stacks init_stacks
438#else
411static void 439static void
412coro_init_stacks () 440coro_init_stacks ()
413{ 441{
414 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 442 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
415 PL_curstackinfo->si_type = PERLSI_MAIN; 443 PL_curstackinfo->si_type = PERLSI_MAIN;
… …
445 New(54,PL_retstack,16,OP*); 473 New(54,PL_retstack,16,OP*);
446 PL_retstack_ix = 0; 474 PL_retstack_ix = 0;
447 PL_retstack_max = 16; 475 PL_retstack_max = 16;
448#endif 476#endif
449} 477}
478#endif
450 479
451/* 480/*
452 * destroy the stacks, the callchain etc... 481 * destroy the stacks, the callchain etc...
453 */ 482 */
454static void 483static void
455coro_destroy_stacks () 484coro_destroy_stacks ()
456{ 485{
457 if (!IN_DESTRUCT) 486 if (!IN_DESTRUCT)
458 { 487 {
459 /* is this ugly, I ask? */ 488 /* restore all saved variables and stuff */
460 LEAVE_SCOPE (0); 489 LEAVE_SCOPE (0);
490 assert (PL_tmps_floor == -1);
461 491
462 /* sure it is, but more important: is it correct?? :/ */ 492 /* free all temporaries */
463 FREETMPS; 493 FREETMPS;
494 assert (PL_tmps_ix == -1);
464 495
496 /* unwind all extra stacks */
465 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 497 POPSTACK_TO (PL_mainstack);
498
499 /* unwind main stack */
500 dounwind (-1);
466 } 501 }
467 502
468 while (PL_curstackinfo->si_next) 503 while (PL_curstackinfo->si_next)
469 PL_curstackinfo = PL_curstackinfo->si_next; 504 PL_curstackinfo = PL_curstackinfo->si_next;
470 505
471 while (PL_curstackinfo) 506 while (PL_curstackinfo)
472 { 507 {
473 PERL_SI *p = PL_curstackinfo->si_prev; 508 PERL_SI *p = PL_curstackinfo->si_prev;
474 509
475 { /*D*//*remove*/
476 dSP;
477 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
478 PUTBACK; /* possibly superfluous */
479 }
480
481 if (!IN_DESTRUCT) 510 if (!IN_DESTRUCT)
482 {
483 dounwind (-1);/*D*//*remove*/
484 SvREFCNT_dec (PL_curstackinfo->si_stack); 511 SvREFCNT_dec (PL_curstackinfo->si_stack);
485 }
486 512
487 Safefree (PL_curstackinfo->si_cxstack); 513 Safefree (PL_curstackinfo->si_cxstack);
488 Safefree (PL_curstackinfo); 514 Safefree (PL_curstackinfo);
489 PL_curstackinfo = p; 515 PL_curstackinfo = p;
490 } 516 }
… …
495 Safefree (PL_savestack); 521 Safefree (PL_savestack);
496#if !PERL_VERSION_ATLEAST (5,9,0) 522#if !PERL_VERSION_ATLEAST (5,9,0)
497 Safefree (PL_retstack); 523 Safefree (PL_retstack);
498#endif 524#endif
499} 525}
526
527/** coroutine stack handling ************************************************/
500 528
501static void 529static void
502setup_coro (struct coro *coro) 530setup_coro (struct coro *coro)
503{ 531{
504 /* 532 /*
… …
697 ++cctx_idle; 725 ++cctx_idle;
698 cctx->next = cctx_first; 726 cctx->next = cctx_first;
699 cctx_first = cctx; 727 cctx_first = cctx;
700} 728}
701 729
730/** coroutine switching *****************************************************/
731
702/* never call directly, always through the coro_state_transfer global variable */ 732/* never call directly, always through the coro_state_transfer global variable */
703static void NOINLINE 733static void NOINLINE
704transfer (struct coro *prev, struct coro *next) 734transfer (struct coro *prev, struct coro *next)
705{ 735{
706 dSTACKLEVEL; 736 dSTACKLEVEL;
707 737
708 /* sometimes transfer is only called to set idle_sp */ 738 /* sometimes transfer is only called to set idle_sp */
709 if (!next) 739 if (!next)
710 { 740 {
711 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 741 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
712 assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */ 742 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
713 } 743 }
714 else if (prev != next) 744 else if (prev != next)
715 { 745 {
716 coro_cctx *prev__cctx; 746 coro_cctx *prev__cctx;
717 747
… …
728 if (!prev->flags & CF_RUNNING) 758 if (!prev->flags & CF_RUNNING)
729 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); 759 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
730 760
731 if (next->flags & CF_RUNNING) 761 if (next->flags & CF_RUNNING)
732 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 762 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
763
764 if (next->flags & CF_DESTROYED)
765 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
733 766
734 prev->flags &= ~CF_RUNNING; 767 prev->flags &= ~CF_RUNNING;
735 next->flags |= CF_RUNNING; 768 next->flags |= CF_RUNNING;
736 769
737 LOCK; 770 LOCK;
… …
758 791
759 /* possibly "free" the cctx */ 792 /* possibly "free" the cctx */
760 if (prev__cctx->idle_sp == STACKLEVEL) 793 if (prev__cctx->idle_sp == STACKLEVEL)
761 { 794 {
762 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 795 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
763 assert (PL_top_env == prev__cctx->top_env); 796 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
764 797
765 prev->cctx = 0; 798 prev->cctx = 0;
766 799
767 cctx_put (prev__cctx); 800 cctx_put (prev__cctx);
768 prev__cctx->inuse = 0; 801 prev__cctx->inuse = 0;
… …
781 PL_top_env = next->cctx->top_env; 814 PL_top_env = next->cctx->top_env;
782 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 815 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
783 } 816 }
784 817
785 free_coro_mortal (); 818 free_coro_mortal ();
786
787 UNLOCK; 819 UNLOCK;
788 } 820 }
789} 821}
790 822
791struct transfer_args 823struct transfer_args
… …
793 struct coro *prev, *next; 825 struct coro *prev, *next;
794}; 826};
795 827
796#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 828#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
797 829
830/** high level stuff ********************************************************/
831
798static void 832static int
799coro_state_destroy (struct coro *coro) 833coro_state_destroy (struct coro *coro)
800{ 834{
801 if (coro->refcnt--) 835 if (coro->flags & CF_DESTROYED)
802 return; 836 return 0;
837
838 coro->flags |= CF_DESTROYED;
839
840 if (coro->flags & CF_READY)
841 {
842 /* reduce nready, as destroying a ready coro effectively unreadies it */
843 /* alternative: look through all ready queues and remove the coro */
844 LOCK;
845 --coro_nready;
846 UNLOCK;
847 }
848 else
849 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
803 850
804 if (coro->mainstack && coro->mainstack != main_mainstack) 851 if (coro->mainstack && coro->mainstack != main_mainstack)
805 { 852 {
853 assert (!(coro->flags & CF_RUNNING));
854
806 struct coro temp; 855 struct coro temp;
807 Zero (&temp, 1, struct coro); 856 Zero (&temp, 1, struct coro);
808 temp.save = CORO_SAVE_ALL; 857 temp.save = CORO_SAVE_ALL;
809 858
810 if (coro->flags & CF_RUNNING) 859 if (coro->flags & CF_RUNNING)
… …
820 coro->mainstack = 0; 869 coro->mainstack = 0;
821 } 870 }
822 871
823 cctx_destroy (coro->cctx); 872 cctx_destroy (coro->cctx);
824 SvREFCNT_dec (coro->args); 873 SvREFCNT_dec (coro->args);
825 Safefree (coro); 874
875 return 1;
826} 876}
827 877
828static int 878static int
829coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 879coro_state_free (pTHX_ SV *sv, MAGIC *mg)
830{ 880{
831 struct coro *coro = (struct coro *)mg->mg_ptr; 881 struct coro *coro = (struct coro *)mg->mg_ptr;
832 mg->mg_ptr = 0; 882 mg->mg_ptr = 0;
833 883
884 if (--coro->refcnt < 0)
885 {
834 coro_state_destroy (coro); 886 coro_state_destroy (coro);
887 Safefree (coro);
888 }
835 889
836 return 0; 890 return 0;
837} 891}
838 892
839static int 893static int
… …
846 return 0; 900 return 0;
847} 901}
848 902
849static MGVTBL coro_state_vtbl = { 903static MGVTBL coro_state_vtbl = {
850 0, 0, 0, 0, 904 0, 0, 0, 0,
851 coro_state_clear, 905 coro_state_free,
852 0, 906 0,
853#ifdef MGf_DUP 907#ifdef MGf_DUP
854 coro_state_dup, 908 coro_state_dup,
855#else 909#else
856# define MGf_DUP 0 910# define MGf_DUP 0
… …
907 return old_save; 961 return old_save;
908} 962}
909 963
910/** Coro ********************************************************************/ 964/** Coro ********************************************************************/
911 965
912#define PRIO_MAX 3
913#define PRIO_HIGH 1
914#define PRIO_NORMAL 0
915#define PRIO_LOW -1
916#define PRIO_IDLE -3
917#define PRIO_MIN -4
918
919/* for Coro.pm */
920static SV *coro_current;
921static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
922static int coro_nready;
923
924static void 966static void
925coro_enq (SV *coro_sv) 967coro_enq (SV *coro_sv)
926{ 968{
927 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 969 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
928 coro_nready++;
929} 970}
930 971
931static SV * 972static SV *
932coro_deq (int min_prio) 973coro_deq (int min_prio)
933{ 974{
… …
937 if (min_prio < 0) 978 if (min_prio < 0)
938 min_prio = 0; 979 min_prio = 0;
939 980
940 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 981 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
941 if (AvFILLp (coro_ready [prio]) >= 0) 982 if (AvFILLp (coro_ready [prio]) >= 0)
942 {
943 coro_nready--;
944 return av_shift (coro_ready [prio]); 983 return av_shift (coro_ready [prio]);
945 }
946 984
947 return 0; 985 return 0;
948} 986}
949 987
950static int 988static int
… …
958 coro = SvSTATE (coro_sv); 996 coro = SvSTATE (coro_sv);
959 997
960 if (coro->flags & CF_READY) 998 if (coro->flags & CF_READY)
961 return 0; 999 return 0;
962 1000
963#if 0 /* this is actually harmless */
964 if (coro->flags & CF_RUNNING)
965 croak ("Coro::ready called on currently running coroutine");
966#endif
967
968 coro->flags |= CF_READY; 1001 coro->flags |= CF_READY;
969 1002
970 LOCK; 1003 LOCK;
971 coro_enq (SvREFCNT_inc (coro_sv)); 1004 coro_enq (SvREFCNT_inc (coro_sv));
1005 ++coro_nready;
972 UNLOCK; 1006 UNLOCK;
973 1007
974 return 1; 1008 return 1;
975} 1009}
976 1010
977static int 1011static int
978api_is_ready (SV *coro_sv) 1012api_is_ready (SV *coro_sv)
979{ 1013{
980 return !!SvSTATE (coro_sv)->flags & CF_READY; 1014 return !!(SvSTATE (coro_sv)->flags & CF_READY);
981} 1015}
982 1016
983static void 1017static void
984prepare_schedule (struct transfer_args *ta) 1018prepare_schedule (struct transfer_args *ta)
985{ 1019{
986 SV *prev, *next; 1020 SV *prev_sv, *next_sv;
987 1021
988 for (;;) 1022 for (;;)
989 { 1023 {
990 LOCK; 1024 LOCK;
991 next = coro_deq (PRIO_MIN); 1025 next_sv = coro_deq (PRIO_MIN);
1026
1027 /* nothing to schedule: call the idle handler */
1028 if (!next_sv)
1029 {
1030 UNLOCK;
1031 dSP;
1032
1033 ENTER;
1034 SAVETMPS;
1035
1036 PUSHMARK (SP);
1037 PUTBACK;
1038 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1039
1040 FREETMPS;
1041 LEAVE;
1042 continue;
1043 }
1044
1045 ta->next = SvSTATE (next_sv);
1046
1047 /* cannot transfer to destroyed coros, skip and look for next */
1048 if (ta->next->flags & CF_DESTROYED)
1049 {
1050 UNLOCK;
1051 SvREFCNT_dec (next_sv);
1052 /* coro_nready is already taken care of by destroy */
1053 continue;
1054 }
1055
1056 --coro_nready;
992 UNLOCK; 1057 UNLOCK;
993
994 if (next)
995 break; 1058 break;
996
997 {
998 dSP;
999
1000 ENTER;
1001 SAVETMPS;
1002
1003 PUSHMARK (SP);
1004 PUTBACK;
1005 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1006
1007 FREETMPS;
1008 LEAVE;
1009 } 1059 }
1010 }
1011
1012 prev = SvRV (coro_current);
1013 SvRV_set (coro_current, next);
1014 1060
1015 /* free this only after the transfer */ 1061 /* free this only after the transfer */
1062 prev_sv = SvRV (coro_current);
1063 SvRV_set (coro_current, next_sv);
1064 ta->prev = SvSTATE (prev_sv);
1065
1066 assert (ta->next->flags & CF_READY);
1067 ta->next->flags &= ~CF_READY;
1068
1016 LOCK; 1069 LOCK;
1017 free_coro_mortal (); 1070 free_coro_mortal ();
1071 coro_mortal = prev_sv;
1018 UNLOCK; 1072 UNLOCK;
1019 coro_mortal = prev;
1020
1021 assert (!SvROK(prev));//D
1022 assert (!SvROK(next));//D
1023
1024 ta->prev = SvSTATE (prev);
1025 ta->next = SvSTATE (next);
1026
1027 assert (ta->next->flags & CF_READY);
1028 ta->next->flags &= ~CF_READY;
1029} 1073}
1030 1074
1031static void 1075static void
1032prepare_cede (struct transfer_args *ta) 1076prepare_cede (struct transfer_args *ta)
1033{ 1077{
1034 api_ready (coro_current); 1078 api_ready (coro_current);
1035
1036 prepare_schedule (ta); 1079 prepare_schedule (ta);
1080}
1081
1082static int
1083prepare_cede_notself (struct transfer_args *ta)
1084{
1085 if (coro_nready)
1086 {
1087 SV *prev = SvRV (coro_current);
1088 prepare_schedule (ta);
1089 api_ready (prev);
1090 return 1;
1091 }
1092 else
1093 return 0;
1037} 1094}
1038 1095
1039static void 1096static void
1040api_schedule (void) 1097api_schedule (void)
1041{ 1098{
… …
1043 1100
1044 prepare_schedule (&ta); 1101 prepare_schedule (&ta);
1045 TRANSFER (ta); 1102 TRANSFER (ta);
1046} 1103}
1047 1104
1048static void 1105static int
1049api_cede (void) 1106api_cede (void)
1050{ 1107{
1051 struct transfer_args ta; 1108 struct transfer_args ta;
1052 1109
1053 prepare_cede (&ta); 1110 prepare_cede (&ta);
1111
1112 if (ta.prev != ta.next)
1113 {
1054 TRANSFER (ta); 1114 TRANSFER (ta);
1115 return 1;
1116 }
1117 else
1118 return 0;
1119}
1120
1121static int
1122api_cede_notself (void)
1123{
1124 struct transfer_args ta;
1125
1126 if (prepare_cede_notself (&ta))
1127 {
1128 TRANSFER (ta);
1129 return 1;
1130 }
1131 else
1132 return 0;
1055} 1133}
1056 1134
1057MODULE = Coro::State PACKAGE = Coro::State 1135MODULE = Coro::State PACKAGE = Coro::State
1058 1136
1059PROTOTYPES: DISABLE 1137PROTOTYPES: DISABLE
… …
1115_set_stacklevel (...) 1193_set_stacklevel (...)
1116 ALIAS: 1194 ALIAS:
1117 Coro::State::transfer = 1 1195 Coro::State::transfer = 1
1118 Coro::schedule = 2 1196 Coro::schedule = 2
1119 Coro::cede = 3 1197 Coro::cede = 3
1198 Coro::cede_notself = 4
1120 CODE: 1199 CODE:
1121{ 1200{
1122 struct transfer_args ta; 1201 struct transfer_args ta;
1123 1202
1124 switch (ix) 1203 switch (ix)
… …
1140 break; 1219 break;
1141 1220
1142 case 3: 1221 case 3:
1143 prepare_cede (&ta); 1222 prepare_cede (&ta);
1144 break; 1223 break;
1224
1225 case 4:
1226 if (!prepare_cede_notself (&ta))
1227 XSRETURN_EMPTY;
1228
1229 break;
1145 } 1230 }
1146 1231
1232 BARRIER;
1147 TRANSFER (ta); 1233 TRANSFER (ta);
1148}
1149 1234
1150void 1235 if (GIMME_V != G_VOID && ta.next != ta.prev)
1151_clone_state_from (SV *dst, SV *src) 1236 XSRETURN_YES;
1237}
1238
1239bool
1240_destroy (SV *coro_sv)
1152 CODE: 1241 CODE:
1153{ 1242 RETVAL = coro_state_destroy (SvSTATE (coro_sv));
1154 struct coro *coro_src = SvSTATE (src); 1243 OUTPUT:
1155 1244 RETVAL
1156 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1157
1158 ++coro_src->refcnt;
1159 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1160}
1161 1245
1162void 1246void
1163_exit (code) 1247_exit (code)
1164 int code 1248 int code
1165 PROTOTYPE: $ 1249 PROTOTYPE: $
… …
1202 coro_ready[i] = newAV (); 1286 coro_ready[i] = newAV ();
1203 1287
1204 { 1288 {
1205 SV *sv = perl_get_sv("Coro::API", 1); 1289 SV *sv = perl_get_sv("Coro::API", 1);
1206 1290
1207 coroapi.schedule = api_schedule; 1291 coroapi.schedule = api_schedule;
1208 coroapi.save = api_save; 1292 coroapi.save = api_save;
1209 coroapi.cede = api_cede; 1293 coroapi.cede = api_cede;
1294 coroapi.cede_notself = api_cede_notself;
1210 coroapi.ready = api_ready; 1295 coroapi.ready = api_ready;
1211 coroapi.is_ready = api_is_ready; 1296 coroapi.is_ready = api_is_ready;
1212 coroapi.nready = &coro_nready; 1297 coroapi.nready = &coro_nready;
1213 coroapi.current = coro_current; 1298 coroapi.current = coro_current;
1214 1299
1215 GCoroAPI = &coroapi; 1300 GCoroAPI = &coroapi;
1216 sv_setiv (sv, (IV)&coroapi); 1301 sv_setiv (sv, (IV)&coroapi);
1217 SvREADONLY_on (sv); 1302 SvREADONLY_on (sv);
1218 } 1303 }
… …
1234 RETVAL = coro->prio; 1319 RETVAL = coro->prio;
1235 1320
1236 if (items > 1) 1321 if (items > 1)
1237 { 1322 {
1238 if (ix) 1323 if (ix)
1239 newprio += coro->prio; 1324 newprio = coro->prio - newprio;
1240 1325
1241 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1326 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1242 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1327 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1243 1328
1244 coro->prio = newprio; 1329 coro->prio = newprio;
1245 } 1330 }
1246} 1331}
1332 OUTPUT:
1333 RETVAL
1247 1334
1248SV * 1335SV *
1249ready (SV *self) 1336ready (SV *self)
1250 PROTOTYPE: $ 1337 PROTOTYPE: $
1251 CODE: 1338 CODE:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines