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.268 by root, Fri Nov 14 06:41:41 2008 UTC vs.
Revision 1.273 by root, Fri Nov 14 23:48:10 2008 UTC

183static JMPENV *main_top_env; 183static JMPENV *main_top_env;
184static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next; 186static volatile struct coro *transfer_next;
187 187
188struct transfer_args
189{
190 struct coro *prev, *next;
191};
192
193static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
194static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
195static SV *rv_diehook; 190static SV *rv_diehook;
196static SV *rv_warnhook; 191static SV *rv_warnhook;
197static HV *hv_sig; /* %SIG */ 192static HV *hv_sig; /* %SIG */
215 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
216 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
217}; 212};
218 213
219/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
220typedef struct coro_cctx { 215typedef struct coro_cctx
216{
221 struct coro_cctx *next; 217 struct coro_cctx *next;
222 218
223 /* the stack */ 219 /* the stack */
224 void *sptr; 220 void *sptr;
225 size_t ssize; 221 size_t ssize;
243 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
244 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
245}; 241};
246 242
247/* the structure where most of the perl state is stored, overlaid on the cxstack */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
248typedef struct { 244typedef struct
245{
249 SV *defsv; 246 SV *defsv;
250 AV *defav; 247 AV *defav;
251 SV *errsv; 248 SV *errsv;
252 SV *irsgv; 249 SV *irsgv;
253#define VAR(name,type) type name; 250#define VAR(name,type) type name;
257 254
258#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 256
260/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
261struct coro { 258struct coro {
262 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 260 coro_cctx *cctx;
264 261
265 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
266 AV *mainstack; 264 AV *mainstack;
267 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
268 266
269 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
270 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
285 struct coro *next, *prev; 283 struct coro *next, *prev;
286}; 284};
287 285
288typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
289typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
290 290
291/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
292 292
293#define PRIO_MAX 3 293#define PRIO_MAX 3
294#define PRIO_HIGH 1 294#define PRIO_HIGH 1
299 299
300/* for Coro.pm */ 300/* for Coro.pm */
301static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook; 302static SV *coro_readyhook;
303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
304static int coro_nready;
305static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
306 306
307/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
308 308
309static SV * 309static SV *
310coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
514 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
515 } 515 }
516 516
517 PUTBACK; 517 PUTBACK;
518 } 518 }
519
520 slf_frame = c->slf_frame;
519} 521}
520 522
521static void 523static void
522save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
523{ 525{
526 c->slf_frame = slf_frame;
527
524 { 528 {
525 dSP; 529 dSP;
526 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
527 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
528 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
595 #undef VAR 599 #undef VAR
596 } 600 }
597} 601}
598 602
599/* 603/*
600 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
601 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
602 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
603 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
604 */ 608 */
605#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
712#endif 716#endif
713 } 717 }
714 } 718 }
715 719
716 return rss; 720 return rss;
717}
718
719/** set stacklevel support **************************************************/
720
721/* we sometimes need to create the effect of pp_set_stacklevel calling us */
722#define SSL_HEAD (void)0
723/* we sometimes need to create the effect of leaving via pp_set_stacklevel */
724#define SSL_TAIL set_stacklevel_tail (aTHX)
725
726INLINE void
727set_stacklevel_tail (pTHX)
728{
729 dSP;
730 SV **bot = SP;
731
732 int gimme = GIMME_V;
733
734 /* make sure we put something on the stack in scalar context */
735 if (gimme == G_SCALAR)
736 {
737 if (sp == bot)
738 XPUSHs (&PL_sv_undef);
739
740 SP = bot + 1;
741 }
742
743 PUTBACK;
744} 721}
745 722
746/** coroutine stack handling ************************************************/ 723/** coroutine stack handling ************************************************/
747 724
748static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 725static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
834 811
835 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
836} 813}
837 814
838static void 815static void
816prepare_nop (aTHX_ struct coro_transfer_args *ta)
817{
818 /* kind of mega-hacky, but works */
819 ta->next = ta->prev = (struct coro *)ta;
820}
821
822static int
823slf_check_nop (aTHX)
824{
825 return 0;
826}
827
828static void
839coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
840{ 830{
841 /* 831 /*
842 * emulate part of the perl startup here. 832 * emulate part of the perl startup here.
843 */ 833 */
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN; 873 SPAGAIN;
884 } 874 }
885 875
886 /* this newly created coroutine might be run on an existing cctx which most 876 /* this newly created coroutine might be run on an existing cctx which most
887 * likely was suspended in set_stacklevel, called from pp_set_stacklevel, 877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 * so we have to emulate entering pp_set_stacklevel here.
889 */ 878 */
890 SSL_HEAD; 879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891} 881}
892 882
893static void 883static void
894coro_destruct (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
895{ 885{
1059 TAINT_NOT; 1049 TAINT_NOT;
1060 return 0; 1050 return 0;
1061} 1051}
1062 1052
1063static void 1053static void
1064prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx) 1054prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1065{ 1055{
1066 ta->prev = (struct coro *)cctx; 1056 ta->prev = (struct coro *)cctx;
1067 ta->next = 0; 1057 ta->next = 0;
1068} 1058}
1069 1059
1129# endif 1119# endif
1130#endif 1120#endif
1131 { 1121 {
1132 dTHX; 1122 dTHX;
1133 1123
1134 /* we are the alternative tail to pp_set_stacklevel */ 1124 /* normally we would need to skip the entersub here */
1135 /* so do the same things here */ 1125 /* not doing so will re-execute it, which is exactly what we want */
1136 SSL_TAIL;
1137
1138 /* we now skip the op that did lead to transfer() */
1139 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
1140 1127
1141 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
1142 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
1143 1130
1144 /* cctx_run is the alternative tail of transfer() */ 1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1145 transfer_tail (aTHX); 1133 transfer_tail (aTHX);
1146 1134
1147 /* somebody or something will hit me for both perl_run and PL_restartop */ 1135 /* somebody or something will hit me for both perl_run and PL_restartop */
1148 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
1149 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
1308transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1309{ 1297{
1310 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1311 { 1299 {
1312 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1313 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1301 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1314 1302
1315 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1316 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1304 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1317 1305
1318 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1319 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1307 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1320 1308
1321#if !PERL_VERSION_ATLEAST (5,10,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1322 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1323 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version"); 1311 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1324#endif 1312#endif
1325 } 1313 }
1326} 1314}
1327 1315
1328/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1435 1423
1436 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1437 { 1425 {
1438 struct coro temp; 1426 struct coro temp;
1439 1427
1440 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1441 croak ("FATAL: tried to destroy currently running coroutine");
1442 1429
1443 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1444 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1445 1432
1446 coro_destruct (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1497# define MGf_DUP 0 1484# define MGf_DUP 0
1498#endif 1485#endif
1499}; 1486};
1500 1487
1501static void 1488static void
1502prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1489prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1503{ 1490{
1504 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1505 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1506 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1507} 1494}
1508 1495
1509static void 1496static void
1510api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1511{ 1498{
1512 dTHX;
1513 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1514 1500
1515 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1516 TRANSFER (ta, 1); 1502 TRANSFER (ta, 1);
1517} 1503}
1518 1504
1535 1521
1536 return 0; 1522 return 0;
1537} 1523}
1538 1524
1539static int 1525static int
1540api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1541{ 1527{
1542 dTHX;
1543 struct coro *coro; 1528 struct coro *coro;
1544 SV *sv_hook; 1529 SV *sv_hook;
1545 void (*xs_hook)(void); 1530 void (*xs_hook)(void);
1546 1531
1547 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1585 1570
1586 return 1; 1571 return 1;
1587} 1572}
1588 1573
1589static int 1574static int
1590api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1591{ 1576{
1592 dTHX;
1593
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1578}
1596 1579
1597INLINE void 1580INLINE void
1598prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1599{ 1582{
1600 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1601 1584
1602 for (;;) 1585 for (;;)
1603 { 1586 {
1652 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1653 UNLOCK; 1636 UNLOCK;
1654} 1637}
1655 1638
1656INLINE void 1639INLINE void
1657prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1658{ 1641{
1659 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1660 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1661} 1644}
1662 1645
1663static void 1646INLINE void
1664prepare_cede_notself (pTHX_ struct transfer_args *ta) 1647prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1665{ 1648{
1666 SV *prev = SvRV (coro_current); 1649 SV *prev = SvRV (coro_current);
1667 1650
1668 if (coro_nready) 1651 if (coro_nready)
1669 { 1652 {
1670 prepare_schedule (aTHX_ ta); 1653 prepare_schedule (aTHX_ ta);
1671 api_ready (prev); 1654 api_ready (aTHX_ prev);
1672 } 1655 }
1673 else 1656 else
1674 ta->prev = ta->next = SvSTATE (prev); 1657 prepare_nop (aTHX_ ta);
1675} 1658}
1676 1659
1677static void 1660static void
1678api_schedule (void) 1661api_schedule (pTHX)
1679{ 1662{
1680 dTHX;
1681 struct transfer_args ta; 1663 struct coro_transfer_args ta;
1682 1664
1683 prepare_schedule (aTHX_ &ta); 1665 prepare_schedule (aTHX_ &ta);
1684 TRANSFER (ta, 1); 1666 TRANSFER (ta, 1);
1685} 1667}
1686 1668
1687static int 1669static int
1688api_cede (void) 1670api_cede (pTHX)
1689{ 1671{
1690 dTHX;
1691 struct transfer_args ta; 1672 struct coro_transfer_args ta;
1692 1673
1693 prepare_cede (aTHX_ &ta); 1674 prepare_cede (aTHX_ &ta);
1694 1675
1695 if (expect_true (ta.prev != ta.next)) 1676 if (expect_true (ta.prev != ta.next))
1696 { 1677 {
1700 else 1681 else
1701 return 0; 1682 return 0;
1702} 1683}
1703 1684
1704static int 1685static int
1705api_cede_notself (void) 1686api_cede_notself (pTHX)
1706{ 1687{
1707 if (coro_nready) 1688 if (coro_nready)
1708 { 1689 {
1709 dTHX;
1710 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1711 1691
1712 prepare_cede_notself (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1713 TRANSFER (ta, 1); 1693 TRANSFER (ta, 1);
1714 return 1; 1694 return 1;
1715 } 1695 }
1716 else 1696 else
1717 return 0; 1697 return 0;
1718} 1698}
1719 1699
1720static void 1700static void
1721api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1722{ 1702{
1723 dTHX;
1724 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1725 1704
1726 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1727 { 1706 {
1728 if (!coro->cctx) 1707 if (!coro->cctx)
1729 coro->cctx = cctx_new_run (); 1708 coro->cctx = cctx_new_run ();
1730 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1731 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1732 1711
1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1734 } 1713 }
1735 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1736 { 1715 {
1795 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 1774 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1796 double now = nvtime (); 1775 double now = nvtime ();
1797 1776
1798 if (now >= self->next) 1777 if (now >= self->next)
1799 { 1778 {
1800 api_cede (); 1779 api_cede (aTHX);
1801 self->next = now + self->every; 1780 self->next = now + self->every;
1802 } 1781 }
1803 1782
1804 return PerlIOBuf_flush (aTHX_ f); 1783 return PerlIOBuf_flush (aTHX_ f);
1805} 1784}
1836 PerlIOBuf_set_ptrcnt, 1815 PerlIOBuf_set_ptrcnt,
1837}; 1816};
1838 1817
1839/*****************************************************************************/ 1818/*****************************************************************************/
1840 1819
1841static const CV *ssl_cv; /* for quick consistency check */ 1820static const CV *slf_cv; /* for quick consistency check */
1842 1821
1843static UNOP ssl_restore; /* restore stack as entersub did, for first-re-run */ 1822static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1844static SV *ssl_arg0; 1823static SV *slf_arg0;
1845static SV *ssl_arg1; 1824static SV *slf_arg1;
1825static SV *slf_arg2;
1846 1826
1847/* this restores the stack in the case we patched the entersub, to */ 1827/* this restores the stack in the case we patched the entersub, to */
1848/* recreate the stack frame as perl will on following calls */ 1828/* recreate the stack frame as perl will on following calls */
1849/* since entersub cleared the stack */ 1829/* since entersub cleared the stack */
1850static OP * 1830static OP *
1853 dSP; 1833 dSP;
1854 1834
1855 PUSHMARK (SP); 1835 PUSHMARK (SP);
1856 1836
1857 EXTEND (SP, 3); 1837 EXTEND (SP, 3);
1858 if (ssl_arg0) PUSHs (sv_2mortal (ssl_arg0)), ssl_arg0 = 0; 1838 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1859 if (ssl_arg1) PUSHs (sv_2mortal (ssl_arg1)), ssl_arg1 = 0; 1839 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1840 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1860 PUSHs ((SV *)CvGV (ssl_cv)); 1841 PUSHs ((SV *)CvGV (slf_cv));
1861 1842
1862 RETURNOP (ssl_restore.op_first); 1843 RETURNOP (slf_restore.op_first);
1863} 1844}
1864 1845
1865#define OPpENTERSUB_SSL 15 /* the part of op_private entersub hopefully doesn't use */ 1846static void
1847slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1848{
1849 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1850}
1866 1851
1867/* declare prototype */ 1852static void
1868XS(XS_Coro__State__set_stacklevel); 1853slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1854{
1855 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1856
1857 frame->prepare = slf_prepare_set_stacklevel;
1858 frame->check = slf_check_nop;
1859 frame->data = (void *)SvIV (arg [0]);
1860}
1861
1862static void
1863slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1864{
1865 SV **arg = (SV **)slf_frame.data;
1866
1867 prepare_transfer (ta, arg [0], arg [1]);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1875
1876 frame->prepare = slf_prepare_transfer;
1877 frame->check = slf_check_nop;
1878 frame->data = (void *)arg; /* let's hope it will stay valid */
1879}
1880
1881static void
1882slf_init_schedule (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1883{
1884 frame->prepare = prepare_schedule;
1885 frame->check = slf_check_nop;
1886}
1887
1888static void
1889slf_init_cede (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1890{
1891 frame->prepare = prepare_cede;
1892 frame->check = slf_check_nop;
1893}
1894
1895static void
1896slf_init_cede_notself (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1897{
1898 frame->prepare = prepare_cede_notself;
1899 frame->check = slf_check_nop;
1900}
1901
1902/* we hijack an hopefully unused CV flag for our purposes */
1903#define CVf_SLF 0x4000
1869 1904
1870/* 1905/*
1871 * these not obviously related functions are all rolled into one 1906 * these not obviously related functions are all rolled into one
1872 * function to increase chances that they all will call transfer with the same 1907 * function to increase chances that they all will call transfer with the same
1873 * stack offset 1908 * stack offset
1909 * SLF stands for "schedule-like-function".
1874 */ 1910 */
1875static OP * 1911static OP *
1876pp_set_stacklevel (pTHX) 1912pp_slf (pTHX)
1877{ 1913{
1914 I32 checkmark; /* mark SP to see how many elements check has pushed */
1915
1916 /* set up the slf frame, unless it has already been set-up */
1917 /* the latter happens when a new coro has been started */
1918 /* or when a new cctx was attached to an existing coroutine */
1919 if (expect_true (!slf_frame.prepare))
1920 {
1921 /* first iteration */
1878 dSP; 1922 dSP;
1879 struct transfer_args ta;
1880 SV **arg = PL_stack_base + TOPMARK + 1; 1923 SV **arg = PL_stack_base + TOPMARK + 1;
1881 int items = SP - arg; /* args without function object */ 1924 int items = SP - arg; /* args without function object */
1925 SV *gv = *sp;
1882 1926
1883 /* do a quick consistency check on the "function" object, and if it isn't */ 1927 /* do a quick consistency check on the "function" object, and if it isn't */
1884 /* for us, divert to the real entersub */ 1928 /* for us, divert to the real entersub */
1885 if (SvTYPE (*sp) != SVt_PVGV || CvXSUB (GvCV (*sp)) != XS_Coro__State__set_stacklevel) 1929 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1886 return PL_ppaddr[OP_ENTERSUB](aTHX); 1930 return PL_ppaddr[OP_ENTERSUB](aTHX);
1887 1931
1888 /* pop args */ 1932 /* pop args */
1889 SP = PL_stack_base + POPMARK; 1933 SP = PL_stack_base + POPMARK;
1890 1934
1891 if (!(PL_op->op_flags & OPf_STACKED)) 1935 if (!(PL_op->op_flags & OPf_STACKED))
1892 { 1936 {
1893 /* ampersand-form of call, use @_ instead of stack */ 1937 /* ampersand-form of call, use @_ instead of stack */
1894 AV *av = GvAV (PL_defgv); 1938 AV *av = GvAV (PL_defgv);
1895 arg = AvARRAY (av); 1939 arg = AvARRAY (av);
1896 items = AvFILLp (av) + 1; 1940 items = AvFILLp (av) + 1;
1941 }
1942
1943 PUTBACK;
1944
1945 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr) (aTHX_ &slf_frame, arg, items);
1946 }
1947
1948 /* now interpret the slf_frame */
1949 /* we use a callback system not to make the code needlessly */
1950 /* complicated, but so we can run multiple perl coros from one cctx */
1951
1952 do
1953 {
1954 struct coro_transfer_args ta;
1955
1956 slf_frame.prepare (aTHX_ &ta);
1957 TRANSFER (ta, 0);
1958
1959 checkmark = PL_stack_sp - PL_stack_base;
1960 }
1961 while (slf_frame.check (aTHX_ &slf_frame));
1962
1963 {
1964 dSP;
1965 SV **bot = PL_stack_base + checkmark;
1966 int gimme = GIMME_V;
1967
1968 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1969
1970 /* make sure we put something on the stack in scalar context */
1971 if (gimme == G_SCALAR)
1972 {
1973 if (sp == bot)
1974 XPUSHs (&PL_sv_undef);
1975
1976 SP = bot + 1;
1897 } 1977 }
1898 1978
1899 PUTBACK; 1979 PUTBACK;
1900 switch (PL_op->op_private & OPpENTERSUB_SSL)
1901 {
1902 case 0:
1903 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1904 break;
1905
1906 case 1:
1907 if (items != 2)
1908 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1909
1910 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1911 break;
1912
1913 case 2:
1914 prepare_schedule (aTHX_ &ta);
1915 break;
1916
1917 case 3:
1918 prepare_cede (aTHX_ &ta);
1919 break;
1920
1921 case 4:
1922 prepare_cede_notself (aTHX_ &ta);
1923 break;
1924 } 1980 }
1925 1981
1926 TRANSFER (ta, 0); 1982 return NORMAL;
1927 SPAGAIN;
1928
1929skip:
1930 PUTBACK;
1931 SSL_TAIL;
1932 SPAGAIN;
1933 RETURN;
1934} 1983}
1935 1984
1936static void 1985static void
1937coro_ssl_patch (pTHX_ CV *cv, int ix, SV **args, int items) 1986api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, SV **arg, int items)
1938{ 1987{
1939 assert (("FATAL: ssl call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_set_stacklevel));
1940
1941 assert (("FATAL: ssl call with illegal CV value", CvGV (cv))); 1988 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1989
1990 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1991 && PL_op->op_ppaddr != pp_slf)
1992 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or other means, caught");
1993
1994 if (items > 3)
1995 croak ("Coro only supports up to three arguments to SLF functions currently, caught");
1996
1997 CvFLAGS (cv) |= CVf_SLF;
1998 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1942 ssl_cv = cv; 1999 slf_cv = cv;
1943 2000
1944 /* we patch the op, and then re-run the whole call */ 2001 /* we patch the op, and then re-run the whole call */
1945 /* we have to put some dummy argument on the stack for this to work */ 2002 /* we have to put the same argument on the stack for this to work */
2003 /* and this will be done by pp_restore */
1946 ssl_restore.op_next = (OP *)&ssl_restore; 2004 slf_restore.op_next = (OP *)&slf_restore;
1947 ssl_restore.op_type = OP_NULL; 2005 slf_restore.op_type = OP_NULL;
1948 ssl_restore.op_ppaddr = pp_restore; 2006 slf_restore.op_ppaddr = pp_restore;
1949 ssl_restore.op_first = PL_op; 2007 slf_restore.op_first = PL_op;
1950 2008
1951 ssl_arg0 = items > 0 ? SvREFCNT_inc (args [0]) : 0; 2009 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
1952 ssl_arg1 = items > 1 ? SvREFCNT_inc (args [1]) : 0; 2010 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2011 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
1953 2012
1954 PL_op->op_ppaddr = pp_set_stacklevel; 2013 PL_op->op_ppaddr = pp_slf;
1955 PL_op->op_private = PL_op->op_private & ~OPpENTERSUB_SSL | ix; /* we potentially share our private flags with entersub */
1956 2014
1957 PL_op = (OP *)&ssl_restore; 2015 PL_op = (OP *)&slf_restore;
1958} 2016}
1959 2017
1960MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1961 2019
1962PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1993 main_top_env = PL_top_env; 2051 main_top_env = PL_top_env;
1994 2052
1995 while (main_top_env->je_prev) 2053 while (main_top_env->je_prev)
1996 main_top_env = main_top_env->je_prev; 2054 main_top_env = main_top_env->je_prev;
1997 2055
1998 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
1999 coroapi.rev = CORO_API_REVISION; 2057 coroapi.rev = CORO_API_REVISION;
2058
2000 coroapi.transfer = api_transfer; 2059 coroapi.transfer = api_transfer;
2060
2061 coroapi.sv_state = SvSTATE_;
2062 coroapi.execute_slf = api_execute_slf;
2063 coroapi.prepare_nop = prepare_nop;
2064 coroapi.prepare_schedule = prepare_schedule;
2065 coroapi.prepare_cede = prepare_cede;
2066 coroapi.prepare_cede_notself = prepare_cede_notself;
2001 2067
2002 { 2068 {
2003 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 2069 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2004 2070
2005 if (!svp) croak ("Time::HiRes is required"); 2071 if (!svp) croak ("Time::HiRes is required");
2040 OUTPUT: 2106 OUTPUT:
2041 RETVAL 2107 RETVAL
2042 2108
2043void 2109void
2044_set_stacklevel (...) 2110_set_stacklevel (...)
2045 ALIAS: 2111 CODE:
2046 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
2047 Coro::schedule = 2 2113
2048 Coro::cede = 3 2114void
2049 Coro::cede_notself = 4 2115transfer (...)
2050 CODE: 2116 CODE:
2051 coro_ssl_patch (aTHX_ cv, ix, &ST (0), items); 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
2052 2118
2053bool 2119bool
2054_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
2055 CODE: 2121 CODE:
2056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2174 SvREFCNT_dec (self->throw); 2240 SvREFCNT_dec (self->throw);
2175 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 2241 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2176 2242
2177void 2243void
2178api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2244api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2245 C_ARGS: aTHX_ coro, flags
2179 2246
2180SV * 2247SV *
2181has_cctx (Coro::State coro) 2248has_cctx (Coro::State coro)
2182 PROTOTYPE: $ 2249 PROTOTYPE: $
2183 CODE: 2250 CODE:
2218 PROTOTYPE: $ 2285 PROTOTYPE: $
2219 ALIAS: 2286 ALIAS:
2220 swap_defav = 1 2287 swap_defav = 1
2221 CODE: 2288 CODE:
2222 if (!self->slot) 2289 if (!self->slot)
2223 croak ("cannot swap state with coroutine that has no saved state"); 2290 croak ("cannot swap state with coroutine that has no saved state,");
2224 else 2291 else
2225 { 2292 {
2226 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv); 2293 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2227 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 2294 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2228 2295
2260 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
2261 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
2262 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
2263 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
2264 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
2265 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
2266 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
2267 2334
2268 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
2269 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
2270 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
2271 } 2338 }
2272} 2339}
2340
2341void
2342schedule (...)
2343 CODE:
2344 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), items);
2345
2346void
2347cede (...)
2348 CODE:
2349 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), items);
2350
2351void
2352cede_notself (...)
2353 CODE:
2354 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), items);
2273 2355
2274void 2356void
2275_set_current (SV *current) 2357_set_current (SV *current)
2276 PROTOTYPE: $ 2358 PROTOTYPE: $
2277 CODE: 2359 CODE:
2311 2393
2312SV * 2394SV *
2313ready (SV *self) 2395ready (SV *self)
2314 PROTOTYPE: $ 2396 PROTOTYPE: $
2315 CODE: 2397 CODE:
2316 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
2317 OUTPUT: 2399 OUTPUT:
2318 RETVAL 2400 RETVAL
2319 2401
2320int 2402int
2321nready (...) 2403nready (...)
2391 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2392 2474
2393 coro->prio = 0; 2475 coro->prio = 0;
2394 2476
2395 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2396 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
2397 2479
2398 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
2399} 2481}
2400 2482
2401#if 0 2483#if 0
2473 2555
2474 av_push (av, data_sv); 2556 av_push (av, data_sv);
2475 2557
2476 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2477 2559
2478 api_ready (self); 2560 api_ready (aTHX_ self);
2479} 2561}
2480 2562
2481void 2563void
2482_set_state (SV *state) 2564_set_state (SV *state)
2483 PROTOTYPE: $ 2565 PROTOTYPE: $
2508 PROTOTYPE: @ 2590 PROTOTYPE: @
2509 CODE: 2591 CODE:
2510{ 2592{
2511 static int incede; 2593 static int incede;
2512 2594
2513 api_cede_notself (); 2595 api_cede_notself (aTHX);
2514 2596
2515 ++incede; 2597 ++incede;
2516 while (coro_nready >= incede && api_cede ()) 2598 while (coro_nready >= incede && api_cede (aTHX))
2517 ; 2599 ;
2518 2600
2519 sv_setsv (sv_activity, &PL_sv_undef); 2601 sv_setsv (sv_activity, &PL_sv_undef);
2520 if (coro_nready >= incede) 2602 if (coro_nready >= incede)
2521 { 2603 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines