[ViewVC] Diff of: cvs/IO-AIO/AIO.xs

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.46 by root, Sun Oct 22 00:49:29 2006 UTC vs.
Revision 1.63 by root, Mon Oct 23 23:48:31 2006 UTC

…		…
		1	#if __linux
		2	# define _GNU_SOURCE
		3	#endif
		4
1	#define _REENTRANT 1	5	#define _REENTRANT 1
		6
2	#include <errno.h>	7	#include <errno.h>
3		8
4	#include "EXTERN.h"	9	#include "EXTERN.h"
5	#include "perl.h"	10	#include "perl.h"
6	#include "XSUB.h"	11	#include "XSUB.h"
55	REQ_STAT, REQ_LSTAT, REQ_FSTAT,	60	REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56	REQ_FSYNC, REQ_FDATASYNC,	61	REQ_FSYNC, REQ_FDATASYNC,
57	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	62	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58	REQ_READDIR,	63	REQ_READDIR,
59	REQ_LINK, REQ_SYMLINK,	64	REQ_LINK, REQ_SYMLINK,
		65	REQ_GROUP, REQ_NOP,
60	REQ_SLEEP,	66	REQ_SLEEP,
61	REQ_GROUP,
62	};	67	};
63		68
64	#define AIO_REQ_KLASS "IO::AIO::REQ"	69	#define AIO_REQ_KLASS "IO::AIO::REQ"
65	#define AIO_GRP_KLASS "IO::AIO::GRP"	70	#define AIO_GRP_KLASS "IO::AIO::GRP"
66		71
67	typedef struct aio_cb	72	typedef struct aio_cb
68	{	73	{
69	struct aio_cb grp, grp_prev, *grp_next;
70
71	struct aio_cb *volatile next;	74	struct aio_cb *volatile next;
72
73	SV self; / the perl counterpart of this request, if any */
74		75
75	SV data, callback;	76	SV data, callback;
76	SV fh, fh2;	77	SV fh, fh2;
77	void dataptr, data2ptr;	78	void dataptr, data2ptr;
78	Stat_t *statdata;	79	Stat_t *statdata;
79	off_t offset;	80	off_t offset;
80	size_t length;	81	size_t length;
81	ssize_t result;	82	ssize_t result;
82		83
		84	STRLEN dataoffset;
83	int type;	85	int type;
84	int fd, fd2;	86	int fd, fd2;
85	int errorno;	87	int errorno;
86	STRLEN dataoffset;
87	mode_t mode; /* open */	88	mode_t mode; /* open */
		89
88	unsigned char cancelled;	90	unsigned char flags;
		91	unsigned char pri;
		92
		93	SV self; / the perl counterpart of this request, if any */
		94	struct aio_cb grp, grp_prev, grp_next, grp_first;
89	} aio_cb;	95	} aio_cb;
		96
		97	enum {
		98	FLAG_CANCELLED = 0x01,
		99	};
90		100
91	typedef aio_cb *aio_req;	101	typedef aio_cb *aio_req;
92	typedef aio_cb *aio_req_ornot;	102	typedef aio_cb *aio_req_ornot;
		103
		104	enum {
		105	PRI_MIN = -4,
		106	PRI_MAX = 4,
		107
		108	DEFAULT_PRI = 0,
		109	PRI_BIAS = -PRI_MIN,
		110	};
		111
		112	static int next_pri = DEFAULT_PRI + PRI_BIAS;
93		113
94	static int started, wanted;	114	static int started, wanted;
95	static volatile int nreqs;	115	static volatile int nreqs;
96	static int max_outstanding = 1<<30;	116	static int max_outstanding = 1<<30;
97	static int respipe [2];	117	static int respipe [2];
98		118
		119	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
		120	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
		121	#else
		122	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
		123	#endif
		124
99	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	125	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	126	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	127	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102		128
103	static volatile aio_req reqs, reqe; /* queue start, queue end */	129	static volatile aio_req reqs, reqe; /* queue start, queue end */
104	static volatile aio_req ress, rese; /* queue start, queue end */	130	static volatile aio_req ress, rese; /* queue start, queue end */
105		131
		132	static void req_invoke (aio_req req);
106	static void req_free (aio_req req);	133	static void req_free (aio_req req);
107		134
108	/* must be called at most once */	135	/* must be called at most once */
109	static SV req_sv (aio_req req, const char klass)	136	static SV req_sv (aio_req req, const char klass)
110	{	137	{
		138	if (!req->self)
		139	{
111	req->self = (SV *)newHV ();	140	req->self = (SV *)newHV ();
112	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	141	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		142	}
113		143
114	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	144	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
115	}	145	}
116		146
117	static aio_req SvAIO_REQ (SV *sv)	147	static aio_req SvAIO_REQ (SV *sv)
118	{	148	{
		149	MAGIC *mg;
		150
119	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	151	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
120	croak ("object of class " AIO_REQ_KLASS " expected");	152	croak ("object of class " AIO_REQ_KLASS " expected");
121		153
122	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	154	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123		155
124	return mg ? (aio_req)mg->mg_ptr : 0;	156	return mg ? (aio_req)mg->mg_ptr : 0;
125	}	157	}
126		158
		159	static void aio_grp_feed (aio_req grp)
		160	{
		161	while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
		162	{
		163	int old_len = grp->length;
		164
		165	if (grp->fh2 && SvOK (grp->fh2))
		166	{
		167	dSP;
		168
		169	ENTER;
		170	SAVETMPS;
		171	PUSHMARK (SP);
		172	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		173	PUTBACK;
		174	call_sv (grp->fh2, G_VOID \| G_EVAL);
		175	SPAGAIN;
		176	FREETMPS;
		177	LEAVE;
		178	}
		179
		180	/* stop if no progress has been made */
		181	if (old_len == grp->length)
		182	{
		183	SvREFCNT_dec (grp->fh2);
		184	grp->fh2 = 0;
		185	break;
		186	}
		187	}
		188	}
		189
		190	static void aio_grp_dec (aio_req grp)
		191	{
		192	--grp->length;
		193
		194	/* call feeder, if applicable */
		195	aio_grp_feed (grp);
		196
		197	/* finish, if done */
		198	if (!grp->length && grp->fd)
		199	{
		200	req_invoke (grp);
		201	req_free (grp);
		202	}
		203	}
		204
127	static void poll_wait ()	205	static void poll_wait ()
128	{	206	{
129	if (nreqs && !ress)
130	{
131	fd_set rfd;	207	fd_set rfd;
		208
		209	while (nreqs)
		210	{
		211	aio_req req;
		212	pthread_mutex_lock (&reslock);
		213	req = ress;
		214	pthread_mutex_unlock (&reslock);
		215
		216	if (req)
		217	return;
		218
132	FD_ZERO(&rfd);	219	FD_ZERO(&rfd);
133	FD_SET(respipe [0], &rfd);	220	FD_SET(respipe [0], &rfd);
134		221
135	select (respipe [0] + 1, &rfd, 0, 0, 0);	222	select (respipe [0] + 1, &rfd, 0, 0, 0);
136	}	223	}
…		…
139	static void req_invoke (aio_req req)	226	static void req_invoke (aio_req req)
140	{	227	{
141	dSP;	228	dSP;
142	int errorno = errno;	229	int errorno = errno;
143		230
144	if (req->cancelled \|\| !SvOK (req->callback))	231	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))
145	return;	232	return;
146		233
147	errno = req->errorno;	234	errno = req->errorno;
148		235
149	ENTER;	236	ENTER;
		237	SAVETMPS;
150	PUSHMARK (SP);	238	PUSHMARK (SP);
		239	EXTEND (SP, 1);
151		240
152	switch (req->type)	241	switch (req->type)
153	{	242	{
154	case REQ_READDIR:	243	case REQ_READDIR:
155	{	244	{
…		…
170	}	259	}
171		260
172	rv = sv_2mortal (newRV_noinc ((SV *)av));	261	rv = sv_2mortal (newRV_noinc ((SV *)av));
173	}	262	}
174		263
175	XPUSHs (rv);	264	PUSHs (rv);
176	}	265	}
177	break;	266	break;
178		267
179	case REQ_OPEN:	268	case REQ_OPEN:
180	{	269	{
181	/* convert fd to fh */	270	/* convert fd to fh */
182	SV *fh;	271	SV *fh;
183		272
184	XPUSHs (sv_2mortal (newSViv (req->result)));	273	PUSHs (sv_2mortal (newSViv (req->result)));
185	PUTBACK;	274	PUTBACK;
186	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	275	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
187	SPAGAIN;	276	SPAGAIN;
188		277
189	fh = SvREFCNT_inc (POPs);	278	fh = SvREFCNT_inc (POPs);
…		…
191	PUSHMARK (SP);	280	PUSHMARK (SP);
192	XPUSHs (sv_2mortal (fh));	281	XPUSHs (sv_2mortal (fh));
193	}	282	}
194	break;	283	break;
195		284
		285	case REQ_GROUP:
		286	req->fd = 2; /* mark group as finished */
		287
		288	if (req->data)
		289	{
		290	int i;
		291	AV av = (AV )req->data;
		292
		293	EXTEND (SP, AvFILL (av) + 1);
		294	for (i = 0; i <= AvFILL (av); ++i)
		295	PUSHs (*av_fetch (av, i, 0));
		296	}
		297	break;
		298
		299	case REQ_NOP:
196	case REQ_SLEEP:	300	case REQ_SLEEP:
197	case REQ_GROUP:
198	break;	301	break;
199		302
200	default:	303	default:
201	XPUSHs (sv_2mortal (newSViv (req->result)));	304	PUSHs (sv_2mortal (newSViv (req->result)));
202	break;	305	break;
203	}	306	}
204		307
205		308
206	PUTBACK;	309	PUTBACK;
207	call_sv (req->callback, G_VOID \| G_EVAL);	310	call_sv (req->callback, G_VOID \| G_EVAL);
208	SPAGAIN;	311	SPAGAIN;
209		312
		313	FREETMPS;
		314	LEAVE;
		315
		316	errno = errorno;
		317
210	if (SvTRUE (ERRSV))	318	if (SvTRUE (ERRSV))
211	{	319	{
212	req_free (req);	320	req_free (req);
213	croak (0);	321	croak (0);
214	}	322	}
215
216	LEAVE;
217
218	errno = errorno;
219	}	323	}
220		324
221	static void req_free (aio_req req)	325	static void req_free (aio_req req)
222	{	326	{
223	if (req->grp)	327	if (req->grp)
224	{	328	{
225	aio_req grp = req->grp;	329	aio_req grp = req->grp;
226		330
227	/* unlink request */	331	/* unlink request */
228	req->grp_next->grp_prev = req->grp_prev;	332	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
229	req->grp_prev->grp_next = req->grp_next;	333	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
230		334
231	if (grp->grp_next == grp && grp->fd)	335	if (grp->grp_first == req)
232	{	336	grp->grp_first = req->grp_next;
233	req_invoke (grp);	337
234	req_free (grp);	338	aio_grp_dec (grp);
235	}
236	}	339	}
237		340
238	if (req->self)	341	if (req->self)
239	{	342	{
240	sv_unmagic (req->self, PERL_MAGIC_ext);	343	sv_unmagic (req->self, PERL_MAGIC_ext);
241	SvREFCNT_dec (req->self);	344	SvREFCNT_dec (req->self);
242	}	345	}
243		346
244	if (req->data)
245	SvREFCNT_dec (req->data);	347	SvREFCNT_dec (req->data);
246
247	if (req->fh)
248	SvREFCNT_dec (req->fh);	348	SvREFCNT_dec (req->fh);
249
250	if (req->fh2)
251	SvREFCNT_dec (req->fh2);	349	SvREFCNT_dec (req->fh2);
252
253	if (req->statdata)
254	Safefree (req->statdata);
255
256	if (req->callback)
257	SvREFCNT_dec (req->callback);	350	SvREFCNT_dec (req->callback);
		351	Safefree (req->statdata);
258		352
259	if (req->type == REQ_READDIR && req->result >= 0)	353	if (req->type == REQ_READDIR && req->result >= 0)
260	free (req->data2ptr);	354	free (req->data2ptr);
261		355
262	Safefree (req);	356	Safefree (req);
263	}	357	}
264		358
265	static void req_cancel (aio_req req)	359	static void req_cancel (aio_req req)
266	{	360	{
267	req->cancelled = 1;	361	req->flags \|= FLAG_CANCELLED;
268		362
269	if (req->type == REQ_GROUP)	363	if (req->type == REQ_GROUP)
270	{	364	{
271	aio_req sub;	365	aio_req sub;
272		366
273	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	367	for (sub = req->grp_first; sub; sub = sub->grp_next)
274	req_cancel (sub);	368	req_cancel (sub);
275	}	369	}
276	}	370	}
277		371
278	static int poll_cb ()	372	static int poll_cb ()
…		…
305	pthread_mutex_unlock (&reslock);	399	pthread_mutex_unlock (&reslock);
306		400
307	if (!req)	401	if (!req)
308	break;	402	break;
309		403
310	nreqs--;	404	--nreqs;
311		405
312	if (req->type == REQ_QUIT)	406	if (req->type == REQ_QUIT)
313	started--;	407	started--;
314	else if (req->type == REQ_GROUP && req->grp_next != req)	408	else if (req->type == REQ_GROUP && req->length)
315	{	409	{
316	req->fd = 1; /* mark request as delayed */	410	req->fd = 1; /* mark request as delayed */
317	continue;	411	continue;
318	}	412	}
319	else	413	else
…		…
366	static void req_send (aio_req req)	460	static void req_send (aio_req req)
367	{	461	{
368	while (started < wanted && nreqs >= started)	462	while (started < wanted && nreqs >= started)
369	start_thread ();	463	start_thread ();
370		464
371	nreqs++;	465	++nreqs;
372		466
373	pthread_mutex_lock (&reqlock);	467	pthread_mutex_lock (&reqlock);
374		468
375	req->next = 0;	469	req->next = 0;
376		470
…		…
726	}	820	}
727		821
728	pthread_mutex_unlock (&reqlock);	822	pthread_mutex_unlock (&reqlock);
729		823
730	errno = 0; /* strictly unnecessary */	824	errno = 0; /* strictly unnecessary */
		825	type = req->type; /* remember type for QUIT check */
731		826
732	if (!req->cancelled)	827	if (!(req->flags & FLAG_CANCELLED))
733	switch (req->type)	828	switch (type)
734	{	829	{
735	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	830	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
736	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	831	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
737		832
738	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	833	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
…		…
762	tv.tv_usec = req->fd2;	857	tv.tv_usec = req->fd2;
763		858
764	req->result = select (0, 0, 0, 0, &tv);	859	req->result = select (0, 0, 0, 0, &tv);
765	}	860	}
766		861
		862	case REQ_GROUP:
		863	case REQ_NOP:
767	case REQ_QUIT:	864	case REQ_QUIT:
768	break;	865	break;
769		866
770	default:	867	default:
771	req->result = ENOSYS;	868	req->result = ENOSYS;
…		…
855	atfork_parent ();	952	atfork_parent ();
856	}	953	}
857		954
858	#define dREQ \	955	#define dREQ \
859	aio_req req; \	956	aio_req req; \
		957	int req_pri = next_pri; \
		958	next_pri = DEFAULT_PRI + PRI_BIAS; \
860	\	959	\
861	if (SvOK (callback) && !SvROK (callback)) \	960	if (SvOK (callback) && !SvROK (callback)) \
862	croak ("callback must be undef or of reference type"); \	961	croak ("callback must be undef or of reference type"); \
863	\	962	\
864	Newz (0, req, 1, aio_cb); \	963	Newz (0, req, 1, aio_cb); \
865	if (!req) \	964	if (!req) \
866	croak ("out of memory during aio_req allocation"); \	965	croak ("out of memory during aio_req allocation"); \
867	\	966	\
868	req->callback = newSVsv (callback)	967	req->callback = newSVsv (callback); \
		968	req->pri = req_pri
869		969
870	#define REQ_SEND \	970	#define REQ_SEND \
871	req_send (req); \	971	req_send (req); \
872	\	972	\
873	if (GIMME_V != G_VOID) \	973	if (GIMME_V != G_VOID) \
…		…
1148	SV * callback	1248	SV * callback
1149	PROTOTYPE: ;$	1249	PROTOTYPE: ;$
1150	PPCODE:	1250	PPCODE:
1151	{	1251	{
1152	dREQ;	1252	dREQ;
		1253
1153	req->type = REQ_GROUP;	1254	req->type = REQ_GROUP;
1154	req->grp_next = req;
1155	req->grp_prev = req;
1156
1157	req_send (req);	1255	req_send (req);
		1256
1158	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1257	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1159	}	1258	}
		1259
		1260	void
		1261	aio_nop (callback=&PL_sv_undef)
		1262	SV * callback
		1263	PPCODE:
		1264	{
		1265	dREQ;
		1266
		1267	req->type = REQ_NOP;
		1268
		1269	REQ_SEND;
		1270	}
		1271
		1272	#if 0
		1273
		1274	void
		1275	aio_pri (int pri = DEFAULT_PRI)
		1276	CODE:
		1277	if (pri < PRI_MIN) pri = PRI_MIN;
		1278	if (pri > PRI_MAX) pri = PRI_MAX;
		1279	next_pri = pri + PRI_BIAS;
		1280
		1281	#endif
1160		1282
1161	void	1283	void
1162	flush ()	1284	flush ()
1163	PROTOTYPE:	1285	PROTOTYPE:
1164	CODE:	1286	CODE:
…		…
1207	CODE:	1329	CODE:
1208	RETVAL = nreqs;	1330	RETVAL = nreqs;
1209	OUTPUT:	1331	OUTPUT:
1210	RETVAL	1332	RETVAL
1211		1333
		1334	PROTOTYPES: DISABLE
		1335
1212	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1336	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1213		1337
1214	void	1338	void
1215	cancel (aio_req_ornot req)	1339	cancel (aio_req_ornot req)
1216	PROTOTYPE:	1340	PROTOTYPE:
1217	CODE:	1341	CODE:
1218	req_cancel (req);	1342	req_cancel (req);
1219		1343
		1344	void
		1345	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
		1346	CODE:
		1347	SvREFCNT_dec (req->callback);
		1348	req->callback = newSVsv (callback);
		1349
1220	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1350	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1221		1351
1222	void	1352	void
1223	add (aio_req grp, ...)	1353	add (aio_req grp, ...)
1224	PROTOTYPE: $;@
1225	PPCODE:	1354	PPCODE:
1226	{	1355	{
1227	int i;	1356	int i;
		1357	aio_req req;
		1358
		1359	if (grp->fd == 2)
		1360	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1228		1361
1229	for (i = 1; i < items; ++i )	1362	for (i = 1; i < items; ++i )
1230	{	1363	{
1231	if (GIMME_V != G_VOID)	1364	if (GIMME_V != G_VOID)
1232	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1365	XPUSHs (sv_2mortal (newSVsv (ST (i))));
1233		1366
1234	aio_req req = SvAIO_REQ (ST (i));	1367	req = SvAIO_REQ (ST (i));
1235	printf ("req = %p\n", req);//D
1236		1368
1237	if (req)	1369	if (req)
1238	{	1370	{
1239	req->grp_prev = grp;	1371	++grp->length;
1240	req->grp_next = grp->grp_next;
1241	grp->grp_next->grp_prev = req;
1242	grp->grp_next = req;
1243
1244	req->grp = grp;	1372	req->grp = grp;
		1373
		1374	req->grp_prev = 0;
		1375	req->grp_next = grp->grp_first;
		1376
		1377	if (grp->grp_first)
		1378	grp->grp_first->grp_prev = req;
		1379
		1380	grp->grp_first = req;
1245	}	1381	}
1246	}	1382	}
1247	}	1383	}
1248		1384
		1385	void
		1386	result (aio_req grp, ...)
		1387	CODE:
		1388	{
		1389	int i;
		1390	AV *av = newAV ();
		1391
		1392	for (i = 1; i < items; ++i )
		1393	av_push (av, newSVsv (ST (i)));
		1394
		1395	SvREFCNT_dec (grp->data);
		1396	grp->data = (SV *)av;
		1397	}
		1398
		1399	void
		1400	feed_limit (aio_req grp, int limit)
		1401	CODE:
		1402	grp->fd2 = limit;
		1403	aio_grp_feed (grp);
		1404
		1405	void
		1406	feed (aio_req grp, SV *callback=&PL_sv_undef)
		1407	CODE:
		1408	{
		1409	SvREFCNT_dec (grp->fh2);
		1410	grp->fh2 = newSVsv (callback);
		1411
		1412	if (grp->fd2 <= 0)
		1413	grp->fd2 = 2;
		1414
		1415	aio_grp_feed (grp);
		1416	}
		1417

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.46 by root, Sun Oct 22 00:49:29 2006 UTC vs. Revision 1.63 by root, Mon Oct 23 23:48:31 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.46 by root, Sun Oct 22 00:49:29 2006 UTC vs.
Revision 1.63 by root, Mon Oct 23 23:48:31 2006 UTC