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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.34 by root, Sat Jun 6 19:57:22 2009 UTC vs.
Revision 1.50 by root, Thu Jan 7 17:18:08 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 *
… …
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__
85# define _DIRENT_HAVE_D_TYPE /* sigh */ 86# define _DIRENT_HAVE_D_TYPE /* sigh */
86# define D_INO(de) (de)->d_fileno 87# define D_INO(de) (de)->d_fileno
87# define D_NAMLEN(de) (de)->d_namlen 88# define D_NAMLEN(de) (de)->d_namlen
88# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600 89# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
89# define D_INO(de) (de)->d_ino 90# define D_INO(de) (de)->d_ino
90# endif 91# endif
91 92
92#ifdef _D_EXACT_NAMLEN 93#ifdef _D_EXACT_NAMLEN
93# undef D_NAMLEN 94# undef D_NAMLEN
… …
105#endif 106#endif
106 107
107#if HAVE_SENDFILE 108#if HAVE_SENDFILE
108# if __linux 109# if __linux
109# include <sys/sendfile.h> 110# include <sys/sendfile.h>
110# elif __freebsd 111# elif __FreeBSD__ || defined __APPLE__
111# include <sys/socket.h> 112# include <sys/socket.h>
112# include <sys/uio.h> 113# include <sys/uio.h>
113# elif __hpux 114# elif __hpux
114# include <sys/socket.h> 115# include <sys/socket.h>
115# elif __solaris /* not yet */ 116# elif __solaris
116# include <sys/sendfile.h> 117# include <sys/sendfile.h>
117# else 118# else
118# error sendfile support requested but not available 119# error sendfile support requested but not available
119# endif 120# endif
120#endif 121#endif
… …
195 196
196/*****************************************************************************/ 197/*****************************************************************************/
197 198
198#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 199#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
199 200
200/* calculcate time difference in ~1/EIO_TICKS of a second */ 201/* calculate time difference in ~1/EIO_TICKS of a second */
201static int tvdiff (struct timeval *tv1, struct timeval *tv2) 202static int tvdiff (struct timeval *tv1, struct timeval *tv2)
202{ 203{
203 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 204 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
204 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 205 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
205} 206}
… …
597} 598}
598 599
599static void etp_set_max_poll_time (double nseconds) 600static void etp_set_max_poll_time (double nseconds)
600{ 601{
601 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 602 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
602 max_poll_time = nseconds; 603 max_poll_time = nseconds * EIO_TICKS;
603 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 604 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
604} 605}
605 606
606static void etp_set_max_poll_reqs (unsigned int maxreqs) 607static void etp_set_max_poll_reqs (unsigned int maxreqs)
607{ 608{
… …
866 if (!res || errno != ENOSYS) 867 if (!res || errno != ENOSYS)
867 return res; 868 return res;
868#endif 869#endif
869 870
870 /* 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
871 * call fdatasync, as thta matches the expectation of it's users best */ 872 * call fdatasync, as that matches the expectation of its users best */
872 return fdatasync (fd); 873 return fdatasync (fd);
873} 874}
874 875
875#if !HAVE_READAHEAD 876#if !HAVE_READAHEAD
876# undef readahead 877# undef readahead
… …
908 909
909#if HAVE_SENDFILE 910#if HAVE_SENDFILE
910# if __linux 911# if __linux
911 res = sendfile (ofd, ifd, &offset, count); 912 res = sendfile (ofd, ifd, &offset, count);
912 913
913# elif __freebsd 914# elif __FreeBSD__
914 /* 915 /*
915 * Of course, the freebsd sendfile is a dire hack with no thoughts 916 * Of course, the freebsd sendfile is a dire hack with no thoughts
916 * wasted on making it similar to other I/O functions. 917 * wasted on making it similar to other I/O functions.
917 */ 918 */
918 { 919 {
919 off_t sbytes; 920 off_t sbytes;
920 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 921 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
921 922
923 /* freebsd' sendfile will return 0 when success */
922 if (res < 0 && sbytes) 924 if (res == 0 && sbytes)
923 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 925 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
926 res = sbytes;
927 }
928
929# elif defined (__APPLE__)
930
931 {
932 off_t sbytes = count;
933 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
934
935 if (res == 0 && errno == EAGAIN && sbytes)
924 res = sbytes; 936 res = sbytes;
925 } 937 }
926 938
927# elif __hpux 939# elif __hpux
928 res = sendfile (ofd, ifd, offset, count, 0, 0); 940 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
942 if (res < 0 && sbytes) 954 if (res < 0 && sbytes)
943 res = sbytes; 955 res = sbytes;
944 } 956 }
945 957
946# endif 958# endif
959
960#elif defined (_WIN32)
961
962 /* does not work, just for documentation of what would need to be done */
963 {
964 HANDLE h = TO_SOCKET (ifd);
965 SetFilePointer (h, offset, 0, FILE_BEGIN);
966 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
967 }
968
947#else 969#else
948 res = -1; 970 res = -1;
949 errno = ENOSYS; 971 errno = ENOSYS;
950#endif 972#endif
951 973
952 if (res < 0 974 if (res < 0
953 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 975 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
976 /* BSDs */
977#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
978 || errno == ENOTSUP
979#endif
980 || errno == EOPNOTSUPP /* BSDs */
954#if __solaris 981#if __solaris
955 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 982 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
956#endif 983#endif
957 ) 984 )
958 ) 985 )
… …
989 } 1016 }
990 1017
991 return res; 1018 return res;
992} 1019}
993 1020
994static int 1021static signed char
995eio_dent_cmp (const void *a_, const void *b_) 1022eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
996{ 1023{
997 const eio_dirent *a = (const eio_dirent *)a_; 1024 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
998 const eio_dirent *b = (const eio_dirent *)b_;
999
1000 return (int)b->score - (int)a->score ? (int)b->score - (int)a->score
1001 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */ 1025 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
1026}
1027
1028#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1029
1030#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1031#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1032
1033static void
1034eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1035{
1036 unsigned char bits [9 + sizeof (ino_t) * 8];
1037 unsigned char *bit = bits;
1038
1039 assert (CHAR_BIT == 8);
1040 assert (sizeof (eio_dirent) * 8 < 256);
1041 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
1042 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
1043
1044 if (size <= EIO_SORT_FAST)
1045 return;
1046
1047 /* first prepare an array of bits to test in our radix sort */
1048 /* try to take endianness into account, as well as differences in ino_t sizes */
1049 /* inode_bits must contain all inodes ORed together */
1050 /* which is used to skip bits that are 0 everywhere, which is very common */
1051 {
1052 ino_t endianness;
1053 int i, j;
1054
1055 /* we store the byte offset of byte n into byte n of "endianness" */
1056 for (i = 0; i < sizeof (ino_t); ++i)
1057 ((unsigned char *)&endianness)[i] = i;
1058
1059 *bit++ = 0;
1060
1061 for (i = 0; i < sizeof (ino_t); ++i)
1062 {
1063 /* shifting off the byte offsets out of "endianness" */
1064 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1065 endianness >>= 8;
1066
1067 for (j = 0; j < 8; ++j)
1068 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1069 *bit++ = offs + j;
1070 }
1071
1072 for (j = 0; j < 8; ++j)
1073 if (score_bits & (1 << j))
1074 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1075 }
1076
1077 /* now actually do the sorting (a variant of MSD radix sort) */
1078 {
1079 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1080 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1081 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1082 int stk_idx = 0;
1083
1084 base_stk [stk_idx] = dents;
1085 end_stk [stk_idx] = dents + size;
1086 bit_stk [stk_idx] = bit - 1;
1087
1088 do
1089 {
1090 base = base_stk [stk_idx];
1091 end = end_stk [stk_idx];
1092 bit = bit_stk [stk_idx];
1093
1094 for (;;)
1095 {
1096 unsigned char O = *bit >> 3;
1097 unsigned char M = 1 << (*bit & 7);
1098
1099 eio_dirent *a = base;
1100 eio_dirent *b = end;
1101
1102 if (b - a < EIO_SORT_CUTOFF)
1103 break;
1104
1105 /* now bit-partition the array on the bit */
1106 /* this ugly asymmetric loop seems to perform much better than typical */
1107 /* partition algos found in the literature */
1108 do
1109 if (!(((unsigned char *)a)[O] & M))
1110 ++a;
1111 else if (!(((unsigned char *)--b)[O] & M))
1112 {
1113 eio_dirent tmp = *a; *a = *b; *b = tmp;
1114 ++a;
1115 }
1116 while (b > a);
1117
1118 /* next bit, or stop, if no bits left in this path */
1119 if (!*--bit)
1120 break;
1121
1122 base_stk [stk_idx] = a;
1123 end_stk [stk_idx] = end;
1124 bit_stk [stk_idx] = bit;
1125 ++stk_idx;
1126
1127 end = a;
1128 }
1129 }
1130 while (stk_idx--);
1131 }
1132}
1133
1134static void
1135eio_dent_insertion_sort (eio_dirent *dents, int size)
1136{
1137 /* first move the smallest element to the front, to act as a sentinel */
1138 {
1139 int i;
1140 eio_dirent *min = dents;
1141
1142 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1143 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1144 if (EIO_DENT_CMP (dents [i], <, *min))
1145 min = &dents [i];
1146
1147 /* swap elements 0 and j (minimum) */
1148 {
1149 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1150 }
1151 }
1152
1153 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1154 {
1155 eio_dirent *i, *j;
1156
1157 for (i = dents + 1; i < dents + size; ++i)
1158 {
1159 eio_dirent value = *i;
1160
1161 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1162 j [1] = j [0];
1163
1164 j [1] = value;
1165 }
1166 }
1167}
1168
1169static void
1170eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1171{
1172 if (size <= 1)
1173 return; /* our insertion sort relies on size > 0 */
1174
1175 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1176 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1177 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1178
1179 /* use an insertion sort at the end, or for small arrays, */
1180 /* as insertion sort is more efficient for small partitions */
1181 eio_dent_insertion_sort (dents, size);
1002} 1182}
1003 1183
1004/* read a full directory */ 1184/* read a full directory */
1005static void 1185static void
1006eio__scandir (eio_req *req, etp_worker *self) 1186eio__scandir (eio_req *req, etp_worker *self)
1007{ 1187{
1008 DIR *dirp; 1188 DIR *dirp;
1009 EIO_STRUCT_DIRENT *entp; 1189 EIO_STRUCT_DIRENT *entp;
1010 unsigned char *name, *names; 1190 char *name, *names;
1011 int namesalloc = 4096; 1191 int namesalloc = 4096;
1012 int namesoffs = 0; 1192 int namesoffs = 0;
1013 int flags = req->int1; 1193 int flags = req->int1;
1014 eio_dirent *dents = 0; 1194 eio_dirent *dents = 0;
1015 int dentalloc = 128; 1195 int dentalloc = 128;
1016 int dentoffs = 0; 1196 int dentoffs = 0;
1197 ino_t inode_bits = 0;
1017 1198
1018 req->result = -1; 1199 req->result = -1;
1019 1200
1020 if (!(flags & EIO_READDIR_DENTS)) 1201 if (!(flags & EIO_READDIR_DENTS))
1021 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1202 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1022 1203
1023 X_LOCK (wrklock); 1204 X_LOCK (wrklock);
1024 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1205 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1025 self->dirp = dirp = opendir (req->ptr1); 1206 self->dirp = dirp = opendir (req->ptr1);
1026 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1207 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1027 req->ptr1 = names = malloc (namesalloc);
1028 req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1208 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1209 req->ptr2 = names = malloc (namesalloc);
1029 X_UNLOCK (wrklock); 1210 X_UNLOCK (wrklock);
1030 1211
1031 if (dirp && names && (!flags || dents)) 1212 if (dirp && names && (!flags || dents))
1032 for (;;) 1213 for (;;)
1033 { 1214 {
… …
1041 1222
1042 /* sort etc. */ 1223 /* sort etc. */
1043 req->int1 = flags; 1224 req->int1 = flags;
1044 req->result = dentoffs; 1225 req->result = dentoffs;
1045 1226
1046 if (dents)
1047 {
1048 eio_dirent *ent = dents + dentoffs;
1049
1050 while (ent > dents)
1051 (--ent)->name = names + (size_t)ent->name;
1052 }
1053
1054 if (flags & EIO_READDIR_STAT_ORDER 1227 if (flags & EIO_READDIR_STAT_ORDER)
1055 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1228 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
1056 {
1057 /* pray your qsort doesn't use quicksort */
1058 qsort (dents, dentoffs, sizeof (*dents), eio_dent_cmp); /* score depends of DIRS_FIRST */
1059 }
1060 else if (flags & EIO_READDIR_DIRS_FIRST) 1229 else if (flags & EIO_READDIR_DIRS_FIRST)
1230 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1231 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1232 else
1061 { 1233 {
1062 /* in this case, all is known, and we just put dirs first and sort them */ 1234 /* in this case, all is known, and we just put dirs first and sort them */
1063 eio_dirent *ent = dents + dentoffs; 1235 eio_dirent *oth = dents + dentoffs;
1064 eio_dirent *dir = dents; 1236 eio_dirent *dir = dents;
1065 1237
1238 /* now partition dirs to the front, and non-dirs to the back */
1239 /* by walking from both sides and swapping if necessary */
1240 /* also clear score, so it doesn't influence sorting */
1066 while (ent > dir) 1241 while (oth > dir)
1067 { 1242 {
1068 if (dir->type == DT_DIR) 1243 if (dir->type == EIO_DT_DIR)
1069 ++dir; 1244 ++dir;
1070 else
1071 {
1072 --ent;
1073
1074 if (ent->type == DT_DIR) 1245 else if ((--oth)->type == EIO_DT_DIR)
1075 { 1246 {
1076 eio_dirent tmp = *dir; 1247 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1077 *dir = *ent;
1078 *ent = tmp;
1079 1248
1080 ++dir; 1249 ++dir;
1081 } 1250 }
1082 } 1251 }
1083 }
1084 1252
1085 /* now sort the dirs only */ 1253 /* now sort the dirs only */
1086 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp); 1254 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1087 } 1255 }
1088
1089 /* only provide the names array unless DENTS is specified */
1090 if (!(flags & EIO_READDIR_DENTS))
1091 {
1092 X_LOCK (wrklock);
1093 assert (!dents);
1094 req->ptr1 = 0;
1095 req->ptr2 = names;
1096 X_UNLOCK (wrklock);
1097 }
1098 1256
1099 break; 1257 break;
1100 } 1258 }
1101 1259
1102 /* now add the entry to our list(s) */ 1260 /* now add the entry to our list(s) */
… …
1109 1267
1110 while (expect_false (namesoffs + len > namesalloc)) 1268 while (expect_false (namesoffs + len > namesalloc))
1111 { 1269 {
1112 namesalloc *= 2; 1270 namesalloc *= 2;
1113 X_LOCK (wrklock); 1271 X_LOCK (wrklock);
1114 req->ptr1 = names = realloc (names, namesalloc); 1272 req->ptr2 = names = realloc (names, namesalloc);
1115 X_UNLOCK (wrklock); 1273 X_UNLOCK (wrklock);
1116 1274
1117 if (!names) 1275 if (!names)
1118 break; 1276 break;
1119 } 1277 }
… …
1126 1284
1127 if (expect_false (dentoffs == dentalloc)) 1285 if (expect_false (dentoffs == dentalloc))
1128 { 1286 {
1129 dentalloc *= 2; 1287 dentalloc *= 2;
1130 X_LOCK (wrklock); 1288 X_LOCK (wrklock);
1131 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1289 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1132 X_UNLOCK (wrklock); 1290 X_UNLOCK (wrklock);
1133 1291
1134 if (!dents) 1292 if (!dents)
1135 break; 1293 break;
1136 } 1294 }
1137 1295
1138 ent = dents + dentoffs; 1296 ent = dents + dentoffs;
1139 1297
1140 ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */ 1298 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1141 ent->namelen = len - 1; 1299 ent->namelen = len - 1;
1142 ent->inode = D_INO (entp); 1300 ent->inode = D_INO (entp);
1301
1302 inode_bits |= ent->inode;
1143 1303
1144 switch (D_TYPE (entp)) 1304 switch (D_TYPE (entp))
1145 { 1305 {
1146 default: 1306 default:
1147 ent->type = EIO_DT_UNKNOWN; 1307 ent->type = EIO_DT_UNKNOWN;
… …
1190 #ifdef DT_WHT 1350 #ifdef DT_WHT
1191 case DT_WHT: ent->type = EIO_DT_WHT; break; 1351 case DT_WHT: ent->type = EIO_DT_WHT; break;
1192 #endif 1352 #endif
1193 } 1353 }
1194 1354
1195 ent->score = 0; 1355 ent->score = 7;
1196 1356
1197 if (flags & EIO_READDIR_DIRS_FIRST) 1357 if (flags & EIO_READDIR_DIRS_FIRST)
1198 { 1358 {
1199 if (ent->type == EIO_DT_UNKNOWN) 1359 if (ent->type == EIO_DT_UNKNOWN)
1200 { 1360 {
1201 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1361 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1202 ent->score = 98; 1362 ent->score = 1;
1203 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1363 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1204 ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */ 1364 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1205 } 1365 }
1206 else if (ent->type == EIO_DT_DIR) 1366 else if (ent->type == EIO_DT_DIR)
1207 ent->score = 100; 1367 ent->score = 0;
1208 } 1368 }
1209 } 1369 }
1210 1370
1211 namesoffs += len; 1371 namesoffs += len;
1212 ++dentoffs; 1372 ++dentoffs;
1213 } 1373 }
1374
1375 if (EIO_CANCELLED (req))
1376 {
1377 errno = ECANCELED;
1378 break;
1379 }
1214 } 1380 }
1215 else
1216 req->result = -1;
1217} 1381}
1218 1382
1219#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1383#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1220# undef msync
1221# define msync(a,b,c) ((errno = ENOSYS), -1) 1384# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1385#else
1386
1387int
1388eio__msync (void *mem, size_t len, int flags)
1389{
1390 if (EIO_MS_ASYNC != MS_SYNC
1391 || EIO_MS_INVALIDATE != MS_INVALIDATE
1392 || EIO_MS_SYNC != MS_SYNC)
1393 {
1394 flags = 0
1395 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1396 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1397 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1398 }
1399
1400 return msync (mem, len, flags);
1401}
1402
1222#endif 1403#endif
1223 1404
1224int 1405int
1225eio__mtouch (void *mem, size_t len, int flags) 1406eio__mtouch (void *mem, size_t len, int flags)
1226{ 1407{
… …
1233 1414
1234 if (!page) 1415 if (!page)
1235 page = sysconf (_SC_PAGESIZE); 1416 page = sysconf (_SC_PAGESIZE);
1236#endif 1417#endif
1237 1418
1419 /* round down to start of page, although this is probably useless */
1238 addr &= ~(page - 1); /* assume page size is always a power of two */ 1420 addr &= ~(page - 1); /* assume page size is always a power of two */
1239 1421
1240 if (addr < end) 1422 if (addr < end)
1241 if (flags) /* modify */ 1423 if (flags & EIO_MT_MODIFY) /* modify */
1242 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1424 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1243 else 1425 else
1244 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1426 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1245 1427
1246 return 0; 1428 return 0;
… …
1418 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1600 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1419 1601
1420 case EIO_SYNC: req->result = 0; sync (); break; 1602 case EIO_SYNC: req->result = 0; sync (); break;
1421 case EIO_FSYNC: req->result = fsync (req->int1); break; 1603 case EIO_FSYNC: req->result = fsync (req->int1); break;
1422 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1604 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1423 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1605 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1424 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1606 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1425 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1607 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1426 1608
1427 case EIO_READDIR: eio__scandir (req, self); break; 1609 case EIO_READDIR: eio__scandir (req, self); break;
1428 1610
… …
1742/* misc garbage */ 1924/* misc garbage */
1743 1925
1744ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1926ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1745{ 1927{
1746 etp_worker wrk; 1928 etp_worker wrk;
1929 ssize_t ret;
1747 1930
1748 wrk.dbuf = 0; 1931 wrk.dbuf = 0;
1749 1932
1750 eio__sendfile (ofd, ifd, offset, count, &wrk); 1933 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1751 1934
1752 if (wrk.dbuf) 1935 if (wrk.dbuf)
1753 free (wrk.dbuf); 1936 free (wrk.dbuf);
1754}
1755 1937
1938 return ret;
1939}
1940

Diff Legend

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