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

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

Diff Legend

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