… | |
… | |
35 | * and other provisions required by the GPL. If you do not delete the |
35 | * and other provisions required by the GPL. If you do not delete the |
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 | #ifndef _WIN32 |
|
|
41 | # include "config.h" |
|
|
42 | #endif |
|
|
43 | |
40 | #include "eio.h" |
44 | #include "eio.h" |
|
|
45 | #include "ecb.h" |
41 | |
46 | |
42 | #ifdef EIO_STACKSIZE |
47 | #ifdef EIO_STACKSIZE |
43 | # define XTHREAD_STACKSIZE EIO_STACKSIZE |
48 | # define XTHREAD_STACKSIZE EIO_STACKSIZE |
44 | #endif |
49 | #endif |
45 | #include "xthread.h" |
50 | #include "xthread.h" |
… | |
… | |
49 | #include <stdlib.h> |
54 | #include <stdlib.h> |
50 | #include <string.h> |
55 | #include <string.h> |
51 | #include <errno.h> |
56 | #include <errno.h> |
52 | #include <sys/types.h> |
57 | #include <sys/types.h> |
53 | #include <sys/stat.h> |
58 | #include <sys/stat.h> |
54 | #include <sys/statvfs.h> |
|
|
55 | #include <limits.h> |
59 | #include <limits.h> |
56 | #include <fcntl.h> |
60 | #include <fcntl.h> |
57 | #include <assert.h> |
61 | #include <assert.h> |
58 | |
62 | |
|
|
63 | /* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ |
|
|
64 | /* intptr_t only comes from stdint.h, says idiot openbsd coder */ |
|
|
65 | #if HAVE_STDINT_H |
|
|
66 | # include <stdint.h> |
|
|
67 | #endif |
|
|
68 | |
|
|
69 | #ifndef ECANCELED |
|
|
70 | # define ECANCELED EDOM |
|
|
71 | #endif |
|
|
72 | #ifndef ELOOP |
|
|
73 | # define ELOOP EDOM |
|
|
74 | #endif |
|
|
75 | |
|
|
76 | #if !defined(ENOTSOCK) && defined(WSAENOTSOCK) |
|
|
77 | # define ENOTSOCK WSAENOTSOCK |
|
|
78 | #endif |
|
|
79 | |
|
|
80 | static void eio_destroy (eio_req *req); |
|
|
81 | |
59 | #ifndef EIO_FINISH |
82 | #ifndef EIO_FINISH |
60 | # define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 |
83 | # define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 |
61 | #endif |
84 | #endif |
62 | |
85 | |
63 | #ifndef EIO_DESTROY |
86 | #ifndef EIO_DESTROY |
… | |
… | |
66 | |
89 | |
67 | #ifndef EIO_FEED |
90 | #ifndef EIO_FEED |
68 | # define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) |
91 | # define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) |
69 | #endif |
92 | #endif |
70 | |
93 | |
|
|
94 | #ifndef EIO_FD_TO_WIN32_HANDLE |
|
|
95 | # define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) |
|
|
96 | #endif |
|
|
97 | #ifndef EIO_WIN32_HANDLE_TO_FD |
|
|
98 | # define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0) |
|
|
99 | #endif |
|
|
100 | |
|
|
101 | #define EIO_ERRNO(errval,retval) ((errno = errval), retval) |
|
|
102 | |
|
|
103 | #define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) |
|
|
104 | |
71 | #ifdef _WIN32 |
105 | #ifdef _WIN32 |
72 | |
106 | |
73 | /*doh*/ |
107 | #undef PAGESIZE |
|
|
108 | #define PAGESIZE 4096 /* GetSystemInfo? */ |
|
|
109 | |
|
|
110 | #ifdef EIO_STRUCT_STATI64 |
|
|
111 | #define stat(path,buf) _stati64 (path,buf) |
|
|
112 | #define fstat(fd,buf) _fstati64 (fd,buf) |
|
|
113 | #endif |
|
|
114 | #define lstat(path,buf) stat (path,buf) |
|
|
115 | #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) |
|
|
116 | #define mkdir(path,mode) _mkdir (path) |
|
|
117 | #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) |
|
|
118 | |
|
|
119 | #define chmod(path,mode) _chmod (path, mode) |
|
|
120 | #define dup(fd) _dup (fd) |
|
|
121 | #define dup2(fd1,fd2) _dup2 (fd1, fd2) |
|
|
122 | |
|
|
123 | #define fchmod(fd,mode) EIO_ENOSYS () |
|
|
124 | #define chown(path,uid,gid) EIO_ENOSYS () |
|
|
125 | #define fchown(fd,uid,gid) EIO_ENOSYS () |
|
|
126 | #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ |
|
|
127 | #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ |
|
|
128 | #define mknod(path,mode,dev) EIO_ENOSYS () |
|
|
129 | #define sync() EIO_ENOSYS () |
|
|
130 | #define readlink(path,buf,s) EIO_ENOSYS () |
|
|
131 | #define statvfs(path,buf) EIO_ENOSYS () |
|
|
132 | #define fstatvfs(fd,buf) EIO_ENOSYS () |
|
|
133 | |
|
|
134 | /* rename() uses MoveFile, which fails to overwrite */ |
|
|
135 | #define rename(old,neu) eio__rename (old, neu) |
|
|
136 | |
|
|
137 | static int |
|
|
138 | eio__rename (const char *old, const char *neu) |
|
|
139 | { |
|
|
140 | if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING)) |
|
|
141 | return 0; |
|
|
142 | |
|
|
143 | /* should steal _dosmaperr */ |
|
|
144 | switch (GetLastError ()) |
|
|
145 | { |
|
|
146 | case ERROR_FILE_NOT_FOUND: |
|
|
147 | case ERROR_PATH_NOT_FOUND: |
|
|
148 | case ERROR_INVALID_DRIVE: |
|
|
149 | case ERROR_NO_MORE_FILES: |
|
|
150 | case ERROR_BAD_NETPATH: |
|
|
151 | case ERROR_BAD_NET_NAME: |
|
|
152 | case ERROR_BAD_PATHNAME: |
|
|
153 | case ERROR_FILENAME_EXCED_RANGE: |
|
|
154 | errno = ENOENT; |
|
|
155 | break; |
|
|
156 | |
|
|
157 | default: |
|
|
158 | errno = EACCES; |
|
|
159 | break; |
|
|
160 | } |
|
|
161 | |
|
|
162 | return -1; |
|
|
163 | } |
|
|
164 | |
|
|
165 | /* we could even stat and see if it exists */ |
|
|
166 | static int |
|
|
167 | symlink (const char *old, const char *neu) |
|
|
168 | { |
|
|
169 | #if WINVER >= 0x0600 |
|
|
170 | if (CreateSymbolicLink (neu, old, 1)) |
|
|
171 | return 0; |
|
|
172 | |
|
|
173 | if (CreateSymbolicLink (neu, old, 0)) |
|
|
174 | return 0; |
|
|
175 | #endif |
|
|
176 | |
|
|
177 | return EIO_ERRNO (ENOENT, -1); |
|
|
178 | } |
|
|
179 | |
|
|
180 | /* POSIX API only */ |
|
|
181 | #define CreateHardLink(neu,old,flags) 0 |
|
|
182 | #define CreateSymbolicLink(neu,old,flags) 0 |
|
|
183 | |
|
|
184 | struct statvfs |
|
|
185 | { |
|
|
186 | int dummy; |
|
|
187 | }; |
|
|
188 | |
|
|
189 | #define DT_DIR EIO_DT_DIR |
|
|
190 | #define DT_REG EIO_DT_REG |
|
|
191 | #define D_NAME(entp) entp.cFileName |
|
|
192 | #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG) |
|
|
193 | |
74 | #else |
194 | #else |
75 | |
195 | |
76 | # include "config.h" |
|
|
77 | # include <sys/time.h> |
196 | #include <sys/time.h> |
78 | # include <sys/select.h> |
197 | #include <sys/select.h> |
|
|
198 | #include <sys/statvfs.h> |
79 | # include <unistd.h> |
199 | #include <unistd.h> |
|
|
200 | #include <signal.h> |
|
|
201 | #include <dirent.h> |
|
|
202 | |
|
|
203 | #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES |
|
|
204 | #include <sys/mman.h> |
|
|
205 | #endif |
|
|
206 | |
|
|
207 | #define D_NAME(entp) entp->d_name |
|
|
208 | |
|
|
209 | /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ |
|
|
210 | #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ |
|
|
211 | #define _DIRENT_HAVE_D_TYPE /* sigh */ |
|
|
212 | #define D_INO(de) (de)->d_fileno |
|
|
213 | #define D_NAMLEN(de) (de)->d_namlen |
|
|
214 | #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 |
|
|
215 | #define D_INO(de) (de)->d_ino |
|
|
216 | #endif |
|
|
217 | |
|
|
218 | #ifdef _D_EXACT_NAMLEN |
|
|
219 | #undef D_NAMLEN |
|
|
220 | #define D_NAMLEN(de) _D_EXACT_NAMLEN (de) |
|
|
221 | #endif |
|
|
222 | |
|
|
223 | #ifdef _DIRENT_HAVE_D_TYPE |
|
|
224 | #define D_TYPE(de) (de)->d_type |
|
|
225 | #endif |
|
|
226 | |
|
|
227 | #ifndef EIO_STRUCT_DIRENT |
|
|
228 | #define EIO_STRUCT_DIRENT struct dirent |
|
|
229 | #endif |
|
|
230 | |
|
|
231 | #endif |
|
|
232 | |
|
|
233 | #if HAVE_UTIMES |
80 | # include <utime.h> |
234 | # include <utime.h> |
81 | # include <signal.h> |
|
|
82 | # include <dirent.h> |
|
|
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 |
235 | #endif |
96 | |
236 | |
97 | #ifdef _D_EXACT_NAMLEN |
237 | #if HAVE_SYS_SYSCALL_H |
98 | # undef D_NAMLEN |
238 | # include <sys/syscall.h> |
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 |
239 | #endif |
105 | |
240 | |
106 | # ifndef EIO_STRUCT_DIRENT |
241 | #if HAVE_SYS_PRCTL_H |
107 | # define EIO_STRUCT_DIRENT struct dirent |
242 | # include <sys/prctl.h> |
108 | # endif |
|
|
109 | |
|
|
110 | #endif |
243 | #endif |
111 | |
244 | |
112 | #if HAVE_SENDFILE |
245 | #if HAVE_SENDFILE |
113 | # if __linux |
246 | # if __linux |
114 | # include <sys/sendfile.h> |
247 | # include <sys/sendfile.h> |
… | |
… | |
129 | #endif |
262 | #endif |
130 | #ifndef D_INO |
263 | #ifndef D_INO |
131 | # define D_INO(de) 0 |
264 | # define D_INO(de) 0 |
132 | #endif |
265 | #endif |
133 | #ifndef D_NAMLEN |
266 | #ifndef D_NAMLEN |
134 | # define D_NAMLEN(de) strlen ((de)->d_name) |
267 | # define D_NAMLEN(entp) strlen (D_NAME (entp)) |
135 | #endif |
268 | #endif |
136 | |
269 | |
137 | /* used for struct dirent, AIX doesn't provide it */ |
270 | /* used for struct dirent, AIX doesn't provide it */ |
138 | #ifndef NAME_MAX |
271 | #ifndef NAME_MAX |
139 | # define NAME_MAX 4096 |
272 | # define NAME_MAX 4096 |
… | |
… | |
146 | |
279 | |
147 | /* buffer size for various temporary buffers */ |
280 | /* buffer size for various temporary buffers */ |
148 | #define EIO_BUFSIZE 65536 |
281 | #define EIO_BUFSIZE 65536 |
149 | |
282 | |
150 | #define dBUF \ |
283 | #define dBUF \ |
151 | char *eio_buf; \ |
|
|
152 | ETP_WORKER_LOCK (self); \ |
|
|
153 | self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ |
284 | char *eio_buf = malloc (EIO_BUFSIZE); \ |
154 | ETP_WORKER_UNLOCK (self); \ |
|
|
155 | errno = ENOMEM; \ |
285 | errno = ENOMEM; \ |
156 | if (!eio_buf) \ |
286 | if (!eio_buf) \ |
157 | return -1; |
287 | return -1 |
|
|
288 | |
|
|
289 | #define FUBd \ |
|
|
290 | free (eio_buf) |
158 | |
291 | |
159 | #define EIO_TICKS ((1000000 + 1023) >> 10) |
292 | #define EIO_TICKS ((1000000 + 1023) >> 10) |
160 | |
|
|
161 | /*****************************************************************************/ |
|
|
162 | |
|
|
163 | #if __GNUC__ >= 3 |
|
|
164 | # define expect(expr,value) __builtin_expect ((expr),(value)) |
|
|
165 | #else |
|
|
166 | # define expect(expr,value) (expr) |
|
|
167 | #endif |
|
|
168 | |
|
|
169 | #define expect_false(expr) expect ((expr) != 0, 0) |
|
|
170 | #define expect_true(expr) expect ((expr) != 0, 1) |
|
|
171 | |
|
|
172 | /*****************************************************************************/ |
|
|
173 | |
293 | |
174 | #define ETP_PRI_MIN EIO_PRI_MIN |
294 | #define ETP_PRI_MIN EIO_PRI_MIN |
175 | #define ETP_PRI_MAX EIO_PRI_MAX |
295 | #define ETP_PRI_MAX EIO_PRI_MAX |
176 | |
296 | |
177 | struct etp_worker; |
297 | struct etp_worker; |
… | |
… | |
181 | static int eio_finish (eio_req *req); |
301 | static int eio_finish (eio_req *req); |
182 | #define ETP_FINISH(req) eio_finish (req) |
302 | #define ETP_FINISH(req) eio_finish (req) |
183 | static void eio_execute (struct etp_worker *self, eio_req *req); |
303 | static void eio_execute (struct etp_worker *self, eio_req *req); |
184 | #define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) |
304 | #define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) |
185 | |
305 | |
186 | #define ETP_WORKER_CLEAR(req) \ |
|
|
187 | if (wrk->dbuf) \ |
|
|
188 | { \ |
|
|
189 | free (wrk->dbuf); \ |
|
|
190 | wrk->dbuf = 0; \ |
|
|
191 | } \ |
|
|
192 | \ |
|
|
193 | if (wrk->dirp) \ |
|
|
194 | { \ |
|
|
195 | closedir (wrk->dirp); \ |
|
|
196 | wrk->dirp = 0; \ |
|
|
197 | } |
|
|
198 | |
|
|
199 | #define ETP_WORKER_COMMON \ |
|
|
200 | void *dbuf; \ |
|
|
201 | DIR *dirp; |
|
|
202 | |
|
|
203 | /*****************************************************************************/ |
306 | /*****************************************************************************/ |
204 | |
307 | |
205 | #define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) |
308 | #define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) |
206 | |
309 | |
207 | /* calculate time difference in ~1/EIO_TICKS of a second */ |
310 | /* calculate time difference in ~1/EIO_TICKS of a second */ |
|
|
311 | ecb_inline int |
208 | static int tvdiff (struct timeval *tv1, struct timeval *tv2) |
312 | tvdiff (struct timeval *tv1, struct timeval *tv2) |
209 | { |
313 | { |
210 | return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS |
314 | return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS |
211 | + ((tv2->tv_usec - tv1->tv_usec) >> 10); |
315 | + ((tv2->tv_usec - tv1->tv_usec) >> 10); |
212 | } |
316 | } |
213 | |
317 | |
… | |
… | |
234 | /* |
338 | /* |
235 | * make our pread/pwrite emulation safe against themselves, but not against |
339 | * make our pread/pwrite emulation safe against themselves, but not against |
236 | * normal read/write by using a mutex. slows down execution a lot, |
340 | * normal read/write by using a mutex. slows down execution a lot, |
237 | * but that's your problem, not mine. |
341 | * but that's your problem, not mine. |
238 | */ |
342 | */ |
239 | static xmutex_t preadwritelock = X_MUTEX_INIT; |
343 | static xmutex_t preadwritelock; |
240 | #endif |
344 | #endif |
241 | |
345 | |
242 | typedef struct etp_worker |
346 | typedef struct etp_worker |
243 | { |
347 | { |
244 | /* locked by wrklock */ |
348 | /* locked by wrklock */ |
… | |
… | |
247 | xthread_t tid; |
351 | xthread_t tid; |
248 | |
352 | |
249 | /* locked by reslock, reqlock or wrklock */ |
353 | /* locked by reslock, reqlock or wrklock */ |
250 | ETP_REQ *req; /* currently processed request */ |
354 | ETP_REQ *req; /* currently processed request */ |
251 | |
355 | |
|
|
356 | #ifdef ETP_WORKER_COMMON |
252 | ETP_WORKER_COMMON |
357 | ETP_WORKER_COMMON |
|
|
358 | #endif |
253 | } etp_worker; |
359 | } etp_worker; |
254 | |
360 | |
255 | static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ |
361 | static etp_worker wrk_first; /* NOT etp */ |
256 | |
362 | |
257 | #define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) |
363 | #define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) |
258 | #define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) |
364 | #define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) |
259 | |
365 | |
260 | /* worker threads management */ |
366 | /* worker threads management */ |
261 | |
367 | |
|
|
368 | static void ecb_cold |
262 | static void etp_worker_clear (etp_worker *wrk) |
369 | etp_worker_clear (etp_worker *wrk) |
263 | { |
370 | { |
264 | ETP_WORKER_CLEAR (wrk); |
|
|
265 | } |
371 | } |
266 | |
372 | |
|
|
373 | static void ecb_cold |
267 | static void etp_worker_free (etp_worker *wrk) |
374 | etp_worker_free (etp_worker *wrk) |
268 | { |
375 | { |
269 | wrk->next->prev = wrk->prev; |
376 | wrk->next->prev = wrk->prev; |
270 | wrk->prev->next = wrk->next; |
377 | wrk->prev->next = wrk->next; |
271 | |
378 | |
272 | free (wrk); |
379 | free (wrk); |
273 | } |
380 | } |
274 | |
381 | |
275 | static unsigned int etp_nreqs (void) |
382 | static unsigned int |
|
|
383 | etp_nreqs (void) |
276 | { |
384 | { |
277 | int retval; |
385 | int retval; |
278 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
386 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
279 | retval = nreqs; |
387 | retval = nreqs; |
280 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
388 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
281 | return retval; |
389 | return retval; |
282 | } |
390 | } |
283 | |
391 | |
284 | static unsigned int etp_nready (void) |
392 | static unsigned int |
|
|
393 | etp_nready (void) |
285 | { |
394 | { |
286 | unsigned int retval; |
395 | unsigned int retval; |
287 | |
396 | |
288 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
397 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
289 | retval = nready; |
398 | retval = nready; |
290 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
399 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
291 | |
400 | |
292 | return retval; |
401 | return retval; |
293 | } |
402 | } |
294 | |
403 | |
295 | static unsigned int etp_npending (void) |
404 | static unsigned int |
|
|
405 | etp_npending (void) |
296 | { |
406 | { |
297 | unsigned int retval; |
407 | unsigned int retval; |
298 | |
408 | |
299 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
409 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
300 | retval = npending; |
410 | retval = npending; |
301 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
411 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
302 | |
412 | |
303 | return retval; |
413 | return retval; |
304 | } |
414 | } |
305 | |
415 | |
306 | static unsigned int etp_nthreads (void) |
416 | static unsigned int |
|
|
417 | etp_nthreads (void) |
307 | { |
418 | { |
308 | unsigned int retval; |
419 | unsigned int retval; |
309 | |
420 | |
310 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
421 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
311 | retval = started; |
422 | retval = started; |
… | |
… | |
325 | } etp_reqq; |
436 | } etp_reqq; |
326 | |
437 | |
327 | static etp_reqq req_queue; |
438 | static etp_reqq req_queue; |
328 | static etp_reqq res_queue; |
439 | static etp_reqq res_queue; |
329 | |
440 | |
|
|
441 | static void ecb_noinline ecb_cold |
|
|
442 | reqq_init (etp_reqq *q) |
|
|
443 | { |
|
|
444 | int pri; |
|
|
445 | |
|
|
446 | for (pri = 0; pri < ETP_NUM_PRI; ++pri) |
|
|
447 | q->qs[pri] = q->qe[pri] = 0; |
|
|
448 | |
|
|
449 | q->size = 0; |
|
|
450 | } |
|
|
451 | |
|
|
452 | static int ecb_noinline |
330 | static int reqq_push (etp_reqq *q, ETP_REQ *req) |
453 | reqq_push (etp_reqq *q, ETP_REQ *req) |
331 | { |
454 | { |
332 | int pri = req->pri; |
455 | int pri = req->pri; |
333 | req->next = 0; |
456 | req->next = 0; |
334 | |
457 | |
335 | if (q->qe[pri]) |
458 | if (q->qe[pri]) |
… | |
… | |
341 | q->qe[pri] = q->qs[pri] = req; |
464 | q->qe[pri] = q->qs[pri] = req; |
342 | |
465 | |
343 | return q->size++; |
466 | return q->size++; |
344 | } |
467 | } |
345 | |
468 | |
|
|
469 | static ETP_REQ * ecb_noinline |
346 | static ETP_REQ *reqq_shift (etp_reqq *q) |
470 | reqq_shift (etp_reqq *q) |
347 | { |
471 | { |
348 | int pri; |
472 | int pri; |
349 | |
473 | |
350 | if (!q->size) |
474 | if (!q->size) |
351 | return 0; |
475 | return 0; |
… | |
… | |
366 | } |
490 | } |
367 | |
491 | |
368 | abort (); |
492 | abort (); |
369 | } |
493 | } |
370 | |
494 | |
371 | static void etp_thread_init (void) |
495 | static int ecb_cold |
|
|
496 | etp_init (void (*want_poll)(void), void (*done_poll)(void)) |
372 | { |
497 | { |
373 | X_MUTEX_CREATE (wrklock); |
498 | X_MUTEX_CREATE (wrklock); |
374 | X_MUTEX_CREATE (reslock); |
499 | X_MUTEX_CREATE (reslock); |
375 | X_MUTEX_CREATE (reqlock); |
500 | X_MUTEX_CREATE (reqlock); |
376 | X_COND_CREATE (reqwait); |
501 | X_COND_CREATE (reqwait); |
377 | } |
|
|
378 | |
502 | |
379 | static void etp_atfork_prepare (void) |
503 | reqq_init (&req_queue); |
380 | { |
504 | reqq_init (&res_queue); |
381 | X_LOCK (wrklock); |
|
|
382 | X_LOCK (reqlock); |
|
|
383 | X_LOCK (reslock); |
|
|
384 | #if !HAVE_PREADWRITE |
|
|
385 | X_LOCK (preadwritelock); |
|
|
386 | #endif |
|
|
387 | } |
|
|
388 | |
505 | |
389 | static void etp_atfork_parent (void) |
506 | wrk_first.next = |
390 | { |
507 | wrk_first.prev = &wrk_first; |
391 | #if !HAVE_PREADWRITE |
|
|
392 | X_UNLOCK (preadwritelock); |
|
|
393 | #endif |
|
|
394 | X_UNLOCK (reslock); |
|
|
395 | X_UNLOCK (reqlock); |
|
|
396 | X_UNLOCK (wrklock); |
|
|
397 | } |
|
|
398 | |
|
|
399 | static void etp_atfork_child (void) |
|
|
400 | { |
|
|
401 | ETP_REQ *prv; |
|
|
402 | |
|
|
403 | while ((prv = reqq_shift (&req_queue))) |
|
|
404 | ETP_DESTROY (prv); |
|
|
405 | |
|
|
406 | while ((prv = reqq_shift (&res_queue))) |
|
|
407 | ETP_DESTROY (prv); |
|
|
408 | |
|
|
409 | while (wrk_first.next != &wrk_first) |
|
|
410 | { |
|
|
411 | etp_worker *wrk = wrk_first.next; |
|
|
412 | |
|
|
413 | if (wrk->req) |
|
|
414 | ETP_DESTROY (wrk->req); |
|
|
415 | |
|
|
416 | etp_worker_clear (wrk); |
|
|
417 | etp_worker_free (wrk); |
|
|
418 | } |
|
|
419 | |
508 | |
420 | started = 0; |
509 | started = 0; |
421 | idle = 0; |
510 | idle = 0; |
422 | nreqs = 0; |
511 | nreqs = 0; |
423 | nready = 0; |
512 | nready = 0; |
424 | npending = 0; |
513 | npending = 0; |
425 | |
514 | |
426 | etp_thread_init (); |
|
|
427 | } |
|
|
428 | |
|
|
429 | static void |
|
|
430 | etp_once_init (void) |
|
|
431 | { |
|
|
432 | etp_thread_init (); |
|
|
433 | X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); |
|
|
434 | } |
|
|
435 | |
|
|
436 | static int |
|
|
437 | etp_init (void (*want_poll)(void), void (*done_poll)(void)) |
|
|
438 | { |
|
|
439 | static pthread_once_t doinit = PTHREAD_ONCE_INIT; |
|
|
440 | |
|
|
441 | pthread_once (&doinit, etp_once_init); |
|
|
442 | |
|
|
443 | want_poll_cb = want_poll; |
515 | want_poll_cb = want_poll; |
444 | done_poll_cb = done_poll; |
516 | done_poll_cb = done_poll; |
445 | |
517 | |
446 | return 0; |
518 | return 0; |
447 | } |
519 | } |
448 | |
520 | |
449 | X_THREAD_PROC (etp_proc); |
521 | X_THREAD_PROC (etp_proc); |
450 | |
522 | |
|
|
523 | static void ecb_cold |
451 | static void etp_start_thread (void) |
524 | etp_start_thread (void) |
452 | { |
525 | { |
453 | etp_worker *wrk = calloc (1, sizeof (etp_worker)); |
526 | etp_worker *wrk = calloc (1, sizeof (etp_worker)); |
454 | |
527 | |
455 | /*TODO*/ |
528 | /*TODO*/ |
456 | assert (("unable to allocate worker thread data", wrk)); |
529 | assert (("unable to allocate worker thread data", wrk)); |
… | |
… | |
469 | free (wrk); |
542 | free (wrk); |
470 | |
543 | |
471 | X_UNLOCK (wrklock); |
544 | X_UNLOCK (wrklock); |
472 | } |
545 | } |
473 | |
546 | |
|
|
547 | static void |
474 | static void etp_maybe_start_thread (void) |
548 | etp_maybe_start_thread (void) |
475 | { |
549 | { |
476 | if (expect_true (etp_nthreads () >= wanted)) |
550 | if (ecb_expect_true (etp_nthreads () >= wanted)) |
477 | return; |
551 | return; |
478 | |
552 | |
479 | /* todo: maybe use idle here, but might be less exact */ |
553 | /* todo: maybe use idle here, but might be less exact */ |
480 | if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) |
554 | if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) |
481 | return; |
555 | return; |
482 | |
556 | |
483 | etp_start_thread (); |
557 | etp_start_thread (); |
484 | } |
558 | } |
485 | |
559 | |
|
|
560 | static void ecb_cold |
486 | static void etp_end_thread (void) |
561 | etp_end_thread (void) |
487 | { |
562 | { |
488 | eio_req *req = calloc (1, sizeof (eio_req)); |
563 | eio_req *req = calloc (1, sizeof (eio_req)); |
489 | |
564 | |
490 | req->type = -1; |
565 | req->type = -1; |
491 | req->pri = ETP_PRI_MAX - ETP_PRI_MIN; |
566 | req->pri = ETP_PRI_MAX - ETP_PRI_MIN; |
… | |
… | |
498 | X_LOCK (wrklock); |
573 | X_LOCK (wrklock); |
499 | --started; |
574 | --started; |
500 | X_UNLOCK (wrklock); |
575 | X_UNLOCK (wrklock); |
501 | } |
576 | } |
502 | |
577 | |
503 | static int etp_poll (void) |
578 | static int |
|
|
579 | etp_poll (void) |
504 | { |
580 | { |
505 | unsigned int maxreqs; |
581 | unsigned int maxreqs; |
506 | unsigned int maxtime; |
582 | unsigned int maxtime; |
507 | struct timeval tv_start, tv_now; |
583 | struct timeval tv_start, tv_now; |
508 | |
584 | |
… | |
… | |
538 | |
614 | |
539 | X_LOCK (reqlock); |
615 | X_LOCK (reqlock); |
540 | --nreqs; |
616 | --nreqs; |
541 | X_UNLOCK (reqlock); |
617 | X_UNLOCK (reqlock); |
542 | |
618 | |
543 | if (expect_false (req->type == EIO_GROUP && req->size)) |
619 | if (ecb_expect_false (req->type == EIO_GROUP && req->size)) |
544 | { |
620 | { |
545 | req->int1 = 1; /* mark request as delayed */ |
621 | req->int1 = 1; /* mark request as delayed */ |
546 | continue; |
622 | continue; |
547 | } |
623 | } |
548 | else |
624 | else |
549 | { |
625 | { |
550 | int res = ETP_FINISH (req); |
626 | int res = ETP_FINISH (req); |
551 | if (expect_false (res)) |
627 | if (ecb_expect_false (res)) |
552 | return res; |
628 | return res; |
553 | } |
629 | } |
554 | |
630 | |
555 | if (expect_false (maxreqs && !--maxreqs)) |
631 | if (ecb_expect_false (maxreqs && !--maxreqs)) |
556 | break; |
632 | break; |
557 | |
633 | |
558 | if (maxtime) |
634 | if (maxtime) |
559 | { |
635 | { |
560 | gettimeofday (&tv_now, 0); |
636 | gettimeofday (&tv_now, 0); |
… | |
… | |
566 | |
642 | |
567 | errno = EAGAIN; |
643 | errno = EAGAIN; |
568 | return -1; |
644 | return -1; |
569 | } |
645 | } |
570 | |
646 | |
|
|
647 | static void |
571 | static void etp_cancel (ETP_REQ *req) |
648 | etp_cancel (ETP_REQ *req) |
572 | { |
649 | { |
573 | X_LOCK (wrklock); |
650 | req->cancelled = 1; |
574 | req->flags |= EIO_FLAG_CANCELLED; |
|
|
575 | X_UNLOCK (wrklock); |
|
|
576 | |
651 | |
577 | eio_grp_cancel (req); |
652 | eio_grp_cancel (req); |
578 | } |
653 | } |
579 | |
654 | |
|
|
655 | static void |
580 | static void etp_submit (ETP_REQ *req) |
656 | etp_submit (ETP_REQ *req) |
581 | { |
657 | { |
582 | req->pri -= ETP_PRI_MIN; |
658 | req->pri -= ETP_PRI_MIN; |
583 | |
659 | |
584 | if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; |
660 | if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; |
585 | if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; |
661 | if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; |
586 | |
662 | |
587 | if (expect_false (req->type == EIO_GROUP)) |
663 | if (ecb_expect_false (req->type == EIO_GROUP)) |
588 | { |
664 | { |
589 | /* I hope this is worth it :/ */ |
665 | /* I hope this is worth it :/ */ |
590 | X_LOCK (reqlock); |
666 | X_LOCK (reqlock); |
591 | ++nreqs; |
667 | ++nreqs; |
592 | X_UNLOCK (reqlock); |
668 | X_UNLOCK (reqlock); |
… | |
… | |
611 | |
687 | |
612 | etp_maybe_start_thread (); |
688 | etp_maybe_start_thread (); |
613 | } |
689 | } |
614 | } |
690 | } |
615 | |
691 | |
|
|
692 | static void ecb_cold |
616 | static void etp_set_max_poll_time (double nseconds) |
693 | etp_set_max_poll_time (double nseconds) |
617 | { |
694 | { |
618 | if (WORDACCESS_UNSAFE) X_LOCK (reslock); |
695 | if (WORDACCESS_UNSAFE) X_LOCK (reslock); |
619 | max_poll_time = nseconds * EIO_TICKS; |
696 | max_poll_time = nseconds * EIO_TICKS; |
620 | if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); |
697 | if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); |
621 | } |
698 | } |
622 | |
699 | |
|
|
700 | static void ecb_cold |
623 | static void etp_set_max_poll_reqs (unsigned int maxreqs) |
701 | etp_set_max_poll_reqs (unsigned int maxreqs) |
624 | { |
702 | { |
625 | if (WORDACCESS_UNSAFE) X_LOCK (reslock); |
703 | if (WORDACCESS_UNSAFE) X_LOCK (reslock); |
626 | max_poll_reqs = maxreqs; |
704 | max_poll_reqs = maxreqs; |
627 | if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); |
705 | if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); |
628 | } |
706 | } |
629 | |
707 | |
|
|
708 | static void ecb_cold |
630 | static void etp_set_max_idle (unsigned int nthreads) |
709 | etp_set_max_idle (unsigned int nthreads) |
631 | { |
710 | { |
632 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
711 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
633 | max_idle = nthreads; |
712 | max_idle = nthreads; |
634 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
713 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
635 | } |
714 | } |
636 | |
715 | |
|
|
716 | static void ecb_cold |
637 | static void etp_set_idle_timeout (unsigned int seconds) |
717 | etp_set_idle_timeout (unsigned int seconds) |
638 | { |
718 | { |
639 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
719 | if (WORDACCESS_UNSAFE) X_LOCK (reqlock); |
640 | idle_timeout = seconds; |
720 | idle_timeout = seconds; |
641 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
721 | if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); |
642 | } |
722 | } |
643 | |
723 | |
|
|
724 | static void ecb_cold |
644 | static void etp_set_min_parallel (unsigned int nthreads) |
725 | etp_set_min_parallel (unsigned int nthreads) |
645 | { |
726 | { |
646 | if (wanted < nthreads) |
727 | if (wanted < nthreads) |
647 | wanted = nthreads; |
728 | wanted = nthreads; |
648 | } |
729 | } |
649 | |
730 | |
|
|
731 | static void ecb_cold |
650 | static void etp_set_max_parallel (unsigned int nthreads) |
732 | etp_set_max_parallel (unsigned int nthreads) |
651 | { |
733 | { |
652 | if (wanted > nthreads) |
734 | if (wanted > nthreads) |
653 | wanted = nthreads; |
735 | wanted = nthreads; |
654 | |
736 | |
655 | while (started > wanted) |
737 | while (started > wanted) |
656 | etp_end_thread (); |
738 | etp_end_thread (); |
657 | } |
739 | } |
658 | |
740 | |
659 | /*****************************************************************************/ |
741 | /*****************************************************************************/ |
660 | |
742 | |
|
|
743 | static void |
661 | static void grp_try_feed (eio_req *grp) |
744 | grp_try_feed (eio_req *grp) |
662 | { |
745 | { |
663 | while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) |
746 | while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) |
664 | { |
747 | { |
665 | grp->flags &= ~EIO_FLAG_GROUPADD; |
748 | grp->flags &= ~EIO_FLAG_GROUPADD; |
666 | |
749 | |
… | |
… | |
673 | break; |
756 | break; |
674 | } |
757 | } |
675 | } |
758 | } |
676 | } |
759 | } |
677 | |
760 | |
|
|
761 | static int |
678 | static int grp_dec (eio_req *grp) |
762 | grp_dec (eio_req *grp) |
679 | { |
763 | { |
680 | --grp->size; |
764 | --grp->size; |
681 | |
765 | |
682 | /* call feeder, if applicable */ |
766 | /* call feeder, if applicable */ |
683 | grp_try_feed (grp); |
767 | grp_try_feed (grp); |
… | |
… | |
687 | return eio_finish (grp); |
771 | return eio_finish (grp); |
688 | else |
772 | else |
689 | return 0; |
773 | return 0; |
690 | } |
774 | } |
691 | |
775 | |
|
|
776 | static void |
692 | void eio_destroy (eio_req *req) |
777 | eio_destroy (eio_req *req) |
693 | { |
778 | { |
694 | if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); |
779 | if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); |
695 | if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); |
780 | if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); |
696 | |
781 | |
697 | EIO_DESTROY (req); |
782 | EIO_DESTROY (req); |
698 | } |
783 | } |
699 | |
784 | |
|
|
785 | static int |
700 | static int eio_finish (eio_req *req) |
786 | eio_finish (eio_req *req) |
701 | { |
787 | { |
702 | int res = EIO_FINISH (req); |
788 | int res = EIO_FINISH (req); |
703 | |
789 | |
704 | if (req->grp) |
790 | if (req->grp) |
705 | { |
791 | { |
… | |
… | |
713 | if (grp->grp_first == req) |
799 | if (grp->grp_first == req) |
714 | grp->grp_first = req->grp_next; |
800 | grp->grp_first = req->grp_next; |
715 | |
801 | |
716 | res2 = grp_dec (grp); |
802 | res2 = grp_dec (grp); |
717 | |
803 | |
718 | if (!res && res2) |
804 | if (!res) |
719 | res = res2; |
805 | res = res2; |
720 | } |
806 | } |
721 | |
807 | |
722 | eio_destroy (req); |
808 | eio_destroy (req); |
723 | |
809 | |
724 | return res; |
810 | return res; |
725 | } |
811 | } |
726 | |
812 | |
|
|
813 | void |
727 | void eio_grp_cancel (eio_req *grp) |
814 | eio_grp_cancel (eio_req *grp) |
728 | { |
815 | { |
729 | for (grp = grp->grp_first; grp; grp = grp->grp_next) |
816 | for (grp = grp->grp_first; grp; grp = grp->grp_next) |
730 | eio_cancel (grp); |
817 | eio_cancel (grp); |
731 | } |
818 | } |
732 | |
819 | |
|
|
820 | void |
733 | void eio_cancel (eio_req *req) |
821 | eio_cancel (eio_req *req) |
734 | { |
822 | { |
735 | etp_cancel (req); |
823 | etp_cancel (req); |
736 | } |
824 | } |
737 | |
825 | |
|
|
826 | void |
738 | void eio_submit (eio_req *req) |
827 | eio_submit (eio_req *req) |
739 | { |
828 | { |
740 | etp_submit (req); |
829 | etp_submit (req); |
741 | } |
830 | } |
742 | |
831 | |
743 | unsigned int eio_nreqs (void) |
832 | unsigned int |
|
|
833 | eio_nreqs (void) |
744 | { |
834 | { |
745 | return etp_nreqs (); |
835 | return etp_nreqs (); |
746 | } |
836 | } |
747 | |
837 | |
748 | unsigned int eio_nready (void) |
838 | unsigned int |
|
|
839 | eio_nready (void) |
749 | { |
840 | { |
750 | return etp_nready (); |
841 | return etp_nready (); |
751 | } |
842 | } |
752 | |
843 | |
753 | unsigned int eio_npending (void) |
844 | unsigned int |
|
|
845 | eio_npending (void) |
754 | { |
846 | { |
755 | return etp_npending (); |
847 | return etp_npending (); |
756 | } |
848 | } |
757 | |
849 | |
758 | unsigned int eio_nthreads (void) |
850 | unsigned int ecb_cold |
|
|
851 | eio_nthreads (void) |
759 | { |
852 | { |
760 | return etp_nthreads (); |
853 | return etp_nthreads (); |
761 | } |
854 | } |
762 | |
855 | |
|
|
856 | void ecb_cold |
763 | void eio_set_max_poll_time (double nseconds) |
857 | eio_set_max_poll_time (double nseconds) |
764 | { |
858 | { |
765 | etp_set_max_poll_time (nseconds); |
859 | etp_set_max_poll_time (nseconds); |
766 | } |
860 | } |
767 | |
861 | |
|
|
862 | void ecb_cold |
768 | void eio_set_max_poll_reqs (unsigned int maxreqs) |
863 | eio_set_max_poll_reqs (unsigned int maxreqs) |
769 | { |
864 | { |
770 | etp_set_max_poll_reqs (maxreqs); |
865 | etp_set_max_poll_reqs (maxreqs); |
771 | } |
866 | } |
772 | |
867 | |
|
|
868 | void ecb_cold |
773 | void eio_set_max_idle (unsigned int nthreads) |
869 | eio_set_max_idle (unsigned int nthreads) |
774 | { |
870 | { |
775 | etp_set_max_idle (nthreads); |
871 | etp_set_max_idle (nthreads); |
776 | } |
872 | } |
777 | |
873 | |
|
|
874 | void ecb_cold |
778 | void eio_set_idle_timeout (unsigned int seconds) |
875 | eio_set_idle_timeout (unsigned int seconds) |
779 | { |
876 | { |
780 | etp_set_idle_timeout (seconds); |
877 | etp_set_idle_timeout (seconds); |
781 | } |
878 | } |
782 | |
879 | |
|
|
880 | void ecb_cold |
783 | void eio_set_min_parallel (unsigned int nthreads) |
881 | eio_set_min_parallel (unsigned int nthreads) |
784 | { |
882 | { |
785 | etp_set_min_parallel (nthreads); |
883 | etp_set_min_parallel (nthreads); |
786 | } |
884 | } |
787 | |
885 | |
|
|
886 | void ecb_cold |
788 | void eio_set_max_parallel (unsigned int nthreads) |
887 | eio_set_max_parallel (unsigned int nthreads) |
789 | { |
888 | { |
790 | etp_set_max_parallel (nthreads); |
889 | etp_set_max_parallel (nthreads); |
791 | } |
890 | } |
792 | |
891 | |
793 | int eio_poll (void) |
892 | int eio_poll (void) |
… | |
… | |
802 | # undef pread |
901 | # undef pread |
803 | # undef pwrite |
902 | # undef pwrite |
804 | # define pread eio__pread |
903 | # define pread eio__pread |
805 | # define pwrite eio__pwrite |
904 | # define pwrite eio__pwrite |
806 | |
905 | |
807 | static ssize_t |
906 | static eio_ssize_t |
808 | eio__pread (int fd, void *buf, size_t count, off_t offset) |
907 | eio__pread (int fd, void *buf, size_t count, off_t offset) |
809 | { |
908 | { |
810 | ssize_t res; |
909 | eio_ssize_t res; |
811 | off_t ooffset; |
910 | off_t ooffset; |
812 | |
911 | |
813 | X_LOCK (preadwritelock); |
912 | X_LOCK (preadwritelock); |
814 | ooffset = lseek (fd, 0, SEEK_CUR); |
913 | ooffset = lseek (fd, 0, SEEK_CUR); |
815 | lseek (fd, offset, SEEK_SET); |
914 | lseek (fd, offset, SEEK_SET); |
… | |
… | |
818 | X_UNLOCK (preadwritelock); |
917 | X_UNLOCK (preadwritelock); |
819 | |
918 | |
820 | return res; |
919 | return res; |
821 | } |
920 | } |
822 | |
921 | |
823 | static ssize_t |
922 | static eio_ssize_t |
824 | eio__pwrite (int fd, void *buf, size_t count, off_t offset) |
923 | eio__pwrite (int fd, void *buf, size_t count, off_t offset) |
825 | { |
924 | { |
826 | ssize_t res; |
925 | eio_ssize_t res; |
827 | off_t ooffset; |
926 | off_t ooffset; |
828 | |
927 | |
829 | X_LOCK (preadwritelock); |
928 | X_LOCK (preadwritelock); |
830 | ooffset = lseek (fd, 0, SEEK_CUR); |
929 | ooffset = lseek (fd, 0, SEEK_CUR); |
831 | lseek (fd, offset, SEEK_SET); |
930 | lseek (fd, offset, SEEK_SET); |
… | |
… | |
863 | #ifndef HAVE_FUTIMES |
962 | #ifndef HAVE_FUTIMES |
864 | |
963 | |
865 | # undef futimes |
964 | # undef futimes |
866 | # define futimes(fd,times) eio__futimes (fd, times) |
965 | # define futimes(fd,times) eio__futimes (fd, times) |
867 | |
966 | |
|
|
967 | static int |
868 | static int eio__futimes (int fd, const struct timeval tv[2]) |
968 | eio__futimes (int fd, const struct timeval tv[2]) |
869 | { |
969 | { |
870 | errno = ENOSYS; |
970 | errno = ENOSYS; |
871 | return -1; |
971 | return -1; |
872 | } |
972 | } |
873 | |
973 | |
… | |
… | |
876 | #if !HAVE_FDATASYNC |
976 | #if !HAVE_FDATASYNC |
877 | # undef fdatasync |
977 | # undef fdatasync |
878 | # define fdatasync(fd) fsync (fd) |
978 | # define fdatasync(fd) fsync (fd) |
879 | #endif |
979 | #endif |
880 | |
980 | |
|
|
981 | static int |
|
|
982 | eio__syncfs (int fd) |
|
|
983 | { |
|
|
984 | int res; |
|
|
985 | |
|
|
986 | #if HAVE_SYS_SYNCFS |
|
|
987 | res = (int)syscall (__NR_syncfs, (int)(fd)); |
|
|
988 | #else |
|
|
989 | res = -1; |
|
|
990 | errno = ENOSYS; |
|
|
991 | #endif |
|
|
992 | |
|
|
993 | if (res < 0 && errno == ENOSYS && fd >= 0) |
|
|
994 | sync (); |
|
|
995 | |
|
|
996 | return res; |
|
|
997 | } |
|
|
998 | |
881 | /* sync_file_range always needs emulation */ |
999 | /* sync_file_range always needs emulation */ |
882 | int |
1000 | static int |
883 | eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) |
1001 | eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) |
884 | { |
1002 | { |
885 | #if HAVE_SYNC_FILE_RANGE |
1003 | #if HAVE_SYNC_FILE_RANGE |
886 | int res; |
1004 | int res; |
887 | |
1005 | |
… | |
… | |
904 | /* even though we could play tricks with the flags, it's better to always |
1022 | /* even though we could play tricks with the flags, it's better to always |
905 | * call fdatasync, as that matches the expectation of its users best */ |
1023 | * call fdatasync, as that matches the expectation of its users best */ |
906 | return fdatasync (fd); |
1024 | return fdatasync (fd); |
907 | } |
1025 | } |
908 | |
1026 | |
|
|
1027 | static int |
|
|
1028 | eio__fallocate (int fd, int mode, off_t offset, size_t len) |
|
|
1029 | { |
|
|
1030 | #if HAVE_FALLOCATE |
|
|
1031 | return fallocate (fd, mode, offset, len); |
|
|
1032 | #else |
|
|
1033 | errno = ENOSYS; |
|
|
1034 | return -1; |
|
|
1035 | #endif |
|
|
1036 | } |
|
|
1037 | |
909 | #if !HAVE_READAHEAD |
1038 | #if !HAVE_READAHEAD |
910 | # undef readahead |
1039 | # undef readahead |
911 | # define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) |
1040 | # define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) |
912 | |
1041 | |
913 | static ssize_t |
1042 | static eio_ssize_t |
914 | eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) |
1043 | eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) |
915 | { |
1044 | { |
916 | size_t todo = count; |
1045 | size_t todo = count; |
917 | dBUF; |
1046 | dBUF; |
918 | |
1047 | |
… | |
… | |
923 | pread (fd, eio_buf, len, offset); |
1052 | pread (fd, eio_buf, len, offset); |
924 | offset += len; |
1053 | offset += len; |
925 | todo -= len; |
1054 | todo -= len; |
926 | } |
1055 | } |
927 | |
1056 | |
|
|
1057 | FUBd; |
|
|
1058 | |
928 | errno = 0; |
1059 | errno = 0; |
929 | return count; |
1060 | return count; |
930 | } |
1061 | } |
931 | |
1062 | |
932 | #endif |
1063 | #endif |
933 | |
1064 | |
934 | /* sendfile always needs emulation */ |
1065 | /* sendfile always needs emulation */ |
935 | static ssize_t |
1066 | static eio_ssize_t |
936 | eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) |
1067 | eio__sendfile (int ofd, int ifd, off_t offset, size_t count) |
937 | { |
1068 | { |
|
|
1069 | eio_ssize_t written = 0; |
938 | ssize_t res; |
1070 | eio_ssize_t res; |
939 | |
1071 | |
940 | if (!count) |
1072 | if (!count) |
941 | return 0; |
1073 | return 0; |
942 | |
1074 | |
|
|
1075 | for (;;) |
|
|
1076 | { |
|
|
1077 | #ifdef __APPLE__ |
|
|
1078 | # undef HAVE_SENDFILE /* broken, as everything on os x */ |
|
|
1079 | #endif |
943 | #if HAVE_SENDFILE |
1080 | #if HAVE_SENDFILE |
944 | # if __linux |
1081 | # if __linux |
|
|
1082 | off_t soffset = offset; |
945 | res = sendfile (ofd, ifd, &offset, count); |
1083 | res = sendfile (ofd, ifd, &soffset, count); |
946 | |
1084 | |
947 | # elif __FreeBSD__ |
1085 | # elif __FreeBSD__ |
948 | /* |
1086 | /* |
949 | * Of course, the freebsd sendfile is a dire hack with no thoughts |
1087 | * Of course, the freebsd sendfile is a dire hack with no thoughts |
950 | * wasted on making it similar to other I/O functions. |
1088 | * wasted on making it similar to other I/O functions. |
951 | */ |
1089 | */ |
952 | { |
|
|
953 | off_t sbytes; |
1090 | off_t sbytes; |
954 | res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); |
1091 | res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); |
955 | |
1092 | |
956 | #if 0 /* according to the manpage, this is correct, but broken behaviour */ |
1093 | #if 0 /* according to the manpage, this is correct, but broken behaviour */ |
957 | /* freebsd' sendfile will return 0 on success */ |
1094 | /* freebsd' sendfile will return 0 on success */ |
958 | /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ |
1095 | /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ |
959 | /* not on e.g. EIO or EPIPE - sounds broken */ |
1096 | /* not on e.g. EIO or EPIPE - sounds broken */ |
960 | if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) |
1097 | if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) |
961 | res = sbytes; |
1098 | res = sbytes; |
962 | #endif |
1099 | #endif |
963 | |
1100 | |
964 | /* according to source inspection, this is correct, and useful behaviour */ |
1101 | /* according to source inspection, this is correct, and useful behaviour */ |
965 | if (sbytes) |
1102 | if (sbytes) |
966 | res = sbytes; |
1103 | res = sbytes; |
967 | } |
|
|
968 | |
1104 | |
969 | # elif defined (__APPLE__) |
1105 | # elif defined (__APPLE__) |
970 | |
|
|
971 | { |
|
|
972 | off_t sbytes = count; |
1106 | off_t sbytes = count; |
973 | res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); |
1107 | res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); |
974 | |
1108 | |
975 | /* according to the manpage, sbytes is always valid */ |
1109 | /* according to the manpage, sbytes is always valid */ |
976 | if (sbytes) |
1110 | if (sbytes) |
977 | res = sbytes; |
1111 | res = sbytes; |
978 | } |
|
|
979 | |
1112 | |
980 | # elif __hpux |
1113 | # elif __hpux |
981 | res = sendfile (ofd, ifd, offset, count, 0, 0); |
1114 | res = sendfile (ofd, ifd, offset, count, 0, 0); |
982 | |
1115 | |
983 | # elif __solaris |
1116 | # elif __solaris |
984 | { |
|
|
985 | struct sendfilevec vec; |
1117 | struct sendfilevec vec; |
986 | size_t sbytes; |
1118 | size_t sbytes; |
987 | |
1119 | |
988 | vec.sfv_fd = ifd; |
1120 | vec.sfv_fd = ifd; |
989 | vec.sfv_flag = 0; |
1121 | vec.sfv_flag = 0; |
990 | vec.sfv_off = offset; |
1122 | vec.sfv_off = offset; |
991 | vec.sfv_len = count; |
1123 | vec.sfv_len = count; |
992 | |
1124 | |
993 | res = sendfilev (ofd, &vec, 1, &sbytes); |
1125 | res = sendfilev (ofd, &vec, 1, &sbytes); |
994 | |
1126 | |
995 | if (res < 0 && sbytes) |
1127 | if (res < 0 && sbytes) |
996 | res = sbytes; |
1128 | res = sbytes; |
997 | } |
|
|
998 | |
1129 | |
999 | # endif |
1130 | # endif |
1000 | |
1131 | |
1001 | #elif defined (_WIN32) |
1132 | #elif defined (_WIN32) && 0 |
1002 | |
|
|
1003 | /* does not work, just for documentation of what would need to be done */ |
1133 | /* does not work, just for documentation of what would need to be done */ |
1004 | { |
1134 | /* actually, cannot be done like this, as TransmitFile changes the file offset, */ |
|
|
1135 | /* libeio guarantees that the file offset does not change, and windows */ |
|
|
1136 | /* has no way to get an independent handle to the same file description */ |
1005 | HANDLE h = TO_SOCKET (ifd); |
1137 | HANDLE h = TO_SOCKET (ifd); |
1006 | SetFilePointer (h, offset, 0, FILE_BEGIN); |
1138 | SetFilePointer (h, offset, 0, FILE_BEGIN); |
1007 | res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); |
1139 | res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); |
1008 | } |
|
|
1009 | |
1140 | |
1010 | #else |
1141 | #else |
1011 | res = -1; |
1142 | res = -1; |
1012 | errno = ENOSYS; |
1143 | errno = ENOSYS; |
1013 | #endif |
1144 | #endif |
1014 | |
1145 | |
|
|
1146 | /* we assume sendfile can copy at least 128mb in one go */ |
|
|
1147 | if (res <= 128 * 1024 * 1024) |
|
|
1148 | { |
|
|
1149 | if (res > 0) |
|
|
1150 | written += res; |
|
|
1151 | |
|
|
1152 | if (written) |
|
|
1153 | return written; |
|
|
1154 | |
|
|
1155 | break; |
|
|
1156 | } |
|
|
1157 | else |
|
|
1158 | { |
|
|
1159 | /* if we requested more, then probably the kernel was lazy */ |
|
|
1160 | written += res; |
|
|
1161 | offset += res; |
|
|
1162 | count -= res; |
|
|
1163 | |
|
|
1164 | if (!count) |
|
|
1165 | return written; |
|
|
1166 | } |
|
|
1167 | } |
|
|
1168 | |
1015 | if (res < 0 |
1169 | if (res < 0 |
1016 | && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK |
1170 | && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK |
1017 | /* BSDs */ |
1171 | /* BSDs */ |
1018 | #ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ |
1172 | #ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ |
1019 | || errno == ENOTSUP |
1173 | || errno == ENOTSUP |
1020 | #endif |
1174 | #endif |
|
|
1175 | #ifdef EOPNOTSUPP /* windows */ |
1021 | || errno == EOPNOTSUPP /* BSDs */ |
1176 | || errno == EOPNOTSUPP /* BSDs */ |
|
|
1177 | #endif |
1022 | #if __solaris |
1178 | #if __solaris |
1023 | || errno == EAFNOSUPPORT || errno == EPROTOTYPE |
1179 | || errno == EAFNOSUPPORT || errno == EPROTOTYPE |
1024 | #endif |
1180 | #endif |
1025 | ) |
1181 | ) |
1026 | ) |
1182 | ) |
… | |
… | |
1030 | |
1186 | |
1031 | res = 0; |
1187 | res = 0; |
1032 | |
1188 | |
1033 | while (count) |
1189 | while (count) |
1034 | { |
1190 | { |
1035 | ssize_t cnt; |
1191 | eio_ssize_t cnt; |
1036 | |
1192 | |
1037 | cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); |
1193 | cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); |
1038 | |
1194 | |
1039 | if (cnt <= 0) |
1195 | if (cnt <= 0) |
1040 | { |
1196 | { |
… | |
… | |
1052 | |
1208 | |
1053 | offset += cnt; |
1209 | offset += cnt; |
1054 | res += cnt; |
1210 | res += cnt; |
1055 | count -= cnt; |
1211 | count -= cnt; |
1056 | } |
1212 | } |
|
|
1213 | |
|
|
1214 | FUBd; |
1057 | } |
1215 | } |
1058 | |
1216 | |
1059 | return res; |
1217 | return res; |
|
|
1218 | } |
|
|
1219 | |
|
|
1220 | #ifdef PAGESIZE |
|
|
1221 | # define eio_pagesize() PAGESIZE |
|
|
1222 | #else |
|
|
1223 | static intptr_t |
|
|
1224 | eio_pagesize (void) |
|
|
1225 | { |
|
|
1226 | static intptr_t page; |
|
|
1227 | |
|
|
1228 | if (!page) |
|
|
1229 | page = sysconf (_SC_PAGESIZE); |
|
|
1230 | |
|
|
1231 | return page; |
|
|
1232 | } |
|
|
1233 | #endif |
|
|
1234 | |
|
|
1235 | static void |
|
|
1236 | eio_page_align (void **addr, size_t *length) |
|
|
1237 | { |
|
|
1238 | intptr_t mask = eio_pagesize () - 1; |
|
|
1239 | |
|
|
1240 | /* round down addr */ |
|
|
1241 | intptr_t adj = mask & (intptr_t)*addr; |
|
|
1242 | |
|
|
1243 | *addr = (void *)((intptr_t)*addr - adj); |
|
|
1244 | *length += adj; |
|
|
1245 | |
|
|
1246 | /* round up length */ |
|
|
1247 | *length = (*length + mask) & ~mask; |
|
|
1248 | } |
|
|
1249 | |
|
|
1250 | #if !_POSIX_MEMLOCK |
|
|
1251 | # define eio__mlockall(a) EIO_ENOSYS () |
|
|
1252 | #else |
|
|
1253 | |
|
|
1254 | static int |
|
|
1255 | eio__mlockall (int flags) |
|
|
1256 | { |
|
|
1257 | #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 |
|
|
1258 | extern int mallopt (int, int); |
|
|
1259 | mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */ |
|
|
1260 | #endif |
|
|
1261 | |
|
|
1262 | if (EIO_MCL_CURRENT != MCL_CURRENT |
|
|
1263 | || EIO_MCL_FUTURE != MCL_FUTURE) |
|
|
1264 | { |
|
|
1265 | flags = 0 |
|
|
1266 | | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0) |
|
|
1267 | | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0); |
|
|
1268 | } |
|
|
1269 | |
|
|
1270 | return mlockall (flags); |
|
|
1271 | } |
|
|
1272 | #endif |
|
|
1273 | |
|
|
1274 | #if !_POSIX_MEMLOCK_RANGE |
|
|
1275 | # define eio__mlock(a,b) EIO_ENOSYS () |
|
|
1276 | #else |
|
|
1277 | |
|
|
1278 | static int |
|
|
1279 | eio__mlock (void *addr, size_t length) |
|
|
1280 | { |
|
|
1281 | eio_page_align (&addr, &length); |
|
|
1282 | |
|
|
1283 | return mlock (addr, length); |
|
|
1284 | } |
|
|
1285 | |
|
|
1286 | #endif |
|
|
1287 | |
|
|
1288 | #if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) |
|
|
1289 | # define eio__msync(a,b,c) EIO_ENOSYS () |
|
|
1290 | #else |
|
|
1291 | |
|
|
1292 | static int |
|
|
1293 | eio__msync (void *mem, size_t len, int flags) |
|
|
1294 | { |
|
|
1295 | eio_page_align (&mem, &len); |
|
|
1296 | |
|
|
1297 | if (EIO_MS_ASYNC != MS_SYNC |
|
|
1298 | || EIO_MS_INVALIDATE != MS_INVALIDATE |
|
|
1299 | || EIO_MS_SYNC != MS_SYNC) |
|
|
1300 | { |
|
|
1301 | flags = 0 |
|
|
1302 | | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0) |
|
|
1303 | | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0) |
|
|
1304 | | (flags & EIO_MS_SYNC ? MS_SYNC : 0); |
|
|
1305 | } |
|
|
1306 | |
|
|
1307 | return msync (mem, len, flags); |
|
|
1308 | } |
|
|
1309 | |
|
|
1310 | #endif |
|
|
1311 | |
|
|
1312 | static int |
|
|
1313 | eio__mtouch (eio_req *req) |
|
|
1314 | { |
|
|
1315 | void *mem = req->ptr2; |
|
|
1316 | size_t len = req->size; |
|
|
1317 | int flags = req->int1; |
|
|
1318 | |
|
|
1319 | eio_page_align (&mem, &len); |
|
|
1320 | |
|
|
1321 | { |
|
|
1322 | intptr_t addr = (intptr_t)mem; |
|
|
1323 | intptr_t end = addr + len; |
|
|
1324 | intptr_t page = eio_pagesize (); |
|
|
1325 | |
|
|
1326 | if (addr < end) |
|
|
1327 | if (flags & EIO_MT_MODIFY) /* modify */ |
|
|
1328 | do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req)); |
|
|
1329 | else |
|
|
1330 | do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req)); |
|
|
1331 | } |
|
|
1332 | |
|
|
1333 | return 0; |
|
|
1334 | } |
|
|
1335 | |
|
|
1336 | /*****************************************************************************/ |
|
|
1337 | /* requests implemented outside eio_execute, because they are so large */ |
|
|
1338 | |
|
|
1339 | static void |
|
|
1340 | eio__realpath (eio_req *req, etp_worker *self) |
|
|
1341 | { |
|
|
1342 | char *rel = req->ptr1; |
|
|
1343 | char *res; |
|
|
1344 | char *tmp1, *tmp2; |
|
|
1345 | #if SYMLOOP_MAX > 32 |
|
|
1346 | int symlinks = SYMLOOP_MAX; |
|
|
1347 | #else |
|
|
1348 | int symlinks = 32; |
|
|
1349 | #endif |
|
|
1350 | |
|
|
1351 | req->result = -1; |
|
|
1352 | |
|
|
1353 | errno = EINVAL; |
|
|
1354 | if (!rel) |
|
|
1355 | return; |
|
|
1356 | |
|
|
1357 | errno = ENOENT; |
|
|
1358 | if (!*rel) |
|
|
1359 | return; |
|
|
1360 | |
|
|
1361 | if (!req->ptr2) |
|
|
1362 | { |
|
|
1363 | X_LOCK (wrklock); |
|
|
1364 | req->flags |= EIO_FLAG_PTR2_FREE; |
|
|
1365 | X_UNLOCK (wrklock); |
|
|
1366 | req->ptr2 = malloc (PATH_MAX * 3); |
|
|
1367 | |
|
|
1368 | errno = ENOMEM; |
|
|
1369 | if (!req->ptr2) |
|
|
1370 | return; |
|
|
1371 | } |
|
|
1372 | |
|
|
1373 | res = req->ptr2; |
|
|
1374 | tmp1 = res + PATH_MAX; |
|
|
1375 | tmp2 = tmp1 + PATH_MAX; |
|
|
1376 | |
|
|
1377 | #if 0 /* disabled, the musl way to do things is just too racy */ |
|
|
1378 | #if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) |
|
|
1379 | /* on linux we may be able to ask the kernel */ |
|
|
1380 | { |
|
|
1381 | int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); |
|
|
1382 | |
|
|
1383 | if (fd >= 0) |
|
|
1384 | { |
|
|
1385 | sprintf (tmp1, "/proc/self/fd/%d", fd); |
|
|
1386 | req->result = readlink (tmp1, res, PATH_MAX); |
|
|
1387 | close (fd); |
|
|
1388 | |
|
|
1389 | /* here we should probably stat the open file and the disk file, to make sure they still match */ |
|
|
1390 | |
|
|
1391 | if (req->result > 0) |
|
|
1392 | goto done; |
|
|
1393 | } |
|
|
1394 | else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) |
|
|
1395 | return; |
|
|
1396 | } |
|
|
1397 | #endif |
|
|
1398 | #endif |
|
|
1399 | |
|
|
1400 | if (*rel != '/') |
|
|
1401 | { |
|
|
1402 | if (!getcwd (res, PATH_MAX)) |
|
|
1403 | return; |
|
|
1404 | |
|
|
1405 | if (res [1]) /* only use if not / */ |
|
|
1406 | res += strlen (res); |
|
|
1407 | } |
|
|
1408 | |
|
|
1409 | while (*rel) |
|
|
1410 | { |
|
|
1411 | eio_ssize_t len, linklen; |
|
|
1412 | char *beg = rel; |
|
|
1413 | |
|
|
1414 | while (*rel && *rel != '/') |
|
|
1415 | ++rel; |
|
|
1416 | |
|
|
1417 | len = rel - beg; |
|
|
1418 | |
|
|
1419 | if (!len) /* skip slashes */ |
|
|
1420 | { |
|
|
1421 | ++rel; |
|
|
1422 | continue; |
|
|
1423 | } |
|
|
1424 | |
|
|
1425 | if (beg [0] == '.') |
|
|
1426 | { |
|
|
1427 | if (len == 1) |
|
|
1428 | continue; /* . - nop */ |
|
|
1429 | |
|
|
1430 | if (beg [1] == '.' && len == 2) |
|
|
1431 | { |
|
|
1432 | /* .. - back up one component, if possible */ |
|
|
1433 | |
|
|
1434 | while (res != req->ptr2) |
|
|
1435 | if (*--res == '/') |
|
|
1436 | break; |
|
|
1437 | |
|
|
1438 | continue; |
|
|
1439 | } |
|
|
1440 | } |
|
|
1441 | |
|
|
1442 | errno = ENAMETOOLONG; |
|
|
1443 | if (res + 1 + len + 1 >= tmp1) |
|
|
1444 | return; |
|
|
1445 | |
|
|
1446 | /* copy one component */ |
|
|
1447 | *res = '/'; |
|
|
1448 | memcpy (res + 1, beg, len); |
|
|
1449 | |
|
|
1450 | /* zero-terminate, for readlink */ |
|
|
1451 | res [len + 1] = 0; |
|
|
1452 | |
|
|
1453 | /* now check if it's a symlink */ |
|
|
1454 | linklen = readlink (req->ptr2, tmp1, PATH_MAX); |
|
|
1455 | |
|
|
1456 | if (linklen < 0) |
|
|
1457 | { |
|
|
1458 | if (errno != EINVAL) |
|
|
1459 | return; |
|
|
1460 | |
|
|
1461 | /* it's a normal directory. hopefully */ |
|
|
1462 | res += len + 1; |
|
|
1463 | } |
|
|
1464 | else |
|
|
1465 | { |
|
|
1466 | /* yay, it was a symlink - build new path in tmp2 */ |
|
|
1467 | int rellen = strlen (rel); |
|
|
1468 | |
|
|
1469 | errno = ENAMETOOLONG; |
|
|
1470 | if (linklen + 1 + rellen >= PATH_MAX) |
|
|
1471 | return; |
|
|
1472 | |
|
|
1473 | errno = ELOOP; |
|
|
1474 | if (!--symlinks) |
|
|
1475 | return; |
|
|
1476 | |
|
|
1477 | if (*tmp1 == '/') |
|
|
1478 | res = req->ptr2; /* symlink resolves to an absolute path */ |
|
|
1479 | |
|
|
1480 | /* we need to be careful, as rel might point into tmp2 already */ |
|
|
1481 | memmove (tmp2 + linklen + 1, rel, rellen + 1); |
|
|
1482 | tmp2 [linklen] = '/'; |
|
|
1483 | memcpy (tmp2, tmp1, linklen); |
|
|
1484 | |
|
|
1485 | rel = tmp2; |
|
|
1486 | } |
|
|
1487 | } |
|
|
1488 | |
|
|
1489 | /* special case for the lone root path */ |
|
|
1490 | if (res == req->ptr2) |
|
|
1491 | *res++ = '/'; |
|
|
1492 | |
|
|
1493 | req->result = res - (char *)req->ptr2; |
|
|
1494 | |
|
|
1495 | done: |
|
|
1496 | req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */ |
1060 | } |
1497 | } |
1061 | |
1498 | |
1062 | static signed char |
1499 | static signed char |
1063 | eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) |
1500 | eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) |
1064 | { |
1501 | { |
… | |
… | |
1072 | |
1509 | |
1073 | #define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ |
1510 | #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 */ |
1511 | #define EIO_SORT_FAST 60 /* when to only use insertion sort */ |
1075 | |
1512 | |
1076 | static void |
1513 | static void |
1077 | eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) |
1514 | eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits) |
1078 | { |
1515 | { |
1079 | unsigned char bits [9 + sizeof (ino_t) * 8]; |
1516 | unsigned char bits [9 + sizeof (eio_ino_t) * 8]; |
1080 | unsigned char *bit = bits; |
1517 | unsigned char *bit = bits; |
1081 | |
1518 | |
1082 | assert (CHAR_BIT == 8); |
1519 | assert (CHAR_BIT == 8); |
1083 | assert (sizeof (eio_dirent) * 8 < 256); |
1520 | assert (sizeof (eio_dirent) * 8 < 256); |
1084 | assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ |
1521 | assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ |
… | |
… | |
1086 | |
1523 | |
1087 | if (size <= EIO_SORT_FAST) |
1524 | if (size <= EIO_SORT_FAST) |
1088 | return; |
1525 | return; |
1089 | |
1526 | |
1090 | /* first prepare an array of bits to test in our radix sort */ |
1527 | /* 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 */ |
1528 | /* try to take endianness into account, as well as differences in eio_ino_t sizes */ |
1092 | /* inode_bits must contain all inodes ORed together */ |
1529 | /* inode_bits must contain all inodes ORed together */ |
1093 | /* which is used to skip bits that are 0 everywhere, which is very common */ |
1530 | /* which is used to skip bits that are 0 everywhere, which is very common */ |
1094 | { |
1531 | { |
1095 | ino_t endianness; |
1532 | eio_ino_t endianness; |
1096 | int i, j; |
1533 | int i, j; |
1097 | |
1534 | |
1098 | /* we store the byte offset of byte n into byte n of "endianness" */ |
1535 | /* we store the byte offset of byte n into byte n of "endianness" */ |
1099 | for (i = 0; i < sizeof (ino_t); ++i) |
1536 | for (i = 0; i < sizeof (eio_ino_t); ++i) |
1100 | ((unsigned char *)&endianness)[i] = i; |
1537 | ((unsigned char *)&endianness)[i] = i; |
1101 | |
1538 | |
1102 | *bit++ = 0; |
1539 | *bit++ = 0; |
1103 | |
1540 | |
1104 | for (i = 0; i < sizeof (ino_t); ++i) |
1541 | for (i = 0; i < sizeof (eio_ino_t); ++i) |
1105 | { |
1542 | { |
1106 | /* shifting off the byte offsets out of "endianness" */ |
1543 | /* shifting off the byte offsets out of "endianness" */ |
1107 | int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; |
1544 | int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; |
1108 | endianness >>= 8; |
1545 | endianness >>= 8; |
1109 | |
1546 | |
1110 | for (j = 0; j < 8; ++j) |
1547 | for (j = 0; j < 8; ++j) |
1111 | if (inode_bits & (((ino_t)1) << (i * 8 + j))) |
1548 | if (inode_bits & (((eio_ino_t)1) << (i * 8 + j))) |
1112 | *bit++ = offs + j; |
1549 | *bit++ = offs + j; |
1113 | } |
1550 | } |
1114 | |
1551 | |
1115 | for (j = 0; j < 8; ++j) |
1552 | for (j = 0; j < 8; ++j) |
1116 | if (score_bits & (1 << j)) |
1553 | if (score_bits & (1 << j)) |
1117 | *bit++ = offsetof (eio_dirent, score) * 8 + j; |
1554 | *bit++ = offsetof (eio_dirent, score) * 8 + j; |
1118 | } |
1555 | } |
1119 | |
1556 | |
1120 | /* now actually do the sorting (a variant of MSD radix sort) */ |
1557 | /* now actually do the sorting (a variant of MSD radix sort) */ |
1121 | { |
1558 | { |
1122 | eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; |
1559 | eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base; |
1123 | eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; |
1560 | eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end; |
1124 | unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; |
1561 | unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8]; |
1125 | int stk_idx = 0; |
1562 | int stk_idx = 0; |
1126 | |
1563 | |
1127 | base_stk [stk_idx] = dents; |
1564 | base_stk [stk_idx] = dents; |
1128 | end_stk [stk_idx] = dents + size; |
1565 | end_stk [stk_idx] = dents + size; |
1129 | bit_stk [stk_idx] = bit - 1; |
1566 | bit_stk [stk_idx] = bit - 1; |
… | |
… | |
1208 | } |
1645 | } |
1209 | } |
1646 | } |
1210 | } |
1647 | } |
1211 | |
1648 | |
1212 | static void |
1649 | static void |
1213 | eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) |
1650 | eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits) |
1214 | { |
1651 | { |
1215 | if (size <= 1) |
1652 | if (size <= 1) |
1216 | return; /* our insertion sort relies on size > 0 */ |
1653 | return; /* our insertion sort relies on size > 0 */ |
1217 | |
1654 | |
1218 | /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ |
1655 | /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ |
… | |
… | |
1226 | |
1663 | |
1227 | /* read a full directory */ |
1664 | /* read a full directory */ |
1228 | static void |
1665 | static void |
1229 | eio__scandir (eio_req *req, etp_worker *self) |
1666 | eio__scandir (eio_req *req, etp_worker *self) |
1230 | { |
1667 | { |
1231 | DIR *dirp; |
|
|
1232 | EIO_STRUCT_DIRENT *entp; |
|
|
1233 | char *name, *names; |
1668 | char *name, *names; |
1234 | int namesalloc = 4096; |
1669 | int namesalloc = 4096 - sizeof (void *) * 4; |
1235 | int namesoffs = 0; |
1670 | int namesoffs = 0; |
1236 | int flags = req->int1; |
1671 | int flags = req->int1; |
1237 | eio_dirent *dents = 0; |
1672 | eio_dirent *dents = 0; |
1238 | int dentalloc = 128; |
1673 | int dentalloc = 128; |
1239 | int dentoffs = 0; |
1674 | int dentoffs = 0; |
1240 | ino_t inode_bits = 0; |
1675 | eio_ino_t inode_bits = 0; |
|
|
1676 | #ifdef _WIN32 |
|
|
1677 | HANDLE dirp; |
|
|
1678 | WIN32_FIND_DATA entp; |
|
|
1679 | #else |
|
|
1680 | DIR *dirp; |
|
|
1681 | EIO_STRUCT_DIRENT *entp; |
|
|
1682 | #endif |
1241 | |
1683 | |
1242 | req->result = -1; |
1684 | req->result = -1; |
1243 | |
1685 | |
1244 | if (!(flags & EIO_READDIR_DENTS)) |
1686 | if (!(flags & EIO_READDIR_DENTS)) |
1245 | flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); |
1687 | flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); |
1246 | |
1688 | |
1247 | X_LOCK (wrklock); |
1689 | #ifdef _WIN32 |
1248 | /* the corresponding closedir is in ETP_WORKER_CLEAR */ |
1690 | { |
|
|
1691 | int len = strlen ((const char *)req->ptr1); |
|
|
1692 | char *path = malloc (MAX_PATH); |
|
|
1693 | const char *fmt; |
|
|
1694 | |
|
|
1695 | if (!len) |
|
|
1696 | fmt = "./*"; |
|
|
1697 | else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') |
|
|
1698 | fmt = "%s*"; |
|
|
1699 | else |
|
|
1700 | fmt = "%s/*"; |
|
|
1701 | |
|
|
1702 | _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); |
|
|
1703 | dirp = FindFirstFile (path, &entp); |
|
|
1704 | free (path); |
|
|
1705 | |
|
|
1706 | if (dirp == INVALID_HANDLE_VALUE) |
|
|
1707 | { |
|
|
1708 | dirp = 0; |
|
|
1709 | |
|
|
1710 | /* should steal _dosmaperr */ |
|
|
1711 | switch (GetLastError ()) |
|
|
1712 | { |
|
|
1713 | case ERROR_FILE_NOT_FOUND: |
|
|
1714 | req->result = 0; |
|
|
1715 | break; |
|
|
1716 | |
|
|
1717 | case ERROR_INVALID_NAME: |
|
|
1718 | case ERROR_PATH_NOT_FOUND: |
|
|
1719 | case ERROR_NO_MORE_FILES: |
|
|
1720 | errno = ENOENT; |
|
|
1721 | break; |
|
|
1722 | |
|
|
1723 | case ERROR_NOT_ENOUGH_MEMORY: |
|
|
1724 | errno = ENOMEM; |
|
|
1725 | break; |
|
|
1726 | |
|
|
1727 | default: |
|
|
1728 | errno = EINVAL; |
|
|
1729 | break; |
|
|
1730 | } |
|
|
1731 | } |
|
|
1732 | } |
|
|
1733 | #else |
1249 | self->dirp = dirp = opendir (req->ptr1); |
1734 | dirp = opendir (req->ptr1); |
|
|
1735 | #endif |
|
|
1736 | |
|
|
1737 | if (req->flags & EIO_FLAG_PTR1_FREE) |
|
|
1738 | free (req->ptr1); |
1250 | |
1739 | |
1251 | req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; |
1740 | req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; |
1252 | req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; |
1741 | req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; |
1253 | req->ptr2 = names = malloc (namesalloc); |
1742 | req->ptr2 = names = malloc (namesalloc); |
1254 | X_UNLOCK (wrklock); |
|
|
1255 | |
1743 | |
1256 | if (dirp && names && (!flags || dents)) |
1744 | if (dirp && names && (!flags || dents)) |
1257 | for (;;) |
1745 | for (;;) |
1258 | { |
1746 | { |
|
|
1747 | int done; |
|
|
1748 | |
|
|
1749 | #ifdef _WIN32 |
|
|
1750 | done = !dirp; |
|
|
1751 | #else |
1259 | errno = 0; |
1752 | errno = 0; |
1260 | entp = readdir (dirp); |
1753 | entp = readdir (dirp); |
|
|
1754 | done = !entp; |
|
|
1755 | #endif |
1261 | |
1756 | |
1262 | if (!entp) |
1757 | if (done) |
1263 | { |
1758 | { |
|
|
1759 | #ifndef _WIN32 |
|
|
1760 | int old_errno = errno; |
|
|
1761 | closedir (dirp); |
|
|
1762 | errno = old_errno; |
|
|
1763 | |
1264 | if (errno) |
1764 | if (errno) |
1265 | break; |
1765 | break; |
|
|
1766 | #endif |
1266 | |
1767 | |
1267 | /* sort etc. */ |
1768 | /* sort etc. */ |
1268 | req->int1 = flags; |
1769 | req->int1 = flags; |
1269 | req->result = dentoffs; |
1770 | req->result = dentoffs; |
1270 | |
1771 | |
… | |
… | |
1279 | eio_dirent *oth = dents + dentoffs; |
1780 | eio_dirent *oth = dents + dentoffs; |
1280 | eio_dirent *dir = dents; |
1781 | eio_dirent *dir = dents; |
1281 | |
1782 | |
1282 | /* now partition dirs to the front, and non-dirs to the back */ |
1783 | /* now partition dirs to the front, and non-dirs to the back */ |
1283 | /* by walking from both sides and swapping if necessary */ |
1784 | /* by walking from both sides and swapping if necessary */ |
1284 | /* also clear score, so it doesn't influence sorting */ |
|
|
1285 | while (oth > dir) |
1785 | while (oth > dir) |
1286 | { |
1786 | { |
1287 | if (dir->type == EIO_DT_DIR) |
1787 | if (dir->type == EIO_DT_DIR) |
1288 | ++dir; |
1788 | ++dir; |
1289 | else if ((--oth)->type == EIO_DT_DIR) |
1789 | else if ((--oth)->type == EIO_DT_DIR) |
… | |
… | |
1292 | |
1792 | |
1293 | ++dir; |
1793 | ++dir; |
1294 | } |
1794 | } |
1295 | } |
1795 | } |
1296 | |
1796 | |
1297 | /* now sort the dirs only */ |
1797 | /* now sort the dirs only (dirs all have the same score) */ |
1298 | eio_dent_sort (dents, dir - dents, 0, inode_bits); |
1798 | eio_dent_sort (dents, dir - dents, 0, inode_bits); |
1299 | } |
1799 | } |
1300 | |
1800 | |
1301 | break; |
1801 | break; |
1302 | } |
1802 | } |
1303 | |
1803 | |
1304 | /* now add the entry to our list(s) */ |
1804 | /* now add the entry to our list(s) */ |
1305 | name = entp->d_name; |
1805 | name = D_NAME (entp); |
1306 | |
1806 | |
1307 | /* skip . and .. entries */ |
1807 | /* skip . and .. entries */ |
1308 | if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) |
1808 | if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) |
1309 | { |
1809 | { |
1310 | int len = D_NAMLEN (entp) + 1; |
1810 | int len = D_NAMLEN (entp) + 1; |
1311 | |
1811 | |
1312 | while (expect_false (namesoffs + len > namesalloc)) |
1812 | while (ecb_expect_false (namesoffs + len > namesalloc)) |
1313 | { |
1813 | { |
1314 | namesalloc *= 2; |
1814 | namesalloc *= 2; |
1315 | X_LOCK (wrklock); |
|
|
1316 | req->ptr2 = names = realloc (names, namesalloc); |
1815 | req->ptr2 = names = realloc (names, namesalloc); |
1317 | X_UNLOCK (wrklock); |
|
|
1318 | |
1816 | |
1319 | if (!names) |
1817 | if (!names) |
1320 | break; |
1818 | break; |
1321 | } |
1819 | } |
1322 | |
1820 | |
… | |
… | |
1324 | |
1822 | |
1325 | if (dents) |
1823 | if (dents) |
1326 | { |
1824 | { |
1327 | struct eio_dirent *ent; |
1825 | struct eio_dirent *ent; |
1328 | |
1826 | |
1329 | if (expect_false (dentoffs == dentalloc)) |
1827 | if (ecb_expect_false (dentoffs == dentalloc)) |
1330 | { |
1828 | { |
1331 | dentalloc *= 2; |
1829 | dentalloc *= 2; |
1332 | X_LOCK (wrklock); |
|
|
1333 | req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); |
1830 | req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); |
1334 | X_UNLOCK (wrklock); |
|
|
1335 | |
1831 | |
1336 | if (!dents) |
1832 | if (!dents) |
1337 | break; |
1833 | break; |
1338 | } |
1834 | } |
1339 | |
1835 | |
… | |
… | |
1419 | if (EIO_CANCELLED (req)) |
1915 | if (EIO_CANCELLED (req)) |
1420 | { |
1916 | { |
1421 | errno = ECANCELED; |
1917 | errno = ECANCELED; |
1422 | break; |
1918 | break; |
1423 | } |
1919 | } |
|
|
1920 | |
|
|
1921 | #ifdef _WIN32 |
|
|
1922 | if (!FindNextFile (dirp, &entp)) |
|
|
1923 | { |
|
|
1924 | FindClose (dirp); |
|
|
1925 | dirp = 0; |
|
|
1926 | } |
|
|
1927 | #endif |
1424 | } |
1928 | } |
1425 | } |
|
|
1426 | |
|
|
1427 | #ifdef PAGESIZE |
|
|
1428 | # define eio_pagesize() PAGESIZE |
|
|
1429 | #else |
|
|
1430 | static intptr_t |
|
|
1431 | eio_pagesize (void) |
|
|
1432 | { |
|
|
1433 | static intptr_t page; |
|
|
1434 | |
|
|
1435 | if (!page) |
|
|
1436 | page = sysconf (_SC_PAGESIZE); |
|
|
1437 | |
|
|
1438 | return page; |
|
|
1439 | } |
|
|
1440 | #endif |
|
|
1441 | |
|
|
1442 | static void |
|
|
1443 | eio_page_align (void **addr, size_t *length) |
|
|
1444 | { |
|
|
1445 | intptr_t mask = eio_pagesize () - 1; |
|
|
1446 | |
|
|
1447 | /* round down addr */ |
|
|
1448 | intptr_t adj = mask & (intptr_t)*addr; |
|
|
1449 | |
|
|
1450 | *addr = (void *)((intptr_t)*addr - adj); |
|
|
1451 | *length += adj; |
|
|
1452 | |
|
|
1453 | /* round up length */ |
|
|
1454 | *length = (*length + mask) & ~mask; |
|
|
1455 | } |
|
|
1456 | |
|
|
1457 | #if !_POSIX_MEMLOCK |
|
|
1458 | # define eio__mlockall(a) ((errno = ENOSYS), -1) |
|
|
1459 | #else |
|
|
1460 | |
|
|
1461 | static int |
|
|
1462 | eio__mlockall (int flags) |
|
|
1463 | { |
|
|
1464 | #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 |
|
|
1465 | extern int mallopt (int, int); |
|
|
1466 | mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */ |
|
|
1467 | #endif |
|
|
1468 | |
|
|
1469 | if (EIO_MCL_CURRENT != MCL_CURRENT |
|
|
1470 | || EIO_MCL_FUTURE != MCL_FUTURE) |
|
|
1471 | { |
|
|
1472 | flags = 0 |
|
|
1473 | | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0) |
|
|
1474 | | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0); |
|
|
1475 | } |
|
|
1476 | |
|
|
1477 | return mlockall (flags); |
|
|
1478 | } |
|
|
1479 | #endif |
|
|
1480 | |
|
|
1481 | #if !_POSIX_MEMLOCK_RANGE |
|
|
1482 | # define eio__mlock(a,b) ((errno = ENOSYS), -1) |
|
|
1483 | #else |
|
|
1484 | |
|
|
1485 | static int |
|
|
1486 | eio__mlock (void *addr, size_t length) |
|
|
1487 | { |
|
|
1488 | eio_page_align (&addr, &length); |
|
|
1489 | |
|
|
1490 | return mlock (addr, length); |
|
|
1491 | } |
|
|
1492 | |
|
|
1493 | #endif |
|
|
1494 | |
|
|
1495 | #if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) |
|
|
1496 | # define eio__msync(a,b,c) ((errno = ENOSYS), -1) |
|
|
1497 | #else |
|
|
1498 | |
|
|
1499 | int |
|
|
1500 | eio__msync (void *mem, size_t len, int flags) |
|
|
1501 | { |
|
|
1502 | eio_page_align (&mem, &len); |
|
|
1503 | |
|
|
1504 | if (EIO_MS_ASYNC != MS_SYNC |
|
|
1505 | || EIO_MS_INVALIDATE != MS_INVALIDATE |
|
|
1506 | || EIO_MS_SYNC != MS_SYNC) |
|
|
1507 | { |
|
|
1508 | flags = 0 |
|
|
1509 | | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0) |
|
|
1510 | | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0) |
|
|
1511 | | (flags & EIO_MS_SYNC ? MS_SYNC : 0); |
|
|
1512 | } |
|
|
1513 | |
|
|
1514 | return msync (mem, len, flags); |
|
|
1515 | } |
|
|
1516 | |
|
|
1517 | #endif |
|
|
1518 | |
|
|
1519 | int |
|
|
1520 | eio__mtouch (void *mem, size_t len, int flags) |
|
|
1521 | { |
|
|
1522 | eio_page_align (&mem, &len); |
|
|
1523 | |
|
|
1524 | { |
|
|
1525 | intptr_t addr = (intptr_t)mem; |
|
|
1526 | intptr_t end = addr + len; |
|
|
1527 | intptr_t page = eio_pagesize (); |
|
|
1528 | |
|
|
1529 | if (addr < end) |
|
|
1530 | if (flags & EIO_MT_MODIFY) /* modify */ |
|
|
1531 | do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); |
|
|
1532 | else |
|
|
1533 | do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); |
|
|
1534 | } |
|
|
1535 | |
|
|
1536 | return 0; |
|
|
1537 | } |
1929 | } |
1538 | |
1930 | |
1539 | /*****************************************************************************/ |
1931 | /*****************************************************************************/ |
1540 | |
1932 | |
1541 | #define ALLOC(len) \ |
1933 | #define ALLOC(len) \ |
… | |
… | |
1557 | { |
1949 | { |
1558 | ETP_REQ *req; |
1950 | ETP_REQ *req; |
1559 | struct timespec ts; |
1951 | struct timespec ts; |
1560 | etp_worker *self = (etp_worker *)thr_arg; |
1952 | etp_worker *self = (etp_worker *)thr_arg; |
1561 | |
1953 | |
|
|
1954 | #if HAVE_PRCTL_SET_NAME |
|
|
1955 | prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0); |
|
|
1956 | #endif |
|
|
1957 | |
1562 | /* try to distribute timeouts somewhat randomly */ |
1958 | /* try to distribute timeouts somewhat evenly */ |
1563 | ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); |
1959 | ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); |
1564 | |
1960 | |
1565 | for (;;) |
1961 | for (;;) |
1566 | { |
1962 | { |
|
|
1963 | ts.tv_sec = 0; |
|
|
1964 | |
1567 | X_LOCK (reqlock); |
1965 | X_LOCK (reqlock); |
1568 | |
1966 | |
1569 | for (;;) |
1967 | for (;;) |
1570 | { |
1968 | { |
1571 | self->req = req = reqq_shift (&req_queue); |
1969 | self->req = req = reqq_shift (&req_queue); |
1572 | |
1970 | |
1573 | if (req) |
1971 | if (req) |
1574 | break; |
1972 | break; |
1575 | |
1973 | |
|
|
1974 | if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ |
|
|
1975 | { |
|
|
1976 | X_UNLOCK (reqlock); |
|
|
1977 | X_LOCK (wrklock); |
|
|
1978 | --started; |
|
|
1979 | X_UNLOCK (wrklock); |
|
|
1980 | goto quit; |
|
|
1981 | } |
|
|
1982 | |
1576 | ++idle; |
1983 | ++idle; |
1577 | |
1984 | |
1578 | ts.tv_sec = time (0) + idle_timeout; |
1985 | if (idle <= max_idle) |
1579 | if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) |
1986 | /* we are allowed to idle, so do so without any timeout */ |
|
|
1987 | X_COND_WAIT (reqwait, reqlock); |
|
|
1988 | else |
1580 | { |
1989 | { |
1581 | if (idle > max_idle) |
1990 | /* initialise timeout once */ |
1582 | { |
1991 | if (!ts.tv_sec) |
1583 | --idle; |
1992 | ts.tv_sec = time (0) + idle_timeout; |
1584 | X_UNLOCK (reqlock); |
|
|
1585 | X_LOCK (wrklock); |
|
|
1586 | --started; |
|
|
1587 | X_UNLOCK (wrklock); |
|
|
1588 | goto quit; |
|
|
1589 | } |
|
|
1590 | |
1993 | |
1591 | /* we are allowed to idle, so do so without any timeout */ |
|
|
1592 | X_COND_WAIT (reqwait, reqlock); |
1994 | if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) |
|
|
1995 | ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */ |
1593 | } |
1996 | } |
1594 | |
1997 | |
1595 | --idle; |
1998 | --idle; |
1596 | } |
1999 | } |
1597 | |
2000 | |
… | |
… | |
1600 | X_UNLOCK (reqlock); |
2003 | X_UNLOCK (reqlock); |
1601 | |
2004 | |
1602 | if (req->type < 0) |
2005 | if (req->type < 0) |
1603 | goto quit; |
2006 | goto quit; |
1604 | |
2007 | |
1605 | if (!EIO_CANCELLED (req)) |
|
|
1606 | ETP_EXECUTE (self, req); |
2008 | ETP_EXECUTE (self, req); |
1607 | |
2009 | |
1608 | X_LOCK (reslock); |
2010 | X_LOCK (reslock); |
1609 | |
2011 | |
1610 | ++npending; |
2012 | ++npending; |
1611 | |
2013 | |
… | |
… | |
1626 | return 0; |
2028 | return 0; |
1627 | } |
2029 | } |
1628 | |
2030 | |
1629 | /*****************************************************************************/ |
2031 | /*****************************************************************************/ |
1630 | |
2032 | |
|
|
2033 | int ecb_cold |
1631 | int eio_init (void (*want_poll)(void), void (*done_poll)(void)) |
2034 | eio_init (void (*want_poll)(void), void (*done_poll)(void)) |
1632 | { |
2035 | { |
|
|
2036 | #if !HAVE_PREADWRITE |
|
|
2037 | X_MUTEX_CREATE (preadwritelock); |
|
|
2038 | #endif |
|
|
2039 | |
1633 | return etp_init (want_poll, done_poll); |
2040 | return etp_init (want_poll, done_poll); |
1634 | } |
2041 | } |
1635 | |
2042 | |
|
|
2043 | ecb_inline void |
1636 | static void eio_api_destroy (eio_req *req) |
2044 | eio_api_destroy (eio_req *req) |
1637 | { |
2045 | { |
1638 | free (req); |
2046 | free (req); |
1639 | } |
2047 | } |
1640 | |
2048 | |
1641 | #define REQ(rtype) \ |
2049 | #define REQ(rtype) \ |
… | |
… | |
1660 | { \ |
2068 | { \ |
1661 | eio_api_destroy (req); \ |
2069 | eio_api_destroy (req); \ |
1662 | return 0; \ |
2070 | return 0; \ |
1663 | } |
2071 | } |
1664 | |
2072 | |
|
|
2073 | static void |
1665 | static void eio_execute (etp_worker *self, eio_req *req) |
2074 | eio_execute (etp_worker *self, eio_req *req) |
1666 | { |
2075 | { |
|
|
2076 | if (ecb_expect_false (EIO_CANCELLED (req))) |
|
|
2077 | { |
|
|
2078 | req->result = -1; |
|
|
2079 | req->errorno = ECANCELED; |
|
|
2080 | return; |
|
|
2081 | } |
|
|
2082 | |
1667 | switch (req->type) |
2083 | switch (req->type) |
1668 | { |
2084 | { |
1669 | case EIO_READ: ALLOC (req->size); |
2085 | case EIO_READ: ALLOC (req->size); |
1670 | req->result = req->offs >= 0 |
2086 | req->result = req->offs >= 0 |
1671 | ? pread (req->int1, req->ptr2, req->size, req->offs) |
2087 | ? pread (req->int1, req->ptr2, req->size, req->offs) |
… | |
… | |
1673 | case EIO_WRITE: req->result = req->offs >= 0 |
2089 | case EIO_WRITE: req->result = req->offs >= 0 |
1674 | ? pwrite (req->int1, req->ptr2, req->size, req->offs) |
2090 | ? pwrite (req->int1, req->ptr2, req->size, req->offs) |
1675 | : write (req->int1, req->ptr2, req->size); break; |
2091 | : write (req->int1, req->ptr2, req->size); break; |
1676 | |
2092 | |
1677 | case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; |
2093 | case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; |
1678 | case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; |
2094 | case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; |
1679 | |
2095 | |
1680 | case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); |
2096 | case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); |
1681 | req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; |
2097 | req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; |
1682 | case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); |
2098 | case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); |
1683 | req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; |
2099 | req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; |
… | |
… | |
1705 | case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; |
2121 | case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; |
1706 | case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; |
2122 | case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; |
1707 | case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; |
2123 | case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; |
1708 | case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; |
2124 | case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; |
1709 | |
2125 | |
|
|
2126 | case EIO_REALPATH: eio__realpath (req, self); break; |
|
|
2127 | |
1710 | case EIO_READLINK: ALLOC (PATH_MAX); |
2128 | case EIO_READLINK: ALLOC (PATH_MAX); |
1711 | req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; |
2129 | req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; |
1712 | |
2130 | |
1713 | case EIO_SYNC: req->result = 0; sync (); break; |
2131 | case EIO_SYNC: req->result = 0; sync (); break; |
1714 | case EIO_FSYNC: req->result = fsync (req->int1); break; |
2132 | case EIO_FSYNC: req->result = fsync (req->int1); break; |
1715 | case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; |
2133 | case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; |
|
|
2134 | case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; |
|
|
2135 | case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; |
1716 | case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; |
2136 | case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; |
1717 | case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; |
2137 | case EIO_MTOUCH: req->result = eio__mtouch (req); break; |
1718 | case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; |
2138 | case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; |
1719 | case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; |
2139 | case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; |
1720 | case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; |
2140 | case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; |
1721 | |
2141 | |
1722 | case EIO_READDIR: eio__scandir (req, self); break; |
2142 | case EIO_READDIR: eio__scandir (req, self); break; |
1723 | |
2143 | |
1724 | case EIO_BUSY: |
2144 | case EIO_BUSY: |
1725 | #ifdef _WIN32 |
2145 | #ifdef _WIN32 |
… | |
… | |
1766 | case EIO_NOP: |
2186 | case EIO_NOP: |
1767 | req->result = 0; |
2187 | req->result = 0; |
1768 | break; |
2188 | break; |
1769 | |
2189 | |
1770 | case EIO_CUSTOM: |
2190 | case EIO_CUSTOM: |
1771 | ((void (*)(eio_req *))req->feed) (req); |
2191 | req->feed (req); |
1772 | break; |
2192 | break; |
1773 | |
2193 | |
1774 | default: |
2194 | default: |
1775 | errno = ENOSYS; |
2195 | errno = ENOSYS; |
1776 | req->result = -1; |
2196 | req->result = -1; |
… | |
… | |
1805 | eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) |
2225 | eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) |
1806 | { |
2226 | { |
1807 | REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; |
2227 | REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; |
1808 | } |
2228 | } |
1809 | |
2229 | |
|
|
2230 | eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) |
|
|
2231 | { |
|
|
2232 | REQ (EIO_FDATASYNC); req->int1 = fd; SEND; |
|
|
2233 | } |
|
|
2234 | |
|
|
2235 | eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data) |
|
|
2236 | { |
|
|
2237 | REQ (EIO_SYNCFS); req->int1 = fd; SEND; |
|
|
2238 | } |
|
|
2239 | |
|
|
2240 | eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) |
|
|
2241 | { |
|
|
2242 | REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; |
|
|
2243 | } |
|
|
2244 | |
1810 | eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) |
2245 | eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) |
1811 | { |
2246 | { |
1812 | REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; |
2247 | REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; |
1813 | } |
2248 | } |
1814 | |
2249 | |
… | |
… | |
1820 | eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) |
2255 | eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) |
1821 | { |
2256 | { |
1822 | REQ (EIO_MLOCKALL); req->int1 = flags; SEND; |
2257 | REQ (EIO_MLOCKALL); req->int1 = flags; SEND; |
1823 | } |
2258 | } |
1824 | |
2259 | |
1825 | eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) |
2260 | eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) |
1826 | { |
2261 | { |
1827 | REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; |
2262 | REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; |
1828 | } |
|
|
1829 | |
|
|
1830 | eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) |
|
|
1831 | { |
|
|
1832 | REQ (EIO_FDATASYNC); req->int1 = fd; SEND; |
|
|
1833 | } |
2263 | } |
1834 | |
2264 | |
1835 | eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) |
2265 | eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) |
1836 | { |
2266 | { |
1837 | REQ (EIO_CLOSE); req->int1 = fd; SEND; |
2267 | REQ (EIO_CLOSE); req->int1 = fd; SEND; |
… | |
… | |
1875 | eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) |
2305 | eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) |
1876 | { |
2306 | { |
1877 | REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; |
2307 | REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; |
1878 | } |
2308 | } |
1879 | |
2309 | |
1880 | eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) |
2310 | eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data) |
1881 | { |
2311 | { |
1882 | REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; |
2312 | REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; |
1883 | } |
2313 | } |
1884 | |
2314 | |
1885 | eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) |
2315 | eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) |
… | |
… | |
1905 | eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) |
2335 | eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) |
1906 | { |
2336 | { |
1907 | REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; |
2337 | REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; |
1908 | } |
2338 | } |
1909 | |
2339 | |
1910 | eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) |
2340 | eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data) |
1911 | { |
2341 | { |
1912 | REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; |
2342 | REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; |
1913 | } |
2343 | } |
1914 | |
2344 | |
1915 | eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) |
2345 | eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) |
… | |
… | |
1929 | } |
2359 | } |
1930 | |
2360 | |
1931 | eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) |
2361 | eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) |
1932 | { |
2362 | { |
1933 | return eio__1path (EIO_READLINK, path, pri, cb, data); |
2363 | return eio__1path (EIO_READLINK, path, pri, cb, data); |
|
|
2364 | } |
|
|
2365 | |
|
|
2366 | eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data) |
|
|
2367 | { |
|
|
2368 | return eio__1path (EIO_REALPATH, path, pri, cb, data); |
1934 | } |
2369 | } |
1935 | |
2370 | |
1936 | eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) |
2371 | eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) |
1937 | { |
2372 | { |
1938 | return eio__1path (EIO_STAT, path, pri, cb, data); |
2373 | return eio__1path (EIO_STAT, path, pri, cb, data); |
… | |
… | |
1997 | eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) |
2432 | eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) |
1998 | { |
2433 | { |
1999 | return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); |
2434 | return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); |
2000 | } |
2435 | } |
2001 | |
2436 | |
2002 | eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) |
2437 | eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) |
2003 | { |
2438 | { |
2004 | REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; |
2439 | REQ (EIO_CUSTOM); req->feed = execute; SEND; |
2005 | } |
2440 | } |
2006 | |
2441 | |
2007 | #endif |
2442 | #endif |
2008 | |
2443 | |
2009 | eio_req *eio_grp (eio_cb cb, void *data) |
2444 | eio_req *eio_grp (eio_cb cb, void *data) |
… | |
… | |
2018 | #undef SEND |
2453 | #undef SEND |
2019 | |
2454 | |
2020 | /*****************************************************************************/ |
2455 | /*****************************************************************************/ |
2021 | /* grp functions */ |
2456 | /* grp functions */ |
2022 | |
2457 | |
|
|
2458 | void |
2023 | void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) |
2459 | eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) |
2024 | { |
2460 | { |
2025 | grp->int2 = limit; |
2461 | grp->int2 = limit; |
2026 | grp->feed = feed; |
2462 | grp->feed = feed; |
2027 | |
2463 | |
2028 | grp_try_feed (grp); |
2464 | grp_try_feed (grp); |
2029 | } |
2465 | } |
2030 | |
2466 | |
|
|
2467 | void |
2031 | void eio_grp_limit (eio_req *grp, int limit) |
2468 | eio_grp_limit (eio_req *grp, int limit) |
2032 | { |
2469 | { |
2033 | grp->int2 = limit; |
2470 | grp->int2 = limit; |
2034 | |
2471 | |
2035 | grp_try_feed (grp); |
2472 | grp_try_feed (grp); |
2036 | } |
2473 | } |
2037 | |
2474 | |
|
|
2475 | void |
2038 | void eio_grp_add (eio_req *grp, eio_req *req) |
2476 | eio_grp_add (eio_req *grp, eio_req *req) |
2039 | { |
2477 | { |
2040 | assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); |
2478 | assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); |
2041 | |
2479 | |
2042 | grp->flags |= EIO_FLAG_GROUPADD; |
2480 | grp->flags |= EIO_FLAG_GROUPADD; |
2043 | |
2481 | |
… | |
… | |
2054 | } |
2492 | } |
2055 | |
2493 | |
2056 | /*****************************************************************************/ |
2494 | /*****************************************************************************/ |
2057 | /* misc garbage */ |
2495 | /* misc garbage */ |
2058 | |
2496 | |
|
|
2497 | eio_ssize_t |
2059 | ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) |
2498 | eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) |
2060 | { |
2499 | { |
2061 | etp_worker wrk; |
|
|
2062 | ssize_t ret; |
|
|
2063 | |
|
|
2064 | wrk.dbuf = 0; |
|
|
2065 | |
|
|
2066 | ret = eio__sendfile (ofd, ifd, offset, count, &wrk); |
2500 | return eio__sendfile (ofd, ifd, offset, count); |
2067 | |
|
|
2068 | if (wrk.dbuf) |
|
|
2069 | free (wrk.dbuf); |
|
|
2070 | |
|
|
2071 | return ret; |
|
|
2072 | } |
2501 | } |
2073 | |
2502 | |