… | |
… | |
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 | # elif defined _WIN32 |
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 |
122 | |
123 | |
… | |
… | |
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 */ |
202 | static int tvdiff (struct timeval *tv1, struct timeval *tv2) |
203 | static 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 | |
600 | static void etp_set_max_poll_time (double nseconds) |
601 | static 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 | |
607 | static void etp_set_max_poll_reqs (unsigned int maxreqs) |
608 | static 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 |
… | |
… | |
923 | if (res < 0 && sbytes) |
924 | if (res < 0 && sbytes) |
924 | /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ |
925 | /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ |
925 | res = sbytes; |
926 | res = sbytes; |
926 | } |
927 | } |
927 | |
928 | |
|
|
929 | # elif defined __APPLE__ |
|
|
930 | |
|
|
931 | { |
|
|
932 | off_t bytes = count; |
|
|
933 | res = sendfile (ifd, ofd, offset, &bytes, 0, 0); |
|
|
934 | |
|
|
935 | if (res < 0 && errno == EAGAIN && bytes) |
|
|
936 | res = sbytes; |
|
|
937 | } |
|
|
938 | |
928 | # elif __hpux |
939 | # elif __hpux |
929 | res = sendfile (ofd, ifd, offset, count, 0, 0); |
940 | res = sendfile (ofd, ifd, offset, count, 0, 0); |
930 | |
941 | |
931 | # elif __solaris |
942 | # elif __solaris |
932 | { |
943 | { |
… | |
… | |
943 | if (res < 0 && sbytes) |
954 | if (res < 0 && sbytes) |
944 | res = sbytes; |
955 | res = sbytes; |
945 | } |
956 | } |
946 | |
957 | |
947 | # endif |
958 | # endif |
|
|
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 | |
… | |
… | |
993 | } |
1013 | } |
994 | |
1014 | |
995 | static signed char |
1015 | static signed char |
996 | eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) |
1016 | eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) |
997 | { |
1017 | { |
998 | return b->score - a->score ? b->score - a->score /* works because our signed char is always 0..100 */ |
1018 | 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; |
1019 | : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; |
1000 | } |
1020 | } |
1001 | |
1021 | |
|
|
1022 | #define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 |
|
|
1023 | |
1002 | #define EIO_QSORT_CUTOFF 20 /* quite high, but performs well on many filesystems */ |
1024 | #define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ |
|
|
1025 | #define EIO_SORT_FAST 60 /* when to only use insertion sort */ |
1003 | |
1026 | |
1004 | static void |
1027 | static void |
1005 | eio_dent_sort (eio_dirent *dents, int size) |
1028 | eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) |
1006 | { |
1029 | { |
|
|
1030 | unsigned char bits [9 + sizeof (ino_t) * 8]; |
|
|
1031 | unsigned char *bit = bits; |
|
|
1032 | |
|
|
1033 | assert (CHAR_BIT == 8); |
|
|
1034 | assert (sizeof (eio_dirent) * 8 < 256); |
|
|
1035 | assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ |
|
|
1036 | assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ |
|
|
1037 | |
|
|
1038 | if (size <= EIO_SORT_FAST) |
|
|
1039 | return; |
|
|
1040 | |
|
|
1041 | /* first prepare an array of bits to test in our radix sort */ |
|
|
1042 | /* try to take endianness into account, as well as differences in ino_t sizes */ |
|
|
1043 | /* inode_bits must contain all inodes ORed together */ |
|
|
1044 | /* which is used to skip bits that are 0 everywhere, which is very common */ |
|
|
1045 | { |
|
|
1046 | ino_t endianness; |
1007 | int i, j; |
1047 | int i, j; |
1008 | |
1048 | |
1009 | if (size > EIO_QSORT_CUTOFF * 3) /* skip quicksort for small directories */ |
1049 | /* we store the byte offset of byte n into byte n of "endianness" */ |
|
|
1050 | for (i = 0; i < sizeof (ino_t); ++i) |
|
|
1051 | ((unsigned char *)&endianness)[i] = i; |
|
|
1052 | |
|
|
1053 | *bit++ = 0; |
|
|
1054 | |
|
|
1055 | for (i = 0; i < sizeof (ino_t); ++i) |
|
|
1056 | { |
|
|
1057 | /* shifting off the byte offsets out of "endianness" */ |
|
|
1058 | int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; |
|
|
1059 | endianness >>= 8; |
|
|
1060 | |
|
|
1061 | for (j = 0; j < 8; ++j) |
|
|
1062 | if (inode_bits & (((ino_t)1) << (i * 8 + j))) |
|
|
1063 | *bit++ = offs + j; |
|
|
1064 | } |
|
|
1065 | |
|
|
1066 | for (j = 0; j < 8; ++j) |
|
|
1067 | if (score_bits & (1 << j)) |
|
|
1068 | *bit++ = offsetof (eio_dirent, score) * 8 + j; |
|
|
1069 | } |
|
|
1070 | |
|
|
1071 | /* now actually do the sorting (a variant of MSD radix sort) */ |
|
|
1072 | { |
|
|
1073 | eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; |
|
|
1074 | eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; |
|
|
1075 | unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; |
|
|
1076 | int stk_idx = 0; |
|
|
1077 | |
|
|
1078 | base_stk [stk_idx] = dents; |
|
|
1079 | end_stk [stk_idx] = dents + size; |
|
|
1080 | bit_stk [stk_idx] = bit - 1; |
|
|
1081 | |
|
|
1082 | do |
|
|
1083 | { |
|
|
1084 | base = base_stk [stk_idx]; |
|
|
1085 | end = end_stk [stk_idx]; |
|
|
1086 | bit = bit_stk [stk_idx]; |
|
|
1087 | |
|
|
1088 | for (;;) |
|
|
1089 | { |
|
|
1090 | unsigned char O = *bit >> 3; |
|
|
1091 | unsigned char M = 1 << (*bit & 7); |
|
|
1092 | |
|
|
1093 | eio_dirent *a = base; |
|
|
1094 | eio_dirent *b = end; |
|
|
1095 | |
|
|
1096 | if (b - a < EIO_SORT_CUTOFF) |
|
|
1097 | break; |
|
|
1098 | |
|
|
1099 | /* now bit-partition the array on the bit */ |
|
|
1100 | /* this ugly asymmetric loop seems to perform much better than typical */ |
|
|
1101 | /* partition algos found in the literature */ |
|
|
1102 | do |
|
|
1103 | if (!(((unsigned char *)a)[O] & M)) |
|
|
1104 | ++a; |
|
|
1105 | else if (!(((unsigned char *)--b)[O] & M)) |
|
|
1106 | { |
|
|
1107 | eio_dirent tmp = *a; *a = *b; *b = tmp; |
|
|
1108 | ++a; |
|
|
1109 | } |
|
|
1110 | while (b > a); |
|
|
1111 | |
|
|
1112 | /* next bit, or stop, if no bits left in this path */ |
|
|
1113 | if (!*--bit) |
|
|
1114 | break; |
|
|
1115 | |
|
|
1116 | base_stk [stk_idx] = a; |
|
|
1117 | end_stk [stk_idx] = end; |
|
|
1118 | bit_stk [stk_idx] = bit; |
|
|
1119 | ++stk_idx; |
|
|
1120 | |
|
|
1121 | end = a; |
|
|
1122 | } |
|
|
1123 | } |
|
|
1124 | while (stk_idx--); |
|
|
1125 | } |
|
|
1126 | } |
|
|
1127 | |
|
|
1128 | static void |
|
|
1129 | eio_dent_insertion_sort (eio_dirent *dents, int size) |
|
|
1130 | { |
|
|
1131 | /* first move the smallest element to the front, to act as a sentinel */ |
|
|
1132 | { |
|
|
1133 | int i; |
|
|
1134 | eio_dirent *min = dents; |
|
|
1135 | |
|
|
1136 | /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */ |
|
|
1137 | for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; ) |
|
|
1138 | if (EIO_DENT_CMP (dents [i], <, *min)) |
|
|
1139 | min = &dents [i]; |
|
|
1140 | |
|
|
1141 | /* swap elements 0 and j (minimum) */ |
1010 | { |
1142 | { |
1011 | /* first, use quicksort */ |
1143 | eio_dirent tmp = *dents; *dents = *min; *min = tmp; |
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 | } |
1144 | } |
|
|
1145 | } |
1061 | |
1146 | |
1062 | /* use a simple insertion sort at the end */ |
1147 | /* then do standard insertion sort, assuming that all elements are >= dents [0] */ |
|
|
1148 | { |
|
|
1149 | eio_dirent *i, *j; |
|
|
1150 | |
1063 | for (i = 1; i < size; ++i) |
1151 | for (i = dents + 1; i < dents + size; ++i) |
1064 | { |
1152 | { |
1065 | eio_dirent value = dents [i]; |
1153 | eio_dirent value = *i; |
1066 | |
1154 | |
1067 | for (j = i - 1; j >= 0 && eio_dent_cmp (&dents [j], &value) > 0; --j) |
1155 | for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j) |
1068 | dents [j + 1] = dents [j]; |
1156 | j [1] = j [0]; |
1069 | |
1157 | |
1070 | dents [j + 1] = value; |
1158 | j [1] = value; |
1071 | } |
1159 | } |
|
|
1160 | } |
|
|
1161 | } |
|
|
1162 | |
|
|
1163 | static void |
|
|
1164 | eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) |
|
|
1165 | { |
|
|
1166 | if (size <= 1) |
|
|
1167 | return; /* our insertion sort relies on size > 0 */ |
|
|
1168 | |
|
|
1169 | /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ |
|
|
1170 | /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */ |
|
|
1171 | eio_dent_radix_sort (dents, size, score_bits, inode_bits); |
|
|
1172 | |
|
|
1173 | /* use an insertion sort at the end, or for small arrays, */ |
|
|
1174 | /* as insertion sort is more efficient for small partitions */ |
|
|
1175 | eio_dent_insertion_sort (dents, size); |
1072 | } |
1176 | } |
1073 | |
1177 | |
1074 | /* read a full directory */ |
1178 | /* read a full directory */ |
1075 | static void |
1179 | static void |
1076 | eio__scandir (eio_req *req, etp_worker *self) |
1180 | eio__scandir (eio_req *req, etp_worker *self) |
… | |
… | |
1082 | int namesoffs = 0; |
1186 | int namesoffs = 0; |
1083 | int flags = req->int1; |
1187 | int flags = req->int1; |
1084 | eio_dirent *dents = 0; |
1188 | eio_dirent *dents = 0; |
1085 | int dentalloc = 128; |
1189 | int dentalloc = 128; |
1086 | int dentoffs = 0; |
1190 | int dentoffs = 0; |
|
|
1191 | ino_t inode_bits = 0; |
1087 | |
1192 | |
1088 | req->result = -1; |
1193 | req->result = -1; |
1089 | |
1194 | |
1090 | if (!(flags & EIO_READDIR_DENTS)) |
1195 | if (!(flags & EIO_READDIR_DENTS)) |
1091 | flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); |
1196 | flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); |
1092 | |
1197 | |
1093 | X_LOCK (wrklock); |
1198 | X_LOCK (wrklock); |
1094 | /* the corresponding closedir is in ETP_WORKER_CLEAR */ |
1199 | /* the corresponding closedir is in ETP_WORKER_CLEAR */ |
1095 | self->dirp = dirp = opendir (req->ptr1); |
1200 | self->dirp = dirp = opendir (req->ptr1); |
1096 | req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; |
1201 | req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; |
1097 | req->ptr1 = names = malloc (namesalloc); |
|
|
1098 | req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; |
1202 | req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; |
|
|
1203 | req->ptr2 = names = malloc (namesalloc); |
1099 | X_UNLOCK (wrklock); |
1204 | X_UNLOCK (wrklock); |
1100 | |
1205 | |
1101 | if (dirp && names && (!flags || dents)) |
1206 | if (dirp && names && (!flags || dents)) |
1102 | for (;;) |
1207 | for (;;) |
1103 | { |
1208 | { |
… | |
… | |
1111 | |
1216 | |
1112 | /* sort etc. */ |
1217 | /* sort etc. */ |
1113 | req->int1 = flags; |
1218 | req->int1 = flags; |
1114 | req->result = dentoffs; |
1219 | req->result = dentoffs; |
1115 | |
1220 | |
1116 | if (dents) |
|
|
1117 | { |
|
|
1118 | eio_dirent *ent = dents + dentoffs; |
|
|
1119 | |
|
|
1120 | while (ent > dents) |
|
|
1121 | (--ent)->name = names + (size_t)ent->name; |
|
|
1122 | } |
|
|
1123 | |
|
|
1124 | if (flags & EIO_READDIR_STAT_ORDER |
1221 | if (flags & EIO_READDIR_STAT_ORDER) |
1125 | || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) |
1222 | eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ |
1126 | eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */ |
|
|
1127 | else if (flags & EIO_READDIR_DIRS_FIRST) |
1223 | else if (flags & EIO_READDIR_DIRS_FIRST) |
|
|
1224 | if (flags & EIO_READDIR_FOUND_UNKNOWN) |
|
|
1225 | eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ |
|
|
1226 | else |
1128 | { |
1227 | { |
1129 | /* in this case, all is known, and we just put dirs first and sort them */ |
1228 | /* in this case, all is known, and we just put dirs first and sort them */ |
1130 | eio_dirent *ent = dents + dentoffs; |
1229 | eio_dirent *oth = dents + dentoffs; |
1131 | eio_dirent *dir = dents; |
1230 | eio_dirent *dir = dents; |
1132 | |
1231 | |
1133 | /* now move dirs to the front, and non-dirs to the back */ |
1232 | /* now partition dirs to the front, and non-dirs to the back */ |
1134 | /* by walking from both sides and swapping if necessary */ |
1233 | /* by walking from both sides and swapping if necessary */ |
|
|
1234 | /* also clear score, so it doesn't influence sorting */ |
1135 | while (ent > dir) |
1235 | while (oth > dir) |
1136 | { |
1236 | { |
1137 | if (dir->type == DT_DIR) |
1237 | if (dir->type == EIO_DT_DIR) |
1138 | ++dir; |
1238 | ++dir; |
1139 | else |
|
|
1140 | { |
|
|
1141 | --ent; |
|
|
1142 | |
|
|
1143 | if (ent->type == DT_DIR) |
1239 | else if ((--oth)->type == EIO_DT_DIR) |
1144 | { |
1240 | { |
1145 | eio_dirent tmp = *dir; |
1241 | eio_dirent tmp = *dir; *dir = *oth; *oth = tmp; |
1146 | *dir = *ent; |
|
|
1147 | *ent = tmp; |
|
|
1148 | |
1242 | |
1149 | ++dir; |
1243 | ++dir; |
1150 | } |
1244 | } |
1151 | } |
1245 | } |
1152 | } |
|
|
1153 | |
1246 | |
1154 | /* now sort the dirs only */ |
1247 | /* now sort the dirs only */ |
1155 | eio_dent_sort (dents, dir - dents); |
1248 | eio_dent_sort (dents, dir - dents, 0, inode_bits); |
1156 | } |
1249 | } |
1157 | |
|
|
1158 | /* only provide the names array unless DENTS is specified */ |
|
|
1159 | if (!(flags & EIO_READDIR_DENTS)) |
|
|
1160 | { |
|
|
1161 | X_LOCK (wrklock); |
|
|
1162 | assert (!dents); |
|
|
1163 | req->ptr1 = 0; |
|
|
1164 | req->ptr2 = names; |
|
|
1165 | X_UNLOCK (wrklock); |
|
|
1166 | } |
|
|
1167 | |
1250 | |
1168 | break; |
1251 | break; |
1169 | } |
1252 | } |
1170 | |
1253 | |
1171 | /* now add the entry to our list(s) */ |
1254 | /* now add the entry to our list(s) */ |
… | |
… | |
1178 | |
1261 | |
1179 | while (expect_false (namesoffs + len > namesalloc)) |
1262 | while (expect_false (namesoffs + len > namesalloc)) |
1180 | { |
1263 | { |
1181 | namesalloc *= 2; |
1264 | namesalloc *= 2; |
1182 | X_LOCK (wrklock); |
1265 | X_LOCK (wrklock); |
1183 | req->ptr1 = names = realloc (names, namesalloc); |
1266 | req->ptr2 = names = realloc (names, namesalloc); |
1184 | X_UNLOCK (wrklock); |
1267 | X_UNLOCK (wrklock); |
1185 | |
1268 | |
1186 | if (!names) |
1269 | if (!names) |
1187 | break; |
1270 | break; |
1188 | } |
1271 | } |
… | |
… | |
1195 | |
1278 | |
1196 | if (expect_false (dentoffs == dentalloc)) |
1279 | if (expect_false (dentoffs == dentalloc)) |
1197 | { |
1280 | { |
1198 | dentalloc *= 2; |
1281 | dentalloc *= 2; |
1199 | X_LOCK (wrklock); |
1282 | X_LOCK (wrklock); |
1200 | req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); |
1283 | req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); |
1201 | X_UNLOCK (wrklock); |
1284 | X_UNLOCK (wrklock); |
1202 | |
1285 | |
1203 | if (!dents) |
1286 | if (!dents) |
1204 | break; |
1287 | break; |
1205 | } |
1288 | } |
1206 | |
1289 | |
1207 | ent = dents + dentoffs; |
1290 | ent = dents + dentoffs; |
1208 | |
1291 | |
1209 | ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */ |
1292 | ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */ |
1210 | ent->namelen = len - 1; |
1293 | ent->namelen = len - 1; |
1211 | ent->inode = D_INO (entp); |
1294 | ent->inode = D_INO (entp); |
|
|
1295 | |
|
|
1296 | inode_bits |= ent->inode; |
1212 | |
1297 | |
1213 | switch (D_TYPE (entp)) |
1298 | switch (D_TYPE (entp)) |
1214 | { |
1299 | { |
1215 | default: |
1300 | default: |
1216 | ent->type = EIO_DT_UNKNOWN; |
1301 | ent->type = EIO_DT_UNKNOWN; |
… | |
… | |
1259 | #ifdef DT_WHT |
1344 | #ifdef DT_WHT |
1260 | case DT_WHT: ent->type = EIO_DT_WHT; break; |
1345 | case DT_WHT: ent->type = EIO_DT_WHT; break; |
1261 | #endif |
1346 | #endif |
1262 | } |
1347 | } |
1263 | |
1348 | |
1264 | ent->score = 0; |
1349 | ent->score = 7; |
1265 | |
1350 | |
1266 | if (flags & EIO_READDIR_DIRS_FIRST) |
1351 | if (flags & EIO_READDIR_DIRS_FIRST) |
1267 | { |
1352 | { |
1268 | if (ent->type == EIO_DT_UNKNOWN) |
1353 | if (ent->type == EIO_DT_UNKNOWN) |
1269 | { |
1354 | { |
1270 | if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ |
1355 | if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ |
1271 | ent->score = 98; |
1356 | ent->score = 1; |
1272 | else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ |
1357 | else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ |
1273 | ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */ |
1358 | ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */ |
1274 | } |
1359 | } |
1275 | else if (ent->type == EIO_DT_DIR) |
1360 | else if (ent->type == EIO_DT_DIR) |
1276 | ent->score = 100; |
1361 | ent->score = 0; |
1277 | } |
1362 | } |
1278 | } |
1363 | } |
1279 | |
1364 | |
1280 | namesoffs += len; |
1365 | namesoffs += len; |
1281 | ++dentoffs; |
1366 | ++dentoffs; |
… | |
… | |
1306 | |
1391 | |
1307 | if (!page) |
1392 | if (!page) |
1308 | page = sysconf (_SC_PAGESIZE); |
1393 | page = sysconf (_SC_PAGESIZE); |
1309 | #endif |
1394 | #endif |
1310 | |
1395 | |
|
|
1396 | /* round down to start of page, although this is probably useless */ |
1311 | addr &= ~(page - 1); /* assume page size is always a power of two */ |
1397 | addr &= ~(page - 1); /* assume page size is always a power of two */ |
1312 | |
1398 | |
1313 | if (addr < end) |
1399 | if (addr < end) |
1314 | if (flags) /* modify */ |
1400 | if (flags) /* modify */ |
1315 | do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); |
1401 | do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); |