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.41 by root, Tue Nov 27 02:51:03 2001 UTC vs.
Revision 1.55 by pcg, Thu Apr 1 02:29:05 2004 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4
5#include "patchlevel.h"
6
7#if PATCHLEVEL < 6
8# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr
10# endif
11# ifndef call_sv
12# define call_sv perl_call_sv
13# endif
14# ifndef get_sv
15# define get_sv perl_get_sv
16# endif
17# ifndef get_cv
18# define get_cv perl_get_cv
19# endif
20# ifndef IS_PADGV
21# define IS_PADGV(v) 0
22# endif
23# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0
25# endif
26#endif
4 27
5#include "libcoro/coro.c" 28#include "libcoro/coro.c"
6 29
7#include <signal.h> 30#include <signal.h>
8 31
16# undef HAVE_MMAP 39# undef HAVE_MMAP
17# endif 40# endif
18# endif 41# endif
19#endif 42#endif
20 43
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 44#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 45#define UCORO_STATE "_coro_state"
25 46
26/* The next macro should declare a variable stacklevel that contains and approximation 47/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 48 * to the current C stack pointer. Its property is that it changes with each call
31#define IN_DESTRUCT (PL_main_cv == Nullcv) 52#define IN_DESTRUCT (PL_main_cv == Nullcv)
32 53
33#define labs(l) ((l) >= 0 ? (l) : -(l)) 54#define labs(l) ((l) >= 0 ? (l) : -(l))
34 55
35#include "CoroAPI.h" 56#include "CoroAPI.h"
57
58#ifdef USE_ITHREADS
59static perl_mutex coro_mutex;
60# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
61# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
62#else
63# define LOCK 0
64# define UNLOCK 0
65#endif
36 66
37static struct CoroAPI coroapi; 67static struct CoroAPI coroapi;
38 68
39/* this is actually not only the c stack but also c registers etc... */ 69/* this is actually not only the c stack but also c registers etc... */
40typedef struct { 70typedef struct {
47 void *sptr; 77 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 78 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 79} coro_stack;
50 80
51struct coro { 81struct coro {
82 /* the top-level JMPENV for each coroutine, needed to catch dies. */
83 JMPENV start_env;
84
52 /* the optional C context */ 85 /* the optional C context */
53 coro_stack *stack; 86 coro_stack *stack;
54 void *cursp; 87 void *cursp;
55 int gencnt; 88 int gencnt;
56 89
68 AV *curstack; 101 AV *curstack;
69 AV *mainstack; 102 AV *mainstack;
70 SV **stack_sp; 103 SV **stack_sp;
71 OP *op; 104 OP *op;
72 SV **curpad; 105 SV **curpad;
106 AV *comppad;
73 SV **stack_base; 107 SV **stack_base;
74 SV **stack_max; 108 SV **stack_max;
75 SV **tmps_stack; 109 SV **tmps_stack;
76 I32 tmps_floor; 110 I32 tmps_floor;
77 I32 tmps_ix; 111 I32 tmps_ix;
100 134
101static AV *main_mainstack; /* used to differentiate between $main and others */ 135static AV *main_mainstack; /* used to differentiate between $main and others */
102static HV *coro_state_stash; 136static HV *coro_state_stash;
103static SV *ucoro_state_sv; 137static SV *ucoro_state_sv;
104static U32 ucoro_state_hash; 138static U32 ucoro_state_hash;
105static HV *padlist_cache;
106static SV *coro_mortal; /* will be freed after next transfer */ 139static SV *coro_mortal; /* will be freed after next transfer */
107 140
108/* mostly copied from op.c:cv_clone2 */ 141/* mostly copied from op.c:cv_clone2 */
109STATIC AV * 142STATIC AV *
110clone_padlist (AV *protopadlist) 143clone_padlist (AV *protopadlist)
139 AvFLAGS (av) = AVf_REIFY; 172 AvFLAGS (av) = AVf_REIFY;
140 173
141 for (ix = fpad; ix > 0; ix--) 174 for (ix = fpad; ix > 0; ix--)
142 { 175 {
143 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 176 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
177
144 if (namesv && namesv != &PL_sv_undef) 178 if (namesv && namesv != &PL_sv_undef)
145 { 179 {
146 char *name = SvPVX (namesv); /* XXX */ 180 char *name = SvPVX (namesv); /* XXX */
181
147 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 182 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
148 { /* lexical from outside? */ 183 { /* lexical from outside? */
149 npad[ix] = SvREFCNT_inc (ppad[ix]); 184 npad[ix] = SvREFCNT_inc (ppad[ix]);
150 } 185 }
151 else 186 else
157 sv = (SV *) newAV (); 192 sv = (SV *) newAV ();
158 else if (*name == '%') 193 else if (*name == '%')
159 sv = (SV *) newHV (); 194 sv = (SV *) newHV ();
160 else 195 else
161 sv = NEWSV (0, 0); 196 sv = NEWSV (0, 0);
197
198#ifdef SvPADBUSY
162 if (!SvPADBUSY (sv)) 199 if (!SvPADBUSY (sv))
200#endif
163 SvPADMY_on (sv); 201 SvPADMY_on (sv);
202
164 npad[ix] = sv; 203 npad[ix] = sv;
165 } 204 }
166 } 205 }
167 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 206 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
168 { 207 {
197#endif 236#endif
198 237
199 return newpadlist; 238 return newpadlist;
200} 239}
201 240
202#ifdef MAY_FLUSH
203STATIC void 241STATIC void
204free_padlist (AV *padlist) 242free_padlist (AV *padlist)
205{ 243{
206 /* may be during global destruction */ 244 /* may be during global destruction */
207 if (SvREFCNT(padlist)) 245 if (SvREFCNT (padlist))
208 { 246 {
209 I32 i = AvFILLp(padlist); 247 I32 i = AvFILLp (padlist);
210 while (i >= 0) 248 while (i >= 0)
211 { 249 {
212 SV **svp = av_fetch(padlist, i--, FALSE); 250 SV **svp = av_fetch (padlist, i--, FALSE);
213 SV *sv = svp ? *svp : Nullsv;
214 if (sv) 251 if (svp)
252 {
253 SV *sv;
254 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
215 SvREFCNT_dec(sv); 255 SvREFCNT_dec (sv);
256
257 SvREFCNT_dec (*svp);
258 }
216 } 259 }
217 260
218 SvREFCNT_dec((SV*)padlist); 261 SvREFCNT_dec ((SV*)padlist);
219 } 262 }
220} 263}
221#endif 264
265STATIC int
266coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
267{
268 AV *padlist;
269 AV *av = (AV *)mg->mg_obj;
270
271 /* casting is fun. */
272 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
273 free_padlist (padlist);
274}
275
276#define PERL_MAGIC_coro PERL_MAGIC_ext
277
278static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
222 279
223/* the next two functions merely cache the padlists */ 280/* the next two functions merely cache the padlists */
224STATIC void 281STATIC void
225get_padlist (CV *cv) 282get_padlist (CV *cv)
226{ 283{
227 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 284 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
228 285
229 if (he && AvFILLp ((AV *)*he) >= 0) 286 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
230 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 287 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
231 else 288 else
232 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 289 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
233} 290}
234 291
235STATIC void 292STATIC void
236put_padlist (CV *cv) 293put_padlist (CV *cv)
237{ 294{
238 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 295 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
239 296
240 if (SvTYPE (*he) != SVt_PVAV) 297 if (!mg)
241 { 298 {
242 SvREFCNT_dec (*he); 299 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
300 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
301 mg->mg_virtual = &vtbl_coro;
243 *he = (SV *)newAV (); 302 mg->mg_obj = (SV *)newAV ();
244 } 303 }
245 304
246 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 305 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
247} 306}
248
249#ifdef MAY_FLUSH
250STATIC void
251flush_padlist_cache ()
252{
253 HV *hv = padlist_cache;
254 padlist_cache = newHV ();
255
256 if (hv_iterinit (hv))
257 {
258 HE *he;
259 AV *padlist;
260
261 while (!!(he = hv_iternext (hv)))
262 {
263 AV *av = (AV *)HeVAL(he);
264
265 /* casting is fun. */
266 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
267 free_padlist (padlist);
268 }
269 }
270
271 SvREFCNT_dec (hv);
272}
273#endif
274 307
275#define SB do { 308#define SB do {
276#define SE } while (0) 309#define SE } while (0)
277 310
278#define LOAD(state) load_state(aTHX_ (state)); 311#define LOAD(state) load_state(aTHX_ (state));
279#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 312#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
280 313
281#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 314#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
282 315
283static void 316static void
284load_state(pTHX_ Coro__State c) 317load_state(pTHX_ Coro__State c)
285{ 318{
286 PL_dowarn = c->dowarn; 319 PL_dowarn = c->dowarn;
290 PL_curstack = c->curstack; 323 PL_curstack = c->curstack;
291 PL_mainstack = c->mainstack; 324 PL_mainstack = c->mainstack;
292 PL_stack_sp = c->stack_sp; 325 PL_stack_sp = c->stack_sp;
293 PL_op = c->op; 326 PL_op = c->op;
294 PL_curpad = c->curpad; 327 PL_curpad = c->curpad;
328 PL_comppad = c->comppad;
295 PL_stack_base = c->stack_base; 329 PL_stack_base = c->stack_base;
296 PL_stack_max = c->stack_max; 330 PL_stack_max = c->stack_max;
297 PL_tmps_stack = c->tmps_stack; 331 PL_tmps_stack = c->tmps_stack;
298 PL_tmps_floor = c->tmps_floor; 332 PL_tmps_floor = c->tmps_floor;
299 PL_tmps_ix = c->tmps_ix; 333 PL_tmps_ix = c->tmps_ix;
328 362
329 if (padlist) 363 if (padlist)
330 { 364 {
331 put_padlist (cv); /* mark this padlist as available */ 365 put_padlist (cv); /* mark this padlist as available */
332 CvPADLIST(cv) = padlist; 366 CvPADLIST(cv) = padlist;
333#ifdef USE_THREADS
334 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
335#endif
336 } 367 }
337 368
338 ++CvDEPTH(cv); 369 ++CvDEPTH(cv);
339 } 370 }
340 371
367 if (CxTYPE(cx) == CXt_SUB) 398 if (CxTYPE(cx) == CXt_SUB)
368 { 399 {
369 CV *cv = cx->blk_sub.cv; 400 CV *cv = cx->blk_sub.cv;
370 if (CvDEPTH(cv)) 401 if (CvDEPTH(cv))
371 { 402 {
372#ifdef USE_THREADS
373 /*XPUSHs ((SV *)CvOWNER(cv));*/
374 /*CvOWNER(cv) = 0;*/
375 /*error must unlock this cv etc.. etc...*/
376#endif
377 EXTEND (SP, CvDEPTH(cv)*2); 403 EXTEND (SP, CvDEPTH(cv)*2);
378 404
379 while (--CvDEPTH(cv)) 405 while (--CvDEPTH(cv))
380 { 406 {
381 /* this tells the restore code to increment CvDEPTH */ 407 /* this tells the restore code to increment CvDEPTH */
387 PUSHs ((SV *)cv); 413 PUSHs ((SV *)cv);
388 414
389 get_padlist (cv); /* this is a monster */ 415 get_padlist (cv); /* this is a monster */
390 } 416 }
391 } 417 }
418#ifdef CXt_FORMAT
392 else if (CxTYPE(cx) == CXt_FORMAT) 419 else if (CxTYPE(cx) == CXt_FORMAT)
393 { 420 {
394 /* I never used formats, so how should I know how these are implemented? */ 421 /* I never used formats, so how should I know how these are implemented? */
395 /* my bold guess is as a simple, plain sub... */ 422 /* my bold guess is as a simple, plain sub... */
396 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 423 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
397 } 424 }
425#endif
398 } 426 }
399 427
400 if (top_si->si_type == PERLSI_MAIN) 428 if (top_si->si_type == PERLSI_MAIN)
401 break; 429 break;
402 430
419 c->curstack = PL_curstack; 447 c->curstack = PL_curstack;
420 c->mainstack = PL_mainstack; 448 c->mainstack = PL_mainstack;
421 c->stack_sp = PL_stack_sp; 449 c->stack_sp = PL_stack_sp;
422 c->op = PL_op; 450 c->op = PL_op;
423 c->curpad = PL_curpad; 451 c->curpad = PL_curpad;
452 c->comppad = PL_comppad;
424 c->stack_base = PL_stack_base; 453 c->stack_base = PL_stack_base;
425 c->stack_max = PL_stack_max; 454 c->stack_max = PL_stack_max;
426 c->tmps_stack = PL_tmps_stack; 455 c->tmps_stack = PL_tmps_stack;
427 c->tmps_floor = PL_tmps_floor; 456 c->tmps_floor = PL_tmps_floor;
428 c->tmps_ix = PL_tmps_ix; 457 c->tmps_ix = PL_tmps_ix;
444} 473}
445 474
446/* 475/*
447 * allocate various perl stacks. This is an exact copy 476 * allocate various perl stacks. This is an exact copy
448 * of perl.c:init_stacks, except that it uses less memory 477 * of perl.c:init_stacks, except that it uses less memory
449 * on the assumption that coroutines do not usually need 478 * on the (sometimes correct) assumption that coroutines do
450 * a lot of stackspace. 479 * not usually need a lot of stackspace.
451 */ 480 */
452STATIC void 481STATIC void
453coro_init_stacks (pTHX) 482coro_init_stacks (pTHX)
454{ 483{
484 LOCK;
485
455 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 486 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
456 PL_curstackinfo->si_type = PERLSI_MAIN; 487 PL_curstackinfo->si_type = PERLSI_MAIN;
457 PL_curstack = PL_curstackinfo->si_stack; 488 PL_curstack = PL_curstackinfo->si_stack;
458 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 489 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
459 490
468 499
469 New(54,PL_markstack,16,I32); 500 New(54,PL_markstack,16,I32);
470 PL_markstack_ptr = PL_markstack; 501 PL_markstack_ptr = PL_markstack;
471 PL_markstack_max = PL_markstack + 16; 502 PL_markstack_max = PL_markstack + 16;
472 503
504#ifdef SET_MARK_OFFSET
473 SET_MARK_OFFSET; 505 SET_MARK_OFFSET;
506#endif
474 507
475 New(54,PL_scopestack,16,I32); 508 New(54,PL_scopestack,16,I32);
476 PL_scopestack_ix = 0; 509 PL_scopestack_ix = 0;
477 PL_scopestack_max = 16; 510 PL_scopestack_max = 16;
478 511
481 PL_savestack_max = 96; 514 PL_savestack_max = 96;
482 515
483 New(54,PL_retstack,8,OP*); 516 New(54,PL_retstack,8,OP*);
484 PL_retstack_ix = 0; 517 PL_retstack_ix = 0;
485 PL_retstack_max = 8; 518 PL_retstack_max = 8;
519
520 UNLOCK;
486} 521}
487 522
488/* 523/*
489 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
490 * still there is a memleak of 128 bytes...
491 */ 525 */
492STATIC void 526STATIC void
493destroy_stacks(pTHX) 527destroy_stacks(pTHX)
494{ 528{
495 if (!IN_DESTRUCT) 529 if (!IN_DESTRUCT)
496 { 530 {
497 /* is this ugly, I ask? */ 531 /* is this ugly, I ask? */
498 while (PL_scopestack_ix) 532 LEAVE_SCOPE (0);
499 LEAVE;
500 533
501 /* sure it is, but more important: is it correct?? :/ */ 534 /* sure it is, but more important: is it correct?? :/ */
502 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
503 FREETMPS; 535 FREETMPS;
504 } 536 }
505 537
506 while (PL_curstackinfo->si_next) 538 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 539 PL_curstackinfo = PL_curstackinfo->si_next;
508 540
542 New (0, stack, 1, coro_stack); 574 New (0, stack, 1, coro_stack);
543 575
544 stack->refcnt = 1; 576 stack->refcnt = 1;
545 stack->usecnt = 1; 577 stack->usecnt = 1;
546 stack->gencnt = ctx->gencnt = 0; 578 stack->gencnt = ctx->gencnt = 0;
579
547 if (alloc) 580 if (alloc)
548 { 581 {
549#if HAVE_MMAP 582#if HAVE_MMAP
550 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 583 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
551 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 584 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
552 if (stack->sptr == (void *)-1) 585 if (stack->sptr == (void *)-1)
553#endif 586#endif
554 { 587 {
555 /*FIXME*//*D*//* reasonable stack size! */ 588 /*FIXME*//*D*//* reasonable stack size! */
556 stack->ssize = -4096 * sizeof (long); 589 stack->ssize = - (8192 * sizeof (long));
557 New (0, stack->sptr, 4096, long); 590 New (0, stack->sptr, 8192, long);
558 } 591 }
559 } 592 }
560 else 593 else
561 stack->sptr = 0; 594 stack->sptr = 0;
562 595
576 { 609 {
577#ifdef HAVE_MMAP 610#ifdef HAVE_MMAP
578 if (stack->ssize > 0 && stack->sptr) 611 if (stack->ssize > 0 && stack->sptr)
579 munmap (stack->sptr, stack->ssize); 612 munmap (stack->sptr, stack->ssize);
580 else 613 else
581#else 614#endif
582 Safefree (stack->sptr); 615 Safefree (stack->sptr);
583#endif 616
584 Safefree (stack); 617 Safefree (stack);
585 } 618 }
586 else if (ctx->gencnt == stack->gencnt) 619 else if (ctx->gencnt == stack->gencnt)
587 --stack->usecnt; 620 --stack->usecnt;
588 } 621 }
594 /* 627 /*
595 * emulate part of the perl startup here. 628 * emulate part of the perl startup here.
596 */ 629 */
597 dSP; 630 dSP;
598 Coro__State ctx = (Coro__State)arg; 631 Coro__State ctx = (Coro__State)arg;
599 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 632 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
600 633
601 coro_init_stacks (aTHX); 634 coro_init_stacks (aTHX);
602 /*PL_curcop = 0;*/ 635 /*PL_curcop = 0;*/
603 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 636 /*PL_in_eval = PL_in_eval;*/ /* inherit */
604 SvREFCNT_dec (GvAV (PL_defgv)); 637 SvREFCNT_dec (GvAV (PL_defgv));
605 GvAV (PL_defgv) = ctx->args; 638 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
606 639
607 SPAGAIN; 640 SPAGAIN;
608 641
609 if (ctx->stack) 642 if (ctx->stack)
610 { 643 {
637 * that doesn't matter, though, since it is only 670 * that doesn't matter, though, since it is only
638 * pp_nextstate and we never return... 671 * pp_nextstate and we never return...
639 * ah yes, and I don't care anyways ;) 672 * ah yes, and I don't care anyways ;)
640 */ 673 */
641 PUTBACK; 674 PUTBACK;
642 PL_op = pp_entersub(); 675 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
643 SPAGAIN; 676 SPAGAIN;
644 677
645 ENTER; /* necessary e.g. for dounwind */ 678 ENTER; /* necessary e.g. for dounwind */
646 } 679 }
647} 680}
653 * this is a _very_ stripped down perl interpreter ;) 686 * this is a _very_ stripped down perl interpreter ;)
654 */ 687 */
655 Coro__State ctx = (Coro__State)arg; 688 Coro__State ctx = (Coro__State)arg;
656 JMPENV coro_start_env; 689 JMPENV coro_start_env;
657 690
658 /* same as JMPENV_BOOTSTRAP */
659 Zero(&coro_start_env, 1, JMPENV);
660 coro_start_env.je_ret = -1;
661 coro_start_env.je_mustcatch = TRUE;
662 PL_top_env = &coro_start_env; 691 PL_top_env = &ctx->start_env;
663 692
664 ctx->cursp = 0; 693 ctx->cursp = 0;
665 PL_op = PL_op->op_next; 694 PL_op = PL_op->op_next;
666 CALLRUNOPS(aTHX); 695 CALLRUNOPS(aTHX);
667 696
668 abort (); 697 abort ();
669} 698}
670 699
671STATIC void 700STATIC void
672transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 701transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
673{ 702{
674 dSTACKLEVEL; 703 dSTACKLEVEL;
675 static struct coro *xnext;
676 704
677 if (prev != next) 705 if (prev != next)
678 { 706 {
679 xnext = next;
680
681 if (next->mainstack) 707 if (next->mainstack)
682 { 708 {
709 LOCK;
683 SAVE (prev, flags); 710 SAVE (prev, flags);
684 LOAD (next); 711 LOAD (next);
712 UNLOCK;
685 713
686 /* mark this state as in-use */ 714 /* mark this state as in-use */
687 next->mainstack = 0; 715 next->mainstack = 0;
688 next->tmps_ix = -2; 716 next->tmps_ix = -2;
689 717
708 continue_coro, (void *)next, 736 continue_coro, (void *)next,
709 next->stack->sptr, labs (next->stack->ssize)); 737 next->stack->sptr, labs (next->stack->ssize));
710 } 738 }
711 739
712 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 740 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
741 prev->cursp = stacklevel;
713 /* don't add any code here */ 742 /* don't add any code here */
714 } 743 }
715 744 else
745 next->cursp = stacklevel;
716 } 746 }
717 else if (next->tmps_ix == -2) 747 else if (next->tmps_ix == -2)
718 croak ("tried to transfer to running coroutine"); 748 croak ("tried to transfer to running coroutine");
719 else 749 else
720 { 750 {
751 LOCK;
721 SAVE (prev, -1); /* first get rid of the old state */ 752 SAVE (prev, -1); /* first get rid of the old state */
753 UNLOCK;
722 754
723 if (flags & TRANSFER_SAVE_CCTXT) 755 if (flags & TRANSFER_SAVE_CCTXT)
724 { 756 {
725 if (!prev->stack) 757 if (!prev->stack)
726 allocate_stack (prev, 0); 758 allocate_stack (prev, 0);
727 759
728 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 760 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
729 { 761 {
762 PL_top_env = &next->start_env;
763
730 setup_coro (next); 764 setup_coro (next);
765 next->cursp = stacklevel;
731 766
732 prev->stack->refcnt++; 767 prev->stack->refcnt++;
733 prev->stack->usecnt++; 768 prev->stack->usecnt++;
734 next->stack = prev->stack; 769 next->stack = prev->stack;
735 next->gencnt = prev->gencnt; 770 next->gencnt = prev->gencnt;
736 } 771 }
737 else 772 else
738 { 773 {
774 assert (!next->stack);
739 allocate_stack (next, 1); 775 allocate_stack (next, 1);
740 coro_create (&(next->stack->cctx), 776 coro_create (&(next->stack->cctx),
741 setup_coro, (void *)next, 777 setup_coro, (void *)next,
742 next->stack->sptr, labs (next->stack->ssize)); 778 next->stack->sptr, labs (next->stack->ssize));
743 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 779 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
780 prev->cursp = stacklevel;
744 /* don't add any code here */ 781 /* don't add any code here */
745 } 782 }
746 } 783 }
747 else 784 else
785 {
748 setup_coro (next); 786 setup_coro (next);
787 next->cursp = stacklevel;
788 }
749 } 789 }
750
751 /*
752 * xnext is now either prev or next, depending on wether
753 * we switched the c stack or not. that's why I use a global
754 * variable, that should become thread-specific at one point.
755 */
756 xnext->cursp = stacklevel;
757 } 790 }
758 791
792 LOCK;
759 if (coro_mortal) 793 if (coro_mortal)
760 { 794 {
761 SvREFCNT_dec (coro_mortal); 795 SvREFCNT_dec (coro_mortal);
762 coro_mortal = 0; 796 coro_mortal = 0;
763 } 797 }
798 UNLOCK;
764} 799}
765 800
766#define SV_CORO(sv,func) \ 801#define SV_CORO(sv,func) \
767 do { \ 802 do { \
768 if (SvROK (sv)) \ 803 if (SvROK (sv)) \
769 sv = SvRV (sv); \ 804 sv = SvRV (sv); \
770 \ 805 \
771 if (SvTYPE(sv) == SVt_PVHV) \ 806 if (SvTYPE (sv) == SVt_PVHV) \
772 { \ 807 { \
773 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 808 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
774 \ 809 \
775 if (!he) \ 810 if (!he) \
776 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 811 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
777 \ 812 \
778 (sv) = SvRV (HeVAL(he)); \ 813 (sv) = SvRV (HeVAL(he)); \
779 } \ 814 } \
780 \ 815 \
781 /* must also be changed inside Coro::Cont::yield */ \ 816 /* must also be changed inside Coro::Cont::yield */ \
782 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 817 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
783 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 818 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
784 \ 819 \
785 } while(0) 820 } while(0)
786 821
787#define SvSTATE(sv) (struct coro *)SvIV (sv) 822#define SvSTATE(sv) (struct coro *)SvIV (sv)
853api_ready (SV *coro) 888api_ready (SV *coro)
854{ 889{
855 if (SvROK (coro)) 890 if (SvROK (coro))
856 coro = SvRV (coro); 891 coro = SvRV (coro);
857 892
893 LOCK;
858 coro_enq (SvREFCNT_inc (coro)); 894 coro_enq (SvREFCNT_inc (coro));
895 UNLOCK;
859} 896}
860 897
861static void 898static void
862api_schedule (void) 899api_schedule (void)
863{ 900{
864 SV *prev, *next; 901 SV *prev, *next;
902
903 LOCK;
865 904
866 prev = SvRV (GvSV (coro_current)); 905 prev = SvRV (GvSV (coro_current));
867 next = coro_deq (PRIO_MIN); 906 next = coro_deq (PRIO_MIN);
868 907
869 if (!next) 908 if (!next)
875 914
876 SvRV (GvSV (coro_current)) = next; 915 SvRV (GvSV (coro_current)) = next;
877 916
878 SV_CORO (next, "Coro::schedule"); 917 SV_CORO (next, "Coro::schedule");
879 918
919 UNLOCK;
920
880 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 921 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
881 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 922 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
882} 923}
883 924
884static void 925static void
885api_cede (void) 926api_cede (void)
886{ 927{
928 LOCK;
887 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 929 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
930 UNLOCK;
888 931
889 api_schedule (); 932 api_schedule ();
890} 933}
891 934
892MODULE = Coro::State PACKAGE = Coro::State 935MODULE = Coro::State PACKAGE = Coro::State
893 936
894PROTOTYPES: ENABLE 937PROTOTYPES: ENABLE
895 938
896BOOT: 939BOOT:
897{ /* {} necessary for stoopid perl-5.6.x */ 940{ /* {} necessary for stoopid perl-5.6.x */
941#ifdef USE_ITHREADS
942 MUTEX_INIT (&coro_mutex);
943#endif
944
898 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 945 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
899 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 946 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
900 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 947 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
901 948
902 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 949 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
903 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 950 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
904 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 951 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
905 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 952 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
906
907 if (!padlist_cache)
908 padlist_cache = newHV ();
909 953
910 main_mainstack = PL_mainstack; 954 main_mainstack = PL_mainstack;
911 955
912 coroapi.ver = CORO_API_VERSION; 956 coroapi.ver = CORO_API_VERSION;
913 coroapi.transfer = api_transfer; 957 coroapi.transfer = api_transfer;
921 Coro__State coro; 965 Coro__State coro;
922 966
923 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 967 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
924 croak ("Coro::State::_newprocess expects an arrayref"); 968 croak ("Coro::State::_newprocess expects an arrayref");
925 969
926 New (0, coro, 1, struct coro); 970 Newz (0, coro, 1, struct coro);
927 971
928 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 972 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
929 coro->mainstack = 0; /* actual work is done inside transfer */ 973 coro->mainstack = 0; /* actual work is done inside transfer */
930 coro->stack = 0; 974 coro->stack = 0;
975
976 /* same as JMPENV_BOOTSTRAP */
977 /* we might be able to recycle start_env, but safe is safe */
978 //Zero(&coro->start_env, 1, JMPENV);
979 coro->start_env.je_ret = -1;
980 coro->start_env.je_mustcatch = TRUE;
931 981
932 RETVAL = coro; 982 RETVAL = coro;
933 OUTPUT: 983 OUTPUT:
934 RETVAL 984 RETVAL
935 985
967 1017
968 coro->mainstack = 0; 1018 coro->mainstack = 0;
969 } 1019 }
970 1020
971 deallocate_stack (coro); 1021 deallocate_stack (coro);
972 1022 SvREFCNT_dec (coro->args);
973 Safefree (coro); 1023 Safefree (coro);
974
975void
976flush()
977 CODE:
978#ifdef MAY_FLUSH
979 flush_padlist_cache ();
980#endif
981 1024
982void 1025void
983_exit(code) 1026_exit(code)
984 int code 1027 int code
985 PROTOTYPE: $ 1028 PROTOTYPE: $
986 CODE: 1029 CODE:
987#if defined(__GLIBC__) || _POSIX_C_SOURCE
988 _exit (code); 1030 _exit (code);
989#else
990 signal (SIGTERM, SIG_DFL);
991 raise (SIGTERM);
992 exit (code);
993#endif
994 1031
995MODULE = Coro::State PACKAGE = Coro::Cont 1032MODULE = Coro::State PACKAGE = Coro::Cont
996 1033
997# this is slightly dirty (should expose a c-level api) 1034# this is slightly dirty (should expose a c-level api)
998 1035
1004 SV *sv; 1041 SV *sv;
1005 AV *defav = GvAV (PL_defgv); 1042 AV *defav = GvAV (PL_defgv);
1006 struct coro *prev, *next; 1043 struct coro *prev, *next;
1007 1044
1008 if (!returnstk) 1045 if (!returnstk)
1009 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1010 1047
1011 /* set up @_ -- ugly */ 1048 /* set up @_ -- ugly */
1012 av_clear (defav); 1049 av_clear (defav);
1013 av_fill (defav, items - 1); 1050 av_fill (defav, items - 1);
1014 while (items--) 1051 while (items--)
1057 sv_setiv(sv, (IV)&coroapi); 1094 sv_setiv(sv, (IV)&coroapi);
1058 SvREADONLY_on(sv); 1095 SvREADONLY_on(sv);
1059 } 1096 }
1060} 1097}
1061 1098
1099#if !PERL_MICRO
1100
1062void 1101void
1063ready(self) 1102ready(self)
1064 SV * self 1103 SV * self
1065 PROTOTYPE: $ 1104 PROTOTYPE: $
1066 CODE: 1105 CODE:
1067 api_ready (self); 1106 api_ready (self);
1107
1108#endif
1068 1109
1069int 1110int
1070nready(...) 1111nready(...)
1071 PROTOTYPE: 1112 PROTOTYPE:
1072 CODE: 1113 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines