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

Comparing libeio/eio.c (file contents):
Revision 1.12 by root, Tue May 13 18:54:52 2008 UTC vs.
Revision 1.99 by root, Tue Jul 26 11:07:08 2011 UTC

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

Diff Legend

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