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

Comparing libeio/eio.c (file contents):
Revision 1.63 by root, Thu May 26 03:51:55 2011 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC

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

Diff Legend

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