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

Comparing libeio/eio.c (file contents):
Revision 1.30 by root, Wed Jun 3 12:24:49 2009 UTC vs.
Revision 1.64 by root, Thu May 26 04:05:18 2011 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,2010,2011 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
… …
68#endif 69#endif
69 70
70#ifdef _WIN32 71#ifdef _WIN32
71 72
72 /*doh*/ 73 /*doh*/
73
74#else 74#else
75 75
76# include "config.h" 76# include "config.h"
77# include <sys/time.h> 77# include <sys/time.h>
78# include <sys/select.h> 78# include <sys/select.h>
79# include <unistd.h> 79# include <unistd.h>
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#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h>
86#endif
87
88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
90# define _DIRENT_HAVE_D_TYPE /* sigh */
91# define D_INO(de) (de)->d_fileno
92# define D_NAMLEN(de) (de)->d_namlen
93# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
94# define D_INO(de) (de)->d_ino
95# endif
96
97#ifdef _D_EXACT_NAMLEN
98# undef D_NAMLEN
99# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
100#endif
101
102# ifdef _DIRENT_HAVE_D_TYPE
103# define D_TYPE(de) (de)->d_type
104# endif
105
84# ifndef EIO_STRUCT_DIRENT 106# ifndef EIO_STRUCT_DIRENT
85# define EIO_STRUCT_DIRENT struct dirent 107# define EIO_STRUCT_DIRENT struct dirent
86# endif 108# endif
87 109
88#endif 110#endif
89 111
90#if HAVE_SENDFILE 112#if HAVE_SENDFILE
91# if __linux 113# if __linux
92# include <sys/sendfile.h> 114# include <sys/sendfile.h>
93# elif __freebsd 115# elif __FreeBSD__ || defined __APPLE__
94# include <sys/socket.h> 116# include <sys/socket.h>
95# include <sys/uio.h> 117# include <sys/uio.h>
96# elif __hpux 118# elif __hpux
97# include <sys/socket.h> 119# include <sys/socket.h>
98# elif __solaris /* not yet */ 120# elif __solaris
99# include <sys/sendfile.h> 121# include <sys/sendfile.h>
100# else 122# else
101# error sendfile support requested but not available 123# error sendfile support requested but not available
102# endif 124# endif
103#endif 125#endif
104 126
105/* number of seconds after which an idle threads exit */ 127#ifndef D_TYPE
106#define IDLE_TIMEOUT 10 128# define D_TYPE(de) 0
129#endif
130#ifndef D_INO
131# define D_INO(de) 0
132#endif
133#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif
107 136
108/* used for struct dirent, AIX doesn't provide it */ 137/* used for struct dirent, AIX doesn't provide it */
109#ifndef NAME_MAX 138#ifndef NAME_MAX
110# define NAME_MAX 4096 139# define NAME_MAX 4096
140#endif
141
142/* used for readlink etc. */
143#ifndef PATH_MAX
144# define PATH_MAX 4096
111#endif 145#endif
112 146
113/* buffer size for various temporary buffers */ 147/* buffer size for various temporary buffers */
114#define EIO_BUFSIZE 65536 148#define EIO_BUFSIZE 65536
115 149
… …
159 if (wrk->dirp) \ 193 if (wrk->dirp) \
160 { \ 194 { \
161 closedir (wrk->dirp); \ 195 closedir (wrk->dirp); \
162 wrk->dirp = 0; \ 196 wrk->dirp = 0; \
163 } 197 }
198
164#define ETP_WORKER_COMMON \ 199#define ETP_WORKER_COMMON \
165 void *dbuf; \ 200 void *dbuf; \
166 DIR *dirp; 201 DIR *dirp;
167 202
168/*****************************************************************************/ 203/*****************************************************************************/
169 204
170#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 205#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
171 206
172/* calculcate time difference in ~1/EIO_TICKS of a second */ 207/* calculate time difference in ~1/EIO_TICKS of a second */
173static int tvdiff (struct timeval *tv1, struct timeval *tv2) 208static int tvdiff (struct timeval *tv1, struct timeval *tv2)
174{ 209{
175 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 210 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
176 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 211 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
177} 212}
… …
185static unsigned int max_poll_reqs; /* reslock */ 220static unsigned int max_poll_reqs; /* reslock */
186 221
187static volatile unsigned int nreqs; /* reqlock */ 222static volatile unsigned int nreqs; /* reqlock */
188static volatile unsigned int nready; /* reqlock */ 223static volatile unsigned int nready; /* reqlock */
189static volatile unsigned int npending; /* reqlock */ 224static volatile unsigned int npending; /* reqlock */
190static volatile unsigned int max_idle = 4; 225static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
226static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
191 227
192static mutex_t wrklock = X_MUTEX_INIT; 228static xmutex_t wrklock;
193static mutex_t reslock = X_MUTEX_INIT; 229static xmutex_t reslock;
194static mutex_t reqlock = X_MUTEX_INIT; 230static xmutex_t reqlock;
195static cond_t reqwait = X_COND_INIT; 231static xcond_t reqwait;
196 232
197#if !HAVE_PREADWRITE 233#if !HAVE_PREADWRITE
198/* 234/*
199 * make our pread/pwrite emulation safe against themselves, but not against 235 * make our pread/pwrite emulation safe against themselves, but not against
200 * normal read/write by using a mutex. slows down execution a lot, 236 * normal read/write by using a mutex. slows down execution a lot,
201 * but that's your problem, not mine. 237 * but that's your problem, not mine.
202 */ 238 */
203static mutex_t preadwritelock = X_MUTEX_INIT; 239static xmutex_t preadwritelock = X_MUTEX_INIT;
204#endif 240#endif
205 241
206typedef struct etp_worker 242typedef struct etp_worker
207{ 243{
208 /* locked by wrklock */ 244 /* locked by wrklock */
209 struct etp_worker *prev, *next; 245 struct etp_worker *prev, *next;
210 246
211 thread_t tid; 247 xthread_t tid;
212 248
213 /* locked by reslock, reqlock or wrklock */ 249 /* locked by reslock, reqlock or wrklock */
214 ETP_REQ *req; /* currently processed request */ 250 ETP_REQ *req; /* currently processed request */
215 251
216 ETP_WORKER_COMMON 252 ETP_WORKER_COMMON
… …
330 } 366 }
331 367
332 abort (); 368 abort ();
333} 369}
334 370
371static void etp_thread_init (void)
372{
373 X_MUTEX_CREATE (wrklock);
374 X_MUTEX_CREATE (reslock);
375 X_MUTEX_CREATE (reqlock);
376 X_COND_CREATE (reqwait);
377}
378
335static void etp_atfork_prepare (void) 379static void etp_atfork_prepare (void)
336{ 380{
337 X_LOCK (wrklock); 381 X_LOCK (wrklock);
338 X_LOCK (reqlock); 382 X_LOCK (reqlock);
339 X_LOCK (reslock); 383 X_LOCK (reslock);
… …
377 idle = 0; 421 idle = 0;
378 nreqs = 0; 422 nreqs = 0;
379 nready = 0; 423 nready = 0;
380 npending = 0; 424 npending = 0;
381 425
382 etp_atfork_parent (); 426 etp_thread_init ();
383} 427}
384 428
385static void 429static void
386etp_once_init (void) 430etp_once_init (void)
387{ 431{
432 etp_thread_init ();
388 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 433 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
389} 434}
390 435
391static int 436static int
392etp_init (void (*want_poll)(void), void (*done_poll)(void)) 437etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
569} 614}
570 615
571static void etp_set_max_poll_time (double nseconds) 616static void etp_set_max_poll_time (double nseconds)
572{ 617{
573 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 618 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
574 max_poll_time = nseconds; 619 max_poll_time = nseconds * EIO_TICKS;
575 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 620 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
576} 621}
577 622
578static void etp_set_max_poll_reqs (unsigned int maxreqs) 623static void etp_set_max_poll_reqs (unsigned int maxreqs)
579{ 624{
… …
583} 628}
584 629
585static void etp_set_max_idle (unsigned int nthreads) 630static void etp_set_max_idle (unsigned int nthreads)
586{ 631{
587 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 632 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
588 max_idle = nthreads <= 0 ? 1 : nthreads; 633 max_idle = nthreads;
634 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
635}
636
637static void etp_set_idle_timeout (unsigned int seconds)
638{
639 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
640 idle_timeout = seconds;
589 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 641 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
590} 642}
591 643
592static void etp_set_min_parallel (unsigned int nthreads) 644static void etp_set_min_parallel (unsigned int nthreads)
593{ 645{
… …
721void eio_set_max_idle (unsigned int nthreads) 773void eio_set_max_idle (unsigned int nthreads)
722{ 774{
723 etp_set_max_idle (nthreads); 775 etp_set_max_idle (nthreads);
724} 776}
725 777
778void eio_set_idle_timeout (unsigned int seconds)
779{
780 etp_set_idle_timeout (seconds);
781}
782
726void eio_set_min_parallel (unsigned int nthreads) 783void eio_set_min_parallel (unsigned int nthreads)
727{ 784{
728 etp_set_min_parallel (nthreads); 785 etp_set_min_parallel (nthreads);
729} 786}
730 787
… …
778 835
779 return res; 836 return res;
780} 837}
781#endif 838#endif
782 839
783#ifndef HAVE_FUTIMES 840#ifndef HAVE_UTIMES
784 841
785# undef utimes 842# undef utimes
786# undef futimes
787# define utimes(path,times) eio__utimes (path, times) 843# define utimes(path,times) eio__utimes (path, times)
788# define futimes(fd,times) eio__futimes (fd, times)
789 844
790static int 845static int
791eio__utimes (const char *filename, const struct timeval times[2]) 846eio__utimes (const char *filename, const struct timeval times[2])
792{ 847{
793 if (times) 848 if (times)
… …
800 return utime (filename, &buf); 855 return utime (filename, &buf);
801 } 856 }
802 else 857 else
803 return utime (filename, 0); 858 return utime (filename, 0);
804} 859}
860
861#endif
862
863#ifndef HAVE_FUTIMES
864
865# undef futimes
866# define futimes(fd,times) eio__futimes (fd, times)
805 867
806static int eio__futimes (int fd, const struct timeval tv[2]) 868static int eio__futimes (int fd, const struct timeval tv[2])
807{ 869{
808 errno = ENOSYS; 870 errno = ENOSYS;
809 return -1; 871 return -1;
… …
838 if (!res || errno != ENOSYS) 900 if (!res || errno != ENOSYS)
839 return res; 901 return res;
840#endif 902#endif
841 903
842 /* even though we could play tricks with the flags, it's better to always 904 /* even though we could play tricks with the flags, it's better to always
843 * call fdatasync, as thta matches the expectation of it's users best */ 905 * call fdatasync, as that matches the expectation of its users best */
844 return fdatasync (fd); 906 return fdatasync (fd);
845} 907}
846 908
847#if !HAVE_READAHEAD 909#if !HAVE_READAHEAD
848# undef readahead 910# undef readahead
… …
880 942
881#if HAVE_SENDFILE 943#if HAVE_SENDFILE
882# if __linux 944# if __linux
883 res = sendfile (ofd, ifd, &offset, count); 945 res = sendfile (ofd, ifd, &offset, count);
884 946
885# elif __freebsd 947# elif __FreeBSD__
886 /* 948 /*
887 * Of course, the freebsd sendfile is a dire hack with no thoughts 949 * Of course, the freebsd sendfile is a dire hack with no thoughts
888 * wasted on making it similar to other I/O functions. 950 * wasted on making it similar to other I/O functions.
889 */ 951 */
890 { 952 {
891 off_t sbytes; 953 off_t sbytes;
892 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 954 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
893 955
894 if (res < 0 && sbytes) 956 #if 0 /* according to the manpage, this is correct, but broken behaviour */
895 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 957 /* freebsd' sendfile will return 0 on success */
958 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
959 /* not on e.g. EIO or EPIPE - sounds broken */
960 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
961 res = sbytes;
962 #endif
963
964 /* according to source inspection, this is correct, and useful behaviour */
965 if (sbytes)
966 res = sbytes;
967 }
968
969# elif defined (__APPLE__)
970
971 {
972 off_t sbytes = count;
973 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
974
975 /* according to the manpage, sbytes is always valid */
976 if (sbytes)
896 res = sbytes; 977 res = sbytes;
897 } 978 }
898 979
899# elif __hpux 980# elif __hpux
900 res = sendfile (ofd, ifd, offset, count, 0, 0); 981 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
914 if (res < 0 && sbytes) 995 if (res < 0 && sbytes)
915 res = sbytes; 996 res = sbytes;
916 } 997 }
917 998
918# endif 999# endif
1000
1001#elif defined (_WIN32)
1002
1003 /* does not work, just for documentation of what would need to be done */
1004 {
1005 HANDLE h = TO_SOCKET (ifd);
1006 SetFilePointer (h, offset, 0, FILE_BEGIN);
1007 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1008 }
1009
919#else 1010#else
920 res = -1; 1011 res = -1;
921 errno = ENOSYS; 1012 errno = ENOSYS;
922#endif 1013#endif
923 1014
924 if (res < 0 1015 if (res < 0
925 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1016 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1017 /* BSDs */
1018#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1019 || errno == ENOTSUP
1020#endif
1021 || errno == EOPNOTSUPP /* BSDs */
926#if __solaris 1022#if __solaris
927 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1023 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
928#endif 1024#endif
929 ) 1025 )
930 ) 1026 )
… …
961 } 1057 }
962 1058
963 return res; 1059 return res;
964} 1060}
965 1061
1062static signed char
1063eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1064{
1065 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1066 : a->inode < b->inode ? -1
1067 : a->inode > b->inode ? 1
1068 : 0;
1069}
1070
1071#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1072
1073#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1074#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1075
1076static void
1077eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1078{
1079 unsigned char bits [9 + sizeof (ino_t) * 8];
1080 unsigned char *bit = bits;
1081
1082 assert (CHAR_BIT == 8);
1083 assert (sizeof (eio_dirent) * 8 < 256);
1084 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1085 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1086
1087 if (size <= EIO_SORT_FAST)
1088 return;
1089
1090 /* first prepare an array of bits to test in our radix sort */
1091 /* try to take endianness into account, as well as differences in ino_t sizes */
1092 /* inode_bits must contain all inodes ORed together */
1093 /* which is used to skip bits that are 0 everywhere, which is very common */
1094 {
1095 ino_t endianness;
1096 int i, j;
1097
1098 /* we store the byte offset of byte n into byte n of "endianness" */
1099 for (i = 0; i < sizeof (ino_t); ++i)
1100 ((unsigned char *)&endianness)[i] = i;
1101
1102 *bit++ = 0;
1103
1104 for (i = 0; i < sizeof (ino_t); ++i)
1105 {
1106 /* shifting off the byte offsets out of "endianness" */
1107 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1108 endianness >>= 8;
1109
1110 for (j = 0; j < 8; ++j)
1111 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1112 *bit++ = offs + j;
1113 }
1114
1115 for (j = 0; j < 8; ++j)
1116 if (score_bits & (1 << j))
1117 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1118 }
1119
1120 /* now actually do the sorting (a variant of MSD radix sort) */
1121 {
1122 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1123 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1124 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1125 int stk_idx = 0;
1126
1127 base_stk [stk_idx] = dents;
1128 end_stk [stk_idx] = dents + size;
1129 bit_stk [stk_idx] = bit - 1;
1130
1131 do
1132 {
1133 base = base_stk [stk_idx];
1134 end = end_stk [stk_idx];
1135 bit = bit_stk [stk_idx];
1136
1137 for (;;)
1138 {
1139 unsigned char O = *bit >> 3;
1140 unsigned char M = 1 << (*bit & 7);
1141
1142 eio_dirent *a = base;
1143 eio_dirent *b = end;
1144
1145 if (b - a < EIO_SORT_CUTOFF)
1146 break;
1147
1148 /* now bit-partition the array on the bit */
1149 /* this ugly asymmetric loop seems to perform much better than typical */
1150 /* partition algos found in the literature */
1151 do
1152 if (!(((unsigned char *)a)[O] & M))
1153 ++a;
1154 else if (!(((unsigned char *)--b)[O] & M))
1155 {
1156 eio_dirent tmp = *a; *a = *b; *b = tmp;
1157 ++a;
1158 }
1159 while (b > a);
1160
1161 /* next bit, or stop, if no bits left in this path */
1162 if (!*--bit)
1163 break;
1164
1165 base_stk [stk_idx] = a;
1166 end_stk [stk_idx] = end;
1167 bit_stk [stk_idx] = bit;
1168 ++stk_idx;
1169
1170 end = a;
1171 }
1172 }
1173 while (stk_idx--);
1174 }
1175}
1176
1177static void
1178eio_dent_insertion_sort (eio_dirent *dents, int size)
1179{
1180 /* first move the smallest element to the front, to act as a sentinel */
1181 {
1182 int i;
1183 eio_dirent *min = dents;
1184
1185 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1186 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1187 if (EIO_DENT_CMP (dents [i], <, *min))
1188 min = &dents [i];
1189
1190 /* swap elements 0 and j (minimum) */
1191 {
1192 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1193 }
1194 }
1195
1196 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1197 {
1198 eio_dirent *i, *j;
1199
1200 for (i = dents + 1; i < dents + size; ++i)
1201 {
1202 eio_dirent value = *i;
1203
1204 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1205 j [1] = j [0];
1206
1207 j [1] = value;
1208 }
1209 }
1210}
1211
1212static void
1213eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1214{
1215 if (size <= 1)
1216 return; /* our insertion sort relies on size > 0 */
1217
1218 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1219 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1220 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1221
1222 /* use an insertion sort at the end, or for small arrays, */
1223 /* as insertion sort is more efficient for small partitions */
1224 eio_dent_insertion_sort (dents, size);
1225}
1226
966/* read a full directory */ 1227/* read a full directory */
967static void 1228static void
968eio__scandir (eio_req *req, etp_worker *self) 1229eio__scandir (eio_req *req, etp_worker *self)
969{ 1230{
970 DIR *dirp; 1231 DIR *dirp;
971 EIO_STRUCT_DIRENT *entp; 1232 EIO_STRUCT_DIRENT *entp;
972 char *name, *names; 1233 char *name, *names;
973 int memlen = 4096; 1234 int namesalloc = 4096;
974 int memofs = 0; 1235 int namesoffs = 0;
1236 int flags = req->int1;
1237 eio_dirent *dents = 0;
1238 int dentalloc = 128;
975 int res = 0; 1239 int dentoffs = 0;
1240 ino_t inode_bits = 0;
1241
1242 req->result = -1;
1243
1244 if (!(flags & EIO_READDIR_DENTS))
1245 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
976 1246
977 X_LOCK (wrklock); 1247 X_LOCK (wrklock);
978 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1248 /* the corresponding closedir is in ETP_WORKER_CLEAR */
979 self->dirp = dirp = opendir (req->ptr1); 1249 self->dirp = dirp = opendir (req->ptr1);
1250
980 req->flags |= EIO_FLAG_PTR2_FREE; 1251 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1252 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
981 req->ptr2 = names = malloc (memlen); 1253 req->ptr2 = names = malloc (namesalloc);
982 X_UNLOCK (wrklock); 1254 X_UNLOCK (wrklock);
983 1255
984 if (dirp && names) 1256 if (dirp && names && (!flags || dents))
985 for (;;) 1257 for (;;)
986 { 1258 {
987 errno = 0; 1259 errno = 0;
988 entp = readdir (dirp); 1260 entp = readdir (dirp);
989 1261
990 if (!entp) 1262 if (!entp)
1263 {
1264 if (errno)
1265 break;
1266
1267 /* sort etc. */
1268 req->int1 = flags;
1269 req->result = dentoffs;
1270
1271 if (flags & EIO_READDIR_STAT_ORDER)
1272 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1273 else if (flags & EIO_READDIR_DIRS_FIRST)
1274 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1275 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1276 else
1277 {
1278 /* in this case, all is known, and we just put dirs first and sort them */
1279 eio_dirent *oth = dents + dentoffs;
1280 eio_dirent *dir = dents;
1281
1282 /* now partition dirs to the front, and non-dirs to the back */
1283 /* by walking from both sides and swapping if necessary */
1284 while (oth > dir)
1285 {
1286 if (dir->type == EIO_DT_DIR)
1287 ++dir;
1288 else if ((--oth)->type == EIO_DT_DIR)
1289 {
1290 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1291
1292 ++dir;
1293 }
1294 }
1295
1296 /* now sort the dirs only (dirs all have the same score) */
1297 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1298 }
1299
991 break; 1300 break;
1301 }
992 1302
1303 /* now add the entry to our list(s) */
993 name = entp->d_name; 1304 name = entp->d_name;
994 1305
1306 /* skip . and .. entries */
995 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1307 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
996 { 1308 {
997 int len = strlen (name) + 1; 1309 int len = D_NAMLEN (entp) + 1;
998 1310
999 res++; 1311 while (expect_false (namesoffs + len > namesalloc))
1000
1001 while (memofs + len > memlen)
1002 { 1312 {
1003 memlen *= 2; 1313 namesalloc *= 2;
1004 X_LOCK (wrklock); 1314 X_LOCK (wrklock);
1005 req->ptr2 = names = realloc (names, memlen); 1315 req->ptr2 = names = realloc (names, namesalloc);
1006 X_UNLOCK (wrklock); 1316 X_UNLOCK (wrklock);
1007 1317
1008 if (!names) 1318 if (!names)
1009 break; 1319 break;
1010 } 1320 }
1011 1321
1012 memcpy (names + memofs, name, len); 1322 memcpy (names + namesoffs, name, len);
1323
1324 if (dents)
1325 {
1326 struct eio_dirent *ent;
1327
1328 if (expect_false (dentoffs == dentalloc))
1329 {
1330 dentalloc *= 2;
1331 X_LOCK (wrklock);
1332 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1333 X_UNLOCK (wrklock);
1334
1335 if (!dents)
1336 break;
1337 }
1338
1339 ent = dents + dentoffs;
1340
1341 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1342 ent->namelen = len - 1;
1343 ent->inode = D_INO (entp);
1344
1345 inode_bits |= ent->inode;
1346
1347 switch (D_TYPE (entp))
1348 {
1349 default:
1350 ent->type = EIO_DT_UNKNOWN;
1351 flags |= EIO_READDIR_FOUND_UNKNOWN;
1352 break;
1353
1354 #ifdef DT_FIFO
1355 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1356 #endif
1357 #ifdef DT_CHR
1358 case DT_CHR: ent->type = EIO_DT_CHR; break;
1359 #endif
1360 #ifdef DT_MPC
1361 case DT_MPC: ent->type = EIO_DT_MPC; break;
1362 #endif
1363 #ifdef DT_DIR
1364 case DT_DIR: ent->type = EIO_DT_DIR; break;
1365 #endif
1366 #ifdef DT_NAM
1367 case DT_NAM: ent->type = EIO_DT_NAM; break;
1368 #endif
1369 #ifdef DT_BLK
1370 case DT_BLK: ent->type = EIO_DT_BLK; break;
1371 #endif
1372 #ifdef DT_MPB
1373 case DT_MPB: ent->type = EIO_DT_MPB; break;
1374 #endif
1375 #ifdef DT_REG
1376 case DT_REG: ent->type = EIO_DT_REG; break;
1377 #endif
1378 #ifdef DT_NWK
1379 case DT_NWK: ent->type = EIO_DT_NWK; break;
1380 #endif
1381 #ifdef DT_CMP
1382 case DT_CMP: ent->type = EIO_DT_CMP; break;
1383 #endif
1384 #ifdef DT_LNK
1385 case DT_LNK: ent->type = EIO_DT_LNK; break;
1386 #endif
1387 #ifdef DT_SOCK
1388 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1389 #endif
1390 #ifdef DT_DOOR
1391 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1392 #endif
1393 #ifdef DT_WHT
1394 case DT_WHT: ent->type = EIO_DT_WHT; break;
1395 #endif
1396 }
1397
1398 ent->score = 7;
1399
1400 if (flags & EIO_READDIR_DIRS_FIRST)
1401 {
1402 if (ent->type == EIO_DT_UNKNOWN)
1403 {
1404 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1405 ent->score = 1;
1406 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1407 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1408 }
1409 else if (ent->type == EIO_DT_DIR)
1410 ent->score = 0;
1411 }
1412 }
1413
1013 memofs += len; 1414 namesoffs += len;
1415 ++dentoffs;
1416 }
1417
1418 if (EIO_CANCELLED (req))
1419 {
1420 errno = ECANCELED;
1421 break;
1014 } 1422 }
1015 } 1423 }
1016
1017 if (errno)
1018 res = -1;
1019
1020 req->result = res;
1021} 1424}
1425
1426#ifdef PAGESIZE
1427# define eio_pagesize() PAGESIZE
1428#else
1429static intptr_t
1430eio_pagesize (void)
1431{
1432 static intptr_t page;
1433
1434 if (!page)
1435 page = sysconf (_SC_PAGESIZE);
1436
1437 return page;
1438}
1439#endif
1440
1441static void
1442eio_page_align (void **addr, size_t *length)
1443{
1444 intptr_t mask = eio_pagesize () - 1;
1445
1446 /* round down addr */
1447 intptr_t adj = mask & (intptr_t)*addr;
1448
1449 *addr = (void *)((intptr_t)*addr - adj);
1450 *length += adj;
1451
1452 /* round up length */
1453 *length = (*length + mask) & ~mask;
1454}
1455
1456#if !_POSIX_MEMLOCK
1457# define eio__mlockall(a) ((errno = ENOSYS), -1)
1458#else
1459
1460static int
1461eio__mlockall (int flags)
1462{
1463 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1464 extern int mallopt (int, int);
1465 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1466 #endif
1467
1468 if (EIO_MCL_CURRENT != MCL_CURRENT
1469 || EIO_MCL_FUTURE != MCL_FUTURE)
1470 {
1471 flags = 0
1472 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1473 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1474 }
1475
1476 return mlockall (flags);
1477}
1478#endif
1479
1480#if !_POSIX_MEMLOCK_RANGE
1481# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1482#else
1483
1484static int
1485eio__mlock (void *addr, size_t length)
1486{
1487 eio_page_align (&addr, &length);
1488
1489 return mlock (addr, length);
1490}
1491
1492#endif
1022 1493
1023#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1494#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1024# undef msync
1025# define msync(a,b,c) ((errno = ENOSYS), -1) 1495# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1496#else
1497
1498int
1499eio__msync (void *mem, size_t len, int flags)
1500{
1501 eio_page_align (&mem, &len);
1502
1503 if (EIO_MS_ASYNC != MS_SYNC
1504 || EIO_MS_INVALIDATE != MS_INVALIDATE
1505 || EIO_MS_SYNC != MS_SYNC)
1506 {
1507 flags = 0
1508 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1509 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1510 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1511 }
1512
1513 return msync (mem, len, flags);
1514}
1515
1026#endif 1516#endif
1027 1517
1028int 1518int
1029eio__mtouch (void *mem, size_t len, int flags) 1519eio__mtouch (void *mem, size_t len, int flags)
1030{ 1520{
1521 eio_page_align (&mem, &len);
1522
1523 {
1031 intptr_t addr = (intptr_t)mem; 1524 intptr_t addr = (intptr_t)mem;
1032 intptr_t end = addr + len; 1525 intptr_t end = addr + len;
1033#ifdef PAGESIZE 1526 intptr_t page = eio_pagesize ();
1034 const intptr_t page = PAGESIZE;
1035#else
1036 static intptr_t page;
1037 1527
1038 if (!page)
1039 page = sysconf (_SC_PAGESIZE);
1040#endif
1041
1042 addr &= ~(page - 1); /* assume page size is always a power of two */
1043
1044 if (addr < end) 1528 if (addr < end)
1045 if (flags) /* modify */ 1529 if (flags & EIO_MT_MODIFY) /* modify */
1046 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1530 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1047 else 1531 else
1048 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1532 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1533 }
1049 1534
1050 return 0; 1535 return 0;
1051} 1536}
1052 1537
1053/*****************************************************************************/ 1538/*****************************************************************************/
… …
1087 if (req) 1572 if (req)
1088 break; 1573 break;
1089 1574
1090 ++idle; 1575 ++idle;
1091 1576
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1577 ts.tv_sec = time (0) + idle_timeout;
1093 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1578 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1094 { 1579 {
1095 if (idle > max_idle) 1580 if (idle > max_idle)
1096 { 1581 {
1097 --idle; 1582 --idle;
… …
1176 return 0; \ 1661 return 0; \
1177 } 1662 }
1178 1663
1179static void eio_execute (etp_worker *self, eio_req *req) 1664static void eio_execute (etp_worker *self, eio_req *req)
1180{ 1665{
1181 errno = 0;
1182
1183 switch (req->type) 1666 switch (req->type)
1184 { 1667 {
1185 case EIO_READ: ALLOC (req->size); 1668 case EIO_READ: ALLOC (req->size);
1186 req->result = req->offs >= 0 1669 req->result = req->offs >= 0
1187 ? pread (req->int1, req->ptr2, req->size, req->offs) 1670 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1198 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1681 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1199 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1682 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1200 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1683 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1201 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1684 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1202 1685
1686 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1687 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1688 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1689 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1690
1203 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1691 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1204 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1692 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1205 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1693 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1206 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1694 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1207 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1695 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1214 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1702 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1215 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1703 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1216 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1704 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1217 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1705 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1218 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1706 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1219 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1707 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1220 1708
1221 case EIO_READLINK: ALLOC (NAME_MAX); 1709 case EIO_READLINK: ALLOC (PATH_MAX);
1222 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1710 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1223 1711
1224 case EIO_SYNC: req->result = 0; sync (); break; 1712 case EIO_SYNC: req->result = 0; sync (); break;
1225 case EIO_FSYNC: req->result = fsync (req->int1); break; 1713 case EIO_FSYNC: req->result = fsync (req->int1); break;
1226 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1714 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1227 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1715 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1228 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1716 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1717 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1718 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1229 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1719 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1230 1720
1231 case EIO_READDIR: eio__scandir (req, self); break; 1721 case EIO_READDIR: eio__scandir (req, self); break;
1232 1722
1233 case EIO_BUSY: 1723 case EIO_BUSY:
1234#ifdef _WIN32 1724#ifdef _WIN32
1235 Sleep (req->nv1 * 1000.); 1725 Sleep (req->nv1 * 1e3);
1236#else 1726#else
1237 { 1727 {
1238 struct timeval tv; 1728 struct timeval tv;
1239 1729
1240 tv.tv_sec = req->nv1; 1730 tv.tv_sec = req->nv1;
1241 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1731 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1242 1732
1243 req->result = select (0, 0, 0, 0, &tv); 1733 req->result = select (0, 0, 0, 0, &tv);
1244 } 1734 }
1245#endif 1735#endif
1246 break; 1736 break;
… …
1261 times = tv; 1751 times = tv;
1262 } 1752 }
1263 else 1753 else
1264 times = 0; 1754 times = 0;
1265 1755
1266
1267 req->result = req->type == EIO_FUTIME 1756 req->result = req->type == EIO_FUTIME
1268 ? futimes (req->int1, times) 1757 ? futimes (req->int1, times)
1269 : utimes (req->ptr1, times); 1758 : utimes (req->ptr1, times);
1270 } 1759 }
1271 break; 1760 break;
… …
1280 case EIO_CUSTOM: 1769 case EIO_CUSTOM:
1281 ((void (*)(eio_req *))req->feed) (req); 1770 ((void (*)(eio_req *))req->feed) (req);
1282 break; 1771 break;
1283 1772
1284 default: 1773 default:
1774 errno = ENOSYS;
1285 req->result = -1; 1775 req->result = -1;
1286 break; 1776 break;
1287 } 1777 }
1288 1778
1289 req->errorno = errno; 1779 req->errorno = errno;
… …
1319eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1809eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1320{ 1810{
1321 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1811 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1322} 1812}
1323 1813
1814eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1815{
1816 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1817}
1818
1819eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1820{
1821 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1822}
1823
1324eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1824eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1325{ 1825{
1326 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1826 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1327} 1827}
1328 1828
… …
1352} 1852}
1353 1853
1354eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1854eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1355{ 1855{
1356 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1856 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1857}
1858
1859eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1860{
1861 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1357} 1862}
1358 1863
1359eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1864eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1360{ 1865{
1361 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1866 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
… …
1435eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1940eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1436{ 1941{
1437 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1942 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1438} 1943}
1439 1944
1945eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1946{
1947 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1948}
1949
1440eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1950eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1441{ 1951{
1442 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1952 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1443} 1953}
1444 1954
1445eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 1955eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1446{ 1956{
1447 return eio__1path (EIO_RMDIR, path, pri, cb, data); 1957 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1448} 1958}
1449 1959
1450eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 1960eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1451{ 1961{
1452 return eio__1path (EIO_READDIR, path, pri, cb, data); 1962 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1453} 1963}
1454 1964
1455eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1965eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1456{ 1966{
1457 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1967 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1458} 1968}
1459 1969
1460static eio_req * 1970static eio_req *
1461eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1971eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1462{ 1972{
… …
1546/* misc garbage */ 2056/* misc garbage */
1547 2057
1548ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2058ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1549{ 2059{
1550 etp_worker wrk; 2060 etp_worker wrk;
2061 ssize_t ret;
1551 2062
1552 wrk.dbuf = 0; 2063 wrk.dbuf = 0;
1553 2064
1554 eio__sendfile (ofd, ifd, offset, count, &wrk); 2065 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1555 2066
1556 if (wrk.dbuf) 2067 if (wrk.dbuf)
1557 free (wrk.dbuf); 2068 free (wrk.dbuf);
1558}
1559 2069
2070 return ret;
2071}
2072

Diff Legend

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