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

Diff Legend

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