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.77 by root, Tue Oct 31 23:55:33 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>
34 33
35#ifdef HAVE_MMAP 34#ifdef HAVE_MMAP
36# include <unistd.h> 35# include <unistd.h>
37# include <sys/mman.h> 36# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS 37# ifndef MAP_ANONYMOUS
… …
140}; 139};
141 140
142typedef struct coro *Coro__State; 141typedef struct coro *Coro__State;
143typedef struct coro *Coro__State_or_hashref; 142typedef struct coro *Coro__State_or_hashref;
144 143
145/* mostly copied from op.c:cv_clone2 */ 144static AV *
146STATIC AV * 145coro_clone_padlist (pTHX_ CV *cv)
147clone_padlist (pTHX_ AV *protopadlist)
148{ 146{
149 AV *av; 147 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; 148 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 149
168 newpadlist = newAV (); 150 newpadlist = newAV ();
169 AvREAL_off (newpadlist); 151 AvREAL_off (newpadlist);
170 av_store (newpadlist, 0, (SV *) newpad_name); 152 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
153 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
154 --AvFILLp (padlist);
155
156 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
171 av_store (newpadlist, 1, (SV *) newpad); 157 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 158
242 return newpadlist; 159 return newpadlist;
243} 160}
244 161
245STATIC void 162static void
246free_padlist (pTHX_ AV *padlist) 163free_padlist (pTHX_ AV *padlist)
247{ 164{
248 /* may be during global destruction */ 165 /* may be during global destruction */
249 if (SvREFCNT (padlist)) 166 if (SvREFCNT (padlist))
250 { 167 {
… …
264 181
265 SvREFCNT_dec ((SV*)padlist); 182 SvREFCNT_dec ((SV*)padlist);
266 } 183 }
267} 184}
268 185
269STATIC int 186static int
270coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 187coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
271{ 188{
272 AV *padlist; 189 AV *padlist;
273 AV *av = (AV *)mg->mg_obj; 190 AV *av = (AV *)mg->mg_obj;
274 191
275 /* casting is fun. */ 192 /* casting is fun. */
276 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 193 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
277 free_padlist (aTHX_ padlist); 194 free_padlist (aTHX_ padlist);
278 195
279 SvREFCNT_dec (av); 196 SvREFCNT_dec (av);
197
198 return 0;
280} 199}
281 200
282#define PERL_MAGIC_coro PERL_MAGIC_ext 201#define PERL_MAGIC_coro PERL_MAGIC_ext
283 202
284static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 203static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
285 204
286/* the next two functions merely cache the padlists */ 205/* the next two functions merely cache the padlists */
287STATIC void 206static void
288get_padlist (pTHX_ CV *cv) 207get_padlist (pTHX_ CV *cv)
289{ 208{
290 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 209 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
291 210
292 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 211 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
293 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 212 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
294 else 213 else
214 {
215#if 0
216 /* this should work - but it doesn't :( */
217 CV *cp = Perl_cv_clone (aTHX_ cv);
218 CvPADLIST (cv) = CvPADLIST (cp);
219 CvPADLIST (cp) = 0;
220 SvREFCNT_dec (cp);
221#else
295 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 222 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
223#endif
224 }
296} 225}
297 226
298STATIC void 227static void
299put_padlist (pTHX_ CV *cv) 228put_padlist (pTHX_ CV *cv)
300{ 229{
301 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 230 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
302 231
303 if (!mg) 232 if (!mg)
… …
346 PL_scopestack_ix = c->scopestack_ix; 275 PL_scopestack_ix = c->scopestack_ix;
347 PL_scopestack_max = c->scopestack_max; 276 PL_scopestack_max = c->scopestack_max;
348 PL_savestack = c->savestack; 277 PL_savestack = c->savestack;
349 PL_savestack_ix = c->savestack_ix; 278 PL_savestack_ix = c->savestack_ix;
350 PL_savestack_max = c->savestack_max; 279 PL_savestack_max = c->savestack_max;
280#if PERL_VERSION < 9
351 PL_retstack = c->retstack; 281 PL_retstack = c->retstack;
352 PL_retstack_ix = c->retstack_ix; 282 PL_retstack_ix = c->retstack_ix;
353 PL_retstack_max = c->retstack_max; 283 PL_retstack_max = c->retstack_max;
284#endif
354 PL_curpm = c->curpm; 285 PL_curpm = c->curpm;
355 PL_curcop = c->curcop; 286 PL_curcop = c->curcop;
356 PL_top_env = c->top_env; 287 PL_top_env = c->top_env;
357 288
358 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 289 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
… …
418 } 349 }
419 350
420 PUSHs ((SV *)CvPADLIST(cv)); 351 PUSHs ((SV *)CvPADLIST(cv));
421 PUSHs ((SV *)cv); 352 PUSHs ((SV *)cv);
422 353
423 get_padlist (aTHX_ cv); /* this is a monster */ 354 get_padlist (aTHX_ cv);
424 } 355 }
425 } 356 }
426#ifdef CXt_FORMAT 357#ifdef CXt_FORMAT
427 else if (CxTYPE(cx) == CXt_FORMAT) 358 else if (CxTYPE(cx) == CXt_FORMAT)
428 { 359 {
… …
472 c->scopestack_ix = PL_scopestack_ix; 403 c->scopestack_ix = PL_scopestack_ix;
473 c->scopestack_max = PL_scopestack_max; 404 c->scopestack_max = PL_scopestack_max;
474 c->savestack = PL_savestack; 405 c->savestack = PL_savestack;
475 c->savestack_ix = PL_savestack_ix; 406 c->savestack_ix = PL_savestack_ix;
476 c->savestack_max = PL_savestack_max; 407 c->savestack_max = PL_savestack_max;
408#if PERL_VERSION < 9
477 c->retstack = PL_retstack; 409 c->retstack = PL_retstack;
478 c->retstack_ix = PL_retstack_ix; 410 c->retstack_ix = PL_retstack_ix;
479 c->retstack_max = PL_retstack_max; 411 c->retstack_max = PL_retstack_max;
412#endif
480 c->curpm = PL_curpm; 413 c->curpm = PL_curpm;
481 c->curcop = PL_curcop; 414 c->curcop = PL_curcop;
482 c->top_env = PL_top_env; 415 c->top_env = PL_top_env;
483} 416}
484 417
… …
486 * allocate various perl stacks. This is an exact copy 419 * allocate various perl stacks. This is an exact copy
487 * of perl.c:init_stacks, except that it uses less memory 420 * of perl.c:init_stacks, except that it uses less memory
488 * on the (sometimes correct) assumption that coroutines do 421 * on the (sometimes correct) assumption that coroutines do
489 * not usually need a lot of stackspace. 422 * not usually need a lot of stackspace.
490 */ 423 */
491STATIC void 424static void
492coro_init_stacks (pTHX) 425coro_init_stacks (pTHX)
493{ 426{
494 LOCK; 427 LOCK;
495 428
496 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 429 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
521 454
522 New(54,PL_savestack,96,ANY); 455 New(54,PL_savestack,96,ANY);
523 PL_savestack_ix = 0; 456 PL_savestack_ix = 0;
524 PL_savestack_max = 96; 457 PL_savestack_max = 96;
525 458
459#if PERL_VERSION < 9
526 New(54,PL_retstack,8,OP*); 460 New(54,PL_retstack,8,OP*);
527 PL_retstack_ix = 0; 461 PL_retstack_ix = 0;
528 PL_retstack_max = 8; 462 PL_retstack_max = 8;
463#endif
529 464
530 UNLOCK; 465 UNLOCK;
531} 466}
532 467
533/* 468/*
534 * destroy the stacks, the callchain etc... 469 * destroy the stacks, the callchain etc...
535 */ 470 */
536STATIC void 471static void
537destroy_stacks(pTHX) 472destroy_stacks(pTHX)
538{ 473{
539 if (!IN_DESTRUCT) 474 if (!IN_DESTRUCT)
540 { 475 {
541 /* is this ugly, I ask? */ 476 /* is this ugly, I ask? */
… …
573 508
574 Safefree (PL_tmps_stack); 509 Safefree (PL_tmps_stack);
575 Safefree (PL_markstack); 510 Safefree (PL_markstack);
576 Safefree (PL_scopestack); 511 Safefree (PL_scopestack);
577 Safefree (PL_savestack); 512 Safefree (PL_savestack);
513#if PERL_VERSION < 9
578 Safefree (PL_retstack); 514 Safefree (PL_retstack);
515#endif
579} 516}
580 517
581static void 518static void
582allocate_stack (Coro__State ctx, int alloc) 519allocate_stack (Coro__State ctx, int alloc)
583{ 520{
… …
595 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */ 532 stack->ssize = STACKSIZE * sizeof (long); /* 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); 533 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
597 if (stack->sptr == (void *)-1) 534 if (stack->sptr == (void *)-1)
598#endif 535#endif
599 { 536 {
600 /*FIXME*//*D*//* reasonable stack size! */
601 stack->ssize = - (STACKSIZE * sizeof (long)); 537 stack->ssize = - (STACKSIZE * (long)sizeof (long));
602 New (0, stack->sptr, STACKSIZE, long); 538 New (0, stack->sptr, STACKSIZE, long);
603 } 539 }
604 } 540 }
605 else 541 else
606 stack->sptr = 0; 542 stack->sptr = 0;
… …
698 /* 634 /*
699 * this is a _very_ stripped down perl interpreter ;) 635 * this is a _very_ stripped down perl interpreter ;)
700 */ 636 */
701 dTHX; 637 dTHX;
702 Coro__State ctx = (Coro__State)arg; 638 Coro__State ctx = (Coro__State)arg;
703 JMPENV coro_start_env;
704 639
705 PL_top_env = &ctx->start_env; 640 PL_top_env = &ctx->start_env;
706 641
707 ctx->cursp = 0; 642 ctx->cursp = 0;
708 PL_op = PL_op->op_next; 643 PL_op = PL_op->op_next;
709 CALLRUNOPS(aTHX); 644 CALLRUNOPS(aTHX);
710 645
711 abort (); 646 abort ();
712} 647}
713 648
714STATIC void 649static void
715transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 650transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
716{ 651{
717 dSTACKLEVEL; 652 dSTACKLEVEL;
718 653
719 if (prev != next) 654 if (prev != next)
… …
831 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 766 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
832 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 767 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
833 \ 768 \
834 } while(0) 769 } while(0)
835 770
836#define SvSTATE(sv) (struct coro *)SvIV (sv) 771#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
837 772
838static void 773static void
839api_transfer(pTHX_ SV *prev, SV *next, int flags) 774api_transfer(pTHX_ SV *prev, SV *next, int flags)
840{ 775{
841 SV_CORO (prev, "Coro::transfer"); 776 SV_CORO (prev, "Coro::transfer");
… …
859static int coro_nready; 794static int coro_nready;
860 795
861static void 796static void
862coro_enq (pTHX_ SV *sv) 797coro_enq (pTHX_ SV *sv)
863{ 798{
799 SV **xprio;
800 int prio;
801
864 if (SvTYPE (sv) == SVt_PVHV) 802 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"); 803 croak ("Coro::ready tried to enqueue something that is not a coroutine");
804
805 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
806 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
807
808 prio = prio > PRIO_MAX ? PRIO_MAX
809 : prio < PRIO_MIN ? PRIO_MIN
810 : prio;
811
812 av_push (coro_ready [prio - PRIO_MIN], sv);
813 coro_nready++;
880} 814}
881 815
882static SV * 816static SV *
883coro_deq (pTHX_ int min_prio) 817coro_deq (pTHX_ int min_prio)
884{ 818{
… …
1073 av_fill (defav, items - 1); 1007 av_fill (defav, items - 1);
1074 while (items--) 1008 while (items--)
1075 av_store (defav, items, SvREFCNT_inc (ST(items))); 1009 av_store (defav, items, SvREFCNT_inc (ST(items)));
1076 1010
1077 sv = av_pop ((AV *)SvRV (yieldstack)); 1011 sv = av_pop ((AV *)SvRV (yieldstack));
1078 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1012 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))); 1013 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
1080 SvREFCNT_dec (sv); 1014 SvREFCNT_dec (sv);
1081 1015
1082 transfer (aTHX_ prev, next, 0); 1016 transfer (aTHX_ prev, next, 0);
1083 1017
1084MODULE = Coro::State PACKAGE = Coro 1018MODULE = Coro::State PACKAGE = Coro

Diff Legend

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