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

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

Diff Legend

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