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.75 by root, Thu Oct 26 06:50:20 2006 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 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 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)
… …
420 } 349 }
421 350
422 PUSHs ((SV *)CvPADLIST(cv)); 351 PUSHs ((SV *)CvPADLIST(cv));
423 PUSHs ((SV *)cv); 352 PUSHs ((SV *)cv);
424 353
425 get_padlist (aTHX_ cv); /* this is a monster */ 354 get_padlist (aTHX_ cv);
426 } 355 }
427 } 356 }
428#ifdef CXt_FORMAT 357#ifdef CXt_FORMAT
429 else if (CxTYPE(cx) == CXt_FORMAT) 358 else if (CxTYPE(cx) == CXt_FORMAT)
430 { 359 {
… …
490 * allocate various perl stacks. This is an exact copy 419 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 420 * of perl.c:init_stacks, except that it uses less memory
492 * on the (sometimes correct) assumption that coroutines do 421 * on the (sometimes correct) assumption that coroutines do
493 * not usually need a lot of stackspace. 422 * not usually need a lot of stackspace.
494 */ 423 */
495STATIC void 424static void
496coro_init_stacks (pTHX) 425coro_init_stacks (pTHX)
497{ 426{
498 LOCK; 427 LOCK;
499 428
500 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 429 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
537} 466}
538 467
539/* 468/*
540 * destroy the stacks, the callchain etc... 469 * destroy the stacks, the callchain etc...
541 */ 470 */
542STATIC void 471static void
543destroy_stacks(pTHX) 472destroy_stacks(pTHX)
544{ 473{
545 if (!IN_DESTRUCT) 474 if (!IN_DESTRUCT)
546 { 475 {
547 /* is this ugly, I ask? */ 476 /* is this ugly, I ask? */
… …
603 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 */
604 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);
605 if (stack->sptr == (void *)-1) 534 if (stack->sptr == (void *)-1)
606#endif 535#endif
607 { 536 {
608 /*FIXME*//*D*//* reasonable stack size! */
609 stack->ssize = - (STACKSIZE * sizeof (long)); 537 stack->ssize = - (STACKSIZE * (long)sizeof (long));
610 New (0, stack->sptr, STACKSIZE, long); 538 New (0, stack->sptr, STACKSIZE, long);
611 } 539 }
612 } 540 }
613 else 541 else
614 stack->sptr = 0; 542 stack->sptr = 0;
… …
706 /* 634 /*
707 * this is a _very_ stripped down perl interpreter ;) 635 * this is a _very_ stripped down perl interpreter ;)
708 */ 636 */
709 dTHX; 637 dTHX;
710 Coro__State ctx = (Coro__State)arg; 638 Coro__State ctx = (Coro__State)arg;
711 JMPENV coro_start_env;
712 639
713 PL_top_env = &ctx->start_env; 640 PL_top_env = &ctx->start_env;
714 641
715 ctx->cursp = 0; 642 ctx->cursp = 0;
716 PL_op = PL_op->op_next; 643 PL_op = PL_op->op_next;
717 CALLRUNOPS(aTHX); 644 CALLRUNOPS(aTHX);
718 645
719 abort (); 646 abort ();
720} 647}
721 648
722STATIC void 649static void
723transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 650transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
724{ 651{
725 dSTACKLEVEL; 652 dSTACKLEVEL;
726 653
727 if (prev != next) 654 if (prev != next)

Diff Legend

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