[ViewVC] Diff of: cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.18 by root, Mon Jun 16 12:19:55 2008 UTC vs.
Revision 1.46 by root, Sat Jan 2 12:58:37 2010 UTC

…		…
1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libeio@schmorp.de>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without modifica-	7	* Redistribution and use in source and binary forms, with or without modifica-
8	* tion, are permitted provided that the following conditions are met:	8	* tion, are permitted provided that the following conditions are met:
9	*	9	*
36	* provisions above, a recipient may use your version of this file under	36	* provisions above, a recipient may use your version of this file under
37	* either the BSD or the GPL.	37	* either the BSD or the GPL.
38	*/	38	*/
39		39
40	#include "eio.h"	40	#include "eio.h"
		41
		42	#ifdef EIO_STACKSIZE
		43	# define XTHREAD_STACKSIZE EIO_STACKSIZE
		44	#endif
41	#include "xthread.h"	45	#include "xthread.h"
42		46
43	#include <errno.h>	47	#include <errno.h>
44	#include <stddef.h>	48	#include <stddef.h>
45	#include <stdlib.h>	49	#include <stdlib.h>
…		…
64	#endif	68	#endif
65		69
66	#ifdef _WIN32	70	#ifdef _WIN32
67		71
68	/doh/	72	/doh/
69
70	#else	73	#else
71		74
72	# include "config.h"	75	# include "config.h"
73	# include <sys/time.h>	76	# include <sys/time.h>
74	# include <sys/select.h>	77	# include <sys/select.h>
		78	# include <sys/mman.h>
75	# include <unistd.h>	79	# include <unistd.h>
76	# include <utime.h>	80	# include <utime.h>
77	# include <signal.h>	81	# include <signal.h>
78	# include <dirent.h>	82	# include <dirent.h>
79		83
		84	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		85	# if __freebsd \|\| defined __NetBSD__ \|\| defined __OpenBSD__
		86	# define _DIRENT_HAVE_D_TYPE /* sigh */
		87	# define D_INO(de) (de)->d_fileno
		88	# define D_NAMLEN(de) (de)->d_namlen
		89	# elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600
		90	# define D_INO(de) (de)->d_ino
		91	# endif
		92
		93	#ifdef _D_EXACT_NAMLEN
		94	# undef D_NAMLEN
		95	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		96	#endif
		97
		98	# ifdef _DIRENT_HAVE_D_TYPE
		99	# define D_TYPE(de) (de)->d_type
		100	# endif
		101
80	# ifndef EIO_STRUCT_DIRENT	102	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent	103	# define EIO_STRUCT_DIRENT struct dirent
82	# endif	104	# endif
83		105
84	#endif	106	#endif
85		107
86	#if HAVE_SENDFILE	108	#if HAVE_SENDFILE
87	# if __linux	109	# if __linux
88	# include <sys/sendfile.h>	110	# include <sys/sendfile.h>
89	# elif __freebsd	111	# elif __freebsd \|\| defined __APPLE__
90	# include <sys/socket.h>	112	# include <sys/socket.h>
91	# include <sys/uio.h>	113	# include <sys/uio.h>
92	# elif __hpux	114	# elif __hpux
93	# include <sys/socket.h>	115	# include <sys/socket.h>
94	# elif __solaris /* not yet */	116	# elif __solaris
95	# include <sys/sendfile.h>	117	# include <sys/sendfile.h>
96	# else	118	# else
97	# error sendfile support requested but not available	119	# error sendfile support requested but not available
98	# endif	120	# endif
		121	#endif
		122
		123	#ifndef D_TYPE
		124	# define D_TYPE(de) 0
		125	#endif
		126	#ifndef D_INO
		127	# define D_INO(de) 0
		128	#endif
		129	#ifndef D_NAMLEN
		130	# define D_NAMLEN(de) strlen ((de)->d_name)
99	#endif	131	#endif
100		132
101	/* number of seconds after which an idle threads exit */	133	/* number of seconds after which an idle threads exit */
102	#define IDLE_TIMEOUT 10	134	#define IDLE_TIMEOUT 10
103		135
…		…
117	errno = ENOMEM; \	149	errno = ENOMEM; \
118	if (!eio_buf) \	150	if (!eio_buf) \
119	return -1;	151	return -1;
120		152
121	#define EIO_TICKS ((1000000 + 1023) >> 10)	153	#define EIO_TICKS ((1000000 + 1023) >> 10)
		154
		155	/*****************************************************************************/
		156
		157	#if __GNUC__ >= 3
		158	# define expect(expr,value) __builtin_expect ((expr),(value))
		159	#else
		160	# define expect(expr,value) (expr)
		161	#endif
		162
		163	#define expect_false(expr) expect ((expr) != 0, 0)
		164	#define expect_true(expr) expect ((expr) != 0, 1)
122		165
123	/*****************************************************************************/	166	/*****************************************************************************/
124		167
125	#define ETP_PRI_MIN EIO_PRI_MIN	168	#define ETP_PRI_MIN EIO_PRI_MIN
126	#define ETP_PRI_MAX EIO_PRI_MAX	169	#define ETP_PRI_MAX EIO_PRI_MAX
…		…
144	if (wrk->dirp) \	187	if (wrk->dirp) \
145	{ \	188	{ \
146	closedir (wrk->dirp); \	189	closedir (wrk->dirp); \
147	wrk->dirp = 0; \	190	wrk->dirp = 0; \
148	}	191	}
		192
149	#define ETP_WORKER_COMMON \	193	#define ETP_WORKER_COMMON \
150	void *dbuf; \	194	void *dbuf; \
151	DIR *dirp;	195	DIR *dirp;
152		196
153	/*****************************************************************************/	197	/*****************************************************************************/
154		198
155	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	199	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
156		200
157	/* calculcate time difference in ~1/EIO_TICKS of a second */	201	/* calculate time difference in ~1/EIO_TICKS of a second */
158	static int tvdiff (struct timeval tv1, struct timeval tv2)	202	static int tvdiff (struct timeval tv1, struct timeval tv2)
159	{	203	{
160	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	204	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
161	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	205	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
162	}	206	}
…		…
176		220
177	static mutex_t wrklock = X_MUTEX_INIT;	221	static mutex_t wrklock = X_MUTEX_INIT;
178	static mutex_t reslock = X_MUTEX_INIT;	222	static mutex_t reslock = X_MUTEX_INIT;
179	static mutex_t reqlock = X_MUTEX_INIT;	223	static mutex_t reqlock = X_MUTEX_INIT;
180	static cond_t reqwait = X_COND_INIT;	224	static cond_t reqwait = X_COND_INIT;
		225
		226	#if !HAVE_PREADWRITE
		227	/*
		228	* make our pread/pwrite emulation safe against themselves, but not against
		229	* normal read/write by using a mutex. slows down execution a lot,
		230	* but that's your problem, not mine.
		231	*/
		232	static mutex_t preadwritelock = X_MUTEX_INIT;
		233	#endif
181		234
182	typedef struct etp_worker	235	typedef struct etp_worker
183	{	236	{
184	/* locked by wrklock */	237	/* locked by wrklock */
185	struct etp_worker prev, next;	238	struct etp_worker prev, next;
…		…
330		383
331	static void etp_atfork_child (void)	384	static void etp_atfork_child (void)
332	{	385	{
333	ETP_REQ *prv;	386	ETP_REQ *prv;
334		387
335	while (prv = reqq_shift (&req_queue))	388	while ((prv = reqq_shift (&req_queue)))
336	ETP_DESTROY (prv);	389	ETP_DESTROY (prv);
337		390
338	while (prv = reqq_shift (&res_queue))	391	while ((prv = reqq_shift (&res_queue)))
339	ETP_DESTROY (prv);	392	ETP_DESTROY (prv);
340		393
341	while (wrk_first.next != &wrk_first)	394	while (wrk_first.next != &wrk_first)
342	{	395	{
343	etp_worker *wrk = wrk_first.next;	396	etp_worker *wrk = wrk_first.next;
…		…
371		424
372	pthread_once (&doinit, etp_once_init);	425	pthread_once (&doinit, etp_once_init);
373		426
374	want_poll_cb = want_poll;	427	want_poll_cb = want_poll;
375	done_poll_cb = done_poll;	428	done_poll_cb = done_poll;
		429
		430	return 0;
376	}	431	}
377		432
378	X_THREAD_PROC (etp_proc);	433	X_THREAD_PROC (etp_proc);
379		434
380	static void etp_start_thread (void)	435	static void etp_start_thread (void)
…		…
400	X_UNLOCK (wrklock);	455	X_UNLOCK (wrklock);
401	}	456	}
402		457
403	static void etp_maybe_start_thread (void)	458	static void etp_maybe_start_thread (void)
404	{	459	{
405	if (etp_nthreads () >= wanted)	460	if (expect_true (etp_nthreads () >= wanted))
406	return;	461	return;
407		462
408	/* todo: maybe use idle here, but might be less exact */	463	/* todo: maybe use idle here, but might be less exact */
409	if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())	464	if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
410	return;	465	return;
411		466
412	etp_start_thread ();	467	etp_start_thread ();
413	}	468	}
414		469
…		…
467		522
468	X_LOCK (reqlock);	523	X_LOCK (reqlock);
469	--nreqs;	524	--nreqs;
470	X_UNLOCK (reqlock);	525	X_UNLOCK (reqlock);
471		526
472	if (req->type == EIO_GROUP && req->size)	527	if (expect_false (req->type == EIO_GROUP && req->size))
473	{	528	{
474	req->int1 = 1; /* mark request as delayed */	529	req->int1 = 1; /* mark request as delayed */
475	continue;	530	continue;
476	}	531	}
477	else	532	else
478	{	533	{
479	int res = ETP_FINISH (req);	534	int res = ETP_FINISH (req);
480	if (res)	535	if (expect_false (res))
481	return res;	536	return res;
482	}	537	}
483		538
484	if (maxreqs && !--maxreqs)	539	if (expect_false (maxreqs && !--maxreqs))
485	break;	540	break;
486		541
487	if (maxtime)	542	if (maxtime)
488	{	543	{
489	gettimeofday (&tv_now, 0);	544	gettimeofday (&tv_now, 0);
…		…
508		563
509	static void etp_submit (ETP_REQ *req)	564	static void etp_submit (ETP_REQ *req)
510	{	565	{
511	req->pri -= ETP_PRI_MIN;	566	req->pri -= ETP_PRI_MIN;
512		567
513	if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;	568	if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
514	if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	569	if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
515		570
		571	if (expect_false (req->type == EIO_GROUP))
		572	{
		573	/* I hope this is worth it :/ */
516	X_LOCK (reqlock);	574	X_LOCK (reqlock);
517	++nreqs;	575	++nreqs;
		576	X_UNLOCK (reqlock);
		577
		578	X_LOCK (reslock);
		579
		580	++npending;
		581
		582	if (!reqq_push (&res_queue, req) && want_poll_cb)
		583	want_poll_cb ();
		584
		585	X_UNLOCK (reslock);
		586	}
		587	else
		588	{
		589	X_LOCK (reqlock);
		590	++nreqs;
518	++nready;	591	++nready;
519	reqq_push (&req_queue, req);	592	reqq_push (&req_queue, req);
520	X_COND_SIGNAL (reqwait);	593	X_COND_SIGNAL (reqwait);
521	X_UNLOCK (reqlock);	594	X_UNLOCK (reqlock);
522		595
523	etp_maybe_start_thread ();	596	etp_maybe_start_thread ();
		597	}
524	}	598	}
525		599
526	static void etp_set_max_poll_time (double nseconds)	600	static void etp_set_max_poll_time (double nseconds)
527	{	601	{
528	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	602	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
529	max_poll_time = nseconds;	603	max_poll_time = nseconds * EIO_TICKS;
530	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	604	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
531	}	605	}
532		606
533	static void etp_set_max_poll_reqs (unsigned int maxreqs)	607	static void etp_set_max_poll_reqs (unsigned int maxreqs)
534	{	608	{
…		…
563		637
564	static void grp_try_feed (eio_req *grp)	638	static void grp_try_feed (eio_req *grp)
565	{	639	{
566	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	640	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
567	{	641	{
568	int old_len = grp->size;	642	grp->flags &= ~EIO_FLAG_GROUPADD;
569		643
570	EIO_FEED (grp);	644	EIO_FEED (grp);
571		645
572	/* stop if no progress has been made */	646	/* stop if no progress has been made */
573	if (old_len == grp->size)	647	if (!(grp->flags & EIO_FLAG_GROUPADD))
574	{	648	{
575	grp->feed = 0;	649	grp->feed = 0;
576	break;	650	break;
577	}	651	}
578	}	652	}
…		…
695		769
696	/*****************************************************************************/	770	/*****************************************************************************/
697	/* work around various missing functions */	771	/* work around various missing functions */
698		772
699	#if !HAVE_PREADWRITE	773	#if !HAVE_PREADWRITE
		774	# undef pread
		775	# undef pwrite
700	# define pread eio__pread	776	# define pread eio__pread
701	# define pwrite eio__pwrite	777	# define pwrite eio__pwrite
702
703	/*
704	* make our pread/pwrite safe against themselves, but not against
705	* normal read/write by using a mutex. slows down execution a lot,
706	* but that's your problem, not mine.
707	*/
708	static mutex_t preadwritelock = X_MUTEX_INIT;
709		778
710	static ssize_t	779	static ssize_t
711	eio__pread (int fd, void *buf, size_t count, off_t offset)	780	eio__pread (int fd, void *buf, size_t count, off_t offset)
712	{	781	{
713	ssize_t res;	782	ssize_t res;
…		…
731		800
732	X_LOCK (preadwritelock);	801	X_LOCK (preadwritelock);
733	ooffset = lseek (fd, 0, SEEK_CUR);	802	ooffset = lseek (fd, 0, SEEK_CUR);
734	lseek (fd, offset, SEEK_SET);	803	lseek (fd, offset, SEEK_SET);
735	res = write (fd, buf, count);	804	res = write (fd, buf, count);
736	lseek (fd, offset, SEEK_SET);	805	lseek (fd, ooffset, SEEK_SET);
737	X_UNLOCK (preadwritelock);	806	X_UNLOCK (preadwritelock);
738		807
739	return res;	808	return res;
740	}	809	}
741	#endif	810	#endif
742		811
743	#ifndef HAVE_FUTIMES	812	#ifndef HAVE_FUTIMES
744		813
		814	# undef utimes
		815	# undef futimes
745	# define utimes(path,times) eio__utimes (path, times)	816	# define utimes(path,times) eio__utimes (path, times)
746	# define futimes(fd,times) eio__futimes (fd, times)	817	# define futimes(fd,times) eio__futimes (fd, times)
747		818
748	static int	819	static int
749	eio__utimes (const char *filename, const struct timeval times[2])	820	eio__utimes (const char *filename, const struct timeval times[2])
…		…
768	}	839	}
769		840
770	#endif	841	#endif
771		842
772	#if !HAVE_FDATASYNC	843	#if !HAVE_FDATASYNC
		844	# undef fdatasync
773	# define fdatasync fsync	845	# define fdatasync(fd) fsync (fd)
774	#endif	846	#endif
		847
		848	/* sync_file_range always needs emulation */
		849	int
		850	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		851	{
		852	#if HAVE_SYNC_FILE_RANGE
		853	int res;
		854
		855	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		856	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		857	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		858	{
		859	flags = 0
		860	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		861	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		862	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		863	}
		864
		865	res = sync_file_range (fd, offset, nbytes, flags);
		866
		867	if (!res \|\| errno != ENOSYS)
		868	return res;
		869	#endif
		870
		871	/* even though we could play tricks with the flags, it's better to always
		872	* call fdatasync, as that matches the expectation of its users best */
		873	return fdatasync (fd);
		874	}
775		875
776	#if !HAVE_READAHEAD	876	#if !HAVE_READAHEAD
		877	# undef readahead
777	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	878	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
778		879
779	static ssize_t	880	static ssize_t
780	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	881	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
781	{	882	{
…		…
822	if (res < 0 && sbytes)	923	if (res < 0 && sbytes)
823	/* maybe only on EAGAIN: as usual, the manpage leaves you guessing */	924	/* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
824	res = sbytes;	925	res = sbytes;
825	}	926	}
826		927
		928	# elif defined (__APPLE__)
		929
		930	{
		931	off_t sbytes = count;
		932	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
		933
		934	if (res < 0 && errno == EAGAIN && sbytes)
		935	res = sbytes;
		936	}
		937
827	# elif __hpux	938	# elif __hpux
828	res = sendfile (ofd, ifd, offset, count, 0, 0);	939	res = sendfile (ofd, ifd, offset, count, 0, 0);
829		940
830	# elif __solaris	941	# elif __solaris
831	{	942	{
…		…
842	if (res < 0 && sbytes)	953	if (res < 0 && sbytes)
843	res = sbytes;	954	res = sbytes;
844	}	955	}
845		956
846	# endif	957	# endif
		958
		959	#elif defined (_WIN32)
		960
		961	/* does not work, just for documentation of what would need to be done */
		962	{
		963	HANDLE h = TO_SOCKET (ifd);
		964	SetFilePointer (h, offset, 0, FILE_BEGIN);
		965	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
		966	}
		967
847	#else	968	#else
848	res = -1;	969	res = -1;
849	errno = ENOSYS;	970	errno = ENOSYS;
850	#endif	971	#endif
851		972
…		…
889	}	1010	}
890		1011
891	return res;	1012	return res;
892	}	1013	}
893		1014
		1015	static signed char
		1016	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
		1017	{
		1018	return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
		1019	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
		1020	}
		1021
		1022	#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
		1023
		1024	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1025	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
		1026
		1027	static void
		1028	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1029	{
		1030	unsigned char bits [9 + sizeof (ino_t) * 8];
		1031	unsigned char *bit = bits;
		1032
		1033	assert (CHAR_BIT == 8);
		1034	assert (sizeof (eio_dirent) * 8 < 256);
		1035	assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
		1036	assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
		1037
		1038	if (size <= EIO_SORT_FAST)
		1039	return;
		1040
		1041	/* first prepare an array of bits to test in our radix sort */
		1042	/* try to take endianness into account, as well as differences in ino_t sizes */
		1043	/* inode_bits must contain all inodes ORed together */
		1044	/* which is used to skip bits that are 0 everywhere, which is very common */
		1045	{
		1046	ino_t endianness;
		1047	int i, j;
		1048
		1049	/* we store the byte offset of byte n into byte n of "endianness" */
		1050	for (i = 0; i < sizeof (ino_t); ++i)
		1051	((unsigned char *)&endianness)[i] = i;
		1052
		1053	*bit++ = 0;
		1054
		1055	for (i = 0; i < sizeof (ino_t); ++i)
		1056	{
		1057	/* shifting off the byte offsets out of "endianness" */
		1058	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
		1059	endianness >>= 8;
		1060
		1061	for (j = 0; j < 8; ++j)
		1062	if (inode_bits & (((ino_t)1) << (i * 8 + j)))
		1063	*bit++ = offs + j;
		1064	}
		1065
		1066	for (j = 0; j < 8; ++j)
		1067	if (score_bits & (1 << j))
		1068	bit++ = offsetof (eio_dirent, score) 8 + j;
		1069	}
		1070
		1071	/* now actually do the sorting (a variant of MSD radix sort) */
		1072	{
		1073	eio_dirent base_stk [9 + sizeof (ino_t) 8], *base;
		1074	eio_dirent end_stk [9 + sizeof (ino_t) 8], *end;
		1075	unsigned char bit_stk [9 + sizeof (ino_t) 8];
		1076	int stk_idx = 0;
		1077
		1078	base_stk [stk_idx] = dents;
		1079	end_stk [stk_idx] = dents + size;
		1080	bit_stk [stk_idx] = bit - 1;
		1081
		1082	do
		1083	{
		1084	base = base_stk [stk_idx];
		1085	end = end_stk [stk_idx];
		1086	bit = bit_stk [stk_idx];
		1087
		1088	for (;;)
		1089	{
		1090	unsigned char O = *bit >> 3;
		1091	unsigned char M = 1 << (*bit & 7);
		1092
		1093	eio_dirent *a = base;
		1094	eio_dirent *b = end;
		1095
		1096	if (b - a < EIO_SORT_CUTOFF)
		1097	break;
		1098
		1099	/* now bit-partition the array on the bit */
		1100	/* this ugly asymmetric loop seems to perform much better than typical */
		1101	/* partition algos found in the literature */
		1102	do
		1103	if (!(((unsigned char *)a)[O] & M))
		1104	++a;
		1105	else if (!(((unsigned char *)--b)[O] & M))
		1106	{
		1107	eio_dirent tmp = a; a = b; b = tmp;
		1108	++a;
		1109	}
		1110	while (b > a);
		1111
		1112	/* next bit, or stop, if no bits left in this path */
		1113	if (!*--bit)
		1114	break;
		1115
		1116	base_stk [stk_idx] = a;
		1117	end_stk [stk_idx] = end;
		1118	bit_stk [stk_idx] = bit;
		1119	++stk_idx;
		1120
		1121	end = a;
		1122	}
		1123	}
		1124	while (stk_idx--);
		1125	}
		1126	}
		1127
		1128	static void
		1129	eio_dent_insertion_sort (eio_dirent *dents, int size)
		1130	{
		1131	/* first move the smallest element to the front, to act as a sentinel */
		1132	{
		1133	int i;
		1134	eio_dirent *min = dents;
		1135
		1136	/* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
		1137	for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
		1138	if (EIO_DENT_CMP (dents [i], <, *min))
		1139	min = &dents [i];
		1140
		1141	/* swap elements 0 and j (minimum) */
		1142	{
		1143	eio_dirent tmp = dents; dents = min; min = tmp;
		1144	}
		1145	}
		1146
		1147	/* then do standard insertion sort, assuming that all elements are >= dents [0] */
		1148	{
		1149	eio_dirent i, j;
		1150
		1151	for (i = dents + 1; i < dents + size; ++i)
		1152	{
		1153	eio_dirent value = *i;
		1154
		1155	for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
		1156	j [1] = j [0];
		1157
		1158	j [1] = value;
		1159	}
		1160	}
		1161	}
		1162
		1163	static void
		1164	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1165	{
		1166	if (size <= 1)
		1167	return; /* our insertion sort relies on size > 0 */
		1168
		1169	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
		1170	/* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
		1171	eio_dent_radix_sort (dents, size, score_bits, inode_bits);
		1172
		1173	/* use an insertion sort at the end, or for small arrays, */
		1174	/* as insertion sort is more efficient for small partitions */
		1175	eio_dent_insertion_sort (dents, size);
		1176	}
		1177
894	/* read a full directory */	1178	/* read a full directory */
895	static void	1179	static void
896	eio__scandir (eio_req req, etp_worker self)	1180	eio__scandir (eio_req req, etp_worker self)
897	{	1181	{
898	DIR *dirp;	1182	DIR *dirp;
899	EIO_STRUCT_DIRENT *entp;	1183	EIO_STRUCT_DIRENT *entp;
900	char name, names;	1184	char name, names;
901	int memlen = 4096;	1185	int namesalloc = 4096;
902	int memofs = 0;	1186	int namesoffs = 0;
		1187	int flags = req->int1;
		1188	eio_dirent *dents = 0;
		1189	int dentalloc = 128;
903	int res = 0;	1190	int dentoffs = 0;
		1191	ino_t inode_bits = 0;
		1192
		1193	req->result = -1;
		1194
		1195	if (!(flags & EIO_READDIR_DENTS))
		1196	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
904		1197
905	X_LOCK (wrklock);	1198	X_LOCK (wrklock);
		1199	/* the corresponding closedir is in ETP_WORKER_CLEAR */
906	self->dirp = dirp = opendir (req->ptr1);	1200	self->dirp = dirp = opendir (req->ptr1);
907	req->flags \|= EIO_FLAG_PTR2_FREE;	1201	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
		1202	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
908	req->ptr2 = names = malloc (memlen);	1203	req->ptr2 = names = malloc (namesalloc);
909	X_UNLOCK (wrklock);	1204	X_UNLOCK (wrklock);
910		1205
911	if (dirp && names)	1206	if (dirp && names && (!flags \|\| dents))
912	for (;;)	1207	for (;;)
913	{	1208	{
914	errno = 0;	1209	errno = 0;
915	entp = readdir (dirp);	1210	entp = readdir (dirp);
916		1211
917	if (!entp)	1212	if (!entp)
		1213	{
		1214	if (errno)
		1215	break;
		1216
		1217	/* sort etc. */
		1218	req->int1 = flags;
		1219	req->result = dentoffs;
		1220
		1221	if (flags & EIO_READDIR_STAT_ORDER)
		1222	eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
		1223	else if (flags & EIO_READDIR_DIRS_FIRST)
		1224	if (flags & EIO_READDIR_FOUND_UNKNOWN)
		1225	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
		1226	else
		1227	{
		1228	/* in this case, all is known, and we just put dirs first and sort them */
		1229	eio_dirent *oth = dents + dentoffs;
		1230	eio_dirent *dir = dents;
		1231
		1232	/* now partition dirs to the front, and non-dirs to the back */
		1233	/* by walking from both sides and swapping if necessary */
		1234	/* also clear score, so it doesn't influence sorting */
		1235	while (oth > dir)
		1236	{
		1237	if (dir->type == EIO_DT_DIR)
		1238	++dir;
		1239	else if ((--oth)->type == EIO_DT_DIR)
		1240	{
		1241	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1242
		1243	++dir;
		1244	}
		1245	}
		1246
		1247	/* now sort the dirs only */
		1248	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1249	}
		1250
918	break;	1251	break;
		1252	}
919		1253
		1254	/* now add the entry to our list(s) */
920	name = entp->d_name;	1255	name = entp->d_name;
921		1256
		1257	/* skip . and .. entries */
922	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1258	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
923	{	1259	{
924	int len = strlen (name) + 1;	1260	int len = D_NAMLEN (entp) + 1;
925		1261
926	res++;	1262	while (expect_false (namesoffs + len > namesalloc))
927
928	while (memofs + len > memlen)
929	{	1263	{
930	memlen *= 2;	1264	namesalloc *= 2;
931	X_LOCK (wrklock);	1265	X_LOCK (wrklock);
932	req->ptr2 = names = realloc (names, memlen);	1266	req->ptr2 = names = realloc (names, namesalloc);
933	X_UNLOCK (wrklock);	1267	X_UNLOCK (wrklock);
934		1268
935	if (!names)	1269	if (!names)
936	break;	1270	break;
937	}	1271	}
938		1272
939	memcpy (names + memofs, name, len);	1273	memcpy (names + namesoffs, name, len);
		1274
		1275	if (dents)
		1276	{
		1277	struct eio_dirent *ent;
		1278
		1279	if (expect_false (dentoffs == dentalloc))
		1280	{
		1281	dentalloc *= 2;
		1282	X_LOCK (wrklock);
		1283	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1284	X_UNLOCK (wrklock);
		1285
		1286	if (!dents)
		1287	break;
		1288	}
		1289
		1290	ent = dents + dentoffs;
		1291
		1292	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
		1293	ent->namelen = len - 1;
		1294	ent->inode = D_INO (entp);
		1295
		1296	inode_bits \|= ent->inode;
		1297
		1298	switch (D_TYPE (entp))
		1299	{
		1300	default:
		1301	ent->type = EIO_DT_UNKNOWN;
		1302	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1303	break;
		1304
		1305	#ifdef DT_FIFO
		1306	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1307	#endif
		1308	#ifdef DT_CHR
		1309	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1310	#endif
		1311	#ifdef DT_MPC
		1312	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1313	#endif
		1314	#ifdef DT_DIR
		1315	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1316	#endif
		1317	#ifdef DT_NAM
		1318	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1319	#endif
		1320	#ifdef DT_BLK
		1321	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1322	#endif
		1323	#ifdef DT_MPB
		1324	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1325	#endif
		1326	#ifdef DT_REG
		1327	case DT_REG: ent->type = EIO_DT_REG; break;
		1328	#endif
		1329	#ifdef DT_NWK
		1330	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1331	#endif
		1332	#ifdef DT_CMP
		1333	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1334	#endif
		1335	#ifdef DT_LNK
		1336	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1337	#endif
		1338	#ifdef DT_SOCK
		1339	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1340	#endif
		1341	#ifdef DT_DOOR
		1342	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1343	#endif
		1344	#ifdef DT_WHT
		1345	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1346	#endif
		1347	}
		1348
		1349	ent->score = 7;
		1350
		1351	if (flags & EIO_READDIR_DIRS_FIRST)
		1352	{
		1353	if (ent->type == EIO_DT_UNKNOWN)
		1354	{
		1355	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1356	ent->score = 1;
		1357	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1358	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
		1359	}
		1360	else if (ent->type == EIO_DT_DIR)
		1361	ent->score = 0;
		1362	}
		1363	}
		1364
940	memofs += len;	1365	namesoffs += len;
		1366	++dentoffs;
		1367	}
		1368
		1369	if (EIO_CANCELLED (req))
		1370	{
		1371	errno = ECANCELED;
		1372	break;
941	}	1373	}
942	}	1374	}
		1375	}
943		1376
944	if (errno)	1377	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
945	res = -1;	1378	# undef msync
946		1379	# define msync(a,b,c) ((errno = ENOSYS), -1)
947	req->result = res;	1380	#endif
		1381
		1382	int
		1383	eio__mtouch (void *mem, size_t len, int flags)
		1384	{
		1385	intptr_t addr = (intptr_t)mem;
		1386	intptr_t end = addr + len;
		1387	#ifdef PAGESIZE
		1388	const intptr_t page = PAGESIZE;
		1389	#else
		1390	static intptr_t page;
		1391
		1392	if (!page)
		1393	page = sysconf (_SC_PAGESIZE);
		1394	#endif
		1395
		1396	/* round down to start of page, although this is probably useless */
		1397	addr &= ~(page - 1); /* assume page size is always a power of two */
		1398
		1399	if (addr < end)
		1400	if (flags) /* modify */
		1401	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
		1402	else
		1403	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1404
		1405	return 0;
948	}	1406	}
949		1407
950	/*****************************************************************************/	1408	/*****************************************************************************/
951		1409
952	#define ALLOC(len) \	1410	#define ALLOC(len) \
…		…
1039		1497
1040	/*****************************************************************************/	1498	/*****************************************************************************/
1041		1499
1042	int eio_init (void (want_poll)(void), void (done_poll)(void))	1500	int eio_init (void (want_poll)(void), void (done_poll)(void))
1043	{	1501	{
1044	etp_init (want_poll, done_poll);	1502	return etp_init (want_poll, done_poll);
1045	}	1503	}
1046		1504
1047	static void eio_api_destroy (eio_req *req)	1505	static void eio_api_destroy (eio_req *req)
1048	{	1506	{
1049	free (req);	1507	free (req);
…		…
1119	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	1577	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1120		1578
1121	case EIO_SYNC: req->result = 0; sync (); break;	1579	case EIO_SYNC: req->result = 0; sync (); break;
1122	case EIO_FSYNC: req->result = fsync (req->int1); break;	1580	case EIO_FSYNC: req->result = fsync (req->int1); break;
1123	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1581	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1582	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
		1583	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1584	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1124		1585
1125	case EIO_READDIR: eio__scandir (req, self); break;	1586	case EIO_READDIR: eio__scandir (req, self); break;
1126		1587
1127	case EIO_BUSY:	1588	case EIO_BUSY:
1128	#ifdef _WIN32	1589	#ifdef _WIN32
…		…
1160		1621
1161	req->result = req->type == EIO_FUTIME	1622	req->result = req->type == EIO_FUTIME
1162	? futimes (req->int1, times)	1623	? futimes (req->int1, times)
1163	: utimes (req->ptr1, times);	1624	: utimes (req->ptr1, times);
1164	}	1625	}
		1626	break;
1165		1627
1166	case EIO_GROUP:	1628	case EIO_GROUP:
		1629	abort (); /* handled in eio_request */
		1630
1167	case EIO_NOP:	1631	case EIO_NOP:
1168	req->result = 0;	1632	req->result = 0;
1169	break;	1633	break;
1170		1634
1171	case EIO_CUSTOM:	1635	case EIO_CUSTOM:
1172	req->feed (req);	1636	((void ()(eio_req ))req->feed) (req);
1173	break;	1637	break;
1174		1638
1175	default:	1639	default:
1176	req->result = -1;	1640	req->result = -1;
1177	break;	1641	break;
…		…
1200	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)	1664	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
1201	{	1665	{
1202	REQ (EIO_FSYNC); req->int1 = fd; SEND;	1666	REQ (EIO_FSYNC); req->int1 = fd; SEND;
1203	}	1667	}
1204		1668
		1669	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1670	{
		1671	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1672	}
		1673
		1674	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1675	{
		1676	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1677	}
		1678
		1679	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1680	{
		1681	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1682	}
		1683
1205	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1684	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1206	{	1685	{
1207	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1686	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1208	}	1687	}
1209		1688
…		…
1321	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1800	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1322	{	1801	{
1323	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1802	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1324	}	1803	}
1325		1804
1326	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1805	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1327	{	1806	{
1328	return eio__1path (EIO_READDIR, path, pri, cb, data);	1807	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1329	}	1808	}
1330		1809
1331	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1810	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1332	{	1811	{
1333	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	1812	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
…		…
1364	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	1843	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1365	}	1844	}
1366		1845
1367	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)	1846	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)
1368	{	1847	{
1369	REQ (EIO_CUSTOM); req->feed = execute; SEND;	1848	REQ (EIO_CUSTOM); req->feed = (void ()(eio_req ))execute; SEND;
1370	}	1849	}
1371		1850
1372	#endif	1851	#endif
1373		1852
1374	eio_req eio_grp (eio_cb cb, void data)	1853	eio_req eio_grp (eio_cb cb, void data)
…		…
1402		1881
1403	void eio_grp_add (eio_req grp, eio_req req)	1882	void eio_grp_add (eio_req grp, eio_req req)
1404	{	1883	{
1405	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	1884	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1406		1885
		1886	grp->flags \|= EIO_FLAG_GROUPADD;
		1887
1407	++grp->size;	1888	++grp->size;
1408	req->grp = grp;	1889	req->grp = grp;
1409		1890
1410	req->grp_prev = 0;	1891	req->grp_prev = 0;
1411	req->grp_next = grp->grp_first;	1892	req->grp_next = grp->grp_first;
…		…
1420	/* misc garbage */	1901	/* misc garbage */
1421		1902
1422	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1903	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1423	{	1904	{
1424	etp_worker wrk;	1905	etp_worker wrk;
		1906	ssize_t ret;
1425		1907
1426	wrk.dbuf = 0;	1908	wrk.dbuf = 0;
1427		1909
1428	eio__sendfile (ofd, ifd, offset, count, &wrk);	1910	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1429		1911
1430	if (wrk.dbuf)	1912	if (wrk.dbuf)
1431	free (wrk.dbuf);	1913	free (wrk.dbuf);
1432	}
1433		1914
		1915	return ret;
		1916	}
		1917

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.18 by root, Mon Jun 16 12:19:55 2008 UTC vs. Revision 1.46 by root, Sat Jan 2 12:58:37 2010 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.18 by root, Mon Jun 16 12:19:55 2008 UTC vs.
Revision 1.46 by root, Sat Jan 2 12:58:37 2010 UTC