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.38 by root, Fri Jun 12 20:01:42 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_QSORT_CUTOFF 20 /* quite high, but performs well on many filesystems */
1003
1004static void
1005eio_dent_sort (eio_dirent *dents, int size)
1006{
1007 int i, j;
1008
1009 if (size > EIO_QSORT_CUTOFF * 3) /* skip quicksort for small directories */
1010 {
1011 /* first, use quicksort */
1012 /* should be good for 2**31 entries */
1013 struct rng { int l, r; } rng [32];
1014
1015 i = 0;
1016 rng[0].l = 0;
1017 rng[0].r = size;
1018
1019 while (expect_true (i >= 0))
1020 {
1021 int L = rng [i].l;
1022 int R = rng [i].r - 1;
1023
1024 if (expect_false (L + EIO_QSORT_CUTOFF < R))
1025 {
1026 eio_dirent piv = dents [L];
1027
1028 while (L < R)
1029 {
1030 while (eio_dent_cmp (&dents [R], &piv) >= 0 && L < R)
1031 --R;
1032
1033 if (L < R)
1034 dents [L++] = dents [R];
1035
1036 while (eio_dent_cmp (&dents [L], &piv) <= 0 && L < R)
1037 ++L;
1038
1039 if (L < R)
1040 dents [R--] = dents [L];
1041 }
1042
1043 dents [L] = piv;
1044
1045 ++i;
1046 rng [i].l = L + 1;
1047 rng [i].r = rng [i - 1].r;
1048 rng [i - 1].r = L;
1049
1050 if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l)
1051 {
1052 struct rng t;
1053
1054 t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
1055 }
1056 }
1057 else
1058 --i;
1059 }
1060 }
1061
1062 /* use a simple insertion sort at the end */
1063 for (i = 1; i < size; ++i)
1064 {
1065 eio_dirent value = dents [i];
1066
1067 for (j = i - 1; j >= 0 && eio_dent_cmp (&dents [j], &value) > 0; --j)
1068 dents [j + 1] = dents [j];
1069
1070 dents [j + 1] = value;
1071 }
994} 1072}
995 1073
996/* read a full directory */ 1074/* read a full directory */
997static void 1075static void
998eio__scandir (eio_req *req, etp_worker *self) 1076eio__scandir (eio_req *req, etp_worker *self)
999{ 1077{
1000 DIR *dirp; 1078 DIR *dirp;
1001 EIO_STRUCT_DIRENT *entp; 1079 EIO_STRUCT_DIRENT *entp;
1002 unsigned char *name, *names; 1080 char *name, *names;
1003 int namesalloc = 4096; 1081 int namesalloc = 4096;
1004 int namesoffs = 0; 1082 int namesoffs = 0;
1005 int flags = req->int1; 1083 int flags = req->int1;
1006 eio_dirent *dents = 0; 1084 eio_dirent *dents = 0;
1007 int dentalloc = 128; 1085 int dentalloc = 128;
… …
1043 (--ent)->name = names + (size_t)ent->name; 1121 (--ent)->name = names + (size_t)ent->name;
1044 } 1122 }
1045 1123
1046 if (flags & EIO_READDIR_STAT_ORDER 1124 if (flags & EIO_READDIR_STAT_ORDER
1047 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1125 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN)))
1048 { 1126 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) 1127 else if (flags & EIO_READDIR_DIRS_FIRST)
1053 { 1128 {
1054 /* in this case, all is known, and we just put dirs first and sort them */ 1129 /* in this case, all is known, and we just put dirs first and sort them */
1055 eio_dirent *ent = dents + dentoffs; 1130 eio_dirent *ent = dents + dentoffs;
1056 eio_dirent *dir = dents; 1131 eio_dirent *dir = dents;
1057 1132
1133 /* now move dirs to the front, and non-dirs to the back */
1134 /* by walking from both sides and swapping if necessary */
1058 while (ent > dir) 1135 while (ent > dir)
1059 { 1136 {
1060 if (dir->type == DT_DIR) 1137 if (dir->type == DT_DIR)
1061 ++dir; 1138 ++dir;
1062 else 1139 else
… …
1073 } 1150 }
1074 } 1151 }
1075 } 1152 }
1076 1153
1077 /* now sort the dirs only */ 1154 /* now sort the dirs only */
1078 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp); 1155 eio_dent_sort (dents, dir - dents);
1079 } 1156 }
1080 1157
1081 /* only provide the names array unless DENTS is specified */ 1158 /* only provide the names array unless DENTS is specified */
1082 if (!(flags & EIO_READDIR_DENTS)) 1159 if (!(flags & EIO_READDIR_DENTS))
1083 { 1160 {
… …
1095 name = entp->d_name; 1172 name = entp->d_name;
1096 1173
1097 /* skip . and .. entries */ 1174 /* skip . and .. entries */
1098 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1175 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1099 { 1176 {
1100 int len = strlen (name) + 1; 1177 int len = D_NAMLEN (entp) + 1;
1101 1178
1102 while (expect_false (namesoffs + len > namesalloc)) 1179 while (expect_false (namesoffs + len > namesalloc))
1103 { 1180 {
1104 namesalloc *= 2; 1181 namesalloc *= 2;
1105 X_LOCK (wrklock); 1182 X_LOCK (wrklock);
… …
1144 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1221 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1145 #endif 1222 #endif
1146 #ifdef DT_CHR 1223 #ifdef DT_CHR
1147 case DT_CHR: ent->type = EIO_DT_CHR; break; 1224 case DT_CHR: ent->type = EIO_DT_CHR; break;
1148 #endif 1225 #endif
1226 #ifdef DT_MPC
1227 case DT_MPC: ent->type = EIO_DT_MPC; break;
1228 #endif
1149 #ifdef DT_DIR 1229 #ifdef DT_DIR
1150 case DT_DIR: ent->type = EIO_DT_DIR; break; 1230 case DT_DIR: ent->type = EIO_DT_DIR; break;
1231 #endif
1232 #ifdef DT_NAM
1233 case DT_NAM: ent->type = EIO_DT_NAM; break;
1151 #endif 1234 #endif
1152 #ifdef DT_BLK 1235 #ifdef DT_BLK
1153 case DT_BLK: ent->type = EIO_DT_BLK; break; 1236 case DT_BLK: ent->type = EIO_DT_BLK; break;
1154 #endif 1237 #endif
1238 #ifdef DT_MPB
1239 case DT_MPB: ent->type = EIO_DT_MPB; break;
1240 #endif
1155 #ifdef DT_REG 1241 #ifdef DT_REG
1156 case DT_REG: ent->type = EIO_DT_REG; break; 1242 case DT_REG: ent->type = EIO_DT_REG; break;
1243 #endif
1244 #ifdef DT_NWK
1245 case DT_NWK: ent->type = EIO_DT_NWK; break;
1246 #endif
1247 #ifdef DT_CMP
1248 case DT_CMP: ent->type = EIO_DT_CMP; break;
1157 #endif 1249 #endif
1158 #ifdef DT_LNK 1250 #ifdef DT_LNK
1159 case DT_LNK: ent->type = EIO_DT_LNK; break; 1251 case DT_LNK: ent->type = EIO_DT_LNK; break;
1160 #endif 1252 #endif
1161 #ifdef DT_SOCK 1253 #ifdef DT_SOCK
1162 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1254 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1163 #endif 1255 #endif
1256 #ifdef DT_DOOR
1257 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1258 #endif
1164 #ifdef DT_WHT 1259 #ifdef DT_WHT
1165 case DT_WHT: ent->type = EIO_DT_WHT; break; 1260 case DT_WHT: ent->type = EIO_DT_WHT; break;
1166 #endif 1261 #endif
1167 } 1262 }
1168 1263
… …
1173 if (ent->type == EIO_DT_UNKNOWN) 1268 if (ent->type == EIO_DT_UNKNOWN)
1174 { 1269 {
1175 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1270 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1176 ent->score = 98; 1271 ent->score = 98;
1177 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1272 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 */ 1273 ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */
1179 } 1274 }
1180 else if (ent->type == DT_DIR) 1275 else if (ent->type == EIO_DT_DIR)
1181 ent->score = 100; 1276 ent->score = 100;
1182 } 1277 }
1183 } 1278 }
1184 1279
1185 namesoffs += len; 1280 namesoffs += len;
1186 ++dentoffs; 1281 ++dentoffs;
1187 } 1282 }
1283
1284 if (EIO_CANCELLED (req))
1285 {
1286 errno = ECANCELED;
1287 break;
1288 }
1188 } 1289 }
1189 else
1190 req->result = -1;
1191} 1290}
1192 1291
1193#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1292#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1194# undef msync 1293# undef msync
1195# define msync(a,b,c) ((errno = ENOSYS), -1) 1294# define msync(a,b,c) ((errno = ENOSYS), -1)
… …
1716/* misc garbage */ 1815/* misc garbage */
1717 1816
1718ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1817ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1719{ 1818{
1720 etp_worker wrk; 1819 etp_worker wrk;
1820 ssize_t ret;
1721 1821
1722 wrk.dbuf = 0; 1822 wrk.dbuf = 0;
1723 1823
1724 eio__sendfile (ofd, ifd, offset, count, &wrk); 1824 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1725 1825
1726 if (wrk.dbuf) 1826 if (wrk.dbuf)
1727 free (wrk.dbuf); 1827 free (wrk.dbuf);
1728}
1729 1828
1829 return ret;
1830}
1831

Diff Legend

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