ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/libeio/eio.c
(Generate patch)

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.32 by root, Sat Jun 6 18:06:55 2009 UTC vs.
Revision 1.40 by root, Sat Jun 13 14:58:33 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
… …
981 } 990 }
982 991
983 return res; 992 return res;
984} 993}
985 994
986static int 995static signed char
987eio_dent_cmp (const void *a_, const void *b_) 996eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
988{ 997{
989 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 */
990 const eio_dirent *b = (const eio_dirent *)b_;
991
992 return (int)b->score - (int)a->score ? (int)b->score - (int)a->score
993 : 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
1004#define EIO_QSORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1005#define EIO_QSORT_SKIP 60 /* when to skip qsort completely */
1006
1007static void
1008eio_dent_sort (eio_dirent *dents, int size)
1009{
1010 int i, j;
1011
1012 if (size <= 1)
1013 return; /* our insertion sort relies on size > 0 */
1014
1015 if (size > EIO_QSORT_SKIP) /* skip quicksort for small directories */
1016 {
1017 /* first, use quicksort */
1018 /* should be good for 2**31 entries */
1019 struct rng { int l, r; } rng [32];
1020
1021 i = 0;
1022 rng[0].l = 0;
1023 rng[0].r = size;
1024
1025 while (expect_true (i >= 0))
1026 {
1027 int L = rng [i].l;
1028 int R = rng [i].r - 1;
1029
1030 if (expect_false (L + EIO_QSORT_CUTOFF < R))
1031 {
1032 eio_dirent piv = dents [L];
1033
1034 while (L < R)
1035 {
1036 while (EIO_DENT_CMP (dents [R], >=, piv) && L < R)
1037 --R;
1038
1039 if (L < R)
1040 dents [L++] = dents [R];
1041
1042 while (EIO_DENT_CMP (dents [L], <=, piv) && L < R)
1043 ++L;
1044
1045 if (L < R)
1046 dents [R--] = dents [L];
1047 }
1048
1049 dents [L] = piv;
1050
1051 ++i;
1052 rng [i].l = L + 1;
1053 rng [i].r = rng [i - 1].r;
1054 rng [i - 1].r = L;
1055
1056 if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l)
1057 {
1058 struct rng t;
1059
1060 t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
1061 }
1062 }
1063 else
1064 --i;
1065 }
1066 }
1067
1068 /* use an insertion sort after qsort, or for small arrays */
1069 /* first move the smallest element to the front, to act as a sentinel */
1070 {
1071 int min = 0;
1072
1073 for (i = size > EIO_QSORT_SKIP ? EIO_QSORT_CUTOFF + 1 : size; --i; )
1074 if (EIO_DENT_CMP (dents [i], <, dents [min]))
1075 min = i;
1076
1077 /* swap elements 0 and j (minimum) */
1078 {
1079 eio_dirent tmp = dents [0]; dents [0] = dents [min]; dents [min] = tmp;
1080 }
1081 }
1082
1083 /* then do standard insertion sort */
1084 for (i = 1; i < size; ++i)
1085 {
1086 eio_dirent value = dents [i];
1087
1088 for (j = i - 1; EIO_DENT_CMP (dents [j], >, value); --j)
1089 {
1090 assert (j >= 0);
1091 dents [j + 1] = dents [j];
1092 }
1093
1094 dents [j + 1] = value;
1095 }
994} 1096}
995 1097
996/* read a full directory */ 1098/* read a full directory */
997static void 1099static void
998eio__scandir (eio_req *req, etp_worker *self) 1100eio__scandir (eio_req *req, etp_worker *self)
999{ 1101{
1000 DIR *dirp; 1102 DIR *dirp;
1001 EIO_STRUCT_DIRENT *entp; 1103 EIO_STRUCT_DIRENT *entp;
1002 unsigned char *name, *names; 1104 char *name, *names;
1003 int namesalloc = 4096; 1105 int namesalloc = 4096;
1004 int namesoffs = 0; 1106 int namesoffs = 0;
1005 int flags = req->int1; 1107 int flags = req->int1;
1006 eio_dirent *dents = 0; 1108 eio_dirent *dents = 0;
1007 int dentalloc = 128; 1109 int dentalloc = 128;
… …
1043 (--ent)->name = names + (size_t)ent->name; 1145 (--ent)->name = names + (size_t)ent->name;
1044 } 1146 }
1045 1147
1046 if (flags & EIO_READDIR_STAT_ORDER 1148 if (flags & EIO_READDIR_STAT_ORDER
1047 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1149 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN)))
1048 { 1150 eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */
1049 /* pray your qsort doesn't use quicksort */
1050 qsort (dents, dentoffs, sizeof (*dents), eio_dent_cmp); /* score depends of DIRS_FIRST */
1051 }
1052 else if (flags & EIO_READDIR_DIRS_FIRST) 1151 else if (flags & EIO_READDIR_DIRS_FIRST)
1053 { 1152 {
1054 /* in this case, all is known, and we just put dirs first and sort them */ 1153 /* in this case, all is known, and we just put dirs first and sort them */
1055 eio_dirent *ent = dents + dentoffs; 1154 eio_dirent *ent = dents + dentoffs;
1056 eio_dirent *dir = dents; 1155 eio_dirent *dir = dents;
1057 1156
1157 /* now move dirs to the front, and non-dirs to the back */
1158 /* by walking from both sides and swapping if necessary */
1058 while (ent > dir) 1159 while (ent > dir)
1059 { 1160 {
1060 if (dir->type == DT_DIR) 1161 if (dir->type == DT_DIR)
1061 ++dir; 1162 ++dir;
1062 else 1163 else
… …
1073 } 1174 }
1074 } 1175 }
1075 } 1176 }
1076 1177
1077 /* now sort the dirs only */ 1178 /* now sort the dirs only */
1078 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp); 1179 eio_dent_sort (dents, dir - dents);
1079 } 1180 }
1080 1181
1081 /* only provide the names array unless DENTS is specified */ 1182 /* only provide the names array unless DENTS is specified */
1082 if (!(flags & EIO_READDIR_DENTS)) 1183 if (!(flags & EIO_READDIR_DENTS))
1083 { 1184 {
… …
1095 name = entp->d_name; 1196 name = entp->d_name;
1096 1197
1097 /* skip . and .. entries */ 1198 /* skip . and .. entries */
1098 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1199 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1099 { 1200 {
1100 int len = strlen (name) + 1; 1201 int len = D_NAMLEN (entp) + 1;
1101 1202
1102 while (expect_false (namesoffs + len > namesalloc)) 1203 while (expect_false (namesoffs + len > namesalloc))
1103 { 1204 {
1104 namesalloc *= 2; 1205 namesalloc *= 2;
1105 X_LOCK (wrklock); 1206 X_LOCK (wrklock);
… …
1144 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1245 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1145 #endif 1246 #endif
1146 #ifdef DT_CHR 1247 #ifdef DT_CHR
1147 case DT_CHR: ent->type = EIO_DT_CHR; break; 1248 case DT_CHR: ent->type = EIO_DT_CHR; break;
1148 #endif 1249 #endif
1250 #ifdef DT_MPC
1251 case DT_MPC: ent->type = EIO_DT_MPC; break;
1252 #endif
1149 #ifdef DT_DIR 1253 #ifdef DT_DIR
1150 case DT_DIR: ent->type = EIO_DT_DIR; break; 1254 case DT_DIR: ent->type = EIO_DT_DIR; break;
1255 #endif
1256 #ifdef DT_NAM
1257 case DT_NAM: ent->type = EIO_DT_NAM; break;
1151 #endif 1258 #endif
1152 #ifdef DT_BLK 1259 #ifdef DT_BLK
1153 case DT_BLK: ent->type = EIO_DT_BLK; break; 1260 case DT_BLK: ent->type = EIO_DT_BLK; break;
1154 #endif 1261 #endif
1262 #ifdef DT_MPB
1263 case DT_MPB: ent->type = EIO_DT_MPB; break;
1264 #endif
1155 #ifdef DT_REG 1265 #ifdef DT_REG
1156 case DT_REG: ent->type = EIO_DT_REG; break; 1266 case DT_REG: ent->type = EIO_DT_REG; break;
1267 #endif
1268 #ifdef DT_NWK
1269 case DT_NWK: ent->type = EIO_DT_NWK; break;
1270 #endif
1271 #ifdef DT_CMP
1272 case DT_CMP: ent->type = EIO_DT_CMP; break;
1157 #endif 1273 #endif
1158 #ifdef DT_LNK 1274 #ifdef DT_LNK
1159 case DT_LNK: ent->type = EIO_DT_LNK; break; 1275 case DT_LNK: ent->type = EIO_DT_LNK; break;
1160 #endif 1276 #endif
1161 #ifdef DT_SOCK 1277 #ifdef DT_SOCK
1162 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1278 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1163 #endif 1279 #endif
1280 #ifdef DT_DOOR
1281 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1282 #endif
1164 #ifdef DT_WHT 1283 #ifdef DT_WHT
1165 case DT_WHT: ent->type = EIO_DT_WHT; break; 1284 case DT_WHT: ent->type = EIO_DT_WHT; break;
1166 #endif 1285 #endif
1167 } 1286 }
1168 1287
… …
1173 if (ent->type == EIO_DT_UNKNOWN) 1292 if (ent->type == EIO_DT_UNKNOWN)
1174 { 1293 {
1175 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1294 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1176 ent->score = 98; 1295 ent->score = 98;
1177 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1296 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1178 ent->score = len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */ 1297 ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */
1179 } 1298 }
1180 else if (ent->type == DT_DIR) 1299 else if (ent->type == EIO_DT_DIR)
1181 ent->score = 100; 1300 ent->score = 100;
1182 } 1301 }
1183 } 1302 }
1184 1303
1185 namesoffs += len; 1304 namesoffs += len;
1186 ++dentoffs; 1305 ++dentoffs;
1187 } 1306 }
1307
1308 if (EIO_CANCELLED (req))
1309 {
1310 errno = ECANCELED;
1311 break;
1312 }
1188 } 1313 }
1189 else
1190 req->result = -1;
1191} 1314}
1192 1315
1193#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1316#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1194# undef msync 1317# undef msync
1195# define msync(a,b,c) ((errno = ENOSYS), -1) 1318# define msync(a,b,c) ((errno = ENOSYS), -1)
… …
1716/* misc garbage */ 1839/* misc garbage */
1717 1840
1718ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1841ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1719{ 1842{
1720 etp_worker wrk; 1843 etp_worker wrk;
1844 ssize_t ret;
1721 1845
1722 wrk.dbuf = 0; 1846 wrk.dbuf = 0;
1723 1847
1724 eio__sendfile (ofd, ifd, offset, count, &wrk); 1848 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1725 1849
1726 if (wrk.dbuf) 1850 if (wrk.dbuf)
1727 free (wrk.dbuf); 1851 free (wrk.dbuf);
1728}
1729 1852
1853 return ret;
1854}
1855

Diff Legend

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