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.64 by root, Mon Mar 21 15:06:51 2005 UTC vs.
Revision 1.84 by root, Fri Nov 24 00:31:21 2006 UTC

… …
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8 8
9#include "patchlevel.h" 9#include "patchlevel.h"
10 10
11#if PATCHLEVEL < 6 11#if PERL_VERSION < 6
12# ifndef PL_ppaddr 12# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr 13# define PL_ppaddr ppaddr
14# endif 14# endif
15# ifndef call_sv 15# ifndef call_sv
16# define call_sv perl_call_sv 16# define call_sv perl_call_sv
… …
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
… …
57 73
58#include "CoroAPI.h" 74#include "CoroAPI.h"
59 75
60#ifdef USE_ITHREADS 76#ifdef USE_ITHREADS
61static perl_mutex coro_mutex; 77static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 78# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 79# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else 80#else
65# define LOCK 0 81# define LOCK (void)0
66# define UNLOCK 0 82# define UNLOCK (void)0
67#endif 83#endif
68 84
69static struct CoroAPI coroapi; 85static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */ 86static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash; 87static HV *coro_state_stash;
… …
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
… …
128 I32 savestack_ix; 141 I32 savestack_ix;
129 I32 savestack_max; 142 I32 savestack_max;
130 OP **retstack; 143 OP **retstack;
131 I32 retstack_ix; 144 I32 retstack_ix;
132 I32 retstack_max; 145 I32 retstack_max;
146 PMOP *curpm;
133 COP *curcop; 147 COP *curcop;
134 JMPENV *top_env; 148 JMPENV *top_env;
135 149
136 /* data associated with this coroutine (initial args) */ 150 /* data associated with this coroutine (initial args) */
137 AV *args; 151 AV *args;
138}; 152};
139 153
140typedef struct coro *Coro__State; 154typedef struct coro *Coro__State;
141typedef struct coro *Coro__State_or_hashref; 155typedef struct coro *Coro__State_or_hashref;
142 156
143/* mostly copied from op.c:cv_clone2 */ 157static AV *
144STATIC AV * 158coro_clone_padlist (pTHX_ CV *cv)
145clone_padlist (pTHX_ AV *protopadlist)
146{ 159{
147 AV *av; 160 AV *padlist = CvPADLIST (cv);
148 I32 ix;
149 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
150 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
151 SV **pname = AvARRAY (protopad_name);
152 SV **ppad = AvARRAY (protopad);
153 I32 fname = AvFILLp (protopad_name);
154 I32 fpad = AvFILLp (protopad);
155 AV *newpadlist, *newpad_name, *newpad; 161 AV *newpadlist, *newpad;
156 SV **npad;
157
158 newpad_name = newAV ();
159 for (ix = fname; ix >= 0; ix--)
160 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
161
162 newpad = newAV ();
163 av_fill (newpad, AvFILLp (protopad));
164 npad = AvARRAY (newpad);
165 162
166 newpadlist = newAV (); 163 newpadlist = newAV ();
167 AvREAL_off (newpadlist); 164 AvREAL_off (newpadlist);
168 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)));
169 av_store (newpadlist, 1, (SV *) newpad); 174 av_store (newpadlist, 1, (SV *)newpad);
170
171 av = newAV (); /* will be @_ */
172 av_extend (av, 0);
173 av_store (newpad, 0, (SV *) av);
174 AvFLAGS (av) = AVf_REIFY;
175
176 for (ix = fpad; ix > 0; ix--)
177 {
178 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
179
180 if (namesv && namesv != &PL_sv_undef)
181 {
182 char *name = SvPVX (namesv); /* XXX */
183
184 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
185 { /* lexical from outside? */
186 npad[ix] = SvREFCNT_inc (ppad[ix]);
187 }
188 else
189 { /* our own lexical */
190 SV *sv;
191 if (*name == '&')
192 sv = SvREFCNT_inc (ppad[ix]);
193 else if (*name == '@')
194 sv = (SV *) newAV ();
195 else if (*name == '%')
196 sv = (SV *) newHV ();
197 else
198 sv = NEWSV (0, 0);
199
200#ifdef SvPADBUSY
201 if (!SvPADBUSY (sv))
202#endif
203 SvPADMY_on (sv);
204
205 npad[ix] = sv;
206 }
207 }
208 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
209 {
210 npad[ix] = SvREFCNT_inc (ppad[ix]);
211 }
212 else
213 {
214 SV *sv = NEWSV (0, 0);
215 SvPADTMP_on (sv);
216 npad[ix] = sv;
217 }
218 }
219
220#if 0 /* return -ENOTUNDERSTOOD */
221 /* Now that vars are all in place, clone nested closures. */
222
223 for (ix = fpad; ix > 0; ix--) {
224 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv;
225 if (namesv
226 && namesv != &PL_sv_undef
227 && !(SvFLAGS(namesv) & SVf_FAKE)
228 && *SvPVX(namesv) == '&'
229 && CvCLONE(ppad[ix]))
230 {
231 CV *kid = cv_clone((CV*)ppad[ix]);
232 SvREFCNT_dec(ppad[ix]);
233 CvCLONE_on(kid);
234 SvPADMY_on(kid);
235 npad[ix] = (SV*)kid;
236 }
237 }
238#endif
239 175
240 return newpadlist; 176 return newpadlist;
241} 177}
242 178
243STATIC void 179static void
244free_padlist (pTHX_ AV *padlist) 180free_padlist (pTHX_ AV *padlist)
245{ 181{
246 /* may be during global destruction */ 182 /* may be during global destruction */
247 if (SvREFCNT (padlist)) 183 if (SvREFCNT (padlist))
248 { 184 {
… …
262 198
263 SvREFCNT_dec ((SV*)padlist); 199 SvREFCNT_dec ((SV*)padlist);
264 } 200 }
265} 201}
266 202
267STATIC int 203static int
268coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 204coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
269{ 205{
270 AV *padlist; 206 AV *padlist;
271 AV *av = (AV *)mg->mg_obj; 207 AV *av = (AV *)mg->mg_obj;
272 208
273 /* casting is fun. */ 209 /* casting is fun. */
274 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 210 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
275 free_padlist (aTHX_ padlist); 211 free_padlist (aTHX_ padlist);
276 212
277 SvREFCNT_dec (av); 213 SvREFCNT_dec (av);
214
215 return 0;
278} 216}
279 217
280#define PERL_MAGIC_coro PERL_MAGIC_ext 218#define PERL_MAGIC_coro PERL_MAGIC_ext
281 219
282static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 220static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
283 221
284/* the next two functions merely cache the padlists */ 222/* the next two functions merely cache the padlists */
285STATIC void 223static void
286get_padlist (pTHX_ CV *cv) 224get_padlist (pTHX_ CV *cv)
287{ 225{
288 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 226 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
289 227
290 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 228 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
291 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 229 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
292 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
293 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 239 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
240#endif
241 }
294} 242}
295 243
296STATIC void 244static void
297put_padlist (pTHX_ CV *cv) 245put_padlist (pTHX_ CV *cv)
298{ 246{
299 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 247 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
300 248
301 if (!mg) 249 if (!mg)
… …
344 PL_scopestack_ix = c->scopestack_ix; 292 PL_scopestack_ix = c->scopestack_ix;
345 PL_scopestack_max = c->scopestack_max; 293 PL_scopestack_max = c->scopestack_max;
346 PL_savestack = c->savestack; 294 PL_savestack = c->savestack;
347 PL_savestack_ix = c->savestack_ix; 295 PL_savestack_ix = c->savestack_ix;
348 PL_savestack_max = c->savestack_max; 296 PL_savestack_max = c->savestack_max;
297#if PERL_VERSION < 9
349 PL_retstack = c->retstack; 298 PL_retstack = c->retstack;
350 PL_retstack_ix = c->retstack_ix; 299 PL_retstack_ix = c->retstack_ix;
351 PL_retstack_max = c->retstack_max; 300 PL_retstack_max = c->retstack_max;
301#endif
302 PL_curpm = c->curpm;
352 PL_curcop = c->curcop; 303 PL_curcop = c->curcop;
353 PL_top_env = c->top_env; 304 PL_top_env = c->top_env;
354 305
355 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 306 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
356 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 307 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
415 } 366 }
416 367
417 PUSHs ((SV *)CvPADLIST(cv)); 368 PUSHs ((SV *)CvPADLIST(cv));
418 PUSHs ((SV *)cv); 369 PUSHs ((SV *)cv);
419 370
420 get_padlist (aTHX_ cv); /* this is a monster */ 371 get_padlist (aTHX_ cv);
421 } 372 }
422 } 373 }
423#ifdef CXt_FORMAT 374#ifdef CXt_FORMAT
424 else if (CxTYPE(cx) == CXt_FORMAT) 375 else if (CxTYPE(cx) == CXt_FORMAT)
425 { 376 {
… …
469 c->scopestack_ix = PL_scopestack_ix; 420 c->scopestack_ix = PL_scopestack_ix;
470 c->scopestack_max = PL_scopestack_max; 421 c->scopestack_max = PL_scopestack_max;
471 c->savestack = PL_savestack; 422 c->savestack = PL_savestack;
472 c->savestack_ix = PL_savestack_ix; 423 c->savestack_ix = PL_savestack_ix;
473 c->savestack_max = PL_savestack_max; 424 c->savestack_max = PL_savestack_max;
425#if PERL_VERSION < 9
474 c->retstack = PL_retstack; 426 c->retstack = PL_retstack;
475 c->retstack_ix = PL_retstack_ix; 427 c->retstack_ix = PL_retstack_ix;
476 c->retstack_max = PL_retstack_max; 428 c->retstack_max = PL_retstack_max;
429#endif
430 c->curpm = PL_curpm;
477 c->curcop = PL_curcop; 431 c->curcop = PL_curcop;
478 c->top_env = PL_top_env; 432 c->top_env = PL_top_env;
479} 433}
480 434
481/* 435/*
482 * allocate various perl stacks. This is an exact copy 436 * allocate various perl stacks. This is an exact copy
483 * of perl.c:init_stacks, except that it uses less memory 437 * of perl.c:init_stacks, except that it uses less memory
484 * on the (sometimes correct) assumption that coroutines do 438 * on the (sometimes correct) assumption that coroutines do
485 * not usually need a lot of stackspace. 439 * not usually need a lot of stackspace.
486 */ 440 */
487STATIC void 441static void
488coro_init_stacks (pTHX) 442coro_init_stacks (pTHX)
489{ 443{
490 LOCK; 444 LOCK;
491 445
492 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 446 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
517 471
518 New(54,PL_savestack,96,ANY); 472 New(54,PL_savestack,96,ANY);
519 PL_savestack_ix = 0; 473 PL_savestack_ix = 0;
520 PL_savestack_max = 96; 474 PL_savestack_max = 96;
521 475
476#if PERL_VERSION < 9
522 New(54,PL_retstack,8,OP*); 477 New(54,PL_retstack,8,OP*);
523 PL_retstack_ix = 0; 478 PL_retstack_ix = 0;
524 PL_retstack_max = 8; 479 PL_retstack_max = 8;
480#endif
525 481
526 UNLOCK; 482 UNLOCK;
527} 483}
528 484
529/* 485/*
530 * destroy the stacks, the callchain etc... 486 * destroy the stacks, the callchain etc...
531 */ 487 */
532STATIC void 488static void
533destroy_stacks(pTHX) 489destroy_stacks(pTHX)
534{ 490{
535 if (!IN_DESTRUCT) 491 if (!IN_DESTRUCT)
536 { 492 {
537 /* is this ugly, I ask? */ 493 /* is this ugly, I ask? */
… …
569 525
570 Safefree (PL_tmps_stack); 526 Safefree (PL_tmps_stack);
571 Safefree (PL_markstack); 527 Safefree (PL_markstack);
572 Safefree (PL_scopestack); 528 Safefree (PL_scopestack);
573 Safefree (PL_savestack); 529 Safefree (PL_savestack);
530#if PERL_VERSION < 9
574 Safefree (PL_retstack); 531 Safefree (PL_retstack);
532#endif
575} 533}
576 534
577static void 535static void
578allocate_stack (Coro__State ctx, int alloc) 536allocate_stack (Coro__State ctx, int alloc)
579{ 537{
… …
586 stack->gencnt = ctx->gencnt = 0; 544 stack->gencnt = ctx->gencnt = 0;
587 545
588 if (alloc) 546 if (alloc)
589 { 547 {
590#if HAVE_MMAP 548#if HAVE_MMAP
591 stack->ssize = 16384 * 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 */
592 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);
593 if (stack->sptr == (void *)-1) 551 if (stack->sptr != (void *)-1)
594#endif
595 { 552 {
596 /*FIXME*//*D*//* reasonable stack size! */ 553# if STACKGUARD
554 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
555# endif
556 }
557 else
558#endif
559 {
597 stack->ssize = - (8192 * sizeof (long)); 560 stack->ssize = - (STACKSIZE * (long)sizeof (long));
598 New (0, stack->sptr, 8192, long); 561 New (0, stack->sptr, STACKSIZE, long);
599 } 562 }
600 } 563 }
601 else 564 else
602 stack->sptr = 0; 565 stack->sptr = 0;
603 566
… …
663 } 626 }
664 else 627 else
665 { 628 {
666 UNOP myop; 629 UNOP myop;
667 630
668 PL_op = (OP *)&myop;
669
670 Zero(&myop, 1, UNOP); 631 Zero(&myop, 1, UNOP);
671 myop.op_next = Nullop; 632 myop.op_next = Nullop;
672 myop.op_flags = OPf_WANT_VOID; 633 myop.op_flags = OPf_WANT_VOID;
634
635 PL_op = (OP *)&myop;
673 636
674 PUSHMARK(SP); 637 PUSHMARK(SP);
675 XPUSHs (sub_init); 638 XPUSHs (sub_init);
676 /* 639 /*
677 * the next line is slightly wrong, as PL_op->op_next 640 * the next line is slightly wrong, as PL_op->op_next
… …
694 /* 657 /*
695 * this is a _very_ stripped down perl interpreter ;) 658 * this is a _very_ stripped down perl interpreter ;)
696 */ 659 */
697 dTHX; 660 dTHX;
698 Coro__State ctx = (Coro__State)arg; 661 Coro__State ctx = (Coro__State)arg;
699 JMPENV coro_start_env;
700 662
701 PL_top_env = &ctx->start_env; 663 PL_top_env = &PL_start_env;
702 664
703 ctx->cursp = 0; 665 ctx->cursp = 0;
704 PL_op = PL_op->op_next; 666 PL_op = PL_op->op_next;
705 CALLRUNOPS(aTHX); 667 CALLRUNOPS(aTHX);
706 668
707 abort (); 669 abort ();
708} 670}
709 671
710STATIC void 672/* never call directly, always through the coro_state_transfer global variable */
673static void
711transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 674transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags)
712{ 675{
713 dSTACKLEVEL; 676 dSTACKLEVEL;
714 677
715 if (prev != next) 678 if (prev != next)
716 { 679 {
680 /* has this coro been created yet? */
717 if (next->mainstack) 681 if (next->mainstack)
718 { 682 {
719 LOCK; 683 LOCK;
720 SAVE (prev, flags); 684 SAVE (prev, flags);
721 LOAD (next); 685 LOAD (next);
… …
760 { 724 {
761 LOCK; 725 LOCK;
762 SAVE (prev, -1); /* first get rid of the old state */ 726 SAVE (prev, -1); /* first get rid of the old state */
763 UNLOCK; 727 UNLOCK;
764 728
729 /* create the coroutine for the first time */
765 if (flags & TRANSFER_SAVE_CCTXT) 730 if (flags & TRANSFER_SAVE_CCTXT)
766 { 731 {
767 if (!prev->stack) 732 if (!prev->stack)
768 allocate_stack (prev, 0); 733 allocate_stack (prev, 0);
769 734
735 /* the new coroutine starts with start_env again */
736 PL_top_env = &PL_start_env;
737
770 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 738 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
771 { 739 {
772 PL_top_env = &next->start_env;
773
774 setup_coro (next); 740 setup_coro (next);
775 next->cursp = stacklevel; 741 next->cursp = stacklevel;
776 742
777 prev->stack->refcnt++; 743 prev->stack->refcnt++;
778 prev->stack->usecnt++; 744 prev->stack->usecnt++;
… …
806 coro_mortal = 0; 772 coro_mortal = 0;
807 } 773 }
808 UNLOCK; 774 UNLOCK;
809} 775}
810 776
777void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
778
811#define SV_CORO(sv,func) \ 779#define SV_CORO(sv,func) \
812 do { \ 780 do { \
813 if (SvROK (sv)) \ 781 if (SvROK (sv)) \
814 sv = SvRV (sv); \ 782 sv = SvRV (sv); \
815 \ 783 \
… …
827 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 795 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
828 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); \
829 \ 797 \
830 } while(0) 798 } while(0)
831 799
832#define SvSTATE(sv) (struct coro *)SvIV (sv) 800#define SvSTATE(sv) INT2PTR (struct coro *, SvIVX (sv))
833 801
834static void 802static void
835api_transfer(pTHX_ SV *prev, SV *next, int flags) 803api_transfer (pTHX_ SV *prev, SV *next, int flags)
836{ 804{
837 SV_CORO (prev, "Coro::transfer"); 805 SV_CORO (prev, "Coro::transfer");
838 SV_CORO (next, "Coro::transfer"); 806 SV_CORO (next, "Coro::transfer");
839 807
840 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 808 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
841} 809}
842 810
843/** Coro ********************************************************************/ 811/** Coro ********************************************************************/
844 812
845#define PRIO_MAX 3 813#define PRIO_MAX 3
… …
849#define PRIO_IDLE -3 817#define PRIO_IDLE -3
850#define PRIO_MIN -4 818#define PRIO_MIN -4
851 819
852/* for Coro.pm */ 820/* for Coro.pm */
853static GV *coro_current, *coro_idle; 821static GV *coro_current, *coro_idle;
854static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 822static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
855static int coro_nready; 823static int coro_nready;
856 824
857static void 825static void
858coro_enq (pTHX_ SV *sv) 826coro_enq (pTHX_ SV *sv)
859{ 827{
828 SV **xprio;
829 int prio;
830
860 if (SvTYPE (sv) == SVt_PVHV) 831 if (SvTYPE (sv) != SVt_PVHV)
861 {
862 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
863 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
864
865 prio = prio > PRIO_MAX ? PRIO_MAX
866 : prio < PRIO_MIN ? PRIO_MIN
867 : prio;
868
869 av_push (coro_ready [prio - PRIO_MIN], sv);
870 coro_nready++;
871
872 return;
873 }
874
875 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++;
876} 843}
877 844
878static SV * 845static SV *
879coro_deq (pTHX_ int min_prio) 846coro_deq (pTHX_ int min_prio)
880{ 847{
… …
883 min_prio -= PRIO_MIN; 850 min_prio -= PRIO_MIN;
884 if (min_prio < 0) 851 if (min_prio < 0)
885 min_prio = 0; 852 min_prio = 0;
886 853
887 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 854 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
888 if (av_len (coro_ready[prio]) >= 0) 855 if (AvFILLp (coro_ready [prio]) >= 0)
889 { 856 {
890 coro_nready--; 857 coro_nready--;
891 return av_shift (coro_ready[prio]); 858 return av_shift (coro_ready [prio]);
892 } 859 }
893 860
894 return 0; 861 return 0;
895} 862}
896 863
… …
930 897
931 SV_CORO (next, "Coro::schedule"); 898 SV_CORO (next, "Coro::schedule");
932 899
933 UNLOCK; 900 UNLOCK;
934 901
935 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 902 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
936 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 903 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
937} 904}
938 905
939static void 906static void
940api_cede (void) 907api_cede (void)
941{ 908{
… …
955BOOT: 922BOOT:
956{ /* {} necessary for stoopid perl-5.6.x */ 923{ /* {} necessary for stoopid perl-5.6.x */
957#ifdef USE_ITHREADS 924#ifdef USE_ITHREADS
958 MUTEX_INIT (&coro_mutex); 925 MUTEX_INIT (&coro_mutex);
959#endif 926#endif
927 BOOT_PAGESIZE;
960 928
961 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 929 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
962 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 930 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
963 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 931 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
964 932
… …
986 Newz (0, coro, 1, struct coro); 954 Newz (0, coro, 1, struct coro);
987 955
988 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 956 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
989 /*coro->mainstack = 0; *//*actual work is done inside transfer */ 957 /*coro->mainstack = 0; *//*actual work is done inside transfer */
990 /*coro->stack = 0;*/ 958 /*coro->stack = 0;*/
991
992 /* same as JMPENV_BOOTSTRAP */
993 /* we might be able to recycle start_env, but safe is safe */
994 /*Zero(&coro->start_env, 1, JMPENV);*/
995 coro->start_env.je_ret = -1;
996 coro->start_env.je_mustcatch = TRUE;
997 959
998 RETVAL = coro; 960 RETVAL = coro;
999 OUTPUT: 961 OUTPUT:
1000 RETVAL 962 RETVAL
1001 963
… …
1007 PROTOTYPE: @ 969 PROTOTYPE: @
1008 CODE: 970 CODE:
1009 PUTBACK; 971 PUTBACK;
1010 SV_CORO (next, "Coro::transfer"); 972 SV_CORO (next, "Coro::transfer");
1011 SV_CORO (prev, "Coro::transfer"); 973 SV_CORO (prev, "Coro::transfer");
1012 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 974 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
1013 SPAGAIN; 975 SPAGAIN;
1014 976
1015void 977void
1016DESTROY(coro) 978DESTROY(coro)
1017 Coro::State coro 979 Coro::State coro
… …
1044 PROTOTYPE: $ 1006 PROTOTYPE: $
1045 CODE: 1007 CODE:
1046 _exit (code); 1008 _exit (code);
1047 1009
1048MODULE = Coro::State PACKAGE = Coro::Cont 1010MODULE = Coro::State PACKAGE = Coro::Cont
1049
1050# this is slightly dirty (should expose a c-level api)
1051 1011
1052void 1012void
1053yield(...) 1013yield(...)
1054 PROTOTYPE: @ 1014 PROTOTYPE: @
1055 CODE: 1015 CODE:
… …
1069 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
1070 while (items--) 1030 while (items--)
1071 av_store (defav, items, SvREFCNT_inc (ST(items))); 1031 av_store (defav, items, SvREFCNT_inc (ST(items)));
1072 1032
1073 sv = av_pop ((AV *)SvRV (yieldstack)); 1033 sv = av_pop ((AV *)SvRV (yieldstack));
1074 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)));
1075 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)));
1076 SvREFCNT_dec (sv); 1036 SvREFCNT_dec (sv);
1077 1037
1078 transfer (aTHX_ prev, next, 0); 1038 coro_state_transfer (aTHX_ prev, next, 0);
1079 1039
1080MODULE = Coro::State PACKAGE = Coro 1040MODULE = Coro::State PACKAGE = Coro
1081
1082# this is slightly dirty (should expose a c-level api)
1083 1041
1084BOOT: 1042BOOT:
1085{ 1043{
1086 int i; 1044 int i;
1087 HV *stash = gv_stashpv ("Coro", TRUE); 1045 HV *stash = gv_stashpv ("Coro", TRUE);
… …
1107 coroapi.ready = api_ready; 1065 coroapi.ready = api_ready;
1108 coroapi.nready = &coro_nready; 1066 coroapi.nready = &coro_nready;
1109 coroapi.current = coro_current; 1067 coroapi.current = coro_current;
1110 1068
1111 GCoroAPI = &coroapi; 1069 GCoroAPI = &coroapi;
1112 sv_setiv(sv, (IV)&coroapi); 1070 sv_setiv (sv, (IV)&coroapi);
1113 SvREADONLY_on(sv); 1071 SvREADONLY_on (sv);
1114 } 1072 }
1115} 1073}
1116 1074
1117#if !PERL_MICRO 1075#if !PERL_MICRO
1118 1076
… …
1143cede(...) 1101cede(...)
1144 PROTOTYPE: 1102 PROTOTYPE:
1145 CODE: 1103 CODE:
1146 api_cede (); 1104 api_cede ();
1147 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