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

Comparing libeio/eio.c (file contents):
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC vs.
Revision 1.47 by root, Sat Jan 2 13:02:20 2010 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 __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 __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
… …
99#endif 106#endif
100 107
101#if HAVE_SENDFILE 108#if HAVE_SENDFILE
102# if __linux 109# if __linux
103# include <sys/sendfile.h> 110# include <sys/sendfile.h>
104# elif __freebsd 111# elif __freebsd || defined __APPLE__
105# include <sys/socket.h> 112# include <sys/socket.h>
106# include <sys/uio.h> 113# include <sys/uio.h>
107# elif __hpux 114# elif __hpux
108# include <sys/socket.h> 115# include <sys/socket.h>
109# elif __solaris /* not yet */ 116# elif __solaris
110# include <sys/sendfile.h> 117# include <sys/sendfile.h>
111# else 118# else
112# error sendfile support requested but not available 119# error sendfile support requested but not available
113# endif 120# endif
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/*****************************************************************************/
188 198
189#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 199#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
190 200
191/* calculcate time difference in ~1/EIO_TICKS of a second */ 201/* calculate time difference in ~1/EIO_TICKS of a second */
192static int tvdiff (struct timeval *tv1, struct timeval *tv2) 202static int tvdiff (struct timeval *tv1, struct timeval *tv2)
193{ 203{
194 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 204 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
195 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 205 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
196} 206}
… …
588} 598}
589 599
590static void etp_set_max_poll_time (double nseconds) 600static void etp_set_max_poll_time (double nseconds)
591{ 601{
592 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 602 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
593 max_poll_time = nseconds; 603 max_poll_time = nseconds * EIO_TICKS;
594 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 604 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
595} 605}
596 606
597static void etp_set_max_poll_reqs (unsigned int maxreqs) 607static void etp_set_max_poll_reqs (unsigned int maxreqs)
598{ 608{
… …
857 if (!res || errno != ENOSYS) 867 if (!res || errno != ENOSYS)
858 return res; 868 return res;
859#endif 869#endif
860 870
861 /* even though we could play tricks with the flags, it's better to always 871 /* 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 */ 872 * call fdatasync, as that matches the expectation of its users best */
863 return fdatasync (fd); 873 return fdatasync (fd);
864} 874}
865 875
866#if !HAVE_READAHEAD 876#if !HAVE_READAHEAD
867# undef readahead 877# undef readahead
… …
913 if (res < 0 && sbytes) 923 if (res < 0 && sbytes)
914 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
915 res = sbytes; 925 res = sbytes;
916 } 926 }
917 927
928# elif defined (__APPLE__)
929
930 {
931 off_t sbytes = count;
932 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
933
934 if (res < 0 && errno == EAGAIN && sbytes)
935 res = sbytes;
936 }
937
918# elif __hpux 938# elif __hpux
919 res = sendfile (ofd, ifd, offset, count, 0, 0); 939 res = sendfile (ofd, ifd, offset, count, 0, 0);
920 940
921# elif __solaris 941# elif __solaris
922 { 942 {
… …
933 if (res < 0 && sbytes) 953 if (res < 0 && sbytes)
934 res = sbytes; 954 res = sbytes;
935 } 955 }
936 956
937# endif 957# endif
958
959#elif defined (_WIN32)
960
961 /* does not work, just for documentation of what would need to be done */
962 {
963 HANDLE h = TO_SOCKET (ifd);
964 SetFilePointer (h, offset, 0, FILE_BEGIN);
965 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
966 }
967
938#else 968#else
939 res = -1; 969 res = -1;
940 errno = ENOSYS; 970 errno = ENOSYS;
941#endif 971#endif
942 972
943 if (res < 0 973 if (res < 0
944 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 974 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
945#if __solaris 975#if __solaris
946 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 976 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
947#endif 977#endif
978 || errno == ENOTSUP || errno == EOPNOTSUPP
948 ) 979 )
949 ) 980 )
950 { 981 {
951 /* emulate sendfile. this is a major pain in the ass */ 982 /* emulate sendfile. this is a major pain in the ass */
952 dBUF; 983 dBUF;
… …
980 } 1011 }
981 1012
982 return res; 1013 return res;
983} 1014}
984 1015
985static int 1016static signed char
986eio_dent_cmp (const void *a_, const void *b_) 1017eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
987{ 1018{
988 const eio_dirent *a = (const eio_dirent *)a_; 1019 return a->score - b->score ? a->score - b->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 */ 1020 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
1021}
1022
1023#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1024
1025#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1026#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1027
1028static void
1029eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1030{
1031 unsigned char bits [9 + sizeof (ino_t) * 8];
1032 unsigned char *bit = bits;
1033
1034 assert (CHAR_BIT == 8);
1035 assert (sizeof (eio_dirent) * 8 < 256);
1036 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
1037 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
1038
1039 if (size <= EIO_SORT_FAST)
1040 return;
1041
1042 /* first prepare an array of bits to test in our radix sort */
1043 /* try to take endianness into account, as well as differences in ino_t sizes */
1044 /* inode_bits must contain all inodes ORed together */
1045 /* which is used to skip bits that are 0 everywhere, which is very common */
1046 {
1047 ino_t endianness;
1048 int i, j;
1049
1050 /* we store the byte offset of byte n into byte n of "endianness" */
1051 for (i = 0; i < sizeof (ino_t); ++i)
1052 ((unsigned char *)&endianness)[i] = i;
1053
1054 *bit++ = 0;
1055
1056 for (i = 0; i < sizeof (ino_t); ++i)
1057 {
1058 /* shifting off the byte offsets out of "endianness" */
1059 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1060 endianness >>= 8;
1061
1062 for (j = 0; j < 8; ++j)
1063 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1064 *bit++ = offs + j;
1065 }
1066
1067 for (j = 0; j < 8; ++j)
1068 if (score_bits & (1 << j))
1069 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1070 }
1071
1072 /* now actually do the sorting (a variant of MSD radix sort) */
1073 {
1074 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1075 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1076 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1077 int stk_idx = 0;
1078
1079 base_stk [stk_idx] = dents;
1080 end_stk [stk_idx] = dents + size;
1081 bit_stk [stk_idx] = bit - 1;
1082
1083 do
1084 {
1085 base = base_stk [stk_idx];
1086 end = end_stk [stk_idx];
1087 bit = bit_stk [stk_idx];
1088
1089 for (;;)
1090 {
1091 unsigned char O = *bit >> 3;
1092 unsigned char M = 1 << (*bit & 7);
1093
1094 eio_dirent *a = base;
1095 eio_dirent *b = end;
1096
1097 if (b - a < EIO_SORT_CUTOFF)
1098 break;
1099
1100 /* now bit-partition the array on the bit */
1101 /* this ugly asymmetric loop seems to perform much better than typical */
1102 /* partition algos found in the literature */
1103 do
1104 if (!(((unsigned char *)a)[O] & M))
1105 ++a;
1106 else if (!(((unsigned char *)--b)[O] & M))
1107 {
1108 eio_dirent tmp = *a; *a = *b; *b = tmp;
1109 ++a;
1110 }
1111 while (b > a);
1112
1113 /* next bit, or stop, if no bits left in this path */
1114 if (!*--bit)
1115 break;
1116
1117 base_stk [stk_idx] = a;
1118 end_stk [stk_idx] = end;
1119 bit_stk [stk_idx] = bit;
1120 ++stk_idx;
1121
1122 end = a;
1123 }
1124 }
1125 while (stk_idx--);
1126 }
1127}
1128
1129static void
1130eio_dent_insertion_sort (eio_dirent *dents, int size)
1131{
1132 /* first move the smallest element to the front, to act as a sentinel */
1133 {
1134 int i;
1135 eio_dirent *min = dents;
1136
1137 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1138 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1139 if (EIO_DENT_CMP (dents [i], <, *min))
1140 min = &dents [i];
1141
1142 /* swap elements 0 and j (minimum) */
1143 {
1144 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1145 }
1146 }
1147
1148 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1149 {
1150 eio_dirent *i, *j;
1151
1152 for (i = dents + 1; i < dents + size; ++i)
1153 {
1154 eio_dirent value = *i;
1155
1156 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1157 j [1] = j [0];
1158
1159 j [1] = value;
1160 }
1161 }
1162}
1163
1164static void
1165eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1166{
1167 if (size <= 1)
1168 return; /* our insertion sort relies on size > 0 */
1169
1170 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1171 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1172 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1173
1174 /* use an insertion sort at the end, or for small arrays, */
1175 /* as insertion sort is more efficient for small partitions */
1176 eio_dent_insertion_sort (dents, size);
993} 1177}
994 1178
995/* read a full directory */ 1179/* read a full directory */
996static void 1180static void
997eio__scandir (eio_req *req, etp_worker *self) 1181eio__scandir (eio_req *req, etp_worker *self)
998{ 1182{
999 DIR *dirp; 1183 DIR *dirp;
1000 EIO_STRUCT_DIRENT *entp; 1184 EIO_STRUCT_DIRENT *entp;
1001 unsigned char *name, *names; 1185 char *name, *names;
1002 int namesalloc = 4096; 1186 int namesalloc = 4096;
1003 int namesoffs = 0; 1187 int namesoffs = 0;
1004 int flags = req->int1; 1188 int flags = req->int1;
1005 eio_dirent *dents = 0; 1189 eio_dirent *dents = 0;
1006 int dentalloc = 128; 1190 int dentalloc = 128;
1007 int dentoffs = 0; 1191 int dentoffs = 0;
1192 ino_t inode_bits = 0;
1008 1193
1009 req->result = -1; 1194 req->result = -1;
1010 1195
1011 if (!(flags & EIO_READDIR_DENTS)) 1196 if (!(flags & EIO_READDIR_DENTS))
1012 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1197 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1013 1198
1014 X_LOCK (wrklock); 1199 X_LOCK (wrklock);
1015
1016 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1200 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1017 self->dirp = dirp = opendir (req->ptr1); 1201 self->dirp = dirp = opendir (req->ptr1);
1018 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1202 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1019 req->ptr1 = names = malloc (namesalloc);
1020 req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1203 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1021 1204 req->ptr2 = names = malloc (namesalloc);
1022 X_UNLOCK (wrklock); 1205 X_UNLOCK (wrklock);
1023 1206
1024 if (dirp && names && (!flags || dents)) 1207 if (dirp && names && (!flags || dents))
1025 for (;;) 1208 for (;;)
1026 { 1209 {
… …
1034 1217
1035 /* sort etc. */ 1218 /* sort etc. */
1036 req->int1 = flags; 1219 req->int1 = flags;
1037 req->result = dentoffs; 1220 req->result = dentoffs;
1038 1221
1039 if (flags & EIO_READDIR_STAT_ORDER || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN)) 1222 if (flags & EIO_READDIR_STAT_ORDER)
1223 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
1224 else if (flags & EIO_READDIR_DIRS_FIRST)
1225 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1226 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1227 else
1040 { 1228 {
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 */ 1229 /* in this case, all is known, and we just put dirs first and sort them */
1047 eio_dirent *ent = dents + dentoffs; 1230 eio_dirent *oth = dents + dentoffs;
1048 eio_dirent *dir = dents; 1231 eio_dirent *dir = dents;
1049 1232
1233 /* now partition dirs to the front, and non-dirs to the back */
1234 /* by walking from both sides and swapping if necessary */
1235 /* also clear score, so it doesn't influence sorting */
1050 while (ent > dir) 1236 while (oth > dir)
1051 { 1237 {
1052 if (dir->type == DT_DIR) 1238 if (dir->type == EIO_DT_DIR)
1053 ++dir; 1239 ++dir;
1054 else
1055 {
1056 --ent;
1057
1058 if (ent->type == DT_DIR) 1240 else if ((--oth)->type == EIO_DT_DIR)
1059 { 1241 {
1060 eio_dirent tmp = *dir; 1242 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1061 *dir = *ent;
1062 *ent = tmp;
1063 1243
1064 ++dir; 1244 ++dir;
1065 } 1245 }
1066 } 1246 }
1067 }
1068 1247
1069 /* now sort the dirs only */ 1248 /* now sort the dirs only */
1070 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp); 1249 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1071 } 1250 }
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 1251
1075 break; 1252 break;
1076 } 1253 }
1077 1254
1255 /* now add the entry to our list(s) */
1078 name = entp->d_name; 1256 name = entp->d_name;
1079 1257
1258 /* skip . and .. entries */
1080 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1259 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1081 { 1260 {
1082 int len = strlen (name) + 1; 1261 int len = D_NAMLEN (entp) + 1;
1083 1262
1084 while (expect_false (namesoffs + len > namesalloc)) 1263 while (expect_false (namesoffs + len > namesalloc))
1085 { 1264 {
1086 namesalloc *= 2; 1265 namesalloc *= 2;
1087 X_LOCK (wrklock); 1266 X_LOCK (wrklock);
1088 req->ptr1 = names = realloc (names, namesalloc); 1267 req->ptr2 = names = realloc (names, namesalloc);
1089 X_UNLOCK (wrklock); 1268 X_UNLOCK (wrklock);
1090 1269
1091 if (!names) 1270 if (!names)
1092 break; 1271 break;
1093 } 1272 }
… …
1100 1279
1101 if (expect_false (dentoffs == dentalloc)) 1280 if (expect_false (dentoffs == dentalloc))
1102 { 1281 {
1103 dentalloc *= 2; 1282 dentalloc *= 2;
1104 X_LOCK (wrklock); 1283 X_LOCK (wrklock);
1105 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1284 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1106 X_UNLOCK (wrklock); 1285 X_UNLOCK (wrklock);
1107 1286
1108 if (!dents) 1287 if (!dents)
1109 break; 1288 break;
1110 } 1289 }
1111 1290
1112 ent = dents + dentoffs; 1291 ent = dents + dentoffs;
1113 1292
1114 ent->name = names + namesoffs; 1293 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1115 ent->namelen = len - 1; 1294 ent->namelen = len - 1;
1116 ent->inode = D_INO (entp); 1295 ent->inode = D_INO (entp);
1296
1297 inode_bits |= ent->inode;
1117 1298
1118 switch (D_TYPE (entp)) 1299 switch (D_TYPE (entp))
1119 { 1300 {
1120 default: 1301 default:
1121 ent->type = EIO_DT_UNKNOWN; 1302 ent->type = EIO_DT_UNKNOWN;
… …
1126 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1307 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1127 #endif 1308 #endif
1128 #ifdef DT_CHR 1309 #ifdef DT_CHR
1129 case DT_CHR: ent->type = EIO_DT_CHR; break; 1310 case DT_CHR: ent->type = EIO_DT_CHR; break;
1130 #endif 1311 #endif
1312 #ifdef DT_MPC
1313 case DT_MPC: ent->type = EIO_DT_MPC; break;
1314 #endif
1131 #ifdef DT_DIR 1315 #ifdef DT_DIR
1132 case DT_DIR: ent->type = EIO_DT_DIR; break; 1316 case DT_DIR: ent->type = EIO_DT_DIR; break;
1133 #endif 1317 #endif
1318 #ifdef DT_NAM
1319 case DT_NAM: ent->type = EIO_DT_NAM; break;
1320 #endif
1134 #ifdef DT_BLK 1321 #ifdef DT_BLK
1135 case DT_BLK: ent->type = EIO_DT_BLK; break; 1322 case DT_BLK: ent->type = EIO_DT_BLK; break;
1136 #endif 1323 #endif
1324 #ifdef DT_MPB
1325 case DT_MPB: ent->type = EIO_DT_MPB; break;
1326 #endif
1137 #ifdef DT_REG 1327 #ifdef DT_REG
1138 case DT_REG: ent->type = EIO_DT_REG; break; 1328 case DT_REG: ent->type = EIO_DT_REG; break;
1139 #endif 1329 #endif
1330 #ifdef DT_NWK
1331 case DT_NWK: ent->type = EIO_DT_NWK; break;
1332 #endif
1333 #ifdef DT_CMP
1334 case DT_CMP: ent->type = EIO_DT_CMP; break;
1335 #endif
1140 #ifdef DT_LNK 1336 #ifdef DT_LNK
1141 case DT_LNK: ent->type = EIO_DT_LNK; break; 1337 case DT_LNK: ent->type = EIO_DT_LNK; break;
1142 #endif 1338 #endif
1143 #ifdef DT_SOCK 1339 #ifdef DT_SOCK
1144 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1340 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1145 #endif 1341 #endif
1342 #ifdef DT_DOOR
1343 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1344 #endif
1146 #ifdef DT_WHT 1345 #ifdef DT_WHT
1147 case DT_WHT: ent->type = EIO_DT_WHT; break; 1346 case DT_WHT: ent->type = EIO_DT_WHT; break;
1148 #endif 1347 #endif
1149 } 1348 }
1150 1349
1151 ent->score = 0; 1350 ent->score = 7;
1152 1351
1153 if (flags & EIO_READDIR_DIRS_FIRST) 1352 if (flags & EIO_READDIR_DIRS_FIRST)
1154 { 1353 {
1155 if (ent->type == EIO_DT_UNKNOWN) 1354 if (ent->type == EIO_DT_UNKNOWN)
1156 { 1355 {
1157 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1356 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1158 ent->score = 98; 1357 ent->score = 1;
1159 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1358 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 */ 1359 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1161 } 1360 }
1162 else if (ent->type == DT_DIR) 1361 else if (ent->type == EIO_DT_DIR)
1163 ent->score = 100; 1362 ent->score = 0;
1164 } 1363 }
1165 } 1364 }
1166 1365
1167 namesoffs += len; 1366 namesoffs += len;
1168 ++dentoffs; 1367 ++dentoffs;
1169 } 1368 }
1369
1370 if (EIO_CANCELLED (req))
1371 {
1372 errno = ECANCELED;
1373 break;
1374 }
1170 } 1375 }
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} 1376}
1184 1377
1185#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1378#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1186# undef msync 1379# undef msync
1187# define msync(a,b,c) ((errno = ENOSYS), -1) 1380# define msync(a,b,c) ((errno = ENOSYS), -1)
… …
1199 1392
1200 if (!page) 1393 if (!page)
1201 page = sysconf (_SC_PAGESIZE); 1394 page = sysconf (_SC_PAGESIZE);
1202#endif 1395#endif
1203 1396
1397 /* round down to start of page, although this is probably useless */
1204 addr &= ~(page - 1); /* assume page size is always a power of two */ 1398 addr &= ~(page - 1); /* assume page size is always a power of two */
1205 1399
1206 if (addr < end) 1400 if (addr < end)
1207 if (flags) /* modify */ 1401 if (flags) /* modify */
1208 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1402 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
… …
1708/* misc garbage */ 1902/* misc garbage */
1709 1903
1710ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1904ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1711{ 1905{
1712 etp_worker wrk; 1906 etp_worker wrk;
1907 ssize_t ret;
1713 1908
1714 wrk.dbuf = 0; 1909 wrk.dbuf = 0;
1715 1910
1716 eio__sendfile (ofd, ifd, offset, count, &wrk); 1911 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1717 1912
1718 if (wrk.dbuf) 1913 if (wrk.dbuf)
1719 free (wrk.dbuf); 1914 free (wrk.dbuf);
1720}
1721 1915
1916 return ret;
1917}
1918

Diff Legend

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