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

Comparing libeio/eio.c (file contents):
Revision 1.52 by root, Fri Jan 8 09:29:56 2010 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC

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

Diff Legend

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