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.72 by root, Wed Feb 1 23:59:41 2006 UTC vs.
Revision 1.78 by root, Wed Nov 1 01:21:21 2006 UTC

… …
28# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
29# endif 29# endif
30#endif 30#endif
31 31
32#include <errno.h> 32#include <errno.h>
33#include <signal.h> 33
34#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
35# undef STACKGUARD
36#endif
37
38#ifndef STACKGUARD
39# define STACKGUARD 0
40#endif
34 41
35#ifdef HAVE_MMAP 42#ifdef HAVE_MMAP
36# include <unistd.h> 43# include <unistd.h>
37# include <sys/mman.h> 44# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS 45# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON 46# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON 47# define MAP_ANONYMOUS MAP_ANON
41# else 48# else
42# undef HAVE_MMAP 49# undef HAVE_MMAP
43# endif 50# endif
51# endif
52# include <limits.h>
53# ifndef PAGESIZE
54# define PAGESIZE pagesize
55# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
56static long pagesize;
57# else
58# define BOOT_PAGESIZE
44# endif 59# endif
45#endif 60#endif
46 61
47#define SUB_INIT "Coro::State::initialize" 62#define SUB_INIT "Coro::State::initialize"
48#define UCORO_STATE "_coro_state" 63#define UCORO_STATE "_coro_state"
… …
140}; 155};
141 156
142typedef struct coro *Coro__State; 157typedef struct coro *Coro__State;
143typedef struct coro *Coro__State_or_hashref; 158typedef struct coro *Coro__State_or_hashref;
144 159
145/* mostly copied from op.c:cv_clone2 */ 160static AV *
146STATIC AV * 161coro_clone_padlist (pTHX_ CV *cv)
147clone_padlist (pTHX_ AV *protopadlist)
148{ 162{
149 AV *av; 163 AV *padlist = CvPADLIST (cv);
150 I32 ix;
151 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
152 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
153 SV **pname = AvARRAY (protopad_name);
154 SV **ppad = AvARRAY (protopad);
155 I32 fname = AvFILLp (protopad_name);
156 I32 fpad = AvFILLp (protopad);
157 AV *newpadlist, *newpad_name, *newpad; 164 AV *newpadlist, *newpad;
158 SV **npad;
159
160 newpad_name = newAV ();
161 for (ix = fname; ix >= 0; ix--)
162 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
163
164 newpad = newAV ();
165 av_fill (newpad, AvFILLp (protopad));
166 npad = AvARRAY (newpad);
167 165
168 newpadlist = newAV (); 166 newpadlist = newAV ();
169 AvREAL_off (newpadlist); 167 AvREAL_off (newpadlist);
170 av_store (newpadlist, 0, (SV *) newpad_name); 168 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
169 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
170 --AvFILLp (padlist);
171
172 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
171 av_store (newpadlist, 1, (SV *) newpad); 173 av_store (newpadlist, 1, (SV *)newpad);
172
173 av = newAV (); /* will be @_ */
174 av_extend (av, 0);
175 av_store (newpad, 0, (SV *) av);
176 AvREIFY_on (av);
177
178 for (ix = fpad; ix > 0; ix--)
179 {
180 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
181
182 if (namesv && namesv != &PL_sv_undef)
183 {
184 char *name = SvPVX (namesv); /* XXX */
185
186 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
187 { /* lexical from outside? */
188 npad[ix] = SvREFCNT_inc (ppad[ix]);
189 }
190 else
191 { /* our own lexical */
192 SV *sv;
193 if (*name == '&')
194 sv = SvREFCNT_inc (ppad[ix]);
195 else if (*name == '@')
196 sv = (SV *) newAV ();
197 else if (*name == '%')
198 sv = (SV *) newHV ();
199 else
200 sv = NEWSV (0, 0);
201
202#ifdef SvPADBUSY
203 if (!SvPADBUSY (sv))
204#endif
205 SvPADMY_on (sv);
206
207 npad[ix] = sv;
208 }
209 }
210 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
211 {
212 npad[ix] = SvREFCNT_inc (ppad[ix]);
213 }
214 else
215 {
216 SV *sv = NEWSV (0, 0);
217 SvPADTMP_on (sv);
218 npad[ix] = sv;
219 }
220 }
221
222#if 0 /* return -ENOTUNDERSTOOD */
223 /* Now that vars are all in place, clone nested closures. */
224
225 for (ix = fpad; ix > 0; ix--) {
226 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv;
227 if (namesv
228 && namesv != &PL_sv_undef
229 && !(SvFLAGS(namesv) & SVf_FAKE)
230 && *SvPVX(namesv) == '&'
231 && CvCLONE(ppad[ix]))
232 {
233 CV *kid = cv_clone((CV*)ppad[ix]);
234 SvREFCNT_dec(ppad[ix]);
235 CvCLONE_on(kid);
236 SvPADMY_on(kid);
237 npad[ix] = (SV*)kid;
238 }
239 }
240#endif
241 174
242 return newpadlist; 175 return newpadlist;
243} 176}
244 177
245STATIC void 178static void
246free_padlist (pTHX_ AV *padlist) 179free_padlist (pTHX_ AV *padlist)
247{ 180{
248 /* may be during global destruction */ 181 /* may be during global destruction */
249 if (SvREFCNT (padlist)) 182 if (SvREFCNT (padlist))
250 { 183 {
… …
264 197
265 SvREFCNT_dec ((SV*)padlist); 198 SvREFCNT_dec ((SV*)padlist);
266 } 199 }
267} 200}
268 201
269STATIC int 202static int
270coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 203coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
271{ 204{
272 AV *padlist; 205 AV *padlist;
273 AV *av = (AV *)mg->mg_obj; 206 AV *av = (AV *)mg->mg_obj;
274 207
275 /* casting is fun. */ 208 /* casting is fun. */
276 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 209 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
277 free_padlist (aTHX_ padlist); 210 free_padlist (aTHX_ padlist);
278 211
279 SvREFCNT_dec (av); 212 SvREFCNT_dec (av);
213
214 return 0;
280} 215}
281 216
282#define PERL_MAGIC_coro PERL_MAGIC_ext 217#define PERL_MAGIC_coro PERL_MAGIC_ext
283 218
284static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 219static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
285 220
286/* the next two functions merely cache the padlists */ 221/* the next two functions merely cache the padlists */
287STATIC void 222static void
288get_padlist (pTHX_ CV *cv) 223get_padlist (pTHX_ CV *cv)
289{ 224{
290 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 225 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
291 226
292 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 227 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
293 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 228 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
294 else 229 else
230 {
231#if 0
232 /* this should work - but it doesn't :( */
233 CV *cp = Perl_cv_clone (aTHX_ cv);
234 CvPADLIST (cv) = CvPADLIST (cp);
235 CvPADLIST (cp) = 0;
236 SvREFCNT_dec (cp);
237#else
295 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 238 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
239#endif
240 }
296} 241}
297 242
298STATIC void 243static void
299put_padlist (pTHX_ CV *cv) 244put_padlist (pTHX_ CV *cv)
300{ 245{
301 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 246 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
302 247
303 if (!mg) 248 if (!mg)
… …
420 } 365 }
421 366
422 PUSHs ((SV *)CvPADLIST(cv)); 367 PUSHs ((SV *)CvPADLIST(cv));
423 PUSHs ((SV *)cv); 368 PUSHs ((SV *)cv);
424 369
425 get_padlist (aTHX_ cv); /* this is a monster */ 370 get_padlist (aTHX_ cv);
426 } 371 }
427 } 372 }
428#ifdef CXt_FORMAT 373#ifdef CXt_FORMAT
429 else if (CxTYPE(cx) == CXt_FORMAT) 374 else if (CxTYPE(cx) == CXt_FORMAT)
430 { 375 {
… …
490 * allocate various perl stacks. This is an exact copy 435 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 436 * of perl.c:init_stacks, except that it uses less memory
492 * on the (sometimes correct) assumption that coroutines do 437 * on the (sometimes correct) assumption that coroutines do
493 * not usually need a lot of stackspace. 438 * not usually need a lot of stackspace.
494 */ 439 */
495STATIC void 440static void
496coro_init_stacks (pTHX) 441coro_init_stacks (pTHX)
497{ 442{
498 LOCK; 443 LOCK;
499 444
500 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 445 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
537} 482}
538 483
539/* 484/*
540 * destroy the stacks, the callchain etc... 485 * destroy the stacks, the callchain etc...
541 */ 486 */
542STATIC void 487static void
543destroy_stacks(pTHX) 488destroy_stacks(pTHX)
544{ 489{
545 if (!IN_DESTRUCT) 490 if (!IN_DESTRUCT)
546 { 491 {
547 /* is this ugly, I ask? */ 492 /* is this ugly, I ask? */
… …
598 stack->gencnt = ctx->gencnt = 0; 543 stack->gencnt = ctx->gencnt = 0;
599 544
600 if (alloc) 545 if (alloc)
601 { 546 {
602#if HAVE_MMAP 547#if HAVE_MMAP
603 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */ 548 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */
604 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 549 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
605 if (stack->sptr == (void *)-1) 550 if (stack->sptr != (void *)-1)
606#endif
607 { 551 {
608 /*FIXME*//*D*//* reasonable stack size! */ 552# if STACKGUARD
553 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
554# endif
555 }
556 else
557#endif
558 {
609 stack->ssize = - (STACKSIZE * sizeof (long)); 559 stack->ssize = - (STACKSIZE * (long)sizeof (long));
610 New (0, stack->sptr, STACKSIZE, long); 560 New (0, stack->sptr, STACKSIZE, long);
611 } 561 }
612 } 562 }
613 else 563 else
614 stack->sptr = 0; 564 stack->sptr = 0;
… …
706 /* 656 /*
707 * this is a _very_ stripped down perl interpreter ;) 657 * this is a _very_ stripped down perl interpreter ;)
708 */ 658 */
709 dTHX; 659 dTHX;
710 Coro__State ctx = (Coro__State)arg; 660 Coro__State ctx = (Coro__State)arg;
711 JMPENV coro_start_env;
712 661
713 PL_top_env = &ctx->start_env; 662 PL_top_env = &ctx->start_env;
714 663
715 ctx->cursp = 0; 664 ctx->cursp = 0;
716 PL_op = PL_op->op_next; 665 PL_op = PL_op->op_next;
717 CALLRUNOPS(aTHX); 666 CALLRUNOPS(aTHX);
718 667
719 abort (); 668 abort ();
720} 669}
721 670
722STATIC void 671static void
723transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 672transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
724{ 673{
725 dSTACKLEVEL; 674 dSTACKLEVEL;
726 675
727 if (prev != next) 676 if (prev != next)
… …
839 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 788 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
840 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 789 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
841 \ 790 \
842 } while(0) 791 } while(0)
843 792
844#define SvSTATE(sv) (struct coro *)SvIV (sv) 793#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
845 794
846static void 795static void
847api_transfer(pTHX_ SV *prev, SV *next, int flags) 796api_transfer(pTHX_ SV *prev, SV *next, int flags)
848{ 797{
849 SV_CORO (prev, "Coro::transfer"); 798 SV_CORO (prev, "Coro::transfer");
… …
867static int coro_nready; 816static int coro_nready;
868 817
869static void 818static void
870coro_enq (pTHX_ SV *sv) 819coro_enq (pTHX_ SV *sv)
871{ 820{
821 SV **xprio;
822 int prio;
823
872 if (SvTYPE (sv) == SVt_PVHV) 824 if (SvTYPE (sv) != SVt_PVHV)
873 {
874 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
875 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
876
877 prio = prio > PRIO_MAX ? PRIO_MAX
878 : prio < PRIO_MIN ? PRIO_MIN
879 : prio;
880
881 av_push (coro_ready [prio - PRIO_MIN], sv);
882 coro_nready++;
883
884 return;
885 }
886
887 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 825 croak ("Coro::ready tried to enqueue something that is not a coroutine");
826
827 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
828 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
829
830 prio = prio > PRIO_MAX ? PRIO_MAX
831 : prio < PRIO_MIN ? PRIO_MIN
832 : prio;
833
834 av_push (coro_ready [prio - PRIO_MIN], sv);
835 coro_nready++;
888} 836}
889 837
890static SV * 838static SV *
891coro_deq (pTHX_ int min_prio) 839coro_deq (pTHX_ int min_prio)
892{ 840{
… …
967BOOT: 915BOOT:
968{ /* {} necessary for stoopid perl-5.6.x */ 916{ /* {} necessary for stoopid perl-5.6.x */
969#ifdef USE_ITHREADS 917#ifdef USE_ITHREADS
970 MUTEX_INIT (&coro_mutex); 918 MUTEX_INIT (&coro_mutex);
971#endif 919#endif
920 BOOT_PAGESIZE;
972 921
973 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 922 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
974 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 923 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
975 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 924 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
976 925
… …
1081 av_fill (defav, items - 1); 1030 av_fill (defav, items - 1);
1082 while (items--) 1031 while (items--)
1083 av_store (defav, items, SvREFCNT_inc (ST(items))); 1032 av_store (defav, items, SvREFCNT_inc (ST(items)));
1084 1033
1085 sv = av_pop ((AV *)SvRV (yieldstack)); 1034 sv = av_pop ((AV *)SvRV (yieldstack));
1086 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1035 prev = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))));
1087 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1036 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
1088 SvREFCNT_dec (sv); 1037 SvREFCNT_dec (sv);
1089 1038
1090 transfer (aTHX_ prev, next, 0); 1039 transfer (aTHX_ prev, next, 0);
1091 1040
1092MODULE = Coro::State PACKAGE = Coro 1041MODULE = Coro::State PACKAGE = Coro

Diff Legend

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