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.59 by root, Mon Jul 19 01:32:27 2004 UTC vs.
Revision 1.80 by root, Thu Nov 2 20:00:00 2006 UTC

1#define PERL_NO_GET_CONTEXT 1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
7#include "patchlevel.h" 9#include "patchlevel.h"
8 10
9#if PATCHLEVEL < 6 11#if PERL_VERSION < 6
10# ifndef PL_ppaddr 12# ifndef PL_ppaddr
11# define PL_ppaddr ppaddr 13# define PL_ppaddr ppaddr
12# endif 14# endif
13# ifndef call_sv 15# ifndef call_sv
14# define call_sv perl_call_sv 16# define call_sv perl_call_sv
… …
25# ifndef IS_PADCONST 27# ifndef IS_PADCONST
26# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
27# endif 29# endif
28#endif 30#endif
29 31
30#include "libcoro/coro.c"
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;
… …
109 AV *mainstack; 125 AV *mainstack;
110 SV **stack_sp; 126 SV **stack_sp;
111 OP *op; 127 OP *op;
112 SV **curpad; 128 SV **curpad;
113 AV *comppad; 129 AV *comppad;
130 CV *compcv;
114 SV **stack_base; 131 SV **stack_base;
115 SV **stack_max; 132 SV **stack_max;
116 SV **tmps_stack; 133 SV **tmps_stack;
117 I32 tmps_floor; 134 I32 tmps_floor;
118 I32 tmps_ix; 135 I32 tmps_ix;
… …
127 I32 savestack_ix; 144 I32 savestack_ix;
128 I32 savestack_max; 145 I32 savestack_max;
129 OP **retstack; 146 OP **retstack;
130 I32 retstack_ix; 147 I32 retstack_ix;
131 I32 retstack_max; 148 I32 retstack_max;
149 PMOP *curpm;
132 COP *curcop; 150 COP *curcop;
133 JMPENV *top_env; 151 JMPENV *top_env;
134 152
135 /* data associated with this coroutine (initial args) */ 153 /* data associated with this coroutine (initial args) */
136 AV *args; 154 AV *args;
137}; 155};
138 156
139typedef struct coro *Coro__State; 157typedef struct coro *Coro__State;
140typedef struct coro *Coro__State_or_hashref; 158typedef struct coro *Coro__State_or_hashref;
141 159
142/* mostly copied from op.c:cv_clone2 */ 160static AV *
143STATIC AV * 161coro_clone_padlist (pTHX_ CV *cv)
144clone_padlist (pTHX_ AV *protopadlist)
145{ 162{
146 AV *av; 163 AV *padlist = CvPADLIST (cv);
147 I32 ix;
148 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
149 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
150 SV **pname = AvARRAY (protopad_name);
151 SV **ppad = AvARRAY (protopad);
152 I32 fname = AvFILLp (protopad_name);
153 I32 fpad = AvFILLp (protopad);
154 AV *newpadlist, *newpad_name, *newpad; 164 AV *newpadlist, *newpad;
155 SV **npad;
156
157 newpad_name = newAV ();
158 for (ix = fname; ix >= 0; ix--)
159 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
160
161 newpad = newAV ();
162 av_fill (newpad, AvFILLp (protopad));
163 npad = AvARRAY (newpad);
164 165
165 newpadlist = newAV (); 166 newpadlist = newAV ();
166 AvREAL_off (newpadlist); 167 AvREAL_off (newpadlist);
167 av_store (newpadlist, 0, (SV *) newpad_name); 168#if PERL_VERSION < 9
169 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
170#else
171 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
172#endif
173 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
174 --AvFILLp (padlist);
175
176 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
168 av_store (newpadlist, 1, (SV *) newpad); 177 av_store (newpadlist, 1, (SV *)newpad);
169
170 av = newAV (); /* will be @_ */
171 av_extend (av, 0);
172 av_store (newpad, 0, (SV *) av);
173 AvFLAGS (av) = AVf_REIFY;
174
175 for (ix = fpad; ix > 0; ix--)
176 {
177 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
178
179 if (namesv && namesv != &PL_sv_undef)
180 {
181 char *name = SvPVX (namesv); /* XXX */
182
183 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
184 { /* lexical from outside? */
185 npad[ix] = SvREFCNT_inc (ppad[ix]);
186 }
187 else
188 { /* our own lexical */
189 SV *sv;
190 if (*name == '&')
191 sv = SvREFCNT_inc (ppad[ix]);
192 else if (*name == '@')
193 sv = (SV *) newAV ();
194 else if (*name == '%')
195 sv = (SV *) newHV ();
196 else
197 sv = NEWSV (0, 0);
198
199#ifdef SvPADBUSY
200 if (!SvPADBUSY (sv))
201#endif
202 SvPADMY_on (sv);
203
204 npad[ix] = sv;
205 }
206 }
207 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
208 {
209 npad[ix] = SvREFCNT_inc (ppad[ix]);
210 }
211 else
212 {
213 SV *sv = NEWSV (0, 0);
214 SvPADTMP_on (sv);
215 npad[ix] = sv;
216 }
217 }
218
219#if 0 /* return -ENOTUNDERSTOOD */
220 /* Now that vars are all in place, clone nested closures. */
221
222 for (ix = fpad; ix > 0; ix--) {
223 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv;
224 if (namesv
225 && namesv != &PL_sv_undef
226 && !(SvFLAGS(namesv) & SVf_FAKE)
227 && *SvPVX(namesv) == '&'
228 && CvCLONE(ppad[ix]))
229 {
230 CV *kid = cv_clone((CV*)ppad[ix]);
231 SvREFCNT_dec(ppad[ix]);
232 CvCLONE_on(kid);
233 SvPADMY_on(kid);
234 npad[ix] = (SV*)kid;
235 }
236 }
237#endif
238 178
239 return newpadlist; 179 return newpadlist;
240} 180}
241 181
242STATIC void 182static void
243free_padlist (pTHX_ AV *padlist) 183free_padlist (pTHX_ AV *padlist)
244{ 184{
245 /* may be during global destruction */ 185 /* may be during global destruction */
246 if (SvREFCNT (padlist)) 186 if (SvREFCNT (padlist))
247 { 187 {
… …
261 201
262 SvREFCNT_dec ((SV*)padlist); 202 SvREFCNT_dec ((SV*)padlist);
263 } 203 }
264} 204}
265 205
266STATIC int 206static int
267coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 207coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
268{ 208{
269 AV *padlist; 209 AV *padlist;
270 AV *av = (AV *)mg->mg_obj; 210 AV *av = (AV *)mg->mg_obj;
271 211
272 /* casting is fun. */ 212 /* casting is fun. */
273 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 213 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
274 free_padlist (aTHX_ padlist); 214 free_padlist (aTHX_ padlist);
215
216 SvREFCNT_dec (av);
217
218 return 0;
275} 219}
276 220
277#define PERL_MAGIC_coro PERL_MAGIC_ext 221#define PERL_MAGIC_coro PERL_MAGIC_ext
278 222
279static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 223static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
280 224
281/* the next two functions merely cache the padlists */ 225/* the next two functions merely cache the padlists */
282STATIC void 226static void
283get_padlist (pTHX_ CV *cv) 227get_padlist (pTHX_ CV *cv)
284{ 228{
285 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 229 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
286 230
287 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 231 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
288 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 232 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
289 else 233 else
234 {
235#if 0
236 /* this should work - but it doesn't :( */
237 CV *cp = Perl_cv_clone (aTHX_ cv);
238 CvPADLIST (cv) = CvPADLIST (cp);
239 CvPADLIST (cp) = 0;
240 SvREFCNT_dec (cp);
241#else
290 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 242 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
243#endif
244 }
291} 245}
292 246
293STATIC void 247static void
294put_padlist (pTHX_ CV *cv) 248put_padlist (pTHX_ CV *cv)
295{ 249{
296 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 250 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
297 251
298 if (!mg) 252 if (!mg)
… …
325 PL_mainstack = c->mainstack; 279 PL_mainstack = c->mainstack;
326 PL_stack_sp = c->stack_sp; 280 PL_stack_sp = c->stack_sp;
327 PL_op = c->op; 281 PL_op = c->op;
328 PL_curpad = c->curpad; 282 PL_curpad = c->curpad;
329 PL_comppad = c->comppad; 283 PL_comppad = c->comppad;
284 PL_compcv = c->compcv;
330 PL_stack_base = c->stack_base; 285 PL_stack_base = c->stack_base;
331 PL_stack_max = c->stack_max; 286 PL_stack_max = c->stack_max;
332 PL_tmps_stack = c->tmps_stack; 287 PL_tmps_stack = c->tmps_stack;
333 PL_tmps_floor = c->tmps_floor; 288 PL_tmps_floor = c->tmps_floor;
334 PL_tmps_ix = c->tmps_ix; 289 PL_tmps_ix = c->tmps_ix;
… …
340 PL_scopestack_ix = c->scopestack_ix; 295 PL_scopestack_ix = c->scopestack_ix;
341 PL_scopestack_max = c->scopestack_max; 296 PL_scopestack_max = c->scopestack_max;
342 PL_savestack = c->savestack; 297 PL_savestack = c->savestack;
343 PL_savestack_ix = c->savestack_ix; 298 PL_savestack_ix = c->savestack_ix;
344 PL_savestack_max = c->savestack_max; 299 PL_savestack_max = c->savestack_max;
300#if PERL_VERSION < 9
345 PL_retstack = c->retstack; 301 PL_retstack = c->retstack;
346 PL_retstack_ix = c->retstack_ix; 302 PL_retstack_ix = c->retstack_ix;
347 PL_retstack_max = c->retstack_max; 303 PL_retstack_max = c->retstack_max;
304#endif
305 PL_curpm = c->curpm;
348 PL_curcop = c->curcop; 306 PL_curcop = c->curcop;
349 PL_top_env = c->top_env; 307 PL_top_env = c->top_env;
350 308
351 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 309 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
352 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 310 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
411 } 369 }
412 370
413 PUSHs ((SV *)CvPADLIST(cv)); 371 PUSHs ((SV *)CvPADLIST(cv));
414 PUSHs ((SV *)cv); 372 PUSHs ((SV *)cv);
415 373
416 get_padlist (aTHX_ cv); /* this is a monster */ 374 get_padlist (aTHX_ cv);
417 } 375 }
418 } 376 }
419#ifdef CXt_FORMAT 377#ifdef CXt_FORMAT
420 else if (CxTYPE(cx) == CXt_FORMAT) 378 else if (CxTYPE(cx) == CXt_FORMAT)
421 { 379 {
… …
449 c->mainstack = PL_mainstack; 407 c->mainstack = PL_mainstack;
450 c->stack_sp = PL_stack_sp; 408 c->stack_sp = PL_stack_sp;
451 c->op = PL_op; 409 c->op = PL_op;
452 c->curpad = PL_curpad; 410 c->curpad = PL_curpad;
453 c->comppad = PL_comppad; 411 c->comppad = PL_comppad;
412 c->compcv = PL_compcv;
454 c->stack_base = PL_stack_base; 413 c->stack_base = PL_stack_base;
455 c->stack_max = PL_stack_max; 414 c->stack_max = PL_stack_max;
456 c->tmps_stack = PL_tmps_stack; 415 c->tmps_stack = PL_tmps_stack;
457 c->tmps_floor = PL_tmps_floor; 416 c->tmps_floor = PL_tmps_floor;
458 c->tmps_ix = PL_tmps_ix; 417 c->tmps_ix = PL_tmps_ix;
… …
464 c->scopestack_ix = PL_scopestack_ix; 423 c->scopestack_ix = PL_scopestack_ix;
465 c->scopestack_max = PL_scopestack_max; 424 c->scopestack_max = PL_scopestack_max;
466 c->savestack = PL_savestack; 425 c->savestack = PL_savestack;
467 c->savestack_ix = PL_savestack_ix; 426 c->savestack_ix = PL_savestack_ix;
468 c->savestack_max = PL_savestack_max; 427 c->savestack_max = PL_savestack_max;
428#if PERL_VERSION < 9
469 c->retstack = PL_retstack; 429 c->retstack = PL_retstack;
470 c->retstack_ix = PL_retstack_ix; 430 c->retstack_ix = PL_retstack_ix;
471 c->retstack_max = PL_retstack_max; 431 c->retstack_max = PL_retstack_max;
432#endif
433 c->curpm = PL_curpm;
472 c->curcop = PL_curcop; 434 c->curcop = PL_curcop;
473 c->top_env = PL_top_env; 435 c->top_env = PL_top_env;
474} 436}
475 437
476/* 438/*
477 * allocate various perl stacks. This is an exact copy 439 * allocate various perl stacks. This is an exact copy
478 * of perl.c:init_stacks, except that it uses less memory 440 * of perl.c:init_stacks, except that it uses less memory
479 * on the (sometimes correct) assumption that coroutines do 441 * on the (sometimes correct) assumption that coroutines do
480 * not usually need a lot of stackspace. 442 * not usually need a lot of stackspace.
481 */ 443 */
482STATIC void 444static void
483coro_init_stacks (pTHX) 445coro_init_stacks (pTHX)
484{ 446{
485 LOCK; 447 LOCK;
486 448
487 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 449 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
512 474
513 New(54,PL_savestack,96,ANY); 475 New(54,PL_savestack,96,ANY);
514 PL_savestack_ix = 0; 476 PL_savestack_ix = 0;
515 PL_savestack_max = 96; 477 PL_savestack_max = 96;
516 478
479#if PERL_VERSION < 9
517 New(54,PL_retstack,8,OP*); 480 New(54,PL_retstack,8,OP*);
518 PL_retstack_ix = 0; 481 PL_retstack_ix = 0;
519 PL_retstack_max = 8; 482 PL_retstack_max = 8;
483#endif
520 484
521 UNLOCK; 485 UNLOCK;
522} 486}
523 487
524/* 488/*
525 * destroy the stacks, the callchain etc... 489 * destroy the stacks, the callchain etc...
526 */ 490 */
527STATIC void 491static void
528destroy_stacks(pTHX) 492destroy_stacks(pTHX)
529{ 493{
530 if (!IN_DESTRUCT) 494 if (!IN_DESTRUCT)
531 { 495 {
532 /* is this ugly, I ask? */ 496 /* is this ugly, I ask? */
… …
564 528
565 Safefree (PL_tmps_stack); 529 Safefree (PL_tmps_stack);
566 Safefree (PL_markstack); 530 Safefree (PL_markstack);
567 Safefree (PL_scopestack); 531 Safefree (PL_scopestack);
568 Safefree (PL_savestack); 532 Safefree (PL_savestack);
533#if PERL_VERSION < 9
569 Safefree (PL_retstack); 534 Safefree (PL_retstack);
535#endif
570} 536}
571 537
572static void 538static void
573allocate_stack (Coro__State ctx, int alloc) 539allocate_stack (Coro__State ctx, int alloc)
574{ 540{
… …
581 stack->gencnt = ctx->gencnt = 0; 547 stack->gencnt = ctx->gencnt = 0;
582 548
583 if (alloc) 549 if (alloc)
584 { 550 {
585#if HAVE_MMAP 551#if HAVE_MMAP
586 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */ 552 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */
587 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 553 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
588 if (stack->sptr == (void *)-1) 554 if (stack->sptr != (void *)-1)
589#endif
590 { 555 {
591 /*FIXME*//*D*//* reasonable stack size! */ 556# if STACKGUARD
557 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
558# endif
559 }
560 else
561#endif
562 {
592 stack->ssize = - (8192 * sizeof (long)); 563 stack->ssize = - (STACKSIZE * (long)sizeof (long));
593 New (0, stack->sptr, 8192, long); 564 New (0, stack->sptr, STACKSIZE, long);
594 } 565 }
595 } 566 }
596 else 567 else
597 stack->sptr = 0; 568 stack->sptr = 0;
598 569
… …
658 } 629 }
659 else 630 else
660 { 631 {
661 UNOP myop; 632 UNOP myop;
662 633
663 PL_op = (OP *)&myop;
664
665 Zero(&myop, 1, UNOP); 634 Zero(&myop, 1, UNOP);
666 myop.op_next = Nullop; 635 myop.op_next = Nullop;
667 myop.op_flags = OPf_WANT_VOID; 636 myop.op_flags = OPf_WANT_VOID;
637
638 PL_op = (OP *)&myop;
668 639
669 PUSHMARK(SP); 640 PUSHMARK(SP);
670 XPUSHs (sub_init); 641 XPUSHs (sub_init);
671 /* 642 /*
672 * the next line is slightly wrong, as PL_op->op_next 643 * the next line is slightly wrong, as PL_op->op_next
… …
689 /* 660 /*
690 * this is a _very_ stripped down perl interpreter ;) 661 * this is a _very_ stripped down perl interpreter ;)
691 */ 662 */
692 dTHX; 663 dTHX;
693 Coro__State ctx = (Coro__State)arg; 664 Coro__State ctx = (Coro__State)arg;
694 JMPENV coro_start_env;
695 665
696 PL_top_env = &ctx->start_env; 666 PL_top_env = &ctx->start_env;
697 667
698 ctx->cursp = 0; 668 ctx->cursp = 0;
699 PL_op = PL_op->op_next; 669 PL_op = PL_op->op_next;
700 CALLRUNOPS(aTHX); 670 CALLRUNOPS(aTHX);
701 671
702 abort (); 672 abort ();
703} 673}
704 674
705STATIC void 675static void
706transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 676transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
707{ 677{
708 dSTACKLEVEL; 678 dSTACKLEVEL;
709 679
710 if (prev != next) 680 if (prev != next)
… …
822 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 792 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
823 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 793 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
824 \ 794 \
825 } while(0) 795 } while(0)
826 796
827#define SvSTATE(sv) (struct coro *)SvIV (sv) 797#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
828 798
829static void 799static void
830api_transfer(pTHX_ SV *prev, SV *next, int flags) 800api_transfer(pTHX_ SV *prev, SV *next, int flags)
831{ 801{
832 SV_CORO (prev, "Coro::transfer"); 802 SV_CORO (prev, "Coro::transfer");
… …
850static int coro_nready; 820static int coro_nready;
851 821
852static void 822static void
853coro_enq (pTHX_ SV *sv) 823coro_enq (pTHX_ SV *sv)
854{ 824{
825 SV **xprio;
826 int prio;
827
855 if (SvTYPE (sv) == SVt_PVHV) 828 if (SvTYPE (sv) != SVt_PVHV)
856 {
857 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
858 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
859
860 prio = prio > PRIO_MAX ? PRIO_MAX
861 : prio < PRIO_MIN ? PRIO_MIN
862 : prio;
863
864 av_push (coro_ready [prio - PRIO_MIN], sv);
865 coro_nready++;
866
867 return;
868 }
869
870 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 829 croak ("Coro::ready tried to enqueue something that is not a coroutine");
830
831 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
832 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
833
834 prio = prio > PRIO_MAX ? PRIO_MAX
835 : prio < PRIO_MIN ? PRIO_MIN
836 : prio;
837
838 av_push (coro_ready [prio - PRIO_MIN], sv);
839 coro_nready++;
871} 840}
872 841
873static SV * 842static SV *
874coro_deq (pTHX_ int min_prio) 843coro_deq (pTHX_ int min_prio)
875{ 844{
… …
950BOOT: 919BOOT:
951{ /* {} necessary for stoopid perl-5.6.x */ 920{ /* {} necessary for stoopid perl-5.6.x */
952#ifdef USE_ITHREADS 921#ifdef USE_ITHREADS
953 MUTEX_INIT (&coro_mutex); 922 MUTEX_INIT (&coro_mutex);
954#endif 923#endif
924 BOOT_PAGESIZE;
955 925
956 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 926 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
957 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 927 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
958 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 928 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
959 929
… …
984 /*coro->mainstack = 0; *//*actual work is done inside transfer */ 954 /*coro->mainstack = 0; *//*actual work is done inside transfer */
985 /*coro->stack = 0;*/ 955 /*coro->stack = 0;*/
986 956
987 /* same as JMPENV_BOOTSTRAP */ 957 /* same as JMPENV_BOOTSTRAP */
988 /* we might be able to recycle start_env, but safe is safe */ 958 /* we might be able to recycle start_env, but safe is safe */
989 /*Zero(&coro->start_env, 1, JMPENV);*/ 959 /*Zero (&coro->start_env, 1, JMPENV);*/
990 coro->start_env.je_ret = -1; 960 coro->start_env.je_ret = -1;
991 coro->start_env.je_mustcatch = TRUE; 961 coro->start_env.je_mustcatch = TRUE;
992 962
993 RETVAL = coro; 963 RETVAL = coro;
994 OUTPUT: 964 OUTPUT:
… …
1015 if (coro->mainstack && coro->mainstack != main_mainstack) 985 if (coro->mainstack && coro->mainstack != main_mainstack)
1016 { 986 {
1017 struct coro temp; 987 struct coro temp;
1018 988
1019 PUTBACK; 989 PUTBACK;
1020 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 990 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
1021 LOAD(aTHX_ coro); 991 LOAD (aTHX_ coro);
1022 SPAGAIN; 992 SPAGAIN;
1023 993
1024 destroy_stacks (aTHX); 994 destroy_stacks (aTHX);
1025 995
1026 LOAD((&temp)); /* this will get rid of defsv etc.. */ 996 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1027 SPAGAIN; 997 SPAGAIN;
1028 998
1029 coro->mainstack = 0; 999 coro->mainstack = 0;
1030 } 1000 }
1031 1001
… …
1046 1016
1047void 1017void
1048yield(...) 1018yield(...)
1049 PROTOTYPE: @ 1019 PROTOTYPE: @
1050 CODE: 1020 CODE:
1051 static SV *returnstk; 1021 SV *yieldstack;
1052 SV *sv; 1022 SV *sv;
1053 AV *defav = GvAV (PL_defgv); 1023 AV *defav = GvAV (PL_defgv);
1054 struct coro *prev, *next; 1024 struct coro *prev, *next;
1055 1025
1056 if (!returnstk) 1026 yieldstack = *hv_fetch (
1057 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1027 (HV *)SvRV (GvSV (coro_current)),
1028 "yieldstack", sizeof ("yieldstack") - 1,
1029 0
1030 );
1058 1031
1059 /* set up @_ -- ugly */ 1032 /* set up @_ -- ugly */
1060 av_clear (defav); 1033 av_clear (defav);
1061 av_fill (defav, items - 1); 1034 av_fill (defav, items - 1);
1062 while (items--) 1035 while (items--)
1063 av_store (defav, items, SvREFCNT_inc (ST(items))); 1036 av_store (defav, items, SvREFCNT_inc (ST(items)));
1064 1037
1065 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1066 sv = av_pop ((AV *)SvRV (returnstk)); 1038 sv = av_pop ((AV *)SvRV (yieldstack));
1067 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1039 prev = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))));
1068 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1040 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
1069 SvREFCNT_dec (sv); 1041 SvREFCNT_dec (sv);
1070 1042
1071 transfer(aTHX_ prev, next, 0); 1043 transfer (aTHX_ prev, next, 0);
1072 1044
1073MODULE = Coro::State PACKAGE = Coro 1045MODULE = Coro::State PACKAGE = Coro
1074 1046
1075# this is slightly dirty (should expose a c-level api) 1047# this is slightly dirty (should expose a c-level api)
1076 1048
… …
1136cede(...) 1108cede(...)
1137 PROTOTYPE: 1109 PROTOTYPE:
1138 CODE: 1110 CODE:
1139 api_cede (); 1111 api_cede ();
1140 1112
1113# and these are hacks
1114SV *
1115_aio_get_state ()
1116 CODE:
1117{
1118 struct {
1119 int errorno;
1120 int laststype;
1121 int laststatval;
1122 Stat_t statcache;
1123 } data;
1124
1125 data.errorno = errno;
1126 data.laststype = PL_laststype;
1127 data.laststatval = PL_laststatval;
1128 data.statcache = PL_statcache;
1129
1130 RETVAL = newSVpvn ((char *)&data, sizeof data);
1131}
1132 OUTPUT:
1133 RETVAL
1134
1135void
1136_aio_set_state (char *data_)
1137 PROTOTYPE: $
1138 CODE:
1139{
1140 struct {
1141 int errorno;
1142 int laststype;
1143 int laststatval;
1144 Stat_t statcache;
1145 } *data = (void *)data_;
1146
1147 errno = data->errorno;
1148 PL_laststype = data->laststype;
1149 PL_laststatval = data->laststatval;
1150 PL_statcache = data->statcache;
1151}

Diff Legend

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