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.28 by root, Sat Aug 25 21:32:05 2001 UTC vs.
Revision 1.44 by root, Sat Mar 22 18:50:32 2003 UTC

… …
7#include <signal.h> 7#include <signal.h>
8 8
9#ifdef HAVE_MMAP 9#ifdef HAVE_MMAP
10# include <unistd.h> 10# include <unistd.h>
11# include <sys/mman.h> 11# include <sys/mman.h>
12# ifndef MAP_ANON
13# ifdef MAP_ANONYMOUS 12# ifndef MAP_ANONYMOUS
14# define MAP_ANON MAP_ANONYMOUS 13# ifdef MAP_ANON
14# define MAP_ANONYMOUS MAP_ANON
15# else 15# else
16# undef HAVE_MMAP 16# undef HAVE_MMAP
17# endif 17# endif
18# endif 18# endif
19#endif 19#endif
… …
25 25
26/* The next macro should declare a variable stacklevel that contains and approximation 26/* 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 27 * to the current C stack pointer. Its property is that it changes with each call
28 * and should be unique. */ 28 * and should be unique. */
29#define dSTACKLEVEL void *stacklevel = &stacklevel 29#define dSTACKLEVEL void *stacklevel = &stacklevel
30
31#define IN_DESTRUCT (PL_main_cv == Nullcv)
30 32
31#define labs(l) ((l) >= 0 ? (l) : -(l)) 33#define labs(l) ((l) >= 0 ? (l) : -(l))
32 34
33#include "CoroAPI.h" 35#include "CoroAPI.h"
34 36
… …
66 AV *curstack; 68 AV *curstack;
67 AV *mainstack; 69 AV *mainstack;
68 SV **stack_sp; 70 SV **stack_sp;
69 OP *op; 71 OP *op;
70 SV **curpad; 72 SV **curpad;
73 AV *comppad;
71 SV **stack_base; 74 SV **stack_base;
72 SV **stack_max; 75 SV **stack_max;
73 SV **tmps_stack; 76 SV **tmps_stack;
74 I32 tmps_floor; 77 I32 tmps_floor;
75 I32 tmps_ix; 78 I32 tmps_ix;
… …
99static AV *main_mainstack; /* used to differentiate between $main and others */ 102static AV *main_mainstack; /* used to differentiate between $main and others */
100static HV *coro_state_stash; 103static HV *coro_state_stash;
101static SV *ucoro_state_sv; 104static SV *ucoro_state_sv;
102static U32 ucoro_state_hash; 105static U32 ucoro_state_hash;
103static HV *padlist_cache; 106static HV *padlist_cache;
107static SV *coro_mortal; /* will be freed after next transfer */
104 108
105/* mostly copied from op.c:cv_clone2 */ 109/* mostly copied from op.c:cv_clone2 */
106STATIC AV * 110STATIC AV *
107clone_padlist (AV *protopadlist) 111clone_padlist (AV *protopadlist)
108{ 112{
… …
287 PL_curstack = c->curstack; 291 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 292 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 293 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 294 PL_op = c->op;
291 PL_curpad = c->curpad; 295 PL_curpad = c->curpad;
296 PL_comppad = c->comppad;
292 PL_stack_base = c->stack_base; 297 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 298 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 299 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 300 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 301 PL_tmps_ix = c->tmps_ix;
… …
355 360
356 PUSHs (Nullsv); 361 PUSHs (Nullsv);
357 /* this loop was inspired by pp_caller */ 362 /* this loop was inspired by pp_caller */
358 for (;;) 363 for (;;)
359 { 364 {
360 do 365 while (cxix >= 0)
361 { 366 {
362 PERL_CONTEXT *cx = &ccstk[cxix--]; 367 PERL_CONTEXT *cx = &ccstk[cxix--];
363 368
364 if (CxTYPE(cx) == CXt_SUB) 369 if (CxTYPE(cx) == CXt_SUB)
365 { 370 {
… …
391 /* I never used formats, so how should I know how these are implemented? */ 396 /* I never used formats, so how should I know how these are implemented? */
392 /* my bold guess is as a simple, plain sub... */ 397 /* my bold guess is as a simple, plain sub... */
393 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 398 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
394 } 399 }
395 } 400 }
396 while (cxix >= 0);
397 401
398 if (top_si->si_type == PERLSI_MAIN) 402 if (top_si->si_type == PERLSI_MAIN)
399 break; 403 break;
400 404
401 top_si = top_si->si_prev; 405 top_si = top_si->si_prev;
… …
417 c->curstack = PL_curstack; 421 c->curstack = PL_curstack;
418 c->mainstack = PL_mainstack; 422 c->mainstack = PL_mainstack;
419 c->stack_sp = PL_stack_sp; 423 c->stack_sp = PL_stack_sp;
420 c->op = PL_op; 424 c->op = PL_op;
421 c->curpad = PL_curpad; 425 c->curpad = PL_curpad;
426 c->comppad = PL_comppad;
422 c->stack_base = PL_stack_base; 427 c->stack_base = PL_stack_base;
423 c->stack_max = PL_stack_max; 428 c->stack_max = PL_stack_max;
424 c->tmps_stack = PL_tmps_stack; 429 c->tmps_stack = PL_tmps_stack;
425 c->tmps_floor = PL_tmps_floor; 430 c->tmps_floor = PL_tmps_floor;
426 c->tmps_ix = PL_tmps_ix; 431 c->tmps_ix = PL_tmps_ix;
… …
488 * still there is a memleak of 128 bytes... 493 * still there is a memleak of 128 bytes...
489 */ 494 */
490STATIC void 495STATIC void
491destroy_stacks(pTHX) 496destroy_stacks(pTHX)
492{ 497{
498 if (!IN_DESTRUCT)
499 {
493 /* is this ugly, I ask? */ 500 /* is this ugly, I ask? */
494 while (PL_scopestack_ix) 501 while (PL_scopestack_ix)
495 LEAVE; 502 LEAVE;
496 503
497 /* sure it is, but more important: is it correct?? :/ */ 504 /* sure it is, but more important: is it correct?? :/ */
498 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */ 505 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
499 FREETMPS; 506 FREETMPS;
507 }
500 508
501 while (PL_curstackinfo->si_next) 509 while (PL_curstackinfo->si_next)
502 PL_curstackinfo = PL_curstackinfo->si_next; 510 PL_curstackinfo = PL_curstackinfo->si_next;
503 511
504 while (PL_curstackinfo) 512 while (PL_curstackinfo)
… …
509 dSP; 517 dSP;
510 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 518 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
511 PUTBACK; /* possibly superfluous */ 519 PUTBACK; /* possibly superfluous */
512 } 520 }
513 521
514 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 522 if (!IN_DESTRUCT)
523 {
515 dounwind(-1); 524 dounwind(-1);
516
517 SvREFCNT_dec(PL_curstackinfo->si_stack); 525 SvREFCNT_dec(PL_curstackinfo->si_stack);
526 }
527
518 Safefree(PL_curstackinfo->si_cxstack); 528 Safefree(PL_curstackinfo->si_cxstack);
519 Safefree(PL_curstackinfo); 529 Safefree(PL_curstackinfo);
520 PL_curstackinfo = p; 530 PL_curstackinfo = p;
521 } 531 }
522 532
… …
537 stack->refcnt = 1; 547 stack->refcnt = 1;
538 stack->usecnt = 1; 548 stack->usecnt = 1;
539 stack->gencnt = ctx->gencnt = 0; 549 stack->gencnt = ctx->gencnt = 0;
540 if (alloc) 550 if (alloc)
541 { 551 {
542#ifdef HAVE_MMAP 552#if HAVE_MMAP
543 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 553 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */
544 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 554 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
545 if (stack->sptr == (void *)-1) 555 if (stack->sptr == (void *)-1)
546#endif 556#endif
547 { 557 {
548 /*FIXME*//*D*//* reasonable stack size! */ 558 /*FIXME*//*D*//* reasonable stack size! */
549 stack->ssize = -4096 * sizeof (long); 559 stack->ssize = -4096 * sizeof (long);
… …
563 573
564 ctx->stack = 0; 574 ctx->stack = 0;
565 575
566 if (stack) 576 if (stack)
567 { 577 {
568 printf ("deallocating stack %p %d\n", stack, stack->refcnt);/*D*/
569 if (!--stack->refcnt) 578 if (!--stack->refcnt)
570 { 579 {
571#ifdef HAVE_MMAP 580#ifdef HAVE_MMAP
572 if (stack->ssize > 0 && stack->sptr) 581 if (stack->ssize > 0 && stack->sptr)
573 munmap (stack->sptr, stack->ssize); 582 munmap (stack->sptr, stack->ssize);
… …
631 * that doesn't matter, though, since it is only 640 * that doesn't matter, though, since it is only
632 * pp_nextstate and we never return... 641 * pp_nextstate and we never return...
633 * ah yes, and I don't care anyways ;) 642 * ah yes, and I don't care anyways ;)
634 */ 643 */
635 PUTBACK; 644 PUTBACK;
636 PL_op = pp_entersub(); 645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
637 SPAGAIN; 646 SPAGAIN;
638 647
639 ENTER; /* necessary e.g. for dounwind */ 648 ENTER; /* necessary e.g. for dounwind */
640 } 649 }
641} 650}
… …
645{ 654{
646 /* 655 /*
647 * this is a _very_ stripped down perl interpreter ;) 656 * this is a _very_ stripped down perl interpreter ;)
648 */ 657 */
649 Coro__State ctx = (Coro__State)arg; 658 Coro__State ctx = (Coro__State)arg;
659 JMPENV coro_start_env;
650 660
651 /*FIXME*//* must set up top_env here */ 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;
666
652 ctx->cursp = 0; 667 ctx->cursp = 0;
653 PL_op = PL_op->op_next; 668 PL_op = PL_op->op_next;
654 CALLRUNOPS(aTHX); 669 CALLRUNOPS(aTHX);
655 670
656 abort (); 671 abort ();
… …
660transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 675transfer(pTHX_ struct coro *prev, struct coro *next, int flags)
661{ 676{
662 dSTACKLEVEL; 677 dSTACKLEVEL;
663 static struct coro *xnext; 678 static struct coro *xnext;
664 679
665 printf ("%p => %p\n", prev, next);/*D*/
666 if (prev != next) 680 if (prev != next)
667 { 681 {
668 xnext = next; 682 xnext = next;
669 683
670 if (next->mainstack) 684 if (next->mainstack)
… …
734 } 748 }
735 } 749 }
736 else 750 else
737 setup_coro (next); 751 setup_coro (next);
738 } 752 }
739 }
740 753
754 /*
755 * xnext is now either prev or next, depending on wether
756 * we switched the c stack or not. that's why I use a global
757 * variable, that should become thread-specific at one point.
758 */
741 xnext->cursp = stacklevel; 759 xnext->cursp = stacklevel;
742}
743
744static struct coro *
745sv_to_coro (SV *arg, const char *funcname, const char *varname)
746{
747 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
748 { 760 }
761
762 if (coro_mortal)
763 {
764 SvREFCNT_dec (coro_mortal);
765 coro_mortal = 0;
766 }
767}
768
769#define SV_CORO(sv,func) \
770 do { \
771 if (SvROK (sv)) \
772 sv = SvRV (sv); \
773 \
774 if (SvTYPE(sv) == SVt_PVHV) \
775 { \
749 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 776 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
750 777 \
751 if (!he) 778 if (!he) \
752 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname); 779 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
753 780 \
754 arg = HeVAL(he); 781 (sv) = SvRV (HeVAL(he)); \
755 } 782 } \
756 783 \
757 /* must also be changed inside Coro::Cont::yield */ 784 /* must also be changed inside Coro::Cont::yield */ \
758 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 785 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
759 return (struct coro *) SvIV((SV*)SvRV(arg));
760
761 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 786 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
762 /*NORETURN*/ 787 \
763} 788 } while(0)
789
790#define SvSTATE(sv) (struct coro *)SvIV (sv)
764 791
765static void 792static void
766api_transfer(pTHX_ SV *prev, SV *next, int flags) 793api_transfer(pTHX_ SV *prev, SV *next, int flags)
767{ 794{
768 transfer(aTHX_ 795 SV_CORO (prev, "Coro::transfer");
769 sv_to_coro (prev, "Coro::transfer", "prev"), 796 SV_CORO (next, "Coro::transfer");
770 sv_to_coro (next, "Coro::transfer", "next"), 797
771 flags); 798 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
772} 799}
773 800
774/** Coro ********************************************************************/ 801/** Coro ********************************************************************/
775 802
776#define PRIO_MAX 3 803#define PRIO_MAX 3
… …
786static int coro_nready; 813static int coro_nready;
787 814
788static void 815static void
789coro_enq (SV *sv) 816coro_enq (SV *sv)
790{ 817{
791 if (SvROK (sv))
792 {
793 SV *hv = SvRV (sv);
794 if (SvTYPE (hv) == SVt_PVHV) 818 if (SvTYPE (sv) == SVt_PVHV)
795 { 819 {
796 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 820 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
797 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 821 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
798 822
799 prio = prio > PRIO_MAX ? PRIO_MAX 823 prio = prio > PRIO_MAX ? PRIO_MAX
800 : prio < PRIO_MIN ? PRIO_MIN 824 : prio < PRIO_MIN ? PRIO_MIN
801 : prio; 825 : prio;
802 826
803 av_push (coro_ready [prio - PRIO_MIN], sv); 827 av_push (coro_ready [prio - PRIO_MIN], sv);
804 coro_nready++; 828 coro_nready++;
805 829
806 return; 830 return;
807 }
808 } 831 }
809 832
810 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 833 croak ("Coro::ready tried to enqueue something that is not a coroutine");
811} 834}
812 835
… …
830} 853}
831 854
832static void 855static void
833api_ready (SV *coro) 856api_ready (SV *coro)
834{ 857{
858 if (SvROK (coro))
859 coro = SvRV (coro);
860
835 coro_enq (SvREFCNT_inc (coro)); 861 coro_enq (SvREFCNT_inc (coro));
836} 862}
837 863
838static void 864static void
839api_schedule (int cede) 865api_schedule (void)
840{ 866{
841 SV *prev, *next; 867 SV *prev, *next;
842 868
843 prev = GvSV (coro_current); 869 prev = SvRV (GvSV (coro_current));
844
845 if (cede)
846 coro_enq (SvREFCNT_inc (prev));
847
848 next = coro_deq (PRIO_MIN); 870 next = coro_deq (PRIO_MIN);
849 871
850 if (!next) 872 if (!next)
851 next = SvREFCNT_inc (GvSV (coro_idle)); 873 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
852 874
853 GvSV (coro_current) = SvREFCNT_inc (next); 875 /* free this only after the transfer */
854 transfer (aTHX_ 876 coro_mortal = prev;
855 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 877 SV_CORO (prev, "Coro::schedule");
856 sv_to_coro (next, "Coro::schedule", "next coroutine"), 878
879 SvRV (GvSV (coro_current)) = next;
880
881 SV_CORO (next, "Coro::schedule");
882
883 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
857 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 884 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
858 SvREFCNT_dec (next); 885}
859 SvREFCNT_dec (prev); 886
887static void
888api_cede (void)
889{
890 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
891
892 api_schedule ();
860} 893}
861 894
862MODULE = Coro::State PACKAGE = Coro::State 895MODULE = Coro::State PACKAGE = Coro::State
863 896
864PROTOTYPES: ENABLE 897PROTOTYPES: ENABLE
… …
903 OUTPUT: 936 OUTPUT:
904 RETVAL 937 RETVAL
905 938
906void 939void
907transfer(prev, next, flags) 940transfer(prev, next, flags)
908 Coro::State_or_hashref prev 941 SV *prev
909 Coro::State_or_hashref next 942 SV *next
910 int flags 943 int flags
911 PROTOTYPE: @ 944 PROTOTYPE: @
912 CODE: 945 CODE:
913 PUTBACK; 946 PUTBACK;
947 SV_CORO (next, "Coro::transfer");
948 SV_CORO (prev, "Coro::transfer");
914 transfer (aTHX_ prev, next, flags); 949 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
915 SPAGAIN; 950 SPAGAIN;
916 951
917void 952void
918DESTROY(coro) 953DESTROY(coro)
919 Coro::State coro 954 Coro::State coro
… …
1014 1049
1015 { 1050 {
1016 SV *sv = perl_get_sv("Coro::API", 1); 1051 SV *sv = perl_get_sv("Coro::API", 1);
1017 1052
1018 coroapi.schedule = api_schedule; 1053 coroapi.schedule = api_schedule;
1054 coroapi.cede = api_cede;
1019 coroapi.ready = api_ready; 1055 coroapi.ready = api_ready;
1020 coroapi.nready = &coro_nready; 1056 coroapi.nready = &coro_nready;
1021 coroapi.current = coro_current; 1057 coroapi.current = coro_current;
1022 1058
1023 GCoroAPI = &coroapi; 1059 GCoroAPI = &coroapi;
… …
1027} 1063}
1028 1064
1029void 1065void
1030ready(self) 1066ready(self)
1031 SV * self 1067 SV * self
1068 PROTOTYPE: $
1032 CODE: 1069 CODE:
1033 api_ready (self); 1070 api_ready (self);
1034 1071
1035int 1072int
1036nready(...) 1073nready(...)
… …
1041 RETVAL 1078 RETVAL
1042 1079
1043void 1080void
1044schedule(...) 1081schedule(...)
1045 PROTOTYPE: 1082 PROTOTYPE:
1046 ALIAS:
1047 cede = 1
1048 CODE: 1083 CODE:
1049 api_schedule (ix); 1084 api_schedule ();
1050 1085
1086void
1087cede(...)
1088 PROTOTYPE:
1089 CODE:
1090 api_cede ();
1091

Diff Legend

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