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

Comparing libeio/eio.c (file contents):
Revision 1.41 by root, Sun Jun 14 20:36:59 2009 UTC vs.
Revision 1.49 by root, Sat Jan 2 14:24:32 2010 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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 *
… …
80# include <utime.h> 80# include <utime.h>
81# include <signal.h> 81# include <signal.h>
82# include <dirent.h> 82# include <dirent.h>
83 83
84/* 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 */
85# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) 85# if __freebsd || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */ 86# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno 87# define D_INO(de) (de)->d_fileno
88# define D_NAMLEN(de) (de)->d_namlen 88# define D_NAMLEN(de) (de)->d_namlen
89# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600 89# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
90# define D_INO(de) (de)->d_ino 90# define D_INO(de) (de)->d_ino
91# endif 91# endif
92 92
93#ifdef _D_EXACT_NAMLEN 93#ifdef _D_EXACT_NAMLEN
94# undef D_NAMLEN 94# undef D_NAMLEN
… …
106#endif 106#endif
107 107
108#if HAVE_SENDFILE 108#if HAVE_SENDFILE
109# if __linux 109# if __linux
110# include <sys/sendfile.h> 110# include <sys/sendfile.h>
111# elif __freebsd 111# elif __freebsd || defined __APPLE__
112# include <sys/socket.h> 112# include <sys/socket.h>
113# include <sys/uio.h> 113# include <sys/uio.h>
114# elif __hpux 114# elif __hpux
115# include <sys/socket.h> 115# include <sys/socket.h>
116# elif __solaris /* not yet */ 116# elif __solaris
117# include <sys/sendfile.h> 117# include <sys/sendfile.h>
118# else 118# else
119# error sendfile support requested but not available 119# error sendfile support requested but not available
120# endif 120# endif
121#endif 121#endif
… …
196 196
197/*****************************************************************************/ 197/*****************************************************************************/
198 198
199#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 199#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
200 200
201/* calculcate time difference in ~1/EIO_TICKS of a second */ 201/* calculate time difference in ~1/EIO_TICKS of a second */
202static int tvdiff (struct timeval *tv1, struct timeval *tv2) 202static int tvdiff (struct timeval *tv1, struct timeval *tv2)
203{ 203{
204 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 204 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
205 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 205 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
206} 206}
… …
598} 598}
599 599
600static void etp_set_max_poll_time (double nseconds) 600static void etp_set_max_poll_time (double nseconds)
601{ 601{
602 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 602 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
603 max_poll_time = nseconds; 603 max_poll_time = nseconds * EIO_TICKS;
604 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 604 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
605} 605}
606 606
607static void etp_set_max_poll_reqs (unsigned int maxreqs) 607static void etp_set_max_poll_reqs (unsigned int maxreqs)
608{ 608{
… …
867 if (!res || errno != ENOSYS) 867 if (!res || errno != ENOSYS)
868 return res; 868 return res;
869#endif 869#endif
870 870
871 /* 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
872 * call fdatasync, as thta matches the expectation of it's users best */ 872 * call fdatasync, as that matches the expectation of its users best */
873 return fdatasync (fd); 873 return fdatasync (fd);
874} 874}
875 875
876#if !HAVE_READAHEAD 876#if !HAVE_READAHEAD
877# undef readahead 877# undef readahead
… …
923 if (res < 0 && sbytes) 923 if (res < 0 && sbytes)
924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
925 res = sbytes; 925 res = sbytes;
926 } 926 }
927 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
928# elif __hpux 938# elif __hpux
929 res = sendfile (ofd, ifd, offset, count, 0, 0); 939 res = sendfile (ofd, ifd, offset, count, 0, 0);
930 940
931# elif __solaris 941# elif __solaris
932 { 942 {
… …
943 if (res < 0 && sbytes) 953 if (res < 0 && sbytes)
944 res = sbytes; 954 res = sbytes;
945 } 955 }
946 956
947# 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
948#else 968#else
949 res = -1; 969 res = -1;
950 errno = ENOSYS; 970 errno = ENOSYS;
951#endif 971#endif
952 972
953 if (res < 0 973 if (res < 0
954 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 974 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
975 /* BSDs */
976#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
977 || errno == ENOTSUP
978#endif
979 || errno == EOPNOTSUPP /* BSDs */
955#if __solaris 980#if __solaris
956 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 981 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
957#endif 982#endif
958 ) 983 )
959 ) 984 )
… …
993} 1018}
994 1019
995static signed char 1020static signed char
996eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1021eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
997{ 1022{
998 return b->score - a->score ? b->score - a->score /* works because our signed char is always 0..100 */ 1023 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; 1024 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
1000} 1025}
1001 1026
1002#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1027#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1003#define EIO_DENT_NUM_SCORES 9
1004 1028
1005#define EIO_QSORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1029#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1006#define EIO_QSORT_SKIP 60 /* when to skip qsort completely */ 1030#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1007 1031
1008static void 1032static void
1009eio_dent_sort (eio_dirent *dents, int size) 1033eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1010{ 1034{
1011 if (size <= 1) 1035 unsigned char bits [9 + sizeof (ino_t) * 8];
1012 return; /* our insertion sort relies on size > 0 */ 1036 unsigned char *bit = bits;
1013 1037
1014 if (size > EIO_QSORT_SKIP) /* skip quicksort for small directories */ 1038 assert (CHAR_BIT == 8);
1039 assert (sizeof (eio_dirent) * 8 < 256);
1040 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
1041 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
1042
1043 if (size <= EIO_SORT_FAST)
1044 return;
1045
1046 /* first prepare an array of bits to test in our radix sort */
1047 /* try to take endianness into account, as well as differences in ino_t sizes */
1048 /* inode_bits must contain all inodes ORed together */
1049 /* which is used to skip bits that are 0 everywhere, which is very common */
1015 { 1050 {
1016 /* first, use quicksort */ 1051 ino_t endianness;
1017 /* should be good for 2**31 entries */
1018 int i; 1052 int i, j;
1019 struct rng { eio_dirent *l, *r; } rng [32];
1020 1053
1021 i = 0; 1054 /* we store the byte offset of byte n into byte n of "endianness" */
1022 rng[0].l = dents; 1055 for (i = 0; i < sizeof (ino_t); ++i)
1023 rng[0].r = dents + size; 1056 ((unsigned char *)&endianness)[i] = i;
1024 1057
1025 while (expect_true (i >= 0)) 1058 *bit++ = 0;
1059
1060 for (i = 0; i < sizeof (ino_t); ++i)
1026 { 1061 {
1027 eio_dirent *L = rng [i].l; 1062 /* shifting off the byte offsets out of "endianness" */
1028 eio_dirent *R = rng [i].r - 1; 1063 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1064 endianness >>= 8;
1029 1065
1030 if (expect_false (L + EIO_QSORT_CUTOFF < R)) 1066 for (j = 0; j < 8; ++j)
1067 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1068 *bit++ = offs + j;
1069 }
1070
1071 for (j = 0; j < 8; ++j)
1072 if (score_bits & (1 << j))
1073 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1074 }
1075
1076 /* now actually do the sorting (a variant of MSD radix sort) */
1077 {
1078 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1079 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1080 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1081 int stk_idx = 0;
1082
1083 base_stk [stk_idx] = dents;
1084 end_stk [stk_idx] = dents + size;
1085 bit_stk [stk_idx] = bit - 1;
1086
1087 do
1088 {
1089 base = base_stk [stk_idx];
1090 end = end_stk [stk_idx];
1091 bit = bit_stk [stk_idx];
1092
1093 for (;;)
1031 { 1094 {
1032 eio_dirent *mid = &dents [((L - dents) + (R - dents)) >> 1]; 1095 unsigned char O = *bit >> 3;
1033 eio_dirent piv = *mid; *mid = *L; *L = piv; 1096 unsigned char M = 1 << (*bit & 7);
1034 1097
1035 while (L < R) 1098 eio_dirent *a = base;
1099 eio_dirent *b = end;
1100
1101 if (b - a < EIO_SORT_CUTOFF)
1102 break;
1103
1104 /* now bit-partition the array on the bit */
1105 /* this ugly asymmetric loop seems to perform much better than typical */
1106 /* partition algos found in the literature */
1107 do
1108 if (!(((unsigned char *)a)[O] & M))
1109 ++a;
1110 else if (!(((unsigned char *)--b)[O] & M))
1036 { 1111 {
1037 while (EIO_DENT_CMP (*R, >=, piv) && L < R) 1112 eio_dirent tmp = *a; *a = *b; *b = tmp;
1038 --R;
1039
1040 if (L < R)
1041 *L++ = *R;
1042
1043 while (EIO_DENT_CMP (*L, <=, piv) && L < R)
1044 ++L; 1113 ++a;
1045
1046 if (L < R)
1047 *R-- = *L;
1048 } 1114 }
1115 while (b > a);
1049 1116
1050 *L = piv; 1117 /* next bit, or stop, if no bits left in this path */
1118 if (!*--bit)
1119 break;
1051 1120
1121 base_stk [stk_idx] = a;
1122 end_stk [stk_idx] = end;
1123 bit_stk [stk_idx] = bit;
1052 ++i; 1124 ++stk_idx;
1053 rng [i].l = L + 1;
1054 rng [i].r = rng [i - 1].r;
1055 rng [i - 1].r = L;
1056 1125
1057 if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l) 1126 end = a;
1058 {
1059 struct rng t;
1060
1061 t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
1062 }
1063 } 1127 }
1064 else
1065 --i;
1066 } 1128 }
1129 while (stk_idx--);
1067 } 1130 }
1131}
1068 1132
1069 /* use an insertion sort after qsort, or for small arrays */ 1133static void
1134eio_dent_insertion_sort (eio_dirent *dents, int size)
1135{
1070 /* first move the smallest element to the front, to act as a sentinel */ 1136 /* first move the smallest element to the front, to act as a sentinel */
1071 { 1137 {
1072 int i; 1138 int i;
1073 eio_dirent *min = dents; 1139 eio_dirent *min = dents;
1074 1140
1141 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1075 for (i = size > EIO_QSORT_SKIP ? EIO_QSORT_CUTOFF + 1 : size; --i; ) 1142 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1076 if (EIO_DENT_CMP (dents [i], <, *min)) 1143 if (EIO_DENT_CMP (dents [i], <, *min))
1077 min = &dents [i]; 1144 min = &dents [i];
1078 1145
1079 /* swap elements 0 and j (minimum) */ 1146 /* swap elements 0 and j (minimum) */
1080 { 1147 {
1081 eio_dirent tmp = *dents; *dents = *min; *min = tmp; 1148 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1082 } 1149 }
1083 } 1150 }
1084 1151
1152 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1085 { 1153 {
1086 /* then do standard insertion sort */
1087 eio_dirent *i, *j; 1154 eio_dirent *i, *j;
1088 1155
1089 for (i = dents + 1; i < dents + size; ++i) 1156 for (i = dents + 1; i < dents + size; ++i)
1090 { 1157 {
1091 eio_dirent value = *i; 1158 eio_dirent value = *i;
… …
1094 j [1] = j [0]; 1161 j [1] = j [0];
1095 1162
1096 j [1] = value; 1163 j [1] = value;
1097 } 1164 }
1098 } 1165 }
1166}
1167
1168static void
1169eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1170{
1171 if (size <= 1)
1172 return; /* our insertion sort relies on size > 0 */
1173
1174 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1175 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1176 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1177
1178 /* use an insertion sort at the end, or for small arrays, */
1179 /* as insertion sort is more efficient for small partitions */
1180 eio_dent_insertion_sort (dents, size);
1099} 1181}
1100 1182
1101/* read a full directory */ 1183/* read a full directory */
1102static void 1184static void
1103eio__scandir (eio_req *req, etp_worker *self) 1185eio__scandir (eio_req *req, etp_worker *self)
… …
1109 int namesoffs = 0; 1191 int namesoffs = 0;
1110 int flags = req->int1; 1192 int flags = req->int1;
1111 eio_dirent *dents = 0; 1193 eio_dirent *dents = 0;
1112 int dentalloc = 128; 1194 int dentalloc = 128;
1113 int dentoffs = 0; 1195 int dentoffs = 0;
1196 ino_t inode_bits = 0;
1114 1197
1115 req->result = -1; 1198 req->result = -1;
1116 1199
1117 if (!(flags & EIO_READDIR_DENTS)) 1200 if (!(flags & EIO_READDIR_DENTS))
1118 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1201 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1119 1202
1120 X_LOCK (wrklock); 1203 X_LOCK (wrklock);
1121 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1204 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1122 self->dirp = dirp = opendir (req->ptr1); 1205 self->dirp = dirp = opendir (req->ptr1);
1123 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1206 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1124 req->ptr1 = names = malloc (namesalloc);
1125 req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1207 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1208 req->ptr2 = names = malloc (namesalloc);
1126 X_UNLOCK (wrklock); 1209 X_UNLOCK (wrklock);
1127 1210
1128 if (dirp && names && (!flags || dents)) 1211 if (dirp && names && (!flags || dents))
1129 for (;;) 1212 for (;;)
1130 { 1213 {
… …
1138 1221
1139 /* sort etc. */ 1222 /* sort etc. */
1140 req->int1 = flags; 1223 req->int1 = flags;
1141 req->result = dentoffs; 1224 req->result = dentoffs;
1142 1225
1143 if (dents)
1144 {
1145 eio_dirent *ent = dents + dentoffs;
1146
1147 while (ent > dents)
1148 (--ent)->name = names + (size_t)ent->name;
1149 }
1150
1151 if (flags & EIO_READDIR_STAT_ORDER 1226 if (flags & EIO_READDIR_STAT_ORDER)
1152 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1227 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
1153 eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */
1154 else if (flags & EIO_READDIR_DIRS_FIRST) 1228 else if (flags & EIO_READDIR_DIRS_FIRST)
1229 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1230 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1231 else
1155 { 1232 {
1156 /* in this case, all is known, and we just put dirs first and sort them */ 1233 /* in this case, all is known, and we just put dirs first and sort them */
1157 eio_dirent *ent = dents + dentoffs; 1234 eio_dirent *oth = dents + dentoffs;
1158 eio_dirent *dir = dents; 1235 eio_dirent *dir = dents;
1159 1236
1160 /* now move dirs to the front, and non-dirs to the back */ 1237 /* now partition dirs to the front, and non-dirs to the back */
1161 /* by walking from both sides and swapping if necessary */ 1238 /* by walking from both sides and swapping if necessary */
1239 /* also clear score, so it doesn't influence sorting */
1162 while (ent > dir) 1240 while (oth > dir)
1163 {
1164 if (dir->type == DT_DIR)
1165 { 1241 {
1166 dir->score = 0; 1242 if (dir->type == EIO_DT_DIR)
1167 ++dir; 1243 ++dir;
1168 }
1169 else
1170 {
1171 --ent;
1172
1173 if (ent->type == DT_DIR) 1244 else if ((--oth)->type == EIO_DT_DIR)
1174 { 1245 {
1175 eio_dirent tmp = *dir; 1246 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1176 *dir = *ent;
1177 *ent = tmp;
1178 1247
1179 dir->score = 0;
1180 ++dir; 1248 ++dir;
1181 } 1249 }
1182 } 1250 }
1183 }
1184 1251
1185 /* now sort the dirs only */ 1252 /* now sort the dirs only */
1186 eio_dent_sort (dents, dir - dents); 1253 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1187 } 1254 }
1188
1189 /* only provide the names array unless DENTS is specified */
1190 if (!(flags & EIO_READDIR_DENTS))
1191 {
1192 X_LOCK (wrklock);
1193 assert (!dents);
1194 req->ptr1 = 0;
1195 req->ptr2 = names;
1196 X_UNLOCK (wrklock);
1197 }
1198 1255
1199 break; 1256 break;
1200 } 1257 }
1201 1258
1202 /* now add the entry to our list(s) */ 1259 /* now add the entry to our list(s) */
… …
1209 1266
1210 while (expect_false (namesoffs + len > namesalloc)) 1267 while (expect_false (namesoffs + len > namesalloc))
1211 { 1268 {
1212 namesalloc *= 2; 1269 namesalloc *= 2;
1213 X_LOCK (wrklock); 1270 X_LOCK (wrklock);
1214 req->ptr1 = names = realloc (names, namesalloc); 1271 req->ptr2 = names = realloc (names, namesalloc);
1215 X_UNLOCK (wrklock); 1272 X_UNLOCK (wrklock);
1216 1273
1217 if (!names) 1274 if (!names)
1218 break; 1275 break;
1219 } 1276 }
… …
1226 1283
1227 if (expect_false (dentoffs == dentalloc)) 1284 if (expect_false (dentoffs == dentalloc))
1228 { 1285 {
1229 dentalloc *= 2; 1286 dentalloc *= 2;
1230 X_LOCK (wrklock); 1287 X_LOCK (wrklock);
1231 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1288 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1232 X_UNLOCK (wrklock); 1289 X_UNLOCK (wrklock);
1233 1290
1234 if (!dents) 1291 if (!dents)
1235 break; 1292 break;
1236 } 1293 }
1237 1294
1238 ent = dents + dentoffs; 1295 ent = dents + dentoffs;
1239 1296
1240 ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */ 1297 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1241 ent->namelen = len - 1; 1298 ent->namelen = len - 1;
1242 ent->inode = D_INO (entp) ? D_INO (entp) : dentoffs; 1299 ent->inode = D_INO (entp);
1300
1301 inode_bits |= ent->inode;
1243 1302
1244 switch (D_TYPE (entp)) 1303 switch (D_TYPE (entp))
1245 { 1304 {
1246 default: 1305 default:
1247 ent->type = EIO_DT_UNKNOWN; 1306 ent->type = EIO_DT_UNKNOWN;
… …
1290 #ifdef DT_WHT 1349 #ifdef DT_WHT
1291 case DT_WHT: ent->type = EIO_DT_WHT; break; 1350 case DT_WHT: ent->type = EIO_DT_WHT; break;
1292 #endif 1351 #endif
1293 } 1352 }
1294 1353
1295 ent->score = 0; 1354 ent->score = 7;
1296 1355
1297 if (flags & EIO_READDIR_DIRS_FIRST) 1356 if (flags & EIO_READDIR_DIRS_FIRST)
1298 { 1357 {
1299 if (ent->type == EIO_DT_UNKNOWN) 1358 if (ent->type == EIO_DT_UNKNOWN)
1300 { 1359 {
1301 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1360 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1302 ent->score = 7; 1361 ent->score = 1;
1303 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1362 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1304 ent->score = len <= 2 ? len + 4 : len <= 4 ? 3 : len <= 7 ? 2 : 1; /* shorter == more likely dir, but avoid too many classes */ 1363 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1305 } 1364 }
1306 else if (ent->type == EIO_DT_DIR) 1365 else if (ent->type == EIO_DT_DIR)
1307 ent->score = 8; 1366 ent->score = 0;
1308 } 1367 }
1309 } 1368 }
1310 1369
1311 namesoffs += len; 1370 namesoffs += len;
1312 ++dentoffs; 1371 ++dentoffs;
… …
1319 } 1378 }
1320 } 1379 }
1321} 1380}
1322 1381
1323#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1382#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1324# undef msync
1325# define msync(a,b,c) ((errno = ENOSYS), -1) 1383# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1384#else
1385
1386int
1387eio__msync (void *mem, size_t len, int flags)
1388{
1389 if (EIO_MS_ASYNC != MS_SYNC
1390 || EIO_MS_INVALIDATE != MS_INVALIDATE
1391 || EIO_MS_SYNC != MS_SYNC)
1392 {
1393 flags = 0
1394 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1395 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1396 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1397 }
1398
1399 return msync (mem, len, flags);
1400}
1401
1326#endif 1402#endif
1327 1403
1328int 1404int
1329eio__mtouch (void *mem, size_t len, int flags) 1405eio__mtouch (void *mem, size_t len, int flags)
1330{ 1406{
… …
1337 1413
1338 if (!page) 1414 if (!page)
1339 page = sysconf (_SC_PAGESIZE); 1415 page = sysconf (_SC_PAGESIZE);
1340#endif 1416#endif
1341 1417
1418 /* round down to start of page, although this is probably useless */
1342 addr &= ~(page - 1); /* assume page size is always a power of two */ 1419 addr &= ~(page - 1); /* assume page size is always a power of two */
1343 1420
1344 if (addr < end) 1421 if (addr < end)
1345 if (flags) /* modify */ 1422 if (flags & EIO_MT_MODIFY) /* modify */
1346 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1423 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1347 else 1424 else
1348 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1425 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1349 1426
1350 return 0; 1427 return 0;
… …
1522 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1599 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1523 1600
1524 case EIO_SYNC: req->result = 0; sync (); break; 1601 case EIO_SYNC: req->result = 0; sync (); break;
1525 case EIO_FSYNC: req->result = fsync (req->int1); break; 1602 case EIO_FSYNC: req->result = fsync (req->int1); break;
1526 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1603 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1527 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1604 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1528 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1605 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1529 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1606 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1530 1607
1531 case EIO_READDIR: eio__scandir (req, self); break; 1608 case EIO_READDIR: eio__scandir (req, self); break;
1532 1609

Diff Legend

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