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.61 by root, Tue Aug 10 01:56:30 2004 UTC vs.
Revision 1.87 by root, Fri Nov 24 13:40:36 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;
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
109 AV *mainstack; 122 AV *mainstack;
110 SV **stack_sp; 123 SV **stack_sp;
111 OP *op; 124 OP *op;
112 SV **curpad; 125 SV **curpad;
113 AV *comppad; 126 AV *comppad;
127 CV *compcv;
114 SV **stack_base; 128 SV **stack_base;
115 SV **stack_max; 129 SV **stack_max;
116 SV **tmps_stack; 130 SV **tmps_stack;
117 I32 tmps_floor; 131 I32 tmps_floor;
118 I32 tmps_ix; 132 I32 tmps_ix;
127 I32 savestack_ix; 141 I32 savestack_ix;
128 I32 savestack_max; 142 I32 savestack_max;
129 OP **retstack; 143 OP **retstack;
130 I32 retstack_ix; 144 I32 retstack_ix;
131 I32 retstack_max; 145 I32 retstack_max;
146 PMOP *curpm;
132 COP *curcop; 147 COP *curcop;
133 JMPENV *top_env; 148 JMPENV *top_env;
134 149
150 /* coro process data */
151 int prio;
152
135 /* data associated with this coroutine (initial args) */ 153 /* data associated with this coroutine (initial args) */
136 AV *args; 154 AV *args;
155 int refcnt;
137}; 156};
138 157
139typedef struct coro *Coro__State; 158typedef struct coro *Coro__State;
140typedef struct coro *Coro__State_or_hashref; 159typedef struct coro *Coro__State_or_hashref;
141 160
142/* mostly copied from op.c:cv_clone2 */ 161static AV *
143STATIC AV * 162coro_clone_padlist (pTHX_ CV *cv)
144clone_padlist (pTHX_ AV *protopadlist)
145{ 163{
146 AV *av; 164 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; 165 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 166
165 newpadlist = newAV (); 167 newpadlist = newAV ();
166 AvREAL_off (newpadlist); 168 AvREAL_off (newpadlist);
167 av_store (newpadlist, 0, (SV *) newpad_name); 169#if PERL_VERSION < 9
170 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
171#else
172 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
173#endif
174 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
175 --AvFILLp (padlist);
176
177 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
168 av_store (newpadlist, 1, (SV *) newpad); 178 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 179
239 return newpadlist; 180 return newpadlist;
240} 181}
241 182
242STATIC void 183static void
243free_padlist (pTHX_ AV *padlist) 184free_padlist (pTHX_ AV *padlist)
244{ 185{
245 /* may be during global destruction */ 186 /* may be during global destruction */
246 if (SvREFCNT (padlist)) 187 if (SvREFCNT (padlist))
247 { 188 {
261 202
262 SvREFCNT_dec ((SV*)padlist); 203 SvREFCNT_dec ((SV*)padlist);
263 } 204 }
264} 205}
265 206
266STATIC int 207static int
267coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 208coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
268{ 209{
269 AV *padlist; 210 AV *padlist;
270 AV *av = (AV *)mg->mg_obj; 211 AV *av = (AV *)mg->mg_obj;
271 212
272 /* casting is fun. */ 213 /* casting is fun. */
273 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 214 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
274 free_padlist (aTHX_ padlist); 215 free_padlist (aTHX_ padlist);
275 216
276 SvREFCNT_dec (av); 217 SvREFCNT_dec (av);
218
219 return 0;
277} 220}
278 221
279#define PERL_MAGIC_coro PERL_MAGIC_ext 222#define PERL_MAGIC_coro PERL_MAGIC_ext
280 223
281static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 224static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
282 225
283/* the next two functions merely cache the padlists */ 226/* the next two functions merely cache the padlists */
284STATIC void 227static void
285get_padlist (pTHX_ CV *cv) 228get_padlist (pTHX_ CV *cv)
286{ 229{
287 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 230 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
288 231
289 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 232 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
290 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 233 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
291 else 234 else
235 {
236#if 0
237 /* this should work - but it doesn't :( */
238 CV *cp = Perl_cv_clone (aTHX_ cv);
239 CvPADLIST (cv) = CvPADLIST (cp);
240 CvPADLIST (cp) = 0;
241 SvREFCNT_dec (cp);
242#else
292 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv)); 243 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
244#endif
245 }
293} 246}
294 247
295STATIC void 248static void
296put_padlist (pTHX_ CV *cv) 249put_padlist (pTHX_ CV *cv)
297{ 250{
298 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 251 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
299 252
300 if (!mg) 253 if (!mg)
327 PL_mainstack = c->mainstack; 280 PL_mainstack = c->mainstack;
328 PL_stack_sp = c->stack_sp; 281 PL_stack_sp = c->stack_sp;
329 PL_op = c->op; 282 PL_op = c->op;
330 PL_curpad = c->curpad; 283 PL_curpad = c->curpad;
331 PL_comppad = c->comppad; 284 PL_comppad = c->comppad;
285 PL_compcv = c->compcv;
332 PL_stack_base = c->stack_base; 286 PL_stack_base = c->stack_base;
333 PL_stack_max = c->stack_max; 287 PL_stack_max = c->stack_max;
334 PL_tmps_stack = c->tmps_stack; 288 PL_tmps_stack = c->tmps_stack;
335 PL_tmps_floor = c->tmps_floor; 289 PL_tmps_floor = c->tmps_floor;
336 PL_tmps_ix = c->tmps_ix; 290 PL_tmps_ix = c->tmps_ix;
342 PL_scopestack_ix = c->scopestack_ix; 296 PL_scopestack_ix = c->scopestack_ix;
343 PL_scopestack_max = c->scopestack_max; 297 PL_scopestack_max = c->scopestack_max;
344 PL_savestack = c->savestack; 298 PL_savestack = c->savestack;
345 PL_savestack_ix = c->savestack_ix; 299 PL_savestack_ix = c->savestack_ix;
346 PL_savestack_max = c->savestack_max; 300 PL_savestack_max = c->savestack_max;
301#if PERL_VERSION < 9
347 PL_retstack = c->retstack; 302 PL_retstack = c->retstack;
348 PL_retstack_ix = c->retstack_ix; 303 PL_retstack_ix = c->retstack_ix;
349 PL_retstack_max = c->retstack_max; 304 PL_retstack_max = c->retstack_max;
305#endif
306 PL_curpm = c->curpm;
350 PL_curcop = c->curcop; 307 PL_curcop = c->curcop;
351 PL_top_env = c->top_env; 308 PL_top_env = c->top_env;
352 309
353 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 310 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
354 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 311 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
413 } 370 }
414 371
415 PUSHs ((SV *)CvPADLIST(cv)); 372 PUSHs ((SV *)CvPADLIST(cv));
416 PUSHs ((SV *)cv); 373 PUSHs ((SV *)cv);
417 374
418 get_padlist (aTHX_ cv); /* this is a monster */ 375 get_padlist (aTHX_ cv);
419 } 376 }
420 } 377 }
421#ifdef CXt_FORMAT 378#ifdef CXt_FORMAT
422 else if (CxTYPE(cx) == CXt_FORMAT) 379 else if (CxTYPE(cx) == CXt_FORMAT)
423 { 380 {
451 c->mainstack = PL_mainstack; 408 c->mainstack = PL_mainstack;
452 c->stack_sp = PL_stack_sp; 409 c->stack_sp = PL_stack_sp;
453 c->op = PL_op; 410 c->op = PL_op;
454 c->curpad = PL_curpad; 411 c->curpad = PL_curpad;
455 c->comppad = PL_comppad; 412 c->comppad = PL_comppad;
413 c->compcv = PL_compcv;
456 c->stack_base = PL_stack_base; 414 c->stack_base = PL_stack_base;
457 c->stack_max = PL_stack_max; 415 c->stack_max = PL_stack_max;
458 c->tmps_stack = PL_tmps_stack; 416 c->tmps_stack = PL_tmps_stack;
459 c->tmps_floor = PL_tmps_floor; 417 c->tmps_floor = PL_tmps_floor;
460 c->tmps_ix = PL_tmps_ix; 418 c->tmps_ix = PL_tmps_ix;
466 c->scopestack_ix = PL_scopestack_ix; 424 c->scopestack_ix = PL_scopestack_ix;
467 c->scopestack_max = PL_scopestack_max; 425 c->scopestack_max = PL_scopestack_max;
468 c->savestack = PL_savestack; 426 c->savestack = PL_savestack;
469 c->savestack_ix = PL_savestack_ix; 427 c->savestack_ix = PL_savestack_ix;
470 c->savestack_max = PL_savestack_max; 428 c->savestack_max = PL_savestack_max;
429#if PERL_VERSION < 9
471 c->retstack = PL_retstack; 430 c->retstack = PL_retstack;
472 c->retstack_ix = PL_retstack_ix; 431 c->retstack_ix = PL_retstack_ix;
473 c->retstack_max = PL_retstack_max; 432 c->retstack_max = PL_retstack_max;
433#endif
434 c->curpm = PL_curpm;
474 c->curcop = PL_curcop; 435 c->curcop = PL_curcop;
475 c->top_env = PL_top_env; 436 c->top_env = PL_top_env;
476} 437}
477 438
478/* 439/*
479 * allocate various perl stacks. This is an exact copy 440 * allocate various perl stacks. This is an exact copy
480 * of perl.c:init_stacks, except that it uses less memory 441 * of perl.c:init_stacks, except that it uses less memory
481 * on the (sometimes correct) assumption that coroutines do 442 * on the (sometimes correct) assumption that coroutines do
482 * not usually need a lot of stackspace. 443 * not usually need a lot of stackspace.
483 */ 444 */
484STATIC void 445static void
485coro_init_stacks (pTHX) 446coro_init_stacks (pTHX)
486{ 447{
487 LOCK; 448 LOCK;
488 449
489 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 450 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
514 475
515 New(54,PL_savestack,96,ANY); 476 New(54,PL_savestack,96,ANY);
516 PL_savestack_ix = 0; 477 PL_savestack_ix = 0;
517 PL_savestack_max = 96; 478 PL_savestack_max = 96;
518 479
480#if PERL_VERSION < 9
519 New(54,PL_retstack,8,OP*); 481 New(54,PL_retstack,8,OP*);
520 PL_retstack_ix = 0; 482 PL_retstack_ix = 0;
521 PL_retstack_max = 8; 483 PL_retstack_max = 8;
484#endif
522 485
523 UNLOCK; 486 UNLOCK;
524} 487}
525 488
526/* 489/*
527 * destroy the stacks, the callchain etc... 490 * destroy the stacks, the callchain etc...
528 */ 491 */
529STATIC void 492static void
530destroy_stacks(pTHX) 493destroy_stacks(pTHX)
531{ 494{
532 if (!IN_DESTRUCT) 495 if (!IN_DESTRUCT)
533 { 496 {
534 /* is this ugly, I ask? */ 497 /* is this ugly, I ask? */
566 529
567 Safefree (PL_tmps_stack); 530 Safefree (PL_tmps_stack);
568 Safefree (PL_markstack); 531 Safefree (PL_markstack);
569 Safefree (PL_scopestack); 532 Safefree (PL_scopestack);
570 Safefree (PL_savestack); 533 Safefree (PL_savestack);
534#if PERL_VERSION < 9
571 Safefree (PL_retstack); 535 Safefree (PL_retstack);
536#endif
572} 537}
573 538
574static void 539static void
575allocate_stack (Coro__State ctx, int alloc) 540allocate_stack (Coro__State ctx, int alloc)
576{ 541{
583 stack->gencnt = ctx->gencnt = 0; 548 stack->gencnt = ctx->gencnt = 0;
584 549
585 if (alloc) 550 if (alloc)
586 { 551 {
587#if HAVE_MMAP 552#if HAVE_MMAP
588 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */ 553 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */
589 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 554 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
590 if (stack->sptr == (void *)-1) 555 if (stack->sptr != (void *)-1)
591#endif
592 { 556 {
593 /*FIXME*//*D*//* reasonable stack size! */ 557# if STACKGUARD
558 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
559# endif
560 }
561 else
562#endif
563 {
594 stack->ssize = - (8192 * sizeof (long)); 564 stack->ssize = - (STACKSIZE * (long)sizeof (long));
595 New (0, stack->sptr, 8192, long); 565 New (0, stack->sptr, STACKSIZE, long);
596 } 566 }
597 } 567 }
598 else 568 else
599 stack->sptr = 0; 569 stack->sptr = 0;
600 570
660 } 630 }
661 else 631 else
662 { 632 {
663 UNOP myop; 633 UNOP myop;
664 634
665 PL_op = (OP *)&myop;
666
667 Zero(&myop, 1, UNOP); 635 Zero(&myop, 1, UNOP);
668 myop.op_next = Nullop; 636 myop.op_next = Nullop;
669 myop.op_flags = OPf_WANT_VOID; 637 myop.op_flags = OPf_WANT_VOID;
638
639 PL_op = (OP *)&myop;
670 640
671 PUSHMARK(SP); 641 PUSHMARK(SP);
672 XPUSHs (sub_init); 642 XPUSHs (sub_init);
673 /* 643 /*
674 * the next line is slightly wrong, as PL_op->op_next 644 * the next line is slightly wrong, as PL_op->op_next
691 /* 661 /*
692 * this is a _very_ stripped down perl interpreter ;) 662 * this is a _very_ stripped down perl interpreter ;)
693 */ 663 */
694 dTHX; 664 dTHX;
695 Coro__State ctx = (Coro__State)arg; 665 Coro__State ctx = (Coro__State)arg;
696 JMPENV coro_start_env;
697 666
698 PL_top_env = &ctx->start_env; 667 PL_top_env = &PL_start_env;
699 668
700 ctx->cursp = 0; 669 ctx->cursp = 0;
701 PL_op = PL_op->op_next; 670 PL_op = PL_op->op_next;
702 CALLRUNOPS(aTHX); 671 CALLRUNOPS(aTHX);
703 672
704 abort (); 673 abort ();
705} 674}
706 675
707STATIC void 676/* never call directly, always through the coro_state_transfer global variable */
677static void
708transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 678transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags)
709{ 679{
710 dSTACKLEVEL; 680 dSTACKLEVEL;
711 681
712 if (prev != next) 682 if (prev != next)
713 { 683 {
684 /* has this coro been created yet? */
714 if (next->mainstack) 685 if (next->mainstack)
715 { 686 {
716 LOCK; 687 LOCK;
717 SAVE (prev, flags); 688 SAVE (prev, flags);
718 LOAD (next); 689 LOAD (next);
757 { 728 {
758 LOCK; 729 LOCK;
759 SAVE (prev, -1); /* first get rid of the old state */ 730 SAVE (prev, -1); /* first get rid of the old state */
760 UNLOCK; 731 UNLOCK;
761 732
733 /* create the coroutine for the first time */
762 if (flags & TRANSFER_SAVE_CCTXT) 734 if (flags & TRANSFER_SAVE_CCTXT)
763 { 735 {
764 if (!prev->stack) 736 if (!prev->stack)
765 allocate_stack (prev, 0); 737 allocate_stack (prev, 0);
766 738
739 /* the new coroutine starts with start_env again */
740 PL_top_env = &PL_start_env;
741
767 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 742 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
768 { 743 {
769 PL_top_env = &next->start_env;
770
771 setup_coro (next); 744 setup_coro (next);
772 next->cursp = stacklevel; 745 next->cursp = stacklevel;
773 746
774 prev->stack->refcnt++; 747 prev->stack->refcnt++;
775 prev->stack->usecnt++; 748 prev->stack->usecnt++;
803 coro_mortal = 0; 776 coro_mortal = 0;
804 } 777 }
805 UNLOCK; 778 UNLOCK;
806} 779}
807 780
781/* use this function pointer to call the above function */
782/* this is done to increase chances of the compiler not inlining the call */
783void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
784
808#define SV_CORO(sv,func) \ 785#define SV_CORO(sv,func) \
809 do { \ 786 do { \
810 if (SvROK (sv)) \ 787 if (SvROK (sv)) \
811 sv = SvRV (sv); \ 788 sv = SvRV (sv); \
812 \ 789 \
813 if (SvTYPE (sv) == SVt_PVHV) \ 790 if (SvTYPE (sv) == SVt_PVHV && SvSTASH (sv) != coro_state_stash) \
814 { \ 791 { \
815 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 792 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
816 \ 793 \
817 if (!he) \ 794 if (!he) \
818 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 795 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
824 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 801 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
825 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 802 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
826 \ 803 \
827 } while(0) 804 } while(0)
828 805
829#define SvSTATE(sv) (struct coro *)SvIV (sv) 806static void
807coro_state_destroy (struct coro *coro)
808{
809 if (coro->refcnt--)
810 return;
830 811
812 if (coro->mainstack && coro->mainstack != main_mainstack)
813 {
814 struct coro temp;
815
816 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
817 LOAD (aTHX_ coro);
818
819 destroy_stacks (aTHX);
820
821 LOAD ((&temp)); /* this will get rid of defsv etc.. */
822
823 coro->mainstack = 0;
824 }
825
826 deallocate_stack (coro);
827 SvREFCNT_dec (coro->args);
828 Safefree (coro);
829}
830
831static void 831static int
832coro_state_clear (SV *sv, MAGIC *mg)
833{
834 struct coro *coro = (struct coro *)mg->mg_ptr;
835 mg->mg_ptr = 0;
836
837 coro_state_destroy (coro);
838
839 return 0;
840}
841
842static int
843coro_state_dup (MAGIC *mg, CLONE_PARAMS *params)
844{
845 struct coro *coro = (struct coro *)mg->mg_ptr;
846
847 ++coro->refcnt;
848
849 return 0;
850}
851
852static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, coro_state_clear, 0, coro_state_dup, 0 };
853
854static struct coro *
855SvSTATE (SV *coro)
856{
857 MAGIC *mg = SvMAGIC (SvROK (coro) ? SvRV (coro) : coro);
858 assert (mg->mg_type == PERL_MAGIC_ext);
859 return (struct coro *)mg->mg_ptr;
860}
861
862static void
832api_transfer(pTHX_ SV *prev, SV *next, int flags) 863api_transfer (pTHX_ SV *prev, SV *next, int flags)
833{ 864{
834 SV_CORO (prev, "Coro::transfer"); 865 SV_CORO (prev, "Coro::transfer");
835 SV_CORO (next, "Coro::transfer"); 866 SV_CORO (next, "Coro::transfer");
836 867
837 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 868 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
838} 869}
839 870
840/** Coro ********************************************************************/ 871/** Coro ********************************************************************/
841 872
842#define PRIO_MAX 3 873#define PRIO_MAX 3
846#define PRIO_IDLE -3 877#define PRIO_IDLE -3
847#define PRIO_MIN -4 878#define PRIO_MIN -4
848 879
849/* for Coro.pm */ 880/* for Coro.pm */
850static GV *coro_current, *coro_idle; 881static GV *coro_current, *coro_idle;
851static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 882static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
852static int coro_nready; 883static int coro_nready;
853 884
854static void 885static void
855coro_enq (pTHX_ SV *sv) 886coro_enq (pTHX_ SV *sv)
856{ 887{
888 int prio;
889
857 if (SvTYPE (sv) == SVt_PVHV) 890 if (SvTYPE (sv) != SVt_PVHV)
858 {
859 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
860 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
861
862 prio = prio > PRIO_MAX ? PRIO_MAX
863 : prio < PRIO_MIN ? PRIO_MIN
864 : prio;
865
866 av_push (coro_ready [prio - PRIO_MIN], sv);
867 coro_nready++;
868
869 return;
870 }
871
872 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 891 croak ("Coro::ready tried to enqueue something that is not a coroutine");
892
893 {
894 SV *coro = sv;
895 SV_CORO (coro, "omg");
896 prio = SvSTATE (coro)->prio;
897 }
898
899 av_push (coro_ready [prio - PRIO_MIN], sv);
900 coro_nready++;
873} 901}
874 902
875static SV * 903static SV *
876coro_deq (pTHX_ int min_prio) 904coro_deq (pTHX_ int min_prio)
877{ 905{
880 min_prio -= PRIO_MIN; 908 min_prio -= PRIO_MIN;
881 if (min_prio < 0) 909 if (min_prio < 0)
882 min_prio = 0; 910 min_prio = 0;
883 911
884 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 912 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
885 if (av_len (coro_ready[prio]) >= 0) 913 if (AvFILLp (coro_ready [prio]) >= 0)
886 { 914 {
887 coro_nready--; 915 coro_nready--;
888 return av_shift (coro_ready[prio]); 916 return av_shift (coro_ready [prio]);
889 } 917 }
890 918
891 return 0; 919 return 0;
892} 920}
893 921
927 955
928 SV_CORO (next, "Coro::schedule"); 956 SV_CORO (next, "Coro::schedule");
929 957
930 UNLOCK; 958 UNLOCK;
931 959
932 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 960 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
933 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 961 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
934} 962}
935 963
936static void 964static void
937api_cede (void) 965api_cede (void)
938{ 966{
945 api_schedule (); 973 api_schedule ();
946} 974}
947 975
948MODULE = Coro::State PACKAGE = Coro::State 976MODULE = Coro::State PACKAGE = Coro::State
949 977
950PROTOTYPES: ENABLE 978PROTOTYPES: DISABLE
951 979
952BOOT: 980BOOT:
953{ /* {} necessary for stoopid perl-5.6.x */ 981{ /* {} necessary for stoopid perl-5.6.x */
954#ifdef USE_ITHREADS 982#ifdef USE_ITHREADS
955 MUTEX_INIT (&coro_mutex); 983 MUTEX_INIT (&coro_mutex);
956#endif 984#endif
985 BOOT_PAGESIZE;
957 986
958 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 987 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
959 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 988 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
960 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 989 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
961 990
966 995
967 main_mainstack = PL_mainstack; 996 main_mainstack = PL_mainstack;
968 997
969 coroapi.ver = CORO_API_VERSION; 998 coroapi.ver = CORO_API_VERSION;
970 coroapi.transfer = api_transfer; 999 coroapi.transfer = api_transfer;
971}
972 1000
973Coro::State 1001 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
974_newprocess(args) 1002}
975 SV * args 1003
976 PROTOTYPE: $ 1004SV *
1005new (char *klass, ...)
977 CODE: 1006 CODE:
978 Coro__State coro; 1007{
1008 struct coro *coro;
1009 HV *hv;
1010 int i;
979 1011
980 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
981 croak ("Coro::State::_newprocess expects an arrayref");
982
983 Newz (0, coro, 1, struct coro); 1012 Newz (0, coro, 1, struct coro);
1013 coro->args = newAV ();
984 1014
985 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 1015 for (i = 1; i < items; i++)
1016 av_push (coro->args, newSVsv (ST (i)));
1017
986 /*coro->mainstack = 0; *//*actual work is done inside transfer */ 1018 /*coro->mainstack = 0; *//*actual work is done inside transfer */
987 /*coro->stack = 0;*/ 1019 /*coro->stack = 0;*/
988 1020
989 /* same as JMPENV_BOOTSTRAP */ 1021 hv = newHV ();
990 /* we might be able to recycle start_env, but safe is safe */ 1022 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
991 /*Zero(&coro->start_env, 1, JMPENV);*/ 1023 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
992 coro->start_env.je_ret = -1; 1024}
993 coro->start_env.je_mustcatch = TRUE;
994
995 RETVAL = coro;
996 OUTPUT: 1025 OUTPUT:
997 RETVAL 1026 RETVAL
998 1027
999void 1028void
1000transfer(prev, next, flags) 1029transfer(prev, next, flags)
1001 SV *prev 1030 SV *prev
1002 SV *next 1031 SV *next
1003 int flags 1032 int flags
1004 PROTOTYPE: @
1005 CODE: 1033 CODE:
1006 PUTBACK; 1034 PUTBACK;
1007 SV_CORO (next, "Coro::transfer"); 1035 SV_CORO (next, "Coro::transfer");
1008 SV_CORO (prev, "Coro::transfer"); 1036 SV_CORO (prev, "Coro::transfer");
1009 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 1037 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
1010 SPAGAIN; 1038 SPAGAIN;
1011 1039
1040int
1041prio (Coro::State coro, int newprio = 0)
1042 ALIAS:
1043 nice = 1
1044 CODE:
1045{
1046 RETVAL = coro->prio;
1047
1048 if (items > 1)
1049 {
1050 if (ix)
1051 newprio += coro->prio;
1052
1053 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1054 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1055
1056 coro->prio = newprio;
1057 }
1058}
1059
1012void 1060void
1013DESTROY(coro) 1061_clone_state_from (SV *dst, SV *src)
1014 Coro::State coro 1062 CODE:
1015 CODE: 1063{
1064 struct coro *coro_src = SvSTATE (src);
1016 1065
1017 if (coro->mainstack && coro->mainstack != main_mainstack) 1066 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1018 {
1019 struct coro temp;
1020 1067
1021 PUTBACK; 1068 ++coro_src->refcnt;
1022 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL); 1069 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1023 LOAD (aTHX_ coro); 1070}
1024 SPAGAIN;
1025
1026 destroy_stacks (aTHX);
1027
1028 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1029 SPAGAIN;
1030
1031 coro->mainstack = 0;
1032 }
1033
1034 deallocate_stack (coro);
1035 SvREFCNT_dec (coro->args);
1036 Safefree (coro);
1037 1071
1038void 1072void
1039_exit(code) 1073_exit (code)
1040 int code 1074 int code
1041 PROTOTYPE: $ 1075 PROTOTYPE: $
1042 CODE: 1076 CODE:
1043 _exit (code); 1077 _exit (code);
1044 1078
1045MODULE = Coro::State PACKAGE = Coro::Cont 1079MODULE = Coro::State PACKAGE = Coro::Cont
1046 1080
1047# this is slightly dirty (should expose a c-level api)
1048
1049void 1081void
1050yield(...) 1082yield (...)
1051 PROTOTYPE: @ 1083 PROTOTYPE: @
1052 CODE: 1084 CODE:
1053 static SV *returnstk; 1085 SV *yieldstack;
1054 SV *sv; 1086 SV *sv;
1055 AV *defav = GvAV (PL_defgv); 1087 AV *defav = GvAV (PL_defgv);
1056 struct coro *prev, *next; 1088 struct coro *prev, *next;
1057 1089
1058 if (!returnstk) 1090 yieldstack = *hv_fetch (
1059 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1091 (HV *)SvRV (GvSV (coro_current)),
1092 "yieldstack", sizeof ("yieldstack") - 1,
1093 0
1094 );
1060 1095
1061 /* set up @_ -- ugly */ 1096 /* set up @_ -- ugly */
1062 av_clear (defav); 1097 av_clear (defav);
1063 av_fill (defav, items - 1); 1098 av_fill (defav, items - 1);
1064 while (items--) 1099 while (items--)
1065 av_store (defav, items, SvREFCNT_inc (ST(items))); 1100 av_store (defav, items, SvREFCNT_inc (ST(items)));
1066 1101
1067 SvGETMAGIC (returnstk); /* isn't documentation wrong for mg_get? */
1068 sv = av_pop ((AV *)SvRV (returnstk)); 1102 sv = av_pop ((AV *)SvRV (yieldstack));
1069 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1103 prev = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1070 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1104 next = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1071 SvREFCNT_dec (sv); 1105 SvREFCNT_dec (sv);
1072 1106
1073 transfer (aTHX_ prev, next, 0); 1107 coro_state_transfer (aTHX_ prev, next, 0);
1074 1108
1075MODULE = Coro::State PACKAGE = Coro 1109MODULE = Coro::State PACKAGE = Coro
1076
1077# this is slightly dirty (should expose a c-level api)
1078 1110
1079BOOT: 1111BOOT:
1080{ 1112{
1081 int i; 1113 int i;
1082 HV *stash = gv_stashpv ("Coro", TRUE); 1114 HV *stash = gv_stashpv ("Coro", TRUE);
1102 coroapi.ready = api_ready; 1134 coroapi.ready = api_ready;
1103 coroapi.nready = &coro_nready; 1135 coroapi.nready = &coro_nready;
1104 coroapi.current = coro_current; 1136 coroapi.current = coro_current;
1105 1137
1106 GCoroAPI = &coroapi; 1138 GCoroAPI = &coroapi;
1107 sv_setiv(sv, (IV)&coroapi); 1139 sv_setiv (sv, (IV)&coroapi);
1108 SvREADONLY_on(sv); 1140 SvREADONLY_on (sv);
1109 } 1141 }
1110} 1142}
1111 1143
1112#if !PERL_MICRO 1144#if !PERL_MICRO
1113 1145
1114void 1146void
1115ready(self) 1147ready (self)
1116 SV * self 1148 SV * self
1117 PROTOTYPE: $ 1149 PROTOTYPE: $
1118 CODE: 1150 CODE:
1119 api_ready (self); 1151 api_ready (self);
1120 1152
1121#endif 1153#endif
1122 1154
1123int 1155int
1124nready(...) 1156nready (...)
1125 PROTOTYPE: 1157 PROTOTYPE:
1126 CODE: 1158 CODE:
1127 RETVAL = coro_nready; 1159 RETVAL = coro_nready;
1128 OUTPUT: 1160 OUTPUT:
1129 RETVAL 1161 RETVAL
1130 1162
1131void 1163void
1132schedule(...) 1164schedule (...)
1133 PROTOTYPE: 1165 PROTOTYPE:
1134 CODE: 1166 CODE:
1135 api_schedule (); 1167 api_schedule ();
1136 1168
1137void 1169void
1138cede(...) 1170cede (...)
1139 PROTOTYPE: 1171 PROTOTYPE:
1140 CODE: 1172 CODE:
1141 api_cede (); 1173 api_cede ();
1142 1174
1175# and these are hacks
1176SV *
1177_aio_get_state ()
1178 CODE:
1179{
1180 struct {
1181 int errorno;
1182 int laststype;
1183 int laststatval;
1184 Stat_t statcache;
1185 } data;
1186
1187 data.errorno = errno;
1188 data.laststype = PL_laststype;
1189 data.laststatval = PL_laststatval;
1190 data.statcache = PL_statcache;
1191
1192 RETVAL = newSVpvn ((char *)&data, sizeof data);
1193}
1194 OUTPUT:
1195 RETVAL
1196
1197void
1198_aio_set_state (char *data_)
1199 PROTOTYPE: $
1200 CODE:
1201{
1202 struct {
1203 int errorno;
1204 int laststype;
1205 int laststatval;
1206 Stat_t statcache;
1207 } *data = (void *)data_;
1208
1209 errno = data->errorno;
1210 PL_laststype = data->laststype;
1211 PL_laststatval = data->laststatval;
1212 PL_statcache = data->statcache;
1213}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines