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

Comparing libeio/eio.c (file contents):
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs.
Revision 1.41 by root, Sun Jun 14 20:36:59 2009 UTC

…		…
73	#else	73	#else
74		74
75	# include "config.h"	75	# include "config.h"
76	# include <sys/time.h>	76	# include <sys/time.h>
77	# include <sys/select.h>	77	# include <sys/select.h>
		78	# include <sys/mman.h>
78	# include <unistd.h>	79	# include <unistd.h>
79	# include <utime.h>	80	# include <utime.h>
80	# include <signal.h>	81	# include <signal.h>
81	# include <dirent.h>	82	# include <dirent.h>
82		83
83	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	84	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
84	# if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)	85	# if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		86	# define _DIRENT_HAVE_D_TYPE /* sigh */
85	# define D_INO(de) (de)->d_fileno	87	# define D_INO(de) (de)->d_fileno
86	# define _DIRENT_HAVE_D_TYPE /* sigh */	88	# define D_NAMLEN(de) (de)->d_namlen
87	# elif defined(__linux) \|\| defined(d_ino) \|\| _XOPEN_SOURCE >= 600	89	# elif defined(__linux) \|\| defined(d_ino) \|\| _XOPEN_SOURCE >= 600
88	# define D_INO(de) (de)->d_ino	90	# define D_INO(de) (de)->d_ino
89	# endif	91	# endif
		92
		93	#ifdef _D_EXACT_NAMLEN
		94	# undef D_NAMLEN
		95	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		96	#endif
90		97
91	# ifdef _DIRENT_HAVE_D_TYPE	98	# ifdef _DIRENT_HAVE_D_TYPE
92	# define D_TYPE(de) (de)->d_type	99	# define D_TYPE(de) (de)->d_type
93	# endif	100	# endif
94		101
…		…
114	#endif	121	#endif
115		122
116	#ifndef D_TYPE	123	#ifndef D_TYPE
117	# define D_TYPE(de) 0	124	# define D_TYPE(de) 0
118	#endif	125	#endif
119
120	#ifndef D_INO	126	#ifndef D_INO
121	# define D_INO(de) 0	127	# define D_INO(de) 0
		128	#endif
		129	#ifndef D_NAMLEN
		130	# define D_NAMLEN(de) strlen ((de)->d_name)
122	#endif	131	#endif
123		132
124	/* number of seconds after which an idle threads exit */	133	/* number of seconds after which an idle threads exit */
125	#define IDLE_TIMEOUT 10	134	#define IDLE_TIMEOUT 10
126		135
…		…
178	if (wrk->dirp) \	187	if (wrk->dirp) \
179	{ \	188	{ \
180	closedir (wrk->dirp); \	189	closedir (wrk->dirp); \
181	wrk->dirp = 0; \	190	wrk->dirp = 0; \
182	}	191	}
		192
183	#define ETP_WORKER_COMMON \	193	#define ETP_WORKER_COMMON \
184	void *dbuf; \	194	void *dbuf; \
185	DIR *dirp;	195	DIR *dirp;
186		196
187	/*****************************************************************************/	197	/*****************************************************************************/
…		…
980	}	990	}
981		991
982	return res;	992	return res;
983	}	993	}
984		994
985	static int	995	static signed char
986	eio_dent_cmp (const void a_, const void b_)	996	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
987	{	997	{
988	const eio_dirent a = (const eio_dirent )a_;	998	return b->score - a->score ? b->score - a->score /* works because our signed char is always 0..100 */
989	const eio_dirent b = (const eio_dirent )b_;
990
991	return (int)b->score - (int)a->score ? (int)b->score - (int)a->score
992	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */	999	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
		1000	}
		1001
		1002	#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
		1003	#define EIO_DENT_NUM_SCORES 9
		1004
		1005	#define EIO_QSORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1006	#define EIO_QSORT_SKIP 60 /* when to skip qsort completely */
		1007
		1008	static void
		1009	eio_dent_sort (eio_dirent *dents, int size)
		1010	{
		1011	if (size <= 1)
		1012	return; /* our insertion sort relies on size > 0 */
		1013
		1014	if (size > EIO_QSORT_SKIP) /* skip quicksort for small directories */
		1015	{
		1016	/* first, use quicksort */
		1017	/* should be good for 2*31 entries /
		1018	int i;
		1019	struct rng { eio_dirent l, r; } rng [32];
		1020
		1021	i = 0;
		1022	rng[0].l = dents;
		1023	rng[0].r = dents + size;
		1024
		1025	while (expect_true (i >= 0))
		1026	{
		1027	eio_dirent *L = rng [i].l;
		1028	eio_dirent *R = rng [i].r - 1;
		1029
		1030	if (expect_false (L + EIO_QSORT_CUTOFF < R))
		1031	{
		1032	eio_dirent *mid = &dents [((L - dents) + (R - dents)) >> 1];
		1033	eio_dirent piv = mid; mid = L; L = piv;
		1034
		1035	while (L < R)
		1036	{
		1037	while (EIO_DENT_CMP (*R, >=, piv) && L < R)
		1038	--R;
		1039
		1040	if (L < R)
		1041	L++ = R;
		1042
		1043	while (EIO_DENT_CMP (*L, <=, piv) && L < R)
		1044	++L;
		1045
		1046	if (L < R)
		1047	R-- = L;
		1048	}
		1049
		1050	*L = piv;
		1051
		1052	++i;
		1053	rng [i].l = L + 1;
		1054	rng [i].r = rng [i - 1].r;
		1055	rng [i - 1].r = L;
		1056
		1057	if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l)
		1058	{
		1059	struct rng t;
		1060
		1061	t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
		1062	}
		1063	}
		1064	else
		1065	--i;
		1066	}
		1067	}
		1068
		1069	/* use an insertion sort after qsort, or for small arrays */
		1070	/* first move the smallest element to the front, to act as a sentinel */
		1071	{
		1072	int i;
		1073	eio_dirent *min = dents;
		1074
		1075	for (i = size > EIO_QSORT_SKIP ? EIO_QSORT_CUTOFF + 1 : size; --i; )
		1076	if (EIO_DENT_CMP (dents [i], <, *min))
		1077	min = &dents [i];
		1078
		1079	/* swap elements 0 and j (minimum) */
		1080	{
		1081	eio_dirent tmp = dents; dents = min; min = tmp;
		1082	}
		1083	}
		1084
		1085	{
		1086	/* then do standard insertion sort */
		1087	eio_dirent i, j;
		1088
		1089	for (i = dents + 1; i < dents + size; ++i)
		1090	{
		1091	eio_dirent value = *i;
		1092
		1093	for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
		1094	j [1] = j [0];
		1095
		1096	j [1] = value;
		1097	}
		1098	}
993	}	1099	}
994		1100
995	/* read a full directory */	1101	/* read a full directory */
996	static void	1102	static void
997	eio__scandir (eio_req req, etp_worker self)	1103	eio__scandir (eio_req req, etp_worker self)
998	{	1104	{
999	DIR *dirp;	1105	DIR *dirp;
1000	EIO_STRUCT_DIRENT *entp;	1106	EIO_STRUCT_DIRENT *entp;
1001	unsigned char name, names;	1107	char name, names;
1002	int namesalloc = 4096;	1108	int namesalloc = 4096;
1003	int namesoffs = 0;	1109	int namesoffs = 0;
1004	int flags = req->int1;	1110	int flags = req->int1;
1005	eio_dirent *dents = 0;	1111	eio_dirent *dents = 0;
1006	int dentalloc = 128;	1112	int dentalloc = 128;
…		…
1010		1116
1011	if (!(flags & EIO_READDIR_DENTS))	1117	if (!(flags & EIO_READDIR_DENTS))
1012	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);	1118	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
1013		1119
1014	X_LOCK (wrklock);	1120	X_LOCK (wrklock);
1015
1016	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1121	/* the corresponding closedir is in ETP_WORKER_CLEAR */
1017	self->dirp = dirp = opendir (req->ptr1);	1122	self->dirp = dirp = opendir (req->ptr1);
1018	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1123	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1019	req->ptr1 = names = malloc (namesalloc);	1124	req->ptr1 = names = malloc (namesalloc);
1020	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1125	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1021
1022	X_UNLOCK (wrklock);	1126	X_UNLOCK (wrklock);
1023		1127
1024	if (dirp && names && (!flags \|\| dents))	1128	if (dirp && names && (!flags \|\| dents))
1025	for (;;)	1129	for (;;)
1026	{	1130	{
…		…
1034		1138
1035	/* sort etc. */	1139	/* sort etc. */
1036	req->int1 = flags;	1140	req->int1 = flags;
1037	req->result = dentoffs;	1141	req->result = dentoffs;
1038		1142
1039	if (flags & EIO_READDIR_STAT_ORDER \|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN))	1143	if (dents)
1040	{	1144	{
1041	/* pray your qsort doesn't use quicksort */	1145	eio_dirent *ent = dents + dentoffs;
1042	qsort (dents, dentoffs, sizeof (dents), eio_dent_cmp); / score depends of DIRS_FIRST */	1146
		1147	while (ent > dents)
		1148	(--ent)->name = names + (size_t)ent->name;
1043	}	1149	}
		1150
		1151	if (flags & EIO_READDIR_STAT_ORDER
1044	else if (flags & EIO_READDIR_DIRS_FIRST && !(flags & EIO_READDIR_FOUND_UNKNOWN))	1152	\|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN)))
		1153	eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */
		1154	else if (flags & EIO_READDIR_DIRS_FIRST)
1045	{	1155	{
1046	/* in this case, all is known, and we just put dirs first and sort them */	1156	/* in this case, all is known, and we just put dirs first and sort them */
1047	eio_dirent *ent = dents + dentoffs;	1157	eio_dirent *ent = dents + dentoffs;
1048	eio_dirent *dir = dents;	1158	eio_dirent *dir = dents;
1049		1159
		1160	/* now move dirs to the front, and non-dirs to the back */
		1161	/* by walking from both sides and swapping if necessary */
1050	while (ent > dir)	1162	while (ent > dir)
1051	{	1163	{
1052	if (dir->type == DT_DIR)	1164	if (dir->type == DT_DIR)
		1165	{
		1166	dir->score = 0;
1053	++dir;	1167	++dir;
		1168	}
1054	else	1169	else
1055	{	1170	{
1056	--ent;	1171	--ent;
1057		1172
1058	if (ent->type == DT_DIR)	1173	if (ent->type == DT_DIR)
1059	{	1174	{
1060	eio_dirent tmp = *dir;	1175	eio_dirent tmp = *dir;
1061	dir = ent;	1176	dir = ent;
1062	*ent = tmp;	1177	*ent = tmp;
1063		1178
		1179	dir->score = 0;
1064	++dir;	1180	++dir;
1065	}	1181	}
1066	}	1182	}
1067	}	1183	}
1068		1184
1069	/* now sort the dirs only */	1185	/* now sort the dirs only */
1070	qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);	1186	eio_dent_sort (dents, dir - dents);
1071	}	1187	}
1072		1188
1073	{int i; for(i=0;i<dentoffs;++i){eio_dirent *e=dents+i; printf ("%9ld %3d %s\n", e->inode,e->score,e->name);}}//D	1189	/* only provide the names array unless DENTS is specified */
		1190	if (!(flags & EIO_READDIR_DENTS))
		1191	{
		1192	X_LOCK (wrklock);
		1193	assert (!dents);
		1194	req->ptr1 = 0;
		1195	req->ptr2 = names;
		1196	X_UNLOCK (wrklock);
		1197	}
1074		1198
1075	break;	1199	break;
1076	}	1200	}
1077		1201
		1202	/* now add the entry to our list(s) */
1078	name = entp->d_name;	1203	name = entp->d_name;
1079		1204
		1205	/* skip . and .. entries */
1080	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1206	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1081	{	1207	{
1082	int len = strlen (name) + 1;	1208	int len = D_NAMLEN (entp) + 1;
1083		1209
1084	while (expect_false (namesoffs + len > namesalloc))	1210	while (expect_false (namesoffs + len > namesalloc))
1085	{	1211	{
1086	namesalloc *= 2;	1212	namesalloc *= 2;
1087	X_LOCK (wrklock);	1213	X_LOCK (wrklock);
…		…
1109	break;	1235	break;
1110	}	1236	}
1111		1237
1112	ent = dents + dentoffs;	1238	ent = dents + dentoffs;
1113		1239
1114	ent->name = names + namesoffs;	1240	ent->name = (char )(size_t)namesoffs; / rather dirtily we store the offset in the pointer */
1115	ent->namelen = len - 1;	1241	ent->namelen = len - 1;
1116	ent->inode = D_INO (entp);	1242	ent->inode = D_INO (entp) ? D_INO (entp) : dentoffs;
1117		1243
1118	switch (D_TYPE (entp))	1244	switch (D_TYPE (entp))
1119	{	1245	{
1120	default:	1246	default:
1121	ent->type = EIO_DT_UNKNOWN;	1247	ent->type = EIO_DT_UNKNOWN;
…		…
1126	case DT_FIFO: ent->type = EIO_DT_FIFO; break;	1252	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1127	#endif	1253	#endif
1128	#ifdef DT_CHR	1254	#ifdef DT_CHR
1129	case DT_CHR: ent->type = EIO_DT_CHR; break;	1255	case DT_CHR: ent->type = EIO_DT_CHR; break;
1130	#endif	1256	#endif
		1257	#ifdef DT_MPC
		1258	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1259	#endif
1131	#ifdef DT_DIR	1260	#ifdef DT_DIR
1132	case DT_DIR: ent->type = EIO_DT_DIR; break;	1261	case DT_DIR: ent->type = EIO_DT_DIR; break;
1133	#endif	1262	#endif
		1263	#ifdef DT_NAM
		1264	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1265	#endif
1134	#ifdef DT_BLK	1266	#ifdef DT_BLK
1135	case DT_BLK: ent->type = EIO_DT_BLK; break;	1267	case DT_BLK: ent->type = EIO_DT_BLK; break;
1136	#endif	1268	#endif
		1269	#ifdef DT_MPB
		1270	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1271	#endif
1137	#ifdef DT_REG	1272	#ifdef DT_REG
1138	case DT_REG: ent->type = EIO_DT_REG; break;	1273	case DT_REG: ent->type = EIO_DT_REG; break;
1139	#endif	1274	#endif
		1275	#ifdef DT_NWK
		1276	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1277	#endif
		1278	#ifdef DT_CMP
		1279	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1280	#endif
1140	#ifdef DT_LNK	1281	#ifdef DT_LNK
1141	case DT_LNK: ent->type = EIO_DT_LNK; break;	1282	case DT_LNK: ent->type = EIO_DT_LNK; break;
1142	#endif	1283	#endif
1143	#ifdef DT_SOCK	1284	#ifdef DT_SOCK
1144	case DT_SOCK: ent->type = EIO_DT_SOCK; break;	1285	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1145	#endif	1286	#endif
		1287	#ifdef DT_DOOR
		1288	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1289	#endif
1146	#ifdef DT_WHT	1290	#ifdef DT_WHT
1147	case DT_WHT: ent->type = EIO_DT_WHT; break;	1291	case DT_WHT: ent->type = EIO_DT_WHT; break;
1148	#endif	1292	#endif
1149	}	1293	}
1150		1294
…		…
1153	if (flags & EIO_READDIR_DIRS_FIRST)	1297	if (flags & EIO_READDIR_DIRS_FIRST)
1154	{	1298	{
1155	if (ent->type == EIO_DT_UNKNOWN)	1299	if (ent->type == EIO_DT_UNKNOWN)
1156	{	1300	{
1157	if (name == '.') / leading dots are likely directories, and, in any case, rare */	1301	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1158	ent->score = 98;	1302	ent->score = 7;
1159	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */	1303	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1160	ent->score = len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */	1304	ent->score = len <= 2 ? len + 4 : len <= 4 ? 3 : len <= 7 ? 2 : 1; /* shorter == more likely dir, but avoid too many classes */
1161	}	1305	}
1162	else if (ent->type == DT_DIR)	1306	else if (ent->type == EIO_DT_DIR)
1163	ent->score = 100;	1307	ent->score = 8;
1164	}	1308	}
1165	}	1309	}
1166		1310
1167	namesoffs += len;	1311	namesoffs += len;
1168	++dentoffs;	1312	++dentoffs;
1169	}	1313	}
		1314
		1315	if (EIO_CANCELLED (req))
		1316	{
		1317	errno = ECANCELED;
		1318	break;
		1319	}
1170	}	1320	}
1171	else
1172	req->result = -1;
1173
1174	/* if user doesn't want the dents, do not provide it */
1175	if (!(flags & EIO_READDIR_DENTS))
1176	{
1177	X_LOCK (wrklock);
1178	free (dents);
1179	req->ptr2 = req->ptr1;
1180	req->ptr1 = 0;
1181	X_UNLOCK (wrklock);
1182	}
1183	}	1321	}
1184		1322
1185	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1323	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1186	# undef msync	1324	# undef msync
1187	# define msync(a,b,c) ((errno = ENOSYS), -1)	1325	# define msync(a,b,c) ((errno = ENOSYS), -1)
…		…
1708	/* misc garbage */	1846	/* misc garbage */
1709		1847
1710	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1848	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1711	{	1849	{
1712	etp_worker wrk;	1850	etp_worker wrk;
		1851	ssize_t ret;
1713		1852
1714	wrk.dbuf = 0;	1853	wrk.dbuf = 0;
1715		1854
1716	eio__sendfile (ofd, ifd, offset, count, &wrk);	1855	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1717		1856
1718	if (wrk.dbuf)	1857	if (wrk.dbuf)
1719	free (wrk.dbuf);	1858	free (wrk.dbuf);
1720	}
1721		1859
		1860	return ret;
		1861	}
		1862

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs. Revision 1.41 by root, Sun Jun 14 20:36:59 2009 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs.
Revision 1.41 by root, Sun Jun 14 20:36:59 2009 UTC