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

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

Diff Legend

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