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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines