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.308 by root, Wed Nov 19 15:09:57 2008 UTC vs.
Revision 1.319 by root, Thu Nov 20 07:25:01 2008 UTC

55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
103 106
104/* 5.8.7 */ 107/* 5.8.7 */
105#ifndef SvRV_set 108#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 109# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 110#endif
167static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 171static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 172static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 174
175static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */
177
172static GV *irsgv; /* $/ */ 178static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 179static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 180static SV *rv_diehook;
175static SV *rv_warnhook; 181static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 182static HV *hv_sig; /* %SIG */
177 183
178/* async_pool helper stuff */ 184/* async_pool helper stuff */
179static SV *sv_pool_rss; 185static SV *sv_pool_rss;
180static SV *sv_pool_size; 186static SV *sv_pool_size;
187static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 188static AV *av_async_pool; /* idle pool */
189static SV *sv_Coro; /* class string */
190static CV *cv_pool_handler;
191static CV *cv_coro_state_new;
182 192
183/* Coro::AnyEvent */ 193/* Coro::AnyEvent */
184static SV *sv_activity; 194static SV *sv_activity;
185 195
186static struct coro_cctx *cctx_first; 196static struct coro_cctx *cctx_first;
263 SV *except; /* exception to be thrown */ 273 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 274 SV *rouse_cb;
265 275
266 /* async_pool */ 276 /* async_pool */
267 SV *saved_deffh; 277 SV *saved_deffh;
278 SV *invoke_cb;
279 AV *invoke_av;
268 280
269 /* linked list */ 281 /* linked list */
270 struct coro *next, *prev; 282 struct coro *next, *prev;
271}; 283};
272 284
289 301
290/* for Coro.pm */ 302/* for Coro.pm */
291static SV *coro_current; 303static SV *coro_current;
292static SV *coro_readyhook; 304static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 305static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
306static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 307static struct coro *coro_first;
295#define coro_nready coroapi.nready 308#define coro_nready coroapi.nready
296 309
297/** lowlevel stuff **********************************************************/ 310/** lowlevel stuff **********************************************************/
298 311
326 return get_hv (name, create); 339 return get_hv (name, create);
327} 340}
328 341
329/* may croak */ 342/* may croak */
330INLINE CV * 343INLINE CV *
331coro_sv_2cv (SV *sv) 344coro_sv_2cv (pTHX_ SV *sv)
332{ 345{
333 HV *st; 346 HV *st;
334 GV *gvp; 347 GV *gvp;
335 return sv_2cv (sv, &st, &gvp, 0); 348 return sv_2cv (sv, &st, &gvp, 0);
336} 349}
686#if !PERL_VERSION_ATLEAST (5,10,0) 699#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 700 Safefree (PL_retstack);
688#endif 701#endif
689} 702}
690 703
704#define CORO_RSS \
705 rss += sizeof (SYM (curstackinfo)); \
706 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
707 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
708 rss += SYM (tmps_max) * sizeof (SV *); \
709 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
710 rss += SYM (scopestack_max) * sizeof (I32); \
711 rss += SYM (savestack_max) * sizeof (ANY);
712
691static size_t 713static size_t
692coro_rss (pTHX_ struct coro *coro) 714coro_rss (pTHX_ struct coro *coro)
693{ 715{
694 size_t rss = sizeof (*coro); 716 size_t rss = sizeof (*coro);
695 717
696 if (coro->mainstack) 718 if (coro->mainstack)
697 { 719 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 720 if (coro->flags & CF_RUNNING)
702 { 721 {
703 slot = &tmp_slot; 722 #define SYM(sym) PL_ ## sym
704 723 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 724 #undef SYM
708 } 725 }
709 else 726 else
710 slot = coro->slot;
711
712 if (slot)
713 { 727 {
714 rss += sizeof (slot->curstackinfo); 728 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 729 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 730 #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 } 731 }
726 } 732 }
727 733
728 return rss; 734 return rss;
729} 735}
829 835
830static int 836static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 837slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 838{
833 return 0; 839 return 0;
840}
841
842static int
843slf_check_repeat (pTHX_ struct CoroSLF *frame)
844{
845 return 1;
834} 846}
835 847
836static UNOP coro_setup_op; 848static UNOP coro_setup_op;
837 849
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 850static void NOINLINE /* noinline to keep it out of the transfer fast path */
931 SvREFCNT_dec (PL_diehook); 943 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook); 944 SvREFCNT_dec (PL_warnhook);
933 945
934 SvREFCNT_dec (coro->saved_deffh); 946 SvREFCNT_dec (coro->saved_deffh);
935 SvREFCNT_dec (coro->rouse_cb); 947 SvREFCNT_dec (coro->rouse_cb);
948 SvREFCNT_dec (coro->invoke_cb);
949 SvREFCNT_dec (coro->invoke_av);
936 950
937 coro_destruct_stacks (aTHX); 951 coro_destruct_stacks (aTHX);
938} 952}
939 953
940INLINE void 954INLINE void
1012 { 1026 {
1013 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1027 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1014 1028
1015 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1029 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1016 { 1030 {
1017 runops_proc_t old_runops = PL_runops;
1018 dSP; 1031 dSP;
1019 GV *gv = CvGV (cx->blk_sub.cv); 1032 GV *gv = CvGV (cx->blk_sub.cv);
1020 SV *fullname = sv_2mortal (newSV (0)); 1033 SV *fullname = sv_2mortal (newSV (0));
1021 1034
1022 if (isGV (gv)) 1035 if (isGV (gv))
1607api_is_ready (pTHX_ SV *coro_sv) 1620api_is_ready (pTHX_ SV *coro_sv)
1608{ 1621{
1609 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1622 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1610} 1623}
1611 1624
1625/* expects to own a reference to next->hv */
1612INLINE void 1626INLINE void
1627prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1628{
1629 SV *prev_sv = SvRV (coro_current);
1630
1631 ta->prev = SvSTATE_hv (prev_sv);
1632 ta->next = next;
1633
1634 TRANSFER_CHECK (*ta);
1635
1636 SvRV_set (coro_current, (SV *)next->hv);
1637
1638 free_coro_mortal (aTHX);
1639 coro_mortal = prev_sv;
1640}
1641
1642static void
1613prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1643prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1614{ 1644{
1615 SV *prev_sv, *next_sv;
1616
1617 for (;;) 1645 for (;;)
1618 { 1646 {
1619 next_sv = coro_deq (aTHX); 1647 SV *next_sv = coro_deq (aTHX);
1620 1648
1621 /* nothing to schedule: call the idle handler */
1622 if (expect_false (!next_sv)) 1649 if (expect_true (next_sv))
1623 { 1650 {
1651 struct coro *next = SvSTATE_hv (next_sv);
1652
1653 /* cannot transfer to destroyed coros, skip and look for next */
1654 if (expect_false (next->flags & CF_DESTROYED))
1655 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1656 else
1657 {
1658 next->flags &= ~CF_READY;
1659 --coro_nready;
1660
1661 prepare_schedule_to (aTHX_ ta, next);
1662 break;
1663 }
1664 }
1665 else
1666 {
1667 /* nothing to schedule: call the idle handler */
1624 dSP; 1668 dSP;
1625 1669
1626 ENTER; 1670 ENTER;
1627 SAVETMPS; 1671 SAVETMPS;
1628 1672
1630 PUTBACK; 1674 PUTBACK;
1631 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1632 1676
1633 FREETMPS; 1677 FREETMPS;
1634 LEAVE; 1678 LEAVE;
1635 continue;
1636 } 1679 }
1637
1638 ta->next = SvSTATE_hv (next_sv);
1639
1640 /* cannot transfer to destroyed coros, skip and look for next */
1641 if (expect_false (ta->next->flags & CF_DESTROYED))
1642 {
1643 SvREFCNT_dec (next_sv);
1644 /* coro_nready has already been taken care of by destroy */
1645 continue;
1646 }
1647
1648 --coro_nready;
1649 break;
1650 } 1680 }
1651
1652 /* free this only after the transfer */
1653 prev_sv = SvRV (coro_current);
1654 ta->prev = SvSTATE_hv (prev_sv);
1655 TRANSFER_CHECK (*ta);
1656 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1657 ta->next->flags &= ~CF_READY;
1658 SvRV_set (coro_current, next_sv);
1659
1660 free_coro_mortal (aTHX);
1661 coro_mortal = prev_sv;
1662} 1681}
1663 1682
1664INLINE void 1683INLINE void
1665prepare_cede (pTHX_ struct coro_transfer_args *ta) 1684prepare_cede (pTHX_ struct coro_transfer_args *ta)
1666{ 1685{
1687{ 1706{
1688 struct coro_transfer_args ta; 1707 struct coro_transfer_args ta;
1689 1708
1690 prepare_schedule (aTHX_ &ta); 1709 prepare_schedule (aTHX_ &ta);
1691 TRANSFER (ta, 1); 1710 TRANSFER (ta, 1);
1711}
1712
1713static void
1714api_schedule_to (pTHX_ SV *coro_sv)
1715{
1716 struct coro_transfer_args ta;
1717 struct coro *next = SvSTATE (coro_sv);
1718
1719 SvREFCNT_inc_NN (coro_sv);
1720 prepare_schedule_to (aTHX_ &ta, next);
1692} 1721}
1693 1722
1694static int 1723static int
1695api_cede (pTHX) 1724api_cede (pTHX)
1696{ 1725{
1745 else 1774 else
1746 coro->slot->runops = RUNOPS_DEFAULT; 1775 coro->slot->runops = RUNOPS_DEFAULT;
1747 } 1776 }
1748} 1777}
1749 1778
1779static void
1780coro_call_on_destroy (pTHX_ struct coro *coro)
1781{
1782 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1783 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1784
1785 if (on_destroyp)
1786 {
1787 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1788
1789 while (AvFILLp (on_destroy) >= 0)
1790 {
1791 dSP; /* don't disturb outer sp */
1792 SV *cb = av_pop (on_destroy);
1793
1794 PUSHMARK (SP);
1795
1796 if (statusp)
1797 {
1798 int i;
1799 AV *status = (AV *)SvRV (*statusp);
1800 EXTEND (SP, AvFILLp (status) + 1);
1801
1802 for (i = 0; i <= AvFILLp (status); ++i)
1803 PUSHs (AvARRAY (status)[i]);
1804 }
1805
1806 PUTBACK;
1807 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1808 }
1809 }
1810}
1811
1812static void
1813slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1814{
1815 int i;
1816 HV *hv = (HV *)SvRV (coro_current);
1817 AV *av = newAV ();
1818
1819 av_extend (av, items - 1);
1820 for (i = 0; i < items; ++i)
1821 av_push (av, SvREFCNT_inc_NN (arg [i]));
1822
1823 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1824
1825 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1826 api_ready (aTHX_ sv_manager);
1827
1828 frame->prepare = prepare_schedule;
1829 frame->check = slf_check_repeat;
1830}
1831
1832/*****************************************************************************/
1833/* async pool handler */
1834
1835static int
1836slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1837{
1838 HV *hv = (HV *)SvRV (coro_current);
1839 struct coro *coro = (struct coro *)frame->data;
1840
1841 if (!coro->invoke_cb)
1842 return 1; /* loop till we have invoke */
1843 else
1844 {
1845 hv_store (hv, "desc", sizeof ("desc") - 1,
1846 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1847
1848 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1849
1850 {
1851 dSP;
1852 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1853 PUTBACK;
1854 }
1855
1856 SvREFCNT_dec (GvAV (PL_defgv));
1857 GvAV (PL_defgv) = coro->invoke_av;
1858 coro->invoke_av = 0;
1859
1860 return 0;
1861 }
1862}
1863
1864static void
1865slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1866{
1867 HV *hv = (HV *)SvRV (coro_current);
1868 struct coro *coro = SvSTATE_hv ((SV *)hv);
1869
1870 if (expect_true (coro->saved_deffh))
1871 {
1872 /* subsequent iteration */
1873 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1874 coro->saved_deffh = 0;
1875
1876 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1877 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1878 {
1879 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1880 coro->invoke_av = newAV ();
1881
1882 frame->prepare = prepare_nop;
1883 }
1884 else
1885 {
1886 av_clear (GvAV (PL_defgv));
1887 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1888
1889 coro->prio = 0;
1890
1891 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1892 api_trace (aTHX_ coro_current, 0);
1893
1894 frame->prepare = prepare_schedule;
1895 av_push (av_async_pool, SvREFCNT_inc (hv));
1896 }
1897 }
1898 else
1899 {
1900 /* first iteration, simply fall through */
1901 frame->prepare = prepare_nop;
1902 }
1903
1904 frame->check = slf_check_pool_handler;
1905 frame->data = (void *)coro;
1906}
1907
1750/*****************************************************************************/ 1908/*****************************************************************************/
1751/* rouse callback */ 1909/* rouse callback */
1752 1910
1753#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1911#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1754 1912
1759 SV *data = (SV *)GENSUB_ARG; 1917 SV *data = (SV *)GENSUB_ARG;
1760 1918
1761 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1919 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1762 { 1920 {
1763 /* first call, set args */ 1921 /* first call, set args */
1764 int i;
1765 AV *av = newAV (); 1922 AV *av = newAV ();
1766 SV *coro = SvRV (data); 1923 SV *coro = SvRV (data);
1767 1924
1768 SvRV_set (data, (SV *)av); 1925 SvRV_set (data, (SV *)av);
1769 api_ready (aTHX_ coro); 1926 api_ready (aTHX_ coro);
1910static void 2067static void
1911slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2068slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1912{ 2069{
1913 frame->prepare = prepare_schedule; 2070 frame->prepare = prepare_schedule;
1914 frame->check = slf_check_nop; 2071 frame->check = slf_check_nop;
2072}
2073
2074static void
2075slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2076{
2077 struct coro *next = (struct coro *)slf_frame.data;
2078
2079 SvREFCNT_inc_NN (next->hv);
2080 prepare_schedule_to (aTHX_ ta, next);
2081}
2082
2083static void
2084slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2085{
2086 if (!items)
2087 croak ("Coro::schedule_to expects a coroutine argument, caught");
2088
2089 frame->data = (void *)SvSTATE (arg [0]);
2090 frame->prepare = slf_prepare_schedule_to;
2091 frame->check = slf_check_nop;
2092}
2093
2094static void
2095slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 api_ready (aTHX_ SvRV (coro_current));
2098
2099 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1915} 2100}
1916 2101
1917static void 2102static void
1918slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2103slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1919{ 2104{
2298{ 2483{
2299 if (items >= 2) 2484 if (items >= 2)
2300 { 2485 {
2301 /* callback form */ 2486 /* callback form */
2302 AV *av = (AV *)SvRV (arg [0]); 2487 AV *av = (AV *)SvRV (arg [0]);
2303 CV *cb_cv = coro_sv_2cv (arg [1]); 2488 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2304 2489
2305 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2490 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2306 2491
2307 if (SvIVX (AvARRAY (av)[0]) > 0) 2492 if (SvIVX (AvARRAY (av)[0]) > 0)
2308 coro_semaphore_adjust (aTHX_ av, 0); 2493 coro_semaphore_adjust (aTHX_ av, 0);
2394 dXSARGS; 2579 dXSARGS;
2395 AV *state = (AV *)GENSUB_ARG; 2580 AV *state = (AV *)GENSUB_ARG;
2396 SV *coro = av_pop (state); 2581 SV *coro = av_pop (state);
2397 SV *data_sv = newSV (sizeof (struct io_state)); 2582 SV *data_sv = newSV (sizeof (struct io_state));
2398 2583
2399 av_extend (state, items); 2584 av_extend (state, items - 1);
2400 2585
2401 sv_upgrade (data_sv, SVt_PV); 2586 sv_upgrade (data_sv, SVt_PV);
2402 SvCUR_set (data_sv, sizeof (struct io_state)); 2587 SvCUR_set (data_sv, sizeof (struct io_state));
2403 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2404 2589
2580 2765
2581 { 2766 {
2582 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2767 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2583 2768
2584 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2769 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2585 hv_store_ent (PL_custom_op_names, slf, 2770 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2586 newSVpv ("coro_slf", 0), 0);
2587 2771
2588 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2772 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2589 hv_store_ent (PL_custom_op_descs, slf, 2773 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2590 newSVpv ("coro schedule like function", 0), 0);
2591 } 2774 }
2592 2775
2593 coroapi.ver = CORO_API_VERSION; 2776 coroapi.ver = CORO_API_VERSION;
2594 coroapi.rev = CORO_API_REVISION; 2777 coroapi.rev = CORO_API_REVISION;
2595 2778
2614 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2797 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2615} 2798}
2616 2799
2617SV * 2800SV *
2618new (char *klass, ...) 2801new (char *klass, ...)
2802 ALIAS:
2803 Coro::new = 1
2619 CODE: 2804 CODE:
2620{ 2805{
2621 struct coro *coro; 2806 struct coro *coro;
2622 MAGIC *mg; 2807 MAGIC *mg;
2623 HV *hv; 2808 HV *hv;
2624 CV *cb; 2809 CV *cb;
2625 int i; 2810 int i;
2626 2811
2627 if (items > 1) 2812 if (items > 1)
2628 { 2813 {
2629 cb = coro_sv_2cv (ST (1)); 2814 cb = coro_sv_2cv (aTHX_ ST (1));
2630 2815
2816 if (!ix)
2817 {
2631 if (CvISXSUB (cb)) 2818 if (CvISXSUB (cb))
2632 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2819 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2633 2820
2634 if (!CvROOT (cb)) 2821 if (!CvROOT (cb))
2635 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2822 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2823 }
2636 } 2824 }
2637 2825
2638 Newz (0, coro, 1, struct coro); 2826 Newz (0, coro, 1, struct coro);
2639 coro->args = newAV (); 2827 coro->args = newAV ();
2640 coro->flags = CF_NEW; 2828 coro->flags = CF_NEW;
2648 mg->mg_flags |= MGf_DUP; 2836 mg->mg_flags |= MGf_DUP;
2649 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2837 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2650 2838
2651 if (items > 1) 2839 if (items > 1)
2652 { 2840 {
2653 coro->startcv = SvREFCNT_inc_NN (cb);
2654
2655 av_extend (coro->args, items - 1); 2841 av_extend (coro->args, items - 1 + ix - 1);
2842
2843 if (ix)
2844 {
2845 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2846 cb = cv_coro_run;
2847 }
2848
2849 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2850
2656 for (i = 2; i < items; i++) 2851 for (i = 2; i < items; i++)
2657 av_push (coro->args, newSVsv (ST (i))); 2852 av_push (coro->args, newSVsv (ST (i)));
2658 } 2853 }
2659} 2854}
2660 OUTPUT: 2855 OUTPUT:
2861 3056
2862BOOT: 3057BOOT:
2863{ 3058{
2864 int i; 3059 int i;
2865 3060
2866 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2867 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3061 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2868 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3062 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2869 3063 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3064 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2870 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3065 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2871 SvREADONLY_on (coro_current); 3066 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3067 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3068 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3069
3070 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3071 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3072 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3073 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2872 3074
2873 coro_stash = gv_stashpv ("Coro", TRUE); 3075 coro_stash = gv_stashpv ("Coro", TRUE);
2874 3076
2875 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3077 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2876 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3078 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2884 3086
2885 { 3087 {
2886 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3088 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2887 3089
2888 coroapi.schedule = api_schedule; 3090 coroapi.schedule = api_schedule;
3091 coroapi.schedule_to = api_schedule_to;
2889 coroapi.cede = api_cede; 3092 coroapi.cede = api_cede;
2890 coroapi.cede_notself = api_cede_notself; 3093 coroapi.cede_notself = api_cede_notself;
2891 coroapi.ready = api_ready; 3094 coroapi.ready = api_ready;
2892 coroapi.is_ready = api_is_ready; 3095 coroapi.is_ready = api_is_ready;
2893 coroapi.nready = coro_nready; 3096 coroapi.nready = coro_nready;
2898 SvREADONLY_on (sv); 3101 SvREADONLY_on (sv);
2899 } 3102 }
2900} 3103}
2901 3104
2902void 3105void
3106terminate (...)
3107 CODE:
3108 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3109
3110void
2903schedule (...) 3111schedule (...)
2904 CODE: 3112 CODE:
2905 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3113 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3114
3115void
3116schedule_to (...)
3117 CODE:
3118 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3119
3120void
3121cede_to (...)
3122 CODE:
3123 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2906 3124
2907void 3125void
2908cede (...) 3126cede (...)
2909 CODE: 3127 CODE:
2910 CORO_EXECUTE_SLF_XS (slf_init_cede); 3128 CORO_EXECUTE_SLF_XS (slf_init_cede);
2911 3129
2912void 3130void
2913cede_notself (...) 3131cede_notself (...)
2914 CODE: 3132 CODE:
2915 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3133 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3134
3135void
3136_cancel (Coro::State self)
3137 CODE:
3138 coro_state_destroy (aTHX_ self);
3139 coro_call_on_destroy (aTHX_ self);
2916 3140
2917void 3141void
2918_set_current (SV *current) 3142_set_current (SV *current)
2919 PROTOTYPE: $ 3143 PROTOTYPE: $
2920 CODE: 3144 CODE:
2965 CODE: 3189 CODE:
2966 RETVAL = coro_nready; 3190 RETVAL = coro_nready;
2967 OUTPUT: 3191 OUTPUT:
2968 RETVAL 3192 RETVAL
2969 3193
2970# for async_pool speedup
2971void 3194void
2972_pool_1 (SV *cb) 3195_pool_handler (...)
2973 CODE: 3196 CODE:
2974{ 3197 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2975 HV *hv = (HV *)SvRV (coro_current);
2976 struct coro *coro = SvSTATE_hv ((SV *)hv);
2977 AV *defav = GvAV (PL_defgv);
2978 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2979 AV *invoke_av;
2980 int i, len;
2981 3198
2982 if (!invoke) 3199void
3200async_pool (SV *cv, ...)
3201 PROTOTYPE: &@
3202 PPCODE:
3203{
3204 HV *hv = (HV *)av_pop (av_async_pool);
3205 AV *av = newAV ();
3206 SV *cb = ST (0);
3207 int i;
3208
3209 av_extend (av, items - 2);
3210 for (i = 1; i < items; ++i)
3211 av_push (av, SvREFCNT_inc_NN (ST (i)));
3212
3213 if ((SV *)hv == &PL_sv_undef)
2983 { 3214 {
2984 SV *old = PL_diehook; 3215 PUSHMARK (SP);
2985 PL_diehook = 0; 3216 EXTEND (SP, 2);
2986 SvREFCNT_dec (old); 3217 PUSHs (sv_Coro);
2987 croak ("\3async_pool terminate\2\n"); 3218 PUSHs ((SV *)cv_pool_handler);
3219 PUTBACK;
3220 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3221 SPAGAIN;
3222
3223 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2988 } 3224 }
2989 3225
2990 SvREFCNT_dec (coro->saved_deffh);
2991 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2992
2993 hv_store (hv, "desc", sizeof ("desc") - 1,
2994 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2995
2996 invoke_av = (AV *)SvRV (invoke);
2997 len = av_len (invoke_av);
2998
2999 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3000
3001 if (len > 0)
3002 { 3226 {
3003 av_fill (defav, len - 1); 3227 struct coro *coro = SvSTATE_hv (hv);
3004 for (i = 0; i < len; ++i) 3228
3005 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3229 assert (!coro->invoke_cb);
3230 assert (!coro->invoke_av);
3231 coro->invoke_cb = SvREFCNT_inc (cb);
3232 coro->invoke_av = av;
3006 } 3233 }
3007}
3008 3234
3009void 3235 api_ready (aTHX_ (SV *)hv);
3010_pool_2 (SV *cb)
3011 CODE:
3012{
3013 HV *hv = (HV *)SvRV (coro_current);
3014 struct coro *coro = SvSTATE_hv ((SV *)hv);
3015 3236
3016 sv_setsv (cb, &PL_sv_undef); 3237 if (GIMME_V != G_VOID)
3017 3238 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3018 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3239 else
3019 coro->saved_deffh = 0;
3020
3021 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3022 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3023 {
3024 SV *old = PL_diehook;
3025 PL_diehook = 0;
3026 SvREFCNT_dec (old); 3240 SvREFCNT_dec (hv);
3027 croak ("\3async_pool terminate\2\n");
3028 }
3029
3030 av_clear (GvAV (PL_defgv));
3031 hv_store (hv, "desc", sizeof ("desc") - 1,
3032 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3033
3034 coro->prio = 0;
3035
3036 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3037 api_trace (aTHX_ coro_current, 0);
3038
3039 av_push (av_async_pool, newSVsv (coro_current));
3040} 3241}
3041 3242
3042SV * 3243SV *
3043rouse_cb () 3244rouse_cb ()
3044 PROTOTYPE: 3245 PROTOTYPE:
3218 3419
3219void 3420void
3220_register (char *target, char *proto, SV *req) 3421_register (char *target, char *proto, SV *req)
3221 CODE: 3422 CODE:
3222{ 3423{
3223 CV *req_cv = coro_sv_2cv (req); 3424 CV *req_cv = coro_sv_2cv (aTHX_ req);
3224 /* newXSproto doesn't return the CV on 5.8 */ 3425 /* newXSproto doesn't return the CV on 5.8 */
3225 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3426 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3226 sv_setpv ((SV *)slf_cv, proto); 3427 sv_setpv ((SV *)slf_cv, proto);
3227 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3428 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3228} 3429}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines