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

Comparing libeio/eio.c (file contents):
Revision 1.25 by root, Tue Sep 30 17:23:24 2008 UTC vs.
Revision 1.42 by root, Mon Jun 15 05:34:49 2009 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>
		83
		84	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		85	# if defined(__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 defined(__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
79		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
…		…
96	# else	118	# else
97	# error sendfile support requested but not available	119	# error sendfile support requested but not available
98	# endif	120	# endif
99	#endif	121	#endif
100		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)
		131	#endif
		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
104	/* used for struct dirent, AIX doesn't provide it */	136	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	137	#ifndef NAME_MAX
…		…
155	if (wrk->dirp) \	187	if (wrk->dirp) \
156	{ \	188	{ \
157	closedir (wrk->dirp); \	189	closedir (wrk->dirp); \
158	wrk->dirp = 0; \	190	wrk->dirp = 0; \
159	}	191	}
		192
160	#define ETP_WORKER_COMMON \	193	#define ETP_WORKER_COMMON \
161	void *dbuf; \	194	void *dbuf; \
162	DIR *dirp;	195	DIR *dirp;
163		196
164	/*****************************************************************************/	197	/*****************************************************************************/
…		…
604		637
605	static void grp_try_feed (eio_req *grp)	638	static void grp_try_feed (eio_req *grp)
606	{	639	{
607	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	640	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
608	{	641	{
609	int old_len = grp->size;	642	grp->flags &= ~EIO_FLAG_GROUPADD;
610		643
611	EIO_FEED (grp);	644	EIO_FEED (grp);
612		645
613	/* stop if no progress has been made */	646	/* stop if no progress has been made */
614	if (old_len == grp->size)	647	if (!(grp->flags & EIO_FLAG_GROUPADD))
615	{	648	{
616	grp->feed = 0;	649	grp->feed = 0;
617	break;	650	break;
618	}	651	}
619	}	652	}
…		…
736		769
737	/*****************************************************************************/	770	/*****************************************************************************/
738	/* work around various missing functions */	771	/* work around various missing functions */
739		772
740	#if !HAVE_PREADWRITE	773	#if !HAVE_PREADWRITE
		774	# undef pread
		775	# undef pwrite
741	# define pread eio__pread	776	# define pread eio__pread
742	# define pwrite eio__pwrite	777	# define pwrite eio__pwrite
743		778
744	static ssize_t	779	static ssize_t
745	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)
…		…
765		800
766	X_LOCK (preadwritelock);	801	X_LOCK (preadwritelock);
767	ooffset = lseek (fd, 0, SEEK_CUR);	802	ooffset = lseek (fd, 0, SEEK_CUR);
768	lseek (fd, offset, SEEK_SET);	803	lseek (fd, offset, SEEK_SET);
769	res = write (fd, buf, count);	804	res = write (fd, buf, count);
770	lseek (fd, offset, SEEK_SET);	805	lseek (fd, ooffset, SEEK_SET);
771	X_UNLOCK (preadwritelock);	806	X_UNLOCK (preadwritelock);
772		807
773	return res;	808	return res;
774	}	809	}
775	#endif	810	#endif
776		811
777	#ifndef HAVE_FUTIMES	812	#ifndef HAVE_FUTIMES
778		813
		814	# undef utimes
		815	# undef futimes
779	# define utimes(path,times) eio__utimes (path, times)	816	# define utimes(path,times) eio__utimes (path, times)
780	# define futimes(fd,times) eio__futimes (fd, times)	817	# define futimes(fd,times) eio__futimes (fd, times)
781		818
782	static int	819	static int
783	eio__utimes (const char *filename, const struct timeval times[2])	820	eio__utimes (const char *filename, const struct timeval times[2])
…		…
802	}	839	}
803		840
804	#endif	841	#endif
805		842
806	#if !HAVE_FDATASYNC	843	#if !HAVE_FDATASYNC
		844	# undef fdatasync
807	# define fdatasync fsync	845	# define fdatasync(fd) fsync (fd)
808	#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 thta matches the expectation of it's users best */
		873	return fdatasync (fd);
		874	}
809		875
810	#if !HAVE_READAHEAD	876	#if !HAVE_READAHEAD
		877	# undef readahead
811	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	878	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
812		879
813	static ssize_t	880	static ssize_t
814	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)
815	{	882	{
…		…
923	}	990	}
924		991
925	return res;	992	return res;
926	}	993	}
927		994
		995	static signed char
		996	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
		997	{
		998	return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
		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
		1004	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1005	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
		1006
		1007	static void
		1008	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1009	{
		1010	unsigned char bits [9 + sizeof (ino_t) * 8];
		1011	unsigned char *bit = bits;
		1012
		1013	assert (CHAR_BIT == 8);
		1014	assert (sizeof (eio_dirent) * 8 < 256);
		1015	assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
		1016	assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
		1017
		1018	if (size <= EIO_SORT_FAST)
		1019	return;
		1020
		1021	/* first prepare an array of bits to test in our radix sort */
		1022	/* try to take endianness into account, as well as differences in ino_t sizes */
		1023	/* inode_bits must contain all inodes ORed together */
		1024	/* which is used to skip bits that are 0 everywhere, which is very common */
		1025	{
		1026	ino_t endianness;
		1027	int i, j;
		1028
		1029	/* we store the byte offset of byte n into byte n of "endianness" */
		1030	for (i = 0; i < sizeof (ino_t); ++i)
		1031	((unsigned char *)&endianness)[i] = i;
		1032
		1033	*bit++ = 0;
		1034
		1035	for (i = 0; i < sizeof (ino_t); ++i)
		1036	{
		1037	/* shifting off the byte offsets out of "endianness" */
		1038	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
		1039	endianness >>= 8;
		1040
		1041	for (j = 0; j < 8; ++j)
		1042	if (inode_bits & (((ino_t)1) << (i * 8 + j)))
		1043	*bit++ = offs + j;
		1044	}
		1045
		1046	for (j = 0; j < 8; ++j)
		1047	if (score_bits & (1 << j))
		1048	bit++ = offsetof (eio_dirent, score) 8 + j;
		1049	}
		1050
		1051	/* now actually do the sorting (a variant of MSD radix sort) */
		1052	{
		1053	eio_dirent base_stk [9 + sizeof (ino_t) 8], *base;
		1054	eio_dirent end_stk [9 + sizeof (ino_t) 8], *end;
		1055	unsigned char bit_stk [9 + sizeof (ino_t) 8];
		1056	int stk_idx = 0;
		1057
		1058	base_stk [stk_idx] = dents;
		1059	end_stk [stk_idx] = dents + size;
		1060	bit_stk [stk_idx] = bit - 1;
		1061
		1062	do
		1063	{
		1064	base = base_stk [stk_idx];
		1065	end = end_stk [stk_idx];
		1066	bit = bit_stk [stk_idx];
		1067
		1068	for (;;)
		1069	{
		1070	unsigned char O = *bit >> 3;
		1071	unsigned char M = 1 << (*bit & 7);
		1072
		1073	eio_dirent *a = base;
		1074	eio_dirent *b = end;
		1075
		1076	if (b - a < EIO_SORT_CUTOFF)
		1077	break;
		1078
		1079	/* now bit-partition the array on the bit */
		1080	/* this ugly asymmetric loop seems to perform much better than typical */
		1081	/* partition algos found in the literature */
		1082	do
		1083	if (!(((unsigned char *)a)[O] & M))
		1084	++a;
		1085	else if (!(((unsigned char *)--b)[O] & M))
		1086	{
		1087	eio_dirent tmp = a; a = b; b = tmp;
		1088	++a;
		1089	}
		1090	while (b > a);
		1091
		1092	/* next bit, or stop, if no bits left in this path */
		1093	if (!*--bit)
		1094	break;
		1095
		1096	base_stk [stk_idx] = a;
		1097	end_stk [stk_idx] = end;
		1098	bit_stk [stk_idx] = bit;
		1099	++stk_idx;
		1100
		1101	end = a;
		1102	}
		1103	}
		1104	while (stk_idx--);
		1105	}
		1106	}
		1107
		1108	static void
		1109	eio_dent_insertion_sort (eio_dirent *dents, int size)
		1110	{
		1111	/* first move the smallest element to the front, to act as a sentinel */
		1112	{
		1113	int i;
		1114	eio_dirent *min = dents;
		1115
		1116	/* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
		1117	for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
		1118	if (EIO_DENT_CMP (dents [i], <, *min))
		1119	min = &dents [i];
		1120
		1121	/* swap elements 0 and j (minimum) */
		1122	{
		1123	eio_dirent tmp = dents; dents = min; min = tmp;
		1124	}
		1125	}
		1126
		1127	/* then do standard insertion sort, assuming that all elements are >= dents [0] */
		1128	{
		1129	eio_dirent i, j;
		1130
		1131	for (i = dents + 1; i < dents + size; ++i)
		1132	{
		1133	eio_dirent value = *i;
		1134
		1135	for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
		1136	j [1] = j [0];
		1137
		1138	j [1] = value;
		1139	}
		1140	}
		1141	}
		1142
		1143	static void
		1144	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1145	{
		1146	if (size <= 1)
		1147	return; /* our insertion sort relies on size > 0 */
		1148
		1149	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
		1150	/* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
		1151	eio_dent_radix_sort (dents, size, score_bits, inode_bits);
		1152
		1153	/* use an insertion sort at the end, or for small arrays, */
		1154	/* as insertion sort is more efficient for small partitions */
		1155	eio_dent_insertion_sort (dents, size);
		1156	}
		1157
928	/* read a full directory */	1158	/* read a full directory */
929	static void	1159	static void
930	eio__scandir (eio_req req, etp_worker self)	1160	eio__scandir (eio_req req, etp_worker self)
931	{	1161	{
932	DIR *dirp;	1162	DIR *dirp;
933	EIO_STRUCT_DIRENT *entp;	1163	EIO_STRUCT_DIRENT *entp;
934	char name, names;	1164	char name, names;
935	int memlen = 4096;	1165	int namesalloc = 4096;
936	int memofs = 0;	1166	int namesoffs = 0;
		1167	int flags = req->int1;
		1168	eio_dirent *dents = 0;
		1169	int dentalloc = 128;
937	int res = 0;	1170	int dentoffs = 0;
		1171	ino_t inode_bits = 0;
		1172
		1173	req->result = -1;
		1174
		1175	if (!(flags & EIO_READDIR_DENTS))
		1176	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
938		1177
939	X_LOCK (wrklock);	1178	X_LOCK (wrklock);
940	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1179	/* the corresponding closedir is in ETP_WORKER_CLEAR */
941	self->dirp = dirp = opendir (req->ptr1);	1180	self->dirp = dirp = opendir (req->ptr1);
942	req->flags \|= EIO_FLAG_PTR2_FREE;	1181	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
		1182	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
943	req->ptr2 = names = malloc (memlen);	1183	req->ptr2 = names = malloc (namesalloc);
944	X_UNLOCK (wrklock);	1184	X_UNLOCK (wrklock);
945		1185
946	if (dirp && names)	1186	if (dirp && names && (!flags \|\| dents))
947	for (;;)	1187	for (;;)
948	{	1188	{
949	errno = 0;	1189	errno = 0;
950	entp = readdir (dirp);	1190	entp = readdir (dirp);
951		1191
952	if (!entp)	1192	if (!entp)
		1193	{
		1194	if (errno)
		1195	break;
		1196
		1197	/* sort etc. */
		1198	req->int1 = flags;
		1199	req->result = dentoffs;
		1200
		1201	if (flags & EIO_READDIR_STAT_ORDER)
		1202	eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
		1203	else if (flags & EIO_READDIR_DIRS_FIRST)
		1204	if (flags & EIO_READDIR_FOUND_UNKNOWN)
		1205	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
		1206	else
		1207	{
		1208	/* in this case, all is known, and we just put dirs first and sort them */
		1209	eio_dirent *oth = dents + dentoffs;
		1210	eio_dirent *dir = dents;
		1211
		1212	/* now partition dirs to the front, and non-dirs to the back */
		1213	/* by walking from both sides and swapping if necessary */
		1214	/* also clear score, so it doesn't influence sorting */
		1215	while (oth > dir)
		1216	{
		1217	if (dir->type == EIO_DT_DIR)
		1218	++dir;
		1219	else if ((--oth)->type == EIO_DT_DIR)
		1220	{
		1221	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1222
		1223	++dir;
		1224	}
		1225	}
		1226
		1227	/* now sort the dirs only */
		1228	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1229	}
		1230
953	break;	1231	break;
		1232	}
954		1233
		1234	/* now add the entry to our list(s) */
955	name = entp->d_name;	1235	name = entp->d_name;
956		1236
		1237	/* skip . and .. entries */
957	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1238	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
958	{	1239	{
959	int len = strlen (name) + 1;	1240	int len = D_NAMLEN (entp) + 1;
960		1241
961	res++;	1242	while (expect_false (namesoffs + len > namesalloc))
962
963	while (memofs + len > memlen)
964	{	1243	{
965	memlen *= 2;	1244	namesalloc *= 2;
966	X_LOCK (wrklock);	1245	X_LOCK (wrklock);
967	req->ptr2 = names = realloc (names, memlen);	1246	req->ptr2 = names = realloc (names, namesalloc);
968	X_UNLOCK (wrklock);	1247	X_UNLOCK (wrklock);
969		1248
970	if (!names)	1249	if (!names)
971	break;	1250	break;
972	}	1251	}
973		1252
974	memcpy (names + memofs, name, len);	1253	memcpy (names + namesoffs, name, len);
		1254
		1255	if (dents)
		1256	{
		1257	struct eio_dirent *ent;
		1258
		1259	if (expect_false (dentoffs == dentalloc))
		1260	{
		1261	dentalloc *= 2;
		1262	X_LOCK (wrklock);
		1263	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1264	X_UNLOCK (wrklock);
		1265
		1266	if (!dents)
		1267	break;
		1268	}
		1269
		1270	ent = dents + dentoffs;
		1271
		1272	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
		1273	ent->namelen = len - 1;
		1274	ent->inode = D_INO (entp);
		1275
		1276	inode_bits \|= ent->inode;
		1277
		1278	switch (D_TYPE (entp))
		1279	{
		1280	default:
		1281	ent->type = EIO_DT_UNKNOWN;
		1282	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1283	break;
		1284
		1285	#ifdef DT_FIFO
		1286	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1287	#endif
		1288	#ifdef DT_CHR
		1289	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1290	#endif
		1291	#ifdef DT_MPC
		1292	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1293	#endif
		1294	#ifdef DT_DIR
		1295	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1296	#endif
		1297	#ifdef DT_NAM
		1298	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1299	#endif
		1300	#ifdef DT_BLK
		1301	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1302	#endif
		1303	#ifdef DT_MPB
		1304	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1305	#endif
		1306	#ifdef DT_REG
		1307	case DT_REG: ent->type = EIO_DT_REG; break;
		1308	#endif
		1309	#ifdef DT_NWK
		1310	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1311	#endif
		1312	#ifdef DT_CMP
		1313	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1314	#endif
		1315	#ifdef DT_LNK
		1316	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1317	#endif
		1318	#ifdef DT_SOCK
		1319	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1320	#endif
		1321	#ifdef DT_DOOR
		1322	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1323	#endif
		1324	#ifdef DT_WHT
		1325	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1326	#endif
		1327	}
		1328
		1329	ent->score = 7;
		1330
		1331	if (flags & EIO_READDIR_DIRS_FIRST)
		1332	{
		1333	if (ent->type == EIO_DT_UNKNOWN)
		1334	{
		1335	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1336	ent->score = 1;
		1337	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1338	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
		1339	}
		1340	else if (ent->type == EIO_DT_DIR)
		1341	ent->score = 0;
		1342	}
		1343	}
		1344
975	memofs += len;	1345	namesoffs += len;
		1346	++dentoffs;
		1347	}
		1348
		1349	if (EIO_CANCELLED (req))
		1350	{
		1351	errno = ECANCELED;
		1352	break;
976	}	1353	}
977	}	1354	}
978
979	if (errno)
980	res = -1;
981
982	req->result = res;
983	}	1355	}
984		1356
985	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1357	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1358	# undef msync
986	# define msync(a,b,c) ENOSYS	1359	# define msync(a,b,c) ((errno = ENOSYS), -1)
987	#endif	1360	#endif
988		1361
989	int	1362	int
990	eio__mtouch (void *mem, size_t len, int flags)	1363	eio__mtouch (void *mem, size_t len, int flags)
991	{	1364	{
…		…
1185	case EIO_SYNC: req->result = 0; sync (); break;	1558	case EIO_SYNC: req->result = 0; sync (); break;
1186	case EIO_FSYNC: req->result = fsync (req->int1); break;	1559	case EIO_FSYNC: req->result = fsync (req->int1); break;
1187	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1560	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1188	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;	1561	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
1189	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;	1562	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1563	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1190		1564
1191	case EIO_READDIR: eio__scandir (req, self); break;	1565	case EIO_READDIR: eio__scandir (req, self); break;
1192		1566
1193	case EIO_BUSY:	1567	case EIO_BUSY:
1194	#ifdef _WIN32	1568	#ifdef _WIN32
…		…
1279	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	1653	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1280	{	1654	{
1281	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	1655	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1282	}	1656	}
1283		1657
		1658	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1659	{
		1660	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1661	}
		1662
1284	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1663	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1285	{	1664	{
1286	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1665	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1287	}	1666	}
1288		1667
…		…
1400	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1779	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1401	{	1780	{
1402	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1781	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1403	}	1782	}
1404		1783
1405	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1784	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1406	{	1785	{
1407	return eio__1path (EIO_READDIR, path, pri, cb, data);	1786	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1408	}	1787	}
1409		1788
1410	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1789	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1411	{	1790	{
1412	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	1791	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
…		…
1481		1860
1482	void eio_grp_add (eio_req grp, eio_req req)	1861	void eio_grp_add (eio_req grp, eio_req req)
1483	{	1862	{
1484	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	1863	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1485		1864
		1865	grp->flags \|= EIO_FLAG_GROUPADD;
		1866
1486	++grp->size;	1867	++grp->size;
1487	req->grp = grp;	1868	req->grp = grp;
1488		1869
1489	req->grp_prev = 0;	1870	req->grp_prev = 0;
1490	req->grp_next = grp->grp_first;	1871	req->grp_next = grp->grp_first;
…		…
1499	/* misc garbage */	1880	/* misc garbage */
1500		1881
1501	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1882	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1502	{	1883	{
1503	etp_worker wrk;	1884	etp_worker wrk;
		1885	ssize_t ret;
1504		1886
1505	wrk.dbuf = 0;	1887	wrk.dbuf = 0;
1506		1888
1507	eio__sendfile (ofd, ifd, offset, count, &wrk);	1889	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1508		1890
1509	if (wrk.dbuf)	1891	if (wrk.dbuf)
1510	free (wrk.dbuf);	1892	free (wrk.dbuf);
1511	}
1512		1893
		1894	return ret;
		1895	}
		1896

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.25 by root, Tue Sep 30 17:23:24 2008 UTC vs. Revision 1.42 by root, Mon Jun 15 05:34:49 2009 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.25 by root, Tue Sep 30 17:23:24 2008 UTC vs.
Revision 1.42 by root, Mon Jun 15 05:34:49 2009 UTC