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.163 by root, Mon Sep 24 18:30:58 2007 UTC vs.
Revision 1.169 by root, Thu Sep 27 16:25:10 2007 UTC

… …
140static AV *av_async_pool; 140static AV *av_async_pool;
141 141
142static struct coro_cctx *cctx_first; 142static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 143static int cctx_count, cctx_idle;
144 144
145enum {
146 CC_MAPPED = 0x01,
147 CC_NOREUSE = 0x02, /* throw this away after tracing */
148 CC_TRACE = 0x04,
149 CC_TRACE_SUB = 0x08, /* trace sub calls */
150 CC_TRACE_LINE = 0x10, /* trace each statement */
151 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
152};
153
145/* this is a structure representing a c-level coroutine */ 154/* this is a structure representing a c-level coroutine */
146typedef struct coro_cctx { 155typedef struct coro_cctx {
147 struct coro_cctx *next; 156 struct coro_cctx *next;
148 157
149 /* the stack */ 158 /* the stack */
… …
157 coro_context cctx; 166 coro_context cctx;
158 167
159#if CORO_USE_VALGRIND 168#if CORO_USE_VALGRIND
160 int valgrind_id; 169 int valgrind_id;
161#endif 170#endif
162 char inuse, mapped; 171 unsigned char flags;
163} coro_cctx; 172} coro_cctx;
164 173
165enum { 174enum {
166 CF_RUNNING = 0x0001, /* coroutine is running */ 175 CF_RUNNING = 0x0001, /* coroutine is running */
167 CF_READY = 0x0002, /* coroutine is ready */ 176 CF_READY = 0x0002, /* coroutine is ready */
… …
289 SvMAGIC (cv) \ 298 SvMAGIC (cv) \
290 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
291 ? SvMAGIC (cv) \ 300 ? SvMAGIC (cv) \
292 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
293 : 0 302 : 0
303
304static struct coro *
305SvSTATE_ (pTHX_ SV *coro)
306{
307 HV *stash;
308 MAGIC *mg;
309
310 if (SvROK (coro))
311 coro = SvRV (coro);
312
313 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash)
315 {
316 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required");
319 }
320
321 mg = CORO_MAGIC (coro);
322 return (struct coro *)mg->mg_ptr;
323}
324
325#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
294 326
295/* the next two functions merely cache the padlists */ 327/* the next two functions merely cache the padlists */
296static void 328static void
297get_padlist (pTHX_ CV *cv) 329get_padlist (pTHX_ CV *cv)
298{ 330{
… …
584 /* 616 /*
585 * emulate part of the perl startup here. 617 * emulate part of the perl startup here.
586 */ 618 */
587 coro_init_stacks (aTHX); 619 coro_init_stacks (aTHX);
588 620
621 PL_runops = RUNOPS_DEFAULT;
589 PL_curcop = &PL_compiling; 622 PL_curcop = &PL_compiling;
590 PL_in_eval = EVAL_NULL; 623 PL_in_eval = EVAL_NULL;
591 PL_comppad = 0; 624 PL_comppad = 0;
592 PL_curpm = 0; 625 PL_curpm = 0;
593 PL_localizing = 0; 626 PL_localizing = 0;
… …
624 SvREFCNT_dec (coro_mortal); 657 SvREFCNT_dec (coro_mortal);
625 coro_mortal = 0; 658 coro_mortal = 0;
626 } 659 }
627} 660}
628 661
662static int
663runops_trace (pTHX)
664{
665 COP *oldcop = 0;
666 int oldcxix = -2;
667 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
668 coro_cctx *cctx = coro->cctx;
669
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 {
672 PERL_ASYNC_CHECK ();
673
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
675 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 {
720 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP;
723 ENTER;
724 SAVETMPS;
725 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT;
727
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
729 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
731
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
733 {
734 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0));
736 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0);
738
739 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes);
741 PUSHs (fullname);
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN;
747 }
748
749 oldcxix = cxstack_ix;
750 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 }
767 }
768 }
769
770 TAINT_NOT;
771 return 0;
772}
773
629/* inject a fake call to Coro::State::_cctx_init into the execution */ 774/* inject a fake call to Coro::State::_cctx_init into the execution */
630/* _cctx_init should be careful, as it could be called at almost any time */ 775/* _cctx_init should be careful, as it could be called at almost any time */
631/* during execution of a perl program */ 776/* during execution of a perl program */
632static void NOINLINE 777static void NOINLINE
633prepare_cctx (pTHX_ coro_cctx *cctx) 778prepare_cctx (pTHX_ coro_cctx *cctx)
634{ 779{
635 dSP; 780 dSP;
636 LOGOP myop; 781 LOGOP myop;
782
783 PL_top_env = &PL_start_env;
784
785 if (cctx->flags & CC_TRACE)
786 PL_runops = runops_trace;
637 787
638 Zero (&myop, 1, LOGOP); 788 Zero (&myop, 1, LOGOP);
639 myop.op_next = PL_op; 789 myop.op_next = PL_op;
640 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 790 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
641 791
… …
658 dTHX; 808 dTHX;
659 809
660 /* coro_run is the alternative tail of transfer(), so unlock here. */ 810 /* coro_run is the alternative tail of transfer(), so unlock here. */
661 UNLOCK; 811 UNLOCK;
662 812
663 PL_top_env = &PL_start_env; 813 /* we now skip the entersub that lead to transfer() */
814 PL_op = PL_op->op_next;
664 815
665 /* inject a fake subroutine call to cctx_init */ 816 /* inject a fake subroutine call to cctx_init */
666 prepare_cctx (aTHX_ (coro_cctx *)arg); 817 prepare_cctx (aTHX_ (coro_cctx *)arg);
667 818
668 /* somebody or something will hit me for both perl_run and PL_restartop */ 819 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
702# if CORO_STACKGUARD 853# if CORO_STACKGUARD
703 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 854 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
704# endif 855# endif
705 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 856 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
706 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 857 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
707 cctx->mapped = 1; 858 cctx->flags |= CC_MAPPED;
708 } 859 }
709 else 860 else
710#endif 861#endif
711 { 862 {
712 cctx->ssize = coro_stacksize * (long)sizeof (long); 863 cctx->ssize = coro_stacksize * (long)sizeof (long);
… …
739#if CORO_USE_VALGRIND 890#if CORO_USE_VALGRIND
740 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 891 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
741#endif 892#endif
742 893
743#if HAVE_MMAP 894#if HAVE_MMAP
744 if (cctx->mapped) 895 if (cctx->flags & CC_MAPPED)
745 munmap (cctx->sptr, cctx->ssize); 896 munmap (cctx->sptr, cctx->ssize);
746 else 897 else
747#endif 898#endif
748 Safefree (cctx->sptr); 899 Safefree (cctx->sptr);
749 900
… …
757 { 908 {
758 coro_cctx *cctx = cctx_first; 909 coro_cctx *cctx = cctx_first;
759 cctx_first = cctx->next; 910 cctx_first = cctx->next;
760 --cctx_idle; 911 --cctx_idle;
761 912
762 if (cctx->ssize >= coro_stacksize) 913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE))
763 return cctx; 914 return cctx;
764 915
765 cctx_destroy (cctx); 916 cctx_destroy (cctx);
766 } 917 }
767 918
768 PL_op = PL_op->op_next;
769 return cctx_new (); 919 return cctx_new ();
770} 920}
771 921
772static void 922static void
773cctx_put (coro_cctx *cctx) 923cctx_put (coro_cctx *cctx)
… …
777 { 927 {
778 coro_cctx *first = cctx_first; 928 coro_cctx *first = cctx_first;
779 cctx_first = first->next; 929 cctx_first = first->next;
780 --cctx_idle; 930 --cctx_idle;
781 931
782 assert (!first->inuse);
783 cctx_destroy (first); 932 cctx_destroy (first);
784 } 933 }
785 934
786 ++cctx_idle; 935 ++cctx_idle;
787 cctx->next = cctx_first; 936 cctx->next = cctx_first;
… …
808 957
809 if (prev->flags & CF_NEW) 958 if (prev->flags & CF_NEW)
810 { 959 {
811 /* create a new empty context */ 960 /* create a new empty context */
812 Newz (0, prev->cctx, 1, coro_cctx); 961 Newz (0, prev->cctx, 1, coro_cctx);
813 prev->cctx->inuse = 1;
814 prev->flags &= ~CF_NEW; 962 prev->flags &= ~CF_NEW;
815 prev->flags |= CF_RUNNING; 963 prev->flags |= CF_RUNNING;
816 } 964 }
817 965
818 /*TODO: must not croak here */ 966 /*TODO: must not croak here */
… …
836 next->flags &= ~CF_NEW; 984 next->flags &= ~CF_NEW;
837 /* first get rid of the old state */ 985 /* first get rid of the old state */
838 save_perl (aTHX_ prev); 986 save_perl (aTHX_ prev);
839 /* setup coroutine call */ 987 /* setup coroutine call */
840 setup_coro (aTHX_ next); 988 setup_coro (aTHX_ next);
841 /* need a new stack */
842 assert (!next->cctx);
843 } 989 }
844 else 990 else
845 { 991 {
846 /* coroutine already started */ 992 /* coroutine already started */
847 save_perl (aTHX_ prev); 993 save_perl (aTHX_ prev);
… …
849 } 995 }
850 996
851 prev__cctx = prev->cctx; 997 prev__cctx = prev->cctx;
852 998
853 /* possibly "free" the cctx */ 999 /* possibly "free" the cctx */
854 if (prev__cctx->idle_sp == STACKLEVEL) 1000 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
855 { 1001 {
856 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1002 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
857 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1003 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
858 1004
859 prev->cctx = 0; 1005 prev->cctx = 0;
860 1006
861 cctx_put (prev__cctx); 1007 cctx_put (prev__cctx);
862 prev__cctx->inuse = 0;
863 } 1008 }
864 1009
865 if (!next->cctx) 1010 if (!next->cctx)
866 {
867 next->cctx = cctx_get (aTHX); 1011 next->cctx = cctx_get (aTHX);
868 assert (!next->cctx->inuse);
869 next->cctx->inuse = 1;
870 }
871 1012
872 if (prev__cctx != next->cctx) 1013 if (prev__cctx != next->cctx)
873 { 1014 {
874 prev__cctx->top_env = PL_top_env; 1015 prev__cctx->top_env = PL_top_env;
875 PL_top_env = next->cctx->top_env; 1016 PL_top_env = next->cctx->top_env;
… …
977#else 1118#else
978# define MGf_DUP 0 1119# define MGf_DUP 0
979#endif 1120#endif
980}; 1121};
981 1122
982static struct coro *
983SvSTATE_ (pTHX_ SV *coro)
984{
985 HV *stash;
986 MAGIC *mg;
987
988 if (SvROK (coro))
989 coro = SvRV (coro);
990
991 stash = SvSTASH (coro);
992 if (stash != coro_stash && stash != coro_state_stash)
993 {
994 /* very slow, but rare, check */
995 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
996 croak ("Coro::State object required");
997 }
998
999 mg = CORO_MAGIC (coro);
1000 return (struct coro *)mg->mg_ptr;
1001}
1002
1003#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1004
1005static void 1123static void
1006prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1124prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1007{ 1125{
1008 ta->prev = SvSTATE (prev_sv); 1126 ta->prev = SvSTATE (prev_sv);
1009 ta->next = SvSTATE (next_sv); 1127 ta->next = SvSTATE (next_sv);
… …
1219#endif 1337#endif
1220 BOOT_PAGESIZE; 1338 BOOT_PAGESIZE;
1221 1339
1222 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1340 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1223 1341
1342 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1343 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1344 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1345 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1346
1224 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1347 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1225 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1348 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1226 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1349 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1227 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1350 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1228 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH)); 1351 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
… …
1379 if (coro->hv) 1502 if (coro->hv)
1380 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 1503 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1381} 1504}
1382 1505
1383void 1506void
1384_eval (Coro::State coro, SV *coderef) 1507call (Coro::State coro, SV *coderef)
1508 ALIAS:
1509 eval = 1
1385 CODE: 1510 CODE:
1386{ 1511{
1387 if (coro->mainstack) 1512 if (coro->mainstack)
1388 { 1513 {
1389 struct coro temp; 1514 struct coro temp;
… …
1400 dSP; 1525 dSP;
1401 ENTER; 1526 ENTER;
1402 SAVETMPS; 1527 SAVETMPS;
1403 PUSHMARK (SP); 1528 PUSHMARK (SP);
1404 PUTBACK; 1529 PUTBACK;
1530 if (ix)
1531 eval_sv (coderef, 0);
1532 else
1405 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1533 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1406 SPAGAIN; 1534 SPAGAIN;
1407 FREETMPS; 1535 FREETMPS;
1408 LEAVE; 1536 LEAVE;
1409 PUTBACK; 1537 PUTBACK;
1410 } 1538 }
… …
1428 CODE: 1556 CODE:
1429 RETVAL = boolSV (coro->flags & ix); 1557 RETVAL = boolSV (coro->flags & ix);
1430 OUTPUT: 1558 OUTPUT:
1431 RETVAL 1559 RETVAL
1432 1560
1561void
1562trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB)
1563 CODE:
1564 if (flags & CC_TRACE)
1565 {
1566 if (!coro->cctx)
1567 coro->cctx = cctx_new ();
1568 else if (!(coro->cctx->flags & CC_TRACE))
1569 croak ("cannot enable tracing on coroutine with custom stack");
1570
1571 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1572 }
1573 else
1574 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1575 {
1576 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1577 coro->cctx->flags |= CC_NOREUSE;
1578
1579 if (coro->flags & CF_RUNNING)
1580 PL_runops = RUNOPS_DEFAULT;
1581 else
1582 coro->runops = RUNOPS_DEFAULT;
1583 }
1584
1433SV * 1585SV *
1434has_stack (Coro::State coro) 1586has_stack (Coro::State coro)
1435 PROTOTYPE: $ 1587 PROTOTYPE: $
1436 CODE: 1588 CODE:
1437 RETVAL = boolSV (!!coro->cctx); 1589 RETVAL = boolSV (!!coro->cctx);
1590 OUTPUT:
1591 RETVAL
1592
1593int
1594is_traced (Coro::State coro)
1595 PROTOTYPE: $
1596 CODE:
1597 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1438 OUTPUT: 1598 OUTPUT:
1439 RETVAL 1599 RETVAL
1440 1600
1441IV 1601IV
1442rss (Coro::State coro) 1602rss (Coro::State coro)

Diff Legend

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