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.362 by root, Wed Jul 1 07:58:45 2009 UTC vs.
Revision 1.374 by root, Fri Oct 2 19:55:59 2009 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
… …
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
117#endif 64#endif
118 65
119#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
… …
201static SV *sv_pool_size; 148static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 152static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 153
208/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
209static SV *sv_activity; 155static SV *sv_activity;
210 156
211/* enable processtime/realtime profiling */ 157/* enable processtime/realtime profiling */
… …
310 256
311 /* on_enter/on_leave */ 257 /* on_enter/on_leave */
312 AV *on_enter; 258 AV *on_enter;
313 AV *on_leave; 259 AV *on_leave;
314 260
261 /* swap_sv */
262 AV *swap_sv;
263
315 /* times */ 264 /* times */
316 coro_ts t_cpu, t_real; 265 coro_ts t_cpu, t_real;
317 266
318 /* linked list */ 267 /* linked list */
319 struct coro *next, *prev; 268 struct coro *next, *prev;
… …
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
344static struct coro *coro_first; 293static struct coro *coro_first;
345#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
346 295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
315
347/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
348 317
349static SV * 318static SV *
350coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
351{ 320{
… …
372#if PERL_VERSION_ATLEAST (5,10,0) 341#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 343 get_hv (name, create);
375#endif 344#endif
376 return get_hv (name, create); 345 return get_hv (name, create);
377}
378
379/* may croak */
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391} 346}
392 347
393INLINE void 348INLINE void
394coro_times_update () 349coro_times_update ()
395{ 350{
… …
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 560}
606 561
607/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
608 563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
609static void 615static void
610on_enterleave_call (pTHX_ SV *cb); 616on_enterleave_call (pTHX_ SV *cb);
611 617
612static void 618static void
613load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
… …
659 int i; 665 int i;
660 666
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 669 }
670
671 SWAP_SVS (c);
664} 672}
665 673
666static void 674static void
667save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
668{ 676{
677 SWAP_SVS (c);
678
669 if (expect_false (c->on_leave)) 679 if (expect_false (c->on_leave))
670 { 680 {
671 int i; 681 int i;
672 682
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
708 { 718 {
709 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
710 720
711 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
712 { 722 {
713 EXTEND (SP, 3);
714 PUSHs ((SV *)CvPADLIST (cv)); 723 PUSHs ((SV *)CvPADLIST (cv));
715 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
716 PUSHs ((SV *)cv); 725 PUSHs ((SV *)cv);
717 726
718 CvDEPTH (cv) = 0; 727 CvDEPTH (cv) = 0;
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 989slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 990{
982 return 1; 991 return 1;
983} 992}
984 993
985static UNOP coro_setup_op; 994static UNOP init_perl_op;
986 995
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 996static void NOINLINE /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 997init_perl (pTHX_ struct coro *coro)
989{ 998{
990 /* 999 /*
991 * emulate part of the perl startup here. 1000 * emulate part of the perl startup here.
992 */ 1001 */
993 coro_init_stacks (aTHX); 1002 coro_init_stacks (aTHX);
… …
1042 */ 1051 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1045 1054
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1047 coro_setup_op.op_next = PL_op; 1056 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1057 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1058 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1059 /* no flags etc. required, as an init function won't be called */
1051 1060
1052 PL_op = (OP *)&coro_setup_op; 1061 PL_op = (OP *)&init_perl_op;
1053 1062
1054 /* copy throw, in case it was set before coro_setup */ 1063 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1064 CORO_THROW = coro->except;
1065
1066 SWAP_SVS (coro);
1056 1067
1057 if (expect_false (enable_times)) 1068 if (expect_false (enable_times))
1058 { 1069 {
1059 coro_times_update (); 1070 coro_times_update ();
1060 coro_times_sub (coro); 1071 coro_times_sub (coro);
… …
1081 dounwind (-1); 1092 dounwind (-1);
1082 } 1093 }
1083} 1094}
1084 1095
1085static void 1096static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1097destroy_perl (pTHX_ struct coro *coro)
1087{ 1098{
1088 SV *svf [9]; 1099 SV *svf [9];
1089 1100
1090 { 1101 {
1091 struct coro *current = SvSTATE_current; 1102 struct coro *current = SvSTATE_current;
… …
1095 save_perl (aTHX_ current); 1106 save_perl (aTHX_ current);
1096 load_perl (aTHX_ coro); 1107 load_perl (aTHX_ coro);
1097 1108
1098 coro_unwind_stacks (aTHX); 1109 coro_unwind_stacks (aTHX);
1099 coro_destruct_stacks (aTHX); 1110 coro_destruct_stacks (aTHX);
1111
1112 /* restore swapped sv's */
1113 SWAP_SVS (coro);
1100 1114
1101 // now save some sv's to be free'd later 1115 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1116 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1117 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1118 svf [2] = GvSV (PL_errgv);
… …
1121 1135
1122 SvREFCNT_dec (coro->saved_deffh); 1136 SvREFCNT_dec (coro->saved_deffh);
1123 SvREFCNT_dec (coro->rouse_cb); 1137 SvREFCNT_dec (coro->rouse_cb);
1124 SvREFCNT_dec (coro->invoke_cb); 1138 SvREFCNT_dec (coro->invoke_cb);
1125 SvREFCNT_dec (coro->invoke_av); 1139 SvREFCNT_dec (coro->invoke_av);
1140 SvREFCNT_dec (coro->swap_sv);
1126 } 1141 }
1127} 1142}
1128 1143
1129INLINE void 1144INLINE void
1130free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1343 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1331 /* 1346 /*
1332 * Unfortunately, there is no way to get at the return values of the 1347 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1350 */
1335 1351
1336 /* 1352 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1353 * If perl-run returns we assume exit() was being called or the coro
1338 * fell off the end, which seems to be the only valid (non-bug) 1354 * fell off the end, which seems to be the only valid (non-bug)
… …
1545 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1546 { 1562 {
1547 /* need to start coroutine */ 1563 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1565 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1551 } 1567 }
1552 else 1568 else
1553 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1554 1570
1555 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
… …
1618 1634
1619 if (coro->mainstack 1635 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1636 && coro->mainstack != main_mainstack
1621 && coro->slot 1637 && coro->slot
1622 && !PL_dirty) 1638 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1639 destroy_perl (aTHX_ coro);
1624 1640
1625 cctx_destroy (coro->cctx); 1641 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1642 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1643 SvREFCNT_dec (coro->args);
1628 SvREFCNT_dec (CORO_THROW); 1644 SvREFCNT_dec (CORO_THROW);
… …
1687 1703
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1704 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1705 TRANSFER (ta, 1);
1690} 1706}
1691 1707
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1708/** Coro ********************************************************************/
1716 1709
1717INLINE void 1710INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1711coro_enq (pTHX_ struct coro *coro)
1719{ 1712{
… …
1744 } 1737 }
1745 1738
1746 return 0; 1739 return 0;
1747} 1740}
1748 1741
1742static void
1743invoke_sv_ready_hook_helper (void)
1744{
1745 dTHX;
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1757}
1758
1749static int 1759static int
1750api_ready (pTHX_ SV *coro_sv) 1760api_ready (pTHX_ SV *coro_sv)
1751{ 1761{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1762 struct coro *coro = SvSTATE (coro_sv);
1757 1763
1758 if (coro->flags & CF_READY) 1764 if (coro->flags & CF_READY)
1759 return 0; 1765 return 0;
1760 1766
1761 coro->flags |= CF_READY; 1767 coro->flags |= CF_READY;
1762 1768
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1769 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1770
1769 if (sv_hook) 1771 if (!coro_nready++)
1770 { 1772 if (coroapi.readyhook)
1771 dSP; 1773 coroapi.readyhook ();
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_hook, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783
1784 if (xs_hook)
1785 xs_hook ();
1786 1774
1787 return 1; 1775 return 1;
1788} 1776}
1789 1777
1790static int 1778static int
… …
1841 api_ready (aTHX_ SvRV (sv_idle)); 1829 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1830 --coro_nready;
1843 } 1831 }
1844 else 1832 else
1845 { 1833 {
1834 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1835 dSP;
1847 1836
1848 ENTER; 1837 ENTER;
1849 SAVETMPS; 1838 SAVETMPS;
1850 1839
… …
1996{ 1985{
1997 int i; 1986 int i;
1998 HV *hv = (HV *)SvRV (coro_current); 1987 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV (); 1988 AV *av = newAV ();
2000 1989
1990 /* items are actually not so common, so optimise for this case */
1991 if (items)
1992 {
2001 av_extend (av, items - 1); 1993 av_extend (av, items - 1);
1994
2002 for (i = 0; i < items; ++i) 1995 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 1996 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 }
2004 1998
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2006 2000
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2002 api_ready (aTHX_ sv_manager);
… …
2098 2092
2099static void 2093static void
2100coro_rouse_callback (pTHX_ CV *cv) 2094coro_rouse_callback (pTHX_ CV *cv)
2101{ 2095{
2102 dXSARGS; 2096 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2097 SV *data = (SV *)S_GENSUB_ARG;
2104 2098
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2099 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2100 {
2107 /* first call, set args */ 2101 /* first call, set args */
2108 SV *coro = SvRV (data); 2102 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2168 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2170 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2171
2178 { 2172 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2174 SV *data = (SV *)S_GENSUB_ARG;
2181 2175
2182 frame->data = (void *)data; 2176 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2177 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2178 frame->check = slf_check_rouse_wait;
2185 } 2179 }
… …
2189coro_new_rouse_cb (pTHX) 2183coro_new_rouse_cb (pTHX)
2190{ 2184{
2191 HV *hv = (HV *)SvRV (coro_current); 2185 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2186 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2187 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2188 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2189
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2190 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2191 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2192
2199 SvREFCNT_dec (coro->rouse_cb); 2193 SvREFCNT_dec (coro->rouse_cb);
… …
2722{ 2716{
2723 if (items >= 2) 2717 if (items >= 2)
2724 { 2718 {
2725 /* callback form */ 2719 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 2720 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 2722
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 2724
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 2725 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 2726 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 2786{
2793 AV *av = (AV *)SvRV (arg [0]); 2787 AV *av = (AV *)SvRV (arg [0]);
2794 2788
2795 if (items >= 2) 2789 if (items >= 2)
2796 { 2790 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2791 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2792 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 2793
2800 if (SvIVX (AvARRAY (av)[0])) 2794 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2802 2796
… …
2837 2831
2838static void 2832static void
2839coro_aio_callback (pTHX_ CV *cv) 2833coro_aio_callback (pTHX_ CV *cv)
2840{ 2834{
2841 dXSARGS; 2835 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 2836 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 2837 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 2838 SV *data_sv = newSV (sizeof (struct io_state));
2845 2839
2846 av_extend (state, items - 1); 2840 av_extend (state, items - 1);
2847 2841
… …
2961 2955
2962 for (i = 0; i < items; ++i) 2956 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 2957 PUSHs (arg [i]);
2964 2958
2965 /* now push the callback closure */ 2959 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2960 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 2961
2968 /* now call the AIO function - we assume our request is uncancelable */ 2962 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 2963 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 2964 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 2965 }
… …
2989/*****************************************************************************/ 2983/*****************************************************************************/
2990 2984
2991#if CORO_CLONE 2985#if CORO_CLONE
2992# include "clone.c" 2986# include "clone.c"
2993#endif 2987#endif
2988
2989/*****************************************************************************/
2990
2991static SV *
2992coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2993{
2994 SV *coro_sv;
2995 struct coro *coro;
2996 MAGIC *mg;
2997 HV *hv;
2998 SV *cb;
2999 int i;
3000
3001 if (argc > 0)
3002 {
3003 cb = s_get_cv_croak (argv [0]);
3004
3005 if (!is_coro)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3027
3028 if (argc > 0)
3029 {
3030 av_extend (coro->args, argc + is_coro - 1);
3031
3032 if (is_coro)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = (SV *)cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 1; i < argc; i++)
3041 av_push (coro->args, newSVsv (argv [i]));
3042 }
3043
3044 return coro_sv;
3045}
2994 3046
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3048
2997PROTOTYPES: DISABLE 3049PROTOTYPES: DISABLE
2998 3050
… …
3067 3119
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3069} 3121}
3070 3122
3071SV * 3123SV *
3072new (char *klass, ...) 3124new (SV *klass, ...)
3073 ALIAS: 3125 ALIAS:
3074 Coro::new = 1 3126 Coro::new = 1
3075 CODE: 3127 CODE:
3076{ 3128 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3129 OUTPUT:
3078 MAGIC *mg;
3079 HV *hv;
3080 CV *cb;
3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
3096
3097 Newz (0, coro, 1, struct coro);
3098 coro->args = newAV ();
3099 coro->flags = CF_NEW;
3100
3101 if (coro_first) coro_first->prev = coro;
3102 coro->next = coro_first;
3103 coro_first = coro;
3104
3105 coro->hv = hv = newHV ();
3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3107 mg->mg_flags |= MGf_DUP;
3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3109
3110 if (items > 1)
3111 {
3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
3122 for (i = 2; i < items; i++)
3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
3125}
3126 OUTPUT:
3127 RETVAL 3130 RETVAL
3128 3131
3129void 3132void
3130transfer (...) 3133transfer (...)
3131 PROTOTYPE: $$ 3134 PROTOTYPE: $$
… …
3381 3384
3382 if (expect_false (current == self)) 3385 if (expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3386 coro_times_sub (SvSTATE (coro_current));
3384} 3387}
3385 3388
3389void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3391 CODE:
3392{
3393 struct coro *current = SvSTATE_current;
3394
3395 if (current == coro)
3396 SWAP_SVS (current);
3397
3398 if (!coro->swap_sv)
3399 coro->swap_sv = newAV ();
3400
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (sv));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (swapsv));
3403
3404 if (current == coro)
3405 SWAP_SVS (current);
3406}
3407
3408
3386MODULE = Coro::State PACKAGE = Coro 3409MODULE = Coro::State PACKAGE = Coro
3387 3410
3388BOOT: 3411BOOT:
3389{ 3412{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3422
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3403 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3427
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3428 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3429
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3450 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3451 SvREADONLY_on (sv);
3429 } 3452 }
3430} 3453}
3431 3454
3455SV *
3456async (...)
3457 PROTOTYPE: &@
3458 CODE:
3459 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3460 api_ready (aTHX_ RETVAL);
3461 OUTPUT:
3462 RETVAL
3463
3432void 3464void
3433terminate (...) 3465terminate (...)
3434 CODE: 3466 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3467 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3436 3468
… …
3470_set_readyhook (SV *hook) 3502_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3503 PROTOTYPE: $
3472 CODE: 3504 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3505 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3506 SvGETMAGIC (hook);
3507 if (SvOK (hook))
3508 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3509 coro_readyhook = newSVsv (hook);
3510 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3511 }
3512 else
3513 {
3514 coro_readyhook = 0;
3515 CORO_READYHOOK = 0;
3516 }
3476 3517
3477int 3518int
3478prio (Coro::State coro, int newprio = 0) 3519prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3520 PROTOTYPE: $;$
3480 ALIAS: 3521 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3585 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3586 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3587
3547 if ((SV *)hv == &PL_sv_undef) 3588 if ((SV *)hv == &PL_sv_undef)
3548 { 3589 {
3549 PUSHMARK (SP); 3590 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3550 EXTEND (SP, 2);
3551 PUSHs (sv_Coro);
3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3591 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3592 SvREFCNT_dec (sv);
3558 } 3593 }
3559 3594
3560 { 3595 {
3561 struct coro *coro = SvSTATE_hv (hv); 3596 struct coro *coro = SvSTATE_hv (hv);
3562 3597
… …
3596 CODE: 3631 CODE:
3597{ 3632{
3598 struct coro *coro = SvSTATE_current; 3633 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 3635
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 3636 block = s_get_cv_croak (block);
3602 3637
3603 if (!*avp) 3638 if (!*avp)
3604 *avp = newAV (); 3639 *avp = newAV ();
3605 3640
3606 av_push (*avp, SvREFCNT_inc (block)); 3641 av_push (*avp, SvREFCNT_inc (block));
… …
3806 3841
3807void 3842void
3808_register (char *target, char *proto, SV *req) 3843_register (char *target, char *proto, SV *req)
3809 CODE: 3844 CODE:
3810{ 3845{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 3846 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 3847 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3848 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 3849 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3850 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 3851}
3817 3852
3853MODULE = Coro::State PACKAGE = Coro::Select
3854
3855void
3856patch_pp_sselect ()
3857 CODE:
3858 if (!coro_old_pp_sselect)
3859 {
3860 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3861 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3862 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3863 }
3864
3865void
3866unpatch_pp_sselect ()
3867 CODE:
3868 if (coro_old_pp_sselect)
3869 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0;
3872 }
3873
3874

Diff Legend

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