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.44 by root, Sat Mar 22 18:50:32 2003 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
… …
158 sv = (SV *) newAV (); 182 sv = (SV *) newAV ();
159 else if (*name == '%') 183 else if (*name == '%')
160 sv = (SV *) newHV (); 184 sv = (SV *) newHV ();
161 else 185 else
162 sv = NEWSV (0, 0); 186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
163 if (!SvPADBUSY (sv)) 188 if (!SvPADBUSY (sv))
189#endif
164 SvPADMY_on (sv); 190 SvPADMY_on (sv);
165 npad[ix] = sv; 191 npad[ix] = sv;
166 } 192 }
167 } 193 }
168 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
… …
198#endif 224#endif
199 225
200 return newpadlist; 226 return newpadlist;
201} 227}
202 228
203#ifdef MAY_FLUSH
204STATIC void 229STATIC void
205free_padlist (AV *padlist) 230free_padlist (AV *padlist)
206{ 231{
207 /* may be during global destruction */ 232 /* may be during global destruction */
208 if (SvREFCNT(padlist)) 233 if (SvREFCNT (padlist))
209 { 234 {
210 I32 i = AvFILLp(padlist); 235 I32 i = AvFILLp (padlist);
211 while (i >= 0) 236 while (i >= 0)
212 { 237 {
213 SV **svp = av_fetch(padlist, i--, FALSE); 238 SV **svp = av_fetch (padlist, i--, FALSE);
214 SV *sv = svp ? *svp : Nullsv;
215 if (sv) 239 if (svp)
240 {
241 SV *sv;
242 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
216 SvREFCNT_dec(sv); 243 SvREFCNT_dec (sv);
244
245 SvREFCNT_dec (*svp);
246 }
217 } 247 }
218 248
219 SvREFCNT_dec((SV*)padlist); 249 SvREFCNT_dec ((SV*)padlist);
220 } 250 }
221} 251}
222#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};
223 267
224/* the next two functions merely cache the padlists */ 268/* the next two functions merely cache the padlists */
225STATIC void 269STATIC void
226get_padlist (CV *cv) 270get_padlist (CV *cv)
227{ 271{
228 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
229 273
230 if (he && AvFILLp ((AV *)*he) >= 0) 274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
231 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
232 else 276 else
233 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
234} 278}
235 279
236STATIC void 280STATIC void
237put_padlist (CV *cv) 281put_padlist (CV *cv)
238{ 282{
239 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
240 284
241 if (SvTYPE (*he) != SVt_PVAV) 285 if (!mg)
242 { 286 {
243 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;
244 *he = (SV *)newAV (); 290 mg->mg_obj = (SV *)newAV ();
245 } 291 }
246 292
247 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 293 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
248} 294}
249
250#ifdef MAY_FLUSH
251STATIC void
252flush_padlist_cache ()
253{
254 HV *hv = padlist_cache;
255 padlist_cache = newHV ();
256
257 if (hv_iterinit (hv))
258 {
259 HE *he;
260 AV *padlist;
261
262 while (!!(he = hv_iternext (hv)))
263 {
264 AV *av = (AV *)HeVAL(he);
265
266 /* casting is fun. */
267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
268 free_padlist (padlist);
269 }
270 }
271
272 SvREFCNT_dec (hv);
273}
274#endif
275 295
276#define SB do { 296#define SB do {
277#define SE } while (0) 297#define SE } while (0)
278 298
279#define LOAD(state) load_state(aTHX_ (state)); 299#define LOAD(state) load_state(aTHX_ (state));
280#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 300#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
281 301
282#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
283 303
284static void 304static void
285load_state(pTHX_ Coro__State c) 305load_state(pTHX_ Coro__State c)
286{ 306{
287 PL_dowarn = c->dowarn; 307 PL_dowarn = c->dowarn;
… …
389 PUSHs ((SV *)cv); 409 PUSHs ((SV *)cv);
390 410
391 get_padlist (cv); /* this is a monster */ 411 get_padlist (cv); /* this is a monster */
392 } 412 }
393 } 413 }
414#ifdef CXt_FORMAT
394 else if (CxTYPE(cx) == CXt_FORMAT) 415 else if (CxTYPE(cx) == CXt_FORMAT)
395 { 416 {
396 /* 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? */
397 /* my bold guess is as a simple, plain sub... */ 418 /* my bold guess is as a simple, plain sub... */
398 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");
399 } 420 }
421#endif
400 } 422 }
401 423
402 if (top_si->si_type == PERLSI_MAIN) 424 if (top_si->si_type == PERLSI_MAIN)
403 break; 425 break;
404 426
… …
447} 469}
448 470
449/* 471/*
450 * allocate various perl stacks. This is an exact copy 472 * allocate various perl stacks. This is an exact copy
451 * of perl.c:init_stacks, except that it uses less memory 473 * of perl.c:init_stacks, except that it uses less memory
452 * on the assumption that coroutines do not usually need 474 * on the (sometimes correct) assumption that coroutines do
453 * a lot of stackspace. 475 * not usually need a lot of stackspace.
454 */ 476 */
455STATIC void 477STATIC void
456coro_init_stacks (pTHX) 478coro_init_stacks (pTHX)
457{ 479{
458 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
… …
471 493
472 New(54,PL_markstack,16,I32); 494 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 495 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 496 PL_markstack_max = PL_markstack + 16;
475 497
498#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 499 SET_MARK_OFFSET;
500#endif
477 501
478 New(54,PL_scopestack,16,I32); 502 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 503 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 504 PL_scopestack_max = 16;
481 505
… …
488 PL_retstack_max = 8; 512 PL_retstack_max = 8;
489} 513}
490 514
491/* 515/*
492 * destroy the stacks, the callchain etc... 516 * destroy the stacks, the callchain etc...
493 * still there is a memleak of 128 bytes...
494 */ 517 */
495STATIC void 518STATIC void
496destroy_stacks(pTHX) 519destroy_stacks(pTHX)
497{ 520{
498 if (!IN_DESTRUCT) 521 if (!IN_DESTRUCT)
499 { 522 {
500 /* is this ugly, I ask? */ 523 /* is this ugly, I ask? */
501 while (PL_scopestack_ix) 524 LEAVE_SCOPE (0);
502 LEAVE;
503 525
504 /* sure it is, but more important: is it correct?? :/ */ 526 /* sure it is, but more important: is it correct?? :/ */
505 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
506 FREETMPS; 527 FREETMPS;
507 } 528 }
508 529
509 while (PL_curstackinfo->si_next) 530 while (PL_curstackinfo->si_next)
510 PL_curstackinfo = PL_curstackinfo->si_next; 531 PL_curstackinfo = PL_curstackinfo->si_next;
511 532
… …
554 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);
555 if (stack->sptr == (void *)-1) 576 if (stack->sptr == (void *)-1)
556#endif 577#endif
557 { 578 {
558 /*FIXME*//*D*//* reasonable stack size! */ 579 /*FIXME*//*D*//* reasonable stack size! */
559 stack->ssize = -4096 * sizeof (long); 580 stack->ssize = - (16384 * sizeof (long));
560 New (0, stack->sptr, 4096, long); 581 New (0, stack->sptr, 16384, long);
561 } 582 }
562 } 583 }
563 else 584 else
564 stack->sptr = 0; 585 stack->sptr = 0;
565 586
… …
579 { 600 {
580#ifdef HAVE_MMAP 601#ifdef HAVE_MMAP
581 if (stack->ssize > 0 && stack->sptr) 602 if (stack->ssize > 0 && stack->sptr)
582 munmap (stack->sptr, stack->ssize); 603 munmap (stack->sptr, stack->ssize);
583 else 604 else
584#else 605#endif
585 Safefree (stack->sptr); 606 Safefree (stack->sptr);
586#endif 607
587 Safefree (stack); 608 Safefree (stack);
588 } 609 }
589 else if (ctx->gencnt == stack->gencnt) 610 else if (ctx->gencnt == stack->gencnt)
590 --stack->usecnt; 611 --stack->usecnt;
591 } 612 }
… …
597 /* 618 /*
598 * emulate part of the perl startup here. 619 * emulate part of the perl startup here.
599 */ 620 */
600 dSP; 621 dSP;
601 Coro__State ctx = (Coro__State)arg; 622 Coro__State ctx = (Coro__State)arg;
602 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 623 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
603 624
604 coro_init_stacks (aTHX); 625 coro_init_stacks (aTHX);
605 /*PL_curcop = 0;*/ 626 /*PL_curcop = 0;*/
606 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 627 /*PL_in_eval = PL_in_eval;*/ /* inherit */
607 SvREFCNT_dec (GvAV (PL_defgv)); 628 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = ctx->args; 629 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
609 630
610 SPAGAIN; 631 SPAGAIN;
611 632
612 if (ctx->stack) 633 if (ctx->stack)
613 { 634 {
… …
656 * this is a _very_ stripped down perl interpreter ;) 677 * this is a _very_ stripped down perl interpreter ;)
657 */ 678 */
658 Coro__State ctx = (Coro__State)arg; 679 Coro__State ctx = (Coro__State)arg;
659 JMPENV coro_start_env; 680 JMPENV coro_start_env;
660 681
661 /* same as JMPENV_BOOTSTRAP */
662 Zero(&coro_start_env, 1, JMPENV);
663 coro_start_env.je_ret = -1;
664 coro_start_env.je_mustcatch = TRUE;
665 PL_top_env = &coro_start_env; 682 PL_top_env = &ctx->start_env;
666 683
667 ctx->cursp = 0; 684 ctx->cursp = 0;
668 PL_op = PL_op->op_next; 685 PL_op = PL_op->op_next;
669 CALLRUNOPS(aTHX); 686 CALLRUNOPS(aTHX);
670 687
… …
728 if (!prev->stack) 745 if (!prev->stack)
729 allocate_stack (prev, 0); 746 allocate_stack (prev, 0);
730 747
731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 748 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
732 { 749 {
750 PL_top_env = &next->start_env;
751
733 setup_coro (next); 752 setup_coro (next);
734 753
735 prev->stack->refcnt++; 754 prev->stack->refcnt++;
736 prev->stack->usecnt++; 755 prev->stack->usecnt++;
737 next->stack = prev->stack; 756 next->stack = prev->stack;
738 next->gencnt = prev->gencnt; 757 next->gencnt = prev->gencnt;
739 } 758 }
740 else 759 else
741 { 760 {
761 assert (!next->stack);
742 allocate_stack (next, 1); 762 allocate_stack (next, 1);
743 coro_create (&(next->stack->cctx), 763 coro_create (&(next->stack->cctx),
744 setup_coro, (void *)next, 764 setup_coro, (void *)next,
745 next->stack->sptr, labs (next->stack->ssize)); 765 next->stack->sptr, labs (next->stack->ssize));
746 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 766 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
… …
924 Coro__State coro; 944 Coro__State coro;
925 945
926 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 946 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
927 croak ("Coro::State::_newprocess expects an arrayref"); 947 croak ("Coro::State::_newprocess expects an arrayref");
928 948
929 New (0, coro, 1, struct coro); 949 Newz (0, coro, 1, struct coro);
930 950
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 951 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 952 coro->mainstack = 0; /* actual work is done inside transfer */
933 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;
934 960
935 RETVAL = coro; 961 RETVAL = coro;
936 OUTPUT: 962 OUTPUT:
937 RETVAL 963 RETVAL
938 964
… …
970 996
971 coro->mainstack = 0; 997 coro->mainstack = 0;
972 } 998 }
973 999
974 deallocate_stack (coro); 1000 deallocate_stack (coro);
975 1001 SvREFCNT_dec (coro->args);
976 Safefree (coro); 1002 Safefree (coro);
977
978void
979flush()
980 CODE:
981#ifdef MAY_FLUSH
982 flush_padlist_cache ();
983#endif
984 1003
985void 1004void
986_exit(code) 1005_exit(code)
987 int code 1006 int code
988 PROTOTYPE: $ 1007 PROTOTYPE: $
989 CODE: 1008 CODE:
990#if defined(__GLIBC__) || _POSIX_C_SOURCE
991 _exit (code); 1009 _exit (code);
992#else
993 signal (SIGTERM, SIG_DFL);
994 raise (SIGTERM);
995 exit (code);
996#endif
997 1010
998MODULE = Coro::State PACKAGE = Coro::Cont 1011MODULE = Coro::State PACKAGE = Coro::Cont
999 1012
1000# this is slightly dirty (should expose a c-level api) 1013# this is slightly dirty (should expose a c-level api)
1001 1014
… …
1007 SV *sv; 1020 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1021 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1022 struct coro *prev, *next;
1010 1023
1011 if (!returnstk) 1024 if (!returnstk)
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1025 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1013 1026
1014 /* set up @_ -- ugly */ 1027 /* set up @_ -- ugly */
1015 av_clear (defav); 1028 av_clear (defav);
1016 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
1017 while (items--) 1030 while (items--)
… …
1060 sv_setiv(sv, (IV)&coroapi); 1073 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv); 1074 SvREADONLY_on(sv);
1062 } 1075 }
1063} 1076}
1064 1077
1078#if !PERL_MICRO
1079
1065void 1080void
1066ready(self) 1081ready(self)
1067 SV * self 1082 SV * self
1068 PROTOTYPE: $ 1083 PROTOTYPE: $
1069 CODE: 1084 CODE:
1070 api_ready (self); 1085 api_ready (self);
1086
1087#endif
1071 1088
1072int 1089int
1073nready(...) 1090nready(...)
1074 PROTOTYPE: 1091 PROTOTYPE:
1075 CODE: 1092 CODE:

Diff Legend

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