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

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

Diff Legend

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