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

Comparing libeio/eio.c (file contents):
Revision 1.53 by root, Sat Jan 9 10:03:09 2010 UTC vs.
Revision 1.145 by root, Fri Jun 23 03:10:19 2017 UTC

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

Diff Legend

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