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

Comparing libeio/eio.c (file contents):
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 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 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifndef _WIN32
41# include "config.h"
42#endif
43
40#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
41 46
42#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
44#endif 49#endif
45#include "xthread.h" 50#include "xthread.h"
46 51
47#include <errno.h> 52#include <errno.h>
48#include <stddef.h> 53#include <stddef.h>
… …
53#include <sys/stat.h> 58#include <sys/stat.h>
54#include <limits.h> 59#include <limits.h>
55#include <fcntl.h> 60#include <fcntl.h>
56#include <assert.h> 61#include <assert.h>
57 62
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H
66# include <stdint.h>
67#endif
68
69#ifndef ECANCELED
70# define ECANCELED EDOM
71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
80static void eio_destroy (eio_req *req);
81
58#ifndef EIO_FINISH 82#ifndef EIO_FINISH
59# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
60#endif 84#endif
61 85
62#ifndef EIO_DESTROY 86#ifndef EIO_DESTROY
… …
65 89
66#ifndef EIO_FEED 90#ifndef EIO_FEED
67# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 91# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
68#endif 92#endif
69 93
94#ifndef EIO_FD_TO_WIN32_HANDLE
95# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
96#endif
97#ifndef EIO_WIN32_HANDLE_TO_FD
98# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
99#endif
100
101#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
102
103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
104
70#ifdef _WIN32 105#ifdef _WIN32
71 106
72 /*doh*/ 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */
109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
117 #define lstat(path,buf) stat (path,buf)
118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
119 #define mkdir(path,mode) _mkdir (path)
120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
121
122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125
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
73#else 197#else
74 198
75# include "config.h"
76# include <sys/time.h> 199 #include <sys/time.h>
77# include <sys/select.h> 200 #include <sys/select.h>
201 #include <sys/statvfs.h>
78# 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
79# include <utime.h> 237# include <utime.h>
80# include <signal.h>
81# include <dirent.h>
82
83/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
84# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
85# define D_INO(de) (de)->d_fileno
86# define _DIRENT_HAVE_D_TYPE /* sigh */
87# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600
88# define D_INO(de) (de)->d_ino
89# endif 238#endif
90 239
91# ifdef _DIRENT_HAVE_D_TYPE 240#if HAVE_SYS_SYSCALL_H
92# define D_TYPE(de) (de)->d_type 241# include <sys/syscall.h>
93# endif 242#endif
94 243
95# ifndef EIO_STRUCT_DIRENT 244#if HAVE_SYS_PRCTL_H
96# define EIO_STRUCT_DIRENT struct dirent 245# include <sys/prctl.h>
97# endif
98
99#endif 246#endif
100 247
101#if HAVE_SENDFILE 248#if HAVE_SENDFILE
102# if __linux 249# if __linux
103# include <sys/sendfile.h> 250# include <sys/sendfile.h>
104# elif __freebsd 251# elif __FreeBSD__ || defined __APPLE__
105# include <sys/socket.h> 252# include <sys/socket.h>
106# include <sys/uio.h> 253# include <sys/uio.h>
107# elif __hpux 254# elif __hpux
108# include <sys/socket.h> 255# include <sys/socket.h>
109# elif __solaris /* not yet */ 256# elif __solaris
110# include <sys/sendfile.h> 257# include <sys/sendfile.h>
111# else 258# else
112# error sendfile support requested but not available 259# error sendfile support requested but not available
113# endif 260# endif
114#endif 261#endif
115 262
116#ifndef D_TYPE 263#ifndef D_TYPE
117# define D_TYPE(de) 0 264# define D_TYPE(de) 0
118#endif 265#endif
119
120#ifndef D_INO 266#ifndef D_INO
121# define D_INO(de) 0 267# define D_INO(de) 0
122#endif 268#endif
123 269#ifndef D_NAMLEN
124/* number of seconds after which an idle threads exit */ 270# define D_NAMLEN(entp) strlen (D_NAME (entp))
125#define IDLE_TIMEOUT 10 271#endif
126 272
127/* used for struct dirent, AIX doesn't provide it */ 273/* used for struct dirent, AIX doesn't provide it */
128#ifndef NAME_MAX 274#ifndef NAME_MAX
129# define NAME_MAX 4096 275# define NAME_MAX 4096
130#endif 276#endif
131 277
278/* used for readlink etc. */
279#ifndef PATH_MAX
280# define PATH_MAX 4096
281#endif
282
132/* buffer size for various temporary buffers */ 283/* buffer size for various temporary buffers */
133#define EIO_BUFSIZE 65536 284#define EIO_BUFSIZE 65536
134 285
135#define dBUF \ 286#define dBUF \
136 char *eio_buf; \
137 ETP_WORKER_LOCK (self); \
138 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 287 char *eio_buf = malloc (EIO_BUFSIZE); \
139 ETP_WORKER_UNLOCK (self); \
140 errno = ENOMEM; \ 288 errno = ENOMEM; \
141 if (!eio_buf) \ 289 if (!eio_buf) \
142 return -1; 290 return -1
291
292#define FUBd \
293 free (eio_buf)
143 294
144#define EIO_TICKS ((1000000 + 1023) >> 10) 295#define EIO_TICKS ((1000000 + 1023) >> 10)
145 296
146/*****************************************************************************/ 297/*****************************************************************************/
147 298
148#if __GNUC__ >= 3 299struct tmpbuf
149# 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
150#else 325#else
151# 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);
152#endif 328#endif
153 329
154#define expect_false(expr) expect ((expr) != 0, 0) 330struct eio_pwd
155#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};
156 338
157/*****************************************************************************/ 339/*****************************************************************************/
158 340
159#define ETP_PRI_MIN EIO_PRI_MIN 341#define ETP_PRI_MIN EIO_PRI_MIN
160#define ETP_PRI_MAX EIO_PRI_MAX 342#define ETP_PRI_MAX EIO_PRI_MAX
… …
166static int eio_finish (eio_req *req); 348static int eio_finish (eio_req *req);
167#define ETP_FINISH(req) eio_finish (req) 349#define ETP_FINISH(req) eio_finish (req)
168static void eio_execute (struct etp_worker *self, eio_req *req); 350static void eio_execute (struct etp_worker *self, eio_req *req);
169#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 351#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
170 352
171#define ETP_WORKER_CLEAR(req) \
172 if (wrk->dbuf) \
173 { \
174 free (wrk->dbuf); \
175 wrk->dbuf = 0; \
176 } \
177 \
178 if (wrk->dirp) \
179 { \
180 closedir (wrk->dirp); \
181 wrk->dirp = 0; \
182 }
183#define ETP_WORKER_COMMON \
184 void *dbuf; \
185 DIR *dirp;
186
187/*****************************************************************************/ 353/*****************************************************************************/
188 354
189#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 355#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
190 356
191/* calculcate time difference in ~1/EIO_TICKS of a second */ 357/* calculate time difference in ~1/EIO_TICKS of a second */
358ecb_inline int
192static int tvdiff (struct timeval *tv1, struct timeval *tv2) 359tvdiff (struct timeval *tv1, struct timeval *tv2)
193{ 360{
194 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 361 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
195 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 362 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
196} 363}
197 364
… …
201static void (*done_poll_cb) (void); 368static void (*done_poll_cb) (void);
202 369
203static unsigned int max_poll_time; /* reslock */ 370static unsigned int max_poll_time; /* reslock */
204static unsigned int max_poll_reqs; /* reslock */ 371static unsigned int max_poll_reqs; /* reslock */
205 372
206static volatile unsigned int nreqs; /* reqlock */ 373static unsigned int nreqs; /* reqlock */
207static volatile unsigned int nready; /* reqlock */ 374static unsigned int nready; /* reqlock */
208static volatile unsigned int npending; /* reqlock */ 375static unsigned int npending; /* reqlock */
209static volatile unsigned int max_idle = 4; 376static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
377static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
210 378
211static mutex_t wrklock = X_MUTEX_INIT; 379static xmutex_t wrklock;
212static mutex_t reslock = X_MUTEX_INIT; 380static xmutex_t reslock;
213static mutex_t reqlock = X_MUTEX_INIT; 381static xmutex_t reqlock;
214static cond_t reqwait = X_COND_INIT; 382static xcond_t reqwait;
215 383
216#if !HAVE_PREADWRITE 384#if !HAVE_PREADWRITE
217/* 385/*
218 * make our pread/pwrite emulation safe against themselves, but not against 386 * make our pread/pwrite emulation safe against themselves, but not against
219 * 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,
220 * but that's your problem, not mine. 388 * but that's your problem, not mine.
221 */ 389 */
222static mutex_t preadwritelock = X_MUTEX_INIT; 390static xmutex_t preadwritelock;
223#endif 391#endif
224 392
225typedef struct etp_worker 393typedef struct etp_worker
226{ 394{
395 struct tmpbuf tmpbuf;
396
227 /* locked by wrklock */ 397 /* locked by wrklock */
228 struct etp_worker *prev, *next; 398 struct etp_worker *prev, *next;
229 399
230 thread_t tid; 400 xthread_t tid;
231 401
232 /* locked by reslock, reqlock or wrklock */ 402#ifdef ETP_WORKER_COMMON
233 ETP_REQ *req; /* currently processed request */
234
235 ETP_WORKER_COMMON 403 ETP_WORKER_COMMON
404#endif
236} etp_worker; 405} etp_worker;
237 406
238static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 407static etp_worker wrk_first; /* NOT etp */
239 408
240#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
241#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
242 411
243/* worker threads management */ 412/* worker threads management */
244 413
414static void
245static void etp_worker_clear (etp_worker *wrk) 415etp_worker_clear (etp_worker *wrk)
246{ 416{
247 ETP_WORKER_CLEAR (wrk);
248} 417}
249 418
419static void ecb_cold
250static void etp_worker_free (etp_worker *wrk) 420etp_worker_free (etp_worker *wrk)
251{ 421{
422 free (wrk->tmpbuf.ptr);
423
252 wrk->next->prev = wrk->prev; 424 wrk->next->prev = wrk->prev;
253 wrk->prev->next = wrk->next; 425 wrk->prev->next = wrk->next;
254 426
255 free (wrk); 427 free (wrk);
256} 428}
257 429
258static unsigned int etp_nreqs (void) 430static unsigned int
431etp_nreqs (void)
259{ 432{
260 int retval; 433 int retval;
261 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 434 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
262 retval = nreqs; 435 retval = nreqs;
263 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 436 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
264 return retval; 437 return retval;
265} 438}
266 439
267static unsigned int etp_nready (void) 440static unsigned int
441etp_nready (void)
268{ 442{
269 unsigned int retval; 443 unsigned int retval;
270 444
271 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 445 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
272 retval = nready; 446 retval = nready;
273 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 447 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
274 448
275 return retval; 449 return retval;
276} 450}
277 451
278static unsigned int etp_npending (void) 452static unsigned int
453etp_npending (void)
279{ 454{
280 unsigned int retval; 455 unsigned int retval;
281 456
282 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 457 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
283 retval = npending; 458 retval = npending;
284 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 459 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
285 460
286 return retval; 461 return retval;
287} 462}
288 463
289static unsigned int etp_nthreads (void) 464static unsigned int
465etp_nthreads (void)
290{ 466{
291 unsigned int retval; 467 unsigned int retval;
292 468
293 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 469 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
294 retval = started; 470 retval = started;
… …
308} etp_reqq; 484} etp_reqq;
309 485
310static etp_reqq req_queue; 486static etp_reqq req_queue;
311static etp_reqq res_queue; 487static etp_reqq res_queue;
312 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
313static int reqq_push (etp_reqq *q, ETP_REQ *req) 501reqq_push (etp_reqq *q, ETP_REQ *req)
314{ 502{
315 int pri = req->pri; 503 int pri = req->pri;
316 req->next = 0; 504 req->next = 0;
317 505
318 if (q->qe[pri]) 506 if (q->qe[pri])
… …
324 q->qe[pri] = q->qs[pri] = req; 512 q->qe[pri] = q->qs[pri] = req;
325 513
326 return q->size++; 514 return q->size++;
327} 515}
328 516
517static ETP_REQ * ecb_noinline
329static ETP_REQ *reqq_shift (etp_reqq *q) 518reqq_shift (etp_reqq *q)
330{ 519{
331 int pri; 520 int pri;
332 521
333 if (!q->size) 522 if (!q->size)
334 return 0; 523 return 0;
… …
349 } 538 }
350 539
351 abort (); 540 abort ();
352} 541}
353 542
354static void etp_atfork_prepare (void) 543static int ecb_cold
544etp_init (void (*want_poll)(void), void (*done_poll)(void))
355{ 545{
356 X_LOCK (wrklock); 546 X_MUTEX_CREATE (wrklock);
357 X_LOCK (reqlock); 547 X_MUTEX_CREATE (reslock);
358 X_LOCK (reslock); 548 X_MUTEX_CREATE (reqlock);
359#if !HAVE_PREADWRITE 549 X_COND_CREATE (reqwait);
360 X_LOCK (preadwritelock);
361#endif
362}
363 550
364static void etp_atfork_parent (void) 551 reqq_init (&req_queue);
365{ 552 reqq_init (&res_queue);
366#if !HAVE_PREADWRITE
367 X_UNLOCK (preadwritelock);
368#endif
369 X_UNLOCK (reslock);
370 X_UNLOCK (reqlock);
371 X_UNLOCK (wrklock);
372}
373 553
374static void etp_atfork_child (void) 554 wrk_first.next =
375{ 555 wrk_first.prev = &wrk_first;
376 ETP_REQ *prv;
377
378 while ((prv = reqq_shift (&req_queue)))
379 ETP_DESTROY (prv);
380
381 while ((prv = reqq_shift (&res_queue)))
382 ETP_DESTROY (prv);
383
384 while (wrk_first.next != &wrk_first)
385 {
386 etp_worker *wrk = wrk_first.next;
387
388 if (wrk->req)
389 ETP_DESTROY (wrk->req);
390
391 etp_worker_clear (wrk);
392 etp_worker_free (wrk);
393 }
394 556
395 started = 0; 557 started = 0;
396 idle = 0; 558 idle = 0;
397 nreqs = 0; 559 nreqs = 0;
398 nready = 0; 560 nready = 0;
399 npending = 0; 561 npending = 0;
400 562
401 etp_atfork_parent ();
402}
403
404static void
405etp_once_init (void)
406{
407 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
408}
409
410static int
411etp_init (void (*want_poll)(void), void (*done_poll)(void))
412{
413 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
414
415 pthread_once (&doinit, etp_once_init);
416
417 want_poll_cb = want_poll; 563 want_poll_cb = want_poll;
418 done_poll_cb = done_poll; 564 done_poll_cb = done_poll;
419 565
420 return 0; 566 return 0;
421} 567}
422 568
423X_THREAD_PROC (etp_proc); 569X_THREAD_PROC (etp_proc);
424 570
571static void ecb_cold
425static void etp_start_thread (void) 572etp_start_thread (void)
426{ 573{
427 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 574 etp_worker *wrk = calloc (1, sizeof (etp_worker));
428 575
429 /*TODO*/ 576 /*TODO*/
430 assert (("unable to allocate worker thread data", wrk)); 577 assert (("unable to allocate worker thread data", wrk));
… …
443 free (wrk); 590 free (wrk);
444 591
445 X_UNLOCK (wrklock); 592 X_UNLOCK (wrklock);
446} 593}
447 594
595static void
448static void etp_maybe_start_thread (void) 596etp_maybe_start_thread (void)
449{ 597{
450 if (expect_true (etp_nthreads () >= wanted)) 598 if (ecb_expect_true (etp_nthreads () >= wanted))
451 return; 599 return;
452 600
453 /* todo: maybe use idle here, but might be less exact */ 601 /* todo: maybe use idle here, but might be less exact */
454 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 ()))
455 return; 603 return;
456 604
457 etp_start_thread (); 605 etp_start_thread ();
458} 606}
459 607
608static void ecb_cold
460static void etp_end_thread (void) 609etp_end_thread (void)
461{ 610{
462 eio_req *req = calloc (1, sizeof (eio_req)); 611 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
463 612
464 req->type = -1; 613 req->type = -1;
465 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 614 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
466 615
467 X_LOCK (reqlock); 616 X_LOCK (reqlock);
… …
472 X_LOCK (wrklock); 621 X_LOCK (wrklock);
473 --started; 622 --started;
474 X_UNLOCK (wrklock); 623 X_UNLOCK (wrklock);
475} 624}
476 625
477static int etp_poll (void) 626static int
627etp_poll (void)
478{ 628{
479 unsigned int maxreqs; 629 unsigned int maxreqs;
480 unsigned int maxtime; 630 unsigned int maxtime;
481 struct timeval tv_start, tv_now; 631 struct timeval tv_start, tv_now;
482 632
… …
512 662
513 X_LOCK (reqlock); 663 X_LOCK (reqlock);
514 --nreqs; 664 --nreqs;
515 X_UNLOCK (reqlock); 665 X_UNLOCK (reqlock);
516 666
517 if (expect_false (req->type == EIO_GROUP && req->size)) 667 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
518 { 668 {
519 req->int1 = 1; /* mark request as delayed */ 669 req->int1 = 1; /* mark request as delayed */
520 continue; 670 continue;
521 } 671 }
522 else 672 else
523 { 673 {
524 int res = ETP_FINISH (req); 674 int res = ETP_FINISH (req);
525 if (expect_false (res)) 675 if (ecb_expect_false (res))
526 return res; 676 return res;
527 } 677 }
528 678
529 if (expect_false (maxreqs && !--maxreqs)) 679 if (ecb_expect_false (maxreqs && !--maxreqs))
530 break; 680 break;
531 681
532 if (maxtime) 682 if (maxtime)
533 { 683 {
534 gettimeofday (&tv_now, 0); 684 gettimeofday (&tv_now, 0);
… …
540 690
541 errno = EAGAIN; 691 errno = EAGAIN;
542 return -1; 692 return -1;
543} 693}
544 694
695static void
545static void etp_cancel (ETP_REQ *req) 696etp_cancel (ETP_REQ *req)
546{ 697{
547 X_LOCK (wrklock); 698 req->cancelled = 1;
548 req->flags |= EIO_FLAG_CANCELLED;
549 X_UNLOCK (wrklock);
550 699
551 eio_grp_cancel (req); 700 eio_grp_cancel (req);
552} 701}
553 702
703static void
554static void etp_submit (ETP_REQ *req) 704etp_submit (ETP_REQ *req)
555{ 705{
556 req->pri -= ETP_PRI_MIN; 706 req->pri -= ETP_PRI_MIN;
557 707
558 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;
559 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;
560 710
561 if (expect_false (req->type == EIO_GROUP)) 711 if (ecb_expect_false (req->type == EIO_GROUP))
562 { 712 {
563 /* I hope this is worth it :/ */ 713 /* I hope this is worth it :/ */
564 X_LOCK (reqlock); 714 X_LOCK (reqlock);
565 ++nreqs; 715 ++nreqs;
566 X_UNLOCK (reqlock); 716 X_UNLOCK (reqlock);
… …
585 735
586 etp_maybe_start_thread (); 736 etp_maybe_start_thread ();
587 } 737 }
588} 738}
589 739
740static void ecb_cold
590static void etp_set_max_poll_time (double nseconds) 741etp_set_max_poll_time (double nseconds)
591{ 742{
592 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 743 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
593 max_poll_time = nseconds; 744 max_poll_time = nseconds * EIO_TICKS;
594 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 745 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
595} 746}
596 747
748static void ecb_cold
597static void etp_set_max_poll_reqs (unsigned int maxreqs) 749etp_set_max_poll_reqs (unsigned int maxreqs)
598{ 750{
599 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 751 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
600 max_poll_reqs = maxreqs; 752 max_poll_reqs = maxreqs;
601 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 753 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
602} 754}
603 755
756static void ecb_cold
604static void etp_set_max_idle (unsigned int nthreads) 757etp_set_max_idle (unsigned int nthreads)
605{ 758{
606 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 759 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
607 max_idle = nthreads <= 0 ? 1 : nthreads; 760 max_idle = nthreads;
608 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 761 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
609} 762}
610 763
764static void ecb_cold
765etp_set_idle_timeout (unsigned int seconds)
766{
767 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
768 idle_timeout = seconds;
769 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
770}
771
772static void ecb_cold
611static void etp_set_min_parallel (unsigned int nthreads) 773etp_set_min_parallel (unsigned int nthreads)
612{ 774{
613 if (wanted < nthreads) 775 if (wanted < nthreads)
614 wanted = nthreads; 776 wanted = nthreads;
615} 777}
616 778
779static void ecb_cold
617static void etp_set_max_parallel (unsigned int nthreads) 780etp_set_max_parallel (unsigned int nthreads)
618{ 781{
619 if (wanted > nthreads) 782 if (wanted > nthreads)
620 wanted = nthreads; 783 wanted = nthreads;
621 784
622 while (started > wanted) 785 while (started > wanted)
623 etp_end_thread (); 786 etp_end_thread ();
624} 787}
625 788
626/*****************************************************************************/ 789/*****************************************************************************/
627 790
791static void
628static void grp_try_feed (eio_req *grp) 792grp_try_feed (eio_req *grp)
629{ 793{
630 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 794 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
631 { 795 {
632 grp->flags &= ~EIO_FLAG_GROUPADD; 796 grp->flags &= ~EIO_FLAG_GROUPADD;
633 797
… …
640 break; 804 break;
641 } 805 }
642 } 806 }
643} 807}
644 808
809static int
645static int grp_dec (eio_req *grp) 810grp_dec (eio_req *grp)
646{ 811{
647 --grp->size; 812 --grp->size;
648 813
649 /* call feeder, if applicable */ 814 /* call feeder, if applicable */
650 grp_try_feed (grp); 815 grp_try_feed (grp);
… …
654 return eio_finish (grp); 819 return eio_finish (grp);
655 else 820 else
656 return 0; 821 return 0;
657} 822}
658 823
824static void
659void eio_destroy (eio_req *req) 825eio_destroy (eio_req *req)
660{ 826{
661 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 827 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
662 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 828 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
663 829
664 EIO_DESTROY (req); 830 EIO_DESTROY (req);
665} 831}
666 832
833static int
667static int eio_finish (eio_req *req) 834eio_finish (eio_req *req)
668{ 835{
669 int res = EIO_FINISH (req); 836 int res = EIO_FINISH (req);
670 837
671 if (req->grp) 838 if (req->grp)
672 { 839 {
… …
680 if (grp->grp_first == req) 847 if (grp->grp_first == req)
681 grp->grp_first = req->grp_next; 848 grp->grp_first = req->grp_next;
682 849
683 res2 = grp_dec (grp); 850 res2 = grp_dec (grp);
684 851
685 if (!res && res2) 852 if (!res)
686 res = res2; 853 res = res2;
687 } 854 }
688 855
689 eio_destroy (req); 856 eio_destroy (req);
690 857
691 return res; 858 return res;
692} 859}
693 860
861void
694void eio_grp_cancel (eio_req *grp) 862eio_grp_cancel (eio_req *grp)
695{ 863{
696 for (grp = grp->grp_first; grp; grp = grp->grp_next) 864 for (grp = grp->grp_first; grp; grp = grp->grp_next)
697 eio_cancel (grp); 865 eio_cancel (grp);
698} 866}
699 867
868void
700void eio_cancel (eio_req *req) 869eio_cancel (eio_req *req)
701{ 870{
702 etp_cancel (req); 871 etp_cancel (req);
703} 872}
704 873
874void
705void eio_submit (eio_req *req) 875eio_submit (eio_req *req)
706{ 876{
707 etp_submit (req); 877 etp_submit (req);
708} 878}
709 879
710unsigned int eio_nreqs (void) 880unsigned int
881eio_nreqs (void)
711{ 882{
712 return etp_nreqs (); 883 return etp_nreqs ();
713} 884}
714 885
715unsigned int eio_nready (void) 886unsigned int
887eio_nready (void)
716{ 888{
717 return etp_nready (); 889 return etp_nready ();
718} 890}
719 891
720unsigned int eio_npending (void) 892unsigned int
893eio_npending (void)
721{ 894{
722 return etp_npending (); 895 return etp_npending ();
723} 896}
724 897
725unsigned int eio_nthreads (void) 898unsigned int ecb_cold
899eio_nthreads (void)
726{ 900{
727 return etp_nthreads (); 901 return etp_nthreads ();
728} 902}
729 903
904void ecb_cold
730void eio_set_max_poll_time (double nseconds) 905eio_set_max_poll_time (double nseconds)
731{ 906{
732 etp_set_max_poll_time (nseconds); 907 etp_set_max_poll_time (nseconds);
733} 908}
734 909
910void ecb_cold
735void eio_set_max_poll_reqs (unsigned int maxreqs) 911eio_set_max_poll_reqs (unsigned int maxreqs)
736{ 912{
737 etp_set_max_poll_reqs (maxreqs); 913 etp_set_max_poll_reqs (maxreqs);
738} 914}
739 915
916void ecb_cold
740void eio_set_max_idle (unsigned int nthreads) 917eio_set_max_idle (unsigned int nthreads)
741{ 918{
742 etp_set_max_idle (nthreads); 919 etp_set_max_idle (nthreads);
743} 920}
744 921
922void ecb_cold
923eio_set_idle_timeout (unsigned int seconds)
924{
925 etp_set_idle_timeout (seconds);
926}
927
928void ecb_cold
745void eio_set_min_parallel (unsigned int nthreads) 929eio_set_min_parallel (unsigned int nthreads)
746{ 930{
747 etp_set_min_parallel (nthreads); 931 etp_set_min_parallel (nthreads);
748} 932}
749 933
934void ecb_cold
750void eio_set_max_parallel (unsigned int nthreads) 935eio_set_max_parallel (unsigned int nthreads)
751{ 936{
752 etp_set_max_parallel (nthreads); 937 etp_set_max_parallel (nthreads);
753} 938}
754 939
755int eio_poll (void) 940int eio_poll (void)
… …
764# undef pread 949# undef pread
765# undef pwrite 950# undef pwrite
766# define pread eio__pread 951# define pread eio__pread
767# define pwrite eio__pwrite 952# define pwrite eio__pwrite
768 953
769static ssize_t 954static eio_ssize_t
770eio__pread (int fd, void *buf, size_t count, off_t offset) 955eio__pread (int fd, void *buf, size_t count, off_t offset)
771{ 956{
772 ssize_t res; 957 eio_ssize_t res;
773 off_t ooffset; 958 off_t ooffset;
774 959
775 X_LOCK (preadwritelock); 960 X_LOCK (preadwritelock);
776 ooffset = lseek (fd, 0, SEEK_CUR); 961 ooffset = lseek (fd, 0, SEEK_CUR);
777 lseek (fd, offset, SEEK_SET); 962 lseek (fd, offset, SEEK_SET);
… …
780 X_UNLOCK (preadwritelock); 965 X_UNLOCK (preadwritelock);
781 966
782 return res; 967 return res;
783} 968}
784 969
785static ssize_t 970static eio_ssize_t
786eio__pwrite (int fd, void *buf, size_t count, off_t offset) 971eio__pwrite (int fd, void *buf, size_t count, off_t offset)
787{ 972{
788 ssize_t res; 973 eio_ssize_t res;
789 off_t ooffset; 974 off_t ooffset;
790 975
791 X_LOCK (preadwritelock); 976 X_LOCK (preadwritelock);
792 ooffset = lseek (fd, 0, SEEK_CUR); 977 ooffset = lseek (fd, 0, SEEK_CUR);
793 lseek (fd, offset, SEEK_SET); 978 lseek (fd, offset, SEEK_SET);
… …
797 982
798 return res; 983 return res;
799} 984}
800#endif 985#endif
801 986
802#ifndef HAVE_FUTIMES 987#ifndef HAVE_UTIMES
803 988
804# undef utimes 989# undef utimes
805# undef futimes
806# define utimes(path,times) eio__utimes (path, times) 990# define utimes(path,times) eio__utimes (path, times)
807# define futimes(fd,times) eio__futimes (fd, times)
808 991
809static int 992static int
810eio__utimes (const char *filename, const struct timeval times[2]) 993eio__utimes (const char *filename, const struct timeval times[2])
811{ 994{
812 if (times) 995 if (times)
… …
820 } 1003 }
821 else 1004 else
822 return utime (filename, 0); 1005 return utime (filename, 0);
823} 1006}
824 1007
1008#endif
1009
1010#ifndef HAVE_FUTIMES
1011
1012# undef futimes
1013# define futimes(fd,times) eio__futimes (fd, times)
1014
1015static int
825static int eio__futimes (int fd, const struct timeval tv[2]) 1016eio__futimes (int fd, const struct timeval tv[2])
826{ 1017{
827 errno = ENOSYS; 1018 errno = ENOSYS;
828 return -1; 1019 return -1;
829} 1020}
830 1021
… …
833#if !HAVE_FDATASYNC 1024#if !HAVE_FDATASYNC
834# undef fdatasync 1025# undef fdatasync
835# define fdatasync(fd) fsync (fd) 1026# define fdatasync(fd) fsync (fd)
836#endif 1027#endif
837 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
838/* sync_file_range always needs emulation */ 1046/* sync_file_range always needs emulation */
839int 1047static int
840eio__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)
841{ 1049{
842#if HAVE_SYNC_FILE_RANGE 1050#if HAVE_SYNC_FILE_RANGE
843 int res; 1051 int res;
844 1052
… …
857 if (!res || errno != ENOSYS) 1065 if (!res || errno != ENOSYS)
858 return res; 1066 return res;
859#endif 1067#endif
860 1068
861 /* 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
862 * call fdatasync, as thta matches the expectation of it's users best */ 1070 * call fdatasync, as that matches the expectation of its users best */
863 return fdatasync (fd); 1071 return fdatasync (fd);
1072}
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
864} 1082}
865 1083
866#if !HAVE_READAHEAD 1084#if !HAVE_READAHEAD
867# undef readahead 1085# undef readahead
868# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1086# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
869 1087
870static ssize_t 1088static eio_ssize_t
871eio__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)
872{ 1090{
873 size_t todo = count; 1091 size_t todo = count;
874 dBUF; 1092 dBUF;
875 1093
… …
880 pread (fd, eio_buf, len, offset); 1098 pread (fd, eio_buf, len, offset);
881 offset += len; 1099 offset += len;
882 todo -= len; 1100 todo -= len;
883 } 1101 }
884 1102
885 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 */
886 return count; 1107 return 0;
887} 1108}
888 1109
889#endif 1110#endif
890 1111
891/* sendfile always needs emulation */ 1112/* sendfile always needs emulation */
892static ssize_t 1113static eio_ssize_t
893eio__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)
894{ 1115{
1116 eio_ssize_t written = 0;
895 ssize_t res; 1117 eio_ssize_t res;
896 1118
897 if (!count) 1119 if (!count)
898 return 0; 1120 return 0;
899 1121
1122 for (;;)
1123 {
1124#ifdef __APPLE__
1125# undef HAVE_SENDFILE /* broken, as everything on os x */
1126#endif
900#if HAVE_SENDFILE 1127#if HAVE_SENDFILE
901# if __linux 1128# if __linux
1129 off_t soffset = offset;
902 res = sendfile (ofd, ifd, &offset, count); 1130 res = sendfile (ofd, ifd, &soffset, count);
903 1131
904# elif __freebsd 1132# elif __FreeBSD__
905 /* 1133 /*
906 * 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
907 * wasted on making it similar to other I/O functions. 1135 * wasted on making it similar to other I/O functions.
908 */ 1136 */
909 {
910 off_t sbytes; 1137 off_t sbytes;
911 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1138 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
912 1139
913 if (res < 0 && sbytes) 1140 #if 0 /* according to the manpage, this is correct, but broken behaviour */
914 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 1141 /* freebsd' sendfile will return 0 on success */
1142 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
1143 /* not on e.g. EIO or EPIPE - sounds broken */
1144 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
915 res = sbytes; 1145 res = sbytes;
916 } 1146 #endif
1147
1148 /* according to source inspection, this is correct, and useful behaviour */
1149 if (sbytes)
1150 res = sbytes;
1151
1152# elif defined __APPLE__
1153 off_t sbytes = count;
1154 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1155
1156 /* according to the manpage, sbytes is always valid */
1157 if (sbytes)
1158 res = sbytes;
917 1159
918# elif __hpux 1160# elif __hpux
919 res = sendfile (ofd, ifd, offset, count, 0, 0); 1161 res = sendfile (ofd, ifd, offset, count, 0, 0);
920 1162
921# elif __solaris 1163# elif __solaris
922 {
923 struct sendfilevec vec; 1164 struct sendfilevec vec;
924 size_t sbytes; 1165 size_t sbytes;
925 1166
926 vec.sfv_fd = ifd; 1167 vec.sfv_fd = ifd;
927 vec.sfv_flag = 0; 1168 vec.sfv_flag = 0;
928 vec.sfv_off = offset; 1169 vec.sfv_off = offset;
929 vec.sfv_len = count; 1170 vec.sfv_len = count;
930 1171
931 res = sendfilev (ofd, &vec, 1, &sbytes); 1172 res = sendfilev (ofd, &vec, 1, &sbytes);
932 1173
933 if (res < 0 && sbytes) 1174 if (res < 0 && sbytes)
934 res = sbytes; 1175 res = sbytes;
935 }
936 1176
937# endif 1177# endif
1178
1179#elif defined (_WIN32) && 0
1180 /* does not work, just for documentation of what would need to be done */
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 */
1184 HANDLE h = TO_SOCKET (ifd);
1185 SetFilePointer (h, offset, 0, FILE_BEGIN);
1186 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1187
938#else 1188#else
939 res = -1; 1189 res = EIO_ENOSYS ();
940 errno = ENOSYS;
941#endif 1190#endif
942 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
943 if (res < 0 1215 if (res < 0
944 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1216 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1217 /* BSDs */
1218#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1219 || errno == ENOTSUP
1220#endif
1221#ifdef EOPNOTSUPP /* windows */
1222 || errno == EOPNOTSUPP /* BSDs */
1223#endif
945#if __solaris 1224#if __solaris
946 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1225 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
947#endif 1226#endif
948 ) 1227 )
949 ) 1228 )
… …
953 1232
954 res = 0; 1233 res = 0;
955 1234
956 while (count) 1235 while (count)
957 { 1236 {
958 ssize_t cnt; 1237 eio_ssize_t cnt;
959 1238
960 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);
961 1240
962 if (cnt <= 0) 1241 if (cnt <= 0)
963 { 1242 {
… …
975 1254
976 offset += cnt; 1255 offset += cnt;
977 res += cnt; 1256 res += cnt;
978 count -= cnt; 1257 count -= cnt;
979 } 1258 }
1259
1260 FUBd;
980 } 1261 }
981 1262
982 return res; 1263 return res;
983} 1264}
984 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
985static int 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;
1554}
1555
1556static signed char
986eio_dent_cmp (const void *a_, const void *b_) 1557eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
987{ 1558{
988 const eio_dirent *a = (const eio_dirent *)a_; 1559 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
989 const eio_dirent *b = (const eio_dirent *)b_; 1560 : a->inode < b->inode ? -1
1561 : a->inode > b->inode ? 1
1562 : 0;
1563}
990 1564
991 return (int)b->score - (int)a->score ? (int)b->score - (int)a->score 1565#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
992 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */ 1566
1567#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1568#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1569
1570static void
1571eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1572{
1573 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1574 unsigned char *bit = bits;
1575
1576 assert (CHAR_BIT == 8);
1577 assert (sizeof (eio_dirent) * 8 < 256);
1578 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1579 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1580
1581 if (size <= EIO_SORT_FAST)
1582 return;
1583
1584 /* first prepare an array of bits to test in our radix sort */
1585 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1586 /* inode_bits must contain all inodes ORed together */
1587 /* which is used to skip bits that are 0 everywhere, which is very common */
1588 {
1589 eio_ino_t endianness;
1590 int i, j;
1591
1592 /* we store the byte offset of byte n into byte n of "endianness" */
1593 for (i = 0; i < sizeof (eio_ino_t); ++i)
1594 ((unsigned char *)&endianness)[i] = i;
1595
1596 *bit++ = 0;
1597
1598 for (i = 0; i < sizeof (eio_ino_t); ++i)
1599 {
1600 /* shifting off the byte offsets out of "endianness" */
1601 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1602 endianness >>= 8;
1603
1604 for (j = 0; j < 8; ++j)
1605 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1606 *bit++ = offs + j;
1607 }
1608
1609 for (j = 0; j < 8; ++j)
1610 if (score_bits & (1 << j))
1611 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1612 }
1613
1614 /* now actually do the sorting (a variant of MSD radix sort) */
1615 {
1616 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1617 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1618 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1619 int stk_idx = 0;
1620
1621 base_stk [stk_idx] = dents;
1622 end_stk [stk_idx] = dents + size;
1623 bit_stk [stk_idx] = bit - 1;
1624
1625 do
1626 {
1627 base = base_stk [stk_idx];
1628 end = end_stk [stk_idx];
1629 bit = bit_stk [stk_idx];
1630
1631 for (;;)
1632 {
1633 unsigned char O = *bit >> 3;
1634 unsigned char M = 1 << (*bit & 7);
1635
1636 eio_dirent *a = base;
1637 eio_dirent *b = end;
1638
1639 if (b - a < EIO_SORT_CUTOFF)
1640 break;
1641
1642 /* now bit-partition the array on the bit */
1643 /* this ugly asymmetric loop seems to perform much better than typical */
1644 /* partition algos found in the literature */
1645 do
1646 if (!(((unsigned char *)a)[O] & M))
1647 ++a;
1648 else if (!(((unsigned char *)--b)[O] & M))
1649 {
1650 eio_dirent tmp = *a; *a = *b; *b = tmp;
1651 ++a;
1652 }
1653 while (b > a);
1654
1655 /* next bit, or stop, if no bits left in this path */
1656 if (!*--bit)
1657 break;
1658
1659 base_stk [stk_idx] = a;
1660 end_stk [stk_idx] = end;
1661 bit_stk [stk_idx] = bit;
1662 ++stk_idx;
1663
1664 end = a;
1665 }
1666 }
1667 while (stk_idx--);
1668 }
1669}
1670
1671static void
1672eio_dent_insertion_sort (eio_dirent *dents, int size)
1673{
1674 /* first move the smallest element to the front, to act as a sentinel */
1675 {
1676 int i;
1677 eio_dirent *min = dents;
1678
1679 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1680 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1681 if (EIO_DENT_CMP (dents [i], <, *min))
1682 min = &dents [i];
1683
1684 /* swap elements 0 and j (minimum) */
1685 {
1686 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1687 }
1688 }
1689
1690 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1691 {
1692 eio_dirent *i, *j;
1693
1694 for (i = dents + 1; i < dents + size; ++i)
1695 {
1696 eio_dirent value = *i;
1697
1698 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1699 j [1] = j [0];
1700
1701 j [1] = value;
1702 }
1703 }
1704}
1705
1706static void
1707eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1708{
1709 if (size <= 1)
1710 return; /* our insertion sort relies on size > 0 */
1711
1712 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1713 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1714 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1715
1716 /* use an insertion sort at the end, or for small arrays, */
1717 /* as insertion sort is more efficient for small partitions */
1718 eio_dent_insertion_sort (dents, size);
993} 1719}
994 1720
995/* read a full directory */ 1721/* read a full directory */
996static void 1722static void
997eio__scandir (eio_req *req, etp_worker *self) 1723eio__scandir (eio_req *req, etp_worker *self)
998{ 1724{
999 DIR *dirp;
1000 EIO_STRUCT_DIRENT *entp;
1001 unsigned char *name, *names; 1725 char *name, *names;
1002 int namesalloc = 4096; 1726 int namesalloc = 4096 - sizeof (void *) * 4;
1003 int namesoffs = 0; 1727 int namesoffs = 0;
1004 int flags = req->int1; 1728 int flags = req->int1;
1005 eio_dirent *dents = 0; 1729 eio_dirent *dents = 0;
1006 int dentalloc = 128; 1730 int dentalloc = 128;
1007 int dentoffs = 0; 1731 int dentoffs = 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
1008 1740
1009 req->result = -1; 1741 req->result = -1;
1010 1742
1011 if (!(flags & EIO_READDIR_DENTS)) 1743 if (!(flags & EIO_READDIR_DENTS))
1012 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1744 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1013 1745
1014 X_LOCK (wrklock); 1746#ifdef _WIN32
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);
1015 1752
1016 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 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
1017 self->dirp = dirp = opendir (req->ptr1); 1806 dirp = opendir (req->ptr1);
1807 #else
1808 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1809 #endif
1810
1811 if (!dirp)
1812 return;
1813#endif
1814
1815 if (req->flags & EIO_FLAG_PTR1_FREE)
1816 free (req->ptr1);
1817
1018 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1818 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1019 req->ptr1 = names = malloc (namesalloc);
1020 req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1819 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1820 req->ptr2 = names = malloc (namesalloc);
1021 1821
1022 X_UNLOCK (wrklock); 1822 if (!names || (flags && !dents))
1823 return;
1023 1824
1024 if (dirp && names && (!flags || dents))
1025 for (;;) 1825 for (;;)
1026 { 1826 {
1827 int done;
1828
1829#ifdef _WIN32
1830 done = !dirp;
1831#else
1027 errno = 0; 1832 errno = 0;
1028 entp = readdir (dirp); 1833 entp = readdir (dirp);
1834 done = !entp;
1835#endif
1029 1836
1030 if (!entp) 1837 if (done)
1031 { 1838 {
1839#ifndef _WIN32
1840 int old_errno = errno;
1841 closedir (dirp);
1842 errno = old_errno;
1843
1032 if (errno) 1844 if (errno)
1033 break; 1845 break;
1846#endif
1034 1847
1035 /* sort etc. */ 1848 /* sort etc. */
1036 req->int1 = flags; 1849 req->int1 = flags;
1037 req->result = dentoffs; 1850 req->result = dentoffs;
1038 1851
1039 if (flags & EIO_READDIR_STAT_ORDER || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN)) 1852 if (flags & EIO_READDIR_STAT_ORDER)
1853 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1854 else if (flags & EIO_READDIR_DIRS_FIRST)
1855 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1856 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1040 { 1857 else
1041 /* pray your qsort doesn't use quicksort */
1042 qsort (dents, dentoffs, sizeof (*dents), eio_dent_cmp); /* score depends of DIRS_FIRST */
1043 }
1044 else if (flags & EIO_READDIR_DIRS_FIRST && !(flags & EIO_READDIR_FOUND_UNKNOWN))
1045 { 1858 {
1046 /* in this case, all is known, and we just put dirs first and sort them */ 1859 /* in this case, all is known, and we just put dirs first and sort them */
1047 eio_dirent *ent = dents + dentoffs; 1860 eio_dirent *oth = dents + dentoffs;
1048 eio_dirent *dir = dents; 1861 eio_dirent *dir = dents;
1049 1862
1863 /* now partition dirs to the front, and non-dirs to the back */
1864 /* by walking from both sides and swapping if necessary */
1050 while (ent > dir) 1865 while (oth > dir)
1051 { 1866 {
1052 if (dir->type == DT_DIR) 1867 if (dir->type == EIO_DT_DIR)
1053 ++dir; 1868 ++dir;
1054 else 1869 else if ((--oth)->type == EIO_DT_DIR)
1055 { 1870 {
1056 --ent;
1057
1058 if (ent->type == DT_DIR)
1059 {
1060 eio_dirent tmp = *dir; 1871 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1061 *dir = *ent;
1062 *ent = tmp;
1063 1872
1064 ++dir; 1873 ++dir;
1065 }
1066 } 1874 }
1067 } 1875 }
1068 1876
1069 /* now sort the dirs only */ 1877 /* now sort the dirs only (dirs all have the same score) */
1070 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp); 1878 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1071 } 1879 }
1072 1880
1073 {int i; for(i=0;i<dentoffs;++i){eio_dirent *e=dents+i; printf ("%9ld %3d %s\n", e->inode,e->score,e->name);}}//D
1074
1075 break; 1881 break;
1076 } 1882 }
1077 1883
1078 name = entp->d_name; 1884 /* now add the entry to our list(s) */
1885 name = D_NAME (entp);
1079 1886
1887 /* skip . and .. entries */
1080 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1888 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1081 { 1889 {
1082 int len = strlen (name) + 1; 1890 int len = D_NAMLEN (entp) + 1;
1083 1891
1084 while (expect_false (namesoffs + len > namesalloc)) 1892 while (ecb_expect_false (namesoffs + len > namesalloc))
1085 { 1893 {
1086 namesalloc *= 2; 1894 namesalloc *= 2;
1087 X_LOCK (wrklock);
1088 req->ptr1 = names = realloc (names, namesalloc); 1895 req->ptr2 = names = realloc (names, namesalloc);
1089 X_UNLOCK (wrklock);
1090 1896
1091 if (!names) 1897 if (!names)
1092 break; 1898 break;
1093 } 1899 }
1094 1900
1095 memcpy (names + namesoffs, name, len); 1901 memcpy (names + namesoffs, name, len);
1096 1902
1097 if (dents) 1903 if (dents)
1098 { 1904 {
1099 struct eio_dirent *ent; 1905 struct eio_dirent *ent;
1100 1906
1101 if (expect_false (dentoffs == dentalloc)) 1907 if (ecb_expect_false (dentoffs == dentalloc))
1102 { 1908 {
1103 dentalloc *= 2; 1909 dentalloc *= 2;
1104 X_LOCK (wrklock);
1105 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1910 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1106 X_UNLOCK (wrklock);
1107 1911
1108 if (!dents) 1912 if (!dents)
1109 break; 1913 break;
1110 } 1914 }
1111 1915
1112 ent = dents + dentoffs; 1916 ent = dents + dentoffs;
1113 1917
1114 ent->name = names + namesoffs; 1918 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1115 ent->namelen = len - 1; 1919 ent->namelen = len - 1;
1116 ent->inode = D_INO (entp); 1920 ent->inode = D_INO (entp);
1117 1921
1922 inode_bits |= ent->inode;
1923
1118 switch (D_TYPE (entp)) 1924 switch (D_TYPE (entp))
1119 { 1925 {
1120 default: 1926 default:
1121 ent->type = EIO_DT_UNKNOWN; 1927 ent->type = EIO_DT_UNKNOWN;
1122 flags |= EIO_READDIR_FOUND_UNKNOWN; 1928 flags |= EIO_READDIR_FOUND_UNKNOWN;
1123 break; 1929 break;
1124 1930
1125 #ifdef DT_FIFO 1931 #ifdef DT_FIFO
1126 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1932 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1127 #endif 1933 #endif
1128 #ifdef DT_CHR 1934 #ifdef DT_CHR
1129 case DT_CHR: ent->type = EIO_DT_CHR; break; 1935 case DT_CHR: ent->type = EIO_DT_CHR; break;
1130 #endif 1936 #endif
1937 #ifdef DT_MPC
1938 case DT_MPC: ent->type = EIO_DT_MPC; break;
1939 #endif
1131 #ifdef DT_DIR 1940 #ifdef DT_DIR
1132 case DT_DIR: ent->type = EIO_DT_DIR; break; 1941 case DT_DIR: ent->type = EIO_DT_DIR; break;
1133 #endif 1942 #endif
1943 #ifdef DT_NAM
1944 case DT_NAM: ent->type = EIO_DT_NAM; break;
1945 #endif
1134 #ifdef DT_BLK 1946 #ifdef DT_BLK
1135 case DT_BLK: ent->type = EIO_DT_BLK; break; 1947 case DT_BLK: ent->type = EIO_DT_BLK; break;
1136 #endif 1948 #endif
1949 #ifdef DT_MPB
1950 case DT_MPB: ent->type = EIO_DT_MPB; break;
1951 #endif
1137 #ifdef DT_REG 1952 #ifdef DT_REG
1138 case DT_REG: ent->type = EIO_DT_REG; break; 1953 case DT_REG: ent->type = EIO_DT_REG; break;
1139 #endif 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
1140 #ifdef DT_LNK 1961 #ifdef DT_LNK
1141 case DT_LNK: ent->type = EIO_DT_LNK; break; 1962 case DT_LNK: ent->type = EIO_DT_LNK; break;
1142 #endif 1963 #endif
1143 #ifdef DT_SOCK 1964 #ifdef DT_SOCK
1144 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1965 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1145 #endif 1966 #endif
1967 #ifdef DT_DOOR
1968 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1969 #endif
1146 #ifdef DT_WHT 1970 #ifdef DT_WHT
1147 case DT_WHT: ent->type = EIO_DT_WHT; break; 1971 case DT_WHT: ent->type = EIO_DT_WHT; break;
1148 #endif 1972 #endif
1149 } 1973 }
1150 1974
1151 ent->score = 0; 1975 ent->score = 7;
1152 1976
1153 if (flags & EIO_READDIR_DIRS_FIRST) 1977 if (flags & EIO_READDIR_DIRS_FIRST)
1154 { 1978 {
1155 if (ent->type == EIO_DT_UNKNOWN) 1979 if (ent->type == EIO_DT_UNKNOWN)
1156 { 1980 {
1157 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1981 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1158 ent->score = 98; 1982 ent->score = 1;
1159 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1983 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1160 ent->score = len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */ 1984 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1161 } 1985 }
1162 else if (ent->type == DT_DIR) 1986 else if (ent->type == EIO_DT_DIR)
1163 ent->score = 100; 1987 ent->score = 0;
1164 } 1988 }
1165 } 1989 }
1166 1990
1167 namesoffs += len; 1991 namesoffs += len;
1168 ++dentoffs; 1992 ++dentoffs;
1169 } 1993 }
1994
1995 if (EIO_CANCELLED (req))
1996 {
1997 errno = ECANCELED;
1998 break;
1170 } 1999 }
1171 else
1172 req->result = -1;
1173 2000
1174 /* if user doesn't want the dents, do not provide it */ 2001#ifdef _WIN32
1175 if (!(flags & EIO_READDIR_DENTS)) 2002 if (!FindNextFile (dirp, &entp))
2003 {
2004 FindClose (dirp);
2005 dirp = 0;
2006 }
2007#endif
2008 }
2009}
2010
2011/*****************************************************************************/
2012/* working directory stuff */
2013/* various deficiencies in the posix 2008 api force us to */
2014/* keep the absolute path in string form at all times */
2015/* fuck yeah. */
2016
2017#if !HAVE_AT
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
2073 return res;
2074}
2075
2076eio_wd
2077eio_wd_open_sync (eio_wd wd, const char *path)
2078{
2079 struct tmpbuf tmpbuf = { 0 };
2080 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2081 free (tmpbuf.ptr);
2082
2083 return wd;
2084}
2085
2086void
2087eio_wd_close_sync (eio_wd wd)
2088{
2089 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1176 { 2090 {
1177 X_LOCK (wrklock); 2091 #if HAVE_AT
2092 close (wd->fd);
2093 #endif
1178 free (dents); 2094 free (wd);
1179 req->ptr2 = req->ptr1;
1180 req->ptr1 = 0;
1181 X_UNLOCK (wrklock);
1182 } 2095 }
1183} 2096}
1184 2097
1185#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 2098#if HAVE_AT
1186# undef msync
1187# define msync(a,b,c) ((errno = ENOSYS), -1)
1188#endif
1189 2099
1190int 2100/* they forgot these */
1191eio__mtouch (void *mem, size_t len, int flags)
1192{
1193 intptr_t addr = (intptr_t)mem;
1194 intptr_t end = addr + len;
1195#ifdef PAGESIZE
1196 const intptr_t page = PAGESIZE;
1197#else
1198 static intptr_t page;
1199 2101
1200 if (!page) 2102static int
1201 page = sysconf (_SC_PAGESIZE); 2103eio__truncateat (int dirfd, const char *path, off_t length)
1202#endif 2104{
2105 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2106 int res;
1203 2107
1204 addr &= ~(page - 1); /* assume page size is always a power of two */ 2108 if (fd < 0)
2109 return fd;
1205 2110
1206 if (addr < end) 2111 res = ftruncate (fd, length);
1207 if (flags) /* modify */ 2112 close (fd);
1208 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1209 else
1210 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1211
1212 return 0; 2113 return res;
1213} 2114}
2115
2116static int
2117eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2118{
2119 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2120 int res;
2121
2122 if (fd < 0)
2123 return fd;
2124
2125 res = fstatvfs (fd, buf);
2126 close (fd);
2127 return res;
2128
2129}
2130
2131#endif
1214 2132
1215/*****************************************************************************/ 2133/*****************************************************************************/
1216 2134
1217#define ALLOC(len) \ 2135#define ALLOC(len) \
1218 if (!req->ptr2) \ 2136 if (!req->ptr2) \
… …
1227 req->result = -1; \ 2145 req->result = -1; \
1228 break; \ 2146 break; \
1229 } \ 2147 } \
1230 } 2148 }
1231 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
1232X_THREAD_PROC (etp_proc) 2167X_THREAD_PROC (etp_proc)
1233{ 2168{
1234 ETP_REQ *req; 2169 ETP_REQ *req;
1235 struct timespec ts; 2170 struct timespec ts;
1236 etp_worker *self = (etp_worker *)thr_arg; 2171 etp_worker *self = (etp_worker *)thr_arg;
1237 2172
2173 etp_proc_init ();
2174
1238 /* try to distribute timeouts somewhat randomly */ 2175 /* try to distribute timeouts somewhat evenly */
1239 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2176 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1240 2177
1241 for (;;) 2178 for (;;)
1242 { 2179 {
2180 ts.tv_sec = 0;
2181
1243 X_LOCK (reqlock); 2182 X_LOCK (reqlock);
1244 2183
1245 for (;;) 2184 for (;;)
1246 { 2185 {
1247 self->req = req = reqq_shift (&req_queue); 2186 req = reqq_shift (&req_queue);
1248 2187
1249 if (req) 2188 if (req)
1250 break; 2189 break;
1251 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
1252 ++idle; 2200 ++idle;
1253 2201
1254 ts.tv_sec = time (0) + IDLE_TIMEOUT; 2202 if (idle <= max_idle)
1255 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
1256 { 2206 {
1257 if (idle > max_idle) 2207 /* initialise timeout once */
1258 { 2208 if (!ts.tv_sec)
1259 --idle; 2209 ts.tv_sec = time (0) + idle_timeout;
1260 X_UNLOCK (reqlock);
1261 X_LOCK (wrklock);
1262 --started;
1263 X_UNLOCK (wrklock);
1264 goto quit;
1265 }
1266 2210
1267 /* we are allowed to idle, so do so without any timeout */
1268 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.,.. */
1269 } 2213 }
1270 2214
1271 --idle; 2215 --idle;
1272 } 2216 }
1273 2217
… …
1276 X_UNLOCK (reqlock); 2220 X_UNLOCK (reqlock);
1277 2221
1278 if (req->type < 0) 2222 if (req->type < 0)
1279 goto quit; 2223 goto quit;
1280 2224
1281 if (!EIO_CANCELLED (req))
1282 ETP_EXECUTE (self, req); 2225 ETP_EXECUTE (self, req);
1283 2226
1284 X_LOCK (reslock); 2227 X_LOCK (reslock);
1285 2228
1286 ++npending; 2229 ++npending;
1287 2230
1288 if (!reqq_push (&res_queue, req) && want_poll_cb) 2231 if (!reqq_push (&res_queue, req) && want_poll_cb)
1289 want_poll_cb (); 2232 want_poll_cb ();
1290 2233
1291 self->req = 0;
1292 etp_worker_clear (self); 2234 etp_worker_clear (self);
1293 2235
1294 X_UNLOCK (reslock); 2236 X_UNLOCK (reslock);
1295 } 2237 }
1296 2238
1297quit: 2239quit:
2240 free (req);
2241
1298 X_LOCK (wrklock); 2242 X_LOCK (wrklock);
1299 etp_worker_free (self); 2243 etp_worker_free (self);
1300 X_UNLOCK (wrklock); 2244 X_UNLOCK (wrklock);
1301
1302 return 0;
1303} 2245}
1304 2246
1305/*****************************************************************************/ 2247/*****************************************************************************/
1306 2248
2249int ecb_cold
1307int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2250eio_init (void (*want_poll)(void), void (*done_poll)(void))
1308{ 2251{
2252#if !HAVE_PREADWRITE
2253 X_MUTEX_CREATE (preadwritelock);
2254#endif
2255
1309 return etp_init (want_poll, done_poll); 2256 return etp_init (want_poll, done_poll);
1310} 2257}
1311 2258
2259ecb_inline void
1312static void eio_api_destroy (eio_req *req) 2260eio_api_destroy (eio_req *req)
1313{ 2261{
1314 free (req); 2262 free (req);
1315} 2263}
1316 2264
1317#define REQ(rtype) \ 2265#define REQ(rtype) \
… …
1336 { \ 2284 { \
1337 eio_api_destroy (req); \ 2285 eio_api_destroy (req); \
1338 return 0; \ 2286 return 0; \
1339 } 2287 }
1340 2288
2289static void
1341static void eio_execute (etp_worker *self, eio_req *req) 2290eio_execute (etp_worker *self, eio_req *req)
1342{ 2291{
1343 errno = 0; 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 }
1344 2320
1345 switch (req->type) 2321 switch (req->type)
1346 { 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;
1347 case EIO_READ: ALLOC (req->size); 2330 case EIO_READ: ALLOC (req->size);
1348 req->result = req->offs >= 0 2331 req->result = req->offs >= 0
1349 ? pread (req->int1, req->ptr2, req->size, req->offs) 2332 ? pread (req->int1, req->ptr2, req->size, req->offs)
1350 : read (req->int1, req->ptr2, req->size); break; 2333 : read (req->int1, req->ptr2, req->size); break;
1351 case EIO_WRITE: req->result = req->offs >= 0 2334 case EIO_WRITE: req->result = req->offs >= 0
1352 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2335 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1353 : write (req->int1, req->ptr2, req->size); break; 2336 : write (req->int1, req->ptr2, req->size); break;
1354 2337
1355 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;
1356 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
1357 2342
1358 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2343 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1359 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;
1360 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2345 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1361 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2346 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1362 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1363 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1364
1365 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 2347 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1366 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1367 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 2348 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1368 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1369 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 2349 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1370 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1371
1372 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break; 2350 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1373 case EIO_CLOSE: req->result = close (req->int1); break; 2351
1374 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1375 case EIO_UNLINK: req->result = unlink (req->ptr1); break; 2352 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1376 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 2353 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1377 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 2354 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1378 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 2355 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1379 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 2356 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1380 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 2357 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1381 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 2358 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1382
1383 case EIO_READLINK: ALLOC (NAME_MAX); 2359 case EIO_READLINK: ALLOC (PATH_MAX);
1384 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 2360 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1385 2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1386 case EIO_SYNC: req->result = 0; sync (); break; 2362 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1387 case EIO_FSYNC: req->result = fsync (req->int1); break;
1388 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1389 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
1390 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1391 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1392
1393 case EIO_READDIR: eio__scandir (req, self); break;
1394
1395 case EIO_BUSY: 2363 case EIO_UTIME:
1396#ifdef _WIN32 2364 case EIO_FUTIME:
1397 Sleep (req->nv1 * 1000.); 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
1398#else 2387#else
1399 {
1400 struct timeval tv;
1401 2388
1402 tv.tv_sec = req->nv1; 2389 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1403 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 2390 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2391 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
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;
1404 2397
1405 req->result = select (0, 0, 0, 0, &tv); 2398 case EIO_UNLINK: req->result = unlink (path ); break;
1406 } 2399 case EIO_RMDIR: req->result = rmdir (path ); break;
1407#endif 2400 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1408 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;
1409 2409
1410 case EIO_UTIME: 2410 case EIO_UTIME:
1411 case EIO_FUTIME: 2411 case EIO_FUTIME:
1412 { 2412 {
1413 struct timeval tv[2]; 2413 struct timeval tv[2];
1414 struct timeval *times; 2414 struct timeval *times;
1415 2415
1416 if (req->nv1 != -1. || req->nv2 != -1.) 2416 if (req->nv1 != -1. || req->nv2 != -1.)
1417 { 2417 {
1418 tv[0].tv_sec = req->nv1; 2418 tv[0].tv_sec = req->nv1;
1419 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; 2419 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1420 tv[1].tv_sec = req->nv2; 2420 tv[1].tv_sec = req->nv2;
1421 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; 2421 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
1422 2422
1423 times = tv; 2423 times = tv;
1424 } 2424 }
1425 else 2425 else
1426 times = 0; 2426 times = 0;
1427
1428 2427
1429 req->result = req->type == EIO_FUTIME 2428 req->result = req->type == EIO_FUTIME
1430 ? futimes (req->int1, times) 2429 ? futimes (req->int1, times)
1431 : utimes (req->ptr1, times); 2430 : utimes (req->ptr1, times);
1432 } 2431 }
1433 break; 2432 break;
1434 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
2443 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2444 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2445
2446 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2447 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2448
2449 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2450 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2451 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2452
2453 case EIO_CLOSE: req->result = close (req->int1); break;
2454 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2455 case EIO_SYNC: req->result = 0; sync (); break;
2456 case EIO_FSYNC: req->result = fsync (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;
2460 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2461 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2462 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2463 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2464 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2465
2466 case EIO_READDIR: eio__scandir (req, self); break;
2467
2468 case EIO_BUSY:
2469#ifdef _WIN32
2470 Sleep (req->nv1 * 1e3);
2471#else
2472 {
2473 struct timeval tv;
2474
2475 tv.tv_sec = req->nv1;
2476 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
2477
2478 req->result = select (0, 0, 0, 0, &tv);
2479 }
2480#endif
2481 break;
2482
1435 case EIO_GROUP: 2483 case EIO_GROUP:
1436 abort (); /* handled in eio_request */ 2484 abort (); /* handled in eio_request */
1437 2485
1438 case EIO_NOP: 2486 case EIO_NOP:
1439 req->result = 0; 2487 req->result = 0;
1440 break; 2488 break;
1441 2489
1442 case EIO_CUSTOM: 2490 case EIO_CUSTOM:
1443 ((void (*)(eio_req *))req->feed) (req); 2491 req->feed (req);
1444 break; 2492 break;
1445 2493
1446 default: 2494 default:
1447 req->result = -1; 2495 req->result = EIO_ENOSYS ();
1448 break; 2496 break;
1449 } 2497 }
1450 2498
1451 req->errorno = errno; 2499 req->errorno = errno;
1452} 2500}
1453 2501
1454#ifndef EIO_NO_WRAPPERS 2502#ifndef EIO_NO_WRAPPERS
1455 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
1456eio_req *eio_nop (int pri, eio_cb cb, void *data) 2514eio_req *eio_nop (int pri, eio_cb cb, void *data)
1457{ 2515{
1458 REQ (EIO_NOP); SEND; 2516 REQ (EIO_NOP); SEND;
1459} 2517}
1460 2518
… …
1476eio_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)
1477{ 2535{
1478 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;
1479} 2537}
1480 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
1481eio_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)
1482{ 2555{
1483 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;
1484} 2557}
1485 2558
1486eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2559eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1487{ 2560{
1488 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2561 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1489} 2562}
1490 2563
1491eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2564eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1492{ 2565{
1493 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2566 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2567}
2568
2569eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2570{
2571 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1494} 2572}
1495 2573
1496eio_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)
1497{ 2575{
1498 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2576 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
1501eio_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)
1502{ 2580{
1503 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;
1504} 2582}
1505 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
1506eio_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)
1507{ 2590{
1508 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;
1509} 2592}
1510 2593
… …
1516eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2599eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1517{ 2600{
1518 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2601 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1519} 2602}
1520 2603
2604eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
2605{
2606 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
2607}
2608
1521eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 2609eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1522{ 2610{
1523 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 2611 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1524} 2612}
1525 2613
… …
1531eio_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)
1532{ 2620{
1533 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2621 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1534} 2622}
1535 2623
1536eio_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)
1537{ 2625{
1538 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;
1539} 2627}
1540 2628
1541eio_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)
… …
1561eio_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)
1562{ 2650{
1563 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2651 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1564} 2652}
1565 2653
1566eio_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)
1567{ 2655{
1568 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;
1569} 2657}
1570 2658
1571eio_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)
… …
1587eio_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)
1588{ 2676{
1589 return eio__1path (EIO_READLINK, path, pri, cb, data); 2677 return eio__1path (EIO_READLINK, path, pri, cb, data);
1590} 2678}
1591 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);
2683}
2684
1592eio_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)
1593{ 2686{
1594 return eio__1path (EIO_STAT, path, pri, cb, data); 2687 return eio__1path (EIO_STAT, path, pri, cb, data);
1595} 2688}
1596 2689
1597eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 2690eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1598{ 2691{
1599 return eio__1path (EIO_LSTAT, path, pri, cb, data); 2692 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1600} 2693}
1601 2694
2695eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
2696{
2697 return eio__1path (EIO_STATVFS, path, pri, cb, data);
2698}
2699
1602eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 2700eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1603{ 2701{
1604 return eio__1path (EIO_UNLINK, path, pri, cb, data); 2702 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1605} 2703}
1606 2704
… …
1614 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 2712 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1615} 2713}
1616 2714
1617eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2715eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1618{ 2716{
1619 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 2717 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1620} 2718}
1621 2719
1622static eio_req * 2720static eio_req *
1623eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2721eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1624{ 2722{
… …
1648eio_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)
1649{ 2747{
1650 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2748 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1651} 2749}
1652 2750
1653eio_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)
1654{ 2752{
1655 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2753 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1656} 2754}
1657 2755
1658#endif 2756#endif
1659 2757
1660eio_req *eio_grp (eio_cb cb, void *data) 2758eio_req *eio_grp (eio_cb cb, void *data)
… …
1669#undef SEND 2767#undef SEND
1670 2768
1671/*****************************************************************************/ 2769/*****************************************************************************/
1672/* grp functions */ 2770/* grp functions */
1673 2771
2772void
1674void 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)
1675{ 2774{
1676 grp->int2 = limit; 2775 grp->int2 = limit;
1677 grp->feed = feed; 2776 grp->feed = feed;
1678 2777
1679 grp_try_feed (grp); 2778 grp_try_feed (grp);
1680} 2779}
1681 2780
2781void
1682void eio_grp_limit (eio_req *grp, int limit) 2782eio_grp_limit (eio_req *grp, int limit)
1683{ 2783{
1684 grp->int2 = limit; 2784 grp->int2 = limit;
1685 2785
1686 grp_try_feed (grp); 2786 grp_try_feed (grp);
1687} 2787}
1688 2788
2789void
1689void eio_grp_add (eio_req *grp, eio_req *req) 2790eio_grp_add (eio_req *grp, eio_req *req)
1690{ 2791{
1691 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));
1692 2793
1693 grp->flags |= EIO_FLAG_GROUPADD; 2794 grp->flags |= EIO_FLAG_GROUPADD;
1694 2795
… …
1705} 2806}
1706 2807
1707/*****************************************************************************/ 2808/*****************************************************************************/
1708/* misc garbage */ 2809/* misc garbage */
1709 2810
2811eio_ssize_t
1710ssize_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)
1711{ 2813{
1712 etp_worker wrk;
1713
1714 wrk.dbuf = 0;
1715
1716 eio__sendfile (ofd, ifd, offset, count, &wrk); 2814 return eio__sendfile (ofd, ifd, offset, count);
1717
1718 if (wrk.dbuf)
1719 free (wrk.dbuf);
1720} 2815}
1721 2816

Diff Legend

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