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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.28 by root, Wed Aug 17 05:06:59 2005 UTC vs.
Revision 1.35 by root, Tue Aug 23 01:16:50 2005 UTC

…		…
4	#include "EXTERN.h"	4	#include "EXTERN.h"
5	#include "perl.h"	5	#include "perl.h"
6	#include "XSUB.h"	6	#include "XSUB.h"
7		7
8	#include "autoconf/config.h"	8	#include "autoconf/config.h"
		9
		10	#include <pthread.h>
9		11
10	#include <sys/types.h>	12	#include <sys/types.h>
11	#include <sys/stat.h>	13	#include <sys/stat.h>
12		14
13	#include <unistd.h>	15	#include <unistd.h>
14	#include <fcntl.h>	16	#include <fcntl.h>
15	#include <signal.h>	17	#include <signal.h>
16	#include <sched.h>	18	#include <sched.h>
17		19
18	#include <pthread.h>	20	#if HAVE_SENDFILE
19		21	# if __linux
20	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */	22	# include <sys/sendfile.h>
21	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */	23	# elif __freebsd
22	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */	24	# include <sys/socket.h>
		25	# include <sys/uio.h>
		26	# elif __hpux
		27	# include <sys/socket.h>
		28	# elif __solaris /* not yet */
		29	# include <sys/sendfile.h>
		30	# else
		31	# error sendfile support requested but not available
		32	# endif
		33	#endif
23		34
24	#if __ia64	35	#if __ia64
25	# define STACKSIZE 65536	36	# define STACKSIZE 65536
26	#else	37	#else
27	# define STACKSIZE 4096	38	# define STACKSIZE 4096
…		…
29		40
30	enum {	41	enum {
31	REQ_QUIT,	42	REQ_QUIT,
32	REQ_OPEN, REQ_CLOSE,	43	REQ_OPEN, REQ_CLOSE,
33	REQ_READ, REQ_WRITE, REQ_READAHEAD,	44	REQ_READ, REQ_WRITE, REQ_READAHEAD,
		45	REQ_SENDFILE,
34	REQ_STAT, REQ_LSTAT, REQ_FSTAT,	46	REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35	REQ_FSYNC, REQ_FDATASYNC,	47	REQ_FSYNC, REQ_FDATASYNC,
36	REQ_UNLINK, REQ_RMDIR,	48	REQ_UNLINK, REQ_RMDIR,
37	REQ_SYMLINK,	49	REQ_SYMLINK,
38	};	50	};
…		…
40	typedef struct aio_cb {	52	typedef struct aio_cb {
41	struct aio_cb *volatile next;	53	struct aio_cb *volatile next;
42		54
43	int type;	55	int type;
44		56
45	int fd;	57	int fd, fd2;
46	off_t offset;	58	off_t offset;
47	size_t length;	59	size_t length;
48	ssize_t result;	60	ssize_t result;
49	mode_t mode; /* open */	61	mode_t mode; /* open */
50	int errorno;	62	int errorno;
51	SV data, callback, *fh;	63	SV data, callback;
		64	SV fh, fh2;
52	void dataptr, data2ptr;	65	void dataptr, data2ptr;
53	STRLEN dataoffset;	66	STRLEN dataoffset;
54		67
55	Stat_t *statdata;	68	Stat_t *statdata;
56	} aio_cb;	69	} aio_cb;
57		70
58	typedef aio_cb *aio_req;	71	typedef aio_cb *aio_req;
59		72
60	static int started;	73	static int started, wanted;
61	static volatile int nreqs;	74	static volatile int nreqs;
62	static int max_outstanding = 1<<30;	75	static int max_outstanding = 1<<30;
63	static int respipe [2];	76	static int respipe [2];
64		77
65	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	78	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
…		…
74	if (req->data)	87	if (req->data)
75	SvREFCNT_dec (req->data);	88	SvREFCNT_dec (req->data);
76		89
77	if (req->fh)	90	if (req->fh)
78	SvREFCNT_dec (req->fh);	91	SvREFCNT_dec (req->fh);
		92
		93	if (req->fh2)
		94	SvREFCNT_dec (req->fh2);
79		95
80	if (req->statdata)	96	if (req->statdata)
81	Safefree (req->statdata);	97	Safefree (req->statdata);
82		98
83	if (req->callback)	99	if (req->callback)
…		…
116	{	132	{
117	ress = req->next;	133	ress = req->next;
118		134
119	if (!ress)	135	if (!ress)
120	{	136	{
121	rese = 0;
122
123	/* read any signals sent by the worker threads */	137	/* read any signals sent by the worker threads */
124	char buf [32];	138	char buf [32];
125	while (read (respipe [0], buf, 32) == 32)	139	while (read (respipe [0], buf, 32) == 32)
126	;	140	;
		141
		142	rese = 0;
127	}	143	}
128	}	144	}
129		145
130	pthread_mutex_unlock (&reslock);	146	pthread_mutex_unlock (&reslock);
131		147
…		…
221	}	237	}
222		238
223	static void	239	static void
224	send_req (aio_req req)	240	send_req (aio_req req)
225	{	241	{
		242	while (started < wanted && nreqs >= started)
		243	start_thread ();
		244
226	nreqs++;	245	nreqs++;
227		246
228	pthread_mutex_lock (&reqlock);	247	pthread_mutex_lock (&reqlock);
229		248
230	req->next = 0;	249	req->next = 0;
…		…
262	send_req (req);	281	send_req (req);
263	}	282	}
264		283
265	static void min_parallel (int nthreads)	284	static void min_parallel (int nthreads)
266	{	285	{
267	while (nthreads > started)	286	if (wanted < nthreads)
268	start_thread ();	287	wanted = nthreads;
269	}	288	}
270		289
271	static void max_parallel (int nthreads)	290	static void max_parallel (int nthreads)
272	{	291	{
273	int cur = started;	292	int cur = started;
274		293
		294	if (wanted > nthreads)
		295	wanted = nthreads;
		296
275	while (cur > nthreads)	297	while (cur > wanted)
276	{	298	{
277	end_thread ();	299	end_thread ();
278	cur--;	300	cur--;
279	}	301	}
280		302
281	while (started > nthreads)	303	while (started > wanted)
282	{	304	{
283	poll_wait ();	305	poll_wait ();
284	poll_cb ();	306	poll_cb ();
285	}	307	}
286	}	308	}
…		…
311		333
312	static void atfork_child (void)	334	static void atfork_child (void)
313	{	335	{
314	aio_req prv;	336	aio_req prv;
315		337
316	int restart = started;
317	started = 0;	338	started = 0;
318		339
319	while (reqs)	340	while (reqs)
320	{	341	{
321	prv = reqs;	342	prv = reqs;
…		…
332	free_req (prv);	353	free_req (prv);
333	}	354	}
334		355
335	ress = rese = 0;	356	ress = rese = 0;
336		357
		358	close (respipe [0]);
		359	close (respipe [1]);
		360	create_pipe ();
		361
337	atfork_parent ();	362	atfork_parent ();
338
339	min_parallel (restart);
340	}	363	}
		364
		365	/* currently noops */
		366	#define LOCK_FD(fd) do { } while (0)
		367	#define UNLOCK_FD(fd) do { } while (0)
341		368
342	/*****************************************************************************/	369	/*****************************************************************************/
343	/* work around various missing functions */	370	/* work around various missing functions */
344		371
345	#if !HAVE_PREADWRITE	372	#if !HAVE_PREADWRITE
…		…
357	pread (int fd, void *buf, size_t count, off_t offset)	384	pread (int fd, void *buf, size_t count, off_t offset)
358	{	385	{
359	ssize_t res;	386	ssize_t res;
360	off_t ooffset;	387	off_t ooffset;
361		388
362	pthread_mutex_lock (&iolock);	389	LOCK_FD (fd);
		390	pthread_mutex_lock (&iolock); /* replace by LOCK_FD and private buffer */
363	ooffset = lseek (fd, 0, SEEK_CUR);	391	ooffset = lseek (fd, 0, SEEK_CUR);
364	lseek (fd, offset, SEEK_SET);	392	lseek (fd, offset, SEEK_SET);
365	res = read (fd, buf, count);	393	res = read (fd, buf, count);
366	lseek (fd, ooffset, SEEK_SET);	394	lseek (fd, ooffset, SEEK_SET);
367	pthread_mutex_unlock (&iolock);	395	pthread_mutex_unlock (&iolock);
		396	UNLOCK_FD (d);
368		397
369	return res;	398	return res;
370	}	399	}
371		400
372	static ssize_t	401	static ssize_t
373	pwrite (int fd, void *buf, size_t count, off_t offset)	402	pwrite (int fd, void *buf, size_t count, off_t offset)
374	{	403	{
375	ssize_t res;	404	ssize_t res;
376	off_t ooffset;	405	off_t ooffset;
377		406
378	pthread_mutex_lock (&iolock);	407	LOCK_FD (fd);
		408	pthread_mutex_lock (&iolock); /* replace by LOCK_FD and private buffer */
379	ooffset = lseek (fd, 0, SEEK_CUR);	409	ooffset = lseek (fd, 0, SEEK_CUR);
380	lseek (fd, offset, SEEK_SET);	410	lseek (fd, offset, SEEK_SET);
381	res = write (fd, buf, count);	411	res = write (fd, buf, count);
382	lseek (fd, offset, SEEK_SET);	412	lseek (fd, offset, SEEK_SET);
383	pthread_mutex_unlock (&iolock);	413	pthread_mutex_unlock (&iolock);
		414	UNLOCK_FD (d);
384		415
385	return res;	416	return res;
386	}	417	}
387	#endif	418	#endif
388		419
…		…
408	}	439	}
409		440
410	errno = 0;	441	errno = 0;
411	}	442	}
412	#endif	443	#endif
		444
		445	/* sendfile always needs emulation */
		446	static ssize_t
		447	sendfile_ (int ofd, int ifd, off_t offset, size_t count)
		448	{
		449	ssize_t res;
		450
		451	if (!count)
		452	return 0;
		453
		454	LOCK_FD (ofd);
		455
		456	#if HAVE_SENDFILE
		457	# if __linux
		458	res = sendfile (ofd, ifd, &offset, count);
		459
		460	# elif __freebsd
		461	/*
		462	* Of course, the freebsd sendfile is a dire hack with no thoughts
		463	* wasted on making it similar to other I/O functions.
		464	*/
		465	{
		466	off_t sbytes;
		467	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
		468
		469	if (res < 0 && sbytes)
		470	/* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
		471	res = sbytes;
		472	}
		473
		474	# elif __hpux
		475	res = sendfile (ofd, ifd, offset, count, 0, 0);
		476
		477	# elif __solaris
		478	{
		479	struct sendfilevec vec;
		480	size_t sbytes;
		481
		482	vec.sfv_fd = ifd;
		483	vec.sfv_flag = 0;
		484	vec.sfv_off = offset;
		485	vec.sfv_len = count;
		486
		487	res = sendfilev (ofd, &vec, 1, &sbytes);
		488
		489	if (res < 0 && sbytes)
		490	res = sbytes;
		491	}
		492
		493	# else
		494	res = -1;
		495	errno = ENOSYS;
		496	# endif
		497	#endif
		498
		499	if (res < 0
		500	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK
		501	#if __solaris
		502	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE
		503	#endif
		504	)
		505	)
		506	{
		507	/* emulate sendfile. this is a major pain in the ass */
		508	char *buf = malloc (4096);
		509	res = 0;
		510
		511	for (;;)
		512	{
		513	ssize_t cnt;
		514
		515	cnt = pread (ifd, buf, 4096, offset);
		516
		517	if (cnt <= 0)
		518	{
		519	if (cnt && !res) res = -1;
		520	break;
		521	}
		522
		523	cnt = write (ofd, buf, cnt);
		524
		525	if (cnt <= 0)
		526	{
		527	if (cnt && !res) res = -1;
		528	break;
		529	}
		530
		531	offset += cnt;
		532	res += cnt;
		533	}
		534
		535	{
		536	int errorno = errno;
		537	free (buf);
		538	errno = errorno;
		539	}
		540	}
		541
		542	UNLOCK_FD (ofd);
		543
		544	return res;
		545	}
413		546
414	/*****************************************************************************/	547	/*****************************************************************************/
415		548
416	static void *	549	static void *
417	aio_proc (void *thr_arg)	550	aio_proc (void *thr_arg)
…		…
449	{	582	{
450	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	583	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
451	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	584	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
452		585
453	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	586	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
		587	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
454		588
455	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	589	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
456	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	590	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
457	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	591	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
458		592
…		…
581		715
582	void	716	void
583	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	717	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
584	SV * fh	718	SV * fh
585	UV offset	719	UV offset
586	IV length	720	UV length
587	SV * data	721	SV * data
588	IV dataoffset	722	UV dataoffset
589	SV * callback	723	SV * callback
590	ALIAS:	724	ALIAS:
591	aio_read = REQ_READ	725	aio_read = REQ_READ
592	aio_write = REQ_WRITE	726	aio_write = REQ_WRITE
593	PROTOTYPE: $$$$$;$	727	PROTOTYPE: $$$$$;$
…		…
639	req->data2ptr = (void *)data;	773	req->data2ptr = (void *)data;
640	}	774	}
641		775
642	send_req (req);	776	send_req (req);
643	}	777	}
		778	}
		779
		780	void
		781	aio_sendfile(out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
		782	SV * out_fh
		783	SV * in_fh
		784	UV in_offset
		785	UV length
		786	SV * callback
		787	PROTOTYPE: $$$$;$
		788	CODE:
		789	{
		790	dREQ;
		791
		792	req->type = REQ_SENDFILE;
		793	req->fh = newSVsv (out_fh);
		794	req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
		795	req->fh2 = newSVsv (in_fh);
		796	req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
		797	req->offset = in_offset;
		798	req->length = length;
		799
		800	send_req (req);
644	}	801	}
645		802
646	void	803	void
647	aio_readahead(fh,offset,length,callback=&PL_sv_undef)	804	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
648	SV * fh	805	SV * fh

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.28 by root, Wed Aug 17 05:06:59 2005 UTC vs. Revision 1.35 by root, Tue Aug 23 01:16:50 2005 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.28 by root, Wed Aug 17 05:06:59 2005 UTC vs.
Revision 1.35 by root, Tue Aug 23 01:16:50 2005 UTC