[ViewVC] Diff of: cvs/Coro/Coro/State.xs

Comparing Coro/Coro/State.xs (file contents):
Revision 1.349 by root, Wed Jun 10 00:47:24 2009 UTC vs.
Revision 1.364 by root, Thu Jul 16 02:19:17 2009 UTC

…		…
6	#include "EXTERN.h"	6	#include "EXTERN.h"
7	#include "perl.h"	7	#include "perl.h"
8	#include "XSUB.h"	8	#include "XSUB.h"
9	#include "perliol.h"	9	#include "perliol.h"
10		10
11	#include "patchlevel.h"	11	#include "schmorp.h"
12		12
13	#include <stdio.h>	13	#include <stdio.h>
14	#include <errno.h>	14	#include <errno.h>
15	#include <assert.h>	15	#include <assert.h>
16		16
…		…
51	#endif	51	#endif
52		52
53	/* the maximum number of idle cctx that will be pooled */	53	/* the maximum number of idle cctx that will be pooled */
54	static int cctx_max_idle = 4;	54	static int cctx_max_idle = 4;
55		55
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	56	#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116	# undef CORO_STACKGUARD	57	# undef CORO_STACKGUARD
117	#endif	58	#endif
118		59
119	#ifndef CORO_STACKGUARD	60	#ifndef CORO_STACKGUARD
…		…
137		78
138	#define IN_DESTRUCT PL_dirty	79	#define IN_DESTRUCT PL_dirty
139		80
140	#if __GNUC__ >= 3	81	#if __GNUC__ >= 3
141	# define attribute(x) __attribute__(x)	82	# define attribute(x) __attribute__(x)
142	# define expect(expr,value) __builtin_expect ((expr),(value))	83	# define expect(expr,value) __builtin_expect ((expr), (value))
143	# define INLINE static inline	84	# define INLINE static inline
144	#else	85	#else
145	# define attribute(x)	86	# define attribute(x)
146	# define expect(expr,value) (expr)	87	# define expect(expr,value) (expr)
147	# define INLINE static	88	# define INLINE static
…		…
159	# if CORO_PTHREAD	100	# if CORO_PTHREAD
160	static void *coro_thx;	101	static void *coro_thx;
161	# endif	102	# endif
162	#endif	103	#endif
163		104
		105	#ifdef __linux
		106	# include <time.h> /* for timespec */
		107	# include <syscall.h> /* for SYS_* */
		108	# ifdef SYS_clock_gettime
		109	# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
		110	# define CORO_CLOCK_MONOTONIC 1
		111	# define CORO_CLOCK_THREAD_CPUTIME_ID 3
		112	# endif
		113	#endif
		114
164	static double (nvtime)(); / so why doesn't it take void? */	115	static double (nvtime)(); / so why doesn't it take void? */
		116	static void (*u2time)(pTHX_ UV ret[2]);
165		117
166	/* we hijack an hopefully unused CV flag for our purposes */	118	/* we hijack an hopefully unused CV flag for our purposes */
167	#define CVf_SLF 0x4000	119	#define CVf_SLF 0x4000
168	static OP *pp_slf (pTHX);	120	static OP *pp_slf (pTHX);
169		121
…		…
194	static CV *cv_pool_handler;	146	static CV *cv_pool_handler;
195	static CV *cv_coro_state_new;	147	static CV *cv_coro_state_new;
196		148
197	/* Coro::AnyEvent */	149	/* Coro::AnyEvent */
198	static SV *sv_activity;	150	static SV *sv_activity;
		151
		152	/* enable processtime/realtime profiling */
		153	static char enable_times;
		154	typedef U32 coro_ts[2];
		155	static coro_ts time_real, time_cpu;
		156	static char times_valid;
199		157
200	static struct coro_cctx *cctx_first;	158	static struct coro_cctx *cctx_first;
201	static int cctx_count, cctx_idle;	159	static int cctx_count, cctx_idle;
202		160
203	enum {	161	enum {
…		…
293		251
294	/* on_enter/on_leave */	252	/* on_enter/on_leave */
295	AV *on_enter;	253	AV *on_enter;
296	AV *on_leave;	254	AV *on_leave;
297		255
		256	/* times */
		257	coro_ts t_cpu, t_real;
		258
298	/* linked list */	259	/* linked list */
299	struct coro next, prev;	260	struct coro next, prev;
300	};	261	};
301		262
302	typedef struct coro *Coro__State;	263	typedef struct coro *Coro__State;
…		…
307	/* the mainr easonw e don't support windows process emulation */	268	/* the mainr easonw e don't support windows process emulation */
308	static struct CoroSLF slf_frame; /* the current slf frame */	269	static struct CoroSLF slf_frame; /* the current slf frame */
309		270
310	/ Coro ******************************************************************/	271	/ Coro ******************************************************************/
311		272
312	#define PRIO_MAX 3	273	#define CORO_PRIO_MAX 3
313	#define PRIO_HIGH 1	274	#define CORO_PRIO_HIGH 1
314	#define PRIO_NORMAL 0	275	#define CORO_PRIO_NORMAL 0
315	#define PRIO_LOW -1	276	#define CORO_PRIO_LOW -1
316	#define PRIO_IDLE -3	277	#define CORO_PRIO_IDLE -3
317	#define PRIO_MIN -4	278	#define CORO_PRIO_MIN -4
318		279
319	/* for Coro.pm */	280	/* for Coro.pm */
320	static SV *coro_current;	281	static SV *coro_current;
321	static SV *coro_readyhook;	282	static SV *coro_readyhook;
322	static struct coro coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; / head\|tail */	283	static struct coro coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; / head\|tail */
323	static CV cv_coro_run, cv_coro_terminate;	284	static CV cv_coro_run, cv_coro_terminate;
324	static struct coro *coro_first;	285	static struct coro *coro_first;
325	#define coro_nready coroapi.nready	286	#define coro_nready coroapi.nready
		287
		288	/ Coro::Select **********************************************************/
		289
		290	static OP (coro_old_pp_sselect) (pTHX);
		291	static SV *coro_select_select;
		292
		293	/* horrible hack, but if it works... */
		294	static OP *
		295	coro_pp_sselect (aTHX)
		296	{
		297	dSP;
		298	PUSHMARK (SP - 4); /* fake argument list */
		299	XPUSHs (coro_select_select);
		300	PUTBACK;
		301
		302	/* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
		303	PL_op->op_flags \|= OPf_STACKED;
		304	PL_op->op_private = 0;
		305	return PL_ppaddr [OP_ENTERSUB](aTHX);
		306	}
326		307
327	/ lowlevel stuff ********************************************************/	308	/ lowlevel stuff ********************************************************/
328		309
329	static SV *	310	static SV *
330	coro_get_sv (pTHX_ const char *name, int create)	311	coro_get_sv (pTHX_ const char *name, int create)
…		…
354	get_hv (name, create);	335	get_hv (name, create);
355	#endif	336	#endif
356	return get_hv (name, create);	337	return get_hv (name, create);
357	}	338	}
358		339
359	/* may croak */	340	INLINE void
360	INLINE CV *	341	coro_times_update ()
361	coro_sv_2cv (pTHX_ SV *sv)
362	{	342	{
363	HV *st;	343	#ifdef coro_clock_gettime
364	GV *gvp;	344	struct timespec ts;
365	CV *cv = sv_2cv (sv, &st, &gvp, 0);
366		345
367	if (!cv)	346	ts.tv_sec = ts.tv_nsec = 0;
368	croak ("code reference expected");	347	coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
		348	time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369		349
370	return cv;	350	ts.tv_sec = ts.tv_nsec = 0;
		351	coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
		352	time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
		353	#else
		354	dTHX;
		355	UV tv[2];
		356
		357	u2time (aTHX_ tv);
		358	time_real [0] = tv [0];
		359	time_real [1] = tv [1] * 1000;
		360	#endif
		361	}
		362
		363	INLINE void
		364	coro_times_add (struct coro *c)
		365	{
		366	c->t_real [1] += time_real [1];
		367	if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
		368	c->t_real [0] += time_real [0];
		369
		370	c->t_cpu [1] += time_cpu [1];
		371	if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
		372	c->t_cpu [0] += time_cpu [0];
		373	}
		374
		375	INLINE void
		376	coro_times_sub (struct coro *c)
		377	{
		378	if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
		379	c->t_real [1] -= time_real [1];
		380	c->t_real [0] -= time_real [0];
		381
		382	if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
		383	c->t_cpu [1] -= time_cpu [1];
		384	c->t_cpu [0] -= time_cpu [0];
371	}	385	}
372		386
373	/*****************************************************************************/	387	/*****************************************************************************/
374	/* magic glue */	388	/* magic glue */
375		389
…		…
475	static int	489	static int
476	coro_cv_free (pTHX_ SV sv, MAGIC mg)	490	coro_cv_free (pTHX_ SV sv, MAGIC mg)
477	{	491	{
478	AV *padlist;	492	AV *padlist;
479	AV av = (AV )mg->mg_obj;	493	AV av = (AV )mg->mg_obj;
		494
		495	/* perl manages to free our internal AV and _then_ call us */
		496	if (IN_DESTRUCT)
		497	return 0;
480		498
481	/* casting is fun. */	499	/* casting is fun. */
482	while (&PL_sv_undef != (SV )(padlist = (AV )av_pop (av)))	500	while (&PL_sv_undef != (SV )(padlist = (AV )av_pop (av)))
483	free_padlist (aTHX_ padlist);	501	free_padlist (aTHX_ padlist);
484		502
…		…
573	}	591	}
574		592
575	slf_frame = c->slf_frame;	593	slf_frame = c->slf_frame;
576	CORO_THROW = c->except;	594	CORO_THROW = c->except;
577		595
		596	if (expect_false (enable_times))
		597	{
		598	if (expect_false (!times_valid))
		599	coro_times_update ();
		600
		601	coro_times_sub (c);
		602	}
		603
578	if (expect_false (c->on_enter))	604	if (expect_false (c->on_enter))
579	{	605	{
580	int i;	606	int i;
581		607
582	for (i = 0; i <= AvFILLp (c->on_enter); ++i)	608	for (i = 0; i <= AvFILLp (c->on_enter); ++i)
…		…
591	{	617	{
592	int i;	618	int i;
593		619
594	for (i = AvFILLp (c->on_leave); i >= 0; --i)	620	for (i = AvFILLp (c->on_leave); i >= 0; --i)
595	on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);	621	on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
		622	}
		623
		624	times_valid = 0;
		625
		626	if (expect_false (enable_times))
		627	{
		628	coro_times_update (); times_valid = 1;
		629	coro_times_add (c);
596	}	630	}
597		631
598	c->except = CORO_THROW;	632	c->except = CORO_THROW;
599	c->slf_frame = slf_frame;	633	c->slf_frame = slf_frame;
600		634
…		…
615	{	649	{
616	while (expect_true (cxix >= 0))	650	while (expect_true (cxix >= 0))
617	{	651	{
618	PERL_CONTEXT *cx = &ccstk[cxix--];	652	PERL_CONTEXT *cx = &ccstk[cxix--];
619		653
620	if (expect_true (CxTYPE (cx) == CXt_SUB \|\| CxTYPE (cx) == CXt_FORMAT))	654	if (expect_true (CxTYPE (cx) == CXt_SUB) \|\| expect_false (CxTYPE (cx) == CXt_FORMAT))
621	{	655	{
622	CV *cv = cx->blk_sub.cv;	656	CV *cv = cx->blk_sub.cv;
623		657
624	if (expect_true (CvDEPTH (cv)))	658	if (expect_true (CvDEPTH (cv)))
625	{	659	{
…		…
649	/* we manually unroll here, as usually 2 slots is enough */	683	/* we manually unroll here, as usually 2 slots is enough */
650	if (SLOT_COUNT >= 1) CXINC;	684	if (SLOT_COUNT >= 1) CXINC;
651	if (SLOT_COUNT >= 2) CXINC;	685	if (SLOT_COUNT >= 2) CXINC;
652	if (SLOT_COUNT >= 3) CXINC;	686	if (SLOT_COUNT >= 3) CXINC;
653	{	687	{
654	int i;	688	unsigned int i;
655	for (i = 3; i < SLOT_COUNT; ++i)	689	for (i = 3; i < SLOT_COUNT; ++i)
656	CXINC;	690	CXINC;
657	}	691	}
658	cxstack_ix -= SLOT_COUNT; /* undo allocation */	692	cxstack_ix -= SLOT_COUNT; /* undo allocation */
659		693
…		…
964		998
965	PL_op = (OP *)&coro_setup_op;	999	PL_op = (OP *)&coro_setup_op;
966		1000
967	/* copy throw, in case it was set before coro_setup */	1001	/* copy throw, in case it was set before coro_setup */
968	CORO_THROW = coro->except;	1002	CORO_THROW = coro->except;
		1003
		1004	if (expect_false (enable_times))
		1005	{
		1006	coro_times_update ();
		1007	coro_times_sub (coro);
		1008	}
969	}	1009	}
970		1010
971	static void	1011	static void
972	coro_unwind_stacks (pTHX)	1012	coro_unwind_stacks (pTHX)
973	{	1013	{
…		…
990	}	1030	}
991		1031
992	static void	1032	static void
993	coro_destruct_perl (pTHX_ struct coro *coro)	1033	coro_destruct_perl (pTHX_ struct coro *coro)
994	{	1034	{
		1035	SV *svf [9];
		1036
		1037	{
		1038	struct coro *current = SvSTATE_current;
		1039
		1040	assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
		1041
		1042	save_perl (aTHX_ current);
		1043	load_perl (aTHX_ coro);
		1044
995	coro_unwind_stacks (aTHX);	1045	coro_unwind_stacks (aTHX);
		1046	coro_destruct_stacks (aTHX);
996		1047
997	SvREFCNT_dec (GvSV (PL_defgv));	1048	// now save some sv's to be free'd later
998	SvREFCNT_dec (GvAV (PL_defgv));	1049	svf [0] = GvSV (PL_defgv);
999	SvREFCNT_dec (GvSV (PL_errgv));	1050	svf [1] = (SV *)GvAV (PL_defgv);
1000	SvREFCNT_dec (PL_defoutgv);	1051	svf [2] = GvSV (PL_errgv);
1001	SvREFCNT_dec (PL_rs);	1052	svf [3] = (SV *)PL_defoutgv;
1002	SvREFCNT_dec (GvSV (irsgv));	1053	svf [4] = PL_rs;
1003	SvREFCNT_dec (GvHV (PL_hintgv));	1054	svf [5] = GvSV (irsgv);
		1055	svf [6] = (SV *)GvHV (PL_hintgv);
		1056	svf [7] = PL_diehook;
		1057	svf [8] = PL_warnhook;
		1058	assert (9 == sizeof (svf) / sizeof (*svf));
1004		1059
1005	SvREFCNT_dec (PL_diehook);	1060	load_perl (aTHX_ current);
1006	SvREFCNT_dec (PL_warnhook);
1007		1061	}
		1062
		1063	{
		1064	unsigned int i;
		1065
		1066	for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
		1067	SvREFCNT_dec (svf [i]);
		1068
1008	SvREFCNT_dec (coro->saved_deffh);	1069	SvREFCNT_dec (coro->saved_deffh);
1009	SvREFCNT_dec (coro->rouse_cb);	1070	SvREFCNT_dec (coro->rouse_cb);
1010	SvREFCNT_dec (coro->invoke_cb);	1071	SvREFCNT_dec (coro->invoke_cb);
1011	SvREFCNT_dec (coro->invoke_av);	1072	SvREFCNT_dec (coro->invoke_av);
1012		1073	}
1013	coro_destruct_stacks (aTHX);
1014	}	1074	}
1015		1075
1016	INLINE void	1076	INLINE void
1017	free_coro_mortal (pTHX)	1077	free_coro_mortal (pTHX)
1018	{	1078	{
…		…
1505		1565
1506	if (coro->mainstack	1566	if (coro->mainstack
1507	&& coro->mainstack != main_mainstack	1567	&& coro->mainstack != main_mainstack
1508	&& coro->slot	1568	&& coro->slot
1509	&& !PL_dirty)	1569	&& !PL_dirty)
1510	{
1511	struct coro *current = SvSTATE_current;
1512
1513	assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1514
1515	save_perl (aTHX_ current);
1516	load_perl (aTHX_ coro);
1517
1518	coro_destruct_perl (aTHX_ coro);	1570	coro_destruct_perl (aTHX_ coro);
1519
1520	load_perl (aTHX_ current);
1521
1522	coro->slot = 0;
1523	}
1524		1571
1525	cctx_destroy (coro->cctx);	1572	cctx_destroy (coro->cctx);
1526	SvREFCNT_dec (coro->startcv);	1573	SvREFCNT_dec (coro->startcv);
1527	SvREFCNT_dec (coro->args);	1574	SvREFCNT_dec (coro->args);
1528	SvREFCNT_dec (CORO_THROW);	1575	SvREFCNT_dec (CORO_THROW);
…		…
1587		1634
1588	prepare_transfer (aTHX_ &ta, prev_sv, next_sv);	1635	prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1589	TRANSFER (ta, 1);	1636	TRANSFER (ta, 1);
1590	}	1637	}
1591		1638
1592	/*****************************************************************************/
1593	/* gensub: simple closure generation utility */
1594
1595	#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1596
1597	/* create a closure from XS, returns a code reference */
1598	/* the arg can be accessed via GENSUB_ARG from the callback */
1599	/* the callback must use dXSARGS/XSRETURN */
1600	static SV *
1601	gensub (pTHX_ void (xsub)(pTHX_ CV ), void *arg)
1602	{
1603	CV cv = (CV )newSV (0);
1604
1605	sv_upgrade ((SV *)cv, SVt_PVCV);
1606
1607	CvANON_on (cv);
1608	CvISXSUB_on (cv);
1609	CvXSUB (cv) = xsub;
1610	GENSUB_ARG = arg;
1611
1612	return newRV_noinc ((SV *)cv);
1613	}
1614
1615	/ Coro ******************************************************************/	1639	/ Coro ******************************************************************/
1616		1640
1617	INLINE void	1641	INLINE void
1618	coro_enq (pTHX_ struct coro *coro)	1642	coro_enq (pTHX_ struct coro *coro)
1619	{	1643	{
1620	struct coro **ready = coro_ready [coro->prio - PRIO_MIN];	1644	struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1621		1645
1622	SvREFCNT_inc_NN (coro->hv);	1646	SvREFCNT_inc_NN (coro->hv);
1623		1647
1624	coro->next_ready = 0;	1648	coro->next_ready = 0;
1625	*(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;	1649	*(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
…		…
1629	INLINE struct coro *	1653	INLINE struct coro *
1630	coro_deq (pTHX)	1654	coro_deq (pTHX)
1631	{	1655	{
1632	int prio;	1656	int prio;
1633		1657
1634	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )	1658	for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1635	{	1659	{
1636	struct coro **ready = coro_ready [prio];	1660	struct coro **ready = coro_ready [prio];
1637		1661
1638	if (ready [0])	1662	if (ready [0])
1639	{	1663	{
…		…
1998		2022
1999	static void	2023	static void
2000	coro_rouse_callback (pTHX_ CV *cv)	2024	coro_rouse_callback (pTHX_ CV *cv)
2001	{	2025	{
2002	dXSARGS;	2026	dXSARGS;
2003	SV data = (SV )GENSUB_ARG;	2027	SV data = (SV )S_GENSUB_ARG;
2004		2028
2005	if (SvTYPE (SvRV (data)) != SVt_PVAV)	2029	if (SvTYPE (SvRV (data)) != SVt_PVAV)
2006	{	2030	{
2007	/* first call, set args */	2031	/* first call, set args */
2008	SV *coro = SvRV (data);	2032	SV *coro = SvRV (data);
…		…
2074	\|\| SvTYPE (SvRV (cb)) != SVt_PVCV	2098	\|\| SvTYPE (SvRV (cb)) != SVt_PVCV
2075	\|\| CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)	2099	\|\| CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2076	croak ("Coro::rouse_wait called with illegal callback argument,");	2100	croak ("Coro::rouse_wait called with illegal callback argument,");
2077		2101
2078	{	2102	{
2079	CV cv = (CV )SvRV (cb); /* for GENSUB_ARG */	2103	CV cv = (CV )SvRV (cb); /* for S_GENSUB_ARG */
2080	SV data = (SV )GENSUB_ARG;	2104	SV data = (SV )S_GENSUB_ARG;
2081		2105
2082	frame->data = (void *)data;	2106	frame->data = (void *)data;
2083	frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;	2107	frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2084	frame->check = slf_check_rouse_wait;	2108	frame->check = slf_check_rouse_wait;
2085	}	2109	}
…		…
2089	coro_new_rouse_cb (pTHX)	2113	coro_new_rouse_cb (pTHX)
2090	{	2114	{
2091	HV hv = (HV )SvRV (coro_current);	2115	HV hv = (HV )SvRV (coro_current);
2092	struct coro *coro = SvSTATE_hv (hv);	2116	struct coro *coro = SvSTATE_hv (hv);
2093	SV data = newRV_inc ((SV )hv);	2117	SV data = newRV_inc ((SV )hv);
2094	SV cb = gensub (aTHX_ coro_rouse_callback, (void )data);	2118	SV cb = s_gensub (aTHX_ coro_rouse_callback, (void )data);
2095		2119
2096	sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);	2120	sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2097	SvREFCNT_dec (data); /* magicext increases the refcount */	2121	SvREFCNT_dec (data); /* magicext increases the refcount */
2098		2122
2099	SvREFCNT_dec (coro->rouse_cb);	2123	SvREFCNT_dec (coro->rouse_cb);
…		…
2470	/* Coro::Semaphore & Coro::Signal */	2494	/* Coro::Semaphore & Coro::Signal */
2471		2495
2472	static SV *	2496	static SV *
2473	coro_waitarray_new (pTHX_ int count)	2497	coro_waitarray_new (pTHX_ int count)
2474	{	2498	{
2475	/* a semaphore contains a counter IV in $sem->[0] and any waiters after that */	2499	/* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2476	AV *av = newAV ();	2500	AV *av = newAV ();
2477	SV **ary;	2501	SV **ary;
2478		2502
2479	/* unfortunately, building manually saves memory */	2503	/* unfortunately, building manually saves memory */
2480	Newx (ary, 2, SV *);	2504	Newx (ary, 2, SV *);
…		…
2622	{	2646	{
2623	if (items >= 2)	2647	if (items >= 2)
2624	{	2648	{
2625	/* callback form */	2649	/* callback form */
2626	AV av = (AV )SvRV (arg [0]);	2650	AV av = (AV )SvRV (arg [0]);
2627	CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);	2651	SV *cb_cv = s_get_cv_croak (arg [1]);
2628		2652
2629	av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));	2653	av_push (av, SvREFCNT_inc_NN (cb_cv));
2630		2654
2631	if (SvIVX (AvARRAY (av)[0]) > 0)	2655	if (SvIVX (AvARRAY (av)[0]) > 0)
2632	coro_semaphore_adjust (aTHX_ av, 0);	2656	coro_semaphore_adjust (aTHX_ av, 0);
2633		2657
2634	frame->prepare = prepare_nop;	2658	frame->prepare = prepare_nop;
…		…
2658	AvARRAY (av)[0] = AvARRAY (av)[1];	2682	AvARRAY (av)[0] = AvARRAY (av)[1];
2659	AvARRAY (av)[1] = cb;	2683	AvARRAY (av)[1] = cb;
2660		2684
2661	cb = av_shift (av);	2685	cb = av_shift (av);
2662		2686
		2687	if (SvTYPE (cb) == SVt_PVCV)
		2688	{
		2689	dSP;
		2690	PUSHMARK (SP);
		2691	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
		2692	PUTBACK;
		2693	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);
		2694	}
		2695	else
		2696	{
2663	api_ready (aTHX_ cb);	2697	api_ready (aTHX_ cb);
2664	sv_setiv (cb, 0); /* signal waiter */	2698	sv_setiv (cb, 0); /* signal waiter */
		2699	}
		2700
2665	SvREFCNT_dec (cb);	2701	SvREFCNT_dec (cb);
2666		2702
2667	--count;	2703	--count;
2668	}	2704	}
2669	}	2705	}
…		…
2678	static void	2714	static void
2679	slf_init_signal_wait (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)	2715	slf_init_signal_wait (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
2680	{	2716	{
2681	AV av = (AV )SvRV (arg [0]);	2717	AV av = (AV )SvRV (arg [0]);
2682		2718
		2719	if (items >= 2)
		2720	{
		2721	SV *cb_cv = s_get_cv_croak (arg [1]);
		2722	av_push (av, SvREFCNT_inc_NN (cb_cv));
		2723
2683	if (SvIVX (AvARRAY (av)[0]))	2724	if (SvIVX (AvARRAY (av)[0]))
		2725	coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
		2726
		2727	frame->prepare = prepare_nop;
		2728	frame->check = slf_check_nop;
		2729	}
		2730	else if (SvIVX (AvARRAY (av)[0]))
2684	{	2731	{
2685	SvIVX (AvARRAY (av)[0]) = 0;	2732	SvIVX (AvARRAY (av)[0]) = 0;
2686	frame->prepare = prepare_nop;	2733	frame->prepare = prepare_nop;
2687	frame->check = slf_check_nop;	2734	frame->check = slf_check_nop;
2688	}	2735	}
2689	else	2736	else
2690	{	2737	{
2691	SV waiter = newRV_inc (SvRV (coro_current)); / owned by signal av */	2738	SV waiter = newSVsv (coro_current); / owned by signal av */
2692		2739
2693	av_push (av, waiter);	2740	av_push (av, waiter);
2694		2741
2695	frame->data = (void )sv_2mortal (SvREFCNT_inc_NN (waiter)); / owned by process */	2742	frame->data = (void )sv_2mortal (SvREFCNT_inc_NN (waiter)); / owned by process */
2696	frame->prepare = prepare_schedule;	2743	frame->prepare = prepare_schedule;
…		…
2714		2761
2715	static void	2762	static void
2716	coro_aio_callback (pTHX_ CV *cv)	2763	coro_aio_callback (pTHX_ CV *cv)
2717	{	2764	{
2718	dXSARGS;	2765	dXSARGS;
2719	AV state = (AV )GENSUB_ARG;	2766	AV state = (AV )S_GENSUB_ARG;
2720	SV *coro = av_pop (state);	2767	SV *coro = av_pop (state);
2721	SV *data_sv = newSV (sizeof (struct io_state));	2768	SV *data_sv = newSV (sizeof (struct io_state));
2722		2769
2723	av_extend (state, items - 1);	2770	av_extend (state, items - 1);
2724		2771
…		…
2838		2885
2839	for (i = 0; i < items; ++i)	2886	for (i = 0; i < items; ++i)
2840	PUSHs (arg [i]);	2887	PUSHs (arg [i]);
2841		2888
2842	/* now push the callback closure */	2889	/* now push the callback closure */
2843	PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void )SvREFCNT_inc_NN ((SV )state))));	2890	PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void )SvREFCNT_inc_NN ((SV )state))));
2844		2891
2845	/* now call the AIO function - we assume our request is uncancelable */	2892	/* now call the AIO function - we assume our request is uncancelable */
2846	PUTBACK;	2893	PUTBACK;
2847	call_sv ((SV *)req, G_VOID \| G_DISCARD);	2894	call_sv ((SV *)req, G_VOID \| G_DISCARD);
2848	}	2895	}
…		…
2935		2982
2936	if (!svp) croak ("Time::HiRes is required");	2983	if (!svp) croak ("Time::HiRes is required");
2937	if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");	2984	if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2938		2985
2939	nvtime = INT2PTR (double ()(), SvIV (svp));	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));
2940	}	2990	}
2941		2991
2942	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));	2992	assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2943	}	2993	}
2944		2994
2945	SV *	2995	SV *
2946	new (char *klass, ...)	2996	new (char *klass, ...)
2947	ALIAS:	2997	ALIAS:
…		…
2949	CODE:	2999	CODE:
2950	{	3000	{
2951	struct coro *coro;	3001	struct coro *coro;
2952	MAGIC *mg;	3002	MAGIC *mg;
2953	HV *hv;	3003	HV *hv;
2954	CV *cb;	3004	SV *cb;
2955	int i;	3005	int i;
2956		3006
2957	if (items > 1)	3007	if (items > 1)
2958	{	3008	{
2959	cb = coro_sv_2cv (aTHX_ ST (1));	3009	cb = s_get_cv_croak (ST (1));
2960		3010
2961	if (!ix)	3011	if (!ix)
2962	{	3012	{
2963	if (CvISXSUB (cb))	3013	if (CvISXSUB (cb))
2964	croak ("Coro::State doesn't support XS functions as coroutine start, caught");	3014	croak ("Coro::State doesn't support XS functions as coroutine start, caught");
…		…
2986	av_extend (coro->args, items - 1 + ix - 1);	3036	av_extend (coro->args, items - 1 + ix - 1);
2987		3037
2988	if (ix)	3038	if (ix)
2989	{	3039	{
2990	av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));	3040	av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991	cb = cv_coro_run;	3041	cb = (SV *)cv_coro_run;
2992	}	3042	}
2993		3043
2994	coro->startcv = (CV )SvREFCNT_inc_NN ((SV )cb);	3044	coro->startcv = (CV )SvREFCNT_inc_NN ((SV )cb);
2995		3045
2996	for (i = 2; i < items; i++)	3046	for (i = 2; i < items; i++)
…		…
3149	CODE:	3199	CODE:
3150	{	3200	{
3151	struct coro *current = SvSTATE_current;	3201	struct coro *current = SvSTATE_current;
3152	SV **throwp = self == current ? &CORO_THROW : &self->except;	3202	SV **throwp = self == current ? &CORO_THROW : &self->except;
3153	SvREFCNT_dec (*throwp);	3203	SvREFCNT_dec (*throwp);
		3204	SvGETMAGIC (throw);
3154	*throwp = SvOK (throw) ? newSVsv (throw) : 0;	3205	*throwp = SvOK (throw) ? newSVsv (throw) : 0;
3155	}	3206	}
3156		3207
3157	void	3208	void
3158	api_trace (SV *coro, int flags = CC_TRACE \| CC_TRACE_SUB)	3209	api_trace (SV *coro, int flags = CC_TRACE \| CC_TRACE_SUB)
…		…
3217	CODE:	3268	CODE:
3218	coro_state_destroy (aTHX_ self);	3269	coro_state_destroy (aTHX_ self);
3219	coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */	3270	coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3220		3271
3221		3272
		3273	SV *
		3274	enable_times (int enabled = enable_times)
		3275	CODE:
		3276	{
		3277	RETVAL = boolSV (enable_times);
		3278
		3279	if (enabled != enable_times)
		3280	{
		3281	enable_times = enabled;
		3282
		3283	coro_times_update ();
		3284	(enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
		3285	}
		3286	}
		3287	OUTPUT:
		3288	RETVAL
		3289
		3290	void
		3291	times (Coro::State self)
		3292	PPCODE:
		3293	{
		3294	struct coro *current = SvSTATE (coro_current);
		3295
		3296	if (expect_false (current == self))
		3297	{
		3298	coro_times_update ();
		3299	coro_times_add (SvSTATE (coro_current));
		3300	}
		3301
		3302	EXTEND (SP, 2);
		3303	PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
		3304	PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
		3305
		3306	if (expect_false (current == self))
		3307	coro_times_sub (SvSTATE (coro_current));
		3308	}
		3309
3222	MODULE = Coro::State PACKAGE = Coro	3310	MODULE = Coro::State PACKAGE = Coro
3223		3311
3224	BOOT:	3312	BOOT:
3225	{	3313	{
3226	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	3314	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
…		…
3238	cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);	3326	cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239	cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);	3327	cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3240		3328
3241	coro_stash = gv_stashpv ("Coro", TRUE);	3329	coro_stash = gv_stashpv ("Coro", TRUE);
3242		3330
3243	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));	3331	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3244	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));	3332	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3245	newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));	3333	newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3246	newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));	3334	newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3247	newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));	3335	newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3248	newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));	3336	newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3249		3337
3250	{	3338	{
3251	SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);	3339	SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3252		3340
3253	coroapi.schedule = api_schedule;	3341	coroapi.schedule = api_schedule;
…		…
3305	void	3393	void
3306	_set_readyhook (SV *hook)	3394	_set_readyhook (SV *hook)
3307	PROTOTYPE: $	3395	PROTOTYPE: $
3308	CODE:	3396	CODE:
3309	SvREFCNT_dec (coro_readyhook);	3397	SvREFCNT_dec (coro_readyhook);
		3398	SvGETMAGIC (hook);
3310	coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;	3399	coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3311		3400
3312	int	3401	int
3313	prio (Coro::State coro, int newprio = 0)	3402	prio (Coro::State coro, int newprio = 0)
3314	PROTOTYPE: $;$	3403	PROTOTYPE: $;$
…		…
3321	if (items > 1)	3410	if (items > 1)
3322	{	3411	{
3323	if (ix)	3412	if (ix)
3324	newprio = coro->prio - newprio;	3413	newprio = coro->prio - newprio;
3325		3414
3326	if (newprio < PRIO_MIN) newprio = PRIO_MIN;	3415	if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3327	if (newprio > PRIO_MAX) newprio = PRIO_MAX;	3416	if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3328		3417
3329	coro->prio = newprio;	3418	coro->prio = newprio;
3330	}	3419	}
3331	}	3420	}
3332	OUTPUT:	3421	OUTPUT:
…		…
3431	CODE:	3520	CODE:
3432	{	3521	{
3433	struct coro *coro = SvSTATE_current;	3522	struct coro *coro = SvSTATE_current;
3434	AV **avp = ix ? &coro->on_leave : &coro->on_enter;	3523	AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3435		3524
3436	block = (SV *)coro_sv_2cv (aTHX_ block);	3525	block = s_get_cv_croak (block);
3437		3526
3438	if (!*avp)	3527	if (!*avp)
3439	*avp = newAV ();	3528	*avp = newAV ();
3440		3529
3441	av_push (*avp, SvREFCNT_inc (block));	3530	av_push (*avp, SvREFCNT_inc (block));
…		…
3458	MODULE = Coro::State PACKAGE = Coro::Semaphore	3547	MODULE = Coro::State PACKAGE = Coro::Semaphore
3459		3548
3460	SV *	3549	SV *
3461	new (SV klass, SV count = 0)	3550	new (SV klass, SV count = 0)
3462	CODE:	3551	CODE:
		3552	{
		3553	int semcnt = 1;
		3554
		3555	if (count)
		3556	{
		3557	SvGETMAGIC (count);
		3558
		3559	if (SvOK (count))
		3560	semcnt = SvIV (count);
		3561	}
		3562
3463	RETVAL = sv_bless (	3563	RETVAL = sv_bless (
3464	coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),	3564	coro_waitarray_new (aTHX_ semcnt),
3465	GvSTASH (CvGV (cv))	3565	GvSTASH (CvGV (cv))
3466	);	3566	);
		3567	}
3467	OUTPUT:	3568	OUTPUT:
3468	RETVAL	3569	RETVAL
3469		3570
3470	# helper for Coro::Channel and others	3571	# helper for Coro::Channel and others
3471	SV *	3572	SV *
…		…
3629		3730
3630	void	3731	void
3631	_register (char target, char proto, SV *req)	3732	_register (char target, char proto, SV *req)
3632	CODE:	3733	CODE:
3633	{	3734	{
3634	CV *req_cv = coro_sv_2cv (aTHX_ req);	3735	SV *req_cv = s_get_cv_croak (req);
3635	/* newXSproto doesn't return the CV on 5.8 */	3736	/* newXSproto doesn't return the CV on 5.8 */
3636	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);	3737	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3637	sv_setpv ((SV *)slf_cv, proto);	3738	sv_setpv ((SV *)slf_cv, proto);
3638	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);	3739	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3639	}	3740	}
3640		3741
		3742	MODULE = Coro::State PACKAGE = Coro::Select
		3743
		3744	void
		3745	patch_pp_sselect ()
		3746	CODE:
		3747	if (!coro_old_pp_sselect)
		3748	{
		3749	coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
		3750	coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
		3751	PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
		3752	}
		3753
		3754	void
		3755	unpatch_pp_sselect ()
		3756	CODE:
		3757	if (coro_old_pp_sselect)
		3758	{
		3759	PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
		3760	coro_old_pp_sselect = 0;
		3761	}
		3762
		3763

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.349 by root, Wed Jun 10 00:47:24 2009 UTC vs. Revision 1.364 by root, Thu Jul 16 02:19:17 2009 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.349 by root, Wed Jun 10 00:47:24 2009 UTC vs.
Revision 1.364 by root, Thu Jul 16 02:19:17 2009 UTC