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.53 by root, Sat Jan 9 10:03:09 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 *
… …
49#include <stdlib.h> 49#include <stdlib.h>
50#include <string.h> 50#include <string.h>
51#include <errno.h> 51#include <errno.h>
52#include <sys/types.h> 52#include <sys/types.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/statvfs.h>
54#include <limits.h> 55#include <limits.h>
55#include <fcntl.h> 56#include <fcntl.h>
56#include <assert.h> 57#include <assert.h>
57 58
58#ifndef EIO_FINISH 59#ifndef EIO_FINISH
… …
80# include <utime.h> 81# include <utime.h>
81# include <signal.h> 82# include <signal.h>
82# include <dirent.h> 83# include <dirent.h>
83 84
84/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 85/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
85# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) 86# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */ 87# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno 88# define D_INO(de) (de)->d_fileno
88# define D_NAMLEN(de) (de)->d_namlen 89# define D_NAMLEN(de) (de)->d_namlen
89# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600 90# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
90# define D_INO(de) (de)->d_ino 91# define D_INO(de) (de)->d_ino
91# endif 92# endif
92 93
93#ifdef _D_EXACT_NAMLEN 94#ifdef _D_EXACT_NAMLEN
94# undef D_NAMLEN 95# undef D_NAMLEN
… …
106#endif 107#endif
107 108
108#if HAVE_SENDFILE 109#if HAVE_SENDFILE
109# if __linux 110# if __linux
110# include <sys/sendfile.h> 111# include <sys/sendfile.h>
111# elif __freebsd 112# elif __FreeBSD__ || defined __APPLE__
112# include <sys/socket.h> 113# include <sys/socket.h>
113# include <sys/uio.h> 114# include <sys/uio.h>
114# elif __hpux 115# elif __hpux
115# include <sys/socket.h> 116# include <sys/socket.h>
116# elif __solaris /* not yet */ 117# elif __solaris
117# include <sys/sendfile.h> 118# include <sys/sendfile.h>
118# else 119# else
119# error sendfile support requested but not available 120# error sendfile support requested but not available
120# endif 121# endif
121#endif 122#endif
… …
196 197
197/*****************************************************************************/ 198/*****************************************************************************/
198 199
199#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 200#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
200 201
201/* calculcate time difference in ~1/EIO_TICKS of a second */ 202/* calculate time difference in ~1/EIO_TICKS of a second */
202static int tvdiff (struct timeval *tv1, struct timeval *tv2) 203static int tvdiff (struct timeval *tv1, struct timeval *tv2)
203{ 204{
204 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 205 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
205 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 206 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
206} 207}
… …
598} 599}
599 600
600static void etp_set_max_poll_time (double nseconds) 601static void etp_set_max_poll_time (double nseconds)
601{ 602{
602 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 603 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
603 max_poll_time = nseconds; 604 max_poll_time = nseconds * EIO_TICKS;
604 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 605 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
605} 606}
606 607
607static void etp_set_max_poll_reqs (unsigned int maxreqs) 608static void etp_set_max_poll_reqs (unsigned int maxreqs)
608{ 609{
… …
867 if (!res || errno != ENOSYS) 868 if (!res || errno != ENOSYS)
868 return res; 869 return res;
869#endif 870#endif
870 871
871 /* even though we could play tricks with the flags, it's better to always 872 /* 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 */ 873 * call fdatasync, as that matches the expectation of its users best */
873 return fdatasync (fd); 874 return fdatasync (fd);
874} 875}
875 876
876#if !HAVE_READAHEAD 877#if !HAVE_READAHEAD
877# undef readahead 878# undef readahead
… …
909 910
910#if HAVE_SENDFILE 911#if HAVE_SENDFILE
911# if __linux 912# if __linux
912 res = sendfile (ofd, ifd, &offset, count); 913 res = sendfile (ofd, ifd, &offset, count);
913 914
914# elif __freebsd 915# elif __FreeBSD__
915 /* 916 /*
916 * Of course, the freebsd sendfile is a dire hack with no thoughts 917 * Of course, the freebsd sendfile is a dire hack with no thoughts
917 * wasted on making it similar to other I/O functions. 918 * wasted on making it similar to other I/O functions.
918 */ 919 */
919 { 920 {
920 off_t sbytes; 921 off_t sbytes;
921 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 922 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
922 923
923 if (res < 0 && sbytes) 924 #if 0 /* according to the manpage, this is correct, but broken behaviour */
924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 925 /* freebsd' sendfile will return 0 on success */
926 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
927 /* not on e.g. EIO or EPIPE - sounds broken */
928 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
929 res = sbytes;
930 #endif
931
932 /* according to source inspection, this is correct, and useful behaviour */
933 if (sbytes)
934 res = sbytes;
935 }
936
937# elif defined (__APPLE__)
938
939 {
940 off_t sbytes = count;
941 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
942
943 /* according to the manpage, sbytes is always valid */
944 if (sbytes)
925 res = sbytes; 945 res = sbytes;
926 } 946 }
927 947
928# elif __hpux 948# elif __hpux
929 res = sendfile (ofd, ifd, offset, count, 0, 0); 949 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
943 if (res < 0 && sbytes) 963 if (res < 0 && sbytes)
944 res = sbytes; 964 res = sbytes;
945 } 965 }
946 966
947# endif 967# endif
968
969#elif defined (_WIN32)
970
971 /* does not work, just for documentation of what would need to be done */
972 {
973 HANDLE h = TO_SOCKET (ifd);
974 SetFilePointer (h, offset, 0, FILE_BEGIN);
975 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
976 }
977
948#else 978#else
949 res = -1; 979 res = -1;
950 errno = ENOSYS; 980 errno = ENOSYS;
951#endif 981#endif
952 982
953 if (res < 0 983 if (res < 0
954 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 984 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
985 /* BSDs */
986#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
987 || errno == ENOTSUP
988#endif
989 || errno == EOPNOTSUPP /* BSDs */
955#if __solaris 990#if __solaris
956 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 991 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
957#endif 992#endif
958 ) 993 )
959 ) 994 )
… …
993} 1028}
994 1029
995static signed char 1030static signed char
996eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1031eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
997{ 1032{
998 return b->score - a->score ? b->score - a->score /* works because our signed char is always 0..100 */ 1033 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; 1034 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
1000} 1035}
1001 1036
1002#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1037#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1003#define EIO_DENT_NUM_SCORES 9
1004 1038
1005#define EIO_QSORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1039#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1006#define EIO_QSORT_SKIP 60 /* when to skip qsort completely */ 1040#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1007 1041
1008static void 1042static void
1009eio_dent_sort (eio_dirent *dents, int size) 1043eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1010{ 1044{
1011 if (size <= 1) 1045 unsigned char bits [9 + sizeof (ino_t) * 8];
1012 return; /* our insertion sort relies on size > 0 */ 1046 unsigned char *bit = bits;
1013 1047
1014 if (size > EIO_QSORT_SKIP) /* skip quicksort for small directories */ 1048 assert (CHAR_BIT == 8);
1049 assert (sizeof (eio_dirent) * 8 < 256);
1050 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
1051 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
1052
1053 if (size <= EIO_SORT_FAST)
1054 return;
1055
1056 /* first prepare an array of bits to test in our radix sort */
1057 /* try to take endianness into account, as well as differences in ino_t sizes */
1058 /* inode_bits must contain all inodes ORed together */
1059 /* which is used to skip bits that are 0 everywhere, which is very common */
1015 { 1060 {
1016 /* first, use quicksort */ 1061 ino_t endianness;
1017 /* should be good for 2**31 entries */
1018 int i; 1062 int i, j;
1019 struct rng { eio_dirent *l, *r; } rng [32];
1020 1063
1021 i = 0; 1064 /* we store the byte offset of byte n into byte n of "endianness" */
1022 rng[0].l = dents; 1065 for (i = 0; i < sizeof (ino_t); ++i)
1023 rng[0].r = dents + size; 1066 ((unsigned char *)&endianness)[i] = i;
1024 1067
1025 while (expect_true (i >= 0)) 1068 *bit++ = 0;
1069
1070 for (i = 0; i < sizeof (ino_t); ++i)
1026 { 1071 {
1027 eio_dirent *L = rng [i].l; 1072 /* shifting off the byte offsets out of "endianness" */
1028 eio_dirent *R = rng [i].r - 1; 1073 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1074 endianness >>= 8;
1029 1075
1030 if (expect_false (L + EIO_QSORT_CUTOFF < R)) 1076 for (j = 0; j < 8; ++j)
1077 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1078 *bit++ = offs + j;
1079 }
1080
1081 for (j = 0; j < 8; ++j)
1082 if (score_bits & (1 << j))
1083 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1084 }
1085
1086 /* now actually do the sorting (a variant of MSD radix sort) */
1087 {
1088 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1089 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1090 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1091 int stk_idx = 0;
1092
1093 base_stk [stk_idx] = dents;
1094 end_stk [stk_idx] = dents + size;
1095 bit_stk [stk_idx] = bit - 1;
1096
1097 do
1098 {
1099 base = base_stk [stk_idx];
1100 end = end_stk [stk_idx];
1101 bit = bit_stk [stk_idx];
1102
1103 for (;;)
1031 { 1104 {
1032 eio_dirent *mid = &dents [((L - dents) + (R - dents)) >> 1]; 1105 unsigned char O = *bit >> 3;
1033 eio_dirent piv = *mid; *mid = *L; *L = piv; 1106 unsigned char M = 1 << (*bit & 7);
1034 1107
1035 while (L < R) 1108 eio_dirent *a = base;
1109 eio_dirent *b = end;
1110
1111 if (b - a < EIO_SORT_CUTOFF)
1112 break;
1113
1114 /* now bit-partition the array on the bit */
1115 /* this ugly asymmetric loop seems to perform much better than typical */
1116 /* partition algos found in the literature */
1117 do
1118 if (!(((unsigned char *)a)[O] & M))
1119 ++a;
1120 else if (!(((unsigned char *)--b)[O] & M))
1036 { 1121 {
1037 while (EIO_DENT_CMP (*R, >=, piv) && L < R) 1122 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; 1123 ++a;
1045
1046 if (L < R)
1047 *R-- = *L;
1048 } 1124 }
1125 while (b > a);
1049 1126
1050 *L = piv; 1127 /* next bit, or stop, if no bits left in this path */
1128 if (!*--bit)
1129 break;
1051 1130
1131 base_stk [stk_idx] = a;
1132 end_stk [stk_idx] = end;
1133 bit_stk [stk_idx] = bit;
1052 ++i; 1134 ++stk_idx;
1053 rng [i].l = L + 1;
1054 rng [i].r = rng [i - 1].r;
1055 rng [i - 1].r = L;
1056 1135
1057 if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l) 1136 end = a;
1058 {
1059 struct rng t;
1060
1061 t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
1062 }
1063 } 1137 }
1064 else
1065 --i;
1066 } 1138 }
1139 while (stk_idx--);
1067 } 1140 }
1141}
1068 1142
1069 /* use an insertion sort after qsort, or for small arrays */ 1143static void
1144eio_dent_insertion_sort (eio_dirent *dents, int size)
1145{
1070 /* first move the smallest element to the front, to act as a sentinel */ 1146 /* first move the smallest element to the front, to act as a sentinel */
1071 { 1147 {
1072 int i; 1148 int i;
1073 eio_dirent *min = dents; 1149 eio_dirent *min = dents;
1074 1150
1151 /* 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; ) 1152 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1076 if (EIO_DENT_CMP (dents [i], <, *min)) 1153 if (EIO_DENT_CMP (dents [i], <, *min))
1077 min = &dents [i]; 1154 min = &dents [i];
1078 1155
1079 /* swap elements 0 and j (minimum) */ 1156 /* swap elements 0 and j (minimum) */
1080 { 1157 {
1081 eio_dirent tmp = *dents; *dents = *min; *min = tmp; 1158 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1082 } 1159 }
1083 } 1160 }
1084 1161
1162 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1085 { 1163 {
1086 /* then do standard insertion sort */
1087 eio_dirent *i, *j; 1164 eio_dirent *i, *j;
1088 1165
1089 for (i = dents + 1; i < dents + size; ++i) 1166 for (i = dents + 1; i < dents + size; ++i)
1090 { 1167 {
1091 eio_dirent value = *i; 1168 eio_dirent value = *i;
… …
1094 j [1] = j [0]; 1171 j [1] = j [0];
1095 1172
1096 j [1] = value; 1173 j [1] = value;
1097 } 1174 }
1098 } 1175 }
1176}
1177
1178static void
1179eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1180{
1181 if (size <= 1)
1182 return; /* our insertion sort relies on size > 0 */
1183
1184 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1185 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1186 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1187
1188 /* use an insertion sort at the end, or for small arrays, */
1189 /* as insertion sort is more efficient for small partitions */
1190 eio_dent_insertion_sort (dents, size);
1099} 1191}
1100 1192
1101/* read a full directory */ 1193/* read a full directory */
1102static void 1194static void
1103eio__scandir (eio_req *req, etp_worker *self) 1195eio__scandir (eio_req *req, etp_worker *self)
… …
1109 int namesoffs = 0; 1201 int namesoffs = 0;
1110 int flags = req->int1; 1202 int flags = req->int1;
1111 eio_dirent *dents = 0; 1203 eio_dirent *dents = 0;
1112 int dentalloc = 128; 1204 int dentalloc = 128;
1113 int dentoffs = 0; 1205 int dentoffs = 0;
1206 ino_t inode_bits = 0;
1114 1207
1115 req->result = -1; 1208 req->result = -1;
1116 1209
1117 if (!(flags & EIO_READDIR_DENTS)) 1210 if (!(flags & EIO_READDIR_DENTS))
1118 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1211 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1119 1212
1120 X_LOCK (wrklock); 1213 X_LOCK (wrklock);
1121 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1214 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1122 self->dirp = dirp = opendir (req->ptr1); 1215 self->dirp = dirp = opendir (req->ptr1);
1123 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1216 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; 1217 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1218 req->ptr2 = names = malloc (namesalloc);
1126 X_UNLOCK (wrklock); 1219 X_UNLOCK (wrklock);
1127 1220
1128 if (dirp && names && (!flags || dents)) 1221 if (dirp && names && (!flags || dents))
1129 for (;;) 1222 for (;;)
1130 { 1223 {
… …
1138 1231
1139 /* sort etc. */ 1232 /* sort etc. */
1140 req->int1 = flags; 1233 req->int1 = flags;
1141 req->result = dentoffs; 1234 req->result = dentoffs;
1142 1235
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 1236 if (flags & EIO_READDIR_STAT_ORDER)
1152 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1237 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) 1238 else if (flags & EIO_READDIR_DIRS_FIRST)
1239 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1240 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1241 else
1155 { 1242 {
1156 /* in this case, all is known, and we just put dirs first and sort them */ 1243 /* in this case, all is known, and we just put dirs first and sort them */
1157 eio_dirent *ent = dents + dentoffs; 1244 eio_dirent *oth = dents + dentoffs;
1158 eio_dirent *dir = dents; 1245 eio_dirent *dir = dents;
1159 1246
1160 /* now move dirs to the front, and non-dirs to the back */ 1247 /* now partition dirs to the front, and non-dirs to the back */
1161 /* by walking from both sides and swapping if necessary */ 1248 /* by walking from both sides and swapping if necessary */
1249 /* also clear score, so it doesn't influence sorting */
1162 while (ent > dir) 1250 while (oth > dir)
1163 {
1164 if (dir->type == DT_DIR)
1165 { 1251 {
1166 dir->score = 0; 1252 if (dir->type == EIO_DT_DIR)
1167 ++dir; 1253 ++dir;
1168 }
1169 else
1170 {
1171 --ent;
1172
1173 if (ent->type == DT_DIR) 1254 else if ((--oth)->type == EIO_DT_DIR)
1174 { 1255 {
1175 eio_dirent tmp = *dir; 1256 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1176 *dir = *ent;
1177 *ent = tmp;
1178 1257
1179 dir->score = 0;
1180 ++dir; 1258 ++dir;
1181 } 1259 }
1182 } 1260 }
1183 }
1184 1261
1185 /* now sort the dirs only */ 1262 /* now sort the dirs only */
1186 eio_dent_sort (dents, dir - dents); 1263 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1187 } 1264 }
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 1265
1199 break; 1266 break;
1200 } 1267 }
1201 1268
1202 /* now add the entry to our list(s) */ 1269 /* now add the entry to our list(s) */
… …
1209 1276
1210 while (expect_false (namesoffs + len > namesalloc)) 1277 while (expect_false (namesoffs + len > namesalloc))
1211 { 1278 {
1212 namesalloc *= 2; 1279 namesalloc *= 2;
1213 X_LOCK (wrklock); 1280 X_LOCK (wrklock);
1214 req->ptr1 = names = realloc (names, namesalloc); 1281 req->ptr2 = names = realloc (names, namesalloc);
1215 X_UNLOCK (wrklock); 1282 X_UNLOCK (wrklock);
1216 1283
1217 if (!names) 1284 if (!names)
1218 break; 1285 break;
1219 } 1286 }
… …
1226 1293
1227 if (expect_false (dentoffs == dentalloc)) 1294 if (expect_false (dentoffs == dentalloc))
1228 { 1295 {
1229 dentalloc *= 2; 1296 dentalloc *= 2;
1230 X_LOCK (wrklock); 1297 X_LOCK (wrklock);
1231 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1298 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1232 X_UNLOCK (wrklock); 1299 X_UNLOCK (wrklock);
1233 1300
1234 if (!dents) 1301 if (!dents)
1235 break; 1302 break;
1236 } 1303 }
1237 1304
1238 ent = dents + dentoffs; 1305 ent = dents + dentoffs;
1239 1306
1240 ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */ 1307 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1241 ent->namelen = len - 1; 1308 ent->namelen = len - 1;
1242 ent->inode = D_INO (entp) ? D_INO (entp) : dentoffs; 1309 ent->inode = D_INO (entp);
1310
1311 inode_bits |= ent->inode;
1243 1312
1244 switch (D_TYPE (entp)) 1313 switch (D_TYPE (entp))
1245 { 1314 {
1246 default: 1315 default:
1247 ent->type = EIO_DT_UNKNOWN; 1316 ent->type = EIO_DT_UNKNOWN;
… …
1290 #ifdef DT_WHT 1359 #ifdef DT_WHT
1291 case DT_WHT: ent->type = EIO_DT_WHT; break; 1360 case DT_WHT: ent->type = EIO_DT_WHT; break;
1292 #endif 1361 #endif
1293 } 1362 }
1294 1363
1295 ent->score = 0; 1364 ent->score = 7;
1296 1365
1297 if (flags & EIO_READDIR_DIRS_FIRST) 1366 if (flags & EIO_READDIR_DIRS_FIRST)
1298 { 1367 {
1299 if (ent->type == EIO_DT_UNKNOWN) 1368 if (ent->type == EIO_DT_UNKNOWN)
1300 { 1369 {
1301 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1370 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1302 ent->score = 7; 1371 ent->score = 1;
1303 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1372 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 */ 1373 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1305 } 1374 }
1306 else if (ent->type == EIO_DT_DIR) 1375 else if (ent->type == EIO_DT_DIR)
1307 ent->score = 8; 1376 ent->score = 0;
1308 } 1377 }
1309 } 1378 }
1310 1379
1311 namesoffs += len; 1380 namesoffs += len;
1312 ++dentoffs; 1381 ++dentoffs;
… …
1319 } 1388 }
1320 } 1389 }
1321} 1390}
1322 1391
1323#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1392#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1324# undef msync
1325# define msync(a,b,c) ((errno = ENOSYS), -1) 1393# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1394#else
1395
1396int
1397eio__msync (void *mem, size_t len, int flags)
1398{
1399 if (EIO_MS_ASYNC != MS_SYNC
1400 || EIO_MS_INVALIDATE != MS_INVALIDATE
1401 || EIO_MS_SYNC != MS_SYNC)
1402 {
1403 flags = 0
1404 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1405 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1406 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1407 }
1408
1409 return msync (mem, len, flags);
1410}
1411
1326#endif 1412#endif
1327 1413
1328int 1414int
1329eio__mtouch (void *mem, size_t len, int flags) 1415eio__mtouch (void *mem, size_t len, int flags)
1330{ 1416{
… …
1337 1423
1338 if (!page) 1424 if (!page)
1339 page = sysconf (_SC_PAGESIZE); 1425 page = sysconf (_SC_PAGESIZE);
1340#endif 1426#endif
1341 1427
1428 /* round down to start of page, although this is probably useless */
1342 addr &= ~(page - 1); /* assume page size is always a power of two */ 1429 addr &= ~(page - 1); /* assume page size is always a power of two */
1343 1430
1344 if (addr < end) 1431 if (addr < end)
1345 if (flags) /* modify */ 1432 if (flags & EIO_MT_MODIFY) /* modify */
1346 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1433 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1347 else 1434 else
1348 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1435 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1349 1436
1350 return 0; 1437 return 0;
… …
1498 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1585 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1499 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1586 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1500 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1587 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1501 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1588 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1502 1589
1590 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1591 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1592 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1593 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1594
1503 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1595 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1504 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1596 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1505 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1597 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1506 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1598 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1507 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1599 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1522 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1614 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1523 1615
1524 case EIO_SYNC: req->result = 0; sync (); break; 1616 case EIO_SYNC: req->result = 0; sync (); break;
1525 case EIO_FSYNC: req->result = fsync (req->int1); break; 1617 case EIO_FSYNC: req->result = fsync (req->int1); break;
1526 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1618 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1527 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1619 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; 1620 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; 1621 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1530 1622
1531 case EIO_READDIR: eio__scandir (req, self); break; 1623 case EIO_READDIR: eio__scandir (req, self); break;
1532 1624
… …
1654eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1746eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1655{ 1747{
1656 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1748 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1657} 1749}
1658 1750
1751eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1752{
1753 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1754}
1755
1659eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1756eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1660{ 1757{
1661 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1758 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1662} 1759}
1663 1760
… …
1733} 1830}
1734 1831
1735eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1832eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1736{ 1833{
1737 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1834 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1835}
1836
1837eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1838{
1839 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1738} 1840}
1739 1841
1740eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1842eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1741{ 1843{
1742 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1844 return eio__1path (EIO_UNLINK, path, pri, cb, data);

Diff Legend

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