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

Comparing libeio/eio.c (file contents):
Revision 1.40 by root, Sat Jun 13 14:58:33 2009 UTC vs.
Revision 1.139 by root, Thu Jun 25 18:14:19 2015 UTC

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

Diff Legend

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