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

Comparing libeio/eio.c (file contents):
Revision 1.27 by root, Wed Oct 22 18:15:36 2008 UTC vs.
Revision 1.103 by root, Thu Sep 15 13:20:54 2011 UTC

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

Diff Legend

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