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

Comparing libeio/eio.c (file contents):
Revision 1.30 by root, Wed Jun 3 12:24:49 2009 UTC vs.
Revision 1.100 by root, Tue Jul 26 11:32:16 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"
41 46
42#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define XTHREAD_STACKSIZE EIO_STACKSIZE
44#endif 49#endif
45#include "xthread.h" 50#include "xthread.h"
… …
53#include <sys/stat.h> 58#include <sys/stat.h>
54#include <limits.h> 59#include <limits.h>
55#include <fcntl.h> 60#include <fcntl.h>
56#include <assert.h> 61#include <assert.h>
57 62
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H
66# include <stdint.h>
67#endif
68
69#ifndef ECANCELED
70# define ECANCELED EDOM
71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
80static void eio_destroy (eio_req *req);
81
58#ifndef EIO_FINISH 82#ifndef EIO_FINISH
59# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
60#endif 84#endif
61 85
62#ifndef EIO_DESTROY 86#ifndef EIO_DESTROY
… …
65 89
66#ifndef EIO_FEED 90#ifndef EIO_FEED
67# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 91# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
68#endif 92#endif
69 93
94#ifndef EIO_FD_TO_WIN32_HANDLE
95# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
96#endif
97#ifndef EIO_WIN32_HANDLE_TO_FD
98# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
99#endif
100
101#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
102
103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
104
70#ifdef _WIN32 105#ifdef _WIN32
71 106
72 /*doh*/ 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */
109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
117 #define lstat(path,buf) stat (path,buf)
118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
119 #define mkdir(path,mode) _mkdir (path)
120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
121
122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125
126 #define fchmod(fd,mode) EIO_ENOSYS ()
127 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
131 #define mknod(path,mode,dev) EIO_ENOSYS ()
132 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
136
137 /* rename() uses MoveFile, which fails to overwrite */
138 #define rename(old,neu) eio__rename (old, neu)
139
140 static int
141 eio__rename (const char *old, const char *neu)
142 {
143 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
144 return 0;
145
146 /* should steal _dosmaperr */
147 switch (GetLastError ())
148 {
149 case ERROR_FILE_NOT_FOUND:
150 case ERROR_PATH_NOT_FOUND:
151 case ERROR_INVALID_DRIVE:
152 case ERROR_NO_MORE_FILES:
153 case ERROR_BAD_NETPATH:
154 case ERROR_BAD_NET_NAME:
155 case ERROR_BAD_PATHNAME:
156 case ERROR_FILENAME_EXCED_RANGE:
157 errno = ENOENT;
158 break;
159
160 default:
161 errno = EACCES;
162 break;
163 }
164
165 return -1;
166 }
167
168 /* we could even stat and see if it exists */
169 static int
170 symlink (const char *old, const char *neu)
171 {
172 #if WINVER >= 0x0600
173 if (CreateSymbolicLink (neu, old, 1))
174 return 0;
175
176 if (CreateSymbolicLink (neu, old, 0))
177 return 0;
178 #endif
179
180 return EIO_ERRNO (ENOENT, -1);
181 }
182
183 /* POSIX API only */
184 #define CreateHardLink(neu,old,flags) 0
185 #define CreateSymbolicLink(neu,old,flags) 0
186
187 struct statvfs
188 {
189 int dummy;
190 };
191
192 #define DT_DIR EIO_DT_DIR
193 #define DT_REG EIO_DT_REG
194 #define D_NAME(entp) entp.cFileName
195 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
73 196
74#else 197#else
75 198
76# include "config.h"
77# include <sys/time.h> 199 #include <sys/time.h>
78# include <sys/select.h> 200 #include <sys/select.h>
201 #include <sys/statvfs.h>
79# 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
80# include <utime.h> 237# include <utime.h>
81# include <signal.h>
82# include <dirent.h>
83
84# ifndef EIO_STRUCT_DIRENT
85# define EIO_STRUCT_DIRENT struct dirent
86# endif 238#endif
87 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>
88#endif 246#endif
89 247
90#if HAVE_SENDFILE 248#if HAVE_SENDFILE
91# if __linux 249# if __linux
92# include <sys/sendfile.h> 250# include <sys/sendfile.h>
93# elif __freebsd 251# elif __FreeBSD__ || defined __APPLE__
94# include <sys/socket.h> 252# include <sys/socket.h>
95# include <sys/uio.h> 253# include <sys/uio.h>
96# elif __hpux 254# elif __hpux
97# include <sys/socket.h> 255# include <sys/socket.h>
98# elif __solaris /* not yet */ 256# elif __solaris
99# include <sys/sendfile.h> 257# include <sys/sendfile.h>
100# else 258# else
101# error sendfile support requested but not available 259# error sendfile support requested but not available
102# endif 260# endif
103#endif 261#endif
104 262
105/* number of seconds after which an idle threads exit */ 263#ifndef D_TYPE
106#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
107 272
108/* used for struct dirent, AIX doesn't provide it */ 273/* used for struct dirent, AIX doesn't provide it */
109#ifndef NAME_MAX 274#ifndef NAME_MAX
110# define NAME_MAX 4096 275# define NAME_MAX 4096
111#endif 276#endif
112 277
278/* used for readlink etc. */
279#ifndef PATH_MAX
280# define PATH_MAX 4096
281#endif
282
113/* buffer size for various temporary buffers */ 283/* buffer size for various temporary buffers */
114#define EIO_BUFSIZE 65536 284#define EIO_BUFSIZE 65536
115 285
116#define dBUF \ 286#define dBUF \
117 char *eio_buf; \
118 ETP_WORKER_LOCK (self); \
119 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 287 char *eio_buf = malloc (EIO_BUFSIZE); \
120 ETP_WORKER_UNLOCK (self); \
121 errno = ENOMEM; \ 288 errno = ENOMEM; \
122 if (!eio_buf) \ 289 if (!eio_buf) \
123 return -1; 290 return -1
291
292#define FUBd \
293 free (eio_buf)
124 294
125#define EIO_TICKS ((1000000 + 1023) >> 10) 295#define EIO_TICKS ((1000000 + 1023) >> 10)
126
127/*****************************************************************************/
128
129#if __GNUC__ >= 3
130# define expect(expr,value) __builtin_expect ((expr),(value))
131#else
132# define expect(expr,value) (expr)
133#endif
134
135#define expect_false(expr) expect ((expr) != 0, 0)
136#define expect_true(expr) expect ((expr) != 0, 1)
137
138/*****************************************************************************/
139 296
140#define ETP_PRI_MIN EIO_PRI_MIN 297#define ETP_PRI_MIN EIO_PRI_MIN
141#define ETP_PRI_MAX EIO_PRI_MAX 298#define ETP_PRI_MAX EIO_PRI_MAX
142 299
143struct etp_worker; 300struct etp_worker;
… …
147static int eio_finish (eio_req *req); 304static int eio_finish (eio_req *req);
148#define ETP_FINISH(req) eio_finish (req) 305#define ETP_FINISH(req) eio_finish (req)
149static void eio_execute (struct etp_worker *self, eio_req *req); 306static void eio_execute (struct etp_worker *self, eio_req *req);
150#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 307#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
151 308
152#define ETP_WORKER_CLEAR(req) \
153 if (wrk->dbuf) \
154 { \
155 free (wrk->dbuf); \
156 wrk->dbuf = 0; \
157 } \
158 \
159 if (wrk->dirp) \
160 { \
161 closedir (wrk->dirp); \
162 wrk->dirp = 0; \
163 }
164#define ETP_WORKER_COMMON \
165 void *dbuf; \
166 DIR *dirp;
167
168/*****************************************************************************/ 309/*****************************************************************************/
169 310
170#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 311#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
171 312
172/* calculcate time difference in ~1/EIO_TICKS of a second */ 313/* calculate time difference in ~1/EIO_TICKS of a second */
314ecb_inline int
173static int tvdiff (struct timeval *tv1, struct timeval *tv2) 315tvdiff (struct timeval *tv1, struct timeval *tv2)
174{ 316{
175 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 317 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
176 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 318 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
177} 319}
178 320
… …
185static unsigned int max_poll_reqs; /* reslock */ 327static unsigned int max_poll_reqs; /* reslock */
186 328
187static volatile unsigned int nreqs; /* reqlock */ 329static volatile unsigned int nreqs; /* reqlock */
188static volatile unsigned int nready; /* reqlock */ 330static volatile unsigned int nready; /* reqlock */
189static volatile unsigned int npending; /* reqlock */ 331static volatile unsigned int npending; /* reqlock */
190static volatile unsigned int max_idle = 4; 332static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
333static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
191 334
192static mutex_t wrklock = X_MUTEX_INIT; 335static xmutex_t wrklock;
193static mutex_t reslock = X_MUTEX_INIT; 336static xmutex_t reslock;
194static mutex_t reqlock = X_MUTEX_INIT; 337static xmutex_t reqlock;
195static cond_t reqwait = X_COND_INIT; 338static xcond_t reqwait;
196 339
197#if !HAVE_PREADWRITE 340#if !HAVE_PREADWRITE
198/* 341/*
199 * make our pread/pwrite emulation safe against themselves, but not against 342 * make our pread/pwrite emulation safe against themselves, but not against
200 * 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,
201 * but that's your problem, not mine. 344 * but that's your problem, not mine.
202 */ 345 */
203static mutex_t preadwritelock = X_MUTEX_INIT; 346static xmutex_t preadwritelock;
204#endif 347#endif
205 348
206typedef struct etp_worker 349typedef struct etp_worker
207{ 350{
208 /* locked by wrklock */ 351 /* locked by wrklock */
209 struct etp_worker *prev, *next; 352 struct etp_worker *prev, *next;
210 353
211 thread_t tid; 354 xthread_t tid;
212 355
213 /* locked by reslock, reqlock or wrklock */ 356 /* locked by reslock, reqlock or wrklock */
214 ETP_REQ *req; /* currently processed request */ 357 ETP_REQ *req; /* currently processed request */
215 358
359#ifdef ETP_WORKER_COMMON
216 ETP_WORKER_COMMON 360 ETP_WORKER_COMMON
361#endif
217} etp_worker; 362} etp_worker;
218 363
219static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 364static etp_worker wrk_first; /* NOT etp */
220 365
221#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 366#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
222#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 367#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
223 368
224/* worker threads management */ 369/* worker threads management */
225 370
371static void ecb_cold
226static void etp_worker_clear (etp_worker *wrk) 372etp_worker_clear (etp_worker *wrk)
227{ 373{
228 ETP_WORKER_CLEAR (wrk);
229} 374}
230 375
376static void ecb_cold
231static void etp_worker_free (etp_worker *wrk) 377etp_worker_free (etp_worker *wrk)
232{ 378{
233 wrk->next->prev = wrk->prev; 379 wrk->next->prev = wrk->prev;
234 wrk->prev->next = wrk->next; 380 wrk->prev->next = wrk->next;
235 381
236 free (wrk); 382 free (wrk);
237} 383}
238 384
239static unsigned int etp_nreqs (void) 385static unsigned int
386etp_nreqs (void)
240{ 387{
241 int retval; 388 int retval;
242 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 389 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
243 retval = nreqs; 390 retval = nreqs;
244 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 391 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
245 return retval; 392 return retval;
246} 393}
247 394
248static unsigned int etp_nready (void) 395static unsigned int
396etp_nready (void)
249{ 397{
250 unsigned int retval; 398 unsigned int retval;
251 399
252 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 400 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
253 retval = nready; 401 retval = nready;
254 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 402 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
255 403
256 return retval; 404 return retval;
257} 405}
258 406
259static unsigned int etp_npending (void) 407static unsigned int
408etp_npending (void)
260{ 409{
261 unsigned int retval; 410 unsigned int retval;
262 411
263 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 412 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
264 retval = npending; 413 retval = npending;
265 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 414 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
266 415
267 return retval; 416 return retval;
268} 417}
269 418
270static unsigned int etp_nthreads (void) 419static unsigned int
420etp_nthreads (void)
271{ 421{
272 unsigned int retval; 422 unsigned int retval;
273 423
274 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 424 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
275 retval = started; 425 retval = started;
… …
289} etp_reqq; 439} etp_reqq;
290 440
291static etp_reqq req_queue; 441static etp_reqq req_queue;
292static etp_reqq res_queue; 442static etp_reqq res_queue;
293 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
294static int reqq_push (etp_reqq *q, ETP_REQ *req) 456reqq_push (etp_reqq *q, ETP_REQ *req)
295{ 457{
296 int pri = req->pri; 458 int pri = req->pri;
297 req->next = 0; 459 req->next = 0;
298 460
299 if (q->qe[pri]) 461 if (q->qe[pri])
… …
305 q->qe[pri] = q->qs[pri] = req; 467 q->qe[pri] = q->qs[pri] = req;
306 468
307 return q->size++; 469 return q->size++;
308} 470}
309 471
472static ETP_REQ * ecb_noinline
310static ETP_REQ *reqq_shift (etp_reqq *q) 473reqq_shift (etp_reqq *q)
311{ 474{
312 int pri; 475 int pri;
313 476
314 if (!q->size) 477 if (!q->size)
315 return 0; 478 return 0;
… …
330 } 493 }
331 494
332 abort (); 495 abort ();
333} 496}
334 497
335static void etp_atfork_prepare (void) 498static int ecb_cold
499etp_init (void (*want_poll)(void), void (*done_poll)(void))
336{ 500{
337 X_LOCK (wrklock); 501 X_MUTEX_CREATE (wrklock);
338 X_LOCK (reqlock); 502 X_MUTEX_CREATE (reslock);
339 X_LOCK (reslock); 503 X_MUTEX_CREATE (reqlock);
340#if !HAVE_PREADWRITE 504 X_COND_CREATE (reqwait);
341 X_LOCK (preadwritelock);
342#endif
343}
344 505
345static void etp_atfork_parent (void) 506 reqq_init (&req_queue);
346{ 507 reqq_init (&res_queue);
347#if !HAVE_PREADWRITE
348 X_UNLOCK (preadwritelock);
349#endif
350 X_UNLOCK (reslock);
351 X_UNLOCK (reqlock);
352 X_UNLOCK (wrklock);
353}
354 508
355static void etp_atfork_child (void) 509 wrk_first.next =
356{ 510 wrk_first.prev = &wrk_first;
357 ETP_REQ *prv;
358
359 while ((prv = reqq_shift (&req_queue)))
360 ETP_DESTROY (prv);
361
362 while ((prv = reqq_shift (&res_queue)))
363 ETP_DESTROY (prv);
364
365 while (wrk_first.next != &wrk_first)
366 {
367 etp_worker *wrk = wrk_first.next;
368
369 if (wrk->req)
370 ETP_DESTROY (wrk->req);
371
372 etp_worker_clear (wrk);
373 etp_worker_free (wrk);
374 }
375 511
376 started = 0; 512 started = 0;
377 idle = 0; 513 idle = 0;
378 nreqs = 0; 514 nreqs = 0;
379 nready = 0; 515 nready = 0;
380 npending = 0; 516 npending = 0;
381 517
382 etp_atfork_parent ();
383}
384
385static void
386etp_once_init (void)
387{
388 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
389}
390
391static int
392etp_init (void (*want_poll)(void), void (*done_poll)(void))
393{
394 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
395
396 pthread_once (&doinit, etp_once_init);
397
398 want_poll_cb = want_poll; 518 want_poll_cb = want_poll;
399 done_poll_cb = done_poll; 519 done_poll_cb = done_poll;
400 520
401 return 0; 521 return 0;
402} 522}
403 523
404X_THREAD_PROC (etp_proc); 524X_THREAD_PROC (etp_proc);
405 525
526static void ecb_cold
406static void etp_start_thread (void) 527etp_start_thread (void)
407{ 528{
408 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 529 etp_worker *wrk = calloc (1, sizeof (etp_worker));
409 530
410 /*TODO*/ 531 /*TODO*/
411 assert (("unable to allocate worker thread data", wrk)); 532 assert (("unable to allocate worker thread data", wrk));
… …
424 free (wrk); 545 free (wrk);
425 546
426 X_UNLOCK (wrklock); 547 X_UNLOCK (wrklock);
427} 548}
428 549
550static void
429static void etp_maybe_start_thread (void) 551etp_maybe_start_thread (void)
430{ 552{
431 if (expect_true (etp_nthreads () >= wanted)) 553 if (ecb_expect_true (etp_nthreads () >= wanted))
432 return; 554 return;
433 555
434 /* todo: maybe use idle here, but might be less exact */ 556 /* todo: maybe use idle here, but might be less exact */
435 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 ()))
436 return; 558 return;
437 559
438 etp_start_thread (); 560 etp_start_thread ();
439} 561}
440 562
563static void ecb_cold
441static void etp_end_thread (void) 564etp_end_thread (void)
442{ 565{
443 eio_req *req = calloc (1, sizeof (eio_req)); 566 eio_req *req = calloc (1, sizeof (eio_req));
444 567
445 req->type = -1; 568 req->type = -1;
446 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 569 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
453 X_LOCK (wrklock); 576 X_LOCK (wrklock);
454 --started; 577 --started;
455 X_UNLOCK (wrklock); 578 X_UNLOCK (wrklock);
456} 579}
457 580
458static int etp_poll (void) 581static int
582etp_poll (void)
459{ 583{
460 unsigned int maxreqs; 584 unsigned int maxreqs;
461 unsigned int maxtime; 585 unsigned int maxtime;
462 struct timeval tv_start, tv_now; 586 struct timeval tv_start, tv_now;
463 587
… …
493 617
494 X_LOCK (reqlock); 618 X_LOCK (reqlock);
495 --nreqs; 619 --nreqs;
496 X_UNLOCK (reqlock); 620 X_UNLOCK (reqlock);
497 621
498 if (expect_false (req->type == EIO_GROUP && req->size)) 622 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
499 { 623 {
500 req->int1 = 1; /* mark request as delayed */ 624 req->int1 = 1; /* mark request as delayed */
501 continue; 625 continue;
502 } 626 }
503 else 627 else
504 { 628 {
505 int res = ETP_FINISH (req); 629 int res = ETP_FINISH (req);
506 if (expect_false (res)) 630 if (ecb_expect_false (res))
507 return res; 631 return res;
508 } 632 }
509 633
510 if (expect_false (maxreqs && !--maxreqs)) 634 if (ecb_expect_false (maxreqs && !--maxreqs))
511 break; 635 break;
512 636
513 if (maxtime) 637 if (maxtime)
514 { 638 {
515 gettimeofday (&tv_now, 0); 639 gettimeofday (&tv_now, 0);
… …
521 645
522 errno = EAGAIN; 646 errno = EAGAIN;
523 return -1; 647 return -1;
524} 648}
525 649
650static void
526static void etp_cancel (ETP_REQ *req) 651etp_cancel (ETP_REQ *req)
527{ 652{
528 X_LOCK (wrklock); 653 req->cancelled = 1;
529 req->flags |= EIO_FLAG_CANCELLED;
530 X_UNLOCK (wrklock);
531 654
532 eio_grp_cancel (req); 655 eio_grp_cancel (req);
533} 656}
534 657
658static void
535static void etp_submit (ETP_REQ *req) 659etp_submit (ETP_REQ *req)
536{ 660{
537 req->pri -= ETP_PRI_MIN; 661 req->pri -= ETP_PRI_MIN;
538 662
539 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;
540 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;
541 665
542 if (expect_false (req->type == EIO_GROUP)) 666 if (ecb_expect_false (req->type == EIO_GROUP))
543 { 667 {
544 /* I hope this is worth it :/ */ 668 /* I hope this is worth it :/ */
545 X_LOCK (reqlock); 669 X_LOCK (reqlock);
546 ++nreqs; 670 ++nreqs;
547 X_UNLOCK (reqlock); 671 X_UNLOCK (reqlock);
… …
566 690
567 etp_maybe_start_thread (); 691 etp_maybe_start_thread ();
568 } 692 }
569} 693}
570 694
695static void ecb_cold
571static void etp_set_max_poll_time (double nseconds) 696etp_set_max_poll_time (double nseconds)
572{ 697{
573 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 698 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
574 max_poll_time = nseconds; 699 max_poll_time = nseconds * EIO_TICKS;
575 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 700 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
576} 701}
577 702
703static void ecb_cold
578static void etp_set_max_poll_reqs (unsigned int maxreqs) 704etp_set_max_poll_reqs (unsigned int maxreqs)
579{ 705{
580 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 706 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
581 max_poll_reqs = maxreqs; 707 max_poll_reqs = maxreqs;
582 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 708 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
583} 709}
584 710
711static void ecb_cold
585static void etp_set_max_idle (unsigned int nthreads) 712etp_set_max_idle (unsigned int nthreads)
586{ 713{
587 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 714 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
588 max_idle = nthreads <= 0 ? 1 : nthreads; 715 max_idle = nthreads;
589 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 716 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
590} 717}
591 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
592static void etp_set_min_parallel (unsigned int nthreads) 728etp_set_min_parallel (unsigned int nthreads)
593{ 729{
594 if (wanted < nthreads) 730 if (wanted < nthreads)
595 wanted = nthreads; 731 wanted = nthreads;
596} 732}
597 733
734static void ecb_cold
598static void etp_set_max_parallel (unsigned int nthreads) 735etp_set_max_parallel (unsigned int nthreads)
599{ 736{
600 if (wanted > nthreads) 737 if (wanted > nthreads)
601 wanted = nthreads; 738 wanted = nthreads;
602 739
603 while (started > wanted) 740 while (started > wanted)
604 etp_end_thread (); 741 etp_end_thread ();
605} 742}
606 743
607/*****************************************************************************/ 744/*****************************************************************************/
608 745
746static void
609static void grp_try_feed (eio_req *grp) 747grp_try_feed (eio_req *grp)
610{ 748{
611 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 749 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
612 { 750 {
613 grp->flags &= ~EIO_FLAG_GROUPADD; 751 grp->flags &= ~EIO_FLAG_GROUPADD;
614 752
… …
621 break; 759 break;
622 } 760 }
623 } 761 }
624} 762}
625 763
764static int
626static int grp_dec (eio_req *grp) 765grp_dec (eio_req *grp)
627{ 766{
628 --grp->size; 767 --grp->size;
629 768
630 /* call feeder, if applicable */ 769 /* call feeder, if applicable */
631 grp_try_feed (grp); 770 grp_try_feed (grp);
… …
635 return eio_finish (grp); 774 return eio_finish (grp);
636 else 775 else
637 return 0; 776 return 0;
638} 777}
639 778
779static void
640void eio_destroy (eio_req *req) 780eio_destroy (eio_req *req)
641{ 781{
642 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 782 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
643 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 783 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
644 784
645 EIO_DESTROY (req); 785 EIO_DESTROY (req);
646} 786}
647 787
788static int
648static int eio_finish (eio_req *req) 789eio_finish (eio_req *req)
649{ 790{
650 int res = EIO_FINISH (req); 791 int res = EIO_FINISH (req);
651 792
652 if (req->grp) 793 if (req->grp)
653 { 794 {
… …
661 if (grp->grp_first == req) 802 if (grp->grp_first == req)
662 grp->grp_first = req->grp_next; 803 grp->grp_first = req->grp_next;
663 804
664 res2 = grp_dec (grp); 805 res2 = grp_dec (grp);
665 806
666 if (!res && res2) 807 if (!res)
667 res = res2; 808 res = res2;
668 } 809 }
669 810
670 eio_destroy (req); 811 eio_destroy (req);
671 812
672 return res; 813 return res;
673} 814}
674 815
816void
675void eio_grp_cancel (eio_req *grp) 817eio_grp_cancel (eio_req *grp)
676{ 818{
677 for (grp = grp->grp_first; grp; grp = grp->grp_next) 819 for (grp = grp->grp_first; grp; grp = grp->grp_next)
678 eio_cancel (grp); 820 eio_cancel (grp);
679} 821}
680 822
823void
681void eio_cancel (eio_req *req) 824eio_cancel (eio_req *req)
682{ 825{
683 etp_cancel (req); 826 etp_cancel (req);
684} 827}
685 828
829void
686void eio_submit (eio_req *req) 830eio_submit (eio_req *req)
687{ 831{
688 etp_submit (req); 832 etp_submit (req);
689} 833}
690 834
691unsigned int eio_nreqs (void) 835unsigned int
836eio_nreqs (void)
692{ 837{
693 return etp_nreqs (); 838 return etp_nreqs ();
694} 839}
695 840
696unsigned int eio_nready (void) 841unsigned int
842eio_nready (void)
697{ 843{
698 return etp_nready (); 844 return etp_nready ();
699} 845}
700 846
701unsigned int eio_npending (void) 847unsigned int
848eio_npending (void)
702{ 849{
703 return etp_npending (); 850 return etp_npending ();
704} 851}
705 852
706unsigned int eio_nthreads (void) 853unsigned int ecb_cold
854eio_nthreads (void)
707{ 855{
708 return etp_nthreads (); 856 return etp_nthreads ();
709} 857}
710 858
859void ecb_cold
711void eio_set_max_poll_time (double nseconds) 860eio_set_max_poll_time (double nseconds)
712{ 861{
713 etp_set_max_poll_time (nseconds); 862 etp_set_max_poll_time (nseconds);
714} 863}
715 864
865void ecb_cold
716void eio_set_max_poll_reqs (unsigned int maxreqs) 866eio_set_max_poll_reqs (unsigned int maxreqs)
717{ 867{
718 etp_set_max_poll_reqs (maxreqs); 868 etp_set_max_poll_reqs (maxreqs);
719} 869}
720 870
871void ecb_cold
721void eio_set_max_idle (unsigned int nthreads) 872eio_set_max_idle (unsigned int nthreads)
722{ 873{
723 etp_set_max_idle (nthreads); 874 etp_set_max_idle (nthreads);
724} 875}
725 876
877void ecb_cold
878eio_set_idle_timeout (unsigned int seconds)
879{
880 etp_set_idle_timeout (seconds);
881}
882
883void ecb_cold
726void eio_set_min_parallel (unsigned int nthreads) 884eio_set_min_parallel (unsigned int nthreads)
727{ 885{
728 etp_set_min_parallel (nthreads); 886 etp_set_min_parallel (nthreads);
729} 887}
730 888
889void ecb_cold
731void eio_set_max_parallel (unsigned int nthreads) 890eio_set_max_parallel (unsigned int nthreads)
732{ 891{
733 etp_set_max_parallel (nthreads); 892 etp_set_max_parallel (nthreads);
734} 893}
735 894
736int eio_poll (void) 895int eio_poll (void)
… …
745# undef pread 904# undef pread
746# undef pwrite 905# undef pwrite
747# define pread eio__pread 906# define pread eio__pread
748# define pwrite eio__pwrite 907# define pwrite eio__pwrite
749 908
750static ssize_t 909static eio_ssize_t
751eio__pread (int fd, void *buf, size_t count, off_t offset) 910eio__pread (int fd, void *buf, size_t count, off_t offset)
752{ 911{
753 ssize_t res; 912 eio_ssize_t res;
754 off_t ooffset; 913 off_t ooffset;
755 914
756 X_LOCK (preadwritelock); 915 X_LOCK (preadwritelock);
757 ooffset = lseek (fd, 0, SEEK_CUR); 916 ooffset = lseek (fd, 0, SEEK_CUR);
758 lseek (fd, offset, SEEK_SET); 917 lseek (fd, offset, SEEK_SET);
… …
761 X_UNLOCK (preadwritelock); 920 X_UNLOCK (preadwritelock);
762 921
763 return res; 922 return res;
764} 923}
765 924
766static ssize_t 925static eio_ssize_t
767eio__pwrite (int fd, void *buf, size_t count, off_t offset) 926eio__pwrite (int fd, void *buf, size_t count, off_t offset)
768{ 927{
769 ssize_t res; 928 eio_ssize_t res;
770 off_t ooffset; 929 off_t ooffset;
771 930
772 X_LOCK (preadwritelock); 931 X_LOCK (preadwritelock);
773 ooffset = lseek (fd, 0, SEEK_CUR); 932 ooffset = lseek (fd, 0, SEEK_CUR);
774 lseek (fd, offset, SEEK_SET); 933 lseek (fd, offset, SEEK_SET);
… …
778 937
779 return res; 938 return res;
780} 939}
781#endif 940#endif
782 941
783#ifndef HAVE_FUTIMES 942#ifndef HAVE_UTIMES
784 943
785# undef utimes 944# undef utimes
786# undef futimes
787# define utimes(path,times) eio__utimes (path, times) 945# define utimes(path,times) eio__utimes (path, times)
788# define futimes(fd,times) eio__futimes (fd, times)
789 946
790static int 947static int
791eio__utimes (const char *filename, const struct timeval times[2]) 948eio__utimes (const char *filename, const struct timeval times[2])
792{ 949{
793 if (times) 950 if (times)
… …
801 } 958 }
802 else 959 else
803 return utime (filename, 0); 960 return utime (filename, 0);
804} 961}
805 962
963#endif
964
965#ifndef HAVE_FUTIMES
966
967# undef futimes
968# define futimes(fd,times) eio__futimes (fd, times)
969
970static int
806static int eio__futimes (int fd, const struct timeval tv[2]) 971eio__futimes (int fd, const struct timeval tv[2])
807{ 972{
808 errno = ENOSYS; 973 errno = ENOSYS;
809 return -1; 974 return -1;
810} 975}
811 976
… …
814#if !HAVE_FDATASYNC 979#if !HAVE_FDATASYNC
815# undef fdatasync 980# undef fdatasync
816# define fdatasync(fd) fsync (fd) 981# define fdatasync(fd) fsync (fd)
817#endif 982#endif
818 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
819/* sync_file_range always needs emulation */ 1002/* sync_file_range always needs emulation */
820int 1003static int
821eio__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)
822{ 1005{
823#if HAVE_SYNC_FILE_RANGE 1006#if HAVE_SYNC_FILE_RANGE
824 int res; 1007 int res;
825 1008
… …
838 if (!res || errno != ENOSYS) 1021 if (!res || errno != ENOSYS)
839 return res; 1022 return res;
840#endif 1023#endif
841 1024
842 /* 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
843 * call fdatasync, as thta matches the expectation of it's users best */ 1026 * call fdatasync, as that matches the expectation of its users best */
844 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
845} 1039}
846 1040
847#if !HAVE_READAHEAD 1041#if !HAVE_READAHEAD
848# undef readahead 1042# undef readahead
849# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1043# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
850 1044
851static ssize_t 1045static eio_ssize_t
852eio__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)
853{ 1047{
854 size_t todo = count; 1048 size_t todo = count;
855 dBUF; 1049 dBUF;
856 1050
… …
861 pread (fd, eio_buf, len, offset); 1055 pread (fd, eio_buf, len, offset);
862 offset += len; 1056 offset += len;
863 todo -= len; 1057 todo -= len;
864 } 1058 }
865 1059
1060 FUBd;
1061
866 errno = 0; 1062 errno = 0;
867 return count; 1063 return count;
868} 1064}
869 1065
870#endif 1066#endif
871 1067
872/* sendfile always needs emulation */ 1068/* sendfile always needs emulation */
873static ssize_t 1069static eio_ssize_t
874eio__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)
875{ 1071{
1072 eio_ssize_t written = 0;
876 ssize_t res; 1073 eio_ssize_t res;
877 1074
878 if (!count) 1075 if (!count)
879 return 0; 1076 return 0;
880 1077
1078 for (;;)
1079 {
1080#ifdef __APPLE__
1081# undef HAVE_SENDFILE /* broken, as everything on os x */
1082#endif
881#if HAVE_SENDFILE 1083#if HAVE_SENDFILE
882# if __linux 1084# if __linux
1085 off_t soffset = offset;
883 res = sendfile (ofd, ifd, &offset, count); 1086 res = sendfile (ofd, ifd, &soffset, count);
884 1087
885# elif __freebsd 1088# elif __FreeBSD__
886 /* 1089 /*
887 * 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
888 * wasted on making it similar to other I/O functions. 1091 * wasted on making it similar to other I/O functions.
889 */ 1092 */
890 {
891 off_t sbytes; 1093 off_t sbytes;
892 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1094 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
893 1095
894 if (res < 0 && sbytes) 1096 #if 0 /* according to the manpage, this is correct, but broken behaviour */
895 /* 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)
896 res = sbytes; 1101 res = sbytes;
897 } 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;
898 1115
899# elif __hpux 1116# elif __hpux
900 res = sendfile (ofd, ifd, offset, count, 0, 0); 1117 res = sendfile (ofd, ifd, offset, count, 0, 0);
901 1118
902# elif __solaris 1119# elif __solaris
903 {
904 struct sendfilevec vec; 1120 struct sendfilevec vec;
905 size_t sbytes; 1121 size_t sbytes;
906 1122
907 vec.sfv_fd = ifd; 1123 vec.sfv_fd = ifd;
908 vec.sfv_flag = 0; 1124 vec.sfv_flag = 0;
909 vec.sfv_off = offset; 1125 vec.sfv_off = offset;
910 vec.sfv_len = count; 1126 vec.sfv_len = count;
911 1127
912 res = sendfilev (ofd, &vec, 1, &sbytes); 1128 res = sendfilev (ofd, &vec, 1, &sbytes);
913 1129
914 if (res < 0 && sbytes) 1130 if (res < 0 && sbytes)
915 res = sbytes; 1131 res = sbytes;
916 }
917 1132
918# 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
919#else 1144#else
920 res = -1; 1145 res = -1;
921 errno = ENOSYS; 1146 errno = ENOSYS;
922#endif 1147#endif
923 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
924 if (res < 0 1172 if (res < 0
925 && (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
926#if __solaris 1181#if __solaris
927 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1182 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
928#endif 1183#endif
929 ) 1184 )
930 ) 1185 )
… …
934 1189
935 res = 0; 1190 res = 0;
936 1191
937 while (count) 1192 while (count)
938 { 1193 {
939 ssize_t cnt; 1194 eio_ssize_t cnt;
940 1195
941 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);
942 1197
943 if (cnt <= 0) 1198 if (cnt <= 0)
944 { 1199 {
… …
956 1211
957 offset += cnt; 1212 offset += cnt;
958 res += cnt; 1213 res += cnt;
959 count -= cnt; 1214 count -= cnt;
960 } 1215 }
1216
1217 FUBd;
961 } 1218 }
962 1219
963 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);
964} 1665}
965 1666
966/* read a full directory */ 1667/* read a full directory */
967static void 1668static void
968eio__scandir (eio_req *req, etp_worker *self) 1669eio__scandir (eio_req *req, etp_worker *self)
969{ 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
970 DIR *dirp; 1683 DIR *dirp;
971 EIO_STRUCT_DIRENT *entp; 1684 EIO_STRUCT_DIRENT *entp;
972 char *name, *names; 1685#endif
973 int memlen = 4096;
974 int memofs = 0;
975 int res = 0;
976 1686
977 X_LOCK (wrklock); 1687 req->result = -1;
978 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1688
1689 if (!(flags & EIO_READDIR_DENTS))
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)
1710 {
1711 dirp = 0;
1712
1713 /* should steal _dosmaperr */
1714 switch (GetLastError ())
1715 {
1716 case ERROR_FILE_NOT_FOUND:
1717 req->result = 0;
1718 break;
1719
1720 case ERROR_INVALID_NAME:
1721 case ERROR_PATH_NOT_FOUND:
1722 case ERROR_NO_MORE_FILES:
1723 errno = ENOENT;
1724 break;
1725
1726 case ERROR_NOT_ENOUGH_MEMORY:
1727 errno = ENOMEM;
1728 break;
1729
1730 default:
1731 errno = EINVAL;
1732 break;
1733 }
1734 }
1735 }
1736#else
979 self->dirp = dirp = opendir (req->ptr1); 1737 dirp = opendir (req->ptr1);
1738#endif
1739
980 req->flags |= EIO_FLAG_PTR2_FREE; 1740 if (req->flags & EIO_FLAG_PTR1_FREE)
1741 free (req->ptr1);
1742
1743 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1744 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
981 req->ptr2 = names = malloc (memlen); 1745 req->ptr2 = names = malloc (namesalloc);
982 X_UNLOCK (wrklock);
983 1746
984 if (dirp && names) 1747 if (dirp && names && (!flags || dents))
985 for (;;) 1748 for (;;)
986 { 1749 {
1750 int done;
1751
1752#ifdef _WIN32
1753 done = !dirp;
1754#else
987 errno = 0; 1755 errno = 0;
988 entp = readdir (dirp); 1756 entp = readdir (dirp);
1757 done = !entp;
1758#endif
989 1759
990 if (!entp) 1760 if (done)
1761 {
1762#ifndef _WIN32
1763 int old_errno = errno;
1764 closedir (dirp);
1765 errno = old_errno;
1766
1767 if (errno)
1768 break;
1769#endif
1770
1771 /* sort etc. */
1772 req->int1 = flags;
1773 req->result = dentoffs;
1774
1775 if (flags & EIO_READDIR_STAT_ORDER)
1776 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1777 else if (flags & EIO_READDIR_DIRS_FIRST)
1778 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1779 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1780 else
1781 {
1782 /* in this case, all is known, and we just put dirs first and sort them */
1783 eio_dirent *oth = dents + dentoffs;
1784 eio_dirent *dir = dents;
1785
1786 /* now partition dirs to the front, and non-dirs to the back */
1787 /* by walking from both sides and swapping if necessary */
1788 while (oth > dir)
1789 {
1790 if (dir->type == EIO_DT_DIR)
1791 ++dir;
1792 else if ((--oth)->type == EIO_DT_DIR)
1793 {
1794 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1795
1796 ++dir;
1797 }
1798 }
1799
1800 /* now sort the dirs only (dirs all have the same score) */
1801 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1802 }
1803
991 break; 1804 break;
1805 }
992 1806
993 name = entp->d_name; 1807 /* now add the entry to our list(s) */
1808 name = D_NAME (entp);
994 1809
1810 /* skip . and .. entries */
995 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1811 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
996 { 1812 {
997 int len = strlen (name) + 1; 1813 int len = D_NAMLEN (entp) + 1;
998 1814
999 res++; 1815 while (ecb_expect_false (namesoffs + len > namesalloc))
1000
1001 while (memofs + len > memlen)
1002 { 1816 {
1003 memlen *= 2; 1817 namesalloc *= 2;
1004 X_LOCK (wrklock);
1005 req->ptr2 = names = realloc (names, memlen); 1818 req->ptr2 = names = realloc (names, namesalloc);
1006 X_UNLOCK (wrklock);
1007 1819
1008 if (!names) 1820 if (!names)
1009 break; 1821 break;
1010 } 1822 }
1011 1823
1012 memcpy (names + memofs, name, len); 1824 memcpy (names + namesoffs, name, len);
1825
1826 if (dents)
1827 {
1828 struct eio_dirent *ent;
1829
1830 if (ecb_expect_false (dentoffs == dentalloc))
1831 {
1832 dentalloc *= 2;
1833 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1834
1835 if (!dents)
1836 break;
1837 }
1838
1839 ent = dents + dentoffs;
1840
1841 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1842 ent->namelen = len - 1;
1843 ent->inode = D_INO (entp);
1844
1845 inode_bits |= ent->inode;
1846
1847 switch (D_TYPE (entp))
1848 {
1849 default:
1850 ent->type = EIO_DT_UNKNOWN;
1851 flags |= EIO_READDIR_FOUND_UNKNOWN;
1852 break;
1853
1854 #ifdef DT_FIFO
1855 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1856 #endif
1857 #ifdef DT_CHR
1858 case DT_CHR: ent->type = EIO_DT_CHR; break;
1859 #endif
1860 #ifdef DT_MPC
1861 case DT_MPC: ent->type = EIO_DT_MPC; break;
1862 #endif
1863 #ifdef DT_DIR
1864 case DT_DIR: ent->type = EIO_DT_DIR; break;
1865 #endif
1866 #ifdef DT_NAM
1867 case DT_NAM: ent->type = EIO_DT_NAM; break;
1868 #endif
1869 #ifdef DT_BLK
1870 case DT_BLK: ent->type = EIO_DT_BLK; break;
1871 #endif
1872 #ifdef DT_MPB
1873 case DT_MPB: ent->type = EIO_DT_MPB; break;
1874 #endif
1875 #ifdef DT_REG
1876 case DT_REG: ent->type = EIO_DT_REG; break;
1877 #endif
1878 #ifdef DT_NWK
1879 case DT_NWK: ent->type = EIO_DT_NWK; break;
1880 #endif
1881 #ifdef DT_CMP
1882 case DT_CMP: ent->type = EIO_DT_CMP; break;
1883 #endif
1884 #ifdef DT_LNK
1885 case DT_LNK: ent->type = EIO_DT_LNK; break;
1886 #endif
1887 #ifdef DT_SOCK
1888 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1889 #endif
1890 #ifdef DT_DOOR
1891 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1892 #endif
1893 #ifdef DT_WHT
1894 case DT_WHT: ent->type = EIO_DT_WHT; break;
1895 #endif
1896 }
1897
1898 ent->score = 7;
1899
1900 if (flags & EIO_READDIR_DIRS_FIRST)
1901 {
1902 if (ent->type == EIO_DT_UNKNOWN)
1903 {
1904 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1905 ent->score = 1;
1906 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1907 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1908 }
1909 else if (ent->type == EIO_DT_DIR)
1910 ent->score = 0;
1911 }
1912 }
1913
1013 memofs += len; 1914 namesoffs += len;
1915 ++dentoffs;
1014 } 1916 }
1917
1918 if (EIO_CANCELLED (req))
1919 {
1920 errno = ECANCELED;
1921 break;
1922 }
1923
1924#ifdef _WIN32
1925 if (!FindNextFile (dirp, &entp))
1926 {
1927 FindClose (dirp);
1928 dirp = 0;
1929 }
1930#endif
1015 } 1931 }
1016
1017 if (errno)
1018 res = -1;
1019
1020 req->result = res;
1021}
1022
1023#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1024# undef msync
1025# define msync(a,b,c) ((errno = ENOSYS), -1)
1026#endif
1027
1028int
1029eio__mtouch (void *mem, size_t len, int flags)
1030{
1031 intptr_t addr = (intptr_t)mem;
1032 intptr_t end = addr + len;
1033#ifdef PAGESIZE
1034 const intptr_t page = PAGESIZE;
1035#else
1036 static intptr_t page;
1037
1038 if (!page)
1039 page = sysconf (_SC_PAGESIZE);
1040#endif
1041
1042 addr &= ~(page - 1); /* assume page size is always a power of two */
1043
1044 if (addr < end)
1045 if (flags) /* modify */
1046 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1047 else
1048 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1049
1050 return 0;
1051} 1932}
1052 1933
1053/*****************************************************************************/ 1934/*****************************************************************************/
1054 1935
1055#define ALLOC(len) \ 1936#define ALLOC(len) \
… …
1071{ 1952{
1072 ETP_REQ *req; 1953 ETP_REQ *req;
1073 struct timespec ts; 1954 struct timespec ts;
1074 etp_worker *self = (etp_worker *)thr_arg; 1955 etp_worker *self = (etp_worker *)thr_arg;
1075 1956
1957#if HAVE_PRCTL_SET_NAME
1958 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1959#endif
1960
1076 /* try to distribute timeouts somewhat randomly */ 1961 /* try to distribute timeouts somewhat evenly */
1077 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1962 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1078 1963
1079 for (;;) 1964 for (;;)
1080 { 1965 {
1966 ts.tv_sec = 0;
1967
1081 X_LOCK (reqlock); 1968 X_LOCK (reqlock);
1082 1969
1083 for (;;) 1970 for (;;)
1084 { 1971 {
1085 self->req = req = reqq_shift (&req_queue); 1972 self->req = req = reqq_shift (&req_queue);
1086 1973
1087 if (req) 1974 if (req)
1088 break; 1975 break;
1089 1976
1977 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1978 {
1979 X_UNLOCK (reqlock);
1980 X_LOCK (wrklock);
1981 --started;
1982 X_UNLOCK (wrklock);
1983 goto quit;
1984 }
1985
1090 ++idle; 1986 ++idle;
1091 1987
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1988 if (idle <= max_idle)
1093 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1989 /* we are allowed to idle, so do so without any timeout */
1990 X_COND_WAIT (reqwait, reqlock);
1991 else
1094 { 1992 {
1095 if (idle > max_idle) 1993 /* initialise timeout once */
1096 { 1994 if (!ts.tv_sec)
1097 --idle; 1995 ts.tv_sec = time (0) + idle_timeout;
1098 X_UNLOCK (reqlock);
1099 X_LOCK (wrklock);
1100 --started;
1101 X_UNLOCK (wrklock);
1102 goto quit;
1103 }
1104 1996
1105 /* we are allowed to idle, so do so without any timeout */
1106 X_COND_WAIT (reqwait, reqlock); 1997 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1998 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1107 } 1999 }
1108 2000
1109 --idle; 2001 --idle;
1110 } 2002 }
1111 2003
… …
1114 X_UNLOCK (reqlock); 2006 X_UNLOCK (reqlock);
1115 2007
1116 if (req->type < 0) 2008 if (req->type < 0)
1117 goto quit; 2009 goto quit;
1118 2010
1119 if (!EIO_CANCELLED (req))
1120 ETP_EXECUTE (self, req); 2011 ETP_EXECUTE (self, req);
1121 2012
1122 X_LOCK (reslock); 2013 X_LOCK (reslock);
1123 2014
1124 ++npending; 2015 ++npending;
1125 2016
… …
1140 return 0; 2031 return 0;
1141} 2032}
1142 2033
1143/*****************************************************************************/ 2034/*****************************************************************************/
1144 2035
2036int ecb_cold
1145int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2037eio_init (void (*want_poll)(void), void (*done_poll)(void))
1146{ 2038{
2039#if !HAVE_PREADWRITE
2040 X_MUTEX_CREATE (preadwritelock);
2041#endif
2042
1147 return etp_init (want_poll, done_poll); 2043 return etp_init (want_poll, done_poll);
1148} 2044}
1149 2045
2046ecb_inline void
1150static void eio_api_destroy (eio_req *req) 2047eio_api_destroy (eio_req *req)
1151{ 2048{
1152 free (req); 2049 free (req);
1153} 2050}
1154 2051
1155#define REQ(rtype) \ 2052#define REQ(rtype) \
… …
1174 { \ 2071 { \
1175 eio_api_destroy (req); \ 2072 eio_api_destroy (req); \
1176 return 0; \ 2073 return 0; \
1177 } 2074 }
1178 2075
2076static void
1179static void eio_execute (etp_worker *self, eio_req *req) 2077eio_execute (etp_worker *self, eio_req *req)
1180{ 2078{
1181 errno = 0; 2079 if (ecb_expect_false (EIO_CANCELLED (req)))
2080 {
2081 req->result = -1;
2082 req->errorno = ECANCELED;
2083 return;
2084 }
1182 2085
1183 switch (req->type) 2086 switch (req->type)
1184 { 2087 {
1185 case EIO_READ: ALLOC (req->size); 2088 case EIO_READ: ALLOC (req->size);
1186 req->result = req->offs >= 0 2089 req->result = req->offs >= 0
… …
1189 case EIO_WRITE: req->result = req->offs >= 0 2092 case EIO_WRITE: req->result = req->offs >= 0
1190 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2093 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1191 : write (req->int1, req->ptr2, req->size); break; 2094 : write (req->int1, req->ptr2, req->size); break;
1192 2095
1193 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2096 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1194 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2097 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1195 2098
1196 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2099 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1197 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2100 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1198 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2101 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1199 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2102 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1200 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2103 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1201 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2104 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2105
2106 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2107 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2108 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2109 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1202 2110
1203 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 2111 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1204 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2112 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1205 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 2113 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1206 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2114 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
… …
1214 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 2122 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1215 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 2123 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1216 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 2124 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1217 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 2125 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1218 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 2126 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1219 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 2127 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1220 2128
2129 case EIO_REALPATH: eio__realpath (req, self); break;
2130
1221 case EIO_READLINK: ALLOC (NAME_MAX); 2131 case EIO_READLINK: ALLOC (PATH_MAX);
1222 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 2132 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1223 2133
1224 case EIO_SYNC: req->result = 0; sync (); break; 2134 case EIO_SYNC: req->result = 0; sync (); break;
1225 case EIO_FSYNC: req->result = fsync (req->int1); break; 2135 case EIO_FSYNC: req->result = fsync (req->int1); break;
1226 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2136 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1227 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 2137 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
1228 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1229 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2138 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2139 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2140 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2141 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2142 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2143 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1230 2144
1231 case EIO_READDIR: eio__scandir (req, self); break; 2145 case EIO_READDIR: eio__scandir (req, self); break;
1232 2146
1233 case EIO_BUSY: 2147 case EIO_BUSY:
1234#ifdef _WIN32 2148#ifdef _WIN32
1235 Sleep (req->nv1 * 1000.); 2149 Sleep (req->nv1 * 1e3);
1236#else 2150#else
1237 { 2151 {
1238 struct timeval tv; 2152 struct timeval tv;
1239 2153
1240 tv.tv_sec = req->nv1; 2154 tv.tv_sec = req->nv1;
1241 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 2155 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1242 2156
1243 req->result = select (0, 0, 0, 0, &tv); 2157 req->result = select (0, 0, 0, 0, &tv);
1244 } 2158 }
1245#endif 2159#endif
1246 break; 2160 break;
… …
1261 times = tv; 2175 times = tv;
1262 } 2176 }
1263 else 2177 else
1264 times = 0; 2178 times = 0;
1265 2179
1266
1267 req->result = req->type == EIO_FUTIME 2180 req->result = req->type == EIO_FUTIME
1268 ? futimes (req->int1, times) 2181 ? futimes (req->int1, times)
1269 : utimes (req->ptr1, times); 2182 : utimes (req->ptr1, times);
1270 } 2183 }
1271 break; 2184 break;
… …
1276 case EIO_NOP: 2189 case EIO_NOP:
1277 req->result = 0; 2190 req->result = 0;
1278 break; 2191 break;
1279 2192
1280 case EIO_CUSTOM: 2193 case EIO_CUSTOM:
1281 ((void (*)(eio_req *))req->feed) (req); 2194 req->feed (req);
1282 break; 2195 break;
1283 2196
1284 default: 2197 default:
2198 errno = ENOSYS;
1285 req->result = -1; 2199 req->result = -1;
1286 break; 2200 break;
1287 } 2201 }
1288 2202
1289 req->errorno = errno; 2203 req->errorno = errno;
… …
1314eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2228eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1315{ 2229{
1316 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2230 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1317} 2231}
1318 2232
2233eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2234{
2235 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2236}
2237
2238eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2239{
2240 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2241}
2242
2243eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2244{
2245 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2246}
2247
1319eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2248eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1320{ 2249{
1321 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2250 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1322} 2251}
1323 2252
1324eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2253eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1325{ 2254{
1326 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2255 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1327} 2256}
1328 2257
1329eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2258eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1330{ 2259{
1331 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2260 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2261}
2262
2263eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2264{
2265 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1332} 2266}
1333 2267
1334eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2268eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1335{ 2269{
1336 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2270 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
1354eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2288eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1355{ 2289{
1356 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2290 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1357} 2291}
1358 2292
2293eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
2294{
2295 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
2296}
2297
1359eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 2298eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1360{ 2299{
1361 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 2300 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1362} 2301}
1363 2302
… …
1369eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2308eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1370{ 2309{
1371 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2310 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1372} 2311}
1373 2312
1374eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2313eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1375{ 2314{
1376 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2315 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1377} 2316}
1378 2317
1379eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2318eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1399eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2338eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1400{ 2339{
1401 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2340 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1402} 2341}
1403 2342
1404eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2343eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1405{ 2344{
1406 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2345 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1407} 2346}
1408 2347
1409eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2348eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1425eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2364eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1426{ 2365{
1427 return eio__1path (EIO_READLINK, path, pri, cb, data); 2366 return eio__1path (EIO_READLINK, path, pri, cb, data);
1428} 2367}
1429 2368
2369eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2370{
2371 return eio__1path (EIO_REALPATH, path, pri, cb, data);
2372}
2373
1430eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2374eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1431{ 2375{
1432 return eio__1path (EIO_STAT, path, pri, cb, data); 2376 return eio__1path (EIO_STAT, path, pri, cb, data);
1433} 2377}
1434 2378
1435eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 2379eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1436{ 2380{
1437 return eio__1path (EIO_LSTAT, path, pri, cb, data); 2381 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1438} 2382}
1439 2383
2384eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
2385{
2386 return eio__1path (EIO_STATVFS, path, pri, cb, data);
2387}
2388
1440eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 2389eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1441{ 2390{
1442 return eio__1path (EIO_UNLINK, path, pri, cb, data); 2391 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1443} 2392}
1444 2393
1445eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 2394eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1446{ 2395{
1447 return eio__1path (EIO_RMDIR, path, pri, cb, data); 2396 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1448} 2397}
1449 2398
1450eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 2399eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1451{ 2400{
1452 return eio__1path (EIO_READDIR, path, pri, cb, data); 2401 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1453} 2402}
1454 2403
1455eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2404eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1456{ 2405{
1457 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 2406 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1458} 2407}
1459 2408
1460static eio_req * 2409static eio_req *
1461eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2410eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1462{ 2411{
… …
1486eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2435eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1487{ 2436{
1488 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2437 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1489} 2438}
1490 2439
1491eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2440eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1492{ 2441{
1493 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2442 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1494} 2443}
1495 2444
1496#endif 2445#endif
1497 2446
1498eio_req *eio_grp (eio_cb cb, void *data) 2447eio_req *eio_grp (eio_cb cb, void *data)
… …
1507#undef SEND 2456#undef SEND
1508 2457
1509/*****************************************************************************/ 2458/*****************************************************************************/
1510/* grp functions */ 2459/* grp functions */
1511 2460
2461void
1512void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2462eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1513{ 2463{
1514 grp->int2 = limit; 2464 grp->int2 = limit;
1515 grp->feed = feed; 2465 grp->feed = feed;
1516 2466
1517 grp_try_feed (grp); 2467 grp_try_feed (grp);
1518} 2468}
1519 2469
2470void
1520void eio_grp_limit (eio_req *grp, int limit) 2471eio_grp_limit (eio_req *grp, int limit)
1521{ 2472{
1522 grp->int2 = limit; 2473 grp->int2 = limit;
1523 2474
1524 grp_try_feed (grp); 2475 grp_try_feed (grp);
1525} 2476}
1526 2477
2478void
1527void eio_grp_add (eio_req *grp, eio_req *req) 2479eio_grp_add (eio_req *grp, eio_req *req)
1528{ 2480{
1529 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2481 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1530 2482
1531 grp->flags |= EIO_FLAG_GROUPADD; 2483 grp->flags |= EIO_FLAG_GROUPADD;
1532 2484
… …
1543} 2495}
1544 2496
1545/*****************************************************************************/ 2497/*****************************************************************************/
1546/* misc garbage */ 2498/* misc garbage */
1547 2499
2500eio_ssize_t
1548ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2501eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1549{ 2502{
1550 etp_worker wrk;
1551
1552 wrk.dbuf = 0;
1553
1554 eio__sendfile (ofd, ifd, offset, count, &wrk); 2503 return eio__sendfile (ofd, ifd, offset, count);
1555
1556 if (wrk.dbuf)
1557 free (wrk.dbuf);
1558} 2504}
1559 2505

Diff Legend

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