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

Comparing libeio/eio.c (file contents):
Revision 1.53 by root, Sat Jan 9 10:03:09 2010 UTC vs.
Revision 1.119 by root, Tue Apr 10 05:01:34 2012 UTC

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

Diff Legend

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