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

Comparing libeio/eio.c (file contents):
Revision 1.32 by root, Sat Jun 6 18:06:55 2009 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC

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

Diff Legend

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