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

Comparing libeio/eio.c (file contents):
Revision 1.65 by root, Mon May 30 12:56:50 2011 UTC vs.
Revision 1.120 by root, Tue Apr 24 18:47:50 2012 UTC

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

Diff Legend

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