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

Comparing libeio/eio.c (file contents):
Revision 1.34 by root, Sat Jun 6 19:57:22 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 *
… …
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
… …
922 if (res < 0 && sbytes) 923 if (res < 0 && sbytes)
923 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
924 res = sbytes; 925 res = sbytes;
925 } 926 }
926 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
927# elif __hpux 938# elif __hpux
928 res = sendfile (ofd, ifd, offset, count, 0, 0); 939 res = sendfile (ofd, ifd, offset, count, 0, 0);
929 940
930# elif __solaris 941# elif __solaris
931 { 942 {
… …
942 if (res < 0 && sbytes) 953 if (res < 0 && sbytes)
943 res = sbytes; 954 res = sbytes;
944 } 955 }
945 956
946# 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
947#else 968#else
948 res = -1; 969 res = -1;
949 errno = ENOSYS; 970 errno = ENOSYS;
950#endif 971#endif
951 972
952 if (res < 0 973 if (res < 0
953 && (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 */
954#if __solaris 980#if __solaris
955 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 981 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
956#endif 982#endif
957 ) 983 )
958 ) 984 )
… …
989 } 1015 }
990 1016
991 return res; 1017 return res;
992} 1018}
993 1019
994static int 1020static signed char
995eio_dent_cmp (const void *a_, const void *b_) 1021eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
996{ 1022{
997 const eio_dirent *a = (const eio_dirent *)a_; 1023 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 */ 1024 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
1025}
1026
1027#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1028
1029#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1030#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1031
1032static void
1033eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1034{
1035 unsigned char bits [9 + sizeof (ino_t) * 8];
1036 unsigned char *bit = bits;
1037
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 */
1050 {
1051 ino_t endianness;
1052 int i, j;
1053
1054 /* we store the byte offset of byte n into byte n of "endianness" */
1055 for (i = 0; i < sizeof (ino_t); ++i)
1056 ((unsigned char *)&endianness)[i] = i;
1057
1058 *bit++ = 0;
1059
1060 for (i = 0; i < sizeof (ino_t); ++i)
1061 {
1062 /* shifting off the byte offsets out of "endianness" */
1063 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1064 endianness >>= 8;
1065
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 (;;)
1094 {
1095 unsigned char O = *bit >> 3;
1096 unsigned char M = 1 << (*bit & 7);
1097
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))
1111 {
1112 eio_dirent tmp = *a; *a = *b; *b = tmp;
1113 ++a;
1114 }
1115 while (b > a);
1116
1117 /* next bit, or stop, if no bits left in this path */
1118 if (!*--bit)
1119 break;
1120
1121 base_stk [stk_idx] = a;
1122 end_stk [stk_idx] = end;
1123 bit_stk [stk_idx] = bit;
1124 ++stk_idx;
1125
1126 end = a;
1127 }
1128 }
1129 while (stk_idx--);
1130 }
1131}
1132
1133static void
1134eio_dent_insertion_sort (eio_dirent *dents, int size)
1135{
1136 /* first move the smallest element to the front, to act as a sentinel */
1137 {
1138 int i;
1139 eio_dirent *min = dents;
1140
1141 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1142 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1143 if (EIO_DENT_CMP (dents [i], <, *min))
1144 min = &dents [i];
1145
1146 /* swap elements 0 and j (minimum) */
1147 {
1148 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1149 }
1150 }
1151
1152 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1153 {
1154 eio_dirent *i, *j;
1155
1156 for (i = dents + 1; i < dents + size; ++i)
1157 {
1158 eio_dirent value = *i;
1159
1160 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1161 j [1] = j [0];
1162
1163 j [1] = value;
1164 }
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);
1002} 1181}
1003 1182
1004/* read a full directory */ 1183/* read a full directory */
1005static void 1184static void
1006eio__scandir (eio_req *req, etp_worker *self) 1185eio__scandir (eio_req *req, etp_worker *self)
1007{ 1186{
1008 DIR *dirp; 1187 DIR *dirp;
1009 EIO_STRUCT_DIRENT *entp; 1188 EIO_STRUCT_DIRENT *entp;
1010 unsigned char *name, *names; 1189 char *name, *names;
1011 int namesalloc = 4096; 1190 int namesalloc = 4096;
1012 int namesoffs = 0; 1191 int namesoffs = 0;
1013 int flags = req->int1; 1192 int flags = req->int1;
1014 eio_dirent *dents = 0; 1193 eio_dirent *dents = 0;
1015 int dentalloc = 128; 1194 int dentalloc = 128;
1016 int dentoffs = 0; 1195 int dentoffs = 0;
1196 ino_t inode_bits = 0;
1017 1197
1018 req->result = -1; 1198 req->result = -1;
1019 1199
1020 if (!(flags & EIO_READDIR_DENTS)) 1200 if (!(flags & EIO_READDIR_DENTS))
1021 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1201 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1022 1202
1023 X_LOCK (wrklock); 1203 X_LOCK (wrklock);
1024 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1204 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1025 self->dirp = dirp = opendir (req->ptr1); 1205 self->dirp = dirp = opendir (req->ptr1);
1026 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1206 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; 1207 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1208 req->ptr2 = names = malloc (namesalloc);
1029 X_UNLOCK (wrklock); 1209 X_UNLOCK (wrklock);
1030 1210
1031 if (dirp && names && (!flags || dents)) 1211 if (dirp && names && (!flags || dents))
1032 for (;;) 1212 for (;;)
1033 { 1213 {
… …
1041 1221
1042 /* sort etc. */ 1222 /* sort etc. */
1043 req->int1 = flags; 1223 req->int1 = flags;
1044 req->result = dentoffs; 1224 req->result = dentoffs;
1045 1225
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 1226 if (flags & EIO_READDIR_STAT_ORDER)
1055 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1227 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) 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
1061 { 1232 {
1062 /* 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 */
1063 eio_dirent *ent = dents + dentoffs; 1234 eio_dirent *oth = dents + dentoffs;
1064 eio_dirent *dir = dents; 1235 eio_dirent *dir = dents;
1065 1236
1237 /* now partition dirs to the front, and non-dirs to the back */
1238 /* by walking from both sides and swapping if necessary */
1239 /* also clear score, so it doesn't influence sorting */
1066 while (ent > dir) 1240 while (oth > dir)
1067 { 1241 {
1068 if (dir->type == DT_DIR) 1242 if (dir->type == EIO_DT_DIR)
1069 ++dir; 1243 ++dir;
1070 else
1071 {
1072 --ent;
1073
1074 if (ent->type == DT_DIR) 1244 else if ((--oth)->type == EIO_DT_DIR)
1075 { 1245 {
1076 eio_dirent tmp = *dir; 1246 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1077 *dir = *ent;
1078 *ent = tmp;
1079 1247
1080 ++dir; 1248 ++dir;
1081 } 1249 }
1082 } 1250 }
1083 }
1084 1251
1085 /* now sort the dirs only */ 1252 /* now sort the dirs only */
1086 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp); 1253 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1087 } 1254 }
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 1255
1099 break; 1256 break;
1100 } 1257 }
1101 1258
1102 /* now add the entry to our list(s) */ 1259 /* now add the entry to our list(s) */
… …
1109 1266
1110 while (expect_false (namesoffs + len > namesalloc)) 1267 while (expect_false (namesoffs + len > namesalloc))
1111 { 1268 {
1112 namesalloc *= 2; 1269 namesalloc *= 2;
1113 X_LOCK (wrklock); 1270 X_LOCK (wrklock);
1114 req->ptr1 = names = realloc (names, namesalloc); 1271 req->ptr2 = names = realloc (names, namesalloc);
1115 X_UNLOCK (wrklock); 1272 X_UNLOCK (wrklock);
1116 1273
1117 if (!names) 1274 if (!names)
1118 break; 1275 break;
1119 } 1276 }
… …
1126 1283
1127 if (expect_false (dentoffs == dentalloc)) 1284 if (expect_false (dentoffs == dentalloc))
1128 { 1285 {
1129 dentalloc *= 2; 1286 dentalloc *= 2;
1130 X_LOCK (wrklock); 1287 X_LOCK (wrklock);
1131 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1288 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1132 X_UNLOCK (wrklock); 1289 X_UNLOCK (wrklock);
1133 1290
1134 if (!dents) 1291 if (!dents)
1135 break; 1292 break;
1136 } 1293 }
1137 1294
1138 ent = dents + dentoffs; 1295 ent = dents + dentoffs;
1139 1296
1140 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 */
1141 ent->namelen = len - 1; 1298 ent->namelen = len - 1;
1142 ent->inode = D_INO (entp); 1299 ent->inode = D_INO (entp);
1300
1301 inode_bits |= ent->inode;
1143 1302
1144 switch (D_TYPE (entp)) 1303 switch (D_TYPE (entp))
1145 { 1304 {
1146 default: 1305 default:
1147 ent->type = EIO_DT_UNKNOWN; 1306 ent->type = EIO_DT_UNKNOWN;
… …
1190 #ifdef DT_WHT 1349 #ifdef DT_WHT
1191 case DT_WHT: ent->type = EIO_DT_WHT; break; 1350 case DT_WHT: ent->type = EIO_DT_WHT; break;
1192 #endif 1351 #endif
1193 } 1352 }
1194 1353
1195 ent->score = 0; 1354 ent->score = 7;
1196 1355
1197 if (flags & EIO_READDIR_DIRS_FIRST) 1356 if (flags & EIO_READDIR_DIRS_FIRST)
1198 { 1357 {
1199 if (ent->type == EIO_DT_UNKNOWN) 1358 if (ent->type == EIO_DT_UNKNOWN)
1200 { 1359 {
1201 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 */
1202 ent->score = 98; 1361 ent->score = 1;
1203 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1362 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 */ 1363 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1205 } 1364 }
1206 else if (ent->type == EIO_DT_DIR) 1365 else if (ent->type == EIO_DT_DIR)
1207 ent->score = 100; 1366 ent->score = 0;
1208 } 1367 }
1209 } 1368 }
1210 1369
1211 namesoffs += len; 1370 namesoffs += len;
1212 ++dentoffs; 1371 ++dentoffs;
1213 } 1372 }
1373
1374 if (EIO_CANCELLED (req))
1375 {
1376 errno = ECANCELED;
1377 break;
1378 }
1214 } 1379 }
1215 else
1216 req->result = -1;
1217} 1380}
1218 1381
1219#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1382#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1220# undef msync
1221# 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
1222#endif 1402#endif
1223 1403
1224int 1404int
1225eio__mtouch (void *mem, size_t len, int flags) 1405eio__mtouch (void *mem, size_t len, int flags)
1226{ 1406{
… …
1233 1413
1234 if (!page) 1414 if (!page)
1235 page = sysconf (_SC_PAGESIZE); 1415 page = sysconf (_SC_PAGESIZE);
1236#endif 1416#endif
1237 1417
1418 /* round down to start of page, although this is probably useless */
1238 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 */
1239 1420
1240 if (addr < end) 1421 if (addr < end)
1241 if (flags) /* modify */ 1422 if (flags & EIO_MT_MODIFY) /* modify */
1242 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1423 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1243 else 1424 else
1244 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1425 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1245 1426
1246 return 0; 1427 return 0;
… …
1418 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1599 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1419 1600
1420 case EIO_SYNC: req->result = 0; sync (); break; 1601 case EIO_SYNC: req->result = 0; sync (); break;
1421 case EIO_FSYNC: req->result = fsync (req->int1); break; 1602 case EIO_FSYNC: req->result = fsync (req->int1); break;
1422 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1603 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1423 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;
1424 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;
1425 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;
1426 1607
1427 case EIO_READDIR: eio__scandir (req, self); break; 1608 case EIO_READDIR: eio__scandir (req, self); break;
1428 1609
… …
1742/* misc garbage */ 1923/* misc garbage */
1743 1924
1744ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1925ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1745{ 1926{
1746 etp_worker wrk; 1927 etp_worker wrk;
1928 ssize_t ret;
1747 1929
1748 wrk.dbuf = 0; 1930 wrk.dbuf = 0;
1749 1931
1750 eio__sendfile (ofd, ifd, offset, count, &wrk); 1932 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1751 1933
1752 if (wrk.dbuf) 1934 if (wrk.dbuf)
1753 free (wrk.dbuf); 1935 free (wrk.dbuf);
1754}
1755 1936
1937 return ret;
1938}
1939

Diff Legend

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