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

Comparing libeio/eio.c (file contents):
Revision 1.27 by root, Wed Oct 22 18:15:36 2008 UTC vs.
Revision 1.45 by root, Sat Jan 2 12:50:22 2010 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 *
… …
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#include "eio.h" 40#include "eio.h"
41
42#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE
44#endif
41#include "xthread.h" 45#include "xthread.h"
42 46
43#include <errno.h> 47#include <errno.h>
44#include <stddef.h> 48#include <stddef.h>
45#include <stdlib.h> 49#include <stdlib.h>
… …
64#endif 68#endif
65 69
66#ifdef _WIN32 70#ifdef _WIN32
67 71
68 /*doh*/ 72 /*doh*/
69
70#else 73#else
71 74
72# include "config.h" 75# include "config.h"
73# include <sys/time.h> 76# include <sys/time.h>
74# include <sys/select.h> 77# include <sys/select.h>
78# include <sys/mman.h>
75# include <unistd.h> 79# include <unistd.h>
76# include <utime.h> 80# include <utime.h>
77# include <signal.h> 81# include <signal.h>
78# include <dirent.h> 82# include <dirent.h>
79 83
84/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
85# if __freebsd || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno
88# define D_NAMLEN(de) (de)->d_namlen
89# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
90# define D_INO(de) (de)->d_ino
91# endif
92
93#ifdef _D_EXACT_NAMLEN
94# undef D_NAMLEN
95# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
96#endif
97
98# ifdef _DIRENT_HAVE_D_TYPE
99# define D_TYPE(de) (de)->d_type
100# endif
101
80# ifndef EIO_STRUCT_DIRENT 102# ifndef EIO_STRUCT_DIRENT
81# define EIO_STRUCT_DIRENT struct dirent 103# define EIO_STRUCT_DIRENT struct dirent
82# endif 104# endif
83 105
84#endif 106#endif
85 107
86#if HAVE_SENDFILE 108#if HAVE_SENDFILE
87# if __linux 109# if __linux
88# include <sys/sendfile.h> 110# include <sys/sendfile.h>
89# elif __freebsd 111# elif __freebsd || defined __APPLE__
90# include <sys/socket.h> 112# include <sys/socket.h>
91# include <sys/uio.h> 113# include <sys/uio.h>
92# elif __hpux 114# elif __hpux
93# include <sys/socket.h> 115# include <sys/socket.h>
94# elif __solaris /* not yet */ 116# elif __solaris
95# include <sys/sendfile.h> 117# include <sys/sendfile.h>
118# elif defined _WIN32
96# else 119# else
97# error sendfile support requested but not available 120# error sendfile support requested but not available
98# endif 121# endif
122#endif
123
124#ifndef D_TYPE
125# define D_TYPE(de) 0
126#endif
127#ifndef D_INO
128# define D_INO(de) 0
129#endif
130#ifndef D_NAMLEN
131# define D_NAMLEN(de) strlen ((de)->d_name)
99#endif 132#endif
100 133
101/* number of seconds after which an idle threads exit */ 134/* number of seconds after which an idle threads exit */
102#define IDLE_TIMEOUT 10 135#define IDLE_TIMEOUT 10
103 136
… …
155 if (wrk->dirp) \ 188 if (wrk->dirp) \
156 { \ 189 { \
157 closedir (wrk->dirp); \ 190 closedir (wrk->dirp); \
158 wrk->dirp = 0; \ 191 wrk->dirp = 0; \
159 } 192 }
193
160#define ETP_WORKER_COMMON \ 194#define ETP_WORKER_COMMON \
161 void *dbuf; \ 195 void *dbuf; \
162 DIR *dirp; 196 DIR *dirp;
163 197
164/*****************************************************************************/ 198/*****************************************************************************/
165 199
166#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 200#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
167 201
168/* calculcate time difference in ~1/EIO_TICKS of a second */ 202/* calculate time difference in ~1/EIO_TICKS of a second */
169static int tvdiff (struct timeval *tv1, struct timeval *tv2) 203static int tvdiff (struct timeval *tv1, struct timeval *tv2)
170{ 204{
171 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 205 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
172 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 206 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
173} 207}
… …
565} 599}
566 600
567static void etp_set_max_poll_time (double nseconds) 601static void etp_set_max_poll_time (double nseconds)
568{ 602{
569 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 603 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
570 max_poll_time = nseconds; 604 max_poll_time = nseconds * EIO_TICKS;
571 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 605 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
572} 606}
573 607
574static void etp_set_max_poll_reqs (unsigned int maxreqs) 608static void etp_set_max_poll_reqs (unsigned int maxreqs)
575{ 609{
… …
767 801
768 X_LOCK (preadwritelock); 802 X_LOCK (preadwritelock);
769 ooffset = lseek (fd, 0, SEEK_CUR); 803 ooffset = lseek (fd, 0, SEEK_CUR);
770 lseek (fd, offset, SEEK_SET); 804 lseek (fd, offset, SEEK_SET);
771 res = write (fd, buf, count); 805 res = write (fd, buf, count);
772 lseek (fd, offset, SEEK_SET); 806 lseek (fd, ooffset, SEEK_SET);
773 X_UNLOCK (preadwritelock); 807 X_UNLOCK (preadwritelock);
774 808
775 return res; 809 return res;
776} 810}
777#endif 811#endif
… …
829 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0); 863 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
830 } 864 }
831 865
832 res = sync_file_range (fd, offset, nbytes, flags); 866 res = sync_file_range (fd, offset, nbytes, flags);
833 867
834 if (res != ENOSYS) 868 if (!res || errno != ENOSYS)
835 return res; 869 return res;
836#endif 870#endif
837 871
838 /* 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
839 * call fdatasync, as thta matches the expectation of it's users best */ 873 * call fdatasync, as that matches the expectation of its users best */
840 return fdatasync (fd); 874 return fdatasync (fd);
841} 875}
842 876
843#if !HAVE_READAHEAD 877#if !HAVE_READAHEAD
844# undef readahead 878# undef readahead
… …
890 if (res < 0 && sbytes) 924 if (res < 0 && sbytes)
891 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 925 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
892 res = sbytes; 926 res = sbytes;
893 } 927 }
894 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
895# elif __hpux 939# elif __hpux
896 res = sendfile (ofd, ifd, offset, count, 0, 0); 940 res = sendfile (ofd, ifd, offset, count, 0, 0);
897 941
898# elif __solaris 942# elif __solaris
899 { 943 {
… …
910 if (res < 0 && sbytes) 954 if (res < 0 && sbytes)
911 res = sbytes; 955 res = sbytes;
912 } 956 }
913 957
914# 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
915#else 968#else
916 res = -1; 969 res = -1;
917 errno = ENOSYS; 970 errno = ENOSYS;
918#endif 971#endif
919 972
… …
957 } 1010 }
958 1011
959 return res; 1012 return res;
960} 1013}
961 1014
1015static signed char
1016eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1017{
1018 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1019 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
1020}
1021
1022#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1023
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 */
1026
1027static void
1028eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
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;
1047 int i, j;
1048
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
1128static void
1129eio_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) */
1142 {
1143 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1144 }
1145 }
1146
1147 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1148 {
1149 eio_dirent *i, *j;
1150
1151 for (i = dents + 1; i < dents + size; ++i)
1152 {
1153 eio_dirent value = *i;
1154
1155 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1156 j [1] = j [0];
1157
1158 j [1] = value;
1159 }
1160 }
1161}
1162
1163static void
1164eio_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);
1176}
1177
962/* read a full directory */ 1178/* read a full directory */
963static void 1179static void
964eio__scandir (eio_req *req, etp_worker *self) 1180eio__scandir (eio_req *req, etp_worker *self)
965{ 1181{
966 DIR *dirp; 1182 DIR *dirp;
967 EIO_STRUCT_DIRENT *entp; 1183 EIO_STRUCT_DIRENT *entp;
968 char *name, *names; 1184 char *name, *names;
969 int memlen = 4096; 1185 int namesalloc = 4096;
970 int memofs = 0; 1186 int namesoffs = 0;
1187 int flags = req->int1;
1188 eio_dirent *dents = 0;
1189 int dentalloc = 128;
971 int res = 0; 1190 int dentoffs = 0;
1191 ino_t inode_bits = 0;
1192
1193 req->result = -1;
1194
1195 if (!(flags & EIO_READDIR_DENTS))
1196 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
972 1197
973 X_LOCK (wrklock); 1198 X_LOCK (wrklock);
974 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1199 /* the corresponding closedir is in ETP_WORKER_CLEAR */
975 self->dirp = dirp = opendir (req->ptr1); 1200 self->dirp = dirp = opendir (req->ptr1);
976 req->flags |= EIO_FLAG_PTR2_FREE; 1201 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1202 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
977 req->ptr2 = names = malloc (memlen); 1203 req->ptr2 = names = malloc (namesalloc);
978 X_UNLOCK (wrklock); 1204 X_UNLOCK (wrklock);
979 1205
980 if (dirp && names) 1206 if (dirp && names && (!flags || dents))
981 for (;;) 1207 for (;;)
982 { 1208 {
983 errno = 0; 1209 errno = 0;
984 entp = readdir (dirp); 1210 entp = readdir (dirp);
985 1211
986 if (!entp) 1212 if (!entp)
1213 {
1214 if (errno)
1215 break;
1216
1217 /* sort etc. */
1218 req->int1 = flags;
1219 req->result = dentoffs;
1220
1221 if (flags & EIO_READDIR_STAT_ORDER)
1222 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
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
1227 {
1228 /* in this case, all is known, and we just put dirs first and sort them */
1229 eio_dirent *oth = dents + dentoffs;
1230 eio_dirent *dir = dents;
1231
1232 /* now partition dirs to the front, and non-dirs to the back */
1233 /* by walking from both sides and swapping if necessary */
1234 /* also clear score, so it doesn't influence sorting */
1235 while (oth > dir)
1236 {
1237 if (dir->type == EIO_DT_DIR)
1238 ++dir;
1239 else if ((--oth)->type == EIO_DT_DIR)
1240 {
1241 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1242
1243 ++dir;
1244 }
1245 }
1246
1247 /* now sort the dirs only */
1248 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1249 }
1250
987 break; 1251 break;
1252 }
988 1253
1254 /* now add the entry to our list(s) */
989 name = entp->d_name; 1255 name = entp->d_name;
990 1256
1257 /* skip . and .. entries */
991 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1258 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
992 { 1259 {
993 int len = strlen (name) + 1; 1260 int len = D_NAMLEN (entp) + 1;
994 1261
995 res++; 1262 while (expect_false (namesoffs + len > namesalloc))
996
997 while (memofs + len > memlen)
998 { 1263 {
999 memlen *= 2; 1264 namesalloc *= 2;
1000 X_LOCK (wrklock); 1265 X_LOCK (wrklock);
1001 req->ptr2 = names = realloc (names, memlen); 1266 req->ptr2 = names = realloc (names, namesalloc);
1002 X_UNLOCK (wrklock); 1267 X_UNLOCK (wrklock);
1003 1268
1004 if (!names) 1269 if (!names)
1005 break; 1270 break;
1006 } 1271 }
1007 1272
1008 memcpy (names + memofs, name, len); 1273 memcpy (names + namesoffs, name, len);
1274
1275 if (dents)
1276 {
1277 struct eio_dirent *ent;
1278
1279 if (expect_false (dentoffs == dentalloc))
1280 {
1281 dentalloc *= 2;
1282 X_LOCK (wrklock);
1283 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1284 X_UNLOCK (wrklock);
1285
1286 if (!dents)
1287 break;
1288 }
1289
1290 ent = dents + dentoffs;
1291
1292 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1293 ent->namelen = len - 1;
1294 ent->inode = D_INO (entp);
1295
1296 inode_bits |= ent->inode;
1297
1298 switch (D_TYPE (entp))
1299 {
1300 default:
1301 ent->type = EIO_DT_UNKNOWN;
1302 flags |= EIO_READDIR_FOUND_UNKNOWN;
1303 break;
1304
1305 #ifdef DT_FIFO
1306 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1307 #endif
1308 #ifdef DT_CHR
1309 case DT_CHR: ent->type = EIO_DT_CHR; break;
1310 #endif
1311 #ifdef DT_MPC
1312 case DT_MPC: ent->type = EIO_DT_MPC; break;
1313 #endif
1314 #ifdef DT_DIR
1315 case DT_DIR: ent->type = EIO_DT_DIR; break;
1316 #endif
1317 #ifdef DT_NAM
1318 case DT_NAM: ent->type = EIO_DT_NAM; break;
1319 #endif
1320 #ifdef DT_BLK
1321 case DT_BLK: ent->type = EIO_DT_BLK; break;
1322 #endif
1323 #ifdef DT_MPB
1324 case DT_MPB: ent->type = EIO_DT_MPB; break;
1325 #endif
1326 #ifdef DT_REG
1327 case DT_REG: ent->type = EIO_DT_REG; break;
1328 #endif
1329 #ifdef DT_NWK
1330 case DT_NWK: ent->type = EIO_DT_NWK; break;
1331 #endif
1332 #ifdef DT_CMP
1333 case DT_CMP: ent->type = EIO_DT_CMP; break;
1334 #endif
1335 #ifdef DT_LNK
1336 case DT_LNK: ent->type = EIO_DT_LNK; break;
1337 #endif
1338 #ifdef DT_SOCK
1339 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1340 #endif
1341 #ifdef DT_DOOR
1342 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1343 #endif
1344 #ifdef DT_WHT
1345 case DT_WHT: ent->type = EIO_DT_WHT; break;
1346 #endif
1347 }
1348
1349 ent->score = 7;
1350
1351 if (flags & EIO_READDIR_DIRS_FIRST)
1352 {
1353 if (ent->type == EIO_DT_UNKNOWN)
1354 {
1355 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1356 ent->score = 1;
1357 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1358 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1359 }
1360 else if (ent->type == EIO_DT_DIR)
1361 ent->score = 0;
1362 }
1363 }
1364
1009 memofs += len; 1365 namesoffs += len;
1366 ++dentoffs;
1367 }
1368
1369 if (EIO_CANCELLED (req))
1370 {
1371 errno = ECANCELED;
1372 break;
1010 } 1373 }
1011 } 1374 }
1012
1013 if (errno)
1014 res = -1;
1015
1016 req->result = res;
1017} 1375}
1018 1376
1019#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1377#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1020# undef msync 1378# undef msync
1021# define msync(a,b,c) ENOSYS 1379# define msync(a,b,c) ((errno = ENOSYS), -1)
1022#endif 1380#endif
1023 1381
1024int 1382int
1025eio__mtouch (void *mem, size_t len, int flags) 1383eio__mtouch (void *mem, size_t len, int flags)
1026{ 1384{
… …
1033 1391
1034 if (!page) 1392 if (!page)
1035 page = sysconf (_SC_PAGESIZE); 1393 page = sysconf (_SC_PAGESIZE);
1036#endif 1394#endif
1037 1395
1396 /* round down to start of page, although this is probably useless */
1038 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 */
1039 1398
1040 if (addr < end) 1399 if (addr < end)
1041 if (flags) /* modify */ 1400 if (flags) /* modify */
1042 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1401 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
… …
1441eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 1800eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1442{ 1801{
1443 return eio__1path (EIO_RMDIR, path, pri, cb, data); 1802 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1444} 1803}
1445 1804
1446eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 1805eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1447{ 1806{
1448 return eio__1path (EIO_READDIR, path, pri, cb, data); 1807 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1449} 1808}
1450 1809
1451eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1810eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1452{ 1811{
1453 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1812 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
… …
1542/* misc garbage */ 1901/* misc garbage */
1543 1902
1544ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1903ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1545{ 1904{
1546 etp_worker wrk; 1905 etp_worker wrk;
1906 ssize_t ret;
1547 1907
1548 wrk.dbuf = 0; 1908 wrk.dbuf = 0;
1549 1909
1550 eio__sendfile (ofd, ifd, offset, count, &wrk); 1910 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1551 1911
1552 if (wrk.dbuf) 1912 if (wrk.dbuf)
1553 free (wrk.dbuf); 1913 free (wrk.dbuf);
1554}
1555 1914
1915 return ret;
1916}
1917

Diff Legend

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