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.309 by root, Wed Nov 19 15:29:57 2008 UTC vs.
Revision 1.318 by root, Thu Nov 20 07:02:43 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
165static size_t cctx_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
166static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
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 CV *coro_run_cv;
171static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174
175static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */
172 177
173static GV *irsgv; /* $/ */ 178static GV *irsgv; /* $/ */
174static GV *stdoutgv; /* *STDOUT */ 179static GV *stdoutgv; /* *STDOUT */
175static SV *rv_diehook; 180static SV *rv_diehook;
176static SV *rv_warnhook; 181static SV *rv_warnhook;
177static HV *hv_sig; /* %SIG */ 182static HV *hv_sig; /* %SIG */
178 183
179/* async_pool helper stuff */ 184/* async_pool helper stuff */
180static SV *sv_pool_rss; 185static SV *sv_pool_rss;
181static SV *sv_pool_size; 186static SV *sv_pool_size;
187static SV *sv_async_pool_idle; /* description string */
182static 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;
183 192
184/* Coro::AnyEvent */ 193/* Coro::AnyEvent */
185static SV *sv_activity; 194static SV *sv_activity;
186 195
187static struct coro_cctx *cctx_first; 196static struct coro_cctx *cctx_first;
264 SV *except; /* exception to be thrown */ 273 SV *except; /* exception to be thrown */
265 SV *rouse_cb; 274 SV *rouse_cb;
266 275
267 /* async_pool */ 276 /* async_pool */
268 SV *saved_deffh; 277 SV *saved_deffh;
278 SV *invoke_cb;
279 AV *invoke_av;
269 280
270 /* linked list */ 281 /* linked list */
271 struct coro *next, *prev; 282 struct coro *next, *prev;
272}; 283};
273 284
290 301
291/* for Coro.pm */ 302/* for Coro.pm */
292static SV *coro_current; 303static SV *coro_current;
293static SV *coro_readyhook; 304static SV *coro_readyhook;
294static 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;
295static struct coro *coro_first; 307static struct coro *coro_first;
296#define coro_nready coroapi.nready 308#define coro_nready coroapi.nready
297 309
298/** lowlevel stuff **********************************************************/ 310/** lowlevel stuff **********************************************************/
299 311
327 return get_hv (name, create); 339 return get_hv (name, create);
328} 340}
329 341
330/* may croak */ 342/* may croak */
331INLINE CV * 343INLINE CV *
332coro_sv_2cv (SV *sv) 344coro_sv_2cv (pTHX_ SV *sv)
333{ 345{
334 HV *st; 346 HV *st;
335 GV *gvp; 347 GV *gvp;
336 return sv_2cv (sv, &st, &gvp, 0); 348 return sv_2cv (sv, &st, &gvp, 0);
337} 349}
687#if !PERL_VERSION_ATLEAST (5,10,0) 699#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 700 Safefree (PL_retstack);
689#endif 701#endif
690} 702}
691 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
692static size_t 713static size_t
693coro_rss (pTHX_ struct coro *coro) 714coro_rss (pTHX_ struct coro *coro)
694{ 715{
695 size_t rss = sizeof (*coro); 716 size_t rss = sizeof (*coro);
696 717
697 if (coro->mainstack) 718 if (coro->mainstack)
698 { 719 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 720 if (coro->flags & CF_RUNNING)
703 { 721 {
704 slot = &tmp_slot; 722 #define SYM(sym) PL_ ## sym
705 723 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 724 #undef SYM
709 } 725 }
710 else 726 else
711 slot = coro->slot;
712
713 if (slot)
714 { 727 {
715 rss += sizeof (slot->curstackinfo); 728 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 729 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 730 #undef SYM
718 rss += slot->tmps_max * sizeof (SV *);
719 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
720 rss += slot->scopestack_max * sizeof (I32);
721 rss += slot->savestack_max * sizeof (ANY);
722
723#if !PERL_VERSION_ATLEAST (5,10,0)
724 rss += slot->retstack_max * sizeof (OP *);
725#endif
726 } 731 }
727 } 732 }
728 733
729 return rss; 734 return rss;
730} 735}
830 835
831static int 836static int
832slf_check_nop (pTHX_ struct CoroSLF *frame) 837slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 838{
834 return 0; 839 return 0;
840}
841
842static int
843slf_check_repeat (pTHX_ struct CoroSLF *frame)
844{
845 return 1;
835} 846}
836 847
837static UNOP coro_setup_op; 848static UNOP coro_setup_op;
838 849
839static 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 */
932 SvREFCNT_dec (PL_diehook); 943 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook); 944 SvREFCNT_dec (PL_warnhook);
934 945
935 SvREFCNT_dec (coro->saved_deffh); 946 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 947 SvREFCNT_dec (coro->rouse_cb);
948 SvREFCNT_dec (coro->invoke_cb);
949 SvREFCNT_dec (coro->invoke_av);
937 950
938 coro_destruct_stacks (aTHX); 951 coro_destruct_stacks (aTHX);
939} 952}
940 953
941INLINE void 954INLINE void
1608api_is_ready (pTHX_ SV *coro_sv) 1621api_is_ready (pTHX_ SV *coro_sv)
1609{ 1622{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1623 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1624}
1612 1625
1626/* expects to own a reference to next->hv */
1613INLINE void 1627INLINE void
1628prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1629{
1630 SV *prev_sv = SvRV (coro_current);
1631
1632 ta->prev = SvSTATE_hv (prev_sv);
1633 ta->next = next;
1634
1635 TRANSFER_CHECK (*ta);
1636
1637 SvRV_set (coro_current, (SV *)next->hv);
1638
1639 free_coro_mortal (aTHX);
1640 coro_mortal = prev_sv;
1641}
1642
1643static void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1644prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1615{ 1645{
1616 SV *prev_sv, *next_sv;
1617
1618 for (;;) 1646 for (;;)
1619 { 1647 {
1620 next_sv = coro_deq (aTHX); 1648 SV *next_sv = coro_deq (aTHX);
1621 1649
1622 /* nothing to schedule: call the idle handler */
1623 if (expect_false (!next_sv)) 1650 if (expect_true (next_sv))
1624 { 1651 {
1652 struct coro *next = SvSTATE_hv (next_sv);
1653
1654 /* cannot transfer to destroyed coros, skip and look for next */
1655 if (expect_false (next->flags & CF_DESTROYED))
1656 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1657 else
1658 {
1659 next->flags &= ~CF_READY;
1660 --coro_nready;
1661
1662 return prepare_schedule_to (aTHX_ ta, next);
1663 }
1664 }
1665 else
1666 {
1667 /* nothing to schedule: call the idle handler */
1625 dSP; 1668 dSP;
1626 1669
1627 ENTER; 1670 ENTER;
1628 SAVETMPS; 1671 SAVETMPS;
1629 1672
1631 PUTBACK; 1674 PUTBACK;
1632 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1633 1676
1634 FREETMPS; 1677 FREETMPS;
1635 LEAVE; 1678 LEAVE;
1636 continue;
1637 } 1679 }
1638
1639 ta->next = SvSTATE_hv (next_sv);
1640
1641 /* cannot transfer to destroyed coros, skip and look for next */
1642 if (expect_false (ta->next->flags & CF_DESTROYED))
1643 {
1644 SvREFCNT_dec (next_sv);
1645 /* coro_nready has already been taken care of by destroy */
1646 continue;
1647 }
1648
1649 --coro_nready;
1650 break;
1651 } 1680 }
1652
1653 /* free this only after the transfer */
1654 prev_sv = SvRV (coro_current);
1655 ta->prev = SvSTATE_hv (prev_sv);
1656 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv);
1660
1661 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv;
1663} 1681}
1664 1682
1665INLINE void 1683INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1684prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1685{
1688{ 1706{
1689 struct coro_transfer_args ta; 1707 struct coro_transfer_args ta;
1690 1708
1691 prepare_schedule (aTHX_ &ta); 1709 prepare_schedule (aTHX_ &ta);
1692 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);
1693} 1721}
1694 1722
1695static int 1723static int
1696api_cede (pTHX) 1724api_cede (pTHX)
1697{ 1725{
1746 else 1774 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1775 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1776 }
1749} 1777}
1750 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
1751/*****************************************************************************/ 1908/*****************************************************************************/
1752/* rouse callback */ 1909/* rouse callback */
1753 1910
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1911#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 1912
1760 SV *data = (SV *)GENSUB_ARG; 1917 SV *data = (SV *)GENSUB_ARG;
1761 1918
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1919 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 1920 {
1764 /* first call, set args */ 1921 /* first call, set args */
1765 int i;
1766 AV *av = newAV (); 1922 AV *av = newAV ();
1767 SV *coro = SvRV (data); 1923 SV *coro = SvRV (data);
1768 1924
1769 SvRV_set (data, (SV *)av); 1925 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro); 1926 api_ready (aTHX_ coro);
1911static void 2067static void
1912slf_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)
1913{ 2069{
1914 frame->prepare = prepare_schedule; 2070 frame->prepare = prepare_schedule;
1915 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);
1916} 2100}
1917 2101
1918static void 2102static void
1919slf_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)
1920{ 2104{
2299{ 2483{
2300 if (items >= 2) 2484 if (items >= 2)
2301 { 2485 {
2302 /* callback form */ 2486 /* callback form */
2303 AV *av = (AV *)SvRV (arg [0]); 2487 AV *av = (AV *)SvRV (arg [0]);
2304 CV *cb_cv = coro_sv_2cv (arg [1]); 2488 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2305 2489
2306 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2490 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2307 2491
2308 if (SvIVX (AvARRAY (av)[0]) > 0) 2492 if (SvIVX (AvARRAY (av)[0]) > 0)
2309 coro_semaphore_adjust (aTHX_ av, 0); 2493 coro_semaphore_adjust (aTHX_ av, 0);
2395 dXSARGS; 2579 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2580 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2581 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2582 SV *data_sv = newSV (sizeof (struct io_state));
2399 2583
2400 av_extend (state, items); 2584 av_extend (state, items - 1);
2401 2585
2402 sv_upgrade (data_sv, SVt_PV); 2586 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2587 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2405 2589
2627 CV *cb; 2811 CV *cb;
2628 int i; 2812 int i;
2629 2813
2630 if (items > 1) 2814 if (items > 1)
2631 { 2815 {
2632 cb = coro_sv_2cv (ST (1)); 2816 cb = coro_sv_2cv (aTHX_ ST (1));
2633 2817
2818 if (!ix)
2819 {
2634 if (CvISXSUB (cb)) 2820 if (CvISXSUB (cb))
2635 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2821 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2636 2822
2637 if (!CvROOT (cb)) 2823 if (!CvROOT (cb))
2638 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2824 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2825 }
2639 } 2826 }
2640 2827
2641 Newz (0, coro, 1, struct coro); 2828 Newz (0, coro, 1, struct coro);
2642 coro->args = newAV (); 2829 coro->args = newAV ();
2643 coro->flags = CF_NEW; 2830 coro->flags = CF_NEW;
2651 mg->mg_flags |= MGf_DUP; 2838 mg->mg_flags |= MGf_DUP;
2652 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2839 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2653 2840
2654 if (items > 1) 2841 if (items > 1)
2655 { 2842 {
2656 av_extend (coro->args, items - 1 + ix); 2843 av_extend (coro->args, items - 1 + ix - 1);
2657 2844
2658 if (ix) 2845 if (ix)
2659 { 2846 {
2660 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 2847 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2661 cb = coro_run_cv; 2848 cb = cv_coro_run;
2662 } 2849 }
2663 2850
2664 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 2851 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2665 2852
2666 for (i = 2; i < items; i++) 2853 for (i = 2; i < items; i++)
2871 3058
2872BOOT: 3059BOOT:
2873{ 3060{
2874 int i; 3061 int i;
2875 3062
2876 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2877 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3063 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2878 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3064 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2879 coro_run_cv = get_cv (aTHX_ "Coro::_terminate", GV_ADD); 3065 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3066 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2880 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3067 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2881 SvREADONLY_on (coro_current); 3068 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3069 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3070 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3071
3072 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3073 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3074 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3075 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2882 3076
2883 coro_stash = gv_stashpv ("Coro", TRUE); 3077 coro_stash = gv_stashpv ("Coro", TRUE);
2884 3078
2885 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3079 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2886 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3080 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2894 3088
2895 { 3089 {
2896 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3090 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2897 3091
2898 coroapi.schedule = api_schedule; 3092 coroapi.schedule = api_schedule;
3093 coroapi.schedule_to = api_schedule_to;
2899 coroapi.cede = api_cede; 3094 coroapi.cede = api_cede;
2900 coroapi.cede_notself = api_cede_notself; 3095 coroapi.cede_notself = api_cede_notself;
2901 coroapi.ready = api_ready; 3096 coroapi.ready = api_ready;
2902 coroapi.is_ready = api_is_ready; 3097 coroapi.is_ready = api_is_ready;
2903 coroapi.nready = coro_nready; 3098 coroapi.nready = coro_nready;
2908 SvREADONLY_on (sv); 3103 SvREADONLY_on (sv);
2909 } 3104 }
2910} 3105}
2911 3106
2912void 3107void
3108terminate (...)
3109 CODE:
3110 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3111
3112void
2913schedule (...) 3113schedule (...)
2914 CODE: 3114 CODE:
2915 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3115 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3116
3117void
3118schedule_to (...)
3119 CODE:
3120 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3121
3122void
3123cede_to (...)
3124 CODE:
3125 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2916 3126
2917void 3127void
2918cede (...) 3128cede (...)
2919 CODE: 3129 CODE:
2920 CORO_EXECUTE_SLF_XS (slf_init_cede); 3130 CORO_EXECUTE_SLF_XS (slf_init_cede);
2921 3131
2922void 3132void
2923cede_notself (...) 3133cede_notself (...)
2924 CODE: 3134 CODE:
2925 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3135 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3136
3137void
3138_cancel (Coro::State self)
3139 CODE:
3140 coro_state_destroy (aTHX_ self);
3141 coro_call_on_destroy (aTHX_ self);
2926 3142
2927void 3143void
2928_set_current (SV *current) 3144_set_current (SV *current)
2929 PROTOTYPE: $ 3145 PROTOTYPE: $
2930 CODE: 3146 CODE:
2975 CODE: 3191 CODE:
2976 RETVAL = coro_nready; 3192 RETVAL = coro_nready;
2977 OUTPUT: 3193 OUTPUT:
2978 RETVAL 3194 RETVAL
2979 3195
2980# for async_pool speedup
2981void 3196void
2982_pool_1 (SV *cb) 3197_pool_handler (...)
2983 CODE: 3198 CODE:
2984{ 3199 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2985 HV *hv = (HV *)SvRV (coro_current);
2986 struct coro *coro = SvSTATE_hv ((SV *)hv);
2987 AV *defav = GvAV (PL_defgv);
2988 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2989 AV *invoke_av;
2990 int i, len;
2991 3200
2992 if (!invoke) 3201void
3202async_pool (SV *cv, ...)
3203 PROTOTYPE: &@
3204 PPCODE:
3205{
3206 HV *hv = (HV *)av_pop (av_async_pool);
3207 AV *av = newAV ();
3208 SV *cb = ST (0);
3209 int i;
3210
3211 av_extend (av, items - 2);
3212 for (i = 1; i < items; ++i)
3213 av_push (av, SvREFCNT_inc_NN (ST (i)));
3214
3215 if ((SV *)hv == &PL_sv_undef)
2993 { 3216 {
2994 SV *old = PL_diehook; 3217 PUSHMARK (SP);
2995 PL_diehook = 0; 3218 EXTEND (SP, 2);
2996 SvREFCNT_dec (old); 3219 PUSHs (sv_Coro);
2997 croak ("\3async_pool terminate\2\n"); 3220 PUSHs ((SV *)cv_pool_handler);
3221 PUTBACK;
3222 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3223 SPAGAIN;
3224
3225 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2998 } 3226 }
2999 3227
3000 SvREFCNT_dec (coro->saved_deffh);
3001 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3002
3003 hv_store (hv, "desc", sizeof ("desc") - 1,
3004 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3005
3006 invoke_av = (AV *)SvRV (invoke);
3007 len = av_len (invoke_av);
3008
3009 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3010
3011 if (len > 0)
3012 { 3228 {
3013 av_fill (defav, len - 1); 3229 struct coro *coro = SvSTATE_hv (hv);
3014 for (i = 0; i < len; ++i) 3230
3015 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3231 assert (!coro->invoke_cb);
3232 assert (!coro->invoke_av);
3233 coro->invoke_cb = SvREFCNT_inc (cb);
3234 coro->invoke_av = av;
3016 } 3235 }
3017}
3018 3236
3019void 3237 api_ready (aTHX_ (SV *)hv);
3020_pool_2 (SV *cb)
3021 CODE:
3022{
3023 HV *hv = (HV *)SvRV (coro_current);
3024 struct coro *coro = SvSTATE_hv ((SV *)hv);
3025 3238
3026 sv_setsv (cb, &PL_sv_undef); 3239 if (GIMME_V != G_VOID)
3027 3240 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3028 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3241 else
3029 coro->saved_deffh = 0;
3030
3031 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3032 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3033 {
3034 SV *old = PL_diehook;
3035 PL_diehook = 0;
3036 SvREFCNT_dec (old); 3242 SvREFCNT_dec (hv);
3037 croak ("\3async_pool terminate\2\n");
3038 }
3039
3040 av_clear (GvAV (PL_defgv));
3041 hv_store (hv, "desc", sizeof ("desc") - 1,
3042 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3043
3044 coro->prio = 0;
3045
3046 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3047 api_trace (aTHX_ coro_current, 0);
3048
3049 av_push (av_async_pool, newSVsv (coro_current));
3050} 3243}
3051 3244
3052SV * 3245SV *
3053rouse_cb () 3246rouse_cb ()
3054 PROTOTYPE: 3247 PROTOTYPE:
3228 3421
3229void 3422void
3230_register (char *target, char *proto, SV *req) 3423_register (char *target, char *proto, SV *req)
3231 CODE: 3424 CODE:
3232{ 3425{
3233 CV *req_cv = coro_sv_2cv (req); 3426 CV *req_cv = coro_sv_2cv (aTHX_ req);
3234 /* newXSproto doesn't return the CV on 5.8 */ 3427 /* newXSproto doesn't return the CV on 5.8 */
3235 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3428 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3236 sv_setpv ((SV *)slf_cv, proto); 3429 sv_setpv ((SV *)slf_cv, proto);
3237 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3430 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3238} 3431}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines