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.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.321 by root, Sat Nov 22 02:09:54 2008 UTC

1#define CORO_CLONE 1 //D
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
55 57
56#define PERL_VERSION_ATLEAST(a,b,c) \ 58#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 59 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 60 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 61 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 62 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 63
62#if !PERL_VERSION_ATLEAST (5,6,0) 64#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 65# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 66# define PL_ppaddr ppaddr
65# endif 67# endif
98# define newSV(l) NEWSV(0,l) 100# define newSV(l) NEWSV(0,l)
99#endif 101#endif
100#ifndef CvISXSUB_on 102#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 103# define CvISXSUB_on(cv) (void)cv
102#endif 104#endif
105#ifndef CvISXSUB
106# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
107#endif
108#ifndef Newx
109# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
110#endif
103 111
104/* 5.8.7 */ 112/* 5.8.7 */
105#ifndef SvRV_set 113#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 114# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 115#endif
167static AV *main_mainstack; /* used to differentiate between $main and others */ 175static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 176static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 177static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 178static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 179
180static AV *av_destroy; /* destruction queue */
181static SV *sv_manager; /* the manager coro */
182
172static GV *irsgv; /* $/ */ 183static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 184static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 185static SV *rv_diehook;
175static SV *rv_warnhook; 186static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 187static HV *hv_sig; /* %SIG */
177 188
178/* async_pool helper stuff */ 189/* async_pool helper stuff */
179static SV *sv_pool_rss; 190static SV *sv_pool_rss;
180static SV *sv_pool_size; 191static SV *sv_pool_size;
192static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 193static AV *av_async_pool; /* idle pool */
194static SV *sv_Coro; /* class string */
195static CV *cv_pool_handler;
196static CV *cv_coro_state_new;
182 197
183/* Coro::AnyEvent */ 198/* Coro::AnyEvent */
184static SV *sv_activity; 199static SV *sv_activity;
185 200
186static struct coro_cctx *cctx_first; 201static struct coro_cctx *cctx_first;
263 SV *except; /* exception to be thrown */ 278 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 279 SV *rouse_cb;
265 280
266 /* async_pool */ 281 /* async_pool */
267 SV *saved_deffh; 282 SV *saved_deffh;
283 SV *invoke_cb;
284 AV *invoke_av;
268 285
269 /* linked list */ 286 /* linked list */
270 struct coro *next, *prev; 287 struct coro *next, *prev;
271}; 288};
272 289
289 306
290/* for Coro.pm */ 307/* for Coro.pm */
291static SV *coro_current; 308static SV *coro_current;
292static SV *coro_readyhook; 309static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 310static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
311static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 312static struct coro *coro_first;
295#define coro_nready coroapi.nready 313#define coro_nready coroapi.nready
296 314
297/** lowlevel stuff **********************************************************/ 315/** lowlevel stuff **********************************************************/
298 316
326 return get_hv (name, create); 344 return get_hv (name, create);
327} 345}
328 346
329/* may croak */ 347/* may croak */
330INLINE CV * 348INLINE CV *
331coro_sv_2cv (SV *sv) 349coro_sv_2cv (pTHX_ SV *sv)
332{ 350{
333 HV *st; 351 HV *st;
334 GV *gvp; 352 GV *gvp;
335 return sv_2cv (sv, &st, &gvp, 0); 353 return sv_2cv (sv, &st, &gvp, 0);
336} 354}
337 355
338static AV * 356static AV *
339coro_clone_padlist (pTHX_ CV *cv) 357coro_derive_padlist (pTHX_ CV *cv)
340{ 358{
341 AV *padlist = CvPADLIST (cv); 359 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 360 AV *newpadlist, *newpad;
343 361
344 newpadlist = newAV (); 362 newpadlist = newAV ();
464 CV *cp = Perl_cv_clone (aTHX_ cv); 482 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 483 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 484 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 485 SvREFCNT_dec (cp);
468#else 486#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 487 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 488#endif
471 } 489 }
472} 490}
473 491
474static void 492static void
686#if !PERL_VERSION_ATLEAST (5,10,0) 704#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 705 Safefree (PL_retstack);
688#endif 706#endif
689} 707}
690 708
709#define CORO_RSS \
710 rss += sizeof (SYM (curstackinfo)); \
711 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
712 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
713 rss += SYM (tmps_max) * sizeof (SV *); \
714 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
715 rss += SYM (scopestack_max) * sizeof (I32); \
716 rss += SYM (savestack_max) * sizeof (ANY);
717
691static size_t 718static size_t
692coro_rss (pTHX_ struct coro *coro) 719coro_rss (pTHX_ struct coro *coro)
693{ 720{
694 size_t rss = sizeof (*coro); 721 size_t rss = sizeof (*coro);
695 722
696 if (coro->mainstack) 723 if (coro->mainstack)
697 { 724 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 725 if (coro->flags & CF_RUNNING)
702 { 726 {
703 slot = &tmp_slot; 727 #define SYM(sym) PL_ ## sym
704 728 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 729 #undef SYM
708 } 730 }
709 else 731 else
710 slot = coro->slot;
711
712 if (slot)
713 { 732 {
714 rss += sizeof (slot->curstackinfo); 733 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 734 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 735 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 736 }
726 } 737 }
727 738
728 return rss; 739 return rss;
729} 740}
831slf_check_nop (pTHX_ struct CoroSLF *frame) 842slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 843{
833 return 0; 844 return 0;
834} 845}
835 846
847static int
848slf_check_repeat (pTHX_ struct CoroSLF *frame)
849{
850 return 1;
851}
852
836static UNOP coro_setup_op; 853static UNOP coro_setup_op;
837 854
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 855static void NOINLINE /* noinline to keep it out of the transfer fast path */
839coro_setup (pTHX_ struct coro *coro) 856coro_setup (pTHX_ struct coro *coro)
840{ 857{
871 dSP; 888 dSP;
872 UNOP myop; 889 UNOP myop;
873 890
874 Zero (&myop, 1, UNOP); 891 Zero (&myop, 1, UNOP);
875 myop.op_next = Nullop; 892 myop.op_next = Nullop;
893 myop.op_type = OP_ENTERSUB;
876 myop.op_flags = OPf_WANT_VOID; 894 myop.op_flags = OPf_WANT_VOID;
877 895
878 PUSHMARK (SP); 896 PUSHMARK (SP);
879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 897 PUSHs ((SV *)coro->startcv);
880 PUTBACK; 898 PUTBACK;
881 PL_op = (OP *)&myop; 899 PL_op = (OP *)&myop;
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 900 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN;
884 } 901 }
885 902
886 /* this newly created coroutine might be run on an existing cctx which most 903 /* this newly created coroutine might be run on an existing cctx which most
887 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 904 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 */ 905 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 906 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 907 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 908
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 909 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 910 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 911 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 912 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags required, as an init function won't be called */ 913 /* no flags etc. required, as an init function won't be called */
897 914
898 PL_op = (OP *)&coro_setup_op; 915 PL_op = (OP *)&coro_setup_op;
899 916
900 /* copy throw, in case it was set before coro_setup */ 917 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 918 CORO_THROW = coro->except;
929 SvREFCNT_dec (GvSV (irsgv)); 946 SvREFCNT_dec (GvSV (irsgv));
930 947
931 SvREFCNT_dec (PL_diehook); 948 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook); 949 SvREFCNT_dec (PL_warnhook);
933 950
934 SvREFCNT_dec (CORO_THROW);
935 SvREFCNT_dec (coro->saved_deffh); 951 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 952 SvREFCNT_dec (coro->rouse_cb);
953 SvREFCNT_dec (coro->invoke_cb);
954 SvREFCNT_dec (coro->invoke_av);
937 955
938 coro_destruct_stacks (aTHX); 956 coro_destruct_stacks (aTHX);
939} 957}
940 958
941INLINE void 959INLINE void
1013 { 1031 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1033
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1035 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1036 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1037 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1038 SV *fullname = sv_2mortal (newSV (0));
1022 1039
1023 if (isGV (gv)) 1040 if (isGV (gv))
1144 transfer_tail (aTHX); 1161 transfer_tail (aTHX);
1145 1162
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1163 /* somebody or something will hit me for both perl_run and PL_restartop */
1147 PL_restartop = PL_op; 1164 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1165 perl_run (PL_curinterp);
1166 /*
1167 * Unfortunately, there is no way to get at the return values of the
1168 * coro body here, as perl_run destroys these
1169 */
1149 1170
1150 /* 1171 /*
1151 * If perl-run returns we assume exit() was being called or the coro 1172 * If perl-run returns we assume exit() was being called or the coro
1152 * fell off the end, which seems to be the only valid (non-bug) 1173 * fell off the end, which seems to be the only valid (non-bug)
1153 * reason for perl_run to return. We try to exit by jumping to the 1174 * reason for perl_run to return. We try to exit by jumping to the
1447 } 1468 }
1448 1469
1449 cctx_destroy (coro->cctx); 1470 cctx_destroy (coro->cctx);
1450 SvREFCNT_dec (coro->startcv); 1471 SvREFCNT_dec (coro->startcv);
1451 SvREFCNT_dec (coro->args); 1472 SvREFCNT_dec (coro->args);
1473 SvREFCNT_dec (CORO_THROW);
1452 1474
1453 if (coro->next) coro->next->prev = coro->prev; 1475 if (coro->next) coro->next->prev = coro->prev;
1454 if (coro->prev) coro->prev->next = coro->next; 1476 if (coro->prev) coro->prev->next = coro->next;
1455 if (coro == coro_first) coro_first = coro->next; 1477 if (coro == coro_first) coro_first = coro->next;
1456 1478
1603api_is_ready (pTHX_ SV *coro_sv) 1625api_is_ready (pTHX_ SV *coro_sv)
1604{ 1626{
1605 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1627 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606} 1628}
1607 1629
1630/* expects to own a reference to next->hv */
1608INLINE void 1631INLINE void
1632prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1633{
1634 SV *prev_sv = SvRV (coro_current);
1635
1636 ta->prev = SvSTATE_hv (prev_sv);
1637 ta->next = next;
1638
1639 TRANSFER_CHECK (*ta);
1640
1641 SvRV_set (coro_current, (SV *)next->hv);
1642
1643 free_coro_mortal (aTHX);
1644 coro_mortal = prev_sv;
1645}
1646
1647static void
1609prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1648prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1610{ 1649{
1611 SV *prev_sv, *next_sv;
1612
1613 for (;;) 1650 for (;;)
1614 { 1651 {
1615 next_sv = coro_deq (aTHX); 1652 SV *next_sv = coro_deq (aTHX);
1616 1653
1617 /* nothing to schedule: call the idle handler */
1618 if (expect_false (!next_sv)) 1654 if (expect_true (next_sv))
1619 { 1655 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1661 else
1662 {
1663 next->flags &= ~CF_READY;
1664 --coro_nready;
1665
1666 prepare_schedule_to (aTHX_ ta, next);
1667 break;
1668 }
1669 }
1670 else
1671 {
1672 /* nothing to schedule: call the idle handler */
1620 dSP; 1673 dSP;
1621 1674
1622 ENTER; 1675 ENTER;
1623 SAVETMPS; 1676 SAVETMPS;
1624 1677
1626 PUTBACK; 1679 PUTBACK;
1627 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1628 1681
1629 FREETMPS; 1682 FREETMPS;
1630 LEAVE; 1683 LEAVE;
1631 continue;
1632 } 1684 }
1633
1634 ta->next = SvSTATE_hv (next_sv);
1635
1636 /* cannot transfer to destroyed coros, skip and look for next */
1637 if (expect_false (ta->next->flags & CF_DESTROYED))
1638 {
1639 SvREFCNT_dec (next_sv);
1640 /* coro_nready has already been taken care of by destroy */
1641 continue;
1642 }
1643
1644 --coro_nready;
1645 break;
1646 } 1685 }
1647
1648 /* free this only after the transfer */
1649 prev_sv = SvRV (coro_current);
1650 ta->prev = SvSTATE_hv (prev_sv);
1651 TRANSFER_CHECK (*ta);
1652 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1653 ta->next->flags &= ~CF_READY;
1654 SvRV_set (coro_current, next_sv);
1655
1656 free_coro_mortal (aTHX);
1657 coro_mortal = prev_sv;
1658} 1686}
1659 1687
1660INLINE void 1688INLINE void
1661prepare_cede (pTHX_ struct coro_transfer_args *ta) 1689prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662{ 1690{
1683{ 1711{
1684 struct coro_transfer_args ta; 1712 struct coro_transfer_args ta;
1685 1713
1686 prepare_schedule (aTHX_ &ta); 1714 prepare_schedule (aTHX_ &ta);
1687 TRANSFER (ta, 1); 1715 TRANSFER (ta, 1);
1716}
1717
1718static void
1719api_schedule_to (pTHX_ SV *coro_sv)
1720{
1721 struct coro_transfer_args ta;
1722 struct coro *next = SvSTATE (coro_sv);
1723
1724 SvREFCNT_inc_NN (coro_sv);
1725 prepare_schedule_to (aTHX_ &ta, next);
1688} 1726}
1689 1727
1690static int 1728static int
1691api_cede (pTHX) 1729api_cede (pTHX)
1692{ 1730{
1741 else 1779 else
1742 coro->slot->runops = RUNOPS_DEFAULT; 1780 coro->slot->runops = RUNOPS_DEFAULT;
1743 } 1781 }
1744} 1782}
1745 1783
1784static void
1785coro_call_on_destroy (pTHX_ struct coro *coro)
1786{
1787 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1788 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1789
1790 if (on_destroyp)
1791 {
1792 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1793
1794 while (AvFILLp (on_destroy) >= 0)
1795 {
1796 dSP; /* don't disturb outer sp */
1797 SV *cb = av_pop (on_destroy);
1798
1799 PUSHMARK (SP);
1800
1801 if (statusp)
1802 {
1803 int i;
1804 AV *status = (AV *)SvRV (*statusp);
1805 EXTEND (SP, AvFILLp (status) + 1);
1806
1807 for (i = 0; i <= AvFILLp (status); ++i)
1808 PUSHs (AvARRAY (status)[i]);
1809 }
1810
1811 PUTBACK;
1812 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1813 }
1814 }
1815}
1816
1817static void
1818slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1819{
1820 int i;
1821 HV *hv = (HV *)SvRV (coro_current);
1822 AV *av = newAV ();
1823
1824 av_extend (av, items - 1);
1825 for (i = 0; i < items; ++i)
1826 av_push (av, SvREFCNT_inc_NN (arg [i]));
1827
1828 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1829
1830 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1831 api_ready (aTHX_ sv_manager);
1832
1833 frame->prepare = prepare_schedule;
1834 frame->check = slf_check_repeat;
1835}
1836
1837/*****************************************************************************/
1838/* async pool handler */
1839
1840static int
1841slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1842{
1843 HV *hv = (HV *)SvRV (coro_current);
1844 struct coro *coro = (struct coro *)frame->data;
1845
1846 if (!coro->invoke_cb)
1847 return 1; /* loop till we have invoke */
1848 else
1849 {
1850 hv_store (hv, "desc", sizeof ("desc") - 1,
1851 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1852
1853 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1854
1855 {
1856 dSP;
1857 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1858 PUTBACK;
1859 }
1860
1861 SvREFCNT_dec (GvAV (PL_defgv));
1862 GvAV (PL_defgv) = coro->invoke_av;
1863 coro->invoke_av = 0;
1864
1865 return 0;
1866 }
1867}
1868
1869static void
1870slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1871{
1872 HV *hv = (HV *)SvRV (coro_current);
1873 struct coro *coro = SvSTATE_hv ((SV *)hv);
1874
1875 if (expect_true (coro->saved_deffh))
1876 {
1877 /* subsequent iteration */
1878 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1879 coro->saved_deffh = 0;
1880
1881 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1882 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1883 {
1884 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1885 coro->invoke_av = newAV ();
1886
1887 frame->prepare = prepare_nop;
1888 }
1889 else
1890 {
1891 av_clear (GvAV (PL_defgv));
1892 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1893
1894 coro->prio = 0;
1895
1896 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1897 api_trace (aTHX_ coro_current, 0);
1898
1899 frame->prepare = prepare_schedule;
1900 av_push (av_async_pool, SvREFCNT_inc (hv));
1901 }
1902 }
1903 else
1904 {
1905 /* first iteration, simply fall through */
1906 frame->prepare = prepare_nop;
1907 }
1908
1909 frame->check = slf_check_pool_handler;
1910 frame->data = (void *)coro;
1911}
1912
1746/*****************************************************************************/ 1913/*****************************************************************************/
1747/* rouse callback */ 1914/* rouse callback */
1748 1915
1749#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1916#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750 1917
1755 SV *data = (SV *)GENSUB_ARG; 1922 SV *data = (SV *)GENSUB_ARG;
1756 1923
1757 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1924 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758 { 1925 {
1759 /* first call, set args */ 1926 /* first call, set args */
1760 int i;
1761 AV *av = newAV (); 1927 AV *av = newAV ();
1762 SV *coro = SvRV (data); 1928 SV *coro = SvRV (data);
1763 1929
1764 SvRV_set (data, (SV *)av); 1930 SvRV_set (data, (SV *)av);
1765 api_ready (aTHX_ coro); 1931 api_ready (aTHX_ coro);
1906static void 2072static void
1907slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2073slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1908{ 2074{
1909 frame->prepare = prepare_schedule; 2075 frame->prepare = prepare_schedule;
1910 frame->check = slf_check_nop; 2076 frame->check = slf_check_nop;
2077}
2078
2079static void
2080slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2081{
2082 struct coro *next = (struct coro *)slf_frame.data;
2083
2084 SvREFCNT_inc_NN (next->hv);
2085 prepare_schedule_to (aTHX_ ta, next);
2086}
2087
2088static void
2089slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2090{
2091 if (!items)
2092 croak ("Coro::schedule_to expects a coroutine argument, caught");
2093
2094 frame->data = (void *)SvSTATE (arg [0]);
2095 frame->prepare = slf_prepare_schedule_to;
2096 frame->check = slf_check_nop;
2097}
2098
2099static void
2100slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2101{
2102 api_ready (aTHX_ SvRV (coro_current));
2103
2104 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1911} 2105}
1912 2106
1913static void 2107static void
1914slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2108slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{ 2109{
2061 } 2255 }
2062 else 2256 else
2063 slf_argc = 0; 2257 slf_argc = 0;
2064 2258
2065 PL_op->op_ppaddr = pp_slf; 2259 PL_op->op_ppaddr = pp_slf;
2066 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2260 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2067 2261
2068 PL_op = (OP *)&slf_restore; 2262 PL_op = (OP *)&slf_restore;
2069} 2263}
2070 2264
2071/*****************************************************************************/ 2265/*****************************************************************************/
2294{ 2488{
2295 if (items >= 2) 2489 if (items >= 2)
2296 { 2490 {
2297 /* callback form */ 2491 /* callback form */
2298 AV *av = (AV *)SvRV (arg [0]); 2492 AV *av = (AV *)SvRV (arg [0]);
2299 CV *cb_cv = coro_sv_2cv (arg [1]); 2493 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2300 2494
2301 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2495 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2302 2496
2303 if (SvIVX (AvARRAY (av)[0]) > 0) 2497 if (SvIVX (AvARRAY (av)[0]) > 0)
2304 coro_semaphore_adjust (aTHX_ av, 0); 2498 coro_semaphore_adjust (aTHX_ av, 0);
2390 dXSARGS; 2584 dXSARGS;
2391 AV *state = (AV *)GENSUB_ARG; 2585 AV *state = (AV *)GENSUB_ARG;
2392 SV *coro = av_pop (state); 2586 SV *coro = av_pop (state);
2393 SV *data_sv = newSV (sizeof (struct io_state)); 2587 SV *data_sv = newSV (sizeof (struct io_state));
2394 2588
2395 av_extend (state, items); 2589 av_extend (state, items - 1);
2396 2590
2397 sv_upgrade (data_sv, SVt_PV); 2591 sv_upgrade (data_sv, SVt_PV);
2398 SvCUR_set (data_sv, sizeof (struct io_state)); 2592 SvCUR_set (data_sv, sizeof (struct io_state));
2399 SvPOK_only (data_sv); 2593 SvPOK_only (data_sv);
2400 2594
2535 XSRETURN_EMPTY; 2729 XSRETURN_EMPTY;
2536} 2730}
2537 2731
2538/*****************************************************************************/ 2732/*****************************************************************************/
2539 2733
2734#if CORO_CLONE
2735# include "clone.c"
2736#endif
2737
2540MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2738MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2541 2739
2542PROTOTYPES: DISABLE 2740PROTOTYPES: DISABLE
2543 2741
2544BOOT: 2742BOOT:
2576 2774
2577 { 2775 {
2578 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2776 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579 2777
2580 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2778 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581 hv_store_ent (PL_custom_op_names, slf, 2779 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582 newSVpv ("coro_slf", 0), 0);
2583 2780
2584 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2781 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585 hv_store_ent (PL_custom_op_descs, slf, 2782 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586 newSVpv ("coro schedule like function", 0), 0);
2587 } 2783 }
2588 2784
2589 coroapi.ver = CORO_API_VERSION; 2785 coroapi.ver = CORO_API_VERSION;
2590 coroapi.rev = CORO_API_REVISION; 2786 coroapi.rev = CORO_API_REVISION;
2591 2787
2610 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2806 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2611} 2807}
2612 2808
2613SV * 2809SV *
2614new (char *klass, ...) 2810new (char *klass, ...)
2811 ALIAS:
2812 Coro::new = 1
2615 CODE: 2813 CODE:
2616{ 2814{
2617 struct coro *coro; 2815 struct coro *coro;
2618 MAGIC *mg; 2816 MAGIC *mg;
2619 HV *hv; 2817 HV *hv;
2620 CV *cb; 2818 CV *cb;
2621 int i; 2819 int i;
2622 2820
2623 if (items > 1) 2821 if (items > 1)
2624 { 2822 {
2625 cb = coro_sv_2cv (ST (1)); 2823 cb = coro_sv_2cv (aTHX_ ST (1));
2626 2824
2825 if (!ix)
2826 {
2627 if (CvISXSUB (cb)) 2827 if (CvISXSUB (cb))
2628 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2828 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629 2829
2630 if (!CvROOT (cb)) 2830 if (!CvROOT (cb))
2631 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2831 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2832 }
2632 } 2833 }
2633 2834
2634 Newz (0, coro, 1, struct coro); 2835 Newz (0, coro, 1, struct coro);
2635 coro->args = newAV (); 2836 coro->args = newAV ();
2636 coro->flags = CF_NEW; 2837 coro->flags = CF_NEW;
2644 mg->mg_flags |= MGf_DUP; 2845 mg->mg_flags |= MGf_DUP;
2645 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2846 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646 2847
2647 if (items > 1) 2848 if (items > 1)
2648 { 2849 {
2649 coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651 av_extend (coro->args, items - 1); 2850 av_extend (coro->args, items - 1 + ix - 1);
2851
2852 if (ix)
2853 {
2652 av_push (coro->args, SvREFCNT_inc (cb)); 2854 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2855 cb = cv_coro_run;
2856 }
2857
2858 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2859
2653 for (i = 2; i < items; i++) 2860 for (i = 2; i < items; i++)
2654 av_push (coro->args, newSVsv (ST (i))); 2861 av_push (coro->args, newSVsv (ST (i)));
2655 } 2862 }
2656} 2863}
2657 OUTPUT: 2864 OUTPUT:
2673void 2880void
2674_exit (int code) 2881_exit (int code)
2675 PROTOTYPE: $ 2882 PROTOTYPE: $
2676 CODE: 2883 CODE:
2677 _exit (code); 2884 _exit (code);
2885
2886#if CORO_CLONE
2887
2888SV *
2889clone (Coro::State coro)
2890 CODE:
2891{
2892 struct coro *ncoro = coro_clone (coro);
2893 MAGIC *mg;
2894 /* TODO: too much duplication */
2895 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP;
2898 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2899}
2900 OUTPUT:
2901 RETVAL
2902
2903#endif
2678 2904
2679int 2905int
2680cctx_stacksize (int new_stacksize = 0) 2906cctx_stacksize (int new_stacksize = 0)
2681 PROTOTYPE: ;$ 2907 PROTOTYPE: ;$
2682 CODE: 2908 CODE:
2858 3084
2859BOOT: 3085BOOT:
2860{ 3086{
2861 int i; 3087 int i;
2862 3088
2863 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3089 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3090 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866 3091 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3092 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2867 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3093 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868 SvREADONLY_on (coro_current); 3094 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3095 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3096 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3097
3098 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3099 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3100 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3101 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2869 3102
2870 coro_stash = gv_stashpv ("Coro", TRUE); 3103 coro_stash = gv_stashpv ("Coro", TRUE);
2871 3104
2872 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3105 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2873 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3106 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2881 3114
2882 { 3115 {
2883 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3116 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884 3117
2885 coroapi.schedule = api_schedule; 3118 coroapi.schedule = api_schedule;
3119 coroapi.schedule_to = api_schedule_to;
2886 coroapi.cede = api_cede; 3120 coroapi.cede = api_cede;
2887 coroapi.cede_notself = api_cede_notself; 3121 coroapi.cede_notself = api_cede_notself;
2888 coroapi.ready = api_ready; 3122 coroapi.ready = api_ready;
2889 coroapi.is_ready = api_is_ready; 3123 coroapi.is_ready = api_is_ready;
2890 coroapi.nready = coro_nready; 3124 coroapi.nready = coro_nready;
2895 SvREADONLY_on (sv); 3129 SvREADONLY_on (sv);
2896 } 3130 }
2897} 3131}
2898 3132
2899void 3133void
3134terminate (...)
3135 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3137
3138void
2900schedule (...) 3139schedule (...)
2901 CODE: 3140 CODE:
2902 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3141 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3142
3143void
3144schedule_to (...)
3145 CODE:
3146 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3147
3148void
3149cede_to (...)
3150 CODE:
3151 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903 3152
2904void 3153void
2905cede (...) 3154cede (...)
2906 CODE: 3155 CODE:
2907 CORO_EXECUTE_SLF_XS (slf_init_cede); 3156 CORO_EXECUTE_SLF_XS (slf_init_cede);
2908 3157
2909void 3158void
2910cede_notself (...) 3159cede_notself (...)
2911 CODE: 3160 CODE:
2912 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3161 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3162
3163void
3164_cancel (Coro::State self)
3165 CODE:
3166 coro_state_destroy (aTHX_ self);
3167 coro_call_on_destroy (aTHX_ self);
2913 3168
2914void 3169void
2915_set_current (SV *current) 3170_set_current (SV *current)
2916 PROTOTYPE: $ 3171 PROTOTYPE: $
2917 CODE: 3172 CODE:
2962 CODE: 3217 CODE:
2963 RETVAL = coro_nready; 3218 RETVAL = coro_nready;
2964 OUTPUT: 3219 OUTPUT:
2965 RETVAL 3220 RETVAL
2966 3221
2967# for async_pool speedup
2968void 3222void
2969_pool_1 (SV *cb) 3223_pool_handler (...)
2970 CODE: 3224 CODE:
2971{ 3225 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2972 HV *hv = (HV *)SvRV (coro_current);
2973 struct coro *coro = SvSTATE_hv ((SV *)hv);
2974 AV *defav = GvAV (PL_defgv);
2975 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2976 AV *invoke_av;
2977 int i, len;
2978 3226
2979 if (!invoke) 3227void
3228async_pool (SV *cv, ...)
3229 PROTOTYPE: &@
3230 PPCODE:
3231{
3232 HV *hv = (HV *)av_pop (av_async_pool);
3233 AV *av = newAV ();
3234 SV *cb = ST (0);
3235 int i;
3236
3237 av_extend (av, items - 2);
3238 for (i = 1; i < items; ++i)
3239 av_push (av, SvREFCNT_inc_NN (ST (i)));
3240
3241 if ((SV *)hv == &PL_sv_undef)
2980 { 3242 {
2981 SV *old = PL_diehook; 3243 PUSHMARK (SP);
2982 PL_diehook = 0; 3244 EXTEND (SP, 2);
2983 SvREFCNT_dec (old); 3245 PUSHs (sv_Coro);
2984 croak ("\3async_pool terminate\2\n"); 3246 PUSHs ((SV *)cv_pool_handler);
3247 PUTBACK;
3248 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3249 SPAGAIN;
3250
3251 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2985 } 3252 }
2986 3253
2987 SvREFCNT_dec (coro->saved_deffh);
2988 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2989
2990 hv_store (hv, "desc", sizeof ("desc") - 1,
2991 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2992
2993 invoke_av = (AV *)SvRV (invoke);
2994 len = av_len (invoke_av);
2995
2996 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2997
2998 if (len > 0)
2999 { 3254 {
3000 av_fill (defav, len - 1); 3255 struct coro *coro = SvSTATE_hv (hv);
3001 for (i = 0; i < len; ++i) 3256
3002 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3257 assert (!coro->invoke_cb);
3258 assert (!coro->invoke_av);
3259 coro->invoke_cb = SvREFCNT_inc (cb);
3260 coro->invoke_av = av;
3003 } 3261 }
3004}
3005 3262
3006void 3263 api_ready (aTHX_ (SV *)hv);
3007_pool_2 (SV *cb)
3008 CODE:
3009{
3010 HV *hv = (HV *)SvRV (coro_current);
3011 struct coro *coro = SvSTATE_hv ((SV *)hv);
3012 3264
3013 sv_setsv (cb, &PL_sv_undef); 3265 if (GIMME_V != G_VOID)
3014 3266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3267 else
3016 coro->saved_deffh = 0;
3017
3018 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3019 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3020 {
3021 SV *old = PL_diehook;
3022 PL_diehook = 0;
3023 SvREFCNT_dec (old); 3268 SvREFCNT_dec (hv);
3024 croak ("\3async_pool terminate\2\n");
3025 }
3026
3027 av_clear (GvAV (PL_defgv));
3028 hv_store (hv, "desc", sizeof ("desc") - 1,
3029 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3030
3031 coro->prio = 0;
3032
3033 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3034 api_trace (aTHX_ coro_current, 0);
3035
3036 av_push (av_async_pool, newSVsv (coro_current));
3037} 3269}
3038 3270
3039SV * 3271SV *
3040rouse_cb () 3272rouse_cb ()
3041 PROTOTYPE: 3273 PROTOTYPE:
3215 3447
3216void 3448void
3217_register (char *target, char *proto, SV *req) 3449_register (char *target, char *proto, SV *req)
3218 CODE: 3450 CODE:
3219{ 3451{
3220 CV *req_cv = coro_sv_2cv (req); 3452 CV *req_cv = coro_sv_2cv (aTHX_ req);
3221 /* newXSproto doesn't return the CV on 5.8 */ 3453 /* newXSproto doesn't return the CV on 5.8 */
3222 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3454 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223 sv_setpv ((SV *)slf_cv, proto); 3455 sv_setpv ((SV *)slf_cv, proto);
3224 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3456 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225} 3457}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines