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.42 by root, Mon Dec 31 20:41:45 2001 UTC vs.
Revision 1.52 by pcg, Sun Nov 30 22:49:25 2003 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
… …
47 void *sptr; 68 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 69 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 70} coro_stack;
50 71
51struct coro { 72struct coro {
73 /* the top-level JMPENV for each coroutine, needed to catch dies. */
74 JMPENV start_env;
75
52 /* the optional C context */ 76 /* the optional C context */
53 coro_stack *stack; 77 coro_stack *stack;
54 void *cursp; 78 void *cursp;
55 int gencnt; 79 int gencnt;
56 80
… …
68 AV *curstack; 92 AV *curstack;
69 AV *mainstack; 93 AV *mainstack;
70 SV **stack_sp; 94 SV **stack_sp;
71 OP *op; 95 OP *op;
72 SV **curpad; 96 SV **curpad;
97 AV *comppad;
73 SV **stack_base; 98 SV **stack_base;
74 SV **stack_max; 99 SV **stack_max;
75 SV **tmps_stack; 100 SV **tmps_stack;
76 I32 tmps_floor; 101 I32 tmps_floor;
77 I32 tmps_ix; 102 I32 tmps_ix;
… …
157 sv = (SV *) newAV (); 182 sv = (SV *) newAV ();
158 else if (*name == '%') 183 else if (*name == '%')
159 sv = (SV *) newHV (); 184 sv = (SV *) newHV ();
160 else 185 else
161 sv = NEWSV (0, 0); 186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
162 if (!SvPADBUSY (sv)) 188 if (!SvPADBUSY (sv))
189#endif
163 SvPADMY_on (sv); 190 SvPADMY_on (sv);
164 npad[ix] = sv; 191 npad[ix] = sv;
165 } 192 }
166 } 193 }
167 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
… …
197#endif 224#endif
198 225
199 return newpadlist; 226 return newpadlist;
200} 227}
201 228
202#ifdef MAY_FLUSH
203STATIC void 229STATIC void
204free_padlist (AV *padlist) 230free_padlist (AV *padlist)
205{ 231{
206 /* may be during global destruction */ 232 /* may be during global destruction */
207 if (SvREFCNT(padlist)) 233 if (SvREFCNT (padlist))
208 { 234 {
209 I32 i = AvFILLp(padlist); 235 I32 i = AvFILLp (padlist);
210 while (i >= 0) 236 while (i >= 0)
211 { 237 {
212 SV **svp = av_fetch(padlist, i--, FALSE); 238 SV **svp = av_fetch (padlist, i--, FALSE);
213 SV *sv = svp ? *svp : Nullsv;
214 if (sv) 239 if (svp)
240 {
241 SV *sv;
242 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
215 SvREFCNT_dec(sv); 243 SvREFCNT_dec (sv);
244
245 SvREFCNT_dec (*svp);
246 }
216 } 247 }
217 248
218 SvREFCNT_dec((SV*)padlist); 249 SvREFCNT_dec ((SV*)padlist);
219 } 250 }
220} 251}
221#endif 252
253STATIC int
254coro_cv_free (SV *sv, MAGIC *mg)
255{
256 AV *padlist;
257 AV *av = (AV *)mg->mg_obj;
258
259 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist);
262}
263
264#define PERL_MAGIC_coro PERL_MAGIC_ext
265
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
222 267
223/* the next two functions merely cache the padlists */ 268/* the next two functions merely cache the padlists */
224STATIC void 269STATIC void
225get_padlist (CV *cv) 270get_padlist (CV *cv)
226{ 271{
227 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
228 273
229 if (he && AvFILLp ((AV *)*he) >= 0) 274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
230 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
231 else 276 else
232 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
233} 278}
234 279
235STATIC void 280STATIC void
236put_padlist (CV *cv) 281put_padlist (CV *cv)
237{ 282{
238 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
239 284
240 if (SvTYPE (*he) != SVt_PVAV) 285 if (!mg)
241 { 286 {
242 SvREFCNT_dec (*he); 287 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
288 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
289 mg->mg_virtual = &vtbl_coro;
243 *he = (SV *)newAV (); 290 mg->mg_obj = (SV *)newAV ();
244 } 291 }
245 292
246 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 293 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
247} 294}
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 295
275#define SB do { 296#define SB do {
276#define SE } while (0) 297#define SE } while (0)
277 298
278#define LOAD(state) load_state(aTHX_ (state)); 299#define LOAD(state) load_state(aTHX_ (state));
279#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 300#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
280 301
281#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 302#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
282 303
283static void 304static void
284load_state(pTHX_ Coro__State c) 305load_state(pTHX_ Coro__State c)
285{ 306{
286 PL_dowarn = c->dowarn; 307 PL_dowarn = c->dowarn;
… …
290 PL_curstack = c->curstack; 311 PL_curstack = c->curstack;
291 PL_mainstack = c->mainstack; 312 PL_mainstack = c->mainstack;
292 PL_stack_sp = c->stack_sp; 313 PL_stack_sp = c->stack_sp;
293 PL_op = c->op; 314 PL_op = c->op;
294 PL_curpad = c->curpad; 315 PL_curpad = c->curpad;
316 PL_comppad = c->comppad;
295 PL_stack_base = c->stack_base; 317 PL_stack_base = c->stack_base;
296 PL_stack_max = c->stack_max; 318 PL_stack_max = c->stack_max;
297 PL_tmps_stack = c->tmps_stack; 319 PL_tmps_stack = c->tmps_stack;
298 PL_tmps_floor = c->tmps_floor; 320 PL_tmps_floor = c->tmps_floor;
299 PL_tmps_ix = c->tmps_ix; 321 PL_tmps_ix = c->tmps_ix;
… …
387 PUSHs ((SV *)cv); 409 PUSHs ((SV *)cv);
388 410
389 get_padlist (cv); /* this is a monster */ 411 get_padlist (cv); /* this is a monster */
390 } 412 }
391 } 413 }
414#ifdef CXt_FORMAT
392 else if (CxTYPE(cx) == CXt_FORMAT) 415 else if (CxTYPE(cx) == CXt_FORMAT)
393 { 416 {
394 /* I never used formats, so how should I know how these are implemented? */ 417 /* I never used formats, so how should I know how these are implemented? */
395 /* my bold guess is as a simple, plain sub... */ 418 /* my bold guess is as a simple, plain sub... */
396 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 419 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
397 } 420 }
421#endif
398 } 422 }
399 423
400 if (top_si->si_type == PERLSI_MAIN) 424 if (top_si->si_type == PERLSI_MAIN)
401 break; 425 break;
402 426
… …
419 c->curstack = PL_curstack; 443 c->curstack = PL_curstack;
420 c->mainstack = PL_mainstack; 444 c->mainstack = PL_mainstack;
421 c->stack_sp = PL_stack_sp; 445 c->stack_sp = PL_stack_sp;
422 c->op = PL_op; 446 c->op = PL_op;
423 c->curpad = PL_curpad; 447 c->curpad = PL_curpad;
448 c->comppad = PL_comppad;
424 c->stack_base = PL_stack_base; 449 c->stack_base = PL_stack_base;
425 c->stack_max = PL_stack_max; 450 c->stack_max = PL_stack_max;
426 c->tmps_stack = PL_tmps_stack; 451 c->tmps_stack = PL_tmps_stack;
427 c->tmps_floor = PL_tmps_floor; 452 c->tmps_floor = PL_tmps_floor;
428 c->tmps_ix = PL_tmps_ix; 453 c->tmps_ix = PL_tmps_ix;
… …
444} 469}
445 470
446/* 471/*
447 * allocate various perl stacks. This is an exact copy 472 * allocate various perl stacks. This is an exact copy
448 * of perl.c:init_stacks, except that it uses less memory 473 * of perl.c:init_stacks, except that it uses less memory
449 * on the assumption that coroutines do not usually need 474 * on the (sometimes correct) assumption that coroutines do
450 * a lot of stackspace. 475 * not usually need a lot of stackspace.
451 */ 476 */
452STATIC void 477STATIC void
453coro_init_stacks (pTHX) 478coro_init_stacks (pTHX)
454{ 479{
455 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
468 493
469 New(54,PL_markstack,16,I32); 494 New(54,PL_markstack,16,I32);
470 PL_markstack_ptr = PL_markstack; 495 PL_markstack_ptr = PL_markstack;
471 PL_markstack_max = PL_markstack + 16; 496 PL_markstack_max = PL_markstack + 16;
472 497
498#ifdef SET_MARK_OFFSET
473 SET_MARK_OFFSET; 499 SET_MARK_OFFSET;
500#endif
474 501
475 New(54,PL_scopestack,16,I32); 502 New(54,PL_scopestack,16,I32);
476 PL_scopestack_ix = 0; 503 PL_scopestack_ix = 0;
477 PL_scopestack_max = 16; 504 PL_scopestack_max = 16;
478 505
… …
485 PL_retstack_max = 8; 512 PL_retstack_max = 8;
486} 513}
487 514
488/* 515/*
489 * destroy the stacks, the callchain etc... 516 * destroy the stacks, the callchain etc...
490 * still there is a memleak of 128 bytes...
491 */ 517 */
492STATIC void 518STATIC void
493destroy_stacks(pTHX) 519destroy_stacks(pTHX)
494{ 520{
495 if (!IN_DESTRUCT) 521 if (!IN_DESTRUCT)
496 { 522 {
497 /* is this ugly, I ask? */ 523 /* is this ugly, I ask? */
498 while (PL_scopestack_ix) 524 LEAVE_SCOPE (0);
499 LEAVE;
500 525
501 /* sure it is, but more important: is it correct?? :/ */ 526 /* 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; 527 FREETMPS;
504 } 528 }
505 529
506 while (PL_curstackinfo->si_next) 530 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 531 PL_curstackinfo = PL_curstackinfo->si_next;
508 532
… …
551 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 575 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
552 if (stack->sptr == (void *)-1) 576 if (stack->sptr == (void *)-1)
553#endif 577#endif
554 { 578 {
555 /*FIXME*//*D*//* reasonable stack size! */ 579 /*FIXME*//*D*//* reasonable stack size! */
556 stack->ssize = -4096 * sizeof (long); 580 stack->ssize = - (16384 * sizeof (long));
557 New (0, stack->sptr, 4096, long); 581 New (0, stack->sptr, 16384, long);
558 } 582 }
559 } 583 }
560 else 584 else
561 stack->sptr = 0; 585 stack->sptr = 0;
562 586
… …
576 { 600 {
577#ifdef HAVE_MMAP 601#ifdef HAVE_MMAP
578 if (stack->ssize > 0 && stack->sptr) 602 if (stack->ssize > 0 && stack->sptr)
579 munmap (stack->sptr, stack->ssize); 603 munmap (stack->sptr, stack->ssize);
580 else 604 else
581#else 605#endif
582 Safefree (stack->sptr); 606 Safefree (stack->sptr);
583#endif 607
584 Safefree (stack); 608 Safefree (stack);
585 } 609 }
586 else if (ctx->gencnt == stack->gencnt) 610 else if (ctx->gencnt == stack->gencnt)
587 --stack->usecnt; 611 --stack->usecnt;
588 } 612 }
… …
594 /* 618 /*
595 * emulate part of the perl startup here. 619 * emulate part of the perl startup here.
596 */ 620 */
597 dSP; 621 dSP;
598 Coro__State ctx = (Coro__State)arg; 622 Coro__State ctx = (Coro__State)arg;
599 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 623 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
600 624
601 coro_init_stacks (aTHX); 625 coro_init_stacks (aTHX);
602 /*PL_curcop = 0;*/ 626 /*PL_curcop = 0;*/
603 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 627 /*PL_in_eval = PL_in_eval;*/ /* inherit */
604 SvREFCNT_dec (GvAV (PL_defgv)); 628 SvREFCNT_dec (GvAV (PL_defgv));
605 GvAV (PL_defgv) = ctx->args; 629 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
606 630
607 SPAGAIN; 631 SPAGAIN;
608 632
609 if (ctx->stack) 633 if (ctx->stack)
610 { 634 {
… …
637 * that doesn't matter, though, since it is only 661 * that doesn't matter, though, since it is only
638 * pp_nextstate and we never return... 662 * pp_nextstate and we never return...
639 * ah yes, and I don't care anyways ;) 663 * ah yes, and I don't care anyways ;)
640 */ 664 */
641 PUTBACK; 665 PUTBACK;
642 PL_op = PL_ppaddr[OP_ENTERSUB](); 666 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
643 SPAGAIN; 667 SPAGAIN;
644 668
645 ENTER; /* necessary e.g. for dounwind */ 669 ENTER; /* necessary e.g. for dounwind */
646 } 670 }
647} 671}
… …
653 * this is a _very_ stripped down perl interpreter ;) 677 * this is a _very_ stripped down perl interpreter ;)
654 */ 678 */
655 Coro__State ctx = (Coro__State)arg; 679 Coro__State ctx = (Coro__State)arg;
656 JMPENV coro_start_env; 680 JMPENV coro_start_env;
657 681
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; 682 PL_top_env = &ctx->start_env;
663 683
664 ctx->cursp = 0; 684 ctx->cursp = 0;
665 PL_op = PL_op->op_next; 685 PL_op = PL_op->op_next;
666 CALLRUNOPS(aTHX); 686 CALLRUNOPS(aTHX);
667 687
… …
725 if (!prev->stack) 745 if (!prev->stack)
726 allocate_stack (prev, 0); 746 allocate_stack (prev, 0);
727 747
728 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 748 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
729 { 749 {
750 PL_top_env = &next->start_env;
751
730 setup_coro (next); 752 setup_coro (next);
731 753
732 prev->stack->refcnt++; 754 prev->stack->refcnt++;
733 prev->stack->usecnt++; 755 prev->stack->usecnt++;
734 next->stack = prev->stack; 756 next->stack = prev->stack;
735 next->gencnt = prev->gencnt; 757 next->gencnt = prev->gencnt;
736 } 758 }
737 else 759 else
738 { 760 {
761 assert (!next->stack);
739 allocate_stack (next, 1); 762 allocate_stack (next, 1);
740 coro_create (&(next->stack->cctx), 763 coro_create (&(next->stack->cctx),
741 setup_coro, (void *)next, 764 setup_coro, (void *)next,
742 next->stack->sptr, labs (next->stack->ssize)); 765 next->stack->sptr, labs (next->stack->ssize));
743 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 766 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
… …
921 Coro__State coro; 944 Coro__State coro;
922 945
923 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 946 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
924 croak ("Coro::State::_newprocess expects an arrayref"); 947 croak ("Coro::State::_newprocess expects an arrayref");
925 948
926 New (0, coro, 1, struct coro); 949 Newz (0, coro, 1, struct coro);
927 950
928 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 951 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
929 coro->mainstack = 0; /* actual work is done inside transfer */ 952 coro->mainstack = 0; /* actual work is done inside transfer */
930 coro->stack = 0; 953 coro->stack = 0;
954
955 /* same as JMPENV_BOOTSTRAP */
956 /* we might be able to recycle start_env, but safe is safe */
957 //Zero(&coro->start_env, 1, JMPENV);
958 coro->start_env.je_ret = -1;
959 coro->start_env.je_mustcatch = TRUE;
931 960
932 RETVAL = coro; 961 RETVAL = coro;
933 OUTPUT: 962 OUTPUT:
934 RETVAL 963 RETVAL
935 964
… …
967 996
968 coro->mainstack = 0; 997 coro->mainstack = 0;
969 } 998 }
970 999
971 deallocate_stack (coro); 1000 deallocate_stack (coro);
972 1001 SvREFCNT_dec (coro->args);
973 Safefree (coro); 1002 Safefree (coro);
974
975void
976flush()
977 CODE:
978#ifdef MAY_FLUSH
979 flush_padlist_cache ();
980#endif
981 1003
982void 1004void
983_exit(code) 1005_exit(code)
984 int code 1006 int code
985 PROTOTYPE: $ 1007 PROTOTYPE: $
986 CODE: 1008 CODE:
987#if defined(__GLIBC__) || _POSIX_C_SOURCE
988 _exit (code); 1009 _exit (code);
989#else
990 signal (SIGTERM, SIG_DFL);
991 raise (SIGTERM);
992 exit (code);
993#endif
994 1010
995MODULE = Coro::State PACKAGE = Coro::Cont 1011MODULE = Coro::State PACKAGE = Coro::Cont
996 1012
997# this is slightly dirty (should expose a c-level api) 1013# this is slightly dirty (should expose a c-level api)
998 1014
… …
1004 SV *sv; 1020 SV *sv;
1005 AV *defav = GvAV (PL_defgv); 1021 AV *defav = GvAV (PL_defgv);
1006 struct coro *prev, *next; 1022 struct coro *prev, *next;
1007 1023
1008 if (!returnstk) 1024 if (!returnstk)
1009 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1025 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1010 1026
1011 /* set up @_ -- ugly */ 1027 /* set up @_ -- ugly */
1012 av_clear (defav); 1028 av_clear (defav);
1013 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
1014 while (items--) 1030 while (items--)
… …
1057 sv_setiv(sv, (IV)&coroapi); 1073 sv_setiv(sv, (IV)&coroapi);
1058 SvREADONLY_on(sv); 1074 SvREADONLY_on(sv);
1059 } 1075 }
1060} 1076}
1061 1077
1078#if !PERL_MICRO
1079
1062void 1080void
1063ready(self) 1081ready(self)
1064 SV * self 1082 SV * self
1065 PROTOTYPE: $ 1083 PROTOTYPE: $
1066 CODE: 1084 CODE:
1067 api_ready (self); 1085 api_ready (self);
1086
1087#endif
1068 1088
1069int 1089int
1070nready(...) 1090nready(...)
1071 PROTOTYPE: 1091 PROTOTYPE:
1072 CODE: 1092 CODE:

Diff Legend

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