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.364 by root, Thu Jul 16 02:19:17 2009 UTC vs.
Revision 1.392 by root, Fri Apr 29 15:43:27 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
142static SV *sv_pool_size; 152static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 156static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 157
149/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
150static SV *sv_activity; 159static SV *sv_activity;
151 160
152/* enable processtime/realtime profiling */ 161/* enable processtime/realtime profiling */
… …
232 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
238 247
239 /* statistics */ 248 /* statistics */
240 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
241 250
242 /* coro process data */ 251 /* coro process data */
… …
250 AV *invoke_av; 259 AV *invoke_av;
251 260
252 /* on_enter/on_leave */ 261 /* on_enter/on_leave */
253 AV *on_enter; 262 AV *on_enter;
254 AV *on_leave; 263 AV *on_leave;
264
265 /* swap_sv */
266 AV *swap_sv;
255 267
256 /* times */ 268 /* times */
257 coro_ts t_cpu, t_real; 269 coro_ts t_cpu, t_real;
258 270
259 /* linked list */ 271 /* linked list */
… …
290static OP *(*coro_old_pp_sselect) (pTHX); 302static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 303static SV *coro_select_select;
292 304
293/* horrible hack, but if it works... */ 305/* horrible hack, but if it works... */
294static OP * 306static OP *
295coro_pp_sselect (aTHX) 307coro_pp_sselect (pTHX)
296{ 308{
297 dSP; 309 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 310 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 311 XPUSHs (coro_select_select);
300 PUTBACK; 312 PUTBACK;
… …
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 314 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED; 315 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 316 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 317 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 318}
319
320/** time stuff **************************************************************/
321
322#ifdef HAS_GETTIMEOFDAY
323
324static void
325coro_u2time (pTHX_ UV ret[2])
326{
327 struct timeval tv;
328 gettimeofday (&tv, 0);
329
330 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec;
332}
333
334static double
335coro_nvtime ()
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 return tv.tv_sec + tv.tv_usec * 1e-6;
341}
342
343static void
344time_init (pTHX)
345{
346 nvtime = coro_nvtime;
347 u2time = coro_u2time;
348}
349
350#else
351
352static void
353time_init (pTHX)
354{
355 SV **svp;
356
357 require_pv ("Time/HiRes.pm");
358
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360
361 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363
364 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
368}
369
370#endif
307 371
308/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
309 373
310static SV * 374static SV *
311coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
… …
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 616}
553 617
554/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
555 619
620/* swap sv heads, at least logically */
621static void
622swap_svs (pTHX_ Coro__State c)
623{
624 int i;
625
626 for (i = 0; i <= AvFILLp (c->swap_sv); )
627 {
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665}
666
667#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro))
670
556static void 671static void
557on_enterleave_call (pTHX_ SV *cb); 672on_enterleave_call (pTHX_ SV *cb);
558 673
559static void 674static void
560load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
… …
606 int i; 721 int i;
607 722
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 725 }
726
727 SWAP_SVS (c);
611} 728}
612 729
613static void 730static void
614save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
615{ 732{
733 SWAP_SVS (c);
734
616 if (expect_false (c->on_leave)) 735 if (expect_false (c->on_leave))
617 { 736 {
618 int i; 737 int i;
619 738
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1047{
929 return 1; 1048 return 1;
930} 1049}
931 1050
932static UNOP coro_setup_op; 1051static UNOP init_perl_op;
933 1052
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053static void NOINLINE /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
936{ 1055{
937 /* 1056 /*
938 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
939 */ 1058 */
940 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1068 PL_curpm = 0;
950 PL_curpad = 0; 1069 PL_curpad = 0;
951 PL_localizing = 0; 1070 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1071 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1073 PL_parser = 0;
956#endif 1074#endif
957 PL_hints = 0; 1075 PL_hints = 0;
… …
989 */ 1107 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
992 1110
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1113 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1115 /* no flags etc. required, as an init function won't be called */
998 1116
999 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
1000 1118
1001 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
1121
1122 SWAP_SVS (coro);
1003 1123
1004 if (expect_false (enable_times)) 1124 if (expect_false (enable_times))
1005 { 1125 {
1006 coro_times_update (); 1126 coro_times_update ();
1007 coro_times_sub (coro); 1127 coro_times_sub (coro);
… …
1028 dounwind (-1); 1148 dounwind (-1);
1029 } 1149 }
1030} 1150}
1031 1151
1032static void 1152static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1153destroy_perl (pTHX_ struct coro *coro)
1034{ 1154{
1035 SV *svf [9]; 1155 SV *svf [9];
1036 1156
1037 { 1157 {
1038 struct coro *current = SvSTATE_current; 1158 struct coro *current = SvSTATE_current;
… …
1042 save_perl (aTHX_ current); 1162 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro); 1163 load_perl (aTHX_ coro);
1044 1164
1045 coro_unwind_stacks (aTHX); 1165 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX); 1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1047 1170
1048 // now save some sv's to be free'd later 1171 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv); 1172 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1173 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1174 svf [2] = GvSV (PL_errgv);
… …
1275 /* somebody or something will hit me for both perl_run and PL_restartop */ 1398 /* somebody or something will hit me for both perl_run and PL_restartop */
1276 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1277 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1278 /* 1401 /*
1279 * Unfortunately, there is no way to get at the return values of the 1402 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these 1403 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1404 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1405 */
1282 1406
1283 /* 1407 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1408 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1409 * fell off the end, which seems to be the only valid (non-bug)
… …
1492 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1493 { 1617 {
1494 /* need to start coroutine */ 1618 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1620 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1498 } 1622 }
1499 else 1623 else
1500 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1501 1625
1502 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
… …
1565 1689
1566 if (coro->mainstack 1690 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1691 && coro->mainstack != main_mainstack
1568 && coro->slot 1692 && coro->slot
1569 && !PL_dirty) 1693 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1695
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1571 1699
1572 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1576
1577 if (coro->next) coro->next->prev = coro->prev;
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1705
1581 return 1; 1706 return 1;
1582} 1707}
1583 1708
1584static int 1709static int
… …
1668 } 1793 }
1669 1794
1670 return 0; 1795 return 0;
1671} 1796}
1672 1797
1798static void
1799invoke_sv_ready_hook_helper (void)
1800{
1801 dTHX;
1802 dSP;
1803
1804 ENTER;
1805 SAVETMPS;
1806
1807 PUSHMARK (SP);
1808 PUTBACK;
1809 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1810
1811 FREETMPS;
1812 LEAVE;
1813}
1814
1673static int 1815static int
1674api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1675{ 1817{
1676 struct coro *coro;
1677 SV *sv_hook;
1678 void (*xs_hook)(void);
1679
1680 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1681 1819
1682 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1683 return 0; 1821 return 0;
1684 1822
1685 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1686 1824
1687 sv_hook = coro_nready ? 0 : coro_readyhook;
1688 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1689
1690 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1691 ++coro_nready;
1692 1826
1693 if (sv_hook) 1827 if (!coro_nready++)
1694 { 1828 if (coroapi.readyhook)
1695 dSP; 1829 coroapi.readyhook ();
1696
1697 ENTER;
1698 SAVETMPS;
1699
1700 PUSHMARK (SP);
1701 PUTBACK;
1702 call_sv (sv_hook, G_VOID | G_DISCARD);
1703
1704 FREETMPS;
1705 LEAVE;
1706 }
1707
1708 if (xs_hook)
1709 xs_hook ();
1710 1830
1711 return 1; 1831 return 1;
1712} 1832}
1713 1833
1714static int 1834static int
… …
1759 { 1879 {
1760 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1761 if (SvROK (sv_idle) 1881 if (SvROK (sv_idle)
1762 && SvOBJECT (SvRV (sv_idle))) 1882 && SvOBJECT (SvRV (sv_idle)))
1763 { 1883 {
1884 if (SvRV (sv_idle) == SvRV (coro_current))
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1886
1764 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1765 api_ready (aTHX_ SvRV (sv_idle)); 1888 api_ready (aTHX_ SvRV (sv_idle));
1766 --coro_nready; 1889 --coro_nready;
1767 } 1890 }
1768 else 1891 else
1769 { 1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1770 dSP; 1894 dSP;
1771 1895
1772 ENTER; 1896 ENTER;
1773 SAVETMPS; 1897 SAVETMPS;
1774 1898
… …
1884 2008
1885static void 2009static void
1886coro_call_on_destroy (pTHX_ struct coro *coro) 2010coro_call_on_destroy (pTHX_ struct coro *coro)
1887{ 2011{
1888 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1889 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1890 2013
1891 if (on_destroyp) 2014 if (on_destroyp)
1892 { 2015 {
1893 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1894 2019
1895 while (AvFILLp (on_destroy) >= 0) 2020 while (AvFILLp (on_destroy) >= 0)
1896 { 2021 {
1897 dSP; /* don't disturb outer sp */ 2022 dSP; /* don't disturb outer sp */
1898 SV *cb = av_pop (on_destroy); 2023 SV *cb = av_pop (on_destroy);
… …
1900 PUSHMARK (SP); 2025 PUSHMARK (SP);
1901 2026
1902 if (statusp) 2027 if (statusp)
1903 { 2028 {
1904 int i; 2029 int i;
1905 AV *status = (AV *)SvRV (*statusp);
1906 EXTEND (SP, AvFILLp (status) + 1); 2030 EXTEND (SP, AvFILLp (status) + 1);
1907 2031
1908 for (i = 0; i <= AvFILLp (status); ++i) 2032 for (i = 0; i <= AvFILLp (status); ++i)
1909 PUSHs (AvARRAY (status)[i]); 2033 PUSHs (AvARRAY (status)[i]);
1910 } 2034 }
… …
1914 } 2038 }
1915 } 2039 }
1916} 2040}
1917 2041
1918static void 2042static void
1919slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2043coro_set_status (HV *coro_hv, SV **arg, int items)
1920{ 2044{
1921 int i;
1922 HV *hv = (HV *)SvRV (coro_current);
1923 AV *av = newAV (); 2045 AV *av = newAV ();
1924 2046
2047 /* items are actually not so common, so optimise for this case */
2048 if (items)
2049 {
2050 int i;
2051
1925 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1926 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1928 2057
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2058 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2059}
1930 2060
2061static void
2062slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2063{
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2064 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager); 2065 api_ready (aTHX_ sv_manager);
1933 2066
1934 frame->prepare = prepare_schedule; 2067 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat; 2068 frame->check = slf_check_repeat;
1936 2069
1937 /* as a minor optimisation, we could unwind all stacks here */ 2070 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */ 2071 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/ 2072 /*coro_unwind_stacks (aTHX);*/
2073}
2074
2075static void
2076slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2077{
2078 HV *coro_hv = (HV *)SvRV (coro_current);
2079
2080 coro_set_status (coro_hv, arg, items);
2081 slf_init_terminate_cancel_common (frame, coro_hv);
2082}
2083
2084static void
2085slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{
2087 HV *coro_hv;
2088 struct coro *coro;
2089
2090 if (items <= 0)
2091 croak ("Coro::cancel called without coro object,");
2092
2093 coro = SvSTATE (arg [0]);
2094 coro_hv = coro->hv;
2095
2096 coro_set_status (coro_hv, arg + 1, items - 1);
2097
2098 /* cancelling the current coro is allowed, and equals terminate */
2099 if (coro_hv == (HV *)SvRV (coro_current))
2100 slf_init_terminate_cancel_common (frame, coro_hv);
2101 else
2102 {
2103 /* otherwise we cancel ourselves */
2104 coro_state_destroy (aTHX_ coro);
2105 coro_call_on_destroy (aTHX_ coro);
2106
2107 frame->prepare = prepare_nop;
2108 frame->check = slf_check_nop;
2109 }
1940} 2110}
1941 2111
1942/*****************************************************************************/ 2112/*****************************************************************************/
1943/* async pool handler */ 2113/* async pool handler */
1944 2114
… …
2348 if (PL_op->op_flags & OPf_STACKED) 2518 if (PL_op->op_flags & OPf_STACKED)
2349 { 2519 {
2350 if (items > slf_arga) 2520 if (items > slf_arga)
2351 { 2521 {
2352 slf_arga = items; 2522 slf_arga = items;
2353 free (slf_argv); 2523 Safefree (slf_argv);
2354 slf_argv = malloc (slf_arga * sizeof (SV *)); 2524 New (0, slf_argv, slf_arga, SV *);
2355 } 2525 }
2356 2526
2357 slf_argc = items; 2527 slf_argc = items;
2358 2528
2359 for (i = 0; i < items; ++i) 2529 for (i = 0; i < items; ++i)
… …
2720 { 2890 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]); 2891 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2892 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723 2893
2724 if (SvIVX (AvARRAY (av)[0])) 2894 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2895 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2726 2896
2727 frame->prepare = prepare_nop; 2897 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop; 2898 frame->check = slf_check_nop;
2729 } 2899 }
2730 else if (SvIVX (AvARRAY (av)[0])) 2900 else if (SvIVX (AvARRAY (av)[0]))
… …
2892 /* now call the AIO function - we assume our request is uncancelable */ 3062 /* now call the AIO function - we assume our request is uncancelable */
2893 PUTBACK; 3063 PUTBACK;
2894 call_sv ((SV *)req, G_VOID | G_DISCARD); 3064 call_sv ((SV *)req, G_VOID | G_DISCARD);
2895 } 3065 }
2896 3066
2897 /* now that the requets is going, we loop toll we have a result */ 3067 /* now that the request is going, we loop till we have a result */
2898 frame->data = (void *)state; 3068 frame->data = (void *)state;
2899 frame->prepare = prepare_schedule; 3069 frame->prepare = prepare_schedule;
2900 frame->check = slf_check_aio_req; 3070 frame->check = slf_check_aio_req;
2901} 3071}
2902 3072
… …
2913/*****************************************************************************/ 3083/*****************************************************************************/
2914 3084
2915#if CORO_CLONE 3085#if CORO_CLONE
2916# include "clone.c" 3086# include "clone.c"
2917#endif 3087#endif
3088
3089/*****************************************************************************/
3090
3091static SV *
3092coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3093{
3094 SV *coro_sv;
3095 struct coro *coro;
3096 MAGIC *mg;
3097 HV *hv;
3098 SV *cb;
3099 int i;
3100
3101 if (argc > 0)
3102 {
3103 cb = s_get_cv_croak (argv [0]);
3104
3105 if (!is_coro)
3106 {
3107 if (CvISXSUB (cb))
3108 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3109
3110 if (!CvROOT (cb))
3111 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3112 }
3113 }
3114
3115 Newz (0, coro, 1, struct coro);
3116 coro->args = newAV ();
3117 coro->flags = CF_NEW;
3118
3119 if (coro_first) coro_first->prev = coro;
3120 coro->next = coro_first;
3121 coro_first = coro;
3122
3123 coro->hv = hv = newHV ();
3124 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3125 mg->mg_flags |= MGf_DUP;
3126 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3127
3128 if (argc > 0)
3129 {
3130 av_extend (coro->args, argc + is_coro - 1);
3131
3132 if (is_coro)
3133 {
3134 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3135 cb = (SV *)cv_coro_run;
3136 }
3137
3138 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3139
3140 for (i = 1; i < argc; i++)
3141 av_push (coro->args, newSVsv (argv [i]));
3142 }
3143
3144 return coro_sv;
3145}
2918 3146
2919MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3147MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2920 3148
2921PROTOTYPES: DISABLE 3149PROTOTYPES: DISABLE
2922 3150
… …
2975 coroapi.prepare_nop = prepare_nop; 3203 coroapi.prepare_nop = prepare_nop;
2976 coroapi.prepare_schedule = prepare_schedule; 3204 coroapi.prepare_schedule = prepare_schedule;
2977 coroapi.prepare_cede = prepare_cede; 3205 coroapi.prepare_cede = prepare_cede;
2978 coroapi.prepare_cede_notself = prepare_cede_notself; 3206 coroapi.prepare_cede_notself = prepare_cede_notself;
2979 3207
2980 { 3208 time_init (aTHX);
2981 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2982
2983 if (!svp) croak ("Time::HiRes is required");
2984 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2985
2986 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2987
2988 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2989 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2990 }
2991 3209
2992 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3210 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2993} 3211}
2994 3212
2995SV * 3213SV *
2996new (char *klass, ...) 3214new (SV *klass, ...)
2997 ALIAS: 3215 ALIAS:
2998 Coro::new = 1 3216 Coro::new = 1
2999 CODE: 3217 CODE:
3000{ 3218 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3001 struct coro *coro; 3219 OUTPUT:
3002 MAGIC *mg;
3003 HV *hv;
3004 SV *cb;
3005 int i;
3006
3007 if (items > 1)
3008 {
3009 cb = s_get_cv_croak (ST (1));
3010
3011 if (!ix)
3012 {
3013 if (CvISXSUB (cb))
3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3015
3016 if (!CvROOT (cb))
3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
3019 }
3020
3021 Newz (0, coro, 1, struct coro);
3022 coro->args = newAV ();
3023 coro->flags = CF_NEW;
3024
3025 if (coro_first) coro_first->prev = coro;
3026 coro->next = coro_first;
3027 coro_first = coro;
3028
3029 coro->hv = hv = newHV ();
3030 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3031 mg->mg_flags |= MGf_DUP;
3032 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3033
3034 if (items > 1)
3035 {
3036 av_extend (coro->args, items - 1 + ix - 1);
3037
3038 if (ix)
3039 {
3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
3046 for (i = 2; i < items; i++)
3047 av_push (coro->args, newSVsv (ST (i)));
3048 }
3049}
3050 OUTPUT:
3051 RETVAL 3220 RETVAL
3052 3221
3053void 3222void
3054transfer (...) 3223transfer (...)
3055 PROTOTYPE: $$ 3224 PROTOTYPE: $$
3056 CODE: 3225 CODE:
3057 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3226 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3058
3059bool
3060_destroy (SV *coro_sv)
3061 CODE:
3062 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3063 OUTPUT:
3064 RETVAL
3065 3227
3066void 3228void
3067_exit (int code) 3229_exit (int code)
3068 PROTOTYPE: $ 3230 PROTOTYPE: $
3069 CODE: 3231 CODE:
… …
3192 RETVAL = boolSV (coro->flags & ix); 3354 RETVAL = boolSV (coro->flags & ix);
3193 OUTPUT: 3355 OUTPUT:
3194 RETVAL 3356 RETVAL
3195 3357
3196void 3358void
3197throw (Coro::State self, SV *throw = &PL_sv_undef) 3359throw (Coro::State self, SV *exception = &PL_sv_undef)
3198 PROTOTYPE: $;$ 3360 PROTOTYPE: $;$
3199 CODE: 3361 CODE:
3200{ 3362{
3201 struct coro *current = SvSTATE_current; 3363 struct coro *current = SvSTATE_current;
3202 SV **throwp = self == current ? &CORO_THROW : &self->except; 3364 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3203 SvREFCNT_dec (*throwp); 3365 SvREFCNT_dec (*exceptionp);
3204 SvGETMAGIC (throw); 3366 SvGETMAGIC (exception);
3205 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3367 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3206} 3368}
3207 3369
3208void 3370void
3209api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3371api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3210 PROTOTYPE: $;$ 3372 PROTOTYPE: $;$
… …
3265 3427
3266void 3428void
3267cancel (Coro::State self) 3429cancel (Coro::State self)
3268 CODE: 3430 CODE:
3269 coro_state_destroy (aTHX_ self); 3431 coro_state_destroy (aTHX_ self);
3270 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3271
3272 3432
3273SV * 3433SV *
3274enable_times (int enabled = enable_times) 3434enable_times (int enabled = enable_times)
3275 CODE: 3435 CODE:
3276{ 3436{
… …
3304 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3464 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3305 3465
3306 if (expect_false (current == self)) 3466 if (expect_false (current == self))
3307 coro_times_sub (SvSTATE (coro_current)); 3467 coro_times_sub (SvSTATE (coro_current));
3308} 3468}
3469
3470void
3471swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3472 CODE:
3473{
3474 struct coro *current = SvSTATE_current;
3475
3476 if (current == coro)
3477 SWAP_SVS (current);
3478
3479 if (!coro->swap_sv)
3480 coro->swap_sv = newAV ();
3481
3482 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3483 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3484
3485 if (current == coro)
3486 SWAP_SVS (current);
3487}
3488
3309 3489
3310MODULE = Coro::State PACKAGE = Coro 3490MODULE = Coro::State PACKAGE = Coro
3311 3491
3312BOOT: 3492BOOT:
3313{ 3493{
… …
3322 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3502 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3323 3503
3324 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3504 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3325 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3505 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3326 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3506 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3327 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3507 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3328 3508
3329 coro_stash = gv_stashpv ("Coro", TRUE); 3509 coro_stash = gv_stashpv ("Coro", TRUE);
3330 3510
3331 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3511 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3332 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3512 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3333 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3513 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3351 sv_setiv (sv, (IV)&coroapi); 3531 sv_setiv (sv, (IV)&coroapi);
3352 SvREADONLY_on (sv); 3532 SvREADONLY_on (sv);
3353 } 3533 }
3354} 3534}
3355 3535
3536SV *
3537async (...)
3538 PROTOTYPE: &@
3539 CODE:
3540 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3541 api_ready (aTHX_ RETVAL);
3542 OUTPUT:
3543 RETVAL
3544
3545void
3546_destroy (Coro::State coro)
3547 CODE:
3548 /* used by the manager thread */
3549 coro_state_destroy (aTHX_ coro);
3550 coro_call_on_destroy (aTHX_ coro);
3551
3356void 3552void
3357terminate (...) 3553terminate (...)
3358 CODE: 3554 CODE:
3359 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3555 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3556
3557void
3558cancel (...)
3559 CODE:
3560 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3360 3561
3361void 3562void
3362schedule (...) 3563schedule (...)
3363 CODE: 3564 CODE:
3364 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3565 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3394_set_readyhook (SV *hook) 3595_set_readyhook (SV *hook)
3395 PROTOTYPE: $ 3596 PROTOTYPE: $
3396 CODE: 3597 CODE:
3397 SvREFCNT_dec (coro_readyhook); 3598 SvREFCNT_dec (coro_readyhook);
3398 SvGETMAGIC (hook); 3599 SvGETMAGIC (hook);
3600 if (SvOK (hook))
3601 {
3399 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3602 coro_readyhook = newSVsv (hook);
3603 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3604 }
3605 else
3606 {
3607 coro_readyhook = 0;
3608 CORO_READYHOOK = 0;
3609 }
3400 3610
3401int 3611int
3402prio (Coro::State coro, int newprio = 0) 3612prio (Coro::State coro, int newprio = 0)
3403 PROTOTYPE: $;$ 3613 PROTOTYPE: $;$
3404 ALIAS: 3614 ALIAS:
… …
3468 for (i = 1; i < items; ++i) 3678 for (i = 1; i < items; ++i)
3469 av_push (av, SvREFCNT_inc_NN (ST (i))); 3679 av_push (av, SvREFCNT_inc_NN (ST (i)));
3470 3680
3471 if ((SV *)hv == &PL_sv_undef) 3681 if ((SV *)hv == &PL_sv_undef)
3472 { 3682 {
3473 PUSHMARK (SP); 3683 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3474 EXTEND (SP, 2);
3475 PUSHs (sv_Coro);
3476 PUSHs ((SV *)cv_pool_handler);
3477 PUTBACK;
3478 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3479 SPAGAIN;
3480
3481 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3684 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3685 SvREFCNT_dec (sv);
3482 } 3686 }
3483 3687
3484 { 3688 {
3485 struct coro *coro = SvSTATE_hv (hv); 3689 struct coro *coro = SvSTATE_hv (hv);
3486 3690
… …
3758 { 3962 {
3759 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 3963 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3760 coro_old_pp_sselect = 0; 3964 coro_old_pp_sselect = 0;
3761 } 3965 }
3762 3966
3763

Diff Legend

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