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

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

Diff Legend

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