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.66 by root, Mon Dec 12 19:43:41 2005 UTC vs.
Revision 1.77 by root, Tue Oct 31 23:55:33 2006 UTC

… …
27# ifndef IS_PADCONST 27# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
29# endif 29# endif
30#endif 30#endif
31 31
32#include <signal.h> 32#include <errno.h>
33 33
34#ifdef HAVE_MMAP 34#ifdef HAVE_MMAP
35# include <unistd.h> 35# include <unistd.h>
36# include <sys/mman.h> 36# include <sys/mman.h>
37# ifndef MAP_ANONYMOUS 37# ifndef MAP_ANONYMOUS
… …
57 57
58#include "CoroAPI.h" 58#include "CoroAPI.h"
59 59
60#ifdef USE_ITHREADS 60#ifdef USE_ITHREADS
61static perl_mutex coro_mutex; 61static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else 64#else
65# define LOCK 0 65# define LOCK (void)0
66# define UNLOCK 0 66# define UNLOCK (void)0
67#endif 67#endif
68 68
69static struct CoroAPI coroapi; 69static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */ 70static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash; 71static HV *coro_state_stash;
… …
139}; 139};
140 140
141typedef struct coro *Coro__State; 141typedef struct coro *Coro__State;
142typedef struct coro *Coro__State_or_hashref; 142typedef struct coro *Coro__State_or_hashref;
143 143
144/* mostly copied from op.c:cv_clone2 */ 144static AV *
145STATIC AV * 145coro_clone_padlist (pTHX_ CV *cv)
146clone_padlist (pTHX_ AV *protopadlist)
147{ 146{
148 AV *av; 147 AV *padlist = CvPADLIST (cv);
149 I32 ix;
150 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
151 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
152 SV **pname = AvARRAY (protopad_name);
153 SV **ppad = AvARRAY (protopad);
154 I32 fname = AvFILLp (protopad_name);
155 I32 fpad = AvFILLp (protopad);
156 AV *newpadlist, *newpad_name, *newpad; 148 AV *newpadlist, *newpad;
157 SV **npad;
158
159 newpad_name = newAV ();
160 for (ix = fname; ix >= 0; ix--)
161 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
162
163 newpad = newAV ();
164 av_fill (newpad, AvFILLp (protopad));
165 npad = AvARRAY (newpad);
166 149
167 newpadlist = newAV (); 150 newpadlist = newAV ();
168 AvREAL_off (newpadlist); 151 AvREAL_off (newpadlist);
169 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)));
170 av_store (newpadlist, 1, (SV *) newpad); 157 av_store (newpadlist, 1, (SV *)newpad);
171
172 av = newAV (); /* will be @_ */
173 av_extend (av, 0);
174 av_store (newpad, 0, (SV *) av);
175 AvFLAGS (av) = AVf_REIFY;
176
177 for (ix = fpad; ix > 0; ix--)
178 {
179 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
180
181 if (namesv && namesv != &PL_sv_undef)
182 {
183 char *name = SvPVX (namesv); /* XXX */
184
185 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
186 { /* lexical from outside? */
187 npad[ix] = SvREFCNT_inc (ppad[ix]);
188 }
189 else
190 { /* our own lexical */
191 SV *sv;
192 if (*name == '&')
193 sv = SvREFCNT_inc (ppad[ix]);
194 else if (*name == '@')
195 sv = (SV *) newAV ();
196 else if (*name == '%')
197 sv = (SV *) newHV ();
198 else
199 sv = NEWSV (0, 0);
200
201#ifdef SvPADBUSY
202 if (!SvPADBUSY (sv))
203#endif
204 SvPADMY_on (sv);
205
206 npad[ix] = sv;
207 }
208 }
209 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
210 {
211 npad[ix] = SvREFCNT_inc (ppad[ix]);
212 }
213 else
214 {
215 SV *sv = NEWSV (0, 0);
216 SvPADTMP_on (sv);
217 npad[ix] = sv;
218 }
219 }
220
221#if 0 /* return -ENOTUNDERSTOOD */
222 /* Now that vars are all in place, clone nested closures. */
223
224 for (ix = fpad; ix > 0; ix--) {
225 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv;
226 if (namesv
227 && namesv != &PL_sv_undef
228 && !(SvFLAGS(namesv) & SVf_FAKE)
229 && *SvPVX(namesv) == '&'
230 && CvCLONE(ppad[ix]))
231 {
232 CV *kid = cv_clone((CV*)ppad[ix]);
233 SvREFCNT_dec(ppad[ix]);
234 CvCLONE_on(kid);
235 SvPADMY_on(kid);
236 npad[ix] = (SV*)kid;
237 }
238 }
239#endif
240 158
241 return newpadlist; 159 return newpadlist;
242} 160}
243 161
244STATIC void 162static void
245free_padlist (pTHX_ AV *padlist) 163free_padlist (pTHX_ AV *padlist)
246{ 164{
247 /* may be during global destruction */ 165 /* may be during global destruction */
248 if (SvREFCNT (padlist)) 166 if (SvREFCNT (padlist))
249 { 167 {
… …
263 181
264 SvREFCNT_dec ((SV*)padlist); 182 SvREFCNT_dec ((SV*)padlist);
265 } 183 }
266} 184}
267 185
268STATIC int 186static int
269coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 187coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
270{ 188{
271 AV *padlist; 189 AV *padlist;
272 AV *av = (AV *)mg->mg_obj; 190 AV *av = (AV *)mg->mg_obj;
273 191
274 /* casting is fun. */ 192 /* casting is fun. */
275 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 193 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
276 free_padlist (aTHX_ padlist); 194 free_padlist (aTHX_ padlist);
277 195
278 SvREFCNT_dec (av); 196 SvREFCNT_dec (av);
197
198 return 0;
279} 199}
280 200
281#define PERL_MAGIC_coro PERL_MAGIC_ext 201#define PERL_MAGIC_coro PERL_MAGIC_ext
282 202
283static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 203static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
284 204
285/* the next two functions merely cache the padlists */ 205/* the next two functions merely cache the padlists */
286STATIC void 206static void
287get_padlist (pTHX_ CV *cv) 207get_padlist (pTHX_ CV *cv)
288{ 208{
289 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 209 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
290 210
291 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 211 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
292 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 212 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
293 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
294 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 222 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
223#endif
224 }
295} 225}
296 226
297STATIC void 227static void
298put_padlist (pTHX_ CV *cv) 228put_padlist (pTHX_ CV *cv)
299{ 229{
300 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 230 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
301 231
302 if (!mg) 232 if (!mg)
… …
345 PL_scopestack_ix = c->scopestack_ix; 275 PL_scopestack_ix = c->scopestack_ix;
346 PL_scopestack_max = c->scopestack_max; 276 PL_scopestack_max = c->scopestack_max;
347 PL_savestack = c->savestack; 277 PL_savestack = c->savestack;
348 PL_savestack_ix = c->savestack_ix; 278 PL_savestack_ix = c->savestack_ix;
349 PL_savestack_max = c->savestack_max; 279 PL_savestack_max = c->savestack_max;
280#if PERL_VERSION < 9
350 PL_retstack = c->retstack; 281 PL_retstack = c->retstack;
351 PL_retstack_ix = c->retstack_ix; 282 PL_retstack_ix = c->retstack_ix;
352 PL_retstack_max = c->retstack_max; 283 PL_retstack_max = c->retstack_max;
284#endif
353 PL_curpm = c->curpm; 285 PL_curpm = c->curpm;
354 PL_curcop = c->curcop; 286 PL_curcop = c->curcop;
355 PL_top_env = c->top_env; 287 PL_top_env = c->top_env;
356 288
357 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 289 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
… …
417 } 349 }
418 350
419 PUSHs ((SV *)CvPADLIST(cv)); 351 PUSHs ((SV *)CvPADLIST(cv));
420 PUSHs ((SV *)cv); 352 PUSHs ((SV *)cv);
421 353
422 get_padlist (aTHX_ cv); /* this is a monster */ 354 get_padlist (aTHX_ cv);
423 } 355 }
424 } 356 }
425#ifdef CXt_FORMAT 357#ifdef CXt_FORMAT
426 else if (CxTYPE(cx) == CXt_FORMAT) 358 else if (CxTYPE(cx) == CXt_FORMAT)
427 { 359 {
… …
471 c->scopestack_ix = PL_scopestack_ix; 403 c->scopestack_ix = PL_scopestack_ix;
472 c->scopestack_max = PL_scopestack_max; 404 c->scopestack_max = PL_scopestack_max;
473 c->savestack = PL_savestack; 405 c->savestack = PL_savestack;
474 c->savestack_ix = PL_savestack_ix; 406 c->savestack_ix = PL_savestack_ix;
475 c->savestack_max = PL_savestack_max; 407 c->savestack_max = PL_savestack_max;
408#if PERL_VERSION < 9
476 c->retstack = PL_retstack; 409 c->retstack = PL_retstack;
477 c->retstack_ix = PL_retstack_ix; 410 c->retstack_ix = PL_retstack_ix;
478 c->retstack_max = PL_retstack_max; 411 c->retstack_max = PL_retstack_max;
412#endif
479 c->curpm = PL_curpm; 413 c->curpm = PL_curpm;
480 c->curcop = PL_curcop; 414 c->curcop = PL_curcop;
481 c->top_env = PL_top_env; 415 c->top_env = PL_top_env;
482} 416}
483 417
… …
485 * allocate various perl stacks. This is an exact copy 419 * allocate various perl stacks. This is an exact copy
486 * of perl.c:init_stacks, except that it uses less memory 420 * of perl.c:init_stacks, except that it uses less memory
487 * on the (sometimes correct) assumption that coroutines do 421 * on the (sometimes correct) assumption that coroutines do
488 * not usually need a lot of stackspace. 422 * not usually need a lot of stackspace.
489 */ 423 */
490STATIC void 424static void
491coro_init_stacks (pTHX) 425coro_init_stacks (pTHX)
492{ 426{
493 LOCK; 427 LOCK;
494 428
495 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 429 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
520 454
521 New(54,PL_savestack,96,ANY); 455 New(54,PL_savestack,96,ANY);
522 PL_savestack_ix = 0; 456 PL_savestack_ix = 0;
523 PL_savestack_max = 96; 457 PL_savestack_max = 96;
524 458
459#if PERL_VERSION < 9
525 New(54,PL_retstack,8,OP*); 460 New(54,PL_retstack,8,OP*);
526 PL_retstack_ix = 0; 461 PL_retstack_ix = 0;
527 PL_retstack_max = 8; 462 PL_retstack_max = 8;
463#endif
528 464
529 UNLOCK; 465 UNLOCK;
530} 466}
531 467
532/* 468/*
533 * destroy the stacks, the callchain etc... 469 * destroy the stacks, the callchain etc...
534 */ 470 */
535STATIC void 471static void
536destroy_stacks(pTHX) 472destroy_stacks(pTHX)
537{ 473{
538 if (!IN_DESTRUCT) 474 if (!IN_DESTRUCT)
539 { 475 {
540 /* is this ugly, I ask? */ 476 /* is this ugly, I ask? */
… …
572 508
573 Safefree (PL_tmps_stack); 509 Safefree (PL_tmps_stack);
574 Safefree (PL_markstack); 510 Safefree (PL_markstack);
575 Safefree (PL_scopestack); 511 Safefree (PL_scopestack);
576 Safefree (PL_savestack); 512 Safefree (PL_savestack);
513#if PERL_VERSION < 9
577 Safefree (PL_retstack); 514 Safefree (PL_retstack);
515#endif
578} 516}
579 517
580static void 518static void
581allocate_stack (Coro__State ctx, int alloc) 519allocate_stack (Coro__State ctx, int alloc)
582{ 520{
… …
589 stack->gencnt = ctx->gencnt = 0; 527 stack->gencnt = ctx->gencnt = 0;
590 528
591 if (alloc) 529 if (alloc)
592 { 530 {
593#if HAVE_MMAP 531#if HAVE_MMAP
594 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */ 532 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */
595 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);
596 if (stack->sptr == (void *)-1) 534 if (stack->sptr == (void *)-1)
597#endif 535#endif
598 { 536 {
599 /*FIXME*//*D*//* reasonable stack size! */
600 stack->ssize = - (8192 * sizeof (long)); 537 stack->ssize = - (STACKSIZE * (long)sizeof (long));
601 New (0, stack->sptr, 8192, long); 538 New (0, stack->sptr, STACKSIZE, long);
602 } 539 }
603 } 540 }
604 else 541 else
605 stack->sptr = 0; 542 stack->sptr = 0;
606 543
… …
697 /* 634 /*
698 * this is a _very_ stripped down perl interpreter ;) 635 * this is a _very_ stripped down perl interpreter ;)
699 */ 636 */
700 dTHX; 637 dTHX;
701 Coro__State ctx = (Coro__State)arg; 638 Coro__State ctx = (Coro__State)arg;
702 JMPENV coro_start_env;
703 639
704 PL_top_env = &ctx->start_env; 640 PL_top_env = &ctx->start_env;
705 641
706 ctx->cursp = 0; 642 ctx->cursp = 0;
707 PL_op = PL_op->op_next; 643 PL_op = PL_op->op_next;
708 CALLRUNOPS(aTHX); 644 CALLRUNOPS(aTHX);
709 645
710 abort (); 646 abort ();
711} 647}
712 648
713STATIC void 649static void
714transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 650transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
715{ 651{
716 dSTACKLEVEL; 652 dSTACKLEVEL;
717 653
718 if (prev != next) 654 if (prev != next)
… …
830 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 766 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
831 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); \
832 \ 768 \
833 } while(0) 769 } while(0)
834 770
835#define SvSTATE(sv) (struct coro *)SvIV (sv) 771#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
836 772
837static void 773static void
838api_transfer(pTHX_ SV *prev, SV *next, int flags) 774api_transfer(pTHX_ SV *prev, SV *next, int flags)
839{ 775{
840 SV_CORO (prev, "Coro::transfer"); 776 SV_CORO (prev, "Coro::transfer");
… …
858static int coro_nready; 794static int coro_nready;
859 795
860static void 796static void
861coro_enq (pTHX_ SV *sv) 797coro_enq (pTHX_ SV *sv)
862{ 798{
799 SV **xprio;
800 int prio;
801
863 if (SvTYPE (sv) == SVt_PVHV) 802 if (SvTYPE (sv) != SVt_PVHV)
864 {
865 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
866 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
867
868 prio = prio > PRIO_MAX ? PRIO_MAX
869 : prio < PRIO_MIN ? PRIO_MIN
870 : prio;
871
872 av_push (coro_ready [prio - PRIO_MIN], sv);
873 coro_nready++;
874
875 return;
876 }
877
878 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++;
879} 814}
880 815
881static SV * 816static SV *
882coro_deq (pTHX_ int min_prio) 817coro_deq (pTHX_ int min_prio)
883{ 818{
… …
1072 av_fill (defav, items - 1); 1007 av_fill (defav, items - 1);
1073 while (items--) 1008 while (items--)
1074 av_store (defav, items, SvREFCNT_inc (ST(items))); 1009 av_store (defav, items, SvREFCNT_inc (ST(items)));
1075 1010
1076 sv = av_pop ((AV *)SvRV (yieldstack)); 1011 sv = av_pop ((AV *)SvRV (yieldstack));
1077 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))));
1078 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))));
1079 SvREFCNT_dec (sv); 1014 SvREFCNT_dec (sv);
1080 1015
1081 transfer (aTHX_ prev, next, 0); 1016 transfer (aTHX_ prev, next, 0);
1082 1017
1083MODULE = Coro::State PACKAGE = Coro 1018MODULE = Coro::State PACKAGE = Coro
… …
1146cede(...) 1081cede(...)
1147 PROTOTYPE: 1082 PROTOTYPE:
1148 CODE: 1083 CODE:
1149 api_cede (); 1084 api_cede ();
1150 1085
1086# and these are hacks
1087SV *
1088_aio_get_state ()
1089 CODE:
1090{
1091 struct {
1092 int errorno;
1093 int laststype;
1094 int laststatval;
1095 Stat_t statcache;
1096 } data;
1097
1098 data.errorno = errno;
1099 data.laststype = PL_laststype;
1100 data.laststatval = PL_laststatval;
1101 data.statcache = PL_statcache;
1102
1103 RETVAL = newSVpvn ((char *)&data, sizeof data);
1104}
1105 OUTPUT:
1106 RETVAL
1107
1108void
1109_aio_set_state (char *data_)
1110 PROTOTYPE: $
1111 CODE:
1112{
1113 struct {
1114 int errorno;
1115 int laststype;
1116 int laststatval;
1117 Stat_t statcache;
1118 } *data = (void *)data_;
1119
1120 errno = data->errorno;
1121 PL_laststype = data->laststype;
1122 PL_laststatval = data->laststatval;
1123 PL_statcache = data->statcache;
1124}

Diff Legend

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