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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs.
Revision 1.37 by root, Fri Jun 12 16:48:08 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_QSORT_CUTOFF 20 /* quite high, but performs well on many filesystems */
		1003
		1004	static void
		1005	eio_dent_sort (eio_dirent *dents, int size)
		1006	{
		1007	/* should be good for 2*31 entries /
		1008	struct rng { int l, r; } rng [32];
		1009	int i, j;
		1010
		1011	i = 0;
		1012	rng[0].l = 0;
		1013	rng[0].r = size;
		1014
		1015	while (expect_true (i >= 0))
		1016	{
		1017	int L = rng [i].l;
		1018	int R = rng [i].r - 1;
		1019
		1020	if (expect_false (L + EIO_QSORT_CUTOFF < R))
		1021	{
		1022	eio_dirent piv = dents [L];
		1023
		1024	while (L < R)
		1025	{
		1026	while (eio_dent_cmp (&dents [R], &piv) >= 0 && L < R)
		1027	--R;
		1028
		1029	if (L < R)
		1030	dents [L++] = dents [R];
		1031
		1032	while (eio_dent_cmp (&dents [L], &piv) <= 0 && L < R)
		1033	++L;
		1034
		1035	if (L < R)
		1036	dents [R--] = dents [L];
		1037	}
		1038
		1039	dents [L] = piv;
		1040
		1041	++i;
		1042	rng [i].l = L + 1;
		1043	rng [i].r = rng [i - 1].r;
		1044	rng [i - 1].r = L;
		1045
		1046	if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l)
		1047	{
		1048	struct rng t;
		1049
		1050	t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
		1051	}
		1052	}
		1053	else
		1054	--i;
		1055	}
		1056
		1057	/* use a simple insertion sort at the end */
		1058	for (i = 1; i < size; ++i)
		1059	{
		1060	eio_dirent value = dents [i];
		1061
		1062	for (j = i - 1; j >= 0 && eio_dent_cmp (&dents [j], &value) > 0; --j)
		1063	dents [j + 1] = dents [j];
		1064
		1065	dents [j + 1] = value;
		1066	}
993	}	1067	}
994		1068
995	/* read a full directory */	1069	/* read a full directory */
996	static void	1070	static void
997	eio__scandir (eio_req req, etp_worker self)	1071	eio__scandir (eio_req req, etp_worker self)
998	{	1072	{
999	DIR *dirp;	1073	DIR *dirp;
1000	EIO_STRUCT_DIRENT *entp;	1074	EIO_STRUCT_DIRENT *entp;
1001	unsigned char name, names;	1075	char name, names;
1002	int namesalloc = 4096;	1076	int namesalloc = 4096;
1003	int namesoffs = 0;	1077	int namesoffs = 0;
1004	int flags = req->int1;	1078	int flags = req->int1;
1005	eio_dirent *dents = 0;	1079	eio_dirent *dents = 0;
1006	int dentalloc = 128;	1080	int dentalloc = 128;
…		…
1010		1084
1011	if (!(flags & EIO_READDIR_DENTS))	1085	if (!(flags & EIO_READDIR_DENTS))
1012	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);	1086	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
1013		1087
1014	X_LOCK (wrklock);	1088	X_LOCK (wrklock);
1015
1016	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1089	/* the corresponding closedir is in ETP_WORKER_CLEAR */
1017	self->dirp = dirp = opendir (req->ptr1);	1090	self->dirp = dirp = opendir (req->ptr1);
1018	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1091	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1019	req->ptr1 = names = malloc (namesalloc);	1092	req->ptr1 = names = malloc (namesalloc);
1020	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1093	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1021
1022	X_UNLOCK (wrklock);	1094	X_UNLOCK (wrklock);
1023		1095
1024	if (dirp && names && (!flags \|\| dents))	1096	if (dirp && names && (!flags \|\| dents))
1025	for (;;)	1097	for (;;)
1026	{	1098	{
…		…
1034		1106
1035	/* sort etc. */	1107	/* sort etc. */
1036	req->int1 = flags;	1108	req->int1 = flags;
1037	req->result = dentoffs;	1109	req->result = dentoffs;
1038		1110
1039	if (flags & EIO_READDIR_STAT_ORDER \|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN))	1111	if (dents)
1040	{	1112	{
1041	/* pray your qsort doesn't use quicksort */	1113	eio_dirent *ent = dents + dentoffs;
1042	qsort (dents, dentoffs, sizeof (dents), eio_dent_cmp); / score depends of DIRS_FIRST */	1114
		1115	while (ent > dents)
		1116	(--ent)->name = names + (size_t)ent->name;
1043	}	1117	}
		1118
		1119	if (flags & EIO_READDIR_STAT_ORDER
1044	else if (flags & EIO_READDIR_DIRS_FIRST && !(flags & EIO_READDIR_FOUND_UNKNOWN))	1120	\|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN)))
		1121	eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */
		1122	else if (flags & EIO_READDIR_DIRS_FIRST)
1045	{	1123	{
1046	/* in this case, all is known, and we just put dirs first and sort them */	1124	/* in this case, all is known, and we just put dirs first and sort them */
1047	eio_dirent *ent = dents + dentoffs;	1125	eio_dirent *ent = dents + dentoffs;
1048	eio_dirent *dir = dents;	1126	eio_dirent *dir = dents;
1049		1127
		1128	/* now move dirs to the front, and non-dirs to the back */
		1129	/* by walking from both sides and swapping if necessary */
1050	while (ent > dir)	1130	while (ent > dir)
1051	{	1131	{
1052	if (dir->type == DT_DIR)	1132	if (dir->type == DT_DIR)
1053	++dir;	1133	++dir;
1054	else	1134	else
…		…
1065	}	1145	}
1066	}	1146	}
1067	}	1147	}
1068		1148
1069	/* now sort the dirs only */	1149	/* now sort the dirs only */
1070	qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);	1150	eio_dent_sort (dents, dir - dents);
1071	}	1151	}
1072		1152
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	1153	/* only provide the names array unless DENTS is specified */
		1154	if (!(flags & EIO_READDIR_DENTS))
		1155	{
		1156	X_LOCK (wrklock);
		1157	assert (!dents);
		1158	req->ptr1 = 0;
		1159	req->ptr2 = names;
		1160	X_UNLOCK (wrklock);
		1161	}
1074		1162
1075	break;	1163	break;
1076	}	1164	}
1077		1165
		1166	/* now add the entry to our list(s) */
1078	name = entp->d_name;	1167	name = entp->d_name;
1079		1168
		1169	/* skip . and .. entries */
1080	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1170	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1081	{	1171	{
1082	int len = strlen (name) + 1;	1172	int len = D_NAMLEN (entp) + 1;
1083		1173
1084	while (expect_false (namesoffs + len > namesalloc))	1174	while (expect_false (namesoffs + len > namesalloc))
1085	{	1175	{
1086	namesalloc *= 2;	1176	namesalloc *= 2;
1087	X_LOCK (wrklock);	1177	X_LOCK (wrklock);
…		…
1109	break;	1199	break;
1110	}	1200	}
1111		1201
1112	ent = dents + dentoffs;	1202	ent = dents + dentoffs;
1113		1203
1114	ent->name = names + namesoffs;	1204	ent->name = (char )(size_t)namesoffs; / rather dirtily we store the offset in the pointer */
1115	ent->namelen = len - 1;	1205	ent->namelen = len - 1;
1116	ent->inode = D_INO (entp);	1206	ent->inode = D_INO (entp);
1117		1207
1118	switch (D_TYPE (entp))	1208	switch (D_TYPE (entp))
1119	{	1209	{
…		…
1126	case DT_FIFO: ent->type = EIO_DT_FIFO; break;	1216	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1127	#endif	1217	#endif
1128	#ifdef DT_CHR	1218	#ifdef DT_CHR
1129	case DT_CHR: ent->type = EIO_DT_CHR; break;	1219	case DT_CHR: ent->type = EIO_DT_CHR; break;
1130	#endif	1220	#endif
		1221	#ifdef DT_MPC
		1222	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1223	#endif
1131	#ifdef DT_DIR	1224	#ifdef DT_DIR
1132	case DT_DIR: ent->type = EIO_DT_DIR; break;	1225	case DT_DIR: ent->type = EIO_DT_DIR; break;
1133	#endif	1226	#endif
		1227	#ifdef DT_NAM
		1228	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1229	#endif
1134	#ifdef DT_BLK	1230	#ifdef DT_BLK
1135	case DT_BLK: ent->type = EIO_DT_BLK; break;	1231	case DT_BLK: ent->type = EIO_DT_BLK; break;
1136	#endif	1232	#endif
		1233	#ifdef DT_MPB
		1234	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1235	#endif
1137	#ifdef DT_REG	1236	#ifdef DT_REG
1138	case DT_REG: ent->type = EIO_DT_REG; break;	1237	case DT_REG: ent->type = EIO_DT_REG; break;
1139	#endif	1238	#endif
		1239	#ifdef DT_NWK
		1240	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1241	#endif
		1242	#ifdef DT_CMP
		1243	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1244	#endif
1140	#ifdef DT_LNK	1245	#ifdef DT_LNK
1141	case DT_LNK: ent->type = EIO_DT_LNK; break;	1246	case DT_LNK: ent->type = EIO_DT_LNK; break;
1142	#endif	1247	#endif
1143	#ifdef DT_SOCK	1248	#ifdef DT_SOCK
1144	case DT_SOCK: ent->type = EIO_DT_SOCK; break;	1249	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1250	#endif
		1251	#ifdef DT_DOOR
		1252	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1145	#endif	1253	#endif
1146	#ifdef DT_WHT	1254	#ifdef DT_WHT
1147	case DT_WHT: ent->type = EIO_DT_WHT; break;	1255	case DT_WHT: ent->type = EIO_DT_WHT; break;
1148	#endif	1256	#endif
1149	}	1257	}
…		…
1155	if (ent->type == EIO_DT_UNKNOWN)	1263	if (ent->type == EIO_DT_UNKNOWN)
1156	{	1264	{
1157	if (name == '.') / leading dots are likely directories, and, in any case, rare */	1265	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1158	ent->score = 98;	1266	ent->score = 98;
1159	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */	1267	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 */	1268	ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */
1161	}	1269	}
1162	else if (ent->type == DT_DIR)	1270	else if (ent->type == EIO_DT_DIR)
1163	ent->score = 100;	1271	ent->score = 100;
1164	}	1272	}
1165	}	1273	}
1166		1274
1167	namesoffs += len;	1275	namesoffs += len;
1168	++dentoffs;	1276	++dentoffs;
1169	}	1277	}
		1278
		1279	if (EIO_CANCELLED (req))
		1280	{
		1281	errno = ECANCELED;
		1282	break;
		1283	}
1170	}	1284	}
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	}	1285	}
1184		1286
1185	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1287	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1186	# undef msync	1288	# undef msync
1187	# define msync(a,b,c) ((errno = ENOSYS), -1)	1289	# define msync(a,b,c) ((errno = ENOSYS), -1)
…		…
1708	/* misc garbage */	1810	/* misc garbage */
1709		1811
1710	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1812	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1711	{	1813	{
1712	etp_worker wrk;	1814	etp_worker wrk;
		1815	ssize_t ret;
1713		1816
1714	wrk.dbuf = 0;	1817	wrk.dbuf = 0;
1715		1818
1716	eio__sendfile (ofd, ifd, offset, count, &wrk);	1819	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1717		1820
1718	if (wrk.dbuf)	1821	if (wrk.dbuf)
1719	free (wrk.dbuf);	1822	free (wrk.dbuf);
1720	}
1721		1823
		1824	return ret;
		1825	}
		1826

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs. Revision 1.37 by root, Fri Jun 12 16:48:08 2009 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs.
Revision 1.37 by root, Fri Jun 12 16:48:08 2009 UTC