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.70 by root, Mon Dec 26 19:26:52 2005 UTC vs.
Revision 1.80 by root, Thu Nov 2 20:00:00 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#if PERL_VERSION < 9
169 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
170#else
171 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
172#endif
173 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
174 --AvFILLp (padlist);
175
176 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
171 av_store (newpadlist, 1, (SV *) newpad); 177 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 AvFLAGS (av) = AVf_REIFY;
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 178
242 return newpadlist; 179 return newpadlist;
243} 180}
244 181
245STATIC void 182static void
246free_padlist (pTHX_ AV *padlist) 183free_padlist (pTHX_ AV *padlist)
247{ 184{
248 /* may be during global destruction */ 185 /* may be during global destruction */
249 if (SvREFCNT (padlist)) 186 if (SvREFCNT (padlist))
250 { 187 {
… …
264 201
265 SvREFCNT_dec ((SV*)padlist); 202 SvREFCNT_dec ((SV*)padlist);
266 } 203 }
267} 204}
268 205
269STATIC int 206static int
270coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 207coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
271{ 208{
272 AV *padlist; 209 AV *padlist;
273 AV *av = (AV *)mg->mg_obj; 210 AV *av = (AV *)mg->mg_obj;
274 211
275 /* casting is fun. */ 212 /* casting is fun. */
276 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 213 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
277 free_padlist (aTHX_ padlist); 214 free_padlist (aTHX_ padlist);
278 215
279 SvREFCNT_dec (av); 216 SvREFCNT_dec (av);
217
218 return 0;
280} 219}
281 220
282#define PERL_MAGIC_coro PERL_MAGIC_ext 221#define PERL_MAGIC_coro PERL_MAGIC_ext
283 222
284static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 223static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
285 224
286/* the next two functions merely cache the padlists */ 225/* the next two functions merely cache the padlists */
287STATIC void 226static void
288get_padlist (pTHX_ CV *cv) 227get_padlist (pTHX_ CV *cv)
289{ 228{
290 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 229 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
291 230
292 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 231 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
293 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 232 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
294 else 233 else
234 {
235#if 0
236 /* this should work - but it doesn't :( */
237 CV *cp = Perl_cv_clone (aTHX_ cv);
238 CvPADLIST (cv) = CvPADLIST (cp);
239 CvPADLIST (cp) = 0;
240 SvREFCNT_dec (cp);
241#else
295 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 242 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
243#endif
244 }
296} 245}
297 246
298STATIC void 247static void
299put_padlist (pTHX_ CV *cv) 248put_padlist (pTHX_ CV *cv)
300{ 249{
301 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 250 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
302 251
303 if (!mg) 252 if (!mg)
… …
346 PL_scopestack_ix = c->scopestack_ix; 295 PL_scopestack_ix = c->scopestack_ix;
347 PL_scopestack_max = c->scopestack_max; 296 PL_scopestack_max = c->scopestack_max;
348 PL_savestack = c->savestack; 297 PL_savestack = c->savestack;
349 PL_savestack_ix = c->savestack_ix; 298 PL_savestack_ix = c->savestack_ix;
350 PL_savestack_max = c->savestack_max; 299 PL_savestack_max = c->savestack_max;
300#if PERL_VERSION < 9
351 PL_retstack = c->retstack; 301 PL_retstack = c->retstack;
352 PL_retstack_ix = c->retstack_ix; 302 PL_retstack_ix = c->retstack_ix;
353 PL_retstack_max = c->retstack_max; 303 PL_retstack_max = c->retstack_max;
304#endif
354 PL_curpm = c->curpm; 305 PL_curpm = c->curpm;
355 PL_curcop = c->curcop; 306 PL_curcop = c->curcop;
356 PL_top_env = c->top_env; 307 PL_top_env = c->top_env;
357 308
358 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 309 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
… …
418 } 369 }
419 370
420 PUSHs ((SV *)CvPADLIST(cv)); 371 PUSHs ((SV *)CvPADLIST(cv));
421 PUSHs ((SV *)cv); 372 PUSHs ((SV *)cv);
422 373
423 get_padlist (aTHX_ cv); /* this is a monster */ 374 get_padlist (aTHX_ cv);
424 } 375 }
425 } 376 }
426#ifdef CXt_FORMAT 377#ifdef CXt_FORMAT
427 else if (CxTYPE(cx) == CXt_FORMAT) 378 else if (CxTYPE(cx) == CXt_FORMAT)
428 { 379 {
… …
472 c->scopestack_ix = PL_scopestack_ix; 423 c->scopestack_ix = PL_scopestack_ix;
473 c->scopestack_max = PL_scopestack_max; 424 c->scopestack_max = PL_scopestack_max;
474 c->savestack = PL_savestack; 425 c->savestack = PL_savestack;
475 c->savestack_ix = PL_savestack_ix; 426 c->savestack_ix = PL_savestack_ix;
476 c->savestack_max = PL_savestack_max; 427 c->savestack_max = PL_savestack_max;
428#if PERL_VERSION < 9
477 c->retstack = PL_retstack; 429 c->retstack = PL_retstack;
478 c->retstack_ix = PL_retstack_ix; 430 c->retstack_ix = PL_retstack_ix;
479 c->retstack_max = PL_retstack_max; 431 c->retstack_max = PL_retstack_max;
432#endif
480 c->curpm = PL_curpm; 433 c->curpm = PL_curpm;
481 c->curcop = PL_curcop; 434 c->curcop = PL_curcop;
482 c->top_env = PL_top_env; 435 c->top_env = PL_top_env;
483} 436}
484 437
… …
486 * allocate various perl stacks. This is an exact copy 439 * allocate various perl stacks. This is an exact copy
487 * of perl.c:init_stacks, except that it uses less memory 440 * of perl.c:init_stacks, except that it uses less memory
488 * on the (sometimes correct) assumption that coroutines do 441 * on the (sometimes correct) assumption that coroutines do
489 * not usually need a lot of stackspace. 442 * not usually need a lot of stackspace.
490 */ 443 */
491STATIC void 444static void
492coro_init_stacks (pTHX) 445coro_init_stacks (pTHX)
493{ 446{
494 LOCK; 447 LOCK;
495 448
496 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 449 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
521 474
522 New(54,PL_savestack,96,ANY); 475 New(54,PL_savestack,96,ANY);
523 PL_savestack_ix = 0; 476 PL_savestack_ix = 0;
524 PL_savestack_max = 96; 477 PL_savestack_max = 96;
525 478
479#if PERL_VERSION < 9
526 New(54,PL_retstack,8,OP*); 480 New(54,PL_retstack,8,OP*);
527 PL_retstack_ix = 0; 481 PL_retstack_ix = 0;
528 PL_retstack_max = 8; 482 PL_retstack_max = 8;
483#endif
529 484
530 UNLOCK; 485 UNLOCK;
531} 486}
532 487
533/* 488/*
534 * destroy the stacks, the callchain etc... 489 * destroy the stacks, the callchain etc...
535 */ 490 */
536STATIC void 491static void
537destroy_stacks(pTHX) 492destroy_stacks(pTHX)
538{ 493{
539 if (!IN_DESTRUCT) 494 if (!IN_DESTRUCT)
540 { 495 {
541 /* is this ugly, I ask? */ 496 /* is this ugly, I ask? */
… …
573 528
574 Safefree (PL_tmps_stack); 529 Safefree (PL_tmps_stack);
575 Safefree (PL_markstack); 530 Safefree (PL_markstack);
576 Safefree (PL_scopestack); 531 Safefree (PL_scopestack);
577 Safefree (PL_savestack); 532 Safefree (PL_savestack);
533#if PERL_VERSION < 9
578 Safefree (PL_retstack); 534 Safefree (PL_retstack);
535#endif
579} 536}
580 537
581static void 538static void
582allocate_stack (Coro__State ctx, int alloc) 539allocate_stack (Coro__State ctx, int alloc)
583{ 540{
… …
590 stack->gencnt = ctx->gencnt = 0; 547 stack->gencnt = ctx->gencnt = 0;
591 548
592 if (alloc) 549 if (alloc)
593 { 550 {
594#if HAVE_MMAP 551#if HAVE_MMAP
595 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */ 552 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */
596 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 553 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
597 if (stack->sptr == (void *)-1) 554 if (stack->sptr != (void *)-1)
598#endif
599 { 555 {
600 /*FIXME*//*D*//* reasonable stack size! */ 556# if STACKGUARD
557 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
558# endif
559 }
560 else
561#endif
562 {
601 stack->ssize = - (STACKSIZE * sizeof (long)); 563 stack->ssize = - (STACKSIZE * (long)sizeof (long));
602 New (0, stack->sptr, STACKSIZE, long); 564 New (0, stack->sptr, STACKSIZE, long);
603 } 565 }
604 } 566 }
605 else 567 else
606 stack->sptr = 0; 568 stack->sptr = 0;
… …
667 } 629 }
668 else 630 else
669 { 631 {
670 UNOP myop; 632 UNOP myop;
671 633
672 PL_op = (OP *)&myop;
673
674 Zero(&myop, 1, UNOP); 634 Zero(&myop, 1, UNOP);
675 myop.op_next = Nullop; 635 myop.op_next = Nullop;
676 myop.op_flags = OPf_WANT_VOID; 636 myop.op_flags = OPf_WANT_VOID;
637
638 PL_op = (OP *)&myop;
677 639
678 PUSHMARK(SP); 640 PUSHMARK(SP);
679 XPUSHs (sub_init); 641 XPUSHs (sub_init);
680 /* 642 /*
681 * the next line is slightly wrong, as PL_op->op_next 643 * the next line is slightly wrong, as PL_op->op_next
… …
698 /* 660 /*
699 * this is a _very_ stripped down perl interpreter ;) 661 * this is a _very_ stripped down perl interpreter ;)
700 */ 662 */
701 dTHX; 663 dTHX;
702 Coro__State ctx = (Coro__State)arg; 664 Coro__State ctx = (Coro__State)arg;
703 JMPENV coro_start_env;
704 665
705 PL_top_env = &ctx->start_env; 666 PL_top_env = &ctx->start_env;
706 667
707 ctx->cursp = 0; 668 ctx->cursp = 0;
708 PL_op = PL_op->op_next; 669 PL_op = PL_op->op_next;
709 CALLRUNOPS(aTHX); 670 CALLRUNOPS(aTHX);
710 671
711 abort (); 672 abort ();
712} 673}
713 674
714STATIC void 675static void
715transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 676transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
716{ 677{
717 dSTACKLEVEL; 678 dSTACKLEVEL;
718 679
719 if (prev != next) 680 if (prev != next)
… …
831 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 792 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
832 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 793 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
833 \ 794 \
834 } while(0) 795 } while(0)
835 796
836#define SvSTATE(sv) (struct coro *)SvIV (sv) 797#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
837 798
838static void 799static void
839api_transfer(pTHX_ SV *prev, SV *next, int flags) 800api_transfer(pTHX_ SV *prev, SV *next, int flags)
840{ 801{
841 SV_CORO (prev, "Coro::transfer"); 802 SV_CORO (prev, "Coro::transfer");
… …
859static int coro_nready; 820static int coro_nready;
860 821
861static void 822static void
862coro_enq (pTHX_ SV *sv) 823coro_enq (pTHX_ SV *sv)
863{ 824{
825 SV **xprio;
826 int prio;
827
864 if (SvTYPE (sv) == SVt_PVHV) 828 if (SvTYPE (sv) != SVt_PVHV)
865 {
866 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
867 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
868
869 prio = prio > PRIO_MAX ? PRIO_MAX
870 : prio < PRIO_MIN ? PRIO_MIN
871 : prio;
872
873 av_push (coro_ready [prio - PRIO_MIN], sv);
874 coro_nready++;
875
876 return;
877 }
878
879 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 829 croak ("Coro::ready tried to enqueue something that is not a coroutine");
830
831 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
832 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
833
834 prio = prio > PRIO_MAX ? PRIO_MAX
835 : prio < PRIO_MIN ? PRIO_MIN
836 : prio;
837
838 av_push (coro_ready [prio - PRIO_MIN], sv);
839 coro_nready++;
880} 840}
881 841
882static SV * 842static SV *
883coro_deq (pTHX_ int min_prio) 843coro_deq (pTHX_ int min_prio)
884{ 844{
… …
959BOOT: 919BOOT:
960{ /* {} necessary for stoopid perl-5.6.x */ 920{ /* {} necessary for stoopid perl-5.6.x */
961#ifdef USE_ITHREADS 921#ifdef USE_ITHREADS
962 MUTEX_INIT (&coro_mutex); 922 MUTEX_INIT (&coro_mutex);
963#endif 923#endif
924 BOOT_PAGESIZE;
964 925
965 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 926 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
966 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 927 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
967 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 928 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
968 929
… …
993 /*coro->mainstack = 0; *//*actual work is done inside transfer */ 954 /*coro->mainstack = 0; *//*actual work is done inside transfer */
994 /*coro->stack = 0;*/ 955 /*coro->stack = 0;*/
995 956
996 /* same as JMPENV_BOOTSTRAP */ 957 /* same as JMPENV_BOOTSTRAP */
997 /* we might be able to recycle start_env, but safe is safe */ 958 /* we might be able to recycle start_env, but safe is safe */
998 /*Zero(&coro->start_env, 1, JMPENV);*/ 959 /*Zero (&coro->start_env, 1, JMPENV);*/
999 coro->start_env.je_ret = -1; 960 coro->start_env.je_ret = -1;
1000 coro->start_env.je_mustcatch = TRUE; 961 coro->start_env.je_mustcatch = TRUE;
1001 962
1002 RETVAL = coro; 963 RETVAL = coro;
1003 OUTPUT: 964 OUTPUT:
… …
1073 av_fill (defav, items - 1); 1034 av_fill (defav, items - 1);
1074 while (items--) 1035 while (items--)
1075 av_store (defav, items, SvREFCNT_inc (ST(items))); 1036 av_store (defav, items, SvREFCNT_inc (ST(items)));
1076 1037
1077 sv = av_pop ((AV *)SvRV (yieldstack)); 1038 sv = av_pop ((AV *)SvRV (yieldstack));
1078 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1039 prev = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))));
1079 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1040 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
1080 SvREFCNT_dec (sv); 1041 SvREFCNT_dec (sv);
1081 1042
1082 transfer (aTHX_ prev, next, 0); 1043 transfer (aTHX_ prev, next, 0);
1083 1044
1084MODULE = Coro::State PACKAGE = Coro 1045MODULE = Coro::State PACKAGE = Coro

Diff Legend

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