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.69 by root, Fri Dec 16 01:33:20 2005 UTC vs.
Revision 1.84 by root, Fri Nov 24 00:31:21 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
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
33 41
34#ifdef HAVE_MMAP 42#ifdef HAVE_MMAP
35# include <unistd.h> 43# include <unistd.h>
36# include <sys/mman.h> 44# include <sys/mman.h>
37# ifndef MAP_ANONYMOUS 45# ifndef MAP_ANONYMOUS
… …
39# define MAP_ANONYMOUS MAP_ANON 47# define MAP_ANONYMOUS MAP_ANON
40# else 48# else
41# undef HAVE_MMAP 49# undef HAVE_MMAP
42# endif 50# endif
43# 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
59# endif
44#endif 60#endif
45 61
46#define SUB_INIT "Coro::State::initialize" 62#define SUB_INIT "Coro::State::initialize"
47#define UCORO_STATE "_coro_state" 63#define UCORO_STATE "_coro_state"
48 64
… …
84 void *sptr; 100 void *sptr;
85 long ssize; /* positive == mmap, otherwise malloc */ 101 long ssize; /* positive == mmap, otherwise malloc */
86} coro_stack; 102} coro_stack;
87 103
88struct coro { 104struct coro {
89 /* the top-level JMPENV for each coroutine, needed to catch dies. */
90 JMPENV start_env;
91
92 /* the optional C context */ 105 /* the optional C context */
93 coro_stack *stack; 106 coro_stack *stack;
94 void *cursp; 107 void *cursp;
95 int gencnt; 108 int gencnt;
96 109
… …
139}; 152};
140 153
141typedef struct coro *Coro__State; 154typedef struct coro *Coro__State;
142typedef struct coro *Coro__State_or_hashref; 155typedef struct coro *Coro__State_or_hashref;
143 156
144/* mostly copied from op.c:cv_clone2 */ 157static AV *
145STATIC AV * 158coro_clone_padlist (pTHX_ CV *cv)
146clone_padlist (pTHX_ AV *protopadlist)
147{ 159{
148 AV *av; 160 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; 161 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 162
167 newpadlist = newAV (); 163 newpadlist = newAV ();
168 AvREAL_off (newpadlist); 164 AvREAL_off (newpadlist);
169 av_store (newpadlist, 0, (SV *) newpad_name); 165#if PERL_VERSION < 9
166 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
167#else
168 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
169#endif
170 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
171 --AvFILLp (padlist);
172
173 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
170 av_store (newpadlist, 1, (SV *) newpad); 174 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 175
241 return newpadlist; 176 return newpadlist;
242} 177}
243 178
244STATIC void 179static void
245free_padlist (pTHX_ AV *padlist) 180free_padlist (pTHX_ AV *padlist)
246{ 181{
247 /* may be during global destruction */ 182 /* may be during global destruction */
248 if (SvREFCNT (padlist)) 183 if (SvREFCNT (padlist))
249 { 184 {
… …
263 198
264 SvREFCNT_dec ((SV*)padlist); 199 SvREFCNT_dec ((SV*)padlist);
265 } 200 }
266} 201}
267 202
268STATIC int 203static int
269coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 204coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
270{ 205{
271 AV *padlist; 206 AV *padlist;
272 AV *av = (AV *)mg->mg_obj; 207 AV *av = (AV *)mg->mg_obj;
273 208
274 /* casting is fun. */ 209 /* casting is fun. */
275 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 210 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
276 free_padlist (aTHX_ padlist); 211 free_padlist (aTHX_ padlist);
277 212
278 SvREFCNT_dec (av); 213 SvREFCNT_dec (av);
214
215 return 0;
279} 216}
280 217
281#define PERL_MAGIC_coro PERL_MAGIC_ext 218#define PERL_MAGIC_coro PERL_MAGIC_ext
282 219
283static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 220static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
284 221
285/* the next two functions merely cache the padlists */ 222/* the next two functions merely cache the padlists */
286STATIC void 223static void
287get_padlist (pTHX_ CV *cv) 224get_padlist (pTHX_ CV *cv)
288{ 225{
289 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 226 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
290 227
291 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 228 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
292 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 229 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
293 else 230 else
231 {
232#if 0
233 /* this should work - but it doesn't :( */
234 CV *cp = Perl_cv_clone (aTHX_ cv);
235 CvPADLIST (cv) = CvPADLIST (cp);
236 CvPADLIST (cp) = 0;
237 SvREFCNT_dec (cp);
238#else
294 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 239 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
240#endif
241 }
295} 242}
296 243
297STATIC void 244static void
298put_padlist (pTHX_ CV *cv) 245put_padlist (pTHX_ CV *cv)
299{ 246{
300 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 247 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
301 248
302 if (!mg) 249 if (!mg)
… …
345 PL_scopestack_ix = c->scopestack_ix; 292 PL_scopestack_ix = c->scopestack_ix;
346 PL_scopestack_max = c->scopestack_max; 293 PL_scopestack_max = c->scopestack_max;
347 PL_savestack = c->savestack; 294 PL_savestack = c->savestack;
348 PL_savestack_ix = c->savestack_ix; 295 PL_savestack_ix = c->savestack_ix;
349 PL_savestack_max = c->savestack_max; 296 PL_savestack_max = c->savestack_max;
297#if PERL_VERSION < 9
350 PL_retstack = c->retstack; 298 PL_retstack = c->retstack;
351 PL_retstack_ix = c->retstack_ix; 299 PL_retstack_ix = c->retstack_ix;
352 PL_retstack_max = c->retstack_max; 300 PL_retstack_max = c->retstack_max;
301#endif
353 PL_curpm = c->curpm; 302 PL_curpm = c->curpm;
354 PL_curcop = c->curcop; 303 PL_curcop = c->curcop;
355 PL_top_env = c->top_env; 304 PL_top_env = c->top_env;
356 305
357 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 306 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
… …
417 } 366 }
418 367
419 PUSHs ((SV *)CvPADLIST(cv)); 368 PUSHs ((SV *)CvPADLIST(cv));
420 PUSHs ((SV *)cv); 369 PUSHs ((SV *)cv);
421 370
422 get_padlist (aTHX_ cv); /* this is a monster */ 371 get_padlist (aTHX_ cv);
423 } 372 }
424 } 373 }
425#ifdef CXt_FORMAT 374#ifdef CXt_FORMAT
426 else if (CxTYPE(cx) == CXt_FORMAT) 375 else if (CxTYPE(cx) == CXt_FORMAT)
427 { 376 {
… …
471 c->scopestack_ix = PL_scopestack_ix; 420 c->scopestack_ix = PL_scopestack_ix;
472 c->scopestack_max = PL_scopestack_max; 421 c->scopestack_max = PL_scopestack_max;
473 c->savestack = PL_savestack; 422 c->savestack = PL_savestack;
474 c->savestack_ix = PL_savestack_ix; 423 c->savestack_ix = PL_savestack_ix;
475 c->savestack_max = PL_savestack_max; 424 c->savestack_max = PL_savestack_max;
425#if PERL_VERSION < 9
476 c->retstack = PL_retstack; 426 c->retstack = PL_retstack;
477 c->retstack_ix = PL_retstack_ix; 427 c->retstack_ix = PL_retstack_ix;
478 c->retstack_max = PL_retstack_max; 428 c->retstack_max = PL_retstack_max;
429#endif
479 c->curpm = PL_curpm; 430 c->curpm = PL_curpm;
480 c->curcop = PL_curcop; 431 c->curcop = PL_curcop;
481 c->top_env = PL_top_env; 432 c->top_env = PL_top_env;
482} 433}
483 434
… …
485 * allocate various perl stacks. This is an exact copy 436 * allocate various perl stacks. This is an exact copy
486 * of perl.c:init_stacks, except that it uses less memory 437 * of perl.c:init_stacks, except that it uses less memory
487 * on the (sometimes correct) assumption that coroutines do 438 * on the (sometimes correct) assumption that coroutines do
488 * not usually need a lot of stackspace. 439 * not usually need a lot of stackspace.
489 */ 440 */
490STATIC void 441static void
491coro_init_stacks (pTHX) 442coro_init_stacks (pTHX)
492{ 443{
493 LOCK; 444 LOCK;
494 445
495 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 446 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
520 471
521 New(54,PL_savestack,96,ANY); 472 New(54,PL_savestack,96,ANY);
522 PL_savestack_ix = 0; 473 PL_savestack_ix = 0;
523 PL_savestack_max = 96; 474 PL_savestack_max = 96;
524 475
476#if PERL_VERSION < 9
525 New(54,PL_retstack,8,OP*); 477 New(54,PL_retstack,8,OP*);
526 PL_retstack_ix = 0; 478 PL_retstack_ix = 0;
527 PL_retstack_max = 8; 479 PL_retstack_max = 8;
480#endif
528 481
529 UNLOCK; 482 UNLOCK;
530} 483}
531 484
532/* 485/*
533 * destroy the stacks, the callchain etc... 486 * destroy the stacks, the callchain etc...
534 */ 487 */
535STATIC void 488static void
536destroy_stacks(pTHX) 489destroy_stacks(pTHX)
537{ 490{
538 if (!IN_DESTRUCT) 491 if (!IN_DESTRUCT)
539 { 492 {
540 /* is this ugly, I ask? */ 493 /* is this ugly, I ask? */
… …
572 525
573 Safefree (PL_tmps_stack); 526 Safefree (PL_tmps_stack);
574 Safefree (PL_markstack); 527 Safefree (PL_markstack);
575 Safefree (PL_scopestack); 528 Safefree (PL_scopestack);
576 Safefree (PL_savestack); 529 Safefree (PL_savestack);
530#if PERL_VERSION < 9
577 Safefree (PL_retstack); 531 Safefree (PL_retstack);
532#endif
578} 533}
579 534
580static void 535static void
581allocate_stack (Coro__State ctx, int alloc) 536allocate_stack (Coro__State ctx, int alloc)
582{ 537{
… …
589 stack->gencnt = ctx->gencnt = 0; 544 stack->gencnt = ctx->gencnt = 0;
590 545
591 if (alloc) 546 if (alloc)
592 { 547 {
593#if HAVE_MMAP 548#if HAVE_MMAP
594 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */ 549 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* 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); 550 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
596 if (stack->sptr == (void *)-1) 551 if (stack->sptr != (void *)-1)
597#endif
598 { 552 {
599 /*FIXME*//*D*//* reasonable stack size! */ 553# if STACKGUARD
554 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
555# endif
556 }
557 else
558#endif
559 {
600 stack->ssize = - (STACKSIZE * sizeof (long)); 560 stack->ssize = - (STACKSIZE * (long)sizeof (long));
601 New (0, stack->sptr, STACKSIZE, long); 561 New (0, stack->sptr, STACKSIZE, long);
602 } 562 }
603 } 563 }
604 else 564 else
605 stack->sptr = 0; 565 stack->sptr = 0;
… …
666 } 626 }
667 else 627 else
668 { 628 {
669 UNOP myop; 629 UNOP myop;
670 630
671 PL_op = (OP *)&myop;
672
673 Zero(&myop, 1, UNOP); 631 Zero(&myop, 1, UNOP);
674 myop.op_next = Nullop; 632 myop.op_next = Nullop;
675 myop.op_flags = OPf_WANT_VOID; 633 myop.op_flags = OPf_WANT_VOID;
634
635 PL_op = (OP *)&myop;
676 636
677 PUSHMARK(SP); 637 PUSHMARK(SP);
678 XPUSHs (sub_init); 638 XPUSHs (sub_init);
679 /* 639 /*
680 * the next line is slightly wrong, as PL_op->op_next 640 * the next line is slightly wrong, as PL_op->op_next
… …
697 /* 657 /*
698 * this is a _very_ stripped down perl interpreter ;) 658 * this is a _very_ stripped down perl interpreter ;)
699 */ 659 */
700 dTHX; 660 dTHX;
701 Coro__State ctx = (Coro__State)arg; 661 Coro__State ctx = (Coro__State)arg;
702 JMPENV coro_start_env;
703 662
704 PL_top_env = &ctx->start_env; 663 PL_top_env = &PL_start_env;
705 664
706 ctx->cursp = 0; 665 ctx->cursp = 0;
707 PL_op = PL_op->op_next; 666 PL_op = PL_op->op_next;
708 CALLRUNOPS(aTHX); 667 CALLRUNOPS(aTHX);
709 668
710 abort (); 669 abort ();
711} 670}
712 671
713STATIC void 672/* never call directly, always through the coro_state_transfer global variable */
673static void
714transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 674transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags)
715{ 675{
716 dSTACKLEVEL; 676 dSTACKLEVEL;
717 677
718 if (prev != next) 678 if (prev != next)
719 { 679 {
680 /* has this coro been created yet? */
720 if (next->mainstack) 681 if (next->mainstack)
721 { 682 {
722 LOCK; 683 LOCK;
723 SAVE (prev, flags); 684 SAVE (prev, flags);
724 LOAD (next); 685 LOAD (next);
… …
763 { 724 {
764 LOCK; 725 LOCK;
765 SAVE (prev, -1); /* first get rid of the old state */ 726 SAVE (prev, -1); /* first get rid of the old state */
766 UNLOCK; 727 UNLOCK;
767 728
729 /* create the coroutine for the first time */
768 if (flags & TRANSFER_SAVE_CCTXT) 730 if (flags & TRANSFER_SAVE_CCTXT)
769 { 731 {
770 if (!prev->stack) 732 if (!prev->stack)
771 allocate_stack (prev, 0); 733 allocate_stack (prev, 0);
772 734
735 /* the new coroutine starts with start_env again */
736 PL_top_env = &PL_start_env;
737
773 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 738 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
774 { 739 {
775 PL_top_env = &next->start_env;
776
777 setup_coro (next); 740 setup_coro (next);
778 next->cursp = stacklevel; 741 next->cursp = stacklevel;
779 742
780 prev->stack->refcnt++; 743 prev->stack->refcnt++;
781 prev->stack->usecnt++; 744 prev->stack->usecnt++;
… …
809 coro_mortal = 0; 772 coro_mortal = 0;
810 } 773 }
811 UNLOCK; 774 UNLOCK;
812} 775}
813 776
777void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
778
814#define SV_CORO(sv,func) \ 779#define SV_CORO(sv,func) \
815 do { \ 780 do { \
816 if (SvROK (sv)) \ 781 if (SvROK (sv)) \
817 sv = SvRV (sv); \ 782 sv = SvRV (sv); \
818 \ 783 \
… …
830 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 795 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
831 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 796 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
832 \ 797 \
833 } while(0) 798 } while(0)
834 799
835#define SvSTATE(sv) (struct coro *)SvIV (sv) 800#define SvSTATE(sv) INT2PTR (struct coro *, SvIVX (sv))
836 801
837static void 802static void
838api_transfer(pTHX_ SV *prev, SV *next, int flags) 803api_transfer (pTHX_ SV *prev, SV *next, int flags)
839{ 804{
840 SV_CORO (prev, "Coro::transfer"); 805 SV_CORO (prev, "Coro::transfer");
841 SV_CORO (next, "Coro::transfer"); 806 SV_CORO (next, "Coro::transfer");
842 807
843 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 808 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
844} 809}
845 810
846/** Coro ********************************************************************/ 811/** Coro ********************************************************************/
847 812
848#define PRIO_MAX 3 813#define PRIO_MAX 3
… …
852#define PRIO_IDLE -3 817#define PRIO_IDLE -3
853#define PRIO_MIN -4 818#define PRIO_MIN -4
854 819
855/* for Coro.pm */ 820/* for Coro.pm */
856static GV *coro_current, *coro_idle; 821static GV *coro_current, *coro_idle;
857static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 822static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
858static int coro_nready; 823static int coro_nready;
859 824
860static void 825static void
861coro_enq (pTHX_ SV *sv) 826coro_enq (pTHX_ SV *sv)
862{ 827{
828 SV **xprio;
829 int prio;
830
863 if (SvTYPE (sv) == SVt_PVHV) 831 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"); 832 croak ("Coro::ready tried to enqueue something that is not a coroutine");
833
834 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
835 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
836
837 prio = prio > PRIO_MAX ? PRIO_MAX
838 : prio < PRIO_MIN ? PRIO_MIN
839 : prio;
840
841 av_push (coro_ready [prio - PRIO_MIN], sv);
842 coro_nready++;
879} 843}
880 844
881static SV * 845static SV *
882coro_deq (pTHX_ int min_prio) 846coro_deq (pTHX_ int min_prio)
883{ 847{
… …
886 min_prio -= PRIO_MIN; 850 min_prio -= PRIO_MIN;
887 if (min_prio < 0) 851 if (min_prio < 0)
888 min_prio = 0; 852 min_prio = 0;
889 853
890 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 854 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
891 if (av_len (coro_ready[prio]) >= 0) 855 if (AvFILLp (coro_ready [prio]) >= 0)
892 { 856 {
893 coro_nready--; 857 coro_nready--;
894 return av_shift (coro_ready[prio]); 858 return av_shift (coro_ready [prio]);
895 } 859 }
896 860
897 return 0; 861 return 0;
898} 862}
899 863
… …
933 897
934 SV_CORO (next, "Coro::schedule"); 898 SV_CORO (next, "Coro::schedule");
935 899
936 UNLOCK; 900 UNLOCK;
937 901
938 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 902 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
939 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 903 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
940} 904}
941 905
942static void 906static void
943api_cede (void) 907api_cede (void)
944{ 908{
… …
958BOOT: 922BOOT:
959{ /* {} necessary for stoopid perl-5.6.x */ 923{ /* {} necessary for stoopid perl-5.6.x */
960#ifdef USE_ITHREADS 924#ifdef USE_ITHREADS
961 MUTEX_INIT (&coro_mutex); 925 MUTEX_INIT (&coro_mutex);
962#endif 926#endif
927 BOOT_PAGESIZE;
963 928
964 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 929 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
965 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 930 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
966 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 931 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
967 932
… …
989 Newz (0, coro, 1, struct coro); 954 Newz (0, coro, 1, struct coro);
990 955
991 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 956 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
992 /*coro->mainstack = 0; *//*actual work is done inside transfer */ 957 /*coro->mainstack = 0; *//*actual work is done inside transfer */
993 /*coro->stack = 0;*/ 958 /*coro->stack = 0;*/
994
995 /* same as JMPENV_BOOTSTRAP */
996 /* we might be able to recycle start_env, but safe is safe */
997 /*Zero(&coro->start_env, 1, JMPENV);*/
998 coro->start_env.je_ret = -1;
999 coro->start_env.je_mustcatch = TRUE;
1000 959
1001 RETVAL = coro; 960 RETVAL = coro;
1002 OUTPUT: 961 OUTPUT:
1003 RETVAL 962 RETVAL
1004 963
… …
1010 PROTOTYPE: @ 969 PROTOTYPE: @
1011 CODE: 970 CODE:
1012 PUTBACK; 971 PUTBACK;
1013 SV_CORO (next, "Coro::transfer"); 972 SV_CORO (next, "Coro::transfer");
1014 SV_CORO (prev, "Coro::transfer"); 973 SV_CORO (prev, "Coro::transfer");
1015 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 974 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
1016 SPAGAIN; 975 SPAGAIN;
1017 976
1018void 977void
1019DESTROY(coro) 978DESTROY(coro)
1020 Coro::State coro 979 Coro::State coro
… …
1047 PROTOTYPE: $ 1006 PROTOTYPE: $
1048 CODE: 1007 CODE:
1049 _exit (code); 1008 _exit (code);
1050 1009
1051MODULE = Coro::State PACKAGE = Coro::Cont 1010MODULE = Coro::State PACKAGE = Coro::Cont
1052
1053# this is slightly dirty (should expose a c-level api)
1054 1011
1055void 1012void
1056yield(...) 1013yield(...)
1057 PROTOTYPE: @ 1014 PROTOTYPE: @
1058 CODE: 1015 CODE:
… …
1072 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
1073 while (items--) 1030 while (items--)
1074 av_store (defav, items, SvREFCNT_inc (ST(items))); 1031 av_store (defav, items, SvREFCNT_inc (ST(items)));
1075 1032
1076 sv = av_pop ((AV *)SvRV (yieldstack)); 1033 sv = av_pop ((AV *)SvRV (yieldstack));
1077 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1034 prev = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1078 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1035 next = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1079 SvREFCNT_dec (sv); 1036 SvREFCNT_dec (sv);
1080 1037
1081 transfer (aTHX_ prev, next, 0); 1038 coro_state_transfer (aTHX_ prev, next, 0);
1082 1039
1083MODULE = Coro::State PACKAGE = Coro 1040MODULE = Coro::State PACKAGE = Coro
1084
1085# this is slightly dirty (should expose a c-level api)
1086 1041
1087BOOT: 1042BOOT:
1088{ 1043{
1089 int i; 1044 int i;
1090 HV *stash = gv_stashpv ("Coro", TRUE); 1045 HV *stash = gv_stashpv ("Coro", TRUE);
… …
1110 coroapi.ready = api_ready; 1065 coroapi.ready = api_ready;
1111 coroapi.nready = &coro_nready; 1066 coroapi.nready = &coro_nready;
1112 coroapi.current = coro_current; 1067 coroapi.current = coro_current;
1113 1068
1114 GCoroAPI = &coroapi; 1069 GCoroAPI = &coroapi;
1115 sv_setiv(sv, (IV)&coroapi); 1070 sv_setiv (sv, (IV)&coroapi);
1116 SvREADONLY_on(sv); 1071 SvREADONLY_on (sv);
1117 } 1072 }
1118} 1073}
1119 1074
1120#if !PERL_MICRO 1075#if !PERL_MICRO
1121 1076
… …
1146cede(...) 1101cede(...)
1147 PROTOTYPE: 1102 PROTOTYPE:
1148 CODE: 1103 CODE:
1149 api_cede (); 1104 api_cede ();
1150 1105
1106# and these are hacks
1107SV *
1108_aio_get_state ()
1109 CODE:
1110{
1111 struct {
1112 int errorno;
1113 int laststype;
1114 int laststatval;
1115 Stat_t statcache;
1116 } data;
1117
1118 data.errorno = errno;
1119 data.laststype = PL_laststype;
1120 data.laststatval = PL_laststatval;
1121 data.statcache = PL_statcache;
1122
1123 RETVAL = newSVpvn ((char *)&data, sizeof data);
1124}
1125 OUTPUT:
1126 RETVAL
1127
1128void
1129_aio_set_state (char *data_)
1130 PROTOTYPE: $
1131 CODE:
1132{
1133 struct {
1134 int errorno;
1135 int laststype;
1136 int laststatval;
1137 Stat_t statcache;
1138 } *data = (void *)data_;
1139
1140 errno = data->errorno;
1141 PL_laststype = data->laststype;
1142 PL_laststatval = data->laststatval;
1143 PL_statcache = data->statcache;
1144}

Diff Legend

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