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.77 by root, Tue Oct 31 23:55:33 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 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;
… …
109 AV *mainstack; 109 AV *mainstack;
110 SV **stack_sp; 110 SV **stack_sp;
111 OP *op; 111 OP *op;
112 SV **curpad; 112 SV **curpad;
113 AV *comppad; 113 AV *comppad;
114 CV *compcv;
114 SV **stack_base; 115 SV **stack_base;
115 SV **stack_max; 116 SV **stack_max;
116 SV **tmps_stack; 117 SV **tmps_stack;
117 I32 tmps_floor; 118 I32 tmps_floor;
118 I32 tmps_ix; 119 I32 tmps_ix;
… …
127 I32 savestack_ix; 128 I32 savestack_ix;
128 I32 savestack_max; 129 I32 savestack_max;
129 OP **retstack; 130 OP **retstack;
130 I32 retstack_ix; 131 I32 retstack_ix;
131 I32 retstack_max; 132 I32 retstack_max;
133 PMOP *curpm;
132 COP *curcop; 134 COP *curcop;
133 JMPENV *top_env; 135 JMPENV *top_env;
134 136
135 /* data associated with this coroutine (initial args) */ 137 /* data associated with this coroutine (initial args) */
136 AV *args; 138 AV *args;
137}; 139};
138 140
139typedef struct coro *Coro__State; 141typedef struct coro *Coro__State;
140typedef struct coro *Coro__State_or_hashref; 142typedef struct coro *Coro__State_or_hashref;
141 143
142/* mostly copied from op.c:cv_clone2 */ 144static AV *
143STATIC AV * 145coro_clone_padlist (pTHX_ CV *cv)
144clone_padlist (pTHX_ AV *protopadlist)
145{ 146{
146 AV *av; 147 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; 148 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 149
165 newpadlist = newAV (); 150 newpadlist = newAV ();
166 AvREAL_off (newpadlist); 151 AvREAL_off (newpadlist);
167 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)));
168 av_store (newpadlist, 1, (SV *) newpad); 157 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 158
239 return newpadlist; 159 return newpadlist;
240} 160}
241 161
242STATIC void 162static void
243free_padlist (pTHX_ AV *padlist) 163free_padlist (pTHX_ AV *padlist)
244{ 164{
245 /* may be during global destruction */ 165 /* may be during global destruction */
246 if (SvREFCNT (padlist)) 166 if (SvREFCNT (padlist))
247 { 167 {
… …
261 181
262 SvREFCNT_dec ((SV*)padlist); 182 SvREFCNT_dec ((SV*)padlist);
263 } 183 }
264} 184}
265 185
266STATIC int 186static int
267coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 187coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
268{ 188{
269 AV *padlist; 189 AV *padlist;
270 AV *av = (AV *)mg->mg_obj; 190 AV *av = (AV *)mg->mg_obj;
271 191
272 /* casting is fun. */ 192 /* casting is fun. */
273 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 193 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
274 free_padlist (aTHX_ padlist); 194 free_padlist (aTHX_ padlist);
195
196 SvREFCNT_dec (av);
197
198 return 0;
275} 199}
276 200
277#define PERL_MAGIC_coro PERL_MAGIC_ext 201#define PERL_MAGIC_coro PERL_MAGIC_ext
278 202
279static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 203static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
280 204
281/* the next two functions merely cache the padlists */ 205/* the next two functions merely cache the padlists */
282STATIC void 206static void
283get_padlist (pTHX_ CV *cv) 207get_padlist (pTHX_ CV *cv)
284{ 208{
285 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 209 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
286 210
287 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 211 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
288 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 212 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
289 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
290 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 222 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
223#endif
224 }
291} 225}
292 226
293STATIC void 227static void
294put_padlist (pTHX_ CV *cv) 228put_padlist (pTHX_ CV *cv)
295{ 229{
296 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 230 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
297 231
298 if (!mg) 232 if (!mg)
… …
325 PL_mainstack = c->mainstack; 259 PL_mainstack = c->mainstack;
326 PL_stack_sp = c->stack_sp; 260 PL_stack_sp = c->stack_sp;
327 PL_op = c->op; 261 PL_op = c->op;
328 PL_curpad = c->curpad; 262 PL_curpad = c->curpad;
329 PL_comppad = c->comppad; 263 PL_comppad = c->comppad;
264 PL_compcv = c->compcv;
330 PL_stack_base = c->stack_base; 265 PL_stack_base = c->stack_base;
331 PL_stack_max = c->stack_max; 266 PL_stack_max = c->stack_max;
332 PL_tmps_stack = c->tmps_stack; 267 PL_tmps_stack = c->tmps_stack;
333 PL_tmps_floor = c->tmps_floor; 268 PL_tmps_floor = c->tmps_floor;
334 PL_tmps_ix = c->tmps_ix; 269 PL_tmps_ix = c->tmps_ix;
… …
340 PL_scopestack_ix = c->scopestack_ix; 275 PL_scopestack_ix = c->scopestack_ix;
341 PL_scopestack_max = c->scopestack_max; 276 PL_scopestack_max = c->scopestack_max;
342 PL_savestack = c->savestack; 277 PL_savestack = c->savestack;
343 PL_savestack_ix = c->savestack_ix; 278 PL_savestack_ix = c->savestack_ix;
344 PL_savestack_max = c->savestack_max; 279 PL_savestack_max = c->savestack_max;
280#if PERL_VERSION < 9
345 PL_retstack = c->retstack; 281 PL_retstack = c->retstack;
346 PL_retstack_ix = c->retstack_ix; 282 PL_retstack_ix = c->retstack_ix;
347 PL_retstack_max = c->retstack_max; 283 PL_retstack_max = c->retstack_max;
284#endif
285 PL_curpm = c->curpm;
348 PL_curcop = c->curcop; 286 PL_curcop = c->curcop;
349 PL_top_env = c->top_env; 287 PL_top_env = c->top_env;
350 288
351 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 289 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
352 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 290 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
411 } 349 }
412 350
413 PUSHs ((SV *)CvPADLIST(cv)); 351 PUSHs ((SV *)CvPADLIST(cv));
414 PUSHs ((SV *)cv); 352 PUSHs ((SV *)cv);
415 353
416 get_padlist (aTHX_ cv); /* this is a monster */ 354 get_padlist (aTHX_ cv);
417 } 355 }
418 } 356 }
419#ifdef CXt_FORMAT 357#ifdef CXt_FORMAT
420 else if (CxTYPE(cx) == CXt_FORMAT) 358 else if (CxTYPE(cx) == CXt_FORMAT)
421 { 359 {
… …
449 c->mainstack = PL_mainstack; 387 c->mainstack = PL_mainstack;
450 c->stack_sp = PL_stack_sp; 388 c->stack_sp = PL_stack_sp;
451 c->op = PL_op; 389 c->op = PL_op;
452 c->curpad = PL_curpad; 390 c->curpad = PL_curpad;
453 c->comppad = PL_comppad; 391 c->comppad = PL_comppad;
392 c->compcv = PL_compcv;
454 c->stack_base = PL_stack_base; 393 c->stack_base = PL_stack_base;
455 c->stack_max = PL_stack_max; 394 c->stack_max = PL_stack_max;
456 c->tmps_stack = PL_tmps_stack; 395 c->tmps_stack = PL_tmps_stack;
457 c->tmps_floor = PL_tmps_floor; 396 c->tmps_floor = PL_tmps_floor;
458 c->tmps_ix = PL_tmps_ix; 397 c->tmps_ix = PL_tmps_ix;
… …
464 c->scopestack_ix = PL_scopestack_ix; 403 c->scopestack_ix = PL_scopestack_ix;
465 c->scopestack_max = PL_scopestack_max; 404 c->scopestack_max = PL_scopestack_max;
466 c->savestack = PL_savestack; 405 c->savestack = PL_savestack;
467 c->savestack_ix = PL_savestack_ix; 406 c->savestack_ix = PL_savestack_ix;
468 c->savestack_max = PL_savestack_max; 407 c->savestack_max = PL_savestack_max;
408#if PERL_VERSION < 9
469 c->retstack = PL_retstack; 409 c->retstack = PL_retstack;
470 c->retstack_ix = PL_retstack_ix; 410 c->retstack_ix = PL_retstack_ix;
471 c->retstack_max = PL_retstack_max; 411 c->retstack_max = PL_retstack_max;
412#endif
413 c->curpm = PL_curpm;
472 c->curcop = PL_curcop; 414 c->curcop = PL_curcop;
473 c->top_env = PL_top_env; 415 c->top_env = PL_top_env;
474} 416}
475 417
476/* 418/*
477 * allocate various perl stacks. This is an exact copy 419 * allocate various perl stacks. This is an exact copy
478 * of perl.c:init_stacks, except that it uses less memory 420 * of perl.c:init_stacks, except that it uses less memory
479 * on the (sometimes correct) assumption that coroutines do 421 * on the (sometimes correct) assumption that coroutines do
480 * not usually need a lot of stackspace. 422 * not usually need a lot of stackspace.
481 */ 423 */
482STATIC void 424static void
483coro_init_stacks (pTHX) 425coro_init_stacks (pTHX)
484{ 426{
485 LOCK; 427 LOCK;
486 428
487 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 429 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
512 454
513 New(54,PL_savestack,96,ANY); 455 New(54,PL_savestack,96,ANY);
514 PL_savestack_ix = 0; 456 PL_savestack_ix = 0;
515 PL_savestack_max = 96; 457 PL_savestack_max = 96;
516 458
459#if PERL_VERSION < 9
517 New(54,PL_retstack,8,OP*); 460 New(54,PL_retstack,8,OP*);
518 PL_retstack_ix = 0; 461 PL_retstack_ix = 0;
519 PL_retstack_max = 8; 462 PL_retstack_max = 8;
463#endif
520 464
521 UNLOCK; 465 UNLOCK;
522} 466}
523 467
524/* 468/*
525 * destroy the stacks, the callchain etc... 469 * destroy the stacks, the callchain etc...
526 */ 470 */
527STATIC void 471static void
528destroy_stacks(pTHX) 472destroy_stacks(pTHX)
529{ 473{
530 if (!IN_DESTRUCT) 474 if (!IN_DESTRUCT)
531 { 475 {
532 /* is this ugly, I ask? */ 476 /* is this ugly, I ask? */
… …
564 508
565 Safefree (PL_tmps_stack); 509 Safefree (PL_tmps_stack);
566 Safefree (PL_markstack); 510 Safefree (PL_markstack);
567 Safefree (PL_scopestack); 511 Safefree (PL_scopestack);
568 Safefree (PL_savestack); 512 Safefree (PL_savestack);
513#if PERL_VERSION < 9
569 Safefree (PL_retstack); 514 Safefree (PL_retstack);
515#endif
570} 516}
571 517
572static void 518static void
573allocate_stack (Coro__State ctx, int alloc) 519allocate_stack (Coro__State ctx, int alloc)
574{ 520{
… …
581 stack->gencnt = ctx->gencnt = 0; 527 stack->gencnt = ctx->gencnt = 0;
582 528
583 if (alloc) 529 if (alloc)
584 { 530 {
585#if HAVE_MMAP 531#if HAVE_MMAP
586 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 */
587 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);
588 if (stack->sptr == (void *)-1) 534 if (stack->sptr == (void *)-1)
589#endif 535#endif
590 { 536 {
591 /*FIXME*//*D*//* reasonable stack size! */
592 stack->ssize = - (8192 * sizeof (long)); 537 stack->ssize = - (STACKSIZE * (long)sizeof (long));
593 New (0, stack->sptr, 8192, long); 538 New (0, stack->sptr, STACKSIZE, long);
594 } 539 }
595 } 540 }
596 else 541 else
597 stack->sptr = 0; 542 stack->sptr = 0;
598 543
… …
689 /* 634 /*
690 * this is a _very_ stripped down perl interpreter ;) 635 * this is a _very_ stripped down perl interpreter ;)
691 */ 636 */
692 dTHX; 637 dTHX;
693 Coro__State ctx = (Coro__State)arg; 638 Coro__State ctx = (Coro__State)arg;
694 JMPENV coro_start_env;
695 639
696 PL_top_env = &ctx->start_env; 640 PL_top_env = &ctx->start_env;
697 641
698 ctx->cursp = 0; 642 ctx->cursp = 0;
699 PL_op = PL_op->op_next; 643 PL_op = PL_op->op_next;
700 CALLRUNOPS(aTHX); 644 CALLRUNOPS(aTHX);
701 645
702 abort (); 646 abort ();
703} 647}
704 648
705STATIC void 649static void
706transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 650transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
707{ 651{
708 dSTACKLEVEL; 652 dSTACKLEVEL;
709 653
710 if (prev != next) 654 if (prev != next)
… …
822 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 766 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
823 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); \
824 \ 768 \
825 } while(0) 769 } while(0)
826 770
827#define SvSTATE(sv) (struct coro *)SvIV (sv) 771#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
828 772
829static void 773static void
830api_transfer(pTHX_ SV *prev, SV *next, int flags) 774api_transfer(pTHX_ SV *prev, SV *next, int flags)
831{ 775{
832 SV_CORO (prev, "Coro::transfer"); 776 SV_CORO (prev, "Coro::transfer");
… …
850static int coro_nready; 794static int coro_nready;
851 795
852static void 796static void
853coro_enq (pTHX_ SV *sv) 797coro_enq (pTHX_ SV *sv)
854{ 798{
799 SV **xprio;
800 int prio;
801
855 if (SvTYPE (sv) == SVt_PVHV) 802 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"); 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++;
871} 814}
872 815
873static SV * 816static SV *
874coro_deq (pTHX_ int min_prio) 817coro_deq (pTHX_ int min_prio)
875{ 818{
… …
1015 if (coro->mainstack && coro->mainstack != main_mainstack) 958 if (coro->mainstack && coro->mainstack != main_mainstack)
1016 { 959 {
1017 struct coro temp; 960 struct coro temp;
1018 961
1019 PUTBACK; 962 PUTBACK;
1020 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 963 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
1021 LOAD(aTHX_ coro); 964 LOAD (aTHX_ coro);
1022 SPAGAIN; 965 SPAGAIN;
1023 966
1024 destroy_stacks (aTHX); 967 destroy_stacks (aTHX);
1025 968
1026 LOAD((&temp)); /* this will get rid of defsv etc.. */ 969 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1027 SPAGAIN; 970 SPAGAIN;
1028 971
1029 coro->mainstack = 0; 972 coro->mainstack = 0;
1030 } 973 }
1031 974
… …
1046 989
1047void 990void
1048yield(...) 991yield(...)
1049 PROTOTYPE: @ 992 PROTOTYPE: @
1050 CODE: 993 CODE:
1051 static SV *returnstk; 994 SV *yieldstack;
1052 SV *sv; 995 SV *sv;
1053 AV *defav = GvAV (PL_defgv); 996 AV *defav = GvAV (PL_defgv);
1054 struct coro *prev, *next; 997 struct coro *prev, *next;
1055 998
1056 if (!returnstk) 999 yieldstack = *hv_fetch (
1057 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1000 (HV *)SvRV (GvSV (coro_current)),
1001 "yieldstack", sizeof ("yieldstack") - 1,
1002 0
1003 );
1058 1004
1059 /* set up @_ -- ugly */ 1005 /* set up @_ -- ugly */
1060 av_clear (defav); 1006 av_clear (defav);
1061 av_fill (defav, items - 1); 1007 av_fill (defav, items - 1);
1062 while (items--) 1008 while (items--)
1063 av_store (defav, items, SvREFCNT_inc (ST(items))); 1009 av_store (defav, items, SvREFCNT_inc (ST(items)));
1064 1010
1065 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1066 sv = av_pop ((AV *)SvRV (returnstk)); 1011 sv = av_pop ((AV *)SvRV (yieldstack));
1067 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))));
1068 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))));
1069 SvREFCNT_dec (sv); 1014 SvREFCNT_dec (sv);
1070 1015
1071 transfer(aTHX_ prev, next, 0); 1016 transfer (aTHX_ prev, next, 0);
1072 1017
1073MODULE = Coro::State PACKAGE = Coro 1018MODULE = Coro::State PACKAGE = Coro
1074 1019
1075# this is slightly dirty (should expose a c-level api) 1020# this is slightly dirty (should expose a c-level api)
1076 1021
… …
1136cede(...) 1081cede(...)
1137 PROTOTYPE: 1082 PROTOTYPE:
1138 CODE: 1083 CODE:
1139 api_cede (); 1084 api_cede ();
1140 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