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.122 by root, Mon Dec 4 13:47:56 2006 UTC vs.
Revision 1.137 by root, Sun Jan 14 20:47:53 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"
… …
99#else 112#else
100# define LOCK (void)0 113# define LOCK (void)0
101# define UNLOCK (void)0 114# define UNLOCK (void)0
102#endif 115#endif
103 116
117/* helper storage struct for Coro::AIO */
104struct io_state 118struct io_state
105{ 119{
106 int errorno; 120 int errorno;
107 I32 laststype; 121 I32 laststype;
108 int laststatval; 122 int laststatval;
… …
124 /* the stack */ 138 /* the stack */
125 void *sptr; 139 void *sptr;
126 long ssize; /* positive == mmap, otherwise malloc */ 140 long ssize; /* positive == mmap, otherwise malloc */
127 141
128 /* cpu state */ 142 /* cpu state */
129 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 */
130 JMPENV *top_env; 145 JMPENV *top_env;
131 coro_context cctx; 146 coro_context cctx;
132 147
133 int inuse; 148 int inuse;
134 149
… …
136 int valgrind_id; 151 int valgrind_id;
137#endif 152#endif
138} coro_cctx; 153} coro_cctx;
139 154
140enum { 155enum {
141 CF_RUNNING = 0x0001, /* coroutine is running */ 156 CF_RUNNING = 0x0001, /* coroutine is running */
142 CF_READY = 0x0002, /* coroutine is ready */ 157 CF_READY = 0x0002, /* coroutine is ready */
143 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 */
144}; 160};
145 161
146/* this is a structure representing a perl-level coroutine */ 162/* this is a structure representing a perl-level coroutine */
147struct coro { 163struct coro {
148 /* the c coroutine allocated to this perl coroutine, if any */ 164 /* the c coroutine allocated to this perl coroutine, if any */
… …
157 /* optionally saved, might be zero */ 173 /* optionally saved, might be zero */
158 AV *defav; /* @_ */ 174 AV *defav; /* @_ */
159 SV *defsv; /* $_ */ 175 SV *defsv; /* $_ */
160 SV *errsv; /* $@ */ 176 SV *errsv; /* $@ */
161 SV *irssv; /* $/ */ 177 SV *irssv; /* $/ */
178 SV *irssv_sv; /* real $/ cache */
162 179
163#define VAR(name,type) type name; 180#define VAR(name,type) type name;
164# include "state.h" 181# include "state.h"
165#undef VAR 182#undef VAR
166 183
… …
168 int prio; 185 int prio;
169}; 186};
170 187
171typedef struct coro *Coro__State; 188typedef struct coro *Coro__State;
172typedef struct coro *Coro__State_or_hashref; 189typedef struct coro *Coro__State_or_hashref;
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 **********************************************************/
173 206
174static AV * 207static AV *
175coro_clone_padlist (CV *cv) 208coro_clone_padlist (CV *cv)
176{ 209{
177 AV *padlist = CvPADLIST (cv); 210 AV *padlist = CvPADLIST (cv);
… …
252 285
253 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 286 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
254 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 287 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
255 else 288 else
256 { 289 {
257#if 0 290#if PREFER_PERL_FUNCTIONS
258 /* this is probably cleaner, but also slower? */ 291 /* this is probably cleaner, but also slower? */
259 CV *cp = Perl_cv_clone (cv); 292 CV *cp = Perl_cv_clone (cv);
260 CvPADLIST (cv) = CvPADLIST (cp); 293 CvPADLIST (cv) = CvPADLIST (cp);
261 CvPADLIST (cp) = 0; 294 CvPADLIST (cp) = 0;
262 SvREFCNT_dec (cp); 295 SvREFCNT_dec (cp);
… …
286 av_extend (av, AvMAX (av) + 1); 319 av_extend (av, AvMAX (av) + 1);
287 320
288 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 321 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
289} 322}
290 323
324/** load & save, init *******************************************************/
325
291#define SB do { 326#define SB do {
292#define SE } while (0) 327#define SE } while (0)
293 328
294#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
295 330
… …
301#undef VAR 336#undef VAR
302 337
303 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 338 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
304 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 339 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
305 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 340 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
306 if (c->irssv) REPLACE_SV (PL_rs , c->irssv); 341 if (c->irssv)
342 {
343 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
344 SvREFCNT_dec (c->irssv);
345 else
346 {
347 REPLACE_SV (PL_rs, c->irssv);
348 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
349 sv_setsv (c->irssv_sv, PL_rs);
350 }
351 }
307 352
308 { 353 {
309 dSP; 354 dSP;
310 CV *cv; 355 CV *cv;
311 356
… …
333 /* 378 /*
334 * 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
335 * (and reinitialize) all cv's in the whole callchain :( 380 * (and reinitialize) all cv's in the whole callchain :(
336 */ 381 */
337 382
383 EXTEND (SP, 3 + 1);
338 PUSHs (Nullsv); 384 PUSHs (Nullsv);
339 /* this loop was inspired by pp_caller */ 385 /* this loop was inspired by pp_caller */
340 for (;;) 386 for (;;)
341 { 387 {
342 while (cxix >= 0) 388 while (cxix >= 0)
… …
348 CV *cv = cx->blk_sub.cv; 394 CV *cv = cx->blk_sub.cv;
349 395
350 if (CvDEPTH (cv)) 396 if (CvDEPTH (cv))
351 { 397 {
352 EXTEND (SP, 3); 398 EXTEND (SP, 3);
353
354 PUSHs ((SV *)CvPADLIST (cv)); 399 PUSHs ((SV *)CvPADLIST (cv));
355 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 400 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
356 PUSHs ((SV *)cv); 401 PUSHs ((SV *)cv);
357 402
358 CvDEPTH (cv) = 0; 403 CvDEPTH (cv) = 0;
359 get_padlist (cv); 404 get_padlist (cv);
360 } 405 }
361 } 406 }
362#ifdef CXt_FORMAT
363 else if (CxTYPE (cx) == CXt_FORMAT)
364 {
365 /* I never used formats, so how should I know how these are implemented? */
366 /* my bold guess is as a simple, plain sub... */
367 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
368 }
369#endif
370 } 407 }
371 408
372 if (top_si->si_type == PERLSI_MAIN) 409 if (top_si->si_type == PERLSI_MAIN)
373 break; 410 break;
374 411
… …
394 * allocate various perl stacks. This is an exact copy 431 * allocate various perl stacks. This is an exact copy
395 * of perl.c:init_stacks, except that it uses less memory 432 * of perl.c:init_stacks, except that it uses less memory
396 * on the (sometimes correct) assumption that coroutines do 433 * on the (sometimes correct) assumption that coroutines do
397 * not usually need a lot of stackspace. 434 * not usually need a lot of stackspace.
398 */ 435 */
436#if PREFER_PERL_FUNCTIONS
437# define coro_init_stacks init_stacks
438#else
399static void 439static void
400coro_init_stacks () 440coro_init_stacks ()
401{ 441{
402 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 442 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
403 PL_curstackinfo->si_type = PERLSI_MAIN; 443 PL_curstackinfo->si_type = PERLSI_MAIN;
… …
433 New(54,PL_retstack,16,OP*); 473 New(54,PL_retstack,16,OP*);
434 PL_retstack_ix = 0; 474 PL_retstack_ix = 0;
435 PL_retstack_max = 16; 475 PL_retstack_max = 16;
436#endif 476#endif
437} 477}
478#endif
438 479
439/* 480/*
440 * destroy the stacks, the callchain etc... 481 * destroy the stacks, the callchain etc...
441 */ 482 */
442static void 483static void
443coro_destroy_stacks () 484coro_destroy_stacks ()
444{ 485{
445 if (!IN_DESTRUCT) 486 if (!IN_DESTRUCT)
446 { 487 {
447 /* is this ugly, I ask? */ 488 /* restore all saved variables and stuff */
448 LEAVE_SCOPE (0); 489 LEAVE_SCOPE (0);
490 assert (PL_tmps_floor == -1);
449 491
450 /* sure it is, but more important: is it correct?? :/ */ 492 /* free all temporaries */
451 FREETMPS; 493 FREETMPS;
494 assert (PL_tmps_ix == -1);
452 495
496 /* unwind all extra stacks */
453 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 497 POPSTACK_TO (PL_mainstack);
498
499 /* unwind main stack */
500 dounwind (-1);
454 } 501 }
455 502
456 while (PL_curstackinfo->si_next) 503 while (PL_curstackinfo->si_next)
457 PL_curstackinfo = PL_curstackinfo->si_next; 504 PL_curstackinfo = PL_curstackinfo->si_next;
458 505
459 while (PL_curstackinfo) 506 while (PL_curstackinfo)
460 { 507 {
461 PERL_SI *p = PL_curstackinfo->si_prev; 508 PERL_SI *p = PL_curstackinfo->si_prev;
462 509
463 { /*D*//*remove*/
464 dSP;
465 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
466 PUTBACK; /* possibly superfluous */
467 }
468
469 if (!IN_DESTRUCT) 510 if (!IN_DESTRUCT)
470 {
471 dounwind (-1);/*D*//*remove*/
472 SvREFCNT_dec (PL_curstackinfo->si_stack); 511 SvREFCNT_dec (PL_curstackinfo->si_stack);
473 }
474 512
475 Safefree (PL_curstackinfo->si_cxstack); 513 Safefree (PL_curstackinfo->si_cxstack);
476 Safefree (PL_curstackinfo); 514 Safefree (PL_curstackinfo);
477 PL_curstackinfo = p; 515 PL_curstackinfo = p;
478 } 516 }
… …
483 Safefree (PL_savestack); 521 Safefree (PL_savestack);
484#if !PERL_VERSION_ATLEAST (5,9,0) 522#if !PERL_VERSION_ATLEAST (5,9,0)
485 Safefree (PL_retstack); 523 Safefree (PL_retstack);
486#endif 524#endif
487} 525}
526
527/** coroutine stack handling ************************************************/
488 528
489static void 529static void
490setup_coro (struct coro *coro) 530setup_coro (struct coro *coro)
491{ 531{
492 /* 532 /*
… …
582{ 622{
583 coro_cctx *cctx; 623 coro_cctx *cctx;
584 624
585 ++cctx_count; 625 ++cctx_count;
586 626
587 New (0, cctx, 1, coro_cctx); 627 Newz (0, cctx, 1, coro_cctx);
588 628
589#if HAVE_MMAP 629#if HAVE_MMAP
590 630
591 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 631 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
592 /* mmap supposedly does allocate-on-write for us */ 632 /* mmap supposedly does allocate-on-write for us */
… …
685 ++cctx_idle; 725 ++cctx_idle;
686 cctx->next = cctx_first; 726 cctx->next = cctx_first;
687 cctx_first = cctx; 727 cctx_first = cctx;
688} 728}
689 729
730/** coroutine switching *****************************************************/
731
690/* never call directly, always through the coro_state_transfer global variable */ 732/* never call directly, always through the coro_state_transfer global variable */
691static void NOINLINE 733static void NOINLINE
692transfer (struct coro *prev, struct coro *next) 734transfer (struct coro *prev, struct coro *next)
693{ 735{
694 dSTACKLEVEL; 736 dSTACKLEVEL;
695 737
696 /* sometimes transfer is only called to set idle_sp */ 738 /* sometimes transfer is only called to set idle_sp */
697 if (!next) 739 if (!next)
740 {
698 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 741 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
742 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
743 }
699 else if (prev != next) 744 else if (prev != next)
700 { 745 {
701 coro_cctx *prev__cctx; 746 coro_cctx *prev__cctx;
702 747
703 if (prev->flags & CF_NEW) 748 if (prev->flags & CF_NEW)
… …
713 if (!prev->flags & CF_RUNNING) 758 if (!prev->flags & CF_RUNNING)
714 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");
715 760
716 if (next->flags & CF_RUNNING) 761 if (next->flags & CF_RUNNING)
717 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");
718 766
719 prev->flags &= ~CF_RUNNING; 767 prev->flags &= ~CF_RUNNING;
720 next->flags |= CF_RUNNING; 768 next->flags |= CF_RUNNING;
721 769
722 LOCK; 770 LOCK;
… …
728 /* first get rid of the old state */ 776 /* first get rid of the old state */
729 save_perl (prev); 777 save_perl (prev);
730 /* setup coroutine call */ 778 /* setup coroutine call */
731 setup_coro (next); 779 setup_coro (next);
732 /* need a new stack */ 780 /* need a new stack */
733 assert (!next->stack); 781 assert (!next->cctx);
734 } 782 }
735 else 783 else
736 { 784 {
737 /* coroutine already started */ 785 /* coroutine already started */
738 save_perl (prev); 786 save_perl (prev);
… …
743 791
744 /* possibly "free" the cctx */ 792 /* possibly "free" the cctx */
745 if (prev__cctx->idle_sp == STACKLEVEL) 793 if (prev__cctx->idle_sp == STACKLEVEL)
746 { 794 {
747 /* 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 */
748 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));
749 797
750 prev->cctx = 0; 798 prev->cctx = 0;
751 799
752 cctx_put (prev__cctx); 800 cctx_put (prev__cctx);
753 prev__cctx->inuse = 0; 801 prev__cctx->inuse = 0;
… …
766 PL_top_env = next->cctx->top_env; 814 PL_top_env = next->cctx->top_env;
767 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 815 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
768 } 816 }
769 817
770 free_coro_mortal (); 818 free_coro_mortal ();
771
772 UNLOCK; 819 UNLOCK;
773 } 820 }
774} 821}
775 822
776struct transfer_args 823struct transfer_args
… …
778 struct coro *prev, *next; 825 struct coro *prev, *next;
779}; 826};
780 827
781#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 828#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
782 829
830/** high level stuff ********************************************************/
831
783static void 832static int
784coro_state_destroy (struct coro *coro) 833coro_state_destroy (struct coro *coro)
785{ 834{
786 if (coro->refcnt--) 835 if (coro->flags & CF_DESTROYED)
787 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 it */
844 LOCK;
845 --coro_nready;
846 UNLOCK;
847 }
848 else
849 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
788 850
789 if (coro->mainstack && coro->mainstack != main_mainstack) 851 if (coro->mainstack && coro->mainstack != main_mainstack)
790 { 852 {
853 assert (!(coro->flags & CF_RUNNING));
854
791 struct coro temp; 855 struct coro temp;
792 Zero (&temp, 1, struct coro); 856 Zero (&temp, 1, struct coro);
793 temp.save = CORO_SAVE_ALL; 857 temp.save = CORO_SAVE_ALL;
794 858
795 if (coro->flags & CF_RUNNING) 859 if (coro->flags & CF_RUNNING)
… …
805 coro->mainstack = 0; 869 coro->mainstack = 0;
806 } 870 }
807 871
808 cctx_destroy (coro->cctx); 872 cctx_destroy (coro->cctx);
809 SvREFCNT_dec (coro->args); 873 SvREFCNT_dec (coro->args);
810 Safefree (coro); 874
875 return 1;
811} 876}
812 877
813static int 878static int
814coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 879coro_state_free (pTHX_ SV *sv, MAGIC *mg)
815{ 880{
816 struct coro *coro = (struct coro *)mg->mg_ptr; 881 struct coro *coro = (struct coro *)mg->mg_ptr;
817 mg->mg_ptr = 0; 882 mg->mg_ptr = 0;
818 883
884 if (--coro->refcnt < 0)
885 {
819 coro_state_destroy (coro); 886 coro_state_destroy (coro);
887 Safefree (coro);
888 }
820 889
821 return 0; 890 return 0;
822} 891}
823 892
824static int 893static int
… …
831 return 0; 900 return 0;
832} 901}
833 902
834static MGVTBL coro_state_vtbl = { 903static MGVTBL coro_state_vtbl = {
835 0, 0, 0, 0, 904 0, 0, 0, 0,
836 coro_state_clear, 905 coro_state_free,
837 0, 906 0,
838#ifdef MGf_DUP 907#ifdef MGf_DUP
839 coro_state_dup, 908 coro_state_dup,
840#else 909#else
841# define MGf_DUP 0 910# define MGf_DUP 0
… …
892 return old_save; 961 return old_save;
893} 962}
894 963
895/** Coro ********************************************************************/ 964/** Coro ********************************************************************/
896 965
897#define PRIO_MAX 3
898#define PRIO_HIGH 1
899#define PRIO_NORMAL 0
900#define PRIO_LOW -1
901#define PRIO_IDLE -3
902#define PRIO_MIN -4
903
904/* for Coro.pm */
905static SV *coro_current;
906static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
907static int coro_nready;
908
909static void 966static void
910coro_enq (SV *coro_sv) 967coro_enq (SV *coro_sv)
911{ 968{
912 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);
913 coro_nready++;
914} 970}
915 971
916static SV * 972static SV *
917coro_deq (int min_prio) 973coro_deq (int min_prio)
918{ 974{
… …
922 if (min_prio < 0) 978 if (min_prio < 0)
923 min_prio = 0; 979 min_prio = 0;
924 980
925 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 981 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
926 if (AvFILLp (coro_ready [prio]) >= 0) 982 if (AvFILLp (coro_ready [prio]) >= 0)
927 {
928 coro_nready--;
929 return av_shift (coro_ready [prio]); 983 return av_shift (coro_ready [prio]);
930 }
931 984
932 return 0; 985 return 0;
933} 986}
934 987
935static int 988static int
… …
943 coro = SvSTATE (coro_sv); 996 coro = SvSTATE (coro_sv);
944 997
945 if (coro->flags & CF_READY) 998 if (coro->flags & CF_READY)
946 return 0; 999 return 0;
947 1000
948#if 0 /* this is actually harmless */
949 if (coro->flags & CF_RUNNING)
950 croak ("Coro::ready called on currently running coroutine");
951#endif
952
953 coro->flags |= CF_READY; 1001 coro->flags |= CF_READY;
954 1002
955 LOCK; 1003 LOCK;
956 coro_enq (SvREFCNT_inc (coro_sv)); 1004 coro_enq (SvREFCNT_inc (coro_sv));
1005 ++coro_nready;
957 UNLOCK; 1006 UNLOCK;
958 1007
959 return 1; 1008 return 1;
960} 1009}
961 1010
962static int 1011static int
963api_is_ready (SV *coro_sv) 1012api_is_ready (SV *coro_sv)
964{ 1013{
965 return !!SvSTATE (coro_sv)->flags & CF_READY; 1014 return !!(SvSTATE (coro_sv)->flags & CF_READY);
966} 1015}
967 1016
968static void 1017static void
969prepare_schedule (struct transfer_args *ta) 1018prepare_schedule (struct transfer_args *ta)
970{ 1019{
971 SV *prev, *next; 1020 SV *prev_sv, *next_sv;
972 1021
973 for (;;) 1022 for (;;)
974 { 1023 {
975 LOCK; 1024 LOCK;
976 next = coro_deq (PRIO_MIN); 1025 next_sv = coro_deq (PRIO_MIN);
977 UNLOCK; 1026 UNLOCK;
978 1027
1028 /* nothing to schedule: call the idle handler */
979 if (next) 1029 if (!next_sv)
980 break;
981
982 { 1030 {
983 dSP; 1031 dSP;
984 1032
985 ENTER; 1033 ENTER;
986 SAVETMPS; 1034 SAVETMPS;
987 1035
988 PUSHMARK (SP); 1036 PUSHMARK (SP);
989 PUTBACK; 1037 PUTBACK;
990 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1038 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
991 1039
992 FREETMPS; 1040 FREETMPS;
993 LEAVE; 1041 LEAVE;
1042 continue;
994 } 1043 }
995 }
996 1044
997 prev = SvRV (coro_current); 1045 ta->next = SvSTATE (next_sv);
998 SvRV_set (coro_current, next); 1046
1047 /* cannot transfer to destroyed coros, skip and look for next */
1048 if (ta->next->flags & CF_DESTROYED)
1049 {
1050 SvREFCNT_dec (next_sv);
1051 /* coro_nready is already taken care of by destroy */
1052 continue;
1053 }
1054
1055 LOCK;
1056 --coro_nready;
1057 UNLOCK;
1058 break;
1059 }
999 1060
1000 /* 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
1001 LOCK; 1069 LOCK;
1002 free_coro_mortal (); 1070 free_coro_mortal ();
1071 coro_mortal = prev_sv;
1003 UNLOCK; 1072 UNLOCK;
1004 coro_mortal = prev;
1005
1006 assert (!SvROK(prev));//D
1007 assert (!SvROK(next));//D
1008
1009 ta->prev = SvSTATE (prev);
1010 ta->next = SvSTATE (next);
1011
1012 assert (ta->next->flags & CF_READY);
1013 ta->next->flags &= ~CF_READY;
1014} 1073}
1015 1074
1016static void 1075static void
1017prepare_cede (struct transfer_args *ta) 1076prepare_cede (struct transfer_args *ta)
1018{ 1077{
1019 api_ready (coro_current); 1078 api_ready (coro_current);
1020
1021 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;
1022} 1094}
1023 1095
1024static void 1096static void
1025api_schedule (void) 1097api_schedule (void)
1026{ 1098{
… …
1028 1100
1029 prepare_schedule (&ta); 1101 prepare_schedule (&ta);
1030 TRANSFER (ta); 1102 TRANSFER (ta);
1031} 1103}
1032 1104
1033static void 1105static int
1034api_cede (void) 1106api_cede (void)
1035{ 1107{
1036 struct transfer_args ta; 1108 struct transfer_args ta;
1037 1109
1038 prepare_cede (&ta); 1110 prepare_cede (&ta);
1111
1112 if (ta.prev != ta.next)
1113 {
1039 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;
1040} 1133}
1041 1134
1042MODULE = Coro::State PACKAGE = Coro::State 1135MODULE = Coro::State PACKAGE = Coro::State
1043 1136
1044PROTOTYPES: DISABLE 1137PROTOTYPES: DISABLE
… …
1100_set_stacklevel (...) 1193_set_stacklevel (...)
1101 ALIAS: 1194 ALIAS:
1102 Coro::State::transfer = 1 1195 Coro::State::transfer = 1
1103 Coro::schedule = 2 1196 Coro::schedule = 2
1104 Coro::cede = 3 1197 Coro::cede = 3
1198 Coro::cede_notself = 4
1105 CODE: 1199 CODE:
1106{ 1200{
1107 struct transfer_args ta; 1201 struct transfer_args ta;
1108 1202
1109 switch (ix) 1203 switch (ix)
… …
1125 break; 1219 break;
1126 1220
1127 case 3: 1221 case 3:
1128 prepare_cede (&ta); 1222 prepare_cede (&ta);
1129 break; 1223 break;
1224
1225 case 4:
1226 if (!prepare_cede_notself (&ta))
1227 XSRETURN_EMPTY;
1228
1229 break;
1130 } 1230 }
1131 1231
1232 BARRIER;
1132 TRANSFER (ta); 1233 TRANSFER (ta);
1133}
1134 1234
1135void 1235 if (GIMME_V != G_VOID && ta.next != ta.prev)
1136_clone_state_from (SV *dst, SV *src) 1236 XSRETURN_YES;
1237}
1238
1239bool
1240_destroy (SV *coro_sv)
1137 CODE: 1241 CODE:
1138{ 1242 RETVAL = coro_state_destroy (SvSTATE (coro_sv));
1139 struct coro *coro_src = SvSTATE (src); 1243 OUTPUT:
1140 1244 RETVAL
1141 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1142
1143 ++coro_src->refcnt;
1144 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1145}
1146 1245
1147void 1246void
1148_exit (code) 1247_exit (code)
1149 int code 1248 int code
1150 PROTOTYPE: $ 1249 PROTOTYPE: $
… …
1187 coro_ready[i] = newAV (); 1286 coro_ready[i] = newAV ();
1188 1287
1189 { 1288 {
1190 SV *sv = perl_get_sv("Coro::API", 1); 1289 SV *sv = perl_get_sv("Coro::API", 1);
1191 1290
1192 coroapi.schedule = api_schedule; 1291 coroapi.schedule = api_schedule;
1193 coroapi.save = api_save; 1292 coroapi.save = api_save;
1194 coroapi.cede = api_cede; 1293 coroapi.cede = api_cede;
1294 coroapi.cede_notself = api_cede_notself;
1195 coroapi.ready = api_ready; 1295 coroapi.ready = api_ready;
1196 coroapi.is_ready = api_is_ready; 1296 coroapi.is_ready = api_is_ready;
1197 coroapi.nready = &coro_nready; 1297 coroapi.nready = &coro_nready;
1198 coroapi.current = coro_current; 1298 coroapi.current = coro_current;
1199 1299
1200 GCoroAPI = &coroapi; 1300 GCoroAPI = &coroapi;
1201 sv_setiv (sv, (IV)&coroapi); 1301 sv_setiv (sv, (IV)&coroapi);
1202 SvREADONLY_on (sv); 1302 SvREADONLY_on (sv);
1203 } 1303 }
… …
1219 RETVAL = coro->prio; 1319 RETVAL = coro->prio;
1220 1320
1221 if (items > 1) 1321 if (items > 1)
1222 { 1322 {
1223 if (ix) 1323 if (ix)
1224 newprio += coro->prio; 1324 newprio = coro->prio - newprio;
1225 1325
1226 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1326 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1227 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1327 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1228 1328
1229 coro->prio = newprio; 1329 coro->prio = newprio;
1230 } 1330 }
1231} 1331}
1332 OUTPUT:
1333 RETVAL
1232 1334
1233SV * 1335SV *
1234ready (SV *self) 1336ready (SV *self)
1235 PROTOTYPE: $ 1337 PROTOTYPE: $
1236 CODE: 1338 CODE:

Diff Legend

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