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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.12 by root, Tue May 13 18:54:52 2008 UTC vs.
Revision 1.64 by root, Thu May 26 04:05:18 2011 UTC

1/*
2 * libeio implementation
3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Alternatively, the contents of this file may be used under the terms of
29 * the GNU General Public License ("GPL") version 2 or any later version,
30 * in which case the provisions of the GPL are applicable instead of
31 * the above. If you wish to allow the use of your version of this file
32 * only under the terms of the GPL and not to allow others to use your
33 * version of this file under the BSD license, indicate your decision
34 * by deleting the provisions above and replace them with the notice
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
37 * either the BSD or the GPL.
38 */
39
1#include "eio.h" 40#include "eio.h"
41
42#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE
44#endif
2#include "xthread.h" 45#include "xthread.h"
3 46
4#include <errno.h> 47#include <errno.h>
5#include <stddef.h> 48#include <stddef.h>
6#include <stdlib.h> 49#include <stdlib.h>
7#include <string.h> 50#include <string.h>
8#include <errno.h> 51#include <errno.h>
9#include <sys/types.h> 52#include <sys/types.h>
10#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/statvfs.h>
11#include <limits.h> 55#include <limits.h>
12#include <fcntl.h> 56#include <fcntl.h>
13#include <assert.h> 57#include <assert.h>
14 58
15#ifndef EIO_FINISH 59#ifndef EIO_FINISH
25#endif 69#endif
26 70
27#ifdef _WIN32 71#ifdef _WIN32
28 72
29 /*doh*/ 73 /*doh*/
30
31#else 74#else
32 75
33# include "config.h" 76# include "config.h"
34# include <sys/time.h> 77# include <sys/time.h>
35# include <sys/select.h> 78# include <sys/select.h>
36# include <unistd.h> 79# include <unistd.h>
37# include <utime.h> 80# include <utime.h>
38# include <signal.h> 81# include <signal.h>
39# include <dirent.h> 82# include <dirent.h>
40 83
84#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h>
86#endif
87
88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
90# define _DIRENT_HAVE_D_TYPE /* sigh */
91# define D_INO(de) (de)->d_fileno
92# define D_NAMLEN(de) (de)->d_namlen
93# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
94# define D_INO(de) (de)->d_ino
95# endif
96
97#ifdef _D_EXACT_NAMLEN
98# undef D_NAMLEN
99# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
100#endif
101
102# ifdef _DIRENT_HAVE_D_TYPE
103# define D_TYPE(de) (de)->d_type
104# endif
105
41# ifndef EIO_STRUCT_DIRENT 106# ifndef EIO_STRUCT_DIRENT
42# define EIO_STRUCT_DIRENT struct dirent 107# define EIO_STRUCT_DIRENT struct dirent
43# endif 108# endif
44 109
45#endif 110#endif
46 111
47#if HAVE_SENDFILE 112#if HAVE_SENDFILE
48# if __linux 113# if __linux
49# include <sys/sendfile.h> 114# include <sys/sendfile.h>
50# elif __freebsd 115# elif __FreeBSD__ || defined __APPLE__
51# include <sys/socket.h> 116# include <sys/socket.h>
52# include <sys/uio.h> 117# include <sys/uio.h>
53# elif __hpux 118# elif __hpux
54# include <sys/socket.h> 119# include <sys/socket.h>
55# elif __solaris /* not yet */ 120# elif __solaris
56# include <sys/sendfile.h> 121# include <sys/sendfile.h>
57# else 122# else
58# error sendfile support requested but not available 123# error sendfile support requested but not available
59# endif 124# endif
60#endif 125#endif
61 126
62/* number of seconds after which an idle threads exit */ 127#ifndef D_TYPE
63#define IDLE_TIMEOUT 10 128# define D_TYPE(de) 0
129#endif
130#ifndef D_INO
131# define D_INO(de) 0
132#endif
133#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif
64 136
65/* used for struct dirent, AIX doesn't provide it */ 137/* used for struct dirent, AIX doesn't provide it */
66#ifndef NAME_MAX 138#ifndef NAME_MAX
67# define NAME_MAX 4096 139# define NAME_MAX 4096
68#endif 140#endif
69 141
142/* used for readlink etc. */
143#ifndef PATH_MAX
144# define PATH_MAX 4096
145#endif
146
70/* buffer size for various temporary buffers */ 147/* buffer size for various temporary buffers */
71#define EIO_BUFSIZE 65536 148#define EIO_BUFSIZE 65536
72 149
73#define dBUF \ 150#define dBUF \
74 char *eio_buf; \ 151 char *eio_buf; \
75 X_LOCK (wrklock); \ 152 ETP_WORKER_LOCK (self); \
76 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 153 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \
77 X_UNLOCK (wrklock); \ 154 ETP_WORKER_UNLOCK (self); \
78 errno = ENOMEM; \ 155 errno = ENOMEM; \
79 if (!eio_buf) \ 156 if (!eio_buf) \
80 return -1; 157 return -1;
81 158
82#define EIO_TICKS ((1000000 + 1023) >> 10) 159#define EIO_TICKS ((1000000 + 1023) >> 10)
83 160
161/*****************************************************************************/
162
163#if __GNUC__ >= 3
164# define expect(expr,value) __builtin_expect ((expr),(value))
165#else
166# define expect(expr,value) (expr)
167#endif
168
169#define expect_false(expr) expect ((expr) != 0, 0)
170#define expect_true(expr) expect ((expr) != 0, 1)
171
172/*****************************************************************************/
173
174#define ETP_PRI_MIN EIO_PRI_MIN
175#define ETP_PRI_MAX EIO_PRI_MAX
176
177struct etp_worker;
178
179#define ETP_REQ eio_req
180#define ETP_DESTROY(req) eio_destroy (req)
181static int eio_finish (eio_req *req);
182#define ETP_FINISH(req) eio_finish (req)
183static void eio_execute (struct etp_worker *self, eio_req *req);
184#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
185
186#define ETP_WORKER_CLEAR(req) \
187 if (wrk->dbuf) \
188 { \
189 free (wrk->dbuf); \
190 wrk->dbuf = 0; \
191 } \
192 \
193 if (wrk->dirp) \
194 { \
195 closedir (wrk->dirp); \
196 wrk->dirp = 0; \
197 }
198
199#define ETP_WORKER_COMMON \
200 void *dbuf; \
201 DIR *dirp;
202
203/*****************************************************************************/
204
205#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
206
207/* calculate time difference in ~1/EIO_TICKS of a second */
208static int tvdiff (struct timeval *tv1, struct timeval *tv2)
209{
210 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
211 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
212}
213
214static unsigned int started, idle, wanted = 4;
215
84static void (*want_poll_cb) (void); 216static void (*want_poll_cb) (void);
85static void (*done_poll_cb) (void); 217static void (*done_poll_cb) (void);
86 218
87static unsigned int max_poll_time = 0; 219static unsigned int max_poll_time; /* reslock */
88static unsigned int max_poll_reqs = 0; 220static unsigned int max_poll_reqs; /* reslock */
89 221
90/* calculcate time difference in ~1/EIO_TICKS of a second */ 222static volatile unsigned int nreqs; /* reqlock */
91static int tvdiff (struct timeval *tv1, struct timeval *tv2) 223static volatile unsigned int nready; /* reqlock */
92{ 224static volatile unsigned int npending; /* reqlock */
93 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 225static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
94 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 226static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
95}
96 227
97static unsigned int started, idle, wanted = 4; 228static xmutex_t wrklock;
229static xmutex_t reslock;
230static xmutex_t reqlock;
231static xcond_t reqwait;
232
233#if !HAVE_PREADWRITE
234/*
235 * make our pread/pwrite emulation safe against themselves, but not against
236 * normal read/write by using a mutex. slows down execution a lot,
237 * but that's your problem, not mine.
238 */
239static xmutex_t preadwritelock = X_MUTEX_INIT;
240#endif
241
242typedef struct etp_worker
243{
244 /* locked by wrklock */
245 struct etp_worker *prev, *next;
246
247 xthread_t tid;
248
249 /* locked by reslock, reqlock or wrklock */
250 ETP_REQ *req; /* currently processed request */
251
252 ETP_WORKER_COMMON
253} etp_worker;
254
255static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
256
257#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
258#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
98 259
99/* worker threads management */ 260/* worker threads management */
100static mutex_t wrklock = X_MUTEX_INIT;
101 261
102typedef struct worker
103{
104 /* locked by wrklock */
105 struct worker *prev, *next;
106
107 thread_t tid;
108
109 /* locked by reslock, reqlock or wrklock */
110 eio_req *req; /* currently processed request */
111 void *dbuf;
112 DIR *dirp;
113} worker;
114
115static worker wrk_first = { &wrk_first, &wrk_first, 0 };
116
117static void worker_clear (worker *wrk) 262static void etp_worker_clear (etp_worker *wrk)
118{ 263{
119 if (wrk->dirp) 264 ETP_WORKER_CLEAR (wrk);
120 {
121 closedir (wrk->dirp);
122 wrk->dirp = 0;
123 }
124
125 if (wrk->dbuf)
126 {
127 free (wrk->dbuf);
128 wrk->dbuf = 0;
129 }
130} 265}
131 266
132static void worker_free (worker *wrk) 267static void etp_worker_free (etp_worker *wrk)
133{ 268{
134 wrk->next->prev = wrk->prev; 269 wrk->next->prev = wrk->prev;
135 wrk->prev->next = wrk->next; 270 wrk->prev->next = wrk->next;
136 271
137 free (wrk); 272 free (wrk);
138} 273}
139 274
140static volatile unsigned int nreqs, nready, npending;
141static volatile unsigned int max_idle = 4;
142
143static mutex_t reslock = X_MUTEX_INIT;
144static mutex_t reqlock = X_MUTEX_INIT;
145static cond_t reqwait = X_COND_INIT;
146
147unsigned int eio_nreqs (void) 275static unsigned int etp_nreqs (void)
148{ 276{
277 int retval;
278 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
279 retval = nreqs;
280 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
149 return nreqs; 281 return retval;
150} 282}
151 283
152unsigned int eio_nready (void) 284static unsigned int etp_nready (void)
153{ 285{
154 unsigned int retval; 286 unsigned int retval;
155 287
156 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 288 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
157 retval = nready; 289 retval = nready;
158 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 290 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
159 291
160 return retval; 292 return retval;
161} 293}
162 294
163unsigned int eio_npending (void) 295static unsigned int etp_npending (void)
164{ 296{
165 unsigned int retval; 297 unsigned int retval;
166 298
167 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 299 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
168 retval = npending; 300 retval = npending;
169 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 301 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
170 302
171 return retval; 303 return retval;
172} 304}
173 305
174unsigned int eio_nthreads (void) 306static unsigned int etp_nthreads (void)
175{ 307{
176 unsigned int retval; 308 unsigned int retval;
177 309
178 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 310 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
179 retval = started; 311 retval = started;
186 * a somewhat faster data structure might be nice, but 318 * a somewhat faster data structure might be nice, but
187 * with 8 priorities this actually needs <20 insns 319 * with 8 priorities this actually needs <20 insns
188 * per shift, the most expensive operation. 320 * per shift, the most expensive operation.
189 */ 321 */
190typedef struct { 322typedef struct {
191 eio_req *qs[EIO_NUM_PRI], *qe[EIO_NUM_PRI]; /* qstart, qend */ 323 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
192 int size; 324 int size;
193} reqq; 325} etp_reqq;
194 326
195static reqq req_queue; 327static etp_reqq req_queue;
196static reqq res_queue; 328static etp_reqq res_queue;
197 329
198static int reqq_push (reqq *q, eio_req *req) 330static int reqq_push (etp_reqq *q, ETP_REQ *req)
199{ 331{
200 int pri = req->pri; 332 int pri = req->pri;
201 req->next = 0; 333 req->next = 0;
202 334
203 if (q->qe[pri]) 335 if (q->qe[pri])
209 q->qe[pri] = q->qs[pri] = req; 341 q->qe[pri] = q->qs[pri] = req;
210 342
211 return q->size++; 343 return q->size++;
212} 344}
213 345
214static eio_req *reqq_shift (reqq *q) 346static ETP_REQ *reqq_shift (etp_reqq *q)
215{ 347{
216 int pri; 348 int pri;
217 349
218 if (!q->size) 350 if (!q->size)
219 return 0; 351 return 0;
220 352
221 --q->size; 353 --q->size;
222 354
223 for (pri = EIO_NUM_PRI; pri--; ) 355 for (pri = ETP_NUM_PRI; pri--; )
224 { 356 {
225 eio_req *req = q->qs[pri]; 357 eio_req *req = q->qs[pri];
226 358
227 if (req) 359 if (req)
228 { 360 {
234 } 366 }
235 367
236 abort (); 368 abort ();
237} 369}
238 370
239static void grp_try_feed (eio_req *grp) 371static void etp_thread_init (void)
240{ 372{
241 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 373 X_MUTEX_CREATE (wrklock);
374 X_MUTEX_CREATE (reslock);
375 X_MUTEX_CREATE (reqlock);
376 X_COND_CREATE (reqwait);
377}
378
379static void etp_atfork_prepare (void)
380{
381 X_LOCK (wrklock);
382 X_LOCK (reqlock);
383 X_LOCK (reslock);
384#if !HAVE_PREADWRITE
385 X_LOCK (preadwritelock);
386#endif
387}
388
389static void etp_atfork_parent (void)
390{
391#if !HAVE_PREADWRITE
392 X_UNLOCK (preadwritelock);
393#endif
394 X_UNLOCK (reslock);
395 X_UNLOCK (reqlock);
396 X_UNLOCK (wrklock);
397}
398
399static void etp_atfork_child (void)
400{
401 ETP_REQ *prv;
402
403 while ((prv = reqq_shift (&req_queue)))
404 ETP_DESTROY (prv);
405
406 while ((prv = reqq_shift (&res_queue)))
407 ETP_DESTROY (prv);
408
409 while (wrk_first.next != &wrk_first)
242 { 410 {
243 int old_len = grp->size; 411 etp_worker *wrk = wrk_first.next;
244 412
245 EIO_FEED (grp); 413 if (wrk->req)
414 ETP_DESTROY (wrk->req);
246 415
247 /* stop if no progress has been made */ 416 etp_worker_clear (wrk);
248 if (old_len == grp->size) 417 etp_worker_free (wrk);
249 {
250 grp->feed = 0;
251 break;
252 }
253 } 418 }
254}
255 419
256static int eio_finish (eio_req *req); 420 started = 0;
421 idle = 0;
422 nreqs = 0;
423 nready = 0;
424 npending = 0;
257 425
258static int grp_dec (eio_req *grp) 426 etp_thread_init ();
259{ 427}
260 --grp->size;
261 428
262 /* call feeder, if applicable */ 429static void
263 grp_try_feed (grp); 430etp_once_init (void)
431{
432 etp_thread_init ();
433 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
434}
264 435
265 /* finish, if done */ 436static int
266 if (!grp->size && grp->int1) 437etp_init (void (*want_poll)(void), void (*done_poll)(void))
267 return eio_finish (grp); 438{
268 else 439 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
440
441 pthread_once (&doinit, etp_once_init);
442
443 want_poll_cb = want_poll;
444 done_poll_cb = done_poll;
445
269 return 0; 446 return 0;
270} 447}
271 448
272void eio_destroy (eio_req *req)
273{
274 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
275 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
276
277 EIO_DESTROY (req);
278}
279
280static int eio_finish (eio_req *req)
281{
282 int res = EIO_FINISH (req);
283
284 if (req->grp)
285 {
286 int res2;
287 eio_req *grp = req->grp;
288
289 /* unlink request */
290 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
291 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
292
293 if (grp->grp_first == req)
294 grp->grp_first = req->grp_next;
295
296 res2 = grp_dec (grp);
297
298 if (!res && res2)
299 res = res2;
300 }
301
302 eio_destroy (req);
303
304 return res;
305}
306
307void eio_grp_cancel (eio_req *grp)
308{
309 for (grp = grp->grp_first; grp; grp = grp->grp_next)
310 eio_cancel (grp);
311}
312
313void eio_cancel (eio_req *req)
314{
315 X_LOCK (wrklock);
316 req->flags |= EIO_FLAG_CANCELLED;
317 X_UNLOCK (wrklock);
318
319 eio_grp_cancel (req);
320}
321
322X_THREAD_PROC (eio_proc); 449X_THREAD_PROC (etp_proc);
323 450
324static void start_thread (void) 451static void etp_start_thread (void)
325{ 452{
326 worker *wrk = calloc (1, sizeof (worker)); 453 etp_worker *wrk = calloc (1, sizeof (etp_worker));
327 454
328 /*TODO*/ 455 /*TODO*/
329 assert (("unable to allocate worker thread data", wrk)); 456 assert (("unable to allocate worker thread data", wrk));
330 457
331 X_LOCK (wrklock); 458 X_LOCK (wrklock);
332 459
333 if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) 460 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
334 { 461 {
335 wrk->prev = &wrk_first; 462 wrk->prev = &wrk_first;
336 wrk->next = wrk_first.next; 463 wrk->next = wrk_first.next;
337 wrk_first.next->prev = wrk; 464 wrk_first.next->prev = wrk;
338 wrk_first.next = wrk; 465 wrk_first.next = wrk;
342 free (wrk); 469 free (wrk);
343 470
344 X_UNLOCK (wrklock); 471 X_UNLOCK (wrklock);
345} 472}
346 473
347static void maybe_start_thread (void) 474static void etp_maybe_start_thread (void)
348{ 475{
349 if (eio_nthreads () >= wanted) 476 if (expect_true (etp_nthreads () >= wanted))
350 return; 477 return;
351 478
352 /* todo: maybe use idle here, but might be less exact */ 479 /* todo: maybe use idle here, but might be less exact */
353 if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ()) 480 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
354 return; 481 return;
355 482
356 start_thread (); 483 etp_start_thread ();
357} 484}
358 485
359void eio_submit (eio_req *req)
360{
361 req->pri += EIO_PRI_BIAS;
362
363 if (req->pri < EIO_PRI_MIN + EIO_PRI_BIAS) req->pri = EIO_PRI_MIN + EIO_PRI_BIAS;
364 if (req->pri > EIO_PRI_MAX + EIO_PRI_BIAS) req->pri = EIO_PRI_MAX + EIO_PRI_BIAS;
365
366 ++nreqs;
367
368 X_LOCK (reqlock);
369 ++nready;
370 reqq_push (&req_queue, req);
371 X_COND_SIGNAL (reqwait);
372 X_UNLOCK (reqlock);
373
374 maybe_start_thread ();
375}
376
377static void end_thread (void) 486static void etp_end_thread (void)
378{ 487{
379 eio_req *req = calloc (1, sizeof (eio_req)); 488 eio_req *req = calloc (1, sizeof (eio_req));
380 489
381 req->type = EIO_QUIT; 490 req->type = -1;
382 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 491 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
383 492
384 X_LOCK (reqlock); 493 X_LOCK (reqlock);
385 reqq_push (&req_queue, req); 494 reqq_push (&req_queue, req);
386 X_COND_SIGNAL (reqwait); 495 X_COND_SIGNAL (reqwait);
387 X_UNLOCK (reqlock); 496 X_UNLOCK (reqlock);
389 X_LOCK (wrklock); 498 X_LOCK (wrklock);
390 --started; 499 --started;
391 X_UNLOCK (wrklock); 500 X_UNLOCK (wrklock);
392} 501}
393 502
394void eio_set_max_poll_time (double nseconds)
395{
396 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
397 max_poll_time = nseconds;
398 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
399}
400
401void eio_set_max_poll_reqs (unsigned int maxreqs)
402{
403 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
404 max_poll_reqs = maxreqs;
405 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
406}
407
408void eio_set_max_idle (unsigned int nthreads)
409{
410 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
411 max_idle = nthreads <= 0 ? 1 : nthreads;
412 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
413}
414
415void eio_set_min_parallel (unsigned int nthreads)
416{
417 if (wanted < nthreads)
418 wanted = nthreads;
419}
420
421void eio_set_max_parallel (unsigned int nthreads)
422{
423 if (wanted > nthreads)
424 wanted = nthreads;
425
426 while (started > wanted)
427 end_thread ();
428}
429
430int eio_poll (void) 503static int etp_poll (void)
431{ 504{
432 int maxreqs = max_poll_reqs; 505 unsigned int maxreqs;
506 unsigned int maxtime;
433 struct timeval tv_start, tv_now; 507 struct timeval tv_start, tv_now;
434 eio_req *req;
435 508
509 X_LOCK (reslock);
510 maxreqs = max_poll_reqs;
511 maxtime = max_poll_time;
512 X_UNLOCK (reslock);
513
436 if (max_poll_time) 514 if (maxtime)
437 gettimeofday (&tv_start, 0); 515 gettimeofday (&tv_start, 0);
438 516
439 for (;;) 517 for (;;)
440 { 518 {
519 ETP_REQ *req;
520
441 maybe_start_thread (); 521 etp_maybe_start_thread ();
442 522
443 X_LOCK (reslock); 523 X_LOCK (reslock);
444 req = reqq_shift (&res_queue); 524 req = reqq_shift (&res_queue);
445 525
446 if (req) 526 if (req)
454 X_UNLOCK (reslock); 534 X_UNLOCK (reslock);
455 535
456 if (!req) 536 if (!req)
457 return 0; 537 return 0;
458 538
539 X_LOCK (reqlock);
459 --nreqs; 540 --nreqs;
541 X_UNLOCK (reqlock);
460 542
461 if (req->type == EIO_GROUP && req->size) 543 if (expect_false (req->type == EIO_GROUP && req->size))
462 { 544 {
463 req->int1 = 1; /* mark request as delayed */ 545 req->int1 = 1; /* mark request as delayed */
464 continue; 546 continue;
465 } 547 }
466 else 548 else
467 { 549 {
468 int res = eio_finish (req); 550 int res = ETP_FINISH (req);
469 if (res) 551 if (expect_false (res))
470 return res; 552 return res;
471 } 553 }
472 554
473 if (maxreqs && !--maxreqs) 555 if (expect_false (maxreqs && !--maxreqs))
474 break; 556 break;
475 557
476 if (max_poll_time) 558 if (maxtime)
477 { 559 {
478 gettimeofday (&tv_now, 0); 560 gettimeofday (&tv_now, 0);
479 561
480 if (tvdiff (&tv_start, &tv_now) >= max_poll_time) 562 if (tvdiff (&tv_start, &tv_now) >= maxtime)
481 break; 563 break;
482 } 564 }
483 } 565 }
484 566
485 errno = EAGAIN; 567 errno = EAGAIN;
486 return -1; 568 return -1;
487} 569}
488 570
571static void etp_cancel (ETP_REQ *req)
572{
573 X_LOCK (wrklock);
574 req->flags |= EIO_FLAG_CANCELLED;
575 X_UNLOCK (wrklock);
576
577 eio_grp_cancel (req);
578}
579
580static void etp_submit (ETP_REQ *req)
581{
582 req->pri -= ETP_PRI_MIN;
583
584 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
585 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
586
587 if (expect_false (req->type == EIO_GROUP))
588 {
589 /* I hope this is worth it :/ */
590 X_LOCK (reqlock);
591 ++nreqs;
592 X_UNLOCK (reqlock);
593
594 X_LOCK (reslock);
595
596 ++npending;
597
598 if (!reqq_push (&res_queue, req) && want_poll_cb)
599 want_poll_cb ();
600
601 X_UNLOCK (reslock);
602 }
603 else
604 {
605 X_LOCK (reqlock);
606 ++nreqs;
607 ++nready;
608 reqq_push (&req_queue, req);
609 X_COND_SIGNAL (reqwait);
610 X_UNLOCK (reqlock);
611
612 etp_maybe_start_thread ();
613 }
614}
615
616static void etp_set_max_poll_time (double nseconds)
617{
618 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
619 max_poll_time = nseconds * EIO_TICKS;
620 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
621}
622
623static void etp_set_max_poll_reqs (unsigned int maxreqs)
624{
625 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
626 max_poll_reqs = maxreqs;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
628}
629
630static void etp_set_max_idle (unsigned int nthreads)
631{
632 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
633 max_idle = nthreads;
634 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
635}
636
637static void etp_set_idle_timeout (unsigned int seconds)
638{
639 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
640 idle_timeout = seconds;
641 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
642}
643
644static void etp_set_min_parallel (unsigned int nthreads)
645{
646 if (wanted < nthreads)
647 wanted = nthreads;
648}
649
650static void etp_set_max_parallel (unsigned int nthreads)
651{
652 if (wanted > nthreads)
653 wanted = nthreads;
654
655 while (started > wanted)
656 etp_end_thread ();
657}
658
659/*****************************************************************************/
660
661static void grp_try_feed (eio_req *grp)
662{
663 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
664 {
665 grp->flags &= ~EIO_FLAG_GROUPADD;
666
667 EIO_FEED (grp);
668
669 /* stop if no progress has been made */
670 if (!(grp->flags & EIO_FLAG_GROUPADD))
671 {
672 grp->feed = 0;
673 break;
674 }
675 }
676}
677
678static int grp_dec (eio_req *grp)
679{
680 --grp->size;
681
682 /* call feeder, if applicable */
683 grp_try_feed (grp);
684
685 /* finish, if done */
686 if (!grp->size && grp->int1)
687 return eio_finish (grp);
688 else
689 return 0;
690}
691
692void eio_destroy (eio_req *req)
693{
694 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
695 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
696
697 EIO_DESTROY (req);
698}
699
700static int eio_finish (eio_req *req)
701{
702 int res = EIO_FINISH (req);
703
704 if (req->grp)
705 {
706 int res2;
707 eio_req *grp = req->grp;
708
709 /* unlink request */
710 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
711 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
712
713 if (grp->grp_first == req)
714 grp->grp_first = req->grp_next;
715
716 res2 = grp_dec (grp);
717
718 if (!res && res2)
719 res = res2;
720 }
721
722 eio_destroy (req);
723
724 return res;
725}
726
727void eio_grp_cancel (eio_req *grp)
728{
729 for (grp = grp->grp_first; grp; grp = grp->grp_next)
730 eio_cancel (grp);
731}
732
733void eio_cancel (eio_req *req)
734{
735 etp_cancel (req);
736}
737
738void eio_submit (eio_req *req)
739{
740 etp_submit (req);
741}
742
743unsigned int eio_nreqs (void)
744{
745 return etp_nreqs ();
746}
747
748unsigned int eio_nready (void)
749{
750 return etp_nready ();
751}
752
753unsigned int eio_npending (void)
754{
755 return etp_npending ();
756}
757
758unsigned int eio_nthreads (void)
759{
760 return etp_nthreads ();
761}
762
763void eio_set_max_poll_time (double nseconds)
764{
765 etp_set_max_poll_time (nseconds);
766}
767
768void eio_set_max_poll_reqs (unsigned int maxreqs)
769{
770 etp_set_max_poll_reqs (maxreqs);
771}
772
773void eio_set_max_idle (unsigned int nthreads)
774{
775 etp_set_max_idle (nthreads);
776}
777
778void eio_set_idle_timeout (unsigned int seconds)
779{
780 etp_set_idle_timeout (seconds);
781}
782
783void eio_set_min_parallel (unsigned int nthreads)
784{
785 etp_set_min_parallel (nthreads);
786}
787
788void eio_set_max_parallel (unsigned int nthreads)
789{
790 etp_set_max_parallel (nthreads);
791}
792
793int eio_poll (void)
794{
795 return etp_poll ();
796}
797
489/*****************************************************************************/ 798/*****************************************************************************/
490/* work around various missing functions */ 799/* work around various missing functions */
491 800
492#if !HAVE_PREADWRITE 801#if !HAVE_PREADWRITE
802# undef pread
803# undef pwrite
493# define pread eio__pread 804# define pread eio__pread
494# define pwrite eio__pwrite 805# define pwrite eio__pwrite
495
496/*
497 * make our pread/pwrite safe against themselves, but not against
498 * normal read/write by using a mutex. slows down execution a lot,
499 * but that's your problem, not mine.
500 */
501static mutex_t preadwritelock = X_MUTEX_INIT;
502 806
503static ssize_t 807static ssize_t
504eio__pread (int fd, void *buf, size_t count, off_t offset) 808eio__pread (int fd, void *buf, size_t count, off_t offset)
505{ 809{
506 ssize_t res; 810 ssize_t res;
524 828
525 X_LOCK (preadwritelock); 829 X_LOCK (preadwritelock);
526 ooffset = lseek (fd, 0, SEEK_CUR); 830 ooffset = lseek (fd, 0, SEEK_CUR);
527 lseek (fd, offset, SEEK_SET); 831 lseek (fd, offset, SEEK_SET);
528 res = write (fd, buf, count); 832 res = write (fd, buf, count);
529 lseek (fd, offset, SEEK_SET); 833 lseek (fd, ooffset, SEEK_SET);
530 X_UNLOCK (preadwritelock); 834 X_UNLOCK (preadwritelock);
531 835
532 return res; 836 return res;
533} 837}
534#endif 838#endif
535 839
536#ifndef HAVE_FUTIMES 840#ifndef HAVE_UTIMES
537 841
842# undef utimes
538# define utimes(path,times) eio__utimes (path, times) 843# define utimes(path,times) eio__utimes (path, times)
539# define futimes(fd,times) eio__futimes (fd, times)
540 844
541static int 845static int
542eio__utimes (const char *filename, const struct timeval times[2]) 846eio__utimes (const char *filename, const struct timeval times[2])
543{ 847{
544 if (times) 848 if (times)
552 } 856 }
553 else 857 else
554 return utime (filename, 0); 858 return utime (filename, 0);
555} 859}
556 860
861#endif
862
863#ifndef HAVE_FUTIMES
864
865# undef futimes
866# define futimes(fd,times) eio__futimes (fd, times)
867
557static int eio__futimes (int fd, const struct timeval tv[2]) 868static int eio__futimes (int fd, const struct timeval tv[2])
558{ 869{
559 errno = ENOSYS; 870 errno = ENOSYS;
560 return -1; 871 return -1;
561} 872}
562 873
563#endif 874#endif
564 875
565#if !HAVE_FDATASYNC 876#if !HAVE_FDATASYNC
877# undef fdatasync
566# define fdatasync fsync 878# define fdatasync(fd) fsync (fd)
567#endif 879#endif
880
881/* sync_file_range always needs emulation */
882int
883eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
884{
885#if HAVE_SYNC_FILE_RANGE
886 int res;
887
888 if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
889 || EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
890 || EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
891 {
892 flags = 0
893 | (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
894 | (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
895 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
896 }
897
898 res = sync_file_range (fd, offset, nbytes, flags);
899
900 if (!res || errno != ENOSYS)
901 return res;
902#endif
903
904 /* even though we could play tricks with the flags, it's better to always
905 * call fdatasync, as that matches the expectation of its users best */
906 return fdatasync (fd);
907}
568 908
569#if !HAVE_READAHEAD 909#if !HAVE_READAHEAD
910# undef readahead
570# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 911# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
571 912
572static ssize_t 913static ssize_t
573eio__readahead (int fd, off_t offset, size_t count, worker *self) 914eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
574{ 915{
575 size_t todo = count; 916 size_t todo = count;
576 dBUF; 917 dBUF;
577 918
578 while (todo > 0) 919 while (todo > 0)
588 return count; 929 return count;
589} 930}
590 931
591#endif 932#endif
592 933
593#if !HAVE_READDIR_R
594# define readdir_r eio__readdir_r
595
596static mutex_t readdirlock = X_MUTEX_INIT;
597
598static int
599eio__readdir_r (DIR *dirp, EIO_STRUCT_DIRENT *ent, EIO_STRUCT_DIRENT **res)
600{
601 EIO_STRUCT_DIRENT *e;
602 int errorno;
603
604 X_LOCK (readdirlock);
605
606 e = readdir (dirp);
607 errorno = errno;
608
609 if (e)
610 {
611 *res = ent;
612 strcpy (ent->d_name, e->d_name);
613 }
614 else
615 *res = 0;
616
617 X_UNLOCK (readdirlock);
618
619 errno = errorno;
620 return e ? 0 : -1;
621}
622#endif
623
624/* sendfile always needs emulation */ 934/* sendfile always needs emulation */
625static ssize_t 935static ssize_t
626eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self) 936eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
627{ 937{
628 ssize_t res; 938 ssize_t res;
629 939
630 if (!count) 940 if (!count)
631 return 0; 941 return 0;
632 942
633#if HAVE_SENDFILE 943#if HAVE_SENDFILE
634# if __linux 944# if __linux
635 res = sendfile (ofd, ifd, &offset, count); 945 res = sendfile (ofd, ifd, &offset, count);
636 946
637# elif __freebsd 947# elif __FreeBSD__
638 /* 948 /*
639 * Of course, the freebsd sendfile is a dire hack with no thoughts 949 * Of course, the freebsd sendfile is a dire hack with no thoughts
640 * wasted on making it similar to other I/O functions. 950 * wasted on making it similar to other I/O functions.
641 */ 951 */
642 { 952 {
643 off_t sbytes; 953 off_t sbytes;
644 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 954 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
645 955
646 if (res < 0 && sbytes) 956 #if 0 /* according to the manpage, this is correct, but broken behaviour */
647 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 957 /* freebsd' sendfile will return 0 on success */
958 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
959 /* not on e.g. EIO or EPIPE - sounds broken */
960 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
961 res = sbytes;
962 #endif
963
964 /* according to source inspection, this is correct, and useful behaviour */
965 if (sbytes)
966 res = sbytes;
967 }
968
969# elif defined (__APPLE__)
970
971 {
972 off_t sbytes = count;
973 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
974
975 /* according to the manpage, sbytes is always valid */
976 if (sbytes)
648 res = sbytes; 977 res = sbytes;
649 } 978 }
650 979
651# elif __hpux 980# elif __hpux
652 res = sendfile (ofd, ifd, offset, count, 0, 0); 981 res = sendfile (ofd, ifd, offset, count, 0, 0);
666 if (res < 0 && sbytes) 995 if (res < 0 && sbytes)
667 res = sbytes; 996 res = sbytes;
668 } 997 }
669 998
670# endif 999# endif
1000
1001#elif defined (_WIN32)
1002
1003 /* does not work, just for documentation of what would need to be done */
1004 {
1005 HANDLE h = TO_SOCKET (ifd);
1006 SetFilePointer (h, offset, 0, FILE_BEGIN);
1007 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1008 }
1009
671#else 1010#else
672 res = -1; 1011 res = -1;
673 errno = ENOSYS; 1012 errno = ENOSYS;
674#endif 1013#endif
675 1014
676 if (res < 0 1015 if (res < 0
677 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1016 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1017 /* BSDs */
1018#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1019 || errno == ENOTSUP
1020#endif
1021 || errno == EOPNOTSUPP /* BSDs */
678#if __solaris 1022#if __solaris
679 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1023 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
680#endif 1024#endif
681 ) 1025 )
682 ) 1026 )
713 } 1057 }
714 1058
715 return res; 1059 return res;
716} 1060}
717 1061
1062static signed char
1063eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1064{
1065 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1066 : a->inode < b->inode ? -1
1067 : a->inode > b->inode ? 1
1068 : 0;
1069}
1070
1071#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1072
1073#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1074#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1075
1076static void
1077eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1078{
1079 unsigned char bits [9 + sizeof (ino_t) * 8];
1080 unsigned char *bit = bits;
1081
1082 assert (CHAR_BIT == 8);
1083 assert (sizeof (eio_dirent) * 8 < 256);
1084 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1085 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1086
1087 if (size <= EIO_SORT_FAST)
1088 return;
1089
1090 /* first prepare an array of bits to test in our radix sort */
1091 /* try to take endianness into account, as well as differences in ino_t sizes */
1092 /* inode_bits must contain all inodes ORed together */
1093 /* which is used to skip bits that are 0 everywhere, which is very common */
1094 {
1095 ino_t endianness;
1096 int i, j;
1097
1098 /* we store the byte offset of byte n into byte n of "endianness" */
1099 for (i = 0; i < sizeof (ino_t); ++i)
1100 ((unsigned char *)&endianness)[i] = i;
1101
1102 *bit++ = 0;
1103
1104 for (i = 0; i < sizeof (ino_t); ++i)
1105 {
1106 /* shifting off the byte offsets out of "endianness" */
1107 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1108 endianness >>= 8;
1109
1110 for (j = 0; j < 8; ++j)
1111 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1112 *bit++ = offs + j;
1113 }
1114
1115 for (j = 0; j < 8; ++j)
1116 if (score_bits & (1 << j))
1117 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1118 }
1119
1120 /* now actually do the sorting (a variant of MSD radix sort) */
1121 {
1122 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1123 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1124 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1125 int stk_idx = 0;
1126
1127 base_stk [stk_idx] = dents;
1128 end_stk [stk_idx] = dents + size;
1129 bit_stk [stk_idx] = bit - 1;
1130
1131 do
1132 {
1133 base = base_stk [stk_idx];
1134 end = end_stk [stk_idx];
1135 bit = bit_stk [stk_idx];
1136
1137 for (;;)
1138 {
1139 unsigned char O = *bit >> 3;
1140 unsigned char M = 1 << (*bit & 7);
1141
1142 eio_dirent *a = base;
1143 eio_dirent *b = end;
1144
1145 if (b - a < EIO_SORT_CUTOFF)
1146 break;
1147
1148 /* now bit-partition the array on the bit */
1149 /* this ugly asymmetric loop seems to perform much better than typical */
1150 /* partition algos found in the literature */
1151 do
1152 if (!(((unsigned char *)a)[O] & M))
1153 ++a;
1154 else if (!(((unsigned char *)--b)[O] & M))
1155 {
1156 eio_dirent tmp = *a; *a = *b; *b = tmp;
1157 ++a;
1158 }
1159 while (b > a);
1160
1161 /* next bit, or stop, if no bits left in this path */
1162 if (!*--bit)
1163 break;
1164
1165 base_stk [stk_idx] = a;
1166 end_stk [stk_idx] = end;
1167 bit_stk [stk_idx] = bit;
1168 ++stk_idx;
1169
1170 end = a;
1171 }
1172 }
1173 while (stk_idx--);
1174 }
1175}
1176
1177static void
1178eio_dent_insertion_sort (eio_dirent *dents, int size)
1179{
1180 /* first move the smallest element to the front, to act as a sentinel */
1181 {
1182 int i;
1183 eio_dirent *min = dents;
1184
1185 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1186 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1187 if (EIO_DENT_CMP (dents [i], <, *min))
1188 min = &dents [i];
1189
1190 /* swap elements 0 and j (minimum) */
1191 {
1192 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1193 }
1194 }
1195
1196 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1197 {
1198 eio_dirent *i, *j;
1199
1200 for (i = dents + 1; i < dents + size; ++i)
1201 {
1202 eio_dirent value = *i;
1203
1204 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1205 j [1] = j [0];
1206
1207 j [1] = value;
1208 }
1209 }
1210}
1211
1212static void
1213eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1214{
1215 if (size <= 1)
1216 return; /* our insertion sort relies on size > 0 */
1217
1218 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1219 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1220 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1221
1222 /* use an insertion sort at the end, or for small arrays, */
1223 /* as insertion sort is more efficient for small partitions */
1224 eio_dent_insertion_sort (dents, size);
1225}
1226
718/* read a full directory */ 1227/* read a full directory */
719static void 1228static void
720eio__scandir (eio_req *req, worker *self) 1229eio__scandir (eio_req *req, etp_worker *self)
721{ 1230{
722 DIR *dirp; 1231 DIR *dirp;
723 union
724 {
725 EIO_STRUCT_DIRENT d;
726 char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
727 } *u;
728 EIO_STRUCT_DIRENT *entp; 1232 EIO_STRUCT_DIRENT *entp;
729 char *name, *names; 1233 char *name, *names;
730 int memlen = 4096; 1234 int namesalloc = 4096;
731 int memofs = 0; 1235 int namesoffs = 0;
1236 int flags = req->int1;
1237 eio_dirent *dents = 0;
1238 int dentalloc = 128;
732 int res = 0; 1239 int dentoffs = 0;
1240 ino_t inode_bits = 0;
1241
1242 req->result = -1;
1243
1244 if (!(flags & EIO_READDIR_DENTS))
1245 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
733 1246
734 X_LOCK (wrklock); 1247 X_LOCK (wrklock);
1248 /* the corresponding closedir is in ETP_WORKER_CLEAR */
735 self->dirp = dirp = opendir (req->ptr1); 1249 self->dirp = dirp = opendir (req->ptr1);
736 self->dbuf = u = malloc (sizeof (*u)); 1250
737 req->flags |= EIO_FLAG_PTR2_FREE; 1251 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1252 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
738 req->ptr2 = names = malloc (memlen); 1253 req->ptr2 = names = malloc (namesalloc);
739 X_UNLOCK (wrklock); 1254 X_UNLOCK (wrklock);
740 1255
741 if (dirp && u && names) 1256 if (dirp && names && (!flags || dents))
742 for (;;) 1257 for (;;)
743 { 1258 {
744 errno = 0; 1259 errno = 0;
745 readdir_r (dirp, &u->d, &entp); 1260 entp = readdir (dirp);
746 1261
747 if (!entp) 1262 if (!entp)
1263 {
1264 if (errno)
1265 break;
1266
1267 /* sort etc. */
1268 req->int1 = flags;
1269 req->result = dentoffs;
1270
1271 if (flags & EIO_READDIR_STAT_ORDER)
1272 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1273 else if (flags & EIO_READDIR_DIRS_FIRST)
1274 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1275 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1276 else
1277 {
1278 /* in this case, all is known, and we just put dirs first and sort them */
1279 eio_dirent *oth = dents + dentoffs;
1280 eio_dirent *dir = dents;
1281
1282 /* now partition dirs to the front, and non-dirs to the back */
1283 /* by walking from both sides and swapping if necessary */
1284 while (oth > dir)
1285 {
1286 if (dir->type == EIO_DT_DIR)
1287 ++dir;
1288 else if ((--oth)->type == EIO_DT_DIR)
1289 {
1290 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1291
1292 ++dir;
1293 }
1294 }
1295
1296 /* now sort the dirs only (dirs all have the same score) */
1297 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1298 }
1299
748 break; 1300 break;
1301 }
749 1302
1303 /* now add the entry to our list(s) */
750 name = entp->d_name; 1304 name = entp->d_name;
751 1305
1306 /* skip . and .. entries */
752 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1307 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
753 { 1308 {
754 int len = strlen (name) + 1; 1309 int len = D_NAMLEN (entp) + 1;
755 1310
756 res++; 1311 while (expect_false (namesoffs + len > namesalloc))
757
758 while (memofs + len > memlen)
759 { 1312 {
760 memlen *= 2; 1313 namesalloc *= 2;
761 X_LOCK (wrklock); 1314 X_LOCK (wrklock);
762 req->ptr2 = names = realloc (names, memlen); 1315 req->ptr2 = names = realloc (names, namesalloc);
763 X_UNLOCK (wrklock); 1316 X_UNLOCK (wrklock);
764 1317
765 if (!names) 1318 if (!names)
766 break; 1319 break;
767 } 1320 }
768 1321
769 memcpy (names + memofs, name, len); 1322 memcpy (names + namesoffs, name, len);
1323
1324 if (dents)
1325 {
1326 struct eio_dirent *ent;
1327
1328 if (expect_false (dentoffs == dentalloc))
1329 {
1330 dentalloc *= 2;
1331 X_LOCK (wrklock);
1332 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1333 X_UNLOCK (wrklock);
1334
1335 if (!dents)
1336 break;
1337 }
1338
1339 ent = dents + dentoffs;
1340
1341 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1342 ent->namelen = len - 1;
1343 ent->inode = D_INO (entp);
1344
1345 inode_bits |= ent->inode;
1346
1347 switch (D_TYPE (entp))
1348 {
1349 default:
1350 ent->type = EIO_DT_UNKNOWN;
1351 flags |= EIO_READDIR_FOUND_UNKNOWN;
1352 break;
1353
1354 #ifdef DT_FIFO
1355 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1356 #endif
1357 #ifdef DT_CHR
1358 case DT_CHR: ent->type = EIO_DT_CHR; break;
1359 #endif
1360 #ifdef DT_MPC
1361 case DT_MPC: ent->type = EIO_DT_MPC; break;
1362 #endif
1363 #ifdef DT_DIR
1364 case DT_DIR: ent->type = EIO_DT_DIR; break;
1365 #endif
1366 #ifdef DT_NAM
1367 case DT_NAM: ent->type = EIO_DT_NAM; break;
1368 #endif
1369 #ifdef DT_BLK
1370 case DT_BLK: ent->type = EIO_DT_BLK; break;
1371 #endif
1372 #ifdef DT_MPB
1373 case DT_MPB: ent->type = EIO_DT_MPB; break;
1374 #endif
1375 #ifdef DT_REG
1376 case DT_REG: ent->type = EIO_DT_REG; break;
1377 #endif
1378 #ifdef DT_NWK
1379 case DT_NWK: ent->type = EIO_DT_NWK; break;
1380 #endif
1381 #ifdef DT_CMP
1382 case DT_CMP: ent->type = EIO_DT_CMP; break;
1383 #endif
1384 #ifdef DT_LNK
1385 case DT_LNK: ent->type = EIO_DT_LNK; break;
1386 #endif
1387 #ifdef DT_SOCK
1388 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1389 #endif
1390 #ifdef DT_DOOR
1391 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1392 #endif
1393 #ifdef DT_WHT
1394 case DT_WHT: ent->type = EIO_DT_WHT; break;
1395 #endif
1396 }
1397
1398 ent->score = 7;
1399
1400 if (flags & EIO_READDIR_DIRS_FIRST)
1401 {
1402 if (ent->type == EIO_DT_UNKNOWN)
1403 {
1404 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1405 ent->score = 1;
1406 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1407 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1408 }
1409 else if (ent->type == EIO_DT_DIR)
1410 ent->score = 0;
1411 }
1412 }
1413
770 memofs += len; 1414 namesoffs += len;
1415 ++dentoffs;
1416 }
1417
1418 if (EIO_CANCELLED (req))
1419 {
1420 errno = ECANCELED;
1421 break;
771 } 1422 }
772 } 1423 }
1424}
773 1425
774 if (errno) 1426#ifdef PAGESIZE
775 res = -1; 1427# define eio_pagesize() PAGESIZE
1428#else
1429static intptr_t
1430eio_pagesize (void)
1431{
1432 static intptr_t page;
1433
1434 if (!page)
1435 page = sysconf (_SC_PAGESIZE);
1436
1437 return page;
1438}
1439#endif
1440
1441static void
1442eio_page_align (void **addr, size_t *length)
1443{
1444 intptr_t mask = eio_pagesize () - 1;
1445
1446 /* round down addr */
1447 intptr_t adj = mask & (intptr_t)*addr;
1448
1449 *addr = (void *)((intptr_t)*addr - adj);
1450 *length += adj;
1451
1452 /* round up length */
1453 *length = (*length + mask) & ~mask;
1454}
1455
1456#if !_POSIX_MEMLOCK
1457# define eio__mlockall(a) ((errno = ENOSYS), -1)
1458#else
1459
1460static int
1461eio__mlockall (int flags)
1462{
1463 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1464 extern int mallopt (int, int);
1465 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1466 #endif
1467
1468 if (EIO_MCL_CURRENT != MCL_CURRENT
1469 || EIO_MCL_FUTURE != MCL_FUTURE)
1470 {
1471 flags = 0
1472 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1473 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1474 }
1475
1476 return mlockall (flags);
1477}
1478#endif
1479
1480#if !_POSIX_MEMLOCK_RANGE
1481# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1482#else
1483
1484static int
1485eio__mlock (void *addr, size_t length)
1486{
1487 eio_page_align (&addr, &length);
1488
1489 return mlock (addr, length);
1490}
1491
1492#endif
1493
1494#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1495# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1496#else
1497
1498int
1499eio__msync (void *mem, size_t len, int flags)
1500{
1501 eio_page_align (&mem, &len);
1502
1503 if (EIO_MS_ASYNC != MS_SYNC
1504 || EIO_MS_INVALIDATE != MS_INVALIDATE
1505 || EIO_MS_SYNC != MS_SYNC)
1506 {
1507 flags = 0
1508 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1509 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1510 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1511 }
1512
1513 return msync (mem, len, flags);
1514}
1515
1516#endif
1517
1518int
1519eio__mtouch (void *mem, size_t len, int flags)
1520{
1521 eio_page_align (&mem, &len);
1522
776 1523 {
777 req->result = res; 1524 intptr_t addr = (intptr_t)mem;
1525 intptr_t end = addr + len;
1526 intptr_t page = eio_pagesize ();
1527
1528 if (addr < end)
1529 if (flags & EIO_MT_MODIFY) /* modify */
1530 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1531 else
1532 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1533 }
1534
1535 return 0;
778} 1536}
779 1537
780/*****************************************************************************/ 1538/*****************************************************************************/
781 1539
782#define ALLOC(len) \ 1540#define ALLOC(len) \
792 req->result = -1; \ 1550 req->result = -1; \
793 break; \ 1551 break; \
794 } \ 1552 } \
795 } 1553 }
796 1554
797X_THREAD_PROC (eio_proc) 1555X_THREAD_PROC (etp_proc)
798{ 1556{
799 eio_req *req; 1557 ETP_REQ *req;
800 struct timespec ts; 1558 struct timespec ts;
801 worker *self = (worker *)thr_arg; 1559 etp_worker *self = (etp_worker *)thr_arg;
802 1560
803 /* try to distribute timeouts somewhat randomly */ 1561 /* try to distribute timeouts somewhat randomly */
804 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1562 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
805 1563
806 for (;;) 1564 for (;;)
807 { 1565 {
808 ts.tv_sec = time (0) + IDLE_TIMEOUT;
809
810 X_LOCK (reqlock); 1566 X_LOCK (reqlock);
811 1567
812 for (;;) 1568 for (;;)
813 { 1569 {
814 self->req = req = reqq_shift (&req_queue); 1570 self->req = req = reqq_shift (&req_queue);
816 if (req) 1572 if (req)
817 break; 1573 break;
818 1574
819 ++idle; 1575 ++idle;
820 1576
1577 ts.tv_sec = time (0) + idle_timeout;
821 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1578 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
822 { 1579 {
823 if (idle > max_idle) 1580 if (idle > max_idle)
824 { 1581 {
825 --idle; 1582 --idle;
830 goto quit; 1587 goto quit;
831 } 1588 }
832 1589
833 /* we are allowed to idle, so do so without any timeout */ 1590 /* we are allowed to idle, so do so without any timeout */
834 X_COND_WAIT (reqwait, reqlock); 1591 X_COND_WAIT (reqwait, reqlock);
835 ts.tv_sec = time (0) + IDLE_TIMEOUT;
836 } 1592 }
837 1593
838 --idle; 1594 --idle;
839 } 1595 }
840 1596
841 --nready; 1597 --nready;
842 1598
843 X_UNLOCK (reqlock); 1599 X_UNLOCK (reqlock);
844 1600
845 errno = 0; /* strictly unnecessary */ 1601 if (req->type < 0)
1602 goto quit;
846 1603
847 if (!EIO_CANCELLED (req)) 1604 if (!EIO_CANCELLED (req))
848 switch (req->type) 1605 ETP_EXECUTE (self, req);
849 {
850 case EIO_READ: ALLOC (req->size);
851 req->result = req->offs >= 0
852 ? pread (req->int1, req->ptr2, req->size, req->offs)
853 : read (req->int1, req->ptr2, req->size); break;
854 case EIO_WRITE: req->result = req->offs >= 0
855 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
856 : write (req->int1, req->ptr2, req->size); break;
857
858 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
859 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
860
861 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
862 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
863 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
864 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
865 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
866 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
867
868 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
869 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
870 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
871 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
872 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
873 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
874
875 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
876 case EIO_CLOSE: req->result = close (req->int1); break;
877 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
878 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
879 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
880 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
881 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
882 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
883 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
884 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
885
886 case EIO_READLINK: ALLOC (NAME_MAX);
887 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
888
889 case EIO_SYNC: req->result = 0; sync (); break;
890 case EIO_FSYNC: req->result = fsync (req->int1); break;
891 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
892
893 case EIO_READDIR: eio__scandir (req, self); break;
894
895 case EIO_BUSY:
896#ifdef _WIN32
897 Sleep (req->nv1 * 1000.);
898#else
899 {
900 struct timeval tv;
901
902 tv.tv_sec = req->nv1;
903 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
904
905 req->result = select (0, 0, 0, 0, &tv);
906 }
907#endif
908 break;
909
910 case EIO_UTIME:
911 case EIO_FUTIME:
912 {
913 struct timeval tv[2];
914 struct timeval *times;
915
916 if (req->nv1 != -1. || req->nv2 != -1.)
917 {
918 tv[0].tv_sec = req->nv1;
919 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
920 tv[1].tv_sec = req->nv2;
921 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
922
923 times = tv;
924 }
925 else
926 times = 0;
927
928
929 req->result = req->type == EIO_FUTIME
930 ? futimes (req->int1, times)
931 : utimes (req->ptr1, times);
932 }
933
934 case EIO_GROUP:
935 case EIO_NOP:
936 req->result = 0;
937 break;
938
939 case EIO_QUIT:
940 goto quit;
941
942 default:
943 req->result = -1;
944 break;
945 }
946
947 req->errorno = errno;
948 1606
949 X_LOCK (reslock); 1607 X_LOCK (reslock);
950 1608
951 ++npending; 1609 ++npending;
952 1610
953 if (!reqq_push (&res_queue, req) && want_poll_cb) 1611 if (!reqq_push (&res_queue, req) && want_poll_cb)
954 want_poll_cb (); 1612 want_poll_cb ();
955 1613
956 self->req = 0; 1614 self->req = 0;
957 worker_clear (self); 1615 etp_worker_clear (self);
958 1616
959 X_UNLOCK (reslock); 1617 X_UNLOCK (reslock);
960 } 1618 }
961 1619
962quit: 1620quit:
963 X_LOCK (wrklock); 1621 X_LOCK (wrklock);
964 worker_free (self); 1622 etp_worker_free (self);
965 X_UNLOCK (wrklock); 1623 X_UNLOCK (wrklock);
966 1624
967 return 0; 1625 return 0;
968} 1626}
969 1627
970/*****************************************************************************/ 1628/*****************************************************************************/
971 1629
972static void eio_atfork_prepare (void)
973{
974 X_LOCK (wrklock);
975 X_LOCK (reqlock);
976 X_LOCK (reslock);
977#if !HAVE_PREADWRITE
978 X_LOCK (preadwritelock);
979#endif
980#if !HAVE_READDIR_R
981 X_LOCK (readdirlock);
982#endif
983}
984
985static void eio_atfork_parent (void)
986{
987#if !HAVE_READDIR_R
988 X_UNLOCK (readdirlock);
989#endif
990#if !HAVE_PREADWRITE
991 X_UNLOCK (preadwritelock);
992#endif
993 X_UNLOCK (reslock);
994 X_UNLOCK (reqlock);
995 X_UNLOCK (wrklock);
996}
997
998static void eio_atfork_child (void)
999{
1000 eio_req *prv;
1001
1002 while (prv = reqq_shift (&req_queue))
1003 eio_destroy (prv);
1004
1005 while (prv = reqq_shift (&res_queue))
1006 eio_destroy (prv);
1007
1008 while (wrk_first.next != &wrk_first)
1009 {
1010 worker *wrk = wrk_first.next;
1011
1012 if (wrk->req)
1013 eio_destroy (wrk->req);
1014
1015 worker_clear (wrk);
1016 worker_free (wrk);
1017 }
1018
1019 started = 0;
1020 idle = 0;
1021 nreqs = 0;
1022 nready = 0;
1023 npending = 0;
1024
1025 eio_atfork_parent ();
1026}
1027
1028int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1630int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1029{ 1631{
1030 want_poll_cb = want_poll; 1632 return etp_init (want_poll, done_poll);
1031 done_poll_cb = done_poll;
1032
1033#ifdef _WIN32
1034 X_MUTEX_CHECK (wrklock);
1035 X_MUTEX_CHECK (reslock);
1036 X_MUTEX_CHECK (reqlock);
1037 X_MUTEX_CHECK (reqwait);
1038 X_MUTEX_CHECK (preadwritelock);
1039 X_MUTEX_CHECK (readdirlock);
1040
1041 X_COND_CHECK (reqwait);
1042#endif
1043
1044 X_THREAD_ATFORK (eio_atfork_prepare, eio_atfork_parent, eio_atfork_child);
1045} 1633}
1046 1634
1047static void eio_api_destroy (eio_req *req) 1635static void eio_api_destroy (eio_req *req)
1048{ 1636{
1049 free (req); 1637 free (req);
1071 { \ 1659 { \
1072 eio_api_destroy (req); \ 1660 eio_api_destroy (req); \
1073 return 0; \ 1661 return 0; \
1074 } 1662 }
1075 1663
1664static void eio_execute (etp_worker *self, eio_req *req)
1665{
1666 switch (req->type)
1667 {
1668 case EIO_READ: ALLOC (req->size);
1669 req->result = req->offs >= 0
1670 ? pread (req->int1, req->ptr2, req->size, req->offs)
1671 : read (req->int1, req->ptr2, req->size); break;
1672 case EIO_WRITE: req->result = req->offs >= 0
1673 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1674 : write (req->int1, req->ptr2, req->size); break;
1675
1676 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1677 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1678
1679 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1680 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1681 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1682 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1683 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1684 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1685
1686 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1687 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1688 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1689 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1690
1691 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1692 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1693 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1694 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1695 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1696 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1697
1698 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1699 case EIO_CLOSE: req->result = close (req->int1); break;
1700 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1701 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1702 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1703 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1704 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1705 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1706 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1707 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1708
1709 case EIO_READLINK: ALLOC (PATH_MAX);
1710 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1711
1712 case EIO_SYNC: req->result = 0; sync (); break;
1713 case EIO_FSYNC: req->result = fsync (req->int1); break;
1714 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1715 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1716 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1717 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1718 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1719 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1720
1721 case EIO_READDIR: eio__scandir (req, self); break;
1722
1723 case EIO_BUSY:
1724#ifdef _WIN32
1725 Sleep (req->nv1 * 1e3);
1726#else
1727 {
1728 struct timeval tv;
1729
1730 tv.tv_sec = req->nv1;
1731 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1732
1733 req->result = select (0, 0, 0, 0, &tv);
1734 }
1735#endif
1736 break;
1737
1738 case EIO_UTIME:
1739 case EIO_FUTIME:
1740 {
1741 struct timeval tv[2];
1742 struct timeval *times;
1743
1744 if (req->nv1 != -1. || req->nv2 != -1.)
1745 {
1746 tv[0].tv_sec = req->nv1;
1747 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1748 tv[1].tv_sec = req->nv2;
1749 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1750
1751 times = tv;
1752 }
1753 else
1754 times = 0;
1755
1756 req->result = req->type == EIO_FUTIME
1757 ? futimes (req->int1, times)
1758 : utimes (req->ptr1, times);
1759 }
1760 break;
1761
1762 case EIO_GROUP:
1763 abort (); /* handled in eio_request */
1764
1765 case EIO_NOP:
1766 req->result = 0;
1767 break;
1768
1769 case EIO_CUSTOM:
1770 ((void (*)(eio_req *))req->feed) (req);
1771 break;
1772
1773 default:
1774 errno = ENOSYS;
1775 req->result = -1;
1776 break;
1777 }
1778
1779 req->errorno = errno;
1780}
1781
1076#ifndef EIO_NO_WRAPPERS 1782#ifndef EIO_NO_WRAPPERS
1077 1783
1078eio_req *eio_nop (int pri, eio_cb cb, void *data) 1784eio_req *eio_nop (int pri, eio_cb cb, void *data)
1079{ 1785{
1080 REQ (EIO_NOP); SEND; 1786 REQ (EIO_NOP); SEND;
1093eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data) 1799eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1094{ 1800{
1095 REQ (EIO_FSYNC); req->int1 = fd; SEND; 1801 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1096} 1802}
1097 1803
1804eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1805{
1806 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1807}
1808
1809eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1810{
1811 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1812}
1813
1814eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1815{
1816 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1817}
1818
1819eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1820{
1821 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1822}
1823
1824eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1825{
1826 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1827}
1828
1098eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 1829eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1099{ 1830{
1100 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 1831 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1101} 1832}
1102 1833
1121} 1852}
1122 1853
1123eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1854eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1124{ 1855{
1125 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1856 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1857}
1858
1859eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1860{
1861 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1126} 1862}
1127 1863
1128eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1864eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1129{ 1865{
1130 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1866 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1204eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1940eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1205{ 1941{
1206 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1942 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1207} 1943}
1208 1944
1945eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1946{
1947 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1948}
1949
1209eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1950eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1210{ 1951{
1211 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1952 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1212} 1953}
1213 1954
1214eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 1955eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1215{ 1956{
1216 return eio__1path (EIO_RMDIR, path, pri, cb, data); 1957 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1217} 1958}
1218 1959
1219eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 1960eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1220{ 1961{
1221 return eio__1path (EIO_READDIR, path, pri, cb, data); 1962 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1222} 1963}
1223 1964
1224eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1965eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1225{ 1966{
1226 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 1967 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1227} 1968}
1228 1969
1229static eio_req * 1970static eio_req *
1230eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1971eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1231{ 1972{
1255eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1996eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1256{ 1997{
1257 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1998 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1258} 1999}
1259 2000
2001eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
2002{
2003 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND;
2004}
2005
1260#endif 2006#endif
1261 2007
1262eio_req *eio_grp (eio_cb cb, void *data) 2008eio_req *eio_grp (eio_cb cb, void *data)
1263{ 2009{
1264 const int pri = EIO_PRI_MAX; 2010 const int pri = EIO_PRI_MAX;
1290 2036
1291void eio_grp_add (eio_req *grp, eio_req *req) 2037void eio_grp_add (eio_req *grp, eio_req *req)
1292{ 2038{
1293 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2039 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1294 2040
2041 grp->flags |= EIO_FLAG_GROUPADD;
2042
1295 ++grp->size; 2043 ++grp->size;
1296 req->grp = grp; 2044 req->grp = grp;
1297 2045
1298 req->grp_prev = 0; 2046 req->grp_prev = 0;
1299 req->grp_next = grp->grp_first; 2047 req->grp_next = grp->grp_first;
1307/*****************************************************************************/ 2055/*****************************************************************************/
1308/* misc garbage */ 2056/* misc garbage */
1309 2057
1310ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2058ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1311{ 2059{
1312 worker wrk; 2060 etp_worker wrk;
2061 ssize_t ret;
1313 2062
1314 wrk.dbuf = 0; 2063 wrk.dbuf = 0;
1315 2064
1316 eio__sendfile (ofd, ifd, offset, count, &wrk); 2065 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1317 2066
1318 if (wrk.dbuf) 2067 if (wrk.dbuf)
1319 free (wrk.dbuf); 2068 free (wrk.dbuf);
1320}
1321 2069
2070 return ret;
2071}
2072

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines