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

Comparing libeio/eio.c (file contents):
Revision 1.26 by root, Sun Oct 12 22:30:33 2008 UTC vs.
Revision 1.31 by root, Sat Jun 6 17:25:13 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>
75	# include <unistd.h>	78	# include <unistd.h>
76	# include <utime.h>	79	# include <utime.h>
77	# include <signal.h>	80	# include <signal.h>
78	# include <dirent.h>	81	# include <dirent.h>
		82
		83	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		84	# if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		85	# define D_INO(de) (de)->d_fileno
		86	# define _DIRENT_HAVE_D_TYPE /* sigh */
		87	# elif defined(__linux) \|\| defined(d_ino) \|\| _XOPEN_SOURCE >= 600
		88	# define D_INO(de) (de)->d_ino
		89	# endif
		90
		91	# ifdef _DIRENT_HAVE_D_TYPE
		92	# define D_TYPE(de) (de)->d_type
		93	# endif
79		94
80	# ifndef EIO_STRUCT_DIRENT	95	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent	96	# define EIO_STRUCT_DIRENT struct dirent
82	# endif	97	# endif
83		98
…		…
96	# else	111	# else
97	# error sendfile support requested but not available	112	# error sendfile support requested but not available
98	# endif	113	# endif
99	#endif	114	#endif
100		115
		116	#ifndef D_TYPE
		117	# define D_TYPE(de) 0
		118	#endif
		119
		120	#ifndef D_INO
		121	# define D_INO(de) 0
		122	#endif
		123
101	/* number of seconds after which an idle threads exit */	124	/* number of seconds after which an idle threads exit */
102	#define IDLE_TIMEOUT 10	125	#define IDLE_TIMEOUT 10
103		126
104	/* used for struct dirent, AIX doesn't provide it */	127	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	128	#ifndef NAME_MAX
…		…
736		759
737	/*****************************************************************************/	760	/*****************************************************************************/
738	/* work around various missing functions */	761	/* work around various missing functions */
739		762
740	#if !HAVE_PREADWRITE	763	#if !HAVE_PREADWRITE
		764	# undef pread
		765	# undef pwrite
741	# define pread eio__pread	766	# define pread eio__pread
742	# define pwrite eio__pwrite	767	# define pwrite eio__pwrite
743		768
744	static ssize_t	769	static ssize_t
745	eio__pread (int fd, void *buf, size_t count, off_t offset)	770	eio__pread (int fd, void *buf, size_t count, off_t offset)
…		…
765		790
766	X_LOCK (preadwritelock);	791	X_LOCK (preadwritelock);
767	ooffset = lseek (fd, 0, SEEK_CUR);	792	ooffset = lseek (fd, 0, SEEK_CUR);
768	lseek (fd, offset, SEEK_SET);	793	lseek (fd, offset, SEEK_SET);
769	res = write (fd, buf, count);	794	res = write (fd, buf, count);
770	lseek (fd, offset, SEEK_SET);	795	lseek (fd, ooffset, SEEK_SET);
771	X_UNLOCK (preadwritelock);	796	X_UNLOCK (preadwritelock);
772		797
773	return res;	798	return res;
774	}	799	}
775	#endif	800	#endif
776		801
777	#ifndef HAVE_FUTIMES	802	#ifndef HAVE_FUTIMES
778		803
		804	# undef utimes
		805	# undef futimes
779	# define utimes(path,times) eio__utimes (path, times)	806	# define utimes(path,times) eio__utimes (path, times)
780	# define futimes(fd,times) eio__futimes (fd, times)	807	# define futimes(fd,times) eio__futimes (fd, times)
781		808
782	static int	809	static int
783	eio__utimes (const char *filename, const struct timeval times[2])	810	eio__utimes (const char *filename, const struct timeval times[2])
…		…
802	}	829	}
803		830
804	#endif	831	#endif
805		832
806	#if !HAVE_FDATASYNC	833	#if !HAVE_FDATASYNC
		834	# undef fdatasync
807	# define fdatasync fsync	835	# define fdatasync(fd) fsync (fd)
808	#endif	836	#endif
		837
		838	/* sync_file_range always needs emulation */
		839	int
		840	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		841	{
		842	#if HAVE_SYNC_FILE_RANGE
		843	int res;
		844
		845	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		846	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		847	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		848	{
		849	flags = 0
		850	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		851	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		852	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		853	}
		854
		855	res = sync_file_range (fd, offset, nbytes, flags);
		856
		857	if (!res \|\| errno != ENOSYS)
		858	return res;
		859	#endif
		860
		861	/* even though we could play tricks with the flags, it's better to always
		862	* call fdatasync, as thta matches the expectation of it's users best */
		863	return fdatasync (fd);
		864	}
809		865
810	#if !HAVE_READAHEAD	866	#if !HAVE_READAHEAD
		867	# undef readahead
811	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	868	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
812		869
813	static ssize_t	870	static ssize_t
814	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	871	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
815	{	872	{
…		…
923	}	980	}
924		981
925	return res;	982	return res;
926	}	983	}
927		984
		985	static int
		986	eio_dent_cmp (const void a_, const void b_)
		987	{
		988	const eio_dirent a = (const eio_dirent )a_;
		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 */
		993	}
		994
928	/* read a full directory */	995	/* read a full directory */
929	static void	996	static void
930	eio__scandir (eio_req req, etp_worker self)	997	eio__scandir (eio_req req, etp_worker self)
931	{	998	{
932	DIR *dirp;	999	DIR *dirp;
933	EIO_STRUCT_DIRENT *entp;	1000	EIO_STRUCT_DIRENT *entp;
934	char name, names;	1001	unsigned char name, names;
935	int memlen = 4096;	1002	int namesalloc = 4096;
936	int memofs = 0;	1003	int namesoffs = 0;
		1004	int flags = req->int1;
		1005	eio_dirent *dents = 0;
		1006	int dentalloc = 128;
937	int res = 0;	1007	int dentoffs = 0;
		1008
		1009	req->result = -1;
		1010
		1011	if (!(flags & EIO_READDIR_DENTS))
		1012	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
938		1013
939	X_LOCK (wrklock);	1014	X_LOCK (wrklock);
		1015
940	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1016	/* the corresponding closedir is in ETP_WORKER_CLEAR */
941	self->dirp = dirp = opendir (req->ptr1);	1017	self->dirp = dirp = opendir (req->ptr1);
942	req->flags \|= EIO_FLAG_PTR2_FREE;	1018	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
943	req->ptr2 = names = malloc (memlen);	1019	req->ptr1 = names = malloc (namesalloc);
		1020	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
		1021
944	X_UNLOCK (wrklock);	1022	X_UNLOCK (wrklock);
945		1023
946	if (dirp && names)	1024	if (dirp && names && (!flags \|\| dents))
947	for (;;)	1025	for (;;)
948	{	1026	{
949	errno = 0;	1027	errno = 0;
950	entp = readdir (dirp);	1028	entp = readdir (dirp);
951		1029
952	if (!entp)	1030	if (!entp)
		1031	{
		1032	if (errno)
		1033	break;
		1034
		1035	/* sort etc. */
		1036	req->int1 = flags;
		1037	req->result = dentoffs;
		1038
		1039	if (flags & EIO_READDIR_STAT_ORDER \|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN))
		1040	{
		1041	/* pray your qsort doesn't use quicksort */
		1042	qsort (dents, dentoffs, sizeof (dents), eio_dent_cmp); / score depends of DIRS_FIRST */
		1043	}
		1044	else if (flags & EIO_READDIR_DIRS_FIRST && !(flags & EIO_READDIR_FOUND_UNKNOWN))
		1045	{
		1046	/* in this case, all is known, and we just put dirs first and sort them */
		1047	eio_dirent *ent = dents + dentoffs;
		1048	eio_dirent *dir = dents;
		1049
		1050	while (ent > dir)
		1051	{
		1052	if (dir->type == DT_DIR)
		1053	++dir;
		1054	else
		1055	{
		1056	--ent;
		1057
		1058	if (ent->type == DT_DIR)
		1059	{
		1060	eio_dirent tmp = *dir;
		1061	dir = ent;
		1062	*ent = tmp;
		1063
		1064	++dir;
		1065	}
		1066	}
		1067	}
		1068
		1069	/* now sort the dirs only */
		1070	qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);
		1071	}
		1072
		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
		1074
953	break;	1075	break;
		1076	}
954		1077
955	name = entp->d_name;	1078	name = entp->d_name;
956		1079
957	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1080	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
958	{	1081	{
959	int len = strlen (name) + 1;	1082	int len = strlen (name) + 1;
960		1083
961	res++;	1084	while (expect_false (namesoffs + len > namesalloc))
962
963	while (memofs + len > memlen)
964	{	1085	{
965	memlen *= 2;	1086	namesalloc *= 2;
966	X_LOCK (wrklock);	1087	X_LOCK (wrklock);
967	req->ptr2 = names = realloc (names, memlen);	1088	req->ptr1 = names = realloc (names, namesalloc);
968	X_UNLOCK (wrklock);	1089	X_UNLOCK (wrklock);
969		1090
970	if (!names)	1091	if (!names)
971	break;	1092	break;
972	}	1093	}
973		1094
974	memcpy (names + memofs, name, len);	1095	memcpy (names + namesoffs, name, len);
		1096
		1097	if (dents)
		1098	{
		1099	struct eio_dirent *ent;
		1100
		1101	if (expect_false (dentoffs == dentalloc))
		1102	{
		1103	dentalloc *= 2;
		1104	X_LOCK (wrklock);
		1105	req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1106	X_UNLOCK (wrklock);
		1107
		1108	if (!dents)
		1109	break;
		1110	}
		1111
		1112	ent = dents + dentoffs;
		1113
		1114	ent->name = names + namesoffs;
		1115	ent->namelen = len - 1;
		1116	ent->inode = D_INO (entp);
		1117
		1118	switch (D_TYPE (entp))
		1119	{
		1120	default:
		1121	ent->type = EIO_DT_UNKNOWN;
		1122	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1123	break;
		1124
		1125	#ifdef DT_FIFO
		1126	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1127	#endif
		1128	#ifdef DT_CHR
		1129	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1130	#endif
		1131	#ifdef DT_DIR
		1132	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1133	#endif
		1134	#ifdef DT_BLK
		1135	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1136	#endif
		1137	#ifdef DT_REG
		1138	case DT_REG: ent->type = EIO_DT_REG; break;
		1139	#endif
		1140	#ifdef DT_LNK
		1141	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1142	#endif
		1143	#ifdef DT_SOCK
		1144	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1145	#endif
		1146	#ifdef DT_WHT
		1147	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1148	#endif
		1149	}
		1150
		1151	ent->score = 0;
		1152
		1153	if (flags & EIO_READDIR_DIRS_FIRST)
		1154	{
		1155	if (ent->type == EIO_DT_UNKNOWN)
		1156	{
		1157	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1158	ent->score = 98;
		1159	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 */
		1161	}
		1162	else if (ent->type == DT_DIR)
		1163	ent->score = 100;
		1164	}
		1165	}
		1166
975	memofs += len;	1167	namesoffs += len;
		1168	++dentoffs;
976	}	1169	}
977	}	1170	}
978		1171	else
979	if (errno)
980	res = -1;
981
982	req->result = res;	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	}
983	}	1183	}
984		1184
985	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1185	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1186	# undef msync
986	# define msync(a,b,c) ENOSYS	1187	# define msync(a,b,c) ((errno = ENOSYS), -1)
987	#endif	1188	#endif
988		1189
989	int	1190	int
990	eio__mtouch (void *mem, size_t len, int flags)	1191	eio__mtouch (void *mem, size_t len, int flags)
991	{	1192	{
…		…
1185	case EIO_SYNC: req->result = 0; sync (); break;	1386	case EIO_SYNC: req->result = 0; sync (); break;
1186	case EIO_FSYNC: req->result = fsync (req->int1); break;	1387	case EIO_FSYNC: req->result = fsync (req->int1); break;
1187	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1388	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1188	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;	1389	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;	1390	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1391	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1190		1392
1191	case EIO_READDIR: eio__scandir (req, self); break;	1393	case EIO_READDIR: eio__scandir (req, self); break;
1192		1394
1193	case EIO_BUSY:	1395	case EIO_BUSY:
1194	#ifdef _WIN32	1396	#ifdef _WIN32
…		…
1279	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	1481	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1280	{	1482	{
1281	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	1483	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1282	}	1484	}
1283		1485
		1486	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1487	{
		1488	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1489	}
		1490
1284	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1491	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1285	{	1492	{
1286	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1493	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1287	}	1494	}
1288		1495
…		…
1400	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1607	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1401	{	1608	{
1402	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1609	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1403	}	1610	}
1404		1611
1405	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1612	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1406	{	1613	{
1407	return eio__1path (EIO_READDIR, path, pri, cb, data);	1614	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1408	}	1615	}
1409		1616
1410	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1617	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1411	{	1618	{
1412	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	1619	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.26 by root, Sun Oct 12 22:30:33 2008 UTC vs. Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.26 by root, Sun Oct 12 22:30:33 2008 UTC vs.
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC