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.62 by root, Tue Feb 15 03:15:16 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 (etplock); \ 152 ETP_WORKER_LOCK (self); \
76 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 153 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \
77 X_UNLOCK (etplock); \ 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
84/*****************************************************************************/ 161/*****************************************************************************/
85 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
86/* calculcate time difference in ~1/EIO_TICKS of a second */ 207/* calculate time difference in ~1/EIO_TICKS of a second */
87static int tvdiff (struct timeval *tv1, struct timeval *tv2) 208static int tvdiff (struct timeval *tv1, struct timeval *tv2)
88{ 209{
89 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 210 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
90 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 211 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
91} 212}
92 213
93static unsigned int started, idle, wanted = 4; 214static unsigned int started, idle, wanted = 4;
94 215
95typedef struct etp_pool
96{
97 void (*want_poll_cb) (void); 216static void (*want_poll_cb) (void);
98 void (*done_poll_cb) (void); 217static void (*done_poll_cb) (void);
99 218
100 unsigned int max_poll_time; 219static unsigned int max_poll_time; /* reslock */
101 unsigned int max_poll_reqs; 220static unsigned int max_poll_reqs; /* reslock */
102} etp_pool;
103 221
104static volatile unsigned int nreqs, nready, npending; 222static volatile unsigned int nreqs; /* reqlock */
105static volatile unsigned int max_idle = 4; 223static volatile unsigned int nready; /* reqlock */
224static volatile unsigned int npending; /* reqlock */
225static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
226static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
106 227
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 */
107static mutex_t etplock = X_MUTEX_INIT; 239static xmutex_t preadwritelock = X_MUTEX_INIT;
108static mutex_t reslock = X_MUTEX_INIT; 240#endif
109static mutex_t reqlock = X_MUTEX_INIT;
110static cond_t reqwait = X_COND_INIT;
111 241
112typedef struct worker 242typedef struct etp_worker
113{ 243{
114 /* locked by etplock */ 244 /* locked by wrklock */
115 struct worker *prev, *next; 245 struct etp_worker *prev, *next;
116 246
117 thread_t tid; 247 xthread_t tid;
118 248
119 /* locked by reslock, reqlock or etplock */ 249 /* locked by reslock, reqlock or wrklock */
120 eio_req *req; /* currently processed request */ 250 ETP_REQ *req; /* currently processed request */
121 void *dbuf; 251
122 DIR *dirp; 252 ETP_WORKER_COMMON
123} worker; 253} etp_worker;
124 254
125static worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 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)
126 259
127/* worker threads management */ 260/* worker threads management */
128 261
129static void worker_clear (worker *wrk) 262static void etp_worker_clear (etp_worker *wrk)
130{ 263{
131 if (wrk->dirp) 264 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} 265}
143 266
144static void worker_free (worker *wrk) 267static void etp_worker_free (etp_worker *wrk)
145{ 268{
146 wrk->next->prev = wrk->prev; 269 wrk->next->prev = wrk->prev;
147 wrk->prev->next = wrk->next; 270 wrk->prev->next = wrk->next;
148 271
149 free (wrk); 272 free (wrk);
150} 273}
151 274
152unsigned int eio_nreqs (void) 275static unsigned int etp_nreqs (void)
153{ 276{
277 int retval;
278 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
279 retval = nreqs;
280 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
154 return nreqs; 281 return retval;
155} 282}
156 283
157unsigned int eio_nready (void) 284static unsigned int etp_nready (void)
158{ 285{
159 unsigned int retval; 286 unsigned int retval;
160 287
161 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 288 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
162 retval = nready; 289 retval = nready;
163 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 290 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
164 291
165 return retval; 292 return retval;
166} 293}
167 294
168unsigned int eio_npending (void) 295static unsigned int etp_npending (void)
169{ 296{
170 unsigned int retval; 297 unsigned int retval;
171 298
172 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 299 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
173 retval = npending; 300 retval = npending;
174 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 301 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
175 302
176 return retval; 303 return retval;
177} 304}
178 305
179unsigned int eio_nthreads (void) 306static unsigned int etp_nthreads (void)
180{ 307{
181 unsigned int retval; 308 unsigned int retval;
182 309
183 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 310 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
184 retval = started; 311 retval = started;
191 * a somewhat faster data structure might be nice, but 318 * a somewhat faster data structure might be nice, but
192 * with 8 priorities this actually needs <20 insns 319 * with 8 priorities this actually needs <20 insns
193 * per shift, the most expensive operation. 320 * per shift, the most expensive operation.
194 */ 321 */
195typedef struct { 322typedef struct {
196 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 */
197 int size; 324 int size;
198} reqq; 325} etp_reqq;
199 326
200static reqq req_queue; 327static etp_reqq req_queue;
201static reqq res_queue; 328static etp_reqq res_queue;
202 329
203static int reqq_push (reqq *q, eio_req *req) 330static int reqq_push (etp_reqq *q, ETP_REQ *req)
204{ 331{
205 int pri = req->pri; 332 int pri = req->pri;
206 req->next = 0; 333 req->next = 0;
207 334
208 if (q->qe[pri]) 335 if (q->qe[pri])
214 q->qe[pri] = q->qs[pri] = req; 341 q->qe[pri] = q->qs[pri] = req;
215 342
216 return q->size++; 343 return q->size++;
217} 344}
218 345
219static eio_req *reqq_shift (reqq *q) 346static ETP_REQ *reqq_shift (etp_reqq *q)
220{ 347{
221 int pri; 348 int pri;
222 349
223 if (!q->size) 350 if (!q->size)
224 return 0; 351 return 0;
225 352
226 --q->size; 353 --q->size;
227 354
228 for (pri = EIO_NUM_PRI; pri--; ) 355 for (pri = ETP_NUM_PRI; pri--; )
229 { 356 {
230 eio_req *req = q->qs[pri]; 357 eio_req *req = q->qs[pri];
231 358
232 if (req) 359 if (req)
233 { 360 {
239 } 366 }
240 367
241 abort (); 368 abort ();
242} 369}
243 370
371static void etp_thread_init (void)
372{
373 X_MUTEX_CREATE (wrklock);
374 X_MUTEX_CREATE (reslock);
375 X_MUTEX_CREATE (reqlock);
376 X_COND_CREATE (reqwait);
377}
378
244static void etp_atfork_prepare (void) 379static void etp_atfork_prepare (void)
245{ 380{
246 X_LOCK (etplock); 381 X_LOCK (wrklock);
247 X_LOCK (reqlock); 382 X_LOCK (reqlock);
248 X_LOCK (reslock); 383 X_LOCK (reslock);
249#if !HAVE_PREADWRITE 384#if !HAVE_PREADWRITE
250 X_LOCK (preadwritelock); 385 X_LOCK (preadwritelock);
251#endif 386#endif
252#if !HAVE_READDIR_R
253 X_LOCK (readdirlock);
254#endif
255} 387}
256 388
257static void etp_atfork_parent (void) 389static void etp_atfork_parent (void)
258{ 390{
259#if !HAVE_READDIR_R
260 X_UNLOCK (readdirlock);
261#endif
262#if !HAVE_PREADWRITE 391#if !HAVE_PREADWRITE
263 X_UNLOCK (preadwritelock); 392 X_UNLOCK (preadwritelock);
264#endif 393#endif
265 X_UNLOCK (reslock); 394 X_UNLOCK (reslock);
266 X_UNLOCK (reqlock); 395 X_UNLOCK (reqlock);
267 X_UNLOCK (etplock); 396 X_UNLOCK (wrklock);
268} 397}
269 398
270static void etp_atfork_child (void) 399static void etp_atfork_child (void)
271{ 400{
272 eio_req *prv; 401 ETP_REQ *prv;
273 402
274 while (prv = reqq_shift (&req_queue)) 403 while ((prv = reqq_shift (&req_queue)))
275 eio_destroy (prv); 404 ETP_DESTROY (prv);
276 405
277 while (prv = reqq_shift (&res_queue)) 406 while ((prv = reqq_shift (&res_queue)))
278 eio_destroy (prv); 407 ETP_DESTROY (prv);
279 408
280 while (wrk_first.next != &wrk_first) 409 while (wrk_first.next != &wrk_first)
281 { 410 {
282 worker *wrk = wrk_first.next; 411 etp_worker *wrk = wrk_first.next;
283 412
284 if (wrk->req) 413 if (wrk->req)
285 eio_destroy (wrk->req); 414 ETP_DESTROY (wrk->req);
286 415
287 worker_clear (wrk); 416 etp_worker_clear (wrk);
288 worker_free (wrk); 417 etp_worker_free (wrk);
289 } 418 }
290 419
291 started = 0; 420 started = 0;
292 idle = 0; 421 idle = 0;
293 nreqs = 0; 422 nreqs = 0;
294 nready = 0; 423 nready = 0;
295 npending = 0; 424 npending = 0;
296 425
297 etp_atfork_parent (); 426 etp_thread_init ();
298} 427}
299 428
300static void 429static void
301etp_once_init (void) 430etp_once_init (void)
302{ 431{
432 etp_thread_init ();
303 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 433 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
304} 434}
305 435
306static int 436static int
307etp_init (etp_pool *etp, void (*want_poll)(void), void (*done_poll)(void)) 437etp_init (void (*want_poll)(void), void (*done_poll)(void))
308{ 438{
309 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 439 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
310 440
311 pthread_once (&doinit, etp_once_init); 441 pthread_once (&doinit, etp_once_init);
312 442
313 memset (etp, 0, sizeof *etp);
314
315 etp->want_poll_cb = want_poll; 443 want_poll_cb = want_poll;
316 etp->done_poll_cb = done_poll; 444 done_poll_cb = done_poll;
317}
318 445
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; 446 return 0;
354} 447}
355 448
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); 449X_THREAD_PROC (etp_proc);
407 450
408static void start_thread (void) 451static void etp_start_thread (void)
409{ 452{
410 worker *wrk = calloc (1, sizeof (worker)); 453 etp_worker *wrk = calloc (1, sizeof (etp_worker));
411 454
412 /*TODO*/ 455 /*TODO*/
413 assert (("unable to allocate worker thread data", wrk)); 456 assert (("unable to allocate worker thread data", wrk));
414 457
415 X_LOCK (etplock); 458 X_LOCK (wrklock);
416 459
417 if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) 460 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
418 { 461 {
419 wrk->prev = &wrk_first; 462 wrk->prev = &wrk_first;
420 wrk->next = wrk_first.next; 463 wrk->next = wrk_first.next;
421 wrk_first.next->prev = wrk; 464 wrk_first.next->prev = wrk;
422 wrk_first.next = wrk; 465 wrk_first.next = wrk;
423 ++started; 466 ++started;
424 } 467 }
425 else 468 else
426 free (wrk); 469 free (wrk);
427 470
428 X_UNLOCK (etplock); 471 X_UNLOCK (wrklock);
429} 472}
430 473
431static void maybe_start_thread (void) 474static void etp_maybe_start_thread (void)
432{ 475{
433 if (eio_nthreads () >= wanted) 476 if (expect_true (etp_nthreads () >= wanted))
434 return; 477 return;
435 478
436 /* todo: maybe use idle here, but might be less exact */ 479 /* todo: maybe use idle here, but might be less exact */
437 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 ()))
438 return; 481 return;
439 482
440 start_thread (); 483 etp_start_thread ();
441} 484}
442 485
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) 486static void etp_end_thread (void)
462{ 487{
463 eio_req *req = calloc (1, sizeof (eio_req)); 488 eio_req *req = calloc (1, sizeof (eio_req));
464 489
465 req->type = EIO_QUIT; 490 req->type = -1;
466 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 491 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
467 492
468 X_LOCK (reqlock); 493 X_LOCK (reqlock);
469 reqq_push (&req_queue, req); 494 reqq_push (&req_queue, req);
470 X_COND_SIGNAL (reqwait); 495 X_COND_SIGNAL (reqwait);
471 X_UNLOCK (reqlock); 496 X_UNLOCK (reqlock);
472 497
473 X_LOCK (etplock); 498 X_LOCK (wrklock);
474 --started; 499 --started;
475 X_UNLOCK (etplock); 500 X_UNLOCK (wrklock);
476} 501}
477 502
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) 503static int etp_poll (void)
515{ 504{
516 int maxreqs = etp.max_poll_reqs; 505 unsigned int maxreqs;
506 unsigned int maxtime;
517 struct timeval tv_start, tv_now; 507 struct timeval tv_start, tv_now;
518 eio_req *req;
519 508
520 if (etp.max_poll_time) 509 X_LOCK (reslock);
510 maxreqs = max_poll_reqs;
511 maxtime = max_poll_time;
512 X_UNLOCK (reslock);
513
514 if (maxtime)
521 gettimeofday (&tv_start, 0); 515 gettimeofday (&tv_start, 0);
522 516
523 for (;;) 517 for (;;)
524 { 518 {
519 ETP_REQ *req;
520
525 maybe_start_thread (); 521 etp_maybe_start_thread ();
526 522
527 X_LOCK (reslock); 523 X_LOCK (reslock);
528 req = reqq_shift (&res_queue); 524 req = reqq_shift (&res_queue);
529 525
530 if (req) 526 if (req)
531 { 527 {
532 --npending; 528 --npending;
533 529
534 if (!res_queue.size && etp.done_poll_cb) 530 if (!res_queue.size && done_poll_cb)
535 etp.done_poll_cb (); 531 done_poll_cb ();
536 } 532 }
537 533
538 X_UNLOCK (reslock); 534 X_UNLOCK (reslock);
539 535
540 if (!req) 536 if (!req)
541 return 0; 537 return 0;
542 538
539 X_LOCK (reqlock);
543 --nreqs; 540 --nreqs;
541 X_UNLOCK (reqlock);
544 542
545 if (req->type == EIO_GROUP && req->size) 543 if (expect_false (req->type == EIO_GROUP && req->size))
546 { 544 {
547 req->int1 = 1; /* mark request as delayed */ 545 req->int1 = 1; /* mark request as delayed */
548 continue; 546 continue;
549 } 547 }
550 else 548 else
551 { 549 {
552 int res = eio_finish (req); 550 int res = ETP_FINISH (req);
553 if (res) 551 if (expect_false (res))
554 return res; 552 return res;
555 } 553 }
556 554
557 if (maxreqs && !--maxreqs) 555 if (expect_false (maxreqs && !--maxreqs))
558 break; 556 break;
559 557
560 if (etp.max_poll_time) 558 if (maxtime)
561 { 559 {
562 gettimeofday (&tv_now, 0); 560 gettimeofday (&tv_now, 0);
563 561
564 if (tvdiff (&tv_start, &tv_now) >= etp.max_poll_time) 562 if (tvdiff (&tv_start, &tv_now) >= maxtime)
565 break; 563 break;
566 } 564 }
567 } 565 }
568 566
569 errno = EAGAIN; 567 errno = EAGAIN;
570 return -1; 568 return -1;
571} 569}
572 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
573/*****************************************************************************/ 798/*****************************************************************************/
574/* work around various missing functions */ 799/* work around various missing functions */
575 800
576#if !HAVE_PREADWRITE 801#if !HAVE_PREADWRITE
802# undef pread
803# undef pwrite
577# define pread eio__pread 804# define pread eio__pread
578# define pwrite eio__pwrite 805# 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 806
587static ssize_t 807static ssize_t
588eio__pread (int fd, void *buf, size_t count, off_t offset) 808eio__pread (int fd, void *buf, size_t count, off_t offset)
589{ 809{
590 ssize_t res; 810 ssize_t res;
608 828
609 X_LOCK (preadwritelock); 829 X_LOCK (preadwritelock);
610 ooffset = lseek (fd, 0, SEEK_CUR); 830 ooffset = lseek (fd, 0, SEEK_CUR);
611 lseek (fd, offset, SEEK_SET); 831 lseek (fd, offset, SEEK_SET);
612 res = write (fd, buf, count); 832 res = write (fd, buf, count);
613 lseek (fd, offset, SEEK_SET); 833 lseek (fd, ooffset, SEEK_SET);
614 X_UNLOCK (preadwritelock); 834 X_UNLOCK (preadwritelock);
615 835
616 return res; 836 return res;
617} 837}
618#endif 838#endif
619 839
620#ifndef HAVE_FUTIMES 840#ifndef HAVE_UTIMES
621 841
842# undef utimes
622# define utimes(path,times) eio__utimes (path, times) 843# define utimes(path,times) eio__utimes (path, times)
623# define futimes(fd,times) eio__futimes (fd, times)
624 844
625static int 845static int
626eio__utimes (const char *filename, const struct timeval times[2]) 846eio__utimes (const char *filename, const struct timeval times[2])
627{ 847{
628 if (times) 848 if (times)
636 } 856 }
637 else 857 else
638 return utime (filename, 0); 858 return utime (filename, 0);
639} 859}
640 860
861#endif
862
863#ifndef HAVE_FUTIMES
864
865# undef futimes
866# define futimes(fd,times) eio__futimes (fd, times)
867
641static int eio__futimes (int fd, const struct timeval tv[2]) 868static int eio__futimes (int fd, const struct timeval tv[2])
642{ 869{
643 errno = ENOSYS; 870 errno = ENOSYS;
644 return -1; 871 return -1;
645} 872}
646 873
647#endif 874#endif
648 875
649#if !HAVE_FDATASYNC 876#if !HAVE_FDATASYNC
877# undef fdatasync
650# define fdatasync fsync 878# define fdatasync(fd) fsync (fd)
651#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}
652 908
653#if !HAVE_READAHEAD 909#if !HAVE_READAHEAD
910# undef readahead
654# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 911# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
655 912
656static ssize_t 913static ssize_t
657eio__readahead (int fd, off_t offset, size_t count, worker *self) 914eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
658{ 915{
659 size_t todo = count; 916 size_t todo = count;
660 dBUF; 917 dBUF;
661 918
662 while (todo > 0) 919 while (todo > 0)
672 return count; 929 return count;
673} 930}
674 931
675#endif 932#endif
676 933
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 */ 934/* sendfile always needs emulation */
709static ssize_t 935static ssize_t
710eio__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)
711{ 937{
712 ssize_t res; 938 ssize_t res;
713 939
714 if (!count) 940 if (!count)
715 return 0; 941 return 0;
716 942
717#if HAVE_SENDFILE 943#if HAVE_SENDFILE
718# if __linux 944# if __linux
719 res = sendfile (ofd, ifd, &offset, count); 945 res = sendfile (ofd, ifd, &offset, count);
720 946
721# elif __freebsd 947# elif __FreeBSD__
722 /* 948 /*
723 * 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
724 * wasted on making it similar to other I/O functions. 950 * wasted on making it similar to other I/O functions.
725 */ 951 */
726 { 952 {
727 off_t sbytes; 953 off_t sbytes;
728 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 954 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
729 955
730 if (res < 0 && sbytes) 956 #if 0 /* according to the manpage, this is correct, but broken behaviour */
731 /* 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)
732 res = sbytes; 977 res = sbytes;
733 } 978 }
734 979
735# elif __hpux 980# elif __hpux
736 res = sendfile (ofd, ifd, offset, count, 0, 0); 981 res = sendfile (ofd, ifd, offset, count, 0, 0);
750 if (res < 0 && sbytes) 995 if (res < 0 && sbytes)
751 res = sbytes; 996 res = sbytes;
752 } 997 }
753 998
754# 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
755#else 1010#else
756 res = -1; 1011 res = -1;
757 errno = ENOSYS; 1012 errno = ENOSYS;
758#endif 1013#endif
759 1014
760 if (res < 0 1015 if (res < 0
761 && (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 */
762#if __solaris 1022#if __solaris
763 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1023 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
764#endif 1024#endif
765 ) 1025 )
766 ) 1026 )
797 } 1057 }
798 1058
799 return res; 1059 return res;
800} 1060}
801 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 : a->inode > b->inode ? 1 : 0;
1067}
1068
1069#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1070
1071#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1072#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1073
1074static void
1075eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1076{
1077 unsigned char bits [9 + sizeof (ino_t) * 8];
1078 unsigned char *bit = bits;
1079
1080 assert (CHAR_BIT == 8);
1081 assert (sizeof (eio_dirent) * 8 < 256);
1082 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
1083 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
1084
1085 if (size <= EIO_SORT_FAST)
1086 return;
1087
1088 /* first prepare an array of bits to test in our radix sort */
1089 /* try to take endianness into account, as well as differences in ino_t sizes */
1090 /* inode_bits must contain all inodes ORed together */
1091 /* which is used to skip bits that are 0 everywhere, which is very common */
1092 {
1093 ino_t endianness;
1094 int i, j;
1095
1096 /* we store the byte offset of byte n into byte n of "endianness" */
1097 for (i = 0; i < sizeof (ino_t); ++i)
1098 ((unsigned char *)&endianness)[i] = i;
1099
1100 *bit++ = 0;
1101
1102 for (i = 0; i < sizeof (ino_t); ++i)
1103 {
1104 /* shifting off the byte offsets out of "endianness" */
1105 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1106 endianness >>= 8;
1107
1108 for (j = 0; j < 8; ++j)
1109 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1110 *bit++ = offs + j;
1111 }
1112
1113 for (j = 0; j < 8; ++j)
1114 if (score_bits & (1 << j))
1115 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1116 }
1117
1118 /* now actually do the sorting (a variant of MSD radix sort) */
1119 {
1120 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1121 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1122 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1123 int stk_idx = 0;
1124
1125 base_stk [stk_idx] = dents;
1126 end_stk [stk_idx] = dents + size;
1127 bit_stk [stk_idx] = bit - 1;
1128
1129 do
1130 {
1131 base = base_stk [stk_idx];
1132 end = end_stk [stk_idx];
1133 bit = bit_stk [stk_idx];
1134
1135 for (;;)
1136 {
1137 unsigned char O = *bit >> 3;
1138 unsigned char M = 1 << (*bit & 7);
1139
1140 eio_dirent *a = base;
1141 eio_dirent *b = end;
1142
1143 if (b - a < EIO_SORT_CUTOFF)
1144 break;
1145
1146 /* now bit-partition the array on the bit */
1147 /* this ugly asymmetric loop seems to perform much better than typical */
1148 /* partition algos found in the literature */
1149 do
1150 if (!(((unsigned char *)a)[O] & M))
1151 ++a;
1152 else if (!(((unsigned char *)--b)[O] & M))
1153 {
1154 eio_dirent tmp = *a; *a = *b; *b = tmp;
1155 ++a;
1156 }
1157 while (b > a);
1158
1159 /* next bit, or stop, if no bits left in this path */
1160 if (!*--bit)
1161 break;
1162
1163 base_stk [stk_idx] = a;
1164 end_stk [stk_idx] = end;
1165 bit_stk [stk_idx] = bit;
1166 ++stk_idx;
1167
1168 end = a;
1169 }
1170 }
1171 while (stk_idx--);
1172 }
1173}
1174
1175static void
1176eio_dent_insertion_sort (eio_dirent *dents, int size)
1177{
1178 /* first move the smallest element to the front, to act as a sentinel */
1179 {
1180 int i;
1181 eio_dirent *min = dents;
1182
1183 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1184 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1185 if (EIO_DENT_CMP (dents [i], <, *min))
1186 min = &dents [i];
1187
1188 /* swap elements 0 and j (minimum) */
1189 {
1190 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1191 }
1192 }
1193
1194 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1195 {
1196 eio_dirent *i, *j;
1197
1198 for (i = dents + 1; i < dents + size; ++i)
1199 {
1200 eio_dirent value = *i;
1201
1202 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1203 j [1] = j [0];
1204
1205 j [1] = value;
1206 }
1207 }
1208}
1209
1210static void
1211eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1212{
1213 if (size <= 1)
1214 return; /* our insertion sort relies on size > 0 */
1215
1216 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1217 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1218 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1219
1220 /* use an insertion sort at the end, or for small arrays, */
1221 /* as insertion sort is more efficient for small partitions */
1222 eio_dent_insertion_sort (dents, size);
1223}
1224
802/* read a full directory */ 1225/* read a full directory */
803static void 1226static void
804eio__scandir (eio_req *req, worker *self) 1227eio__scandir (eio_req *req, etp_worker *self)
805{ 1228{
806 DIR *dirp; 1229 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; 1230 EIO_STRUCT_DIRENT *entp;
813 char *name, *names; 1231 char *name, *names;
814 int memlen = 4096; 1232 int namesalloc = 4096;
815 int memofs = 0; 1233 int namesoffs = 0;
1234 int flags = req->int1;
1235 eio_dirent *dents = 0;
1236 int dentalloc = 128;
816 int res = 0; 1237 int dentoffs = 0;
1238 ino_t inode_bits = 0;
817 1239
1240 req->result = -1;
1241
1242 if (!(flags & EIO_READDIR_DENTS))
1243 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1244
818 X_LOCK (etplock); 1245 X_LOCK (wrklock);
1246 /* the corresponding closedir is in ETP_WORKER_CLEAR */
819 self->dirp = dirp = opendir (req->ptr1); 1247 self->dirp = dirp = opendir (req->ptr1);
820 self->dbuf = u = malloc (sizeof (*u));
821 req->flags |= EIO_FLAG_PTR2_FREE; 1248 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1249 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
822 req->ptr2 = names = malloc (memlen); 1250 req->ptr2 = names = malloc (namesalloc);
823 X_UNLOCK (etplock); 1251 X_UNLOCK (wrklock);
824 1252
825 if (dirp && u && names) 1253 if (dirp && names && (!flags || dents))
826 for (;;) 1254 for (;;)
827 { 1255 {
828 errno = 0; 1256 errno = 0;
829 readdir_r (dirp, &u->d, &entp); 1257 entp = readdir (dirp);
830 1258
831 if (!entp) 1259 if (!entp)
1260 {
1261 if (errno)
1262 break;
1263
1264 /* sort etc. */
1265 req->int1 = flags;
1266 req->result = dentoffs;
1267
1268 if (flags & EIO_READDIR_STAT_ORDER)
1269 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
1270 else if (flags & EIO_READDIR_DIRS_FIRST)
1271 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1272 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1273 else
1274 {
1275 /* in this case, all is known, and we just put dirs first and sort them */
1276 eio_dirent *oth = dents + dentoffs;
1277 eio_dirent *dir = dents;
1278
1279 /* now partition dirs to the front, and non-dirs to the back */
1280 /* by walking from both sides and swapping if necessary */
1281 /* also clear score, so it doesn't influence sorting */
1282 while (oth > dir)
1283 {
1284 if (dir->type == EIO_DT_DIR)
1285 ++dir;
1286 else if ((--oth)->type == EIO_DT_DIR)
1287 {
1288 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1289
1290 ++dir;
1291 }
1292 }
1293
1294 /* now sort the dirs only */
1295 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1296 }
1297
832 break; 1298 break;
1299 }
833 1300
1301 /* now add the entry to our list(s) */
834 name = entp->d_name; 1302 name = entp->d_name;
835 1303
1304 /* skip . and .. entries */
836 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1305 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
837 { 1306 {
838 int len = strlen (name) + 1; 1307 int len = D_NAMLEN (entp) + 1;
839 1308
840 res++; 1309 while (expect_false (namesoffs + len > namesalloc))
841
842 while (memofs + len > memlen)
843 { 1310 {
844 memlen *= 2; 1311 namesalloc *= 2;
845 X_LOCK (etplock); 1312 X_LOCK (wrklock);
846 req->ptr2 = names = realloc (names, memlen); 1313 req->ptr2 = names = realloc (names, namesalloc);
847 X_UNLOCK (etplock); 1314 X_UNLOCK (wrklock);
848 1315
849 if (!names) 1316 if (!names)
850 break; 1317 break;
851 } 1318 }
852 1319
853 memcpy (names + memofs, name, len); 1320 memcpy (names + namesoffs, name, len);
1321
1322 if (dents)
1323 {
1324 struct eio_dirent *ent;
1325
1326 if (expect_false (dentoffs == dentalloc))
1327 {
1328 dentalloc *= 2;
1329 X_LOCK (wrklock);
1330 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1331 X_UNLOCK (wrklock);
1332
1333 if (!dents)
1334 break;
1335 }
1336
1337 ent = dents + dentoffs;
1338
1339 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1340 ent->namelen = len - 1;
1341 ent->inode = D_INO (entp);
1342
1343 inode_bits |= ent->inode;
1344
1345 switch (D_TYPE (entp))
1346 {
1347 default:
1348 ent->type = EIO_DT_UNKNOWN;
1349 flags |= EIO_READDIR_FOUND_UNKNOWN;
1350 break;
1351
1352 #ifdef DT_FIFO
1353 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1354 #endif
1355 #ifdef DT_CHR
1356 case DT_CHR: ent->type = EIO_DT_CHR; break;
1357 #endif
1358 #ifdef DT_MPC
1359 case DT_MPC: ent->type = EIO_DT_MPC; break;
1360 #endif
1361 #ifdef DT_DIR
1362 case DT_DIR: ent->type = EIO_DT_DIR; break;
1363 #endif
1364 #ifdef DT_NAM
1365 case DT_NAM: ent->type = EIO_DT_NAM; break;
1366 #endif
1367 #ifdef DT_BLK
1368 case DT_BLK: ent->type = EIO_DT_BLK; break;
1369 #endif
1370 #ifdef DT_MPB
1371 case DT_MPB: ent->type = EIO_DT_MPB; break;
1372 #endif
1373 #ifdef DT_REG
1374 case DT_REG: ent->type = EIO_DT_REG; break;
1375 #endif
1376 #ifdef DT_NWK
1377 case DT_NWK: ent->type = EIO_DT_NWK; break;
1378 #endif
1379 #ifdef DT_CMP
1380 case DT_CMP: ent->type = EIO_DT_CMP; break;
1381 #endif
1382 #ifdef DT_LNK
1383 case DT_LNK: ent->type = EIO_DT_LNK; break;
1384 #endif
1385 #ifdef DT_SOCK
1386 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1387 #endif
1388 #ifdef DT_DOOR
1389 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1390 #endif
1391 #ifdef DT_WHT
1392 case DT_WHT: ent->type = EIO_DT_WHT; break;
1393 #endif
1394 }
1395
1396 ent->score = 7;
1397
1398 if (flags & EIO_READDIR_DIRS_FIRST)
1399 {
1400 if (ent->type == EIO_DT_UNKNOWN)
1401 {
1402 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1403 ent->score = 1;
1404 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1405 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1406 }
1407 else if (ent->type == EIO_DT_DIR)
1408 ent->score = 0;
1409 }
1410 }
1411
854 memofs += len; 1412 namesoffs += len;
1413 ++dentoffs;
1414 }
1415
1416 if (EIO_CANCELLED (req))
1417 {
1418 errno = ECANCELED;
1419 break;
855 } 1420 }
856 } 1421 }
1422}
857 1423
858 if (errno) 1424#ifdef PAGESIZE
859 res = -1; 1425# define eio_pagesize() PAGESIZE
1426#else
1427static intptr_t
1428eio_pagesize (void)
1429{
1430 static intptr_t page;
1431
1432 if (!page)
1433 page = sysconf (_SC_PAGESIZE);
1434
1435 return page;
1436}
1437#endif
1438
1439static void
1440eio_page_align (void **addr, size_t *length)
1441{
1442 intptr_t mask = eio_pagesize () - 1;
1443
1444 /* round down addr */
1445 intptr_t adj = mask & (intptr_t)*addr;
1446
1447 *addr = (void *)((intptr_t)*addr - adj);
1448 *length += adj;
1449
1450 /* round up length */
1451 *length = (*length + mask) & ~mask;
1452}
1453
1454#if !_POSIX_MEMLOCK
1455# define eio__mlockall(a) ((errno = ENOSYS), -1)
1456#else
1457
1458static int
1459eio__mlockall (int flags)
1460{
1461 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1462 extern int mallopt (int, int);
1463 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1464 #endif
1465
1466 if (EIO_MCL_CURRENT != MCL_CURRENT
1467 || EIO_MCL_FUTURE != MCL_FUTURE)
1468 {
1469 flags = 0
1470 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1471 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1472 }
1473
1474 return mlockall (flags);
1475}
1476#endif
1477
1478#if !_POSIX_MEMLOCK_RANGE
1479# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1480#else
1481
1482static int
1483eio__mlock (void *addr, size_t length)
1484{
1485 eio_page_align (&addr, &length);
1486
1487 return mlock (addr, length);
1488}
1489
1490#endif
1491
1492#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1493# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1494#else
1495
1496int
1497eio__msync (void *mem, size_t len, int flags)
1498{
1499 eio_page_align (&mem, &len);
1500
1501 if (EIO_MS_ASYNC != MS_SYNC
1502 || EIO_MS_INVALIDATE != MS_INVALIDATE
1503 || EIO_MS_SYNC != MS_SYNC)
1504 {
1505 flags = 0
1506 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1507 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1508 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1509 }
1510
1511 return msync (mem, len, flags);
1512}
1513
1514#endif
1515
1516int
1517eio__mtouch (void *mem, size_t len, int flags)
1518{
1519 eio_page_align (&mem, &len);
1520
860 1521 {
861 req->result = res; 1522 intptr_t addr = (intptr_t)mem;
1523 intptr_t end = addr + len;
1524 intptr_t page = eio_pagesize ();
1525
1526 if (addr < end)
1527 if (flags & EIO_MT_MODIFY) /* modify */
1528 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1529 else
1530 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1531 }
1532
1533 return 0;
862} 1534}
863 1535
864/*****************************************************************************/ 1536/*****************************************************************************/
865 1537
866#define ALLOC(len) \ 1538#define ALLOC(len) \
867 if (!req->ptr2) \ 1539 if (!req->ptr2) \
868 { \ 1540 { \
869 X_LOCK (etplock); \ 1541 X_LOCK (wrklock); \
870 req->flags |= EIO_FLAG_PTR2_FREE; \ 1542 req->flags |= EIO_FLAG_PTR2_FREE; \
871 X_UNLOCK (etplock); \ 1543 X_UNLOCK (wrklock); \
872 req->ptr2 = malloc (len); \ 1544 req->ptr2 = malloc (len); \
873 if (!req->ptr2) \ 1545 if (!req->ptr2) \
874 { \ 1546 { \
875 errno = ENOMEM; \ 1547 errno = ENOMEM; \
876 req->result = -1; \ 1548 req->result = -1; \
877 break; \ 1549 break; \
878 } \ 1550 } \
879 } 1551 }
880 1552
881X_THREAD_PROC (eio_proc) 1553X_THREAD_PROC (etp_proc)
882{ 1554{
883 eio_req *req; 1555 ETP_REQ *req;
884 struct timespec ts; 1556 struct timespec ts;
885 worker *self = (worker *)thr_arg; 1557 etp_worker *self = (etp_worker *)thr_arg;
886 1558
887 /* try to distribute timeouts somewhat randomly */ 1559 /* try to distribute timeouts somewhat randomly */
888 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1560 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
889 1561
890 for (;;) 1562 for (;;)
891 { 1563 {
892 ts.tv_sec = time (0) + IDLE_TIMEOUT;
893
894 X_LOCK (reqlock); 1564 X_LOCK (reqlock);
895 1565
896 for (;;) 1566 for (;;)
897 { 1567 {
898 self->req = req = reqq_shift (&req_queue); 1568 self->req = req = reqq_shift (&req_queue);
900 if (req) 1570 if (req)
901 break; 1571 break;
902 1572
903 ++idle; 1573 ++idle;
904 1574
1575 ts.tv_sec = time (0) + idle_timeout;
905 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1576 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
906 { 1577 {
907 if (idle > max_idle) 1578 if (idle > max_idle)
908 { 1579 {
909 --idle; 1580 --idle;
910 X_UNLOCK (reqlock); 1581 X_UNLOCK (reqlock);
911 X_LOCK (etplock); 1582 X_LOCK (wrklock);
912 --started; 1583 --started;
913 X_UNLOCK (etplock); 1584 X_UNLOCK (wrklock);
914 goto quit; 1585 goto quit;
915 } 1586 }
916 1587
917 /* we are allowed to idle, so do so without any timeout */ 1588 /* we are allowed to idle, so do so without any timeout */
918 X_COND_WAIT (reqwait, reqlock); 1589 X_COND_WAIT (reqwait, reqlock);
919 ts.tv_sec = time (0) + IDLE_TIMEOUT;
920 } 1590 }
921 1591
922 --idle; 1592 --idle;
923 } 1593 }
924 1594
925 --nready; 1595 --nready;
926 1596
927 X_UNLOCK (reqlock); 1597 X_UNLOCK (reqlock);
928 1598
929 errno = 0; /* strictly unnecessary */ 1599 if (req->type < 0)
1600 goto quit;
930 1601
931 if (!EIO_CANCELLED (req)) 1602 if (!EIO_CANCELLED (req))
932 switch (req->type) 1603 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 1604
1033 X_LOCK (reslock); 1605 X_LOCK (reslock);
1034 1606
1035 ++npending; 1607 ++npending;
1036 1608
1037 if (!reqq_push (&res_queue, req) && etp.want_poll_cb) 1609 if (!reqq_push (&res_queue, req) && want_poll_cb)
1038 etp.want_poll_cb (); 1610 want_poll_cb ();
1039 1611
1040 self->req = 0; 1612 self->req = 0;
1041 worker_clear (self); 1613 etp_worker_clear (self);
1042 1614
1043 X_UNLOCK (reslock); 1615 X_UNLOCK (reslock);
1044 } 1616 }
1045 1617
1046quit: 1618quit:
1047 X_LOCK (etplock); 1619 X_LOCK (wrklock);
1048 worker_free (self); 1620 etp_worker_free (self);
1049 X_UNLOCK (etplock); 1621 X_UNLOCK (wrklock);
1050 1622
1051 return 0; 1623 return 0;
1052} 1624}
1053 1625
1054/*****************************************************************************/ 1626/*****************************************************************************/
1055 1627
1056int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1628int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1057{ 1629{
1058 etp_init (&etp, want_poll, done_poll); 1630 return etp_init (want_poll, done_poll);
1059} 1631}
1060 1632
1061static void eio_api_destroy (eio_req *req) 1633static void eio_api_destroy (eio_req *req)
1062{ 1634{
1063 free (req); 1635 free (req);
1085 { \ 1657 { \
1086 eio_api_destroy (req); \ 1658 eio_api_destroy (req); \
1087 return 0; \ 1659 return 0; \
1088 } 1660 }
1089 1661
1662static void eio_execute (etp_worker *self, eio_req *req)
1663{
1664 switch (req->type)
1665 {
1666 case EIO_READ: ALLOC (req->size);
1667 req->result = req->offs >= 0
1668 ? pread (req->int1, req->ptr2, req->size, req->offs)
1669 : read (req->int1, req->ptr2, req->size); break;
1670 case EIO_WRITE: req->result = req->offs >= 0
1671 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1672 : write (req->int1, req->ptr2, req->size); break;
1673
1674 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1675 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1676
1677 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1678 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1679 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1680 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1681 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1682 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1683
1684 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1685 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1686 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1687 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1688
1689 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1690 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1691 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1692 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1693 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1694 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1695
1696 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1697 case EIO_CLOSE: req->result = close (req->int1); break;
1698 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1699 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1700 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1701 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1702 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1703 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1704 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1705 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1706
1707 case EIO_READLINK: ALLOC (PATH_MAX);
1708 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1709
1710 case EIO_SYNC: req->result = 0; sync (); break;
1711 case EIO_FSYNC: req->result = fsync (req->int1); break;
1712 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1713 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1714 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1715 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1716 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1717 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1718
1719 case EIO_READDIR: eio__scandir (req, self); break;
1720
1721 case EIO_BUSY:
1722#ifdef _WIN32
1723 Sleep (req->nv1 * 1e3);
1724#else
1725 {
1726 struct timeval tv;
1727
1728 tv.tv_sec = req->nv1;
1729 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1730
1731 req->result = select (0, 0, 0, 0, &tv);
1732 }
1733#endif
1734 break;
1735
1736 case EIO_UTIME:
1737 case EIO_FUTIME:
1738 {
1739 struct timeval tv[2];
1740 struct timeval *times;
1741
1742 if (req->nv1 != -1. || req->nv2 != -1.)
1743 {
1744 tv[0].tv_sec = req->nv1;
1745 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1746 tv[1].tv_sec = req->nv2;
1747 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1748
1749 times = tv;
1750 }
1751 else
1752 times = 0;
1753
1754 req->result = req->type == EIO_FUTIME
1755 ? futimes (req->int1, times)
1756 : utimes (req->ptr1, times);
1757 }
1758 break;
1759
1760 case EIO_GROUP:
1761 abort (); /* handled in eio_request */
1762
1763 case EIO_NOP:
1764 req->result = 0;
1765 break;
1766
1767 case EIO_CUSTOM:
1768 ((void (*)(eio_req *))req->feed) (req);
1769 break;
1770
1771 default:
1772 errno = ENOSYS;
1773 req->result = -1;
1774 break;
1775 }
1776
1777 req->errorno = errno;
1778}
1779
1090#ifndef EIO_NO_WRAPPERS 1780#ifndef EIO_NO_WRAPPERS
1091 1781
1092eio_req *eio_nop (int pri, eio_cb cb, void *data) 1782eio_req *eio_nop (int pri, eio_cb cb, void *data)
1093{ 1783{
1094 REQ (EIO_NOP); SEND; 1784 REQ (EIO_NOP); SEND;
1107eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data) 1797eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1108{ 1798{
1109 REQ (EIO_FSYNC); req->int1 = fd; SEND; 1799 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1110} 1800}
1111 1801
1802eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1803{
1804 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1805}
1806
1807eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1808{
1809 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1810}
1811
1812eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1813{
1814 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1815}
1816
1817eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1818{
1819 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1820}
1821
1822eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1823{
1824 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1825}
1826
1112eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 1827eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1113{ 1828{
1114 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 1829 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1115} 1830}
1116 1831
1135} 1850}
1136 1851
1137eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1852eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1138{ 1853{
1139 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1854 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1855}
1856
1857eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1858{
1859 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1140} 1860}
1141 1861
1142eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1862eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1143{ 1863{
1144 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1864 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) 1938eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1219{ 1939{
1220 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1940 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1221} 1941}
1222 1942
1943eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1944{
1945 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1946}
1947
1223eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1948eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1224{ 1949{
1225 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1950 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1226} 1951}
1227 1952
1228eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 1953eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1229{ 1954{
1230 return eio__1path (EIO_RMDIR, path, pri, cb, data); 1955 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1231} 1956}
1232 1957
1233eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 1958eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1234{ 1959{
1235 return eio__1path (EIO_READDIR, path, pri, cb, data); 1960 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1236} 1961}
1237 1962
1238eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1963eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1239{ 1964{
1240 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 1965 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1241} 1966}
1242 1967
1243static eio_req * 1968static eio_req *
1244eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1969eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1245{ 1970{
1269eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1994eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1270{ 1995{
1271 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1996 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1272} 1997}
1273 1998
1999eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
2000{
2001 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND;
2002}
2003
1274#endif 2004#endif
1275 2005
1276eio_req *eio_grp (eio_cb cb, void *data) 2006eio_req *eio_grp (eio_cb cb, void *data)
1277{ 2007{
1278 const int pri = EIO_PRI_MAX; 2008 const int pri = EIO_PRI_MAX;
1304 2034
1305void eio_grp_add (eio_req *grp, eio_req *req) 2035void eio_grp_add (eio_req *grp, eio_req *req)
1306{ 2036{
1307 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2037 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1308 2038
2039 grp->flags |= EIO_FLAG_GROUPADD;
2040
1309 ++grp->size; 2041 ++grp->size;
1310 req->grp = grp; 2042 req->grp = grp;
1311 2043
1312 req->grp_prev = 0; 2044 req->grp_prev = 0;
1313 req->grp_next = grp->grp_first; 2045 req->grp_next = grp->grp_first;
1321/*****************************************************************************/ 2053/*****************************************************************************/
1322/* misc garbage */ 2054/* misc garbage */
1323 2055
1324ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2056ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1325{ 2057{
1326 worker wrk; 2058 etp_worker wrk;
2059 ssize_t ret;
1327 2060
1328 wrk.dbuf = 0; 2061 wrk.dbuf = 0;
1329 2062
1330 eio__sendfile (ofd, ifd, offset, count, &wrk); 2063 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1331 2064
1332 if (wrk.dbuf) 2065 if (wrk.dbuf)
1333 free (wrk.dbuf); 2066 free (wrk.dbuf);
1334}
1335 2067
2068 return ret;
2069}
2070

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines