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.152 by root, Fri Aug 17 17:16:22 2018 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,2012,2013,2016,2017 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 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
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"
41
42#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE
44#endif
45#include "xthread.h" 45#include "ecb.h"
46 46
47#include <errno.h> 47#include <errno.h>
48#include <stddef.h> 48#include <stddef.h>
49#include <stdlib.h> 49#include <stdlib.h>
50#include <string.h> 50#include <string.h>
… …
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <limits.h> 54#include <limits.h>
55#include <fcntl.h> 55#include <fcntl.h>
56#include <assert.h> 56#include <assert.h>
57 57
58/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
59/* intptr_t only comes from stdint.h, says idiot openbsd coder */
60#if HAVE_STDINT_H
61# include <stdint.h>
62#endif
63
64#ifndef ECANCELED
65# define ECANCELED EDOM
66#endif
67#ifndef ELOOP
68# define ELOOP EDOM
69#endif
70
71#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
72# define ENOTSOCK WSAENOTSOCK
73#endif
74
75static void eio_destroy (eio_req *req);
76
58#ifndef EIO_FINISH 77#ifndef EIO_FINISH
59# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 78# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
60#endif 79#endif
61 80
62#ifndef EIO_DESTROY 81#ifndef EIO_DESTROY
… …
65 84
66#ifndef EIO_FEED 85#ifndef EIO_FEED
67# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 86# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
68#endif 87#endif
69 88
89#ifndef EIO_FD_TO_WIN32_HANDLE
90# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
91#endif
92#ifndef EIO_WIN32_HANDLE_TO_FD
93# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
94#endif
95
96#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
97
98#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
99
70#ifdef _WIN32 100#ifdef _WIN32
71 101
72 /*doh*/ 102 #undef PAGESIZE
103 #define PAGESIZE 4096 /* GetSystemInfo? */
104
105 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
106
107 #ifdef EIO_STRUCT_STATI64
108 /* look at perl's non-sloppy stat */
109 #define stat(path,buf) _stati64 (path,buf)
110 #define fstat(fd,buf) _fstati64 (fd,buf)
111 #endif
112 #define lstat(path,buf) stat (path,buf)
113 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
114 #define mkdir(path,mode) _mkdir (path)
115 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
116
117 #define chmod(path,mode) _chmod (path, mode)
118 #define dup(fd) _dup (fd)
119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
124 #define fchmod(fd,mode) EIO_ENOSYS ()
125 #define chown(path,uid,gid) EIO_ENOSYS ()
126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
129 #define mknod(path,mode,dev) EIO_ENOSYS ()
130 #define sync() EIO_ENOSYS ()
131 #define readlink(path,buf,s) EIO_ENOSYS ()
132 #define statvfs(path,buf) EIO_ENOSYS ()
133 #define fstatvfs(fd,buf) EIO_ENOSYS ()
134
135 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
136 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
137
138 #if __GNUC__
139 typedef long long eio_off_t; /* signed for compatibility to msvc */
140 #else
141 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
142 #endif
143
144 static eio_ssize_t
145 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
146 {
147 OVERLAPPED o = { 0 };
148 DWORD got;
149
150 o.Offset = offset;
151 o.OffsetHigh = offset >> 32;
152
153 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
154 ? got : -1;
155 }
156
157 static eio_ssize_t
158 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
159 {
160 OVERLAPPED o = { 0 };
161 DWORD got;
162
163 o.Offset = offset;
164 o.OffsetHigh = offset >> 32;
165
166 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
167 ? got : -1;
168 }
169
170 /* rename() uses MoveFile, which fails to overwrite */
171 #define rename(old,neu) eio__rename (old, neu)
172
173 static int
174 eio__rename (const char *old, const char *neu)
175 {
176 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
177 return 0;
178
179 /* should steal _dosmaperr */
180 switch (GetLastError ())
181 {
182 case ERROR_FILE_NOT_FOUND:
183 case ERROR_PATH_NOT_FOUND:
184 case ERROR_INVALID_DRIVE:
185 case ERROR_NO_MORE_FILES:
186 case ERROR_BAD_NETPATH:
187 case ERROR_BAD_NET_NAME:
188 case ERROR_BAD_PATHNAME:
189 case ERROR_FILENAME_EXCED_RANGE:
190 errno = ENOENT;
191 break;
192
193 default:
194 errno = EACCES;
195 break;
196 }
197
198 return -1;
199 }
200
201 /* we could even stat and see if it exists */
202 static int
203 symlink (const char *old, const char *neu)
204 {
205 #if WINVER >= 0x0600
206 int flags;
207
208 /* This tries out all combinations of SYMBOLIC_LINK_FLAG_DIRECTORY
209 * and SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE,
210 * with directory first.
211 */
212 for (flags = 3; flags >= 0; --flags)
213 if (CreateSymbolicLink (neu, old, flags))
214 return 0;
215 #endif
216
217 return EIO_ERRNO (ENOENT, -1);
218 }
219
220 /* POSIX API only, causing trouble for win32 apps */
221 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
222 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
223
224 struct statvfs
225 {
226 int dummy;
227 };
228
229 #define DT_DIR EIO_DT_DIR
230 #define DT_REG EIO_DT_REG
231 #define D_NAME(entp) entp.cFileName
232 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
73 233
74#else 234#else
75 235
76# include "config.h" 236 #include <sys/ioctl.h>
77# include <sys/time.h> 237 #include <sys/time.h>
78# include <sys/select.h> 238 #include <sys/select.h>
79# include <unistd.h> 239 #include <unistd.h>
240 #include <signal.h>
241 #include <dirent.h>
242
243 #ifdef ANDROID
244 #include <sys/vfs.h>
245 #define statvfs statfs
246 #define fstatvfs fstatfs
247 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
248 #else
249 #include <sys/statvfs.h>
250 #endif
251
252 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
253 #include <sys/mman.h>
254 #endif
255
256 #define D_NAME(entp) entp->d_name
257
258 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
259 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
260 #define _DIRENT_HAVE_D_TYPE /* sigh */
261 #define D_INO(de) (de)->d_fileno
262 #define D_NAMLEN(de) (de)->d_namlen
263 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
264 #define D_INO(de) (de)->d_ino
265 #endif
266
267 #ifdef _D_EXACT_NAMLEN
268 #undef D_NAMLEN
269 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
270 #endif
271
272 #ifdef _DIRENT_HAVE_D_TYPE
273 #define D_TYPE(de) (de)->d_type
274 #endif
275
276 #ifndef EIO_STRUCT_DIRENT
277 #define EIO_STRUCT_DIRENT struct dirent
278 #endif
279
280#endif
281
282#if HAVE_UTIMES
80# include <utime.h> 283# include <utime.h>
81# include <signal.h>
82# include <dirent.h>
83
84# ifndef EIO_STRUCT_DIRENT
85# define EIO_STRUCT_DIRENT struct dirent
86# endif 284#endif
87 285
286#if HAVE_SYS_SYSCALL_H
287# include <sys/syscall.h>
88#endif 288#endif
89 289
90#if HAVE_SENDFILE 290#if HAVE_SENDFILE
91# if __linux 291# if __linux
92# include <sys/sendfile.h> 292# include <sys/sendfile.h>
93# elif __freebsd 293# elif __FreeBSD__ || defined __APPLE__
94# include <sys/socket.h> 294# include <sys/socket.h>
95# include <sys/uio.h> 295# include <sys/uio.h>
96# elif __hpux 296# elif __hpux
97# include <sys/socket.h> 297# include <sys/socket.h>
98# elif __solaris /* not yet */ 298# elif __solaris
99# include <sys/sendfile.h> 299# include <sys/sendfile.h>
100# else 300# else
101# error sendfile support requested but not available 301# error sendfile support requested but not available
102# endif 302# endif
103#endif 303#endif
104 304
105/* number of seconds after which an idle threads exit */ 305#if HAVE_RENAMEAT2
106#define IDLE_TIMEOUT 10 306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
310#ifndef D_TYPE
311# define D_TYPE(de) 0
312#endif
313#ifndef D_INO
314# define D_INO(de) 0
315#endif
316#ifndef D_NAMLEN
317# define D_NAMLEN(entp) strlen (D_NAME (entp))
318#endif
107 319
108/* used for struct dirent, AIX doesn't provide it */ 320/* used for struct dirent, AIX doesn't provide it */
109#ifndef NAME_MAX 321#ifndef NAME_MAX
110# define NAME_MAX 4096 322# define NAME_MAX 4096
111#endif 323#endif
112 324
325/* used for readlink etc. */
326#ifndef PATH_MAX
327# define PATH_MAX 0
328#endif
329
330#ifndef O_CLOEXEC
331 #define O_CLOEXEC 0
332#endif
333
334#ifndef EIO_PATH_MIN
335# define EIO_PATH_MIN 8160
336#endif
337
338#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
339
113/* buffer size for various temporary buffers */ 340/* buffer size for various temporary buffers */
114#define EIO_BUFSIZE 65536 341#define EIO_BUFSIZE 65536
115 342
116#define dBUF \ 343#define dBUF \
117 char *eio_buf; \
118 ETP_WORKER_LOCK (self); \
119 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 344 char *eio_buf = malloc (EIO_BUFSIZE); \
120 ETP_WORKER_UNLOCK (self); \
121 errno = ENOMEM; \ 345 errno = ENOMEM; \
122 if (!eio_buf) \ 346 if (!eio_buf) \
123 return -1; 347 return -1
124 348
125#define EIO_TICKS ((1000000 + 1023) >> 10) 349#define FUBd \
350 free (eio_buf)
126 351
127/*****************************************************************************/ 352/*****************************************************************************/
128 353
129#if __GNUC__ >= 3 354struct etp_tmpbuf;
130# define expect(expr,value) __builtin_expect ((expr),(value)) 355
356#if _POSIX_VERSION >= 200809L
357 #define HAVE_AT 1
358 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
359 #ifndef O_SEARCH
360 #define O_SEARCH O_RDONLY
361 #endif
131#else 362#else
132# define expect(expr,value) (expr) 363 #define HAVE_AT 0
364 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
133#endif 365#endif
134 366
135#define expect_false(expr) expect ((expr) != 0, 0) 367struct eio_pwd
136#define expect_true(expr) expect ((expr) != 0, 1) 368{
369#if HAVE_AT
370 int fd;
371#endif
372 int len;
373 char str[1]; /* actually, a 0-terminated canonical path */
374};
137 375
138/*****************************************************************************/ 376/*****************************************************************************/
139 377
140#define ETP_PRI_MIN EIO_PRI_MIN 378#define ETP_PRI_MIN EIO_PRI_MIN
141#define ETP_PRI_MAX EIO_PRI_MAX 379#define ETP_PRI_MAX EIO_PRI_MAX
142 380
381#define ETP_TYPE_QUIT -1
382#define ETP_TYPE_GROUP EIO_GROUP
383
384static void eio_nop_callback (void) { }
385static void (*eio_want_poll_cb)(void) = eio_nop_callback;
386static void (*eio_done_poll_cb)(void) = eio_nop_callback;
387
388#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
389#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
390
143struct etp_worker; 391struct etp_worker;
144
145#define ETP_REQ eio_req 392#define ETP_REQ eio_req
146#define ETP_DESTROY(req) eio_destroy (req) 393#define ETP_DESTROY(req) eio_destroy (req)
147static int eio_finish (eio_req *req); 394static int eio_finish (eio_req *req);
148#define ETP_FINISH(req) eio_finish (req) 395#define ETP_FINISH(req) eio_finish (req)
149static void eio_execute (struct etp_worker *self, eio_req *req); 396static void eio_execute (struct etp_worker *self, eio_req *req);
150#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 397#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
151 398
152#define ETP_WORKER_CLEAR(req) \ 399#include "etp.c"
153 if (wrk->dbuf) \ 400
154 { \ 401static struct etp_pool eio_pool;
155 free (wrk->dbuf); \ 402#define EIO_POOL (&eio_pool)
156 wrk->dbuf = 0; \
157 } \
158 \
159 if (wrk->dirp) \
160 { \
161 closedir (wrk->dirp); \
162 wrk->dirp = 0; \
163 }
164#define ETP_WORKER_COMMON \
165 void *dbuf; \
166 DIR *dirp;
167 403
168/*****************************************************************************/ 404/*****************************************************************************/
169 405
170#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
171
172/* calculcate time difference in ~1/EIO_TICKS of a second */
173static int tvdiff (struct timeval *tv1, struct timeval *tv2)
174{
175 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
176 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
177}
178
179static unsigned int started, idle, wanted = 4;
180
181static void (*want_poll_cb) (void);
182static void (*done_poll_cb) (void);
183
184static unsigned int max_poll_time; /* reslock */
185static unsigned int max_poll_reqs; /* reslock */
186
187static volatile unsigned int nreqs; /* reqlock */
188static volatile unsigned int nready; /* reqlock */
189static volatile unsigned int npending; /* reqlock */
190static volatile unsigned int max_idle = 4;
191
192static mutex_t wrklock = X_MUTEX_INIT;
193static mutex_t reslock = X_MUTEX_INIT;
194static mutex_t reqlock = X_MUTEX_INIT;
195static cond_t reqwait = X_COND_INIT;
196
197#if !HAVE_PREADWRITE
198/*
199 * make our pread/pwrite emulation safe against themselves, but not against
200 * normal read/write by using a mutex. slows down execution a lot,
201 * but that's your problem, not mine.
202 */
203static mutex_t preadwritelock = X_MUTEX_INIT;
204#endif
205
206typedef struct etp_worker
207{
208 /* locked by wrklock */
209 struct etp_worker *prev, *next;
210
211 thread_t tid;
212
213 /* locked by reslock, reqlock or wrklock */
214 ETP_REQ *req; /* currently processed request */
215
216 ETP_WORKER_COMMON
217} etp_worker;
218
219static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
220
221#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
222#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
223
224/* worker threads management */
225
226static void etp_worker_clear (etp_worker *wrk)
227{
228 ETP_WORKER_CLEAR (wrk);
229}
230
231static void etp_worker_free (etp_worker *wrk)
232{
233 wrk->next->prev = wrk->prev;
234 wrk->prev->next = wrk->next;
235
236 free (wrk);
237}
238
239static unsigned int etp_nreqs (void)
240{
241 int retval;
242 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
243 retval = nreqs;
244 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
245 return retval;
246}
247
248static unsigned int etp_nready (void)
249{
250 unsigned int retval;
251
252 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
253 retval = nready;
254 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
255
256 return retval;
257}
258
259static unsigned int etp_npending (void)
260{
261 unsigned int retval;
262
263 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
264 retval = npending;
265 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
266
267 return retval;
268}
269
270static unsigned int etp_nthreads (void)
271{
272 unsigned int retval;
273
274 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
275 retval = started;
276 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
277
278 return retval;
279}
280
281/*
282 * a somewhat faster data structure might be nice, but
283 * with 8 priorities this actually needs <20 insns
284 * per shift, the most expensive operation.
285 */
286typedef struct {
287 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
288 int size;
289} etp_reqq;
290
291static etp_reqq req_queue;
292static etp_reqq res_queue;
293
294static int reqq_push (etp_reqq *q, ETP_REQ *req)
295{
296 int pri = req->pri;
297 req->next = 0;
298
299 if (q->qe[pri])
300 {
301 q->qe[pri]->next = req;
302 q->qe[pri] = req;
303 }
304 else
305 q->qe[pri] = q->qs[pri] = req;
306
307 return q->size++;
308}
309
310static ETP_REQ *reqq_shift (etp_reqq *q)
311{
312 int pri;
313
314 if (!q->size)
315 return 0;
316
317 --q->size;
318
319 for (pri = ETP_NUM_PRI; pri--; )
320 {
321 eio_req *req = q->qs[pri];
322
323 if (req)
324 {
325 if (!(q->qs[pri] = (eio_req *)req->next))
326 q->qe[pri] = 0;
327
328 return req;
329 }
330 }
331
332 abort ();
333}
334
335static void etp_atfork_prepare (void)
336{
337 X_LOCK (wrklock);
338 X_LOCK (reqlock);
339 X_LOCK (reslock);
340#if !HAVE_PREADWRITE
341 X_LOCK (preadwritelock);
342#endif
343}
344
345static void etp_atfork_parent (void)
346{
347#if !HAVE_PREADWRITE
348 X_UNLOCK (preadwritelock);
349#endif
350 X_UNLOCK (reslock);
351 X_UNLOCK (reqlock);
352 X_UNLOCK (wrklock);
353}
354
355static void etp_atfork_child (void)
356{
357 ETP_REQ *prv;
358
359 while ((prv = reqq_shift (&req_queue)))
360 ETP_DESTROY (prv);
361
362 while ((prv = reqq_shift (&res_queue)))
363 ETP_DESTROY (prv);
364
365 while (wrk_first.next != &wrk_first)
366 {
367 etp_worker *wrk = wrk_first.next;
368
369 if (wrk->req)
370 ETP_DESTROY (wrk->req);
371
372 etp_worker_clear (wrk);
373 etp_worker_free (wrk);
374 }
375
376 started = 0;
377 idle = 0;
378 nreqs = 0;
379 nready = 0;
380 npending = 0;
381
382 etp_atfork_parent ();
383}
384
385static void 406static void
386etp_once_init (void)
387{
388 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
389}
390
391static int
392etp_init (void (*want_poll)(void), void (*done_poll)(void))
393{
394 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
395
396 pthread_once (&doinit, etp_once_init);
397
398 want_poll_cb = want_poll;
399 done_poll_cb = done_poll;
400
401 return 0;
402}
403
404X_THREAD_PROC (etp_proc);
405
406static void etp_start_thread (void)
407{
408 etp_worker *wrk = calloc (1, sizeof (etp_worker));
409
410 /*TODO*/
411 assert (("unable to allocate worker thread data", wrk));
412
413 X_LOCK (wrklock);
414
415 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
416 {
417 wrk->prev = &wrk_first;
418 wrk->next = wrk_first.next;
419 wrk_first.next->prev = wrk;
420 wrk_first.next = wrk;
421 ++started;
422 }
423 else
424 free (wrk);
425
426 X_UNLOCK (wrklock);
427}
428
429static void etp_maybe_start_thread (void)
430{
431 if (expect_true (etp_nthreads () >= wanted))
432 return;
433
434 /* todo: maybe use idle here, but might be less exact */
435 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
436 return;
437
438 etp_start_thread ();
439}
440
441static void etp_end_thread (void)
442{
443 eio_req *req = calloc (1, sizeof (eio_req));
444
445 req->type = -1;
446 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
447
448 X_LOCK (reqlock);
449 reqq_push (&req_queue, req);
450 X_COND_SIGNAL (reqwait);
451 X_UNLOCK (reqlock);
452
453 X_LOCK (wrklock);
454 --started;
455 X_UNLOCK (wrklock);
456}
457
458static int etp_poll (void)
459{
460 unsigned int maxreqs;
461 unsigned int maxtime;
462 struct timeval tv_start, tv_now;
463
464 X_LOCK (reslock);
465 maxreqs = max_poll_reqs;
466 maxtime = max_poll_time;
467 X_UNLOCK (reslock);
468
469 if (maxtime)
470 gettimeofday (&tv_start, 0);
471
472 for (;;)
473 {
474 ETP_REQ *req;
475
476 etp_maybe_start_thread ();
477
478 X_LOCK (reslock);
479 req = reqq_shift (&res_queue);
480
481 if (req)
482 {
483 --npending;
484
485 if (!res_queue.size && done_poll_cb)
486 done_poll_cb ();
487 }
488
489 X_UNLOCK (reslock);
490
491 if (!req)
492 return 0;
493
494 X_LOCK (reqlock);
495 --nreqs;
496 X_UNLOCK (reqlock);
497
498 if (expect_false (req->type == EIO_GROUP && req->size))
499 {
500 req->int1 = 1; /* mark request as delayed */
501 continue;
502 }
503 else
504 {
505 int res = ETP_FINISH (req);
506 if (expect_false (res))
507 return res;
508 }
509
510 if (expect_false (maxreqs && !--maxreqs))
511 break;
512
513 if (maxtime)
514 {
515 gettimeofday (&tv_now, 0);
516
517 if (tvdiff (&tv_start, &tv_now) >= maxtime)
518 break;
519 }
520 }
521
522 errno = EAGAIN;
523 return -1;
524}
525
526static void etp_cancel (ETP_REQ *req)
527{
528 X_LOCK (wrklock);
529 req->flags |= EIO_FLAG_CANCELLED;
530 X_UNLOCK (wrklock);
531
532 eio_grp_cancel (req);
533}
534
535static void etp_submit (ETP_REQ *req)
536{
537 req->pri -= ETP_PRI_MIN;
538
539 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
540 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
541
542 if (expect_false (req->type == EIO_GROUP))
543 {
544 /* I hope this is worth it :/ */
545 X_LOCK (reqlock);
546 ++nreqs;
547 X_UNLOCK (reqlock);
548
549 X_LOCK (reslock);
550
551 ++npending;
552
553 if (!reqq_push (&res_queue, req) && want_poll_cb)
554 want_poll_cb ();
555
556 X_UNLOCK (reslock);
557 }
558 else
559 {
560 X_LOCK (reqlock);
561 ++nreqs;
562 ++nready;
563 reqq_push (&req_queue, req);
564 X_COND_SIGNAL (reqwait);
565 X_UNLOCK (reqlock);
566
567 etp_maybe_start_thread ();
568 }
569}
570
571static void etp_set_max_poll_time (double nseconds)
572{
573 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
574 max_poll_time = nseconds;
575 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
576}
577
578static void etp_set_max_poll_reqs (unsigned int maxreqs)
579{
580 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
581 max_poll_reqs = maxreqs;
582 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
583}
584
585static void etp_set_max_idle (unsigned int nthreads)
586{
587 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
588 max_idle = nthreads <= 0 ? 1 : nthreads;
589 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
590}
591
592static void etp_set_min_parallel (unsigned int nthreads)
593{
594 if (wanted < nthreads)
595 wanted = nthreads;
596}
597
598static void etp_set_max_parallel (unsigned int nthreads)
599{
600 if (wanted > nthreads)
601 wanted = nthreads;
602
603 while (started > wanted)
604 etp_end_thread ();
605}
606
607/*****************************************************************************/
608
609static void grp_try_feed (eio_req *grp) 407grp_try_feed (eio_req *grp)
610{ 408{
611 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 409 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
612 { 410 {
613 grp->flags &= ~EIO_FLAG_GROUPADD; 411 grp->flags &= ~ETP_FLAG_GROUPADD;
614 412
615 EIO_FEED (grp); 413 EIO_FEED (grp);
616 414
617 /* stop if no progress has been made */ 415 /* stop if no progress has been made */
618 if (!(grp->flags & EIO_FLAG_GROUPADD)) 416 if (!(grp->flags & ETP_FLAG_GROUPADD))
619 { 417 {
620 grp->feed = 0; 418 grp->feed = 0;
621 break; 419 break;
622 } 420 }
623 } 421 }
624} 422}
625 423
424static int
626static int grp_dec (eio_req *grp) 425grp_dec (eio_req *grp)
627{ 426{
628 --grp->size; 427 --grp->size;
629 428
630 /* call feeder, if applicable */ 429 /* call feeder, if applicable */
631 grp_try_feed (grp); 430 grp_try_feed (grp);
632 431
633 /* finish, if done */ 432 /* finish, if done */
634 if (!grp->size && grp->int1) 433 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
635 return eio_finish (grp); 434 return eio_finish (grp);
636 else 435 else
637 return 0; 436 return 0;
638} 437}
639 438
439static void
640void eio_destroy (eio_req *req) 440eio_destroy (eio_req *req)
641{ 441{
642 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 442 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
643 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 443 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
644 444
645 EIO_DESTROY (req); 445 EIO_DESTROY (req);
646} 446}
647 447
448static int
648static int eio_finish (eio_req *req) 449eio_finish (eio_req *req)
649{ 450{
650 int res = EIO_FINISH (req); 451 int res = EIO_FINISH (req);
651 452
652 if (req->grp) 453 if (req->grp)
653 { 454 {
… …
661 if (grp->grp_first == req) 462 if (grp->grp_first == req)
662 grp->grp_first = req->grp_next; 463 grp->grp_first = req->grp_next;
663 464
664 res2 = grp_dec (grp); 465 res2 = grp_dec (grp);
665 466
666 if (!res && res2) 467 if (!res)
667 res = res2; 468 res = res2;
668 } 469 }
669 470
670 eio_destroy (req); 471 eio_destroy (req);
671 472
672 return res; 473 return res;
673} 474}
674 475
476void
675void eio_grp_cancel (eio_req *grp) 477eio_grp_cancel (eio_req *grp)
676{ 478{
677 for (grp = grp->grp_first; grp; grp = grp->grp_next) 479 etp_grp_cancel (EIO_POOL, grp);
678 eio_cancel (grp);
679} 480}
680 481
482void
681void eio_cancel (eio_req *req) 483eio_cancel (eio_req *req)
682{ 484{
683 etp_cancel (req); 485 etp_cancel (EIO_POOL, req);
684} 486}
685 487
488void
686void eio_submit (eio_req *req) 489eio_submit (eio_req *req)
687{ 490{
688 etp_submit (req); 491 etp_submit (EIO_POOL, req);
689} 492}
690 493
691unsigned int eio_nreqs (void) 494unsigned int
495eio_nreqs (void)
692{ 496{
693 return etp_nreqs (); 497 return etp_nreqs (EIO_POOL);
694} 498}
695 499
696unsigned int eio_nready (void) 500unsigned int
501eio_nready (void)
697{ 502{
698 return etp_nready (); 503 return etp_nready (EIO_POOL);
699} 504}
700 505
701unsigned int eio_npending (void) 506unsigned int
507eio_npending (void)
702{ 508{
703 return etp_npending (); 509 return etp_npending (EIO_POOL);
704} 510}
705 511
706unsigned int eio_nthreads (void) 512unsigned int ecb_cold
513eio_nthreads (void)
707{ 514{
708 return etp_nthreads (); 515 return etp_nthreads (EIO_POOL);
709} 516}
710 517
518void ecb_cold
711void eio_set_max_poll_time (double nseconds) 519eio_set_max_poll_time (double nseconds)
712{ 520{
713 etp_set_max_poll_time (nseconds); 521 etp_set_max_poll_time (EIO_POOL, nseconds);
714} 522}
715 523
524void ecb_cold
716void eio_set_max_poll_reqs (unsigned int maxreqs) 525eio_set_max_poll_reqs (unsigned int maxreqs)
717{ 526{
718 etp_set_max_poll_reqs (maxreqs); 527 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
719} 528}
720 529
530void ecb_cold
721void eio_set_max_idle (unsigned int nthreads) 531eio_set_max_idle (unsigned int nthreads)
722{ 532{
723 etp_set_max_idle (nthreads); 533 etp_set_max_idle (EIO_POOL, nthreads);
724} 534}
725 535
536void ecb_cold
537eio_set_idle_timeout (unsigned int seconds)
538{
539 etp_set_idle_timeout (EIO_POOL, seconds);
540}
541
542void ecb_cold
726void eio_set_min_parallel (unsigned int nthreads) 543eio_set_min_parallel (unsigned int nthreads)
727{ 544{
728 etp_set_min_parallel (nthreads); 545 etp_set_min_parallel (EIO_POOL, nthreads);
729} 546}
730 547
548void ecb_cold
731void eio_set_max_parallel (unsigned int nthreads) 549eio_set_max_parallel (unsigned int nthreads)
732{ 550{
733 etp_set_max_parallel (nthreads); 551 etp_set_max_parallel (EIO_POOL, nthreads);
734} 552}
735 553
736int eio_poll (void) 554int eio_poll (void)
737{ 555{
738 return etp_poll (); 556 return etp_poll (EIO_POOL);
739} 557}
740 558
741/*****************************************************************************/ 559/*****************************************************************************/
742/* work around various missing functions */ 560/* work around various missing functions */
743 561
744#if !HAVE_PREADWRITE 562#if HAVE_POSIX_CLOSE && !__linux
745# undef pread 563# define eio__close(fd) posix_close (fd, 0)
746# undef pwrite 564#else
747# define pread eio__pread 565# define eio__close(fd) close (fd)
748# define pwrite eio__pwrite
749
750static ssize_t
751eio__pread (int fd, void *buf, size_t count, off_t offset)
752{
753 ssize_t res;
754 off_t ooffset;
755
756 X_LOCK (preadwritelock);
757 ooffset = lseek (fd, 0, SEEK_CUR);
758 lseek (fd, offset, SEEK_SET);
759 res = read (fd, buf, count);
760 lseek (fd, ooffset, SEEK_SET);
761 X_UNLOCK (preadwritelock);
762
763 return res;
764}
765
766static ssize_t
767eio__pwrite (int fd, void *buf, size_t count, off_t offset)
768{
769 ssize_t res;
770 off_t ooffset;
771
772 X_LOCK (preadwritelock);
773 ooffset = lseek (fd, 0, SEEK_CUR);
774 lseek (fd, offset, SEEK_SET);
775 res = write (fd, buf, count);
776 lseek (fd, ooffset, SEEK_SET);
777 X_UNLOCK (preadwritelock);
778
779 return res;
780}
781#endif 566#endif
782 567
568/* close() without disturbing errno */
569static void
570silent_close (int fd)
571{
572 int saved_errno = errno;
573 eio__close (fd);
574 errno = saved_errno;
575}
576
783#ifndef HAVE_FUTIMES 577#ifndef HAVE_UTIMES
784 578
785# undef utimes 579# undef utimes
786# undef futimes
787# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
788# define futimes(fd,times) eio__futimes (fd, times)
789 581
790static int 582static int
791eio__utimes (const char *filename, const struct timeval times[2]) 583eio__utimes (const char *filename, const struct timeval times[2])
792{ 584{
793 if (times) 585 if (times)
… …
801 } 593 }
802 else 594 else
803 return utime (filename, 0); 595 return utime (filename, 0);
804} 596}
805 597
598#endif
599
600#ifndef HAVE_FUTIMES
601
602# undef futimes
603# define futimes(fd,times) eio__futimes (fd, times)
604
605static int
806static int eio__futimes (int fd, const struct timeval tv[2]) 606eio__futimes (int fd, const struct timeval tv[2])
807{ 607{
808 errno = ENOSYS; 608 errno = ENOSYS;
809 return -1; 609 return -1;
810} 610}
811 611
… …
814#if !HAVE_FDATASYNC 614#if !HAVE_FDATASYNC
815# undef fdatasync 615# undef fdatasync
816# define fdatasync(fd) fsync (fd) 616# define fdatasync(fd) fsync (fd)
817#endif 617#endif
818 618
619static int
620eio__syncfs (int fd)
621{
622 int res;
623
624#if HAVE_SYS_SYNCFS
625 res = (int)syscall (__NR_syncfs, (int)(fd));
626#else
627 res = EIO_ENOSYS ();
628#endif
629
630 if (res < 0 && errno == ENOSYS && fd >= 0)
631 sync ();
632
633 return res;
634}
635
819/* sync_file_range always needs emulation */ 636/* sync_file_range always needs emulation */
820int 637static int
821eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 638eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
822{ 639{
823#if HAVE_SYNC_FILE_RANGE 640#if HAVE_SYNC_FILE_RANGE
824 int res; 641 int res;
825 642
… …
838 if (!res || errno != ENOSYS) 655 if (!res || errno != ENOSYS)
839 return res; 656 return res;
840#endif 657#endif
841 658
842 /* even though we could play tricks with the flags, it's better to always 659 /* 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 */ 660 * call fdatasync, as that matches the expectation of its users best */
844 return fdatasync (fd); 661 return fdatasync (fd);
662}
663
664static int
665eio__fallocate (int fd, int mode, off_t offset, size_t len)
666{
667#if HAVE_LINUX_FALLOCATE
668 return fallocate (fd, mode, offset, len);
669#else
670 return EIO_ENOSYS ();
671#endif
845} 672}
846 673
847#if !HAVE_READAHEAD 674#if !HAVE_READAHEAD
848# undef readahead 675# undef readahead
849# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 676# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
850 677
851static ssize_t 678static eio_ssize_t
852eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 679eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
853{ 680{
854 size_t todo = count; 681 size_t todo = count;
855 dBUF; 682 dBUF;
856 683
… …
861 pread (fd, eio_buf, len, offset); 688 pread (fd, eio_buf, len, offset);
862 offset += len; 689 offset += len;
863 todo -= len; 690 todo -= len;
864 } 691 }
865 692
866 errno = 0; 693 FUBd;
694
695 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
696 /* but not for e.g. EIO or eof, so we also never fail */
867 return count; 697 return 0;
868} 698}
869 699
870#endif 700#endif
871 701
872/* sendfile always needs emulation */ 702/* sendfile always needs emulation */
873static ssize_t 703static eio_ssize_t
874eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 704eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
875{ 705{
706 eio_ssize_t written = 0;
876 ssize_t res; 707 eio_ssize_t res;
877 708
878 if (!count) 709 if (!count)
879 return 0; 710 return 0;
880 711
712 for (;;)
713 {
714#ifdef __APPLE__
715# undef HAVE_SENDFILE /* broken, as everything on os x */
716#endif
881#if HAVE_SENDFILE 717#if HAVE_SENDFILE
882# if __linux 718# if __linux
719 off_t soffset = offset;
883 res = sendfile (ofd, ifd, &offset, count); 720 res = sendfile (ofd, ifd, &soffset, count);
884 721
885# elif __freebsd 722# elif __FreeBSD__
886 /* 723 /*
887 * Of course, the freebsd sendfile is a dire hack with no thoughts 724 * Of course, the freebsd sendfile is a dire hack with no thoughts
888 * wasted on making it similar to other I/O functions. 725 * wasted on making it similar to other I/O functions.
889 */ 726 */
890 {
891 off_t sbytes; 727 off_t sbytes;
892 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 728 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
893 729
894 if (res < 0 && sbytes) 730 #if 0 /* according to the manpage, this is correct, but broken behaviour */
895 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 731 /* freebsd' sendfile will return 0 on success */
732 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
733 /* not on e.g. EIO or EPIPE - sounds broken */
734 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
896 res = sbytes; 735 res = sbytes;
897 } 736 #endif
737
738 /* according to source inspection, this is correct, and useful behaviour */
739 if (sbytes)
740 res = sbytes;
741
742# elif defined __APPLE__
743 off_t sbytes = count;
744 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
745
746 /* according to the manpage, sbytes is always valid */
747 if (sbytes)
748 res = sbytes;
898 749
899# elif __hpux 750# elif __hpux
900 res = sendfile (ofd, ifd, offset, count, 0, 0); 751 res = sendfile (ofd, ifd, offset, count, 0, 0);
901 752
902# elif __solaris 753# elif __solaris
903 {
904 struct sendfilevec vec; 754 struct sendfilevec vec;
905 size_t sbytes; 755 size_t sbytes;
906 756
907 vec.sfv_fd = ifd; 757 vec.sfv_fd = ifd;
908 vec.sfv_flag = 0; 758 vec.sfv_flag = 0;
909 vec.sfv_off = offset; 759 vec.sfv_off = offset;
910 vec.sfv_len = count; 760 vec.sfv_len = count;
911 761
912 res = sendfilev (ofd, &vec, 1, &sbytes); 762 res = sendfilev (ofd, &vec, 1, &sbytes);
913 763
914 if (res < 0 && sbytes) 764 if (res < 0 && sbytes)
915 res = sbytes; 765 res = sbytes;
916 }
917 766
918# endif 767# endif
768
769#elif defined (_WIN32) && 0
770 /* does not work, just for documentation of what would need to be done */
771 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
772 /* libeio guarantees that the file offset does not change, and windows */
773 /* has no way to get an independent handle to the same file description */
774 HANDLE h = TO_SOCKET (ifd);
775 SetFilePointer (h, offset, 0, FILE_BEGIN);
776 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
777
919#else 778#else
920 res = -1; 779 res = EIO_ENOSYS ();
921 errno = ENOSYS;
922#endif 780#endif
923 781
782 /* we assume sendfile can copy at least 128mb in one go */
783 if (res <= 128 * 1024 * 1024)
784 {
785 if (res > 0)
786 written += res;
787
788 if (written)
789 return written;
790
791 break;
792 }
793 else
794 {
795 /* if we requested more, then probably the kernel was lazy */
796 written += res;
797 offset += res;
798 count -= res;
799
800 if (!count)
801 return written;
802 }
803 }
804
924 if (res < 0 805 if (res < 0
925 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 806 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
807 /* BSDs */
808#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
809 || errno == ENOTSUP
810#endif
811#ifdef EOPNOTSUPP /* windows */
812 || errno == EOPNOTSUPP /* BSDs */
813#endif
926#if __solaris 814#if __solaris
927 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 815 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
928#endif 816#endif
929 ) 817 )
930 ) 818 )
… …
934 822
935 res = 0; 823 res = 0;
936 824
937 while (count) 825 while (count)
938 { 826 {
939 ssize_t cnt; 827 eio_ssize_t cnt;
940 828
941 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 829 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
942 830
943 if (cnt <= 0) 831 if (cnt <= 0)
944 { 832 {
… …
956 844
957 offset += cnt; 845 offset += cnt;
958 res += cnt; 846 res += cnt;
959 count -= cnt; 847 count -= cnt;
960 } 848 }
849
850 FUBd;
961 } 851 }
962 852
963 return res; 853 return res;
854}
855
856#ifdef PAGESIZE
857# define eio_pagesize() PAGESIZE
858#else
859static intptr_t
860eio_pagesize (void)
861{
862 static intptr_t page;
863
864 if (!page)
865 page = sysconf (_SC_PAGESIZE);
866
867 return page;
868}
869#endif
870
871static void
872eio_page_align (void **addr, size_t *length)
873{
874 intptr_t mask = eio_pagesize () - 1;
875
876 /* round down addr */
877 intptr_t adj = mask & (intptr_t)*addr;
878
879 *addr = (void *)((intptr_t)*addr - adj);
880 *length += adj;
881
882 /* round up length */
883 *length = (*length + mask) & ~mask;
884}
885
886#if !_POSIX_MEMLOCK
887# define eio__mlockall(a) EIO_ENOSYS ()
888#else
889
890static int
891eio__mlockall (int flags)
892{
893 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
894 extern int mallopt (int, int);
895 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
896 #endif
897
898 if (EIO_MCL_CURRENT != MCL_CURRENT
899 || EIO_MCL_FUTURE != MCL_FUTURE)
900 {
901 flags = 0
902 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
903 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
904 }
905
906 return mlockall (flags);
907}
908#endif
909
910#if !_POSIX_MEMLOCK_RANGE
911# define eio__mlock(a,b) EIO_ENOSYS ()
912#else
913
914static int
915eio__mlock (void *addr, size_t length)
916{
917 eio_page_align (&addr, &length);
918
919 return mlock (addr, length);
920}
921
922#endif
923
924#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
925# define eio__msync(a,b,c) EIO_ENOSYS ()
926#else
927
928static int
929eio__msync (void *mem, size_t len, int flags)
930{
931 eio_page_align (&mem, &len);
932
933 if (EIO_MS_ASYNC != MS_SYNC
934 || EIO_MS_INVALIDATE != MS_INVALIDATE
935 || EIO_MS_SYNC != MS_SYNC)
936 {
937 flags = 0
938 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
939 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
940 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
941 }
942
943 return msync (mem, len, flags);
944}
945
946#endif
947
948static int
949eio__mtouch (eio_req *req)
950{
951 void *mem = req->ptr2;
952 size_t len = req->size;
953 int flags = req->int1;
954
955 eio_page_align (&mem, &len);
956
957 {
958 intptr_t addr = (intptr_t)mem;
959 intptr_t end = addr + len;
960 intptr_t page = eio_pagesize ();
961
962 if (addr < end)
963 if (flags & EIO_MT_MODIFY) /* modify */
964 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < end && !EIO_CANCELLED (req));
965 else
966 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < end && !EIO_CANCELLED (req));
967 }
968
969 return 0;
970}
971
972/*****************************************************************************/
973/* requests implemented outside eio_execute, because they are so large */
974
975static void
976eio__lseek (eio_req *req)
977{
978 /* this usually gets optimised away completely, or your compiler sucks, */
979 /* or the whence constants really are not 0, 1, 2 */
980 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
981 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
982 : req->int2 == EIO_SEEK_END ? SEEK_END
983 : req->int2;
984
985 req->offs = lseek (req->int1, req->offs, whence);
986 req->result = req->offs == (off_t)-1 ? -1 : 0;
987}
988
989/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
990static int
991eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
992{
993 char *res;
994 const char *rel = path;
995 char *tmp1, *tmp2;
996#if SYMLOOP_MAX > 32
997 int symlinks = SYMLOOP_MAX;
998#else
999 int symlinks = 32;
1000#endif
1001
1002 errno = EINVAL;
1003 if (!rel)
1004 return -1;
1005
1006 errno = ENOENT;
1007 if (!*rel)
1008 return -1;
1009
1010 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
1011#ifdef _WIN32
1012 if (_access (rel, 4) != 0)
1013 return -1;
1014
1015 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
1016
1017 errno = ENAMETOOLONG;
1018 if (symlinks >= EIO_PATH_MAX * 3)
1019 return -1;
1020
1021 errno = EIO;
1022 if (symlinks <= 0)
1023 return -1;
1024
1025 return symlinks;
1026
1027#else
1028 tmp1 = res + EIO_PATH_MAX;
1029 tmp2 = tmp1 + EIO_PATH_MAX;
1030
1031#if 0 /* disabled, the musl way to do things is just too racy */
1032#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1033 /* on linux we may be able to ask the kernel */
1034 {
1035 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1036
1037 if (fd >= 0)
1038 {
1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1040 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1041 /* here we should probably stat the open file and the disk file, to make sure they still match */
1042 eio__close (fd);
1043
1044 if (req->result > 0)
1045 goto done;
1046 }
1047 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1048 return -1;
1049 }
1050#endif
1051#endif
1052
1053 if (*rel != '/')
1054 {
1055 int len;
1056
1057 errno = ENOENT;
1058 if (wd == EIO_INVALID_WD)
1059 return -1;
1060
1061 if (wd == EIO_CWD)
1062 {
1063 if (!getcwd (res, EIO_PATH_MAX))
1064 return -1;
1065
1066 len = strlen (res);
1067 }
1068 else
1069 memcpy (res, wd->str, len = wd->len);
1070
1071 if (res [1]) /* only use if not / */
1072 res += len;
1073 }
1074
1075 while (*rel)
1076 {
1077 eio_ssize_t len, linklen;
1078 const char *beg = rel;
1079
1080 while (*rel && *rel != '/')
1081 ++rel;
1082
1083 len = rel - beg;
1084
1085 if (!len) /* skip slashes */
1086 {
1087 ++rel;
1088 continue;
1089 }
1090
1091 if (beg [0] == '.')
1092 {
1093 if (len == 1)
1094 continue; /* . - nop */
1095
1096 if (beg [1] == '.' && len == 2)
1097 {
1098 /* .. - back up one component, if possible */
1099
1100 while (res != tmpbuf->ptr)
1101 if (*--res == '/')
1102 break;
1103
1104 continue;
1105 }
1106 }
1107
1108 errno = ENAMETOOLONG;
1109 if (res + 1 + len + 1 >= tmp1)
1110 return -1;
1111
1112 /* copy one component */
1113 *res = '/';
1114 memcpy (res + 1, beg, len);
1115
1116 /* zero-terminate, for readlink */
1117 res [len + 1] = 0;
1118
1119 /* now check if it's a symlink */
1120 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1121
1122 if (linklen < 0)
1123 {
1124 if (errno != EINVAL)
1125 return -1;
1126
1127 /* it's a normal directory. hopefully */
1128 res += len + 1;
1129 }
1130 else
1131 {
1132 /* yay, it was a symlink - build new path in tmp2 */
1133 int rellen = strlen (rel);
1134
1135 errno = ENAMETOOLONG;
1136 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1137 return -1;
1138
1139 errno = ELOOP;
1140 if (!--symlinks)
1141 return -1;
1142
1143 if (*tmp1 == '/')
1144 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1145
1146 /* we need to be careful, as rel might point into tmp2 already */
1147 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1148 tmp2 [linklen] = '/';
1149 memcpy (tmp2, tmp1, linklen);
1150
1151 rel = tmp2;
1152 }
1153 }
1154
1155 /* special case for the lone root path */
1156 if (res == tmpbuf->ptr)
1157 *res++ = '/';
1158
1159 return res - (char *)tmpbuf->ptr;
1160#endif
1161}
1162
1163static signed char
1164eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1165{
1166 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1167 : a->inode < b->inode ? -1
1168 : a->inode > b->inode ? 1
1169 : 0;
1170}
1171
1172#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1173
1174#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1175#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1176
1177static void
1178eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1179{
1180 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1181 unsigned char *bit = bits;
1182
1183 assert (CHAR_BIT == 8);
1184 assert (sizeof (eio_dirent) * 8 < 256);
1185 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1186 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1187
1188 if (size <= EIO_SORT_FAST)
1189 return;
1190
1191 /* first prepare an array of bits to test in our radix sort */
1192 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1193 /* inode_bits must contain all inodes ORed together */
1194 /* which is used to skip bits that are 0 everywhere, which is very common */
1195 {
1196 eio_ino_t endianness;
1197 int i, j;
1198
1199 /* we store the byte offset of byte n into byte n of "endianness" */
1200 for (i = 0; i < sizeof (eio_ino_t); ++i)
1201 ((unsigned char *)&endianness)[i] = i;
1202
1203 *bit++ = 0;
1204
1205 for (i = 0; i < sizeof (eio_ino_t); ++i)
1206 {
1207 /* shifting off the byte offsets out of "endianness" */
1208 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1209 endianness >>= 8;
1210
1211 for (j = 0; j < 8; ++j)
1212 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1213 *bit++ = offs + j;
1214 }
1215
1216 for (j = 0; j < 8; ++j)
1217 if (score_bits & (1 << j))
1218 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1219 }
1220
1221 /* now actually do the sorting (a variant of MSD radix sort) */
1222 {
1223 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1224 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1225 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1226 int stk_idx = 0;
1227
1228 base_stk [stk_idx] = dents;
1229 end_stk [stk_idx] = dents + size;
1230 bit_stk [stk_idx] = bit - 1;
1231
1232 do
1233 {
1234 base = base_stk [stk_idx];
1235 end = end_stk [stk_idx];
1236 bit = bit_stk [stk_idx];
1237
1238 for (;;)
1239 {
1240 unsigned char O = *bit >> 3;
1241 unsigned char M = 1 << (*bit & 7);
1242
1243 eio_dirent *a = base;
1244 eio_dirent *b = end;
1245
1246 if (b - a < EIO_SORT_CUTOFF)
1247 break;
1248
1249 /* now bit-partition the array on the bit */
1250 /* this ugly asymmetric loop seems to perform much better than typical */
1251 /* partition algos found in the literature */
1252 do
1253 if (!(((unsigned char *)a)[O] & M))
1254 ++a;
1255 else if (!(((unsigned char *)--b)[O] & M))
1256 {
1257 eio_dirent tmp = *a; *a = *b; *b = tmp;
1258 ++a;
1259 }
1260 while (b > a);
1261
1262 /* next bit, or stop, if no bits left in this path */
1263 if (!*--bit)
1264 break;
1265
1266 base_stk [stk_idx] = a;
1267 end_stk [stk_idx] = end;
1268 bit_stk [stk_idx] = bit;
1269 ++stk_idx;
1270
1271 end = a;
1272 }
1273 }
1274 while (stk_idx--);
1275 }
1276}
1277
1278static void
1279eio_dent_insertion_sort (eio_dirent *dents, int size)
1280{
1281 /* first move the smallest element to the front, to act as a sentinel */
1282 {
1283 int i;
1284 eio_dirent *min = dents;
1285
1286 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1287 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1288 if (EIO_DENT_CMP (dents [i], <, *min))
1289 min = &dents [i];
1290
1291 /* swap elements 0 and j (minimum) */
1292 {
1293 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1294 }
1295 }
1296
1297 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1298 {
1299 eio_dirent *i, *j;
1300
1301 for (i = dents + 1; i < dents + size; ++i)
1302 {
1303 eio_dirent value = *i;
1304
1305 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1306 j [1] = j [0];
1307
1308 j [1] = value;
1309 }
1310 }
1311}
1312
1313static void
1314eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1315{
1316 if (size <= 1)
1317 return; /* our insertion sort relies on size > 0 */
1318
1319 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1320 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1321 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1322
1323 /* use an insertion sort at the end, or for small arrays, */
1324 /* as insertion sort is more efficient for small partitions */
1325 eio_dent_insertion_sort (dents, size);
964} 1326}
965 1327
966/* read a full directory */ 1328/* read a full directory */
967static void 1329static void
968eio__scandir (eio_req *req, etp_worker *self) 1330eio__scandir (eio_req *req, etp_worker *self)
969{ 1331{
1332 char *name, *names;
1333 int namesalloc = 4096 - sizeof (void *) * 4;
1334 int namesoffs = 0;
1335 int flags = req->int1;
1336 eio_dirent *dents = 0;
1337 int dentalloc = 128;
1338 int dentoffs = 0;
1339 eio_ino_t inode_bits = 0;
1340#ifdef _WIN32
1341 HANDLE dirp;
1342 WIN32_FIND_DATA entp;
1343#else
970 DIR *dirp; 1344 DIR *dirp;
971 EIO_STRUCT_DIRENT *entp; 1345 EIO_STRUCT_DIRENT *entp;
972 char *name, *names; 1346#endif
973 int memlen = 4096;
974 int memofs = 0;
975 int res = 0;
976 1347
977 X_LOCK (wrklock); 1348 req->result = -1;
978 /* the corresponding closedir is in ETP_WORKER_CLEAR */
979 self->dirp = dirp = opendir (req->ptr1);
980 req->flags |= EIO_FLAG_PTR2_FREE;
981 req->ptr2 = names = malloc (memlen);
982 X_UNLOCK (wrklock);
983 1349
984 if (dirp && names) 1350 if (!(flags & EIO_READDIR_DENTS))
985 for (;;) 1351 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1352
1353#ifdef _WIN32
1354 {
1355 int len = strlen ((const char *)req->ptr1);
1356 char *path = malloc (MAX_PATH);
1357 const char *fmt;
1358 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1359
1360 if (!len)
1361 fmt = "./*";
1362 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1363 fmt = "%s*";
1364 else
1365 fmt = "%s/*";
1366
1367 _snprintf (path, MAX_PATH, fmt, reqpath);
1368 dirp = FindFirstFile (path, &entp);
1369 free (path);
1370
1371 if (dirp == INVALID_HANDLE_VALUE)
986 { 1372 {
1373 /* should steal _dosmaperr */
1374 switch (GetLastError ())
1375 {
1376 case ERROR_FILE_NOT_FOUND:
1377 req->result = 0;
1378 break;
1379
1380 case ERROR_INVALID_NAME:
1381 case ERROR_PATH_NOT_FOUND:
1382 case ERROR_NO_MORE_FILES:
1383 errno = ENOENT;
1384 break;
1385
1386 case ERROR_NOT_ENOUGH_MEMORY:
1387 errno = ENOMEM;
1388 break;
1389
1390 default:
1391 errno = EINVAL;
1392 break;
1393 }
1394
1395 return;
1396 }
1397 }
1398#else
1399 #if HAVE_AT
1400 {
1401 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1402
1403 if (fd < 0)
1404 return;
1405
1406 dirp = fdopendir (fd);
1407
1408 if (!dirp)
1409 silent_close (fd);
1410 }
1411 #else
1412 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1413 #endif
1414
1415 if (!dirp)
1416 return;
1417#endif
1418
1419 if (req->flags & EIO_FLAG_PTR1_FREE)
1420 free (req->ptr1);
1421
1422 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1423 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1424 req->ptr2 = names = malloc (namesalloc);
1425
1426 if (!names || (flags && !dents))
1427 return;
1428
1429 for (;;)
1430 {
1431 int done;
1432
1433#ifdef _WIN32
1434 done = !dirp;
1435#else
987 errno = 0; 1436 errno = 0;
988 entp = readdir (dirp); 1437 entp = readdir (dirp);
1438 done = !entp;
1439#endif
989 1440
1441 if (done)
1442 {
1443#ifndef _WIN32
1444 int old_errno = errno;
1445 closedir (dirp);
1446 errno = old_errno;
1447
990 if (!entp) 1448 if (errno)
1449 break;
1450#endif
1451
1452 /* sort etc. */
1453 req->int1 = flags;
1454 req->result = dentoffs;
1455
1456 if (flags & EIO_READDIR_STAT_ORDER)
1457 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1458 else if (flags & EIO_READDIR_DIRS_FIRST)
1459 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1460 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1461 else
1462 {
1463 /* in this case, all is known, and we just put dirs first and sort them */
1464 eio_dirent *oth = dents + dentoffs;
1465 eio_dirent *dir = dents;
1466
1467 /* now partition dirs to the front, and non-dirs to the back */
1468 /* by walking from both sides and swapping if necessary */
1469 while (oth > dir)
1470 {
1471 if (dir->type == EIO_DT_DIR)
1472 ++dir;
1473 else if ((--oth)->type == EIO_DT_DIR)
1474 {
1475 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1476
1477 ++dir;
1478 }
1479 }
1480
1481 /* now sort the dirs only (dirs all have the same score) */
1482 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1483 }
1484
991 break; 1485 break;
1486 }
992 1487
993 name = entp->d_name; 1488 /* now add the entry to our list(s) */
1489 name = D_NAME (entp);
994 1490
1491 /* skip . and .. entries */
995 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1492 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
996 { 1493 {
997 int len = strlen (name) + 1; 1494 int len = D_NAMLEN (entp) + 1;
998 1495
999 res++; 1496 while (ecb_expect_false (namesoffs + len > namesalloc))
1000
1001 while (memofs + len > memlen)
1002 { 1497 {
1003 memlen *= 2; 1498 namesalloc *= 2;
1004 X_LOCK (wrklock);
1005 req->ptr2 = names = realloc (names, memlen); 1499 req->ptr2 = names = realloc (names, namesalloc);
1006 X_UNLOCK (wrklock);
1007 1500
1008 if (!names) 1501 if (!names)
1502 break;
1503 }
1504
1505 memcpy (names + namesoffs, name, len);
1506
1507 if (dents)
1508 {
1509 struct eio_dirent *ent;
1510
1511 if (ecb_expect_false (dentoffs == dentalloc))
1512 {
1513 dentalloc *= 2;
1514 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1515
1516 if (!dents)
1009 break; 1517 break;
1010 } 1518 }
1011 1519
1012 memcpy (names + memofs, name, len); 1520 ent = dents + dentoffs;
1013 memofs += len; 1521
1522 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1523 ent->namelen = len - 1;
1524 ent->inode = D_INO (entp);
1525
1526 inode_bits |= ent->inode;
1527
1528 switch (D_TYPE (entp))
1529 {
1530 default:
1531 ent->type = EIO_DT_UNKNOWN;
1532 flags |= EIO_READDIR_FOUND_UNKNOWN;
1533 break;
1534
1535 #ifdef DT_FIFO
1536 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1537 #endif
1538 #ifdef DT_CHR
1539 case DT_CHR: ent->type = EIO_DT_CHR; break;
1540 #endif
1541 #ifdef DT_MPC
1542 case DT_MPC: ent->type = EIO_DT_MPC; break;
1543 #endif
1544 #ifdef DT_DIR
1545 case DT_DIR: ent->type = EIO_DT_DIR; break;
1546 #endif
1547 #ifdef DT_NAM
1548 case DT_NAM: ent->type = EIO_DT_NAM; break;
1549 #endif
1550 #ifdef DT_BLK
1551 case DT_BLK: ent->type = EIO_DT_BLK; break;
1552 #endif
1553 #ifdef DT_MPB
1554 case DT_MPB: ent->type = EIO_DT_MPB; break;
1555 #endif
1556 #ifdef DT_REG
1557 case DT_REG: ent->type = EIO_DT_REG; break;
1558 #endif
1559 #ifdef DT_NWK
1560 case DT_NWK: ent->type = EIO_DT_NWK; break;
1561 #endif
1562 #ifdef DT_CMP
1563 case DT_CMP: ent->type = EIO_DT_CMP; break;
1564 #endif
1565 #ifdef DT_LNK
1566 case DT_LNK: ent->type = EIO_DT_LNK; break;
1567 #endif
1568 #ifdef DT_SOCK
1569 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1570 #endif
1571 #ifdef DT_DOOR
1572 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1573 #endif
1574 #ifdef DT_WHT
1575 case DT_WHT: ent->type = EIO_DT_WHT; break;
1576 #endif
1577 }
1578
1579 ent->score = 7;
1580
1581 if (flags & EIO_READDIR_DIRS_FIRST)
1582 {
1583 if (ent->type == EIO_DT_UNKNOWN)
1584 {
1585 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1586 ent->score = 1;
1587 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1588 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1589 }
1590 else if (ent->type == EIO_DT_DIR)
1591 ent->score = 0;
1592 }
1014 } 1593 }
1594
1595 namesoffs += len;
1596 ++dentoffs;
1015 } 1597 }
1016 1598
1017 if (errno) 1599 if (EIO_CANCELLED (req))
1018 res = -1; 1600 {
1601 errno = ECANCELED;
1602 break;
1603 }
1604
1605#ifdef _WIN32
1606 if (!FindNextFile (dirp, &entp))
1607 {
1608 FindClose (dirp);
1609 dirp = 0;
1610 }
1611#endif
1612 }
1613}
1614
1615/*****************************************************************************/
1616/* working directory stuff */
1617/* various deficiencies in the posix 2008 api force us to */
1618/* keep the absolute path in string form at all times */
1619/* fuck yeah. */
1620
1621#if !HAVE_AT
1622
1623/* a bit like realpath, but usually faster because it doesn'T have to return */
1624/* an absolute or canonical path */
1625static const char *
1626wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1627{
1628 if (!wd || *path == '/')
1629 return path;
1630
1631 if (path [0] == '.' && !path [1])
1632 return wd->str;
1633
1019 1634 {
1020 req->result = res; 1635 int l1 = wd->len;
1021} 1636 int l2 = strlen (path);
1022 1637
1023#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1638 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1024# undef msync
1025# define msync(a,b,c) ((errno = ENOSYS), -1)
1026#endif
1027 1639
1028int 1640 memcpy (res, wd->str, l1);
1029eio__mtouch (void *mem, size_t len, int flags) 1641 res [l1] = '/';
1642 memcpy (res + l1 + 1, path, l2 + 1);
1643
1644 return res;
1645 }
1646}
1647
1648#endif
1649
1650static eio_wd
1651eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1030{ 1652{
1031 intptr_t addr = (intptr_t)mem; 1653 int fd;
1032 intptr_t end = addr + len; 1654 eio_wd res;
1033#ifdef PAGESIZE 1655 int len = eio__realpath (tmpbuf, wd, path);
1034 const intptr_t page = PAGESIZE; 1656
1657 if (len < 0)
1658 return EIO_INVALID_WD;
1659
1660#if HAVE_AT
1661 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1662
1663 if (fd < 0)
1664 return EIO_INVALID_WD;
1665#endif
1666
1667 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1668
1669#if HAVE_AT
1670 res->fd = fd;
1671#endif
1672
1673 res->len = len;
1674 memcpy (res->str, tmpbuf->ptr, len);
1675 res->str [len] = 0;
1676
1677 return res;
1678}
1679
1680eio_wd
1681eio_wd_open_sync (eio_wd wd, const char *path)
1682{
1683 struct etp_tmpbuf tmpbuf = { 0 };
1684 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1685 free (tmpbuf.ptr);
1686
1687 return wd;
1688}
1689
1690void
1691eio_wd_close_sync (eio_wd wd)
1692{
1693 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1694 {
1695 #if HAVE_AT
1696 eio__close (wd->fd);
1697 #endif
1698 free (wd);
1699 }
1700}
1701
1702#if HAVE_AT
1703
1704static int
1705eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1706{
1707#if HAVE_RENAMEAT2
1708 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1035#else 1709#else
1036 static intptr_t page;
1037
1038 if (!page) 1710 if (flags)
1039 page = sysconf (_SC_PAGESIZE); 1711 return EIO_ENOSYS ();
1040#endif
1041 1712
1042 addr &= ~(page - 1); /* assume page size is always a power of two */ 1713 return renameat (olddirfd, oldpath, newdirfd, newpath);
1714#endif
1715}
1043 1716
1044 if (addr < end) 1717/* they forgot these */
1045 if (flags) /* modify */
1046 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1047 else
1048 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1049 1718
1719static int
1720eio__truncateat (int dirfd, const char *path, off_t length)
1721{
1722 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1723 int res;
1724
1725 if (fd < 0)
1726 return fd;
1727
1728 res = ftruncate (fd, length);
1729 silent_close (fd);
1050 return 0; 1730 return res;
1051} 1731}
1732
1733static int
1734eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1735{
1736 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
1737 int res;
1738
1739 if (fd < 0)
1740 return fd;
1741
1742 res = fstatvfs (fd, buf);
1743 silent_close (fd);
1744 return res;
1745}
1746
1747#endif
1052 1748
1053/*****************************************************************************/ 1749/*****************************************************************************/
1054 1750
1055#define ALLOC(len) \ 1751#define ALLOC(len) \
1056 if (!req->ptr2) \ 1752 if (!req->ptr2) \
1057 { \ 1753 { \
1058 X_LOCK (wrklock); \ 1754 X_LOCK (EIO_POOL->wrklock); \
1059 req->flags |= EIO_FLAG_PTR2_FREE; \ 1755 req->flags |= EIO_FLAG_PTR2_FREE; \
1060 X_UNLOCK (wrklock); \ 1756 X_UNLOCK (EIO_POOL->wrklock); \
1061 req->ptr2 = malloc (len); \ 1757 req->ptr2 = malloc (len); \
1062 if (!req->ptr2) \ 1758 if (!req->ptr2) \
1063 { \ 1759 { \
1064 errno = ENOMEM; \ 1760 errno = ENOMEM; \
1065 req->result = -1; \ 1761 req->result = -1; \
1066 break; \ 1762 goto alloc_fail; \
1067 } \ 1763 } \
1068 } 1764 }
1069 1765
1070X_THREAD_PROC (etp_proc) 1766/*****************************************************************************/
1071{
1072 ETP_REQ *req;
1073 struct timespec ts;
1074 etp_worker *self = (etp_worker *)thr_arg;
1075 1767
1076 /* try to distribute timeouts somewhat randomly */ 1768static void
1077 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1769eio__slurp (int fd, eio_req *req)
1770{
1771 req->result = fd;
1078 1772
1079 for (;;) 1773 if (fd < 0)
1774 return;
1775
1776 if (req->offs < 0 || !req->size) /* do we need the size? */
1080 { 1777 {
1081 X_LOCK (reqlock); 1778 off_t size = lseek (fd, 0, SEEK_END);
1082 1779
1083 for (;;)
1084 {
1085 self->req = req = reqq_shift (&req_queue);
1086
1087 if (req)
1088 break;
1089
1090 ++idle;
1091
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1094 {
1095 if (idle > max_idle)
1096 {
1097 --idle;
1098 X_UNLOCK (reqlock);
1099 X_LOCK (wrklock);
1100 --started;
1101 X_UNLOCK (wrklock);
1102 goto quit;
1103 }
1104
1105 /* we are allowed to idle, so do so without any timeout */
1106 X_COND_WAIT (reqwait, reqlock);
1107 }
1108
1109 --idle;
1110 }
1111
1112 --nready;
1113
1114 X_UNLOCK (reqlock);
1115
1116 if (req->type < 0) 1780 if (req->offs < 0)
1117 goto quit; 1781 req->offs += size;
1118 1782
1119 if (!EIO_CANCELLED (req)) 1783 if (!req->size)
1120 ETP_EXECUTE (self, req); 1784 req->size = size - req->offs;
1121
1122 X_LOCK (reslock);
1123
1124 ++npending;
1125
1126 if (!reqq_push (&res_queue, req) && want_poll_cb)
1127 want_poll_cb ();
1128
1129 self->req = 0;
1130 etp_worker_clear (self);
1131
1132 X_UNLOCK (reslock);
1133 } 1785 }
1134 1786
1135quit: 1787 ALLOC (req->size);
1136 X_LOCK (wrklock); 1788 req->result = pread (fd, req->ptr2, req->size, req->offs);
1137 etp_worker_free (self);
1138 X_UNLOCK (wrklock);
1139 1789
1140 return 0; 1790 silent_close (fd);
1141}
1142 1791
1143/*****************************************************************************/ 1792alloc_fail:
1793 ;
1794}
1144 1795
1796int ecb_cold
1145int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1797eio_init (void (*want_poll)(void), void (*done_poll)(void))
1146{ 1798{
1147 return etp_init (want_poll, done_poll); 1799 eio_want_poll_cb = want_poll;
1148} 1800 eio_done_poll_cb = done_poll;
1149 1801
1802 return etp_init (EIO_POOL, 0, 0, 0);
1803}
1804
1805ecb_inline void
1150static void eio_api_destroy (eio_req *req) 1806eio_api_destroy (eio_req *req)
1151{ 1807{
1152 free (req); 1808 free (req);
1153} 1809}
1154 1810
1155#define REQ(rtype) \ 1811#define REQ(rtype) \
1156 eio_req *req; \ 1812 eio_req *req; \
1157 \ 1813 \
1158 req = (eio_req *)calloc (1, sizeof *req); \ 1814 req = (eio_req *)calloc (1, sizeof *req); \
1159 if (!req) \ 1815 if (!req) \
1160 return 0; \ 1816 return 0; \
… …
1174 { \ 1830 { \
1175 eio_api_destroy (req); \ 1831 eio_api_destroy (req); \
1176 return 0; \ 1832 return 0; \
1177 } 1833 }
1178 1834
1835#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1836
1837static void
1179static void eio_execute (etp_worker *self, eio_req *req) 1838eio_execute (etp_worker *self, eio_req *req)
1180{ 1839{
1181 errno = 0; 1840#if HAVE_AT
1841 int dirfd;
1842#else
1843 const char *path;
1844#endif
1845
1846 if (ecb_expect_false (EIO_CANCELLED (req)))
1847 {
1848 req->result = -1;
1849 req->errorno = ECANCELED;
1850 return;
1851 }
1852
1853 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1854 {
1855 req->result = -1;
1856 req->errorno = ENOENT;
1857 return;
1858 }
1859
1860 if (req->type >= EIO_OPEN)
1861 {
1862 #if HAVE_AT
1863 dirfd = WD2FD (req->wd);
1864 #else
1865 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1866 #endif
1867 }
1182 1868
1183 switch (req->type) 1869 switch (req->type)
1184 { 1870 {
1871 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1872 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1873 break;
1874 case EIO_WD_CLOSE: req->result = 0;
1875 eio_wd_close_sync (req->wd); break;
1876
1877 case EIO_SEEK: eio__lseek (req); break;
1185 case EIO_READ: ALLOC (req->size); 1878 case EIO_READ: ALLOC (req->size);
1186 req->result = req->offs >= 0 1879 req->result = req->offs >= 0
1187 ? pread (req->int1, req->ptr2, req->size, req->offs) 1880 ? pread (req->int1, req->ptr2, req->size, req->offs)
1188 : read (req->int1, req->ptr2, req->size); break; 1881 : read (req->int1, req->ptr2, req->size); break;
1189 case EIO_WRITE: req->result = req->offs >= 0 1882 case EIO_WRITE: req->result = req->offs >= 0
1190 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1883 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1191 : write (req->int1, req->ptr2, req->size); break; 1884 : write (req->int1, req->ptr2, req->size); break;
1192 1885
1886 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1887 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1888
1193 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1889 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1194 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 1890 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1891
1892#if HAVE_AT
1195 1893
1196 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1894 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1197 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1895 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1198 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1896 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1199 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1897 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1200 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1201 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1202
1203 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1898 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1204 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; 1899 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1206 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; 1900 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1208 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1209
1210 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break; 1901 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1211 case EIO_CLOSE: req->result = close (req->int1); break; 1902 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
1212 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 1903
1213 case EIO_UNLINK: req->result = unlink (req->ptr1); break; 1904 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1214 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1905 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1906 req->result = req->wd && SINGLEDOT (req->ptr1)
1907 ? rmdir (req->wd->str)
1908 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1215 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1909 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1216 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1910 case EIO_RENAME: req->result = eio__renameat2 (
1911 dirfd,
1912 /* complications arise because "." cannot be renamed, so we might have to expand */
1913 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1914 WD2FD ((eio_wd)req->int3),
1915 req->ptr2,
1916 req->int2
1917 );
1918 break;
1217 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1919 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1218 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1920 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1219 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1921 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1220 1922 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1923 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1221 case EIO_READLINK: ALLOC (NAME_MAX); 1924 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1222 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1925 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1223 1926 if (req->result == EIO_PATH_MAX)
1224 case EIO_SYNC: req->result = 0; sync (); break; 1927 {
1225 case EIO_FSYNC: req->result = fsync (req->int1); break; 1928 req->result = -1;
1226 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1929 errno = ENAMETOOLONG;
1227 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1930 }
1228 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1931 break;
1229 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1230
1231 case EIO_READDIR: eio__scandir (req, self); break;
1232
1233 case EIO_BUSY: 1932 case EIO_UTIME:
1234#ifdef _WIN32 1933 case EIO_FUTIME:
1235 Sleep (req->nv1 * 1000.); 1934 {
1935 struct timespec ts[2];
1936 struct timespec *times;
1937
1938 if (req->nv1 != -1. || req->nv2 != -1.)
1939 {
1940 ts[0].tv_sec = req->nv1;
1941 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1942 ts[1].tv_sec = req->nv2;
1943 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1944
1945 times = ts;
1946 }
1947 else
1948 times = 0;
1949
1950 req->result = req->type == EIO_FUTIME
1951 ? futimens (req->int1, times)
1952 : utimensat (dirfd, req->ptr1, times, 0);
1953 }
1954 break;
1955
1236#else 1956#else
1237 {
1238 struct timeval tv;
1239 1957
1240 tv.tv_sec = req->nv1; 1958 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1241 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1959 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1960 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1961 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1962 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1963 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1964 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1965 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1966 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
1242 1967
1243 req->result = select (0, 0, 0, 0, &tv); 1968 case EIO_UNLINK: req->result = unlink (path ); break;
1244 } 1969 case EIO_RMDIR: req->result = rmdir (path ); break;
1245#endif 1970 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1246 break; 1971 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
1972 case EIO_LINK: req->result = link (path , req->ptr2); break;
1973 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1974 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1975 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1976 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1977 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1978 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1979 if (req->result == EIO_PATH_MAX)
1980 {
1981 req->result = -1;
1982 errno = ENAMETOOLONG;
1983 }
1984 break;
1247 1985
1248 case EIO_UTIME: 1986 case EIO_UTIME:
1249 case EIO_FUTIME: 1987 case EIO_FUTIME:
1250 { 1988 {
1251 struct timeval tv[2]; 1989 struct timeval tv[2];
1252 struct timeval *times; 1990 struct timeval *times;
1253 1991
1254 if (req->nv1 != -1. || req->nv2 != -1.) 1992 if (req->nv1 != -1. || req->nv2 != -1.)
1255 { 1993 {
1256 tv[0].tv_sec = req->nv1; 1994 tv[0].tv_sec = req->nv1;
1257 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; 1995 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1258 tv[1].tv_sec = req->nv2; 1996 tv[1].tv_sec = req->nv2;
1259 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; 1997 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
1260 1998
1261 times = tv; 1999 times = tv;
1262 } 2000 }
1263 else 2001 else
1264 times = 0; 2002 times = 0;
1265
1266 2003
1267 req->result = req->type == EIO_FUTIME 2004 req->result = req->type == EIO_FUTIME
1268 ? futimes (req->int1, times) 2005 ? futimes (req->int1, times)
1269 : utimes (req->ptr1, times); 2006 : utimes (req->ptr1, times);
1270 } 2007 }
1271 break; 2008 break;
1272 2009
2010#endif
2011
2012 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2013 {
2014 ALLOC (req->result);
2015 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2016 }
2017 break;
2018
2019 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2020 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2021
2022 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2023 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2024
2025 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2026 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2027 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2028
2029 case EIO_CLOSE: req->result = eio__close (req->int1); break;
2030 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2031 case EIO_SYNC: req->result = 0; sync (); break;
2032 case EIO_FSYNC: req->result = fsync (req->int1); break;
2033 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2034 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2035 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2036 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2037 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2038 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2039 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2040 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2041
2042 case EIO_READDIR: eio__scandir (req, self); break;
2043
2044 case EIO_BUSY:
2045#ifdef _WIN32
2046 Sleep (req->nv1 * 1e3);
2047#else
2048 {
2049 struct timeval tv;
2050
2051 tv.tv_sec = req->nv1;
2052 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
2053
2054 req->result = select (0, 0, 0, 0, &tv);
2055 }
2056#endif
2057 break;
2058
2059#if 0
1273 case EIO_GROUP: 2060 case EIO_GROUP:
1274 abort (); /* handled in eio_request */ 2061 abort (); /* handled in eio_request */
2062#endif
1275 2063
1276 case EIO_NOP: 2064 case EIO_NOP:
1277 req->result = 0; 2065 req->result = 0;
1278 break; 2066 break;
1279 2067
1280 case EIO_CUSTOM: 2068 case EIO_CUSTOM:
1281 ((void (*)(eio_req *))req->feed) (req); 2069 req->feed (req);
1282 break; 2070 break;
1283 2071
1284 default: 2072 default:
1285 req->result = -1; 2073 req->result = EIO_ENOSYS ();
1286 break; 2074 break;
1287 } 2075 }
1288 2076
2077alloc_fail:
1289 req->errorno = errno; 2078 req->errorno = errno;
1290} 2079}
1291 2080
1292#ifndef EIO_NO_WRAPPERS 2081#ifndef EIO_NO_WRAPPERS
1293 2082
2083eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2084{
2085 REQ (EIO_WD_OPEN); PATH; SEND;
2086}
2087
2088eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2089{
2090 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2091}
2092
1294eio_req *eio_nop (int pri, eio_cb cb, void *data) 2093eio_req *eio_nop (int pri, eio_cb cb, void *data)
1295{ 2094{
1296 REQ (EIO_NOP); SEND; 2095 REQ (EIO_NOP); SEND;
1297} 2096}
1298 2097
… …
1314eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2113eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1315{ 2114{
1316 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2115 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1317} 2116}
1318 2117
2118eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2119{
2120 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2121}
2122
2123eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2124{
2125 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2126}
2127
2128eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2129{
2130 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2131}
2132
1319eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2133eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1320{ 2134{
1321 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2135 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1322} 2136}
1323 2137
1324eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2138eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1325{ 2139{
1326 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2140 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1327} 2141}
1328 2142
1329eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2143eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1330{ 2144{
1331 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2145 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2146}
2147
2148eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2149{
2150 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1332} 2151}
1333 2152
1334eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2153eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1335{ 2154{
1336 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2155 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
1339eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2158eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
1340{ 2159{
1341 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2160 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
1342} 2161}
1343 2162
2163eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2164{
2165 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2166}
2167
1344eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2168eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1345{ 2169{
1346 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2170 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1347} 2171}
1348 2172
1349eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2173eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1350{ 2174{
1351 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2175 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1352} 2176}
1353 2177
2178eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2179{
2180 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2181}
2182
2183eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2184{
2185 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2186}
2187
1354eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2188eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1355{ 2189{
1356 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2190 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1357} 2191}
1358 2192
2193eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
2194{
2195 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
2196}
2197
1359eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 2198eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1360{ 2199{
1361 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 2200 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1362} 2201}
1363 2202
… …
1369eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2208eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1370{ 2209{
1371 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2210 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1372} 2211}
1373 2212
1374eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2213eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1375{ 2214{
1376 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2215 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1377} 2216}
1378 2217
1379eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2218eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1399eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2238eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1400{ 2239{
1401 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2240 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1402} 2241}
1403 2242
1404eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2243eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1405{ 2244{
1406 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2245 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1407} 2246}
1408 2247
1409eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2248eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1425eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2264eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1426{ 2265{
1427 return eio__1path (EIO_READLINK, path, pri, cb, data); 2266 return eio__1path (EIO_READLINK, path, pri, cb, data);
1428} 2267}
1429 2268
2269eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2270{
2271 return eio__1path (EIO_REALPATH, path, pri, cb, data);
2272}
2273
1430eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2274eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1431{ 2275{
1432 return eio__1path (EIO_STAT, path, pri, cb, data); 2276 return eio__1path (EIO_STAT, path, pri, cb, data);
1433} 2277}
1434 2278
1435eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 2279eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1436{ 2280{
1437 return eio__1path (EIO_LSTAT, path, pri, cb, data); 2281 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1438} 2282}
1439 2283
2284eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
2285{
2286 return eio__1path (EIO_STATVFS, path, pri, cb, data);
2287}
2288
1440eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 2289eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1441{ 2290{
1442 return eio__1path (EIO_UNLINK, path, pri, cb, data); 2291 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1443} 2292}
1444 2293
1445eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 2294eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1446{ 2295{
1447 return eio__1path (EIO_RMDIR, path, pri, cb, data); 2296 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1448} 2297}
1449 2298
1450eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 2299eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1451{ 2300{
1452 return eio__1path (EIO_READDIR, path, pri, cb, data); 2301 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1453} 2302}
1454 2303
1455eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2304eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1456{ 2305{
1457 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 2306 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1458} 2307}
1459 2308
1460static eio_req * 2309static eio_req *
1461eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2310eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1462{ 2311{
… …
1486eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2335eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1487{ 2336{
1488 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2337 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1489} 2338}
1490 2339
2340eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2341{
2342 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2343}
2344
1491eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2345eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1492{ 2346{
1493 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2347 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1494} 2348}
1495 2349
1496#endif 2350#endif
1497 2351
1498eio_req *eio_grp (eio_cb cb, void *data) 2352eio_req *eio_grp (eio_cb cb, void *data)
… …
1507#undef SEND 2361#undef SEND
1508 2362
1509/*****************************************************************************/ 2363/*****************************************************************************/
1510/* grp functions */ 2364/* grp functions */
1511 2365
2366void
1512void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2367eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1513{ 2368{
1514 grp->int2 = limit; 2369 grp->int2 = limit;
1515 grp->feed = feed; 2370 grp->feed = feed;
1516 2371
1517 grp_try_feed (grp); 2372 grp_try_feed (grp);
1518} 2373}
1519 2374
2375void
1520void eio_grp_limit (eio_req *grp, int limit) 2376eio_grp_limit (eio_req *grp, int limit)
1521{ 2377{
1522 grp->int2 = limit; 2378 grp->int2 = limit;
1523 2379
1524 grp_try_feed (grp); 2380 grp_try_feed (grp);
1525} 2381}
1526 2382
2383void
1527void eio_grp_add (eio_req *grp, eio_req *req) 2384eio_grp_add (eio_req *grp, eio_req *req)
1528{ 2385{
1529 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2386 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1530 2387
1531 grp->flags |= EIO_FLAG_GROUPADD; 2388 grp->flags |= ETP_FLAG_GROUPADD;
1532 2389
1533 ++grp->size; 2390 ++grp->size;
1534 req->grp = grp; 2391 req->grp = grp;
1535 2392
1536 req->grp_prev = 0; 2393 req->grp_prev = 0;
… …
1543} 2400}
1544 2401
1545/*****************************************************************************/ 2402/*****************************************************************************/
1546/* misc garbage */ 2403/* misc garbage */
1547 2404
2405eio_ssize_t
1548ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2406eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1549{ 2407{
1550 etp_worker wrk;
1551
1552 wrk.dbuf = 0;
1553
1554 eio__sendfile (ofd, ifd, offset, count, &wrk); 2408 return eio__sendfile (ofd, ifd, offset, count);
1555
1556 if (wrk.dbuf)
1557 free (wrk.dbuf);
1558} 2409}
1559 2410

Diff Legend

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