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

Comparing libeio/eio.c (file contents):
Revision 1.10 by root, Tue May 13 17:08:15 2008 UTC vs.
Revision 1.33 by root, Sat Jun 6 19:44:17 2009 UTC

1/*
2 * libeio implementation
3 *
4 * Copyright (c) 2007,2008,2009 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>
25#endif 68#endif
26 69
27#ifdef _WIN32 70#ifdef _WIN32
28 71
29 /*doh*/ 72 /*doh*/
30
31#else 73#else
32 74
33# include "config.h" 75# include "config.h"
34# include <sys/time.h> 76# include <sys/time.h>
35# include <sys/select.h> 77# include <sys/select.h>
36# include <unistd.h> 78# include <unistd.h>
37# include <utime.h> 79# include <utime.h>
38# include <signal.h> 80# include <signal.h>
39# include <dirent.h> 81# include <dirent.h>
82
83/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
84# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
85# define _DIRENT_HAVE_D_TYPE /* sigh */
86# define D_INO(de) (de)->d_fileno
87# define D_NAMLEN(de) (de)->d_namlen
88# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600
89# define D_INO(de) (de)->d_ino
90# endif
91
92#ifdef _D_EXACT_NAMLEN
93# undef D_NAMLEN
94# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
95#endif
96
97# ifdef _DIRENT_HAVE_D_TYPE
98# define D_TYPE(de) (de)->d_type
99# endif
40 100
41# ifndef EIO_STRUCT_DIRENT 101# ifndef EIO_STRUCT_DIRENT
42# define EIO_STRUCT_DIRENT struct dirent 102# define EIO_STRUCT_DIRENT struct dirent
43# endif 103# endif
44 104
57# else 117# else
58# error sendfile support requested but not available 118# error sendfile support requested but not available
59# endif 119# endif
60#endif 120#endif
61 121
122#ifndef D_TYPE
123# define D_TYPE(de) 0
124#endif
125#ifndef D_INO
126# define D_INO(de) 0
127#endif
128#ifndef D_NAMLEN
129# define D_NAMLEN(de) strlen ((de)->d_name)
130#endif
131
62/* number of seconds after which an idle threads exit */ 132/* number of seconds after which an idle threads exit */
63#define IDLE_TIMEOUT 10 133#define IDLE_TIMEOUT 10
64 134
65/* used for struct dirent, AIX doesn't provide it */ 135/* used for struct dirent, AIX doesn't provide it */
66#ifndef NAME_MAX 136#ifndef NAME_MAX
70/* buffer size for various temporary buffers */ 140/* buffer size for various temporary buffers */
71#define EIO_BUFSIZE 65536 141#define EIO_BUFSIZE 65536
72 142
73#define dBUF \ 143#define dBUF \
74 char *eio_buf; \ 144 char *eio_buf; \
75 X_LOCK (wrklock); \ 145 ETP_WORKER_LOCK (self); \
76 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 146 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \
77 X_UNLOCK (wrklock); \ 147 ETP_WORKER_UNLOCK (self); \
78 errno = ENOMEM; \ 148 errno = ENOMEM; \
79 if (!eio_buf) \ 149 if (!eio_buf) \
80 return -1; 150 return -1;
81 151
82#define EIO_TICKS ((1000000 + 1023) >> 10) 152#define EIO_TICKS ((1000000 + 1023) >> 10)
83 153
154/*****************************************************************************/
155
156#if __GNUC__ >= 3
157# define expect(expr,value) __builtin_expect ((expr),(value))
158#else
159# define expect(expr,value) (expr)
160#endif
161
162#define expect_false(expr) expect ((expr) != 0, 0)
163#define expect_true(expr) expect ((expr) != 0, 1)
164
165/*****************************************************************************/
166
167#define ETP_PRI_MIN EIO_PRI_MIN
168#define ETP_PRI_MAX EIO_PRI_MAX
169
170struct etp_worker;
171
172#define ETP_REQ eio_req
173#define ETP_DESTROY(req) eio_destroy (req)
174static int eio_finish (eio_req *req);
175#define ETP_FINISH(req) eio_finish (req)
176static void eio_execute (struct etp_worker *self, eio_req *req);
177#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
178
179#define ETP_WORKER_CLEAR(req) \
180 if (wrk->dbuf) \
181 { \
182 free (wrk->dbuf); \
183 wrk->dbuf = 0; \
184 } \
185 \
186 if (wrk->dirp) \
187 { \
188 closedir (wrk->dirp); \
189 wrk->dirp = 0; \
190 }
191
192#define ETP_WORKER_COMMON \
193 void *dbuf; \
194 DIR *dirp;
195
196/*****************************************************************************/
197
198#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
199
200/* calculcate time difference in ~1/EIO_TICKS of a second */
201static int tvdiff (struct timeval *tv1, struct timeval *tv2)
202{
203 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
204 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
205}
206
207static unsigned int started, idle, wanted = 4;
208
84static void (*want_poll_cb) (void); 209static void (*want_poll_cb) (void);
85static void (*done_poll_cb) (void); 210static void (*done_poll_cb) (void);
86 211
87static unsigned int max_poll_time = 0; 212static unsigned int max_poll_time; /* reslock */
88static unsigned int max_poll_reqs = 0; 213static unsigned int max_poll_reqs; /* reslock */
89 214
90/* calculcate time difference in ~1/EIO_TICKS of a second */ 215static volatile unsigned int nreqs; /* reqlock */
91static int tvdiff (struct timeval *tv1, struct timeval *tv2) 216static volatile unsigned int nready; /* reqlock */
92{ 217static volatile unsigned int npending; /* reqlock */
93 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 218static volatile unsigned int max_idle = 4;
94 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
95}
96 219
97static unsigned int started, idle, wanted = 4;
98
99/* worker threads management */
100static mutex_t wrklock = X_MUTEX_INIT; 220static mutex_t wrklock = X_MUTEX_INIT;
101
102typedef struct worker
103{
104 /* locked by wrklock */
105 struct worker *prev, *next;
106
107 thread_t tid;
108
109 /* locked by reslock, reqlock or wrklock */
110 eio_req *req; /* currently processed request */
111 void *dbuf;
112 DIR *dirp;
113} worker;
114
115static worker wrk_first = { &wrk_first, &wrk_first, 0 };
116
117static void worker_clear (worker *wrk)
118{
119 if (wrk->dirp)
120 {
121 closedir (wrk->dirp);
122 wrk->dirp = 0;
123 }
124
125 if (wrk->dbuf)
126 {
127 free (wrk->dbuf);
128 wrk->dbuf = 0;
129 }
130}
131
132static void worker_free (worker *wrk)
133{
134 wrk->next->prev = wrk->prev;
135 wrk->prev->next = wrk->next;
136
137 free (wrk);
138}
139
140static volatile unsigned int nreqs, nready, npending;
141static volatile unsigned int max_idle = 4;
142
143static mutex_t reslock = X_MUTEX_INIT; 221static mutex_t reslock = X_MUTEX_INIT;
144static mutex_t reqlock = X_MUTEX_INIT; 222static mutex_t reqlock = X_MUTEX_INIT;
145static cond_t reqwait = X_COND_INIT; 223static cond_t reqwait = X_COND_INIT;
146 224
225#if !HAVE_PREADWRITE
226/*
227 * make our pread/pwrite emulation safe against themselves, but not against
228 * normal read/write by using a mutex. slows down execution a lot,
229 * but that's your problem, not mine.
230 */
231static mutex_t preadwritelock = X_MUTEX_INIT;
232#endif
233
234typedef struct etp_worker
235{
236 /* locked by wrklock */
237 struct etp_worker *prev, *next;
238
239 thread_t tid;
240
241 /* locked by reslock, reqlock or wrklock */
242 ETP_REQ *req; /* currently processed request */
243
244 ETP_WORKER_COMMON
245} etp_worker;
246
247static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
248
249#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
250#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
251
252/* worker threads management */
253
254static void etp_worker_clear (etp_worker *wrk)
255{
256 ETP_WORKER_CLEAR (wrk);
257}
258
259static void etp_worker_free (etp_worker *wrk)
260{
261 wrk->next->prev = wrk->prev;
262 wrk->prev->next = wrk->next;
263
264 free (wrk);
265}
266
147unsigned int eio_nreqs (void) 267static unsigned int etp_nreqs (void)
148{ 268{
269 int retval;
270 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
271 retval = nreqs;
272 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
149 return nreqs; 273 return retval;
150} 274}
151 275
152unsigned int eio_nready (void) 276static unsigned int etp_nready (void)
153{ 277{
154 unsigned int retval; 278 unsigned int retval;
155 279
156 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 280 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
157 retval = nready; 281 retval = nready;
158 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 282 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
159 283
160 return retval; 284 return retval;
161} 285}
162 286
163unsigned int eio_npending (void) 287static unsigned int etp_npending (void)
164{ 288{
165 unsigned int retval; 289 unsigned int retval;
166 290
167 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 291 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
168 retval = npending; 292 retval = npending;
169 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 293 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
170 294
171 return retval; 295 return retval;
172} 296}
173 297
174unsigned int eio_nthreads (void) 298static unsigned int etp_nthreads (void)
175{ 299{
176 unsigned int retval; 300 unsigned int retval;
177 301
178 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 302 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
179 retval = started; 303 retval = started;
186 * a somewhat faster data structure might be nice, but 310 * a somewhat faster data structure might be nice, but
187 * with 8 priorities this actually needs <20 insns 311 * with 8 priorities this actually needs <20 insns
188 * per shift, the most expensive operation. 312 * per shift, the most expensive operation.
189 */ 313 */
190typedef struct { 314typedef struct {
191 eio_req *qs[EIO_NUM_PRI], *qe[EIO_NUM_PRI]; /* qstart, qend */ 315 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
192 int size; 316 int size;
193} reqq; 317} etp_reqq;
194 318
195static reqq req_queue; 319static etp_reqq req_queue;
196static reqq res_queue; 320static etp_reqq res_queue;
197 321
198static int reqq_push (reqq *q, eio_req *req) 322static int reqq_push (etp_reqq *q, ETP_REQ *req)
199{ 323{
200 int pri = req->pri; 324 int pri = req->pri;
201 req->next = 0; 325 req->next = 0;
202 326
203 if (q->qe[pri]) 327 if (q->qe[pri])
209 q->qe[pri] = q->qs[pri] = req; 333 q->qe[pri] = q->qs[pri] = req;
210 334
211 return q->size++; 335 return q->size++;
212} 336}
213 337
214static eio_req *reqq_shift (reqq *q) 338static ETP_REQ *reqq_shift (etp_reqq *q)
215{ 339{
216 int pri; 340 int pri;
217 341
218 if (!q->size) 342 if (!q->size)
219 return 0; 343 return 0;
220 344
221 --q->size; 345 --q->size;
222 346
223 for (pri = EIO_NUM_PRI; pri--; ) 347 for (pri = ETP_NUM_PRI; pri--; )
224 { 348 {
225 eio_req *req = q->qs[pri]; 349 eio_req *req = q->qs[pri];
226 350
227 if (req) 351 if (req)
228 { 352 {
234 } 358 }
235 359
236 abort (); 360 abort ();
237} 361}
238 362
239static void grp_try_feed (eio_req *grp) 363static void etp_atfork_prepare (void)
240{ 364{
241 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 365 X_LOCK (wrklock);
366 X_LOCK (reqlock);
367 X_LOCK (reslock);
368#if !HAVE_PREADWRITE
369 X_LOCK (preadwritelock);
370#endif
371}
372
373static void etp_atfork_parent (void)
374{
375#if !HAVE_PREADWRITE
376 X_UNLOCK (preadwritelock);
377#endif
378 X_UNLOCK (reslock);
379 X_UNLOCK (reqlock);
380 X_UNLOCK (wrklock);
381}
382
383static void etp_atfork_child (void)
384{
385 ETP_REQ *prv;
386
387 while ((prv = reqq_shift (&req_queue)))
388 ETP_DESTROY (prv);
389
390 while ((prv = reqq_shift (&res_queue)))
391 ETP_DESTROY (prv);
392
393 while (wrk_first.next != &wrk_first)
242 { 394 {
243 int old_len = grp->size; 395 etp_worker *wrk = wrk_first.next;
244 396
245 EIO_FEED (grp); 397 if (wrk->req)
398 ETP_DESTROY (wrk->req);
246 399
247 /* stop if no progress has been made */ 400 etp_worker_clear (wrk);
248 if (old_len == grp->size) 401 etp_worker_free (wrk);
249 {
250 grp->feed = 0;
251 break;
252 }
253 } 402 }
254}
255 403
256static int eio_finish (eio_req *req); 404 started = 0;
405 idle = 0;
406 nreqs = 0;
407 nready = 0;
408 npending = 0;
257 409
258static int grp_dec (eio_req *grp) 410 etp_atfork_parent ();
259{ 411}
260 --grp->size;
261 412
262 /* call feeder, if applicable */ 413static void
263 grp_try_feed (grp); 414etp_once_init (void)
415{
416 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
417}
264 418
265 /* finish, if done */ 419static int
266 if (!grp->size && grp->int1) 420etp_init (void (*want_poll)(void), void (*done_poll)(void))
267 return eio_finish (grp); 421{
268 else 422 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
423
424 pthread_once (&doinit, etp_once_init);
425
426 want_poll_cb = want_poll;
427 done_poll_cb = done_poll;
428
269 return 0; 429 return 0;
270} 430}
271 431
272void eio_destroy (eio_req *req)
273{
274 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
275 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
276
277 EIO_DESTROY (req);
278}
279
280static int eio_finish (eio_req *req)
281{
282 int res = EIO_FINISH (req);
283
284 if (req->grp)
285 {
286 int res2;
287 eio_req *grp = req->grp;
288
289 /* unlink request */
290 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
291 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
292
293 if (grp->grp_first == req)
294 grp->grp_first = req->grp_next;
295
296 res2 = grp_dec (grp);
297
298 if (!res && res2)
299 res = res2;
300 }
301
302 eio_destroy (req);
303
304 return res;
305}
306
307void eio_grp_cancel (eio_req *grp)
308{
309 for (grp = grp->grp_first; grp; grp = grp->grp_next)
310 eio_cancel (grp);
311}
312
313void eio_cancel (eio_req *req)
314{
315 X_LOCK (wrklock);
316 req->flags |= EIO_FLAG_CANCELLED;
317 X_UNLOCK (wrklock);
318
319 eio_grp_cancel (req);
320}
321
322X_THREAD_PROC (eio_proc); 432X_THREAD_PROC (etp_proc);
323 433
324static void start_thread (void) 434static void etp_start_thread (void)
325{ 435{
326 worker *wrk = calloc (1, sizeof (worker)); 436 etp_worker *wrk = calloc (1, sizeof (etp_worker));
327 437
328 /*TODO*/ 438 /*TODO*/
329 assert (("unable to allocate worker thread data", wrk)); 439 assert (("unable to allocate worker thread data", wrk));
330 440
331 X_LOCK (wrklock); 441 X_LOCK (wrklock);
332 442
333 if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) 443 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
334 { 444 {
335 wrk->prev = &wrk_first; 445 wrk->prev = &wrk_first;
336 wrk->next = wrk_first.next; 446 wrk->next = wrk_first.next;
337 wrk_first.next->prev = wrk; 447 wrk_first.next->prev = wrk;
338 wrk_first.next = wrk; 448 wrk_first.next = wrk;
342 free (wrk); 452 free (wrk);
343 453
344 X_UNLOCK (wrklock); 454 X_UNLOCK (wrklock);
345} 455}
346 456
347static void maybe_start_thread (void) 457static void etp_maybe_start_thread (void)
348{ 458{
349 if (eio_nthreads () >= wanted) 459 if (expect_true (etp_nthreads () >= wanted))
350 return; 460 return;
351 461
352 /* todo: maybe use idle here, but might be less exact */ 462 /* todo: maybe use idle here, but might be less exact */
353 if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ()) 463 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
354 return; 464 return;
355 465
356 start_thread (); 466 etp_start_thread ();
357} 467}
358 468
359void eio_submit (eio_req *req)
360{
361 ++nreqs;
362
363 X_LOCK (reqlock);
364 ++nready;
365 reqq_push (&req_queue, req);
366 X_COND_SIGNAL (reqwait);
367 X_UNLOCK (reqlock);
368
369 maybe_start_thread ();
370}
371
372static void end_thread (void) 469static void etp_end_thread (void)
373{ 470{
374 eio_req *req = calloc (1, sizeof (eio_req)); 471 eio_req *req = calloc (1, sizeof (eio_req));
375 472
376 req->type = EIO_QUIT; 473 req->type = -1;
377 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 474 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
378 475
379 X_LOCK (reqlock); 476 X_LOCK (reqlock);
380 reqq_push (&req_queue, req); 477 reqq_push (&req_queue, req);
381 X_COND_SIGNAL (reqwait); 478 X_COND_SIGNAL (reqwait);
382 X_UNLOCK (reqlock); 479 X_UNLOCK (reqlock);
384 X_LOCK (wrklock); 481 X_LOCK (wrklock);
385 --started; 482 --started;
386 X_UNLOCK (wrklock); 483 X_UNLOCK (wrklock);
387} 484}
388 485
389void eio_set_max_poll_time (double nseconds)
390{
391 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
392 max_poll_time = nseconds;
393 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
394}
395
396void eio_set_max_poll_reqs (unsigned int maxreqs)
397{
398 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
399 max_poll_reqs = maxreqs;
400 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
401}
402
403void eio_set_max_idle (unsigned int nthreads)
404{
405 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
406 max_idle = nthreads <= 0 ? 1 : nthreads;
407 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
408}
409
410void eio_set_min_parallel (unsigned int nthreads)
411{
412 if (wanted < nthreads)
413 wanted = nthreads;
414}
415
416void eio_set_max_parallel (unsigned int nthreads)
417{
418 if (wanted > nthreads)
419 wanted = nthreads;
420
421 while (started > wanted)
422 end_thread ();
423}
424
425int eio_poll (void) 486static int etp_poll (void)
426{ 487{
427 int maxreqs = max_poll_reqs; 488 unsigned int maxreqs;
489 unsigned int maxtime;
428 struct timeval tv_start, tv_now; 490 struct timeval tv_start, tv_now;
429 eio_req *req;
430 491
492 X_LOCK (reslock);
493 maxreqs = max_poll_reqs;
494 maxtime = max_poll_time;
495 X_UNLOCK (reslock);
496
431 if (max_poll_time) 497 if (maxtime)
432 gettimeofday (&tv_start, 0); 498 gettimeofday (&tv_start, 0);
433 499
434 for (;;) 500 for (;;)
435 { 501 {
502 ETP_REQ *req;
503
436 maybe_start_thread (); 504 etp_maybe_start_thread ();
437 505
438 X_LOCK (reslock); 506 X_LOCK (reslock);
439 req = reqq_shift (&res_queue); 507 req = reqq_shift (&res_queue);
440 508
441 if (req) 509 if (req)
449 X_UNLOCK (reslock); 517 X_UNLOCK (reslock);
450 518
451 if (!req) 519 if (!req)
452 return 0; 520 return 0;
453 521
522 X_LOCK (reqlock);
454 --nreqs; 523 --nreqs;
524 X_UNLOCK (reqlock);
455 525
456 if (req->type == EIO_GROUP && req->size) 526 if (expect_false (req->type == EIO_GROUP && req->size))
457 { 527 {
458 req->int1 = 1; /* mark request as delayed */ 528 req->int1 = 1; /* mark request as delayed */
459 continue; 529 continue;
460 } 530 }
461 else 531 else
462 { 532 {
463 int res = eio_finish (req); 533 int res = ETP_FINISH (req);
464 if (res) 534 if (expect_false (res))
465 return res; 535 return res;
466 } 536 }
467 537
468 if (maxreqs && !--maxreqs) 538 if (expect_false (maxreqs && !--maxreqs))
469 break; 539 break;
470 540
471 if (max_poll_time) 541 if (maxtime)
472 { 542 {
473 gettimeofday (&tv_now, 0); 543 gettimeofday (&tv_now, 0);
474 544
475 if (tvdiff (&tv_start, &tv_now) >= max_poll_time) 545 if (tvdiff (&tv_start, &tv_now) >= maxtime)
476 break; 546 break;
477 } 547 }
478 } 548 }
479 549
480 errno = EAGAIN; 550 errno = EAGAIN;
481 return -1; 551 return -1;
482} 552}
483 553
554static void etp_cancel (ETP_REQ *req)
555{
556 X_LOCK (wrklock);
557 req->flags |= EIO_FLAG_CANCELLED;
558 X_UNLOCK (wrklock);
559
560 eio_grp_cancel (req);
561}
562
563static void etp_submit (ETP_REQ *req)
564{
565 req->pri -= ETP_PRI_MIN;
566
567 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
568 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
569
570 if (expect_false (req->type == EIO_GROUP))
571 {
572 /* I hope this is worth it :/ */
573 X_LOCK (reqlock);
574 ++nreqs;
575 X_UNLOCK (reqlock);
576
577 X_LOCK (reslock);
578
579 ++npending;
580
581 if (!reqq_push (&res_queue, req) && want_poll_cb)
582 want_poll_cb ();
583
584 X_UNLOCK (reslock);
585 }
586 else
587 {
588 X_LOCK (reqlock);
589 ++nreqs;
590 ++nready;
591 reqq_push (&req_queue, req);
592 X_COND_SIGNAL (reqwait);
593 X_UNLOCK (reqlock);
594
595 etp_maybe_start_thread ();
596 }
597}
598
599static void etp_set_max_poll_time (double nseconds)
600{
601 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
602 max_poll_time = nseconds;
603 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
604}
605
606static void etp_set_max_poll_reqs (unsigned int maxreqs)
607{
608 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
609 max_poll_reqs = maxreqs;
610 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
611}
612
613static void etp_set_max_idle (unsigned int nthreads)
614{
615 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
616 max_idle = nthreads <= 0 ? 1 : nthreads;
617 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
618}
619
620static void etp_set_min_parallel (unsigned int nthreads)
621{
622 if (wanted < nthreads)
623 wanted = nthreads;
624}
625
626static void etp_set_max_parallel (unsigned int nthreads)
627{
628 if (wanted > nthreads)
629 wanted = nthreads;
630
631 while (started > wanted)
632 etp_end_thread ();
633}
634
635/*****************************************************************************/
636
637static void grp_try_feed (eio_req *grp)
638{
639 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
640 {
641 grp->flags &= ~EIO_FLAG_GROUPADD;
642
643 EIO_FEED (grp);
644
645 /* stop if no progress has been made */
646 if (!(grp->flags & EIO_FLAG_GROUPADD))
647 {
648 grp->feed = 0;
649 break;
650 }
651 }
652}
653
654static int grp_dec (eio_req *grp)
655{
656 --grp->size;
657
658 /* call feeder, if applicable */
659 grp_try_feed (grp);
660
661 /* finish, if done */
662 if (!grp->size && grp->int1)
663 return eio_finish (grp);
664 else
665 return 0;
666}
667
668void eio_destroy (eio_req *req)
669{
670 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
671 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
672
673 EIO_DESTROY (req);
674}
675
676static int eio_finish (eio_req *req)
677{
678 int res = EIO_FINISH (req);
679
680 if (req->grp)
681 {
682 int res2;
683 eio_req *grp = req->grp;
684
685 /* unlink request */
686 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
687 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
688
689 if (grp->grp_first == req)
690 grp->grp_first = req->grp_next;
691
692 res2 = grp_dec (grp);
693
694 if (!res && res2)
695 res = res2;
696 }
697
698 eio_destroy (req);
699
700 return res;
701}
702
703void eio_grp_cancel (eio_req *grp)
704{
705 for (grp = grp->grp_first; grp; grp = grp->grp_next)
706 eio_cancel (grp);
707}
708
709void eio_cancel (eio_req *req)
710{
711 etp_cancel (req);
712}
713
714void eio_submit (eio_req *req)
715{
716 etp_submit (req);
717}
718
719unsigned int eio_nreqs (void)
720{
721 return etp_nreqs ();
722}
723
724unsigned int eio_nready (void)
725{
726 return etp_nready ();
727}
728
729unsigned int eio_npending (void)
730{
731 return etp_npending ();
732}
733
734unsigned int eio_nthreads (void)
735{
736 return etp_nthreads ();
737}
738
739void eio_set_max_poll_time (double nseconds)
740{
741 etp_set_max_poll_time (nseconds);
742}
743
744void eio_set_max_poll_reqs (unsigned int maxreqs)
745{
746 etp_set_max_poll_reqs (maxreqs);
747}
748
749void eio_set_max_idle (unsigned int nthreads)
750{
751 etp_set_max_idle (nthreads);
752}
753
754void eio_set_min_parallel (unsigned int nthreads)
755{
756 etp_set_min_parallel (nthreads);
757}
758
759void eio_set_max_parallel (unsigned int nthreads)
760{
761 etp_set_max_parallel (nthreads);
762}
763
764int eio_poll (void)
765{
766 return etp_poll ();
767}
768
484/*****************************************************************************/ 769/*****************************************************************************/
485/* work around various missing functions */ 770/* work around various missing functions */
486 771
487#if !HAVE_PREADWRITE 772#if !HAVE_PREADWRITE
773# undef pread
774# undef pwrite
488# define pread eio__pread 775# define pread eio__pread
489# define pwrite eio__pwrite 776# define pwrite eio__pwrite
490
491/*
492 * make our pread/pwrite safe against themselves, but not against
493 * normal read/write by using a mutex. slows down execution a lot,
494 * but that's your problem, not mine.
495 */
496static mutex_t preadwritelock = X_MUTEX_INIT;
497 777
498static ssize_t 778static ssize_t
499eio__pread (int fd, void *buf, size_t count, off_t offset) 779eio__pread (int fd, void *buf, size_t count, off_t offset)
500{ 780{
501 ssize_t res; 781 ssize_t res;
519 799
520 X_LOCK (preadwritelock); 800 X_LOCK (preadwritelock);
521 ooffset = lseek (fd, 0, SEEK_CUR); 801 ooffset = lseek (fd, 0, SEEK_CUR);
522 lseek (fd, offset, SEEK_SET); 802 lseek (fd, offset, SEEK_SET);
523 res = write (fd, buf, count); 803 res = write (fd, buf, count);
524 lseek (fd, offset, SEEK_SET); 804 lseek (fd, ooffset, SEEK_SET);
525 X_UNLOCK (preadwritelock); 805 X_UNLOCK (preadwritelock);
526 806
527 return res; 807 return res;
528} 808}
529#endif 809#endif
530 810
531#ifndef HAVE_FUTIMES 811#ifndef HAVE_FUTIMES
532 812
813# undef utimes
814# undef futimes
533# define utimes(path,times) eio__utimes (path, times) 815# define utimes(path,times) eio__utimes (path, times)
534# define futimes(fd,times) eio__futimes (fd, times) 816# define futimes(fd,times) eio__futimes (fd, times)
535 817
536static int 818static int
537eio__utimes (const char *filename, const struct timeval times[2]) 819eio__utimes (const char *filename, const struct timeval times[2])
556} 838}
557 839
558#endif 840#endif
559 841
560#if !HAVE_FDATASYNC 842#if !HAVE_FDATASYNC
843# undef fdatasync
561# define fdatasync fsync 844# define fdatasync(fd) fsync (fd)
562#endif 845#endif
846
847/* sync_file_range always needs emulation */
848int
849eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
850{
851#if HAVE_SYNC_FILE_RANGE
852 int res;
853
854 if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
855 || EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
856 || EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
857 {
858 flags = 0
859 | (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
860 | (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
861 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
862 }
863
864 res = sync_file_range (fd, offset, nbytes, flags);
865
866 if (!res || errno != ENOSYS)
867 return res;
868#endif
869
870 /* even though we could play tricks with the flags, it's better to always
871 * call fdatasync, as thta matches the expectation of it's users best */
872 return fdatasync (fd);
873}
563 874
564#if !HAVE_READAHEAD 875#if !HAVE_READAHEAD
876# undef readahead
565# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 877# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
566 878
567static ssize_t 879static ssize_t
568eio__readahead (int fd, off_t offset, size_t count, worker *self) 880eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
569{ 881{
570 size_t todo = count; 882 size_t todo = count;
571 dBUF; 883 dBUF;
572 884
573 while (todo > 0) 885 while (todo > 0)
583 return count; 895 return count;
584} 896}
585 897
586#endif 898#endif
587 899
588#if !HAVE_READDIR_R
589# define readdir_r eio__readdir_r
590
591static mutex_t readdirlock = X_MUTEX_INIT;
592
593static int
594eio__readdir_r (DIR *dirp, EIO_STRUCT_DIRENT *ent, EIO_STRUCT_DIRENT **res)
595{
596 EIO_STRUCT_DIRENT *e;
597 int errorno;
598
599 X_LOCK (readdirlock);
600
601 e = readdir (dirp);
602 errorno = errno;
603
604 if (e)
605 {
606 *res = ent;
607 strcpy (ent->d_name, e->d_name);
608 }
609 else
610 *res = 0;
611
612 X_UNLOCK (readdirlock);
613
614 errno = errorno;
615 return e ? 0 : -1;
616}
617#endif
618
619/* sendfile always needs emulation */ 900/* sendfile always needs emulation */
620static ssize_t 901static ssize_t
621eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self) 902eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
622{ 903{
623 ssize_t res; 904 ssize_t res;
624 905
625 if (!count) 906 if (!count)
626 return 0; 907 return 0;
708 } 989 }
709 990
710 return res; 991 return res;
711} 992}
712 993
994static int
995eio_dent_cmp (const void *a_, const void *b_)
996{
997 const eio_dirent *a = (const eio_dirent *)a_;
998 const eio_dirent *b = (const eio_dirent *)b_;
999
1000 return (int)b->score - (int)a->score ? (int)b->score - (int)a->score
1001 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */
1002}
1003
713/* read a full directory */ 1004/* read a full directory */
714static void 1005static void
715eio__scandir (eio_req *req, worker *self) 1006eio__scandir (eio_req *req, etp_worker *self)
716{ 1007{
717 DIR *dirp; 1008 DIR *dirp;
718 union
719 {
720 EIO_STRUCT_DIRENT d;
721 char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
722 } *u;
723 EIO_STRUCT_DIRENT *entp; 1009 EIO_STRUCT_DIRENT *entp;
724 char *name, *names; 1010 unsigned char *name, *names;
725 int memlen = 4096; 1011 int namesalloc = 4096;
726 int memofs = 0; 1012 int namesoffs = 0;
1013 int flags = req->int1;
1014 eio_dirent *dents = 0;
1015 int dentalloc = 128;
727 int res = 0; 1016 int dentoffs = 0;
1017
1018 req->result = -1;
1019
1020 if (!(flags & EIO_READDIR_DENTS))
1021 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
728 1022
729 X_LOCK (wrklock); 1023 X_LOCK (wrklock);
1024 /* the corresponding closedir is in ETP_WORKER_CLEAR */
730 self->dirp = dirp = opendir (req->ptr1); 1025 self->dirp = dirp = opendir (req->ptr1);
731 self->dbuf = u = malloc (sizeof (*u));
732 req->flags |= EIO_FLAG_PTR2_FREE; 1026 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
733 req->ptr2 = names = malloc (memlen); 1027 req->ptr1 = names = malloc (namesalloc);
1028 req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
734 X_UNLOCK (wrklock); 1029 X_UNLOCK (wrklock);
735 1030
736 if (dirp && u && names) 1031 if (dirp && names && (!flags || dents))
737 for (;;) 1032 for (;;)
738 { 1033 {
739 errno = 0; 1034 errno = 0;
740 readdir_r (dirp, &u->d, &entp); 1035 entp = readdir (dirp);
741 1036
742 if (!entp) 1037 if (!entp)
1038 {
1039 if (errno)
1040 break;
1041
1042 /* sort etc. */
1043 req->int1 = flags;
1044 req->result = dentoffs;
1045
1046 if (dents)
1047 {
1048 eio_dirent *ent = dents + dentoffs;
1049
1050 while (ent > dents)
1051 (--ent)->name = names + (size_t)ent->name;
1052 }
1053
1054 if (flags & EIO_READDIR_STAT_ORDER
1055 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN)))
1056 {
1057 /* pray your qsort doesn't use quicksort */
1058 qsort (dents, dentoffs, sizeof (*dents), eio_dent_cmp); /* score depends of DIRS_FIRST */
1059 }
1060 else if (flags & EIO_READDIR_DIRS_FIRST)
1061 {
1062 /* in this case, all is known, and we just put dirs first and sort them */
1063 eio_dirent *ent = dents + dentoffs;
1064 eio_dirent *dir = dents;
1065
1066 while (ent > dir)
1067 {
1068 if (dir->type == DT_DIR)
1069 ++dir;
1070 else
1071 {
1072 --ent;
1073
1074 if (ent->type == DT_DIR)
1075 {
1076 eio_dirent tmp = *dir;
1077 *dir = *ent;
1078 *ent = tmp;
1079
1080 ++dir;
1081 }
1082 }
1083 }
1084
1085 /* now sort the dirs only */
1086 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);
1087 }
1088
1089 /* only provide the names array unless DENTS is specified */
1090 if (!(flags & EIO_READDIR_DENTS))
1091 {
1092 X_LOCK (wrklock);
1093 assert (!dents);
1094 req->ptr1 = 0;
1095 req->ptr2 = names;
1096 X_UNLOCK (wrklock);
1097 }
1098
743 break; 1099 break;
1100 }
744 1101
1102 /* now add the entry to our list(s) */
745 name = entp->d_name; 1103 name = entp->d_name;
746 1104
1105 /* skip . and .. entries */
747 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1106 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
748 { 1107 {
749 int len = strlen (name) + 1; 1108 int len = D_NAMLEN (entp) + 1;
750 1109
751 res++; 1110 while (expect_false (namesoffs + len > namesalloc))
752
753 while (memofs + len > memlen)
754 { 1111 {
755 memlen *= 2; 1112 namesalloc *= 2;
756 X_LOCK (wrklock); 1113 X_LOCK (wrklock);
757 req->ptr2 = names = realloc (names, memlen); 1114 req->ptr1 = names = realloc (names, namesalloc);
758 X_UNLOCK (wrklock); 1115 X_UNLOCK (wrklock);
759 1116
760 if (!names) 1117 if (!names)
761 break; 1118 break;
762 } 1119 }
763 1120
764 memcpy (names + memofs, name, len); 1121 memcpy (names + namesoffs, name, len);
1122
1123 if (dents)
1124 {
1125 struct eio_dirent *ent;
1126
1127 if (expect_false (dentoffs == dentalloc))
1128 {
1129 dentalloc *= 2;
1130 X_LOCK (wrklock);
1131 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1132 X_UNLOCK (wrklock);
1133
1134 if (!dents)
1135 break;
1136 }
1137
1138 ent = dents + dentoffs;
1139
1140 ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */
1141 ent->namelen = len - 1;
1142 ent->inode = D_INO (entp);
1143
1144 switch (D_TYPE (entp))
1145 {
1146 default:
1147 ent->type = EIO_DT_UNKNOWN;
1148 flags |= EIO_READDIR_FOUND_UNKNOWN;
1149 break;
1150
1151 #ifdef DT_FIFO
1152 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1153 #endif
1154 #ifdef DT_CHR
1155 case DT_CHR: ent->type = EIO_DT_CHR; break;
1156 #endif
1157 #ifdef DT_MPC
1158 case DT_MPC: ent->type = EIO_DT_MPC; break;
1159 #endif
1160 #ifdef DT_DIR
1161 case DT_DIR: ent->type = EIO_DT_DIR; break;
1162 #endif
1163 #ifdef DT_NAM
1164 case DT_NAM: ent->type = EIO_DT_NAM; break;
1165 #endif
1166 #ifdef DT_BLK
1167 case DT_BLK: ent->type = EIO_DT_BLK; break;
1168 #endif
1169 #ifdef DT_MPB
1170 case DT_MPB: ent->type = EIO_DT_MPB; break;
1171 #endif
1172 #ifdef DT_REG
1173 case DT_REG: ent->type = EIO_DT_REG; break;
1174 #endif
1175 #ifdef DT_NWK
1176 case DT_NWK: ent->type = EIO_DT_NWK; break;
1177 #endif
1178 #ifdef DT_CMP
1179 case DT_CMP: ent->type = EIO_DT_CMP; break;
1180 #endif
1181 #ifdef DT_LNK
1182 case DT_LNK: ent->type = EIO_DT_LNK; break;
1183 #endif
1184 #ifdef DT_SOCK
1185 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1186 #endif
1187 #ifdef DT_DOOR
1188 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1189 #endif
1190 #ifdef DT_WHT
1191 case DT_WHT: ent->type = EIO_DT_WHT; break;
1192 #endif
1193 }
1194
1195 ent->score = 0;
1196
1197 if (flags & EIO_READDIR_DIRS_FIRST)
1198 {
1199 if (ent->type == EIO_DT_UNKNOWN)
1200 {
1201 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1202 ent->score = 98;
1203 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1204 ent->score = len <= 2 ? len + 60 : len <= 4 ? 50 : len <= 7 ? 40 : 10; /* shorter == more likely dir, but avoid too many classes */
1205 }
1206 else if (ent->type == EIO_DT_DIR)
1207 ent->score = 100;
1208 }
1209 }
1210
765 memofs += len; 1211 namesoffs += len;
1212 ++dentoffs;
766 } 1213 }
767 } 1214 }
768 1215 else
769 if (errno)
770 res = -1;
771
772 req->result = res; 1216 req->result = -1;
1217}
1218
1219#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1220# undef msync
1221# define msync(a,b,c) ((errno = ENOSYS), -1)
1222#endif
1223
1224int
1225eio__mtouch (void *mem, size_t len, int flags)
1226{
1227 intptr_t addr = (intptr_t)mem;
1228 intptr_t end = addr + len;
1229#ifdef PAGESIZE
1230 const intptr_t page = PAGESIZE;
1231#else
1232 static intptr_t page;
1233
1234 if (!page)
1235 page = sysconf (_SC_PAGESIZE);
1236#endif
1237
1238 addr &= ~(page - 1); /* assume page size is always a power of two */
1239
1240 if (addr < end)
1241 if (flags) /* modify */
1242 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1243 else
1244 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1245
1246 return 0;
773} 1247}
774 1248
775/*****************************************************************************/ 1249/*****************************************************************************/
776 1250
777#define ALLOC(len) \ 1251#define ALLOC(len) \
787 req->result = -1; \ 1261 req->result = -1; \
788 break; \ 1262 break; \
789 } \ 1263 } \
790 } 1264 }
791 1265
792X_THREAD_PROC (eio_proc) 1266X_THREAD_PROC (etp_proc)
793{ 1267{
794 eio_req *req; 1268 ETP_REQ *req;
795 struct timespec ts; 1269 struct timespec ts;
796 worker *self = (worker *)thr_arg; 1270 etp_worker *self = (etp_worker *)thr_arg;
797 1271
798 /* try to distribute timeouts somewhat randomly */ 1272 /* try to distribute timeouts somewhat randomly */
799 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1273 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
800 1274
801 for (;;) 1275 for (;;)
802 { 1276 {
803 ts.tv_sec = time (0) + IDLE_TIMEOUT;
804
805 X_LOCK (reqlock); 1277 X_LOCK (reqlock);
806 1278
807 for (;;) 1279 for (;;)
808 { 1280 {
809 self->req = req = reqq_shift (&req_queue); 1281 self->req = req = reqq_shift (&req_queue);
811 if (req) 1283 if (req)
812 break; 1284 break;
813 1285
814 ++idle; 1286 ++idle;
815 1287
1288 ts.tv_sec = time (0) + IDLE_TIMEOUT;
816 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1289 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
817 { 1290 {
818 if (idle > max_idle) 1291 if (idle > max_idle)
819 { 1292 {
820 --idle; 1293 --idle;
825 goto quit; 1298 goto quit;
826 } 1299 }
827 1300
828 /* we are allowed to idle, so do so without any timeout */ 1301 /* we are allowed to idle, so do so without any timeout */
829 X_COND_WAIT (reqwait, reqlock); 1302 X_COND_WAIT (reqwait, reqlock);
830 ts.tv_sec = time (0) + IDLE_TIMEOUT;
831 } 1303 }
832 1304
833 --idle; 1305 --idle;
834 } 1306 }
835 1307
836 --nready; 1308 --nready;
837 1309
838 X_UNLOCK (reqlock); 1310 X_UNLOCK (reqlock);
839 1311
840 errno = 0; /* strictly unnecessary */ 1312 if (req->type < 0)
1313 goto quit;
841 1314
842 if (!EIO_CANCELLED (req)) 1315 if (!EIO_CANCELLED (req))
843 switch (req->type) 1316 ETP_EXECUTE (self, req);
844 {
845 case EIO_READ: ALLOC (req->size);
846 req->result = req->offs >= 0
847 ? pread (req->int1, req->ptr2, req->size, req->offs)
848 : read (req->int1, req->ptr2, req->size); break;
849 case EIO_WRITE: req->result = req->offs >= 0
850 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
851 : write (req->int1, req->ptr2, req->size); break;
852
853 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
854 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
855
856 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
857 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
858 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
859 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
860 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
861 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
862
863 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
864 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
865 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
866 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
867 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
868 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
869
870 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
871 case EIO_CLOSE: req->result = close (req->int1); break;
872 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
873 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
874 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
875 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
876 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
877 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
878 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
879 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
880
881 case EIO_READLINK: ALLOC (NAME_MAX);
882 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
883
884 case EIO_SYNC: req->result = 0; sync (); break;
885 case EIO_FSYNC: req->result = fsync (req->int1); break;
886 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
887
888 case EIO_READDIR: eio__scandir (req, self); break;
889
890 case EIO_BUSY:
891#ifdef _WIN32
892 Sleep (req->nv1 * 1000.);
893#else
894 {
895 struct timeval tv;
896
897 tv.tv_sec = req->nv1;
898 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
899
900 req->result = select (0, 0, 0, 0, &tv);
901 }
902#endif
903 break;
904
905 case EIO_UTIME:
906 case EIO_FUTIME:
907 {
908 struct timeval tv[2];
909 struct timeval *times;
910
911 if (req->nv1 != -1. || req->nv2 != -1.)
912 {
913 tv[0].tv_sec = req->nv1;
914 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
915 tv[1].tv_sec = req->nv2;
916 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
917
918 times = tv;
919 }
920 else
921 times = 0;
922
923
924 req->result = req->type == EIO_FUTIME
925 ? futimes (req->int1, times)
926 : utimes (req->ptr1, times);
927 }
928
929 case EIO_GROUP:
930 case EIO_NOP:
931 req->result = 0;
932 break;
933
934 case EIO_QUIT:
935 goto quit;
936
937 default:
938 req->result = -1;
939 break;
940 }
941
942 req->errorno = errno;
943 1317
944 X_LOCK (reslock); 1318 X_LOCK (reslock);
945 1319
946 ++npending; 1320 ++npending;
947 1321
948 if (!reqq_push (&res_queue, req) && want_poll_cb) 1322 if (!reqq_push (&res_queue, req) && want_poll_cb)
949 want_poll_cb (); 1323 want_poll_cb ();
950 1324
951 self->req = 0; 1325 self->req = 0;
952 worker_clear (self); 1326 etp_worker_clear (self);
953 1327
954 X_UNLOCK (reslock); 1328 X_UNLOCK (reslock);
955 } 1329 }
956 1330
957quit: 1331quit:
958 X_LOCK (wrklock); 1332 X_LOCK (wrklock);
959 worker_free (self); 1333 etp_worker_free (self);
960 X_UNLOCK (wrklock); 1334 X_UNLOCK (wrklock);
961 1335
962 return 0; 1336 return 0;
963} 1337}
964 1338
965/*****************************************************************************/ 1339/*****************************************************************************/
966 1340
967static void eio_atfork_prepare (void)
968{
969 X_LOCK (wrklock);
970 X_LOCK (reqlock);
971 X_LOCK (reslock);
972#if !HAVE_PREADWRITE
973 X_LOCK (preadwritelock);
974#endif
975#if !HAVE_READDIR_R
976 X_LOCK (readdirlock);
977#endif
978}
979
980static void eio_atfork_parent (void)
981{
982#if !HAVE_READDIR_R
983 X_UNLOCK (readdirlock);
984#endif
985#if !HAVE_PREADWRITE
986 X_UNLOCK (preadwritelock);
987#endif
988 X_UNLOCK (reslock);
989 X_UNLOCK (reqlock);
990 X_UNLOCK (wrklock);
991}
992
993static void eio_atfork_child (void)
994{
995 eio_req *prv;
996
997 while (prv = reqq_shift (&req_queue))
998 eio_destroy (prv);
999
1000 while (prv = reqq_shift (&res_queue))
1001 eio_destroy (prv);
1002
1003 while (wrk_first.next != &wrk_first)
1004 {
1005 worker *wrk = wrk_first.next;
1006
1007 if (wrk->req)
1008 eio_destroy (wrk->req);
1009
1010 worker_clear (wrk);
1011 worker_free (wrk);
1012 }
1013
1014 started = 0;
1015 idle = 0;
1016 nreqs = 0;
1017 nready = 0;
1018 npending = 0;
1019
1020 eio_atfork_parent ();
1021}
1022
1023int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1341int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1024{ 1342{
1025 want_poll_cb = want_poll; 1343 return etp_init (want_poll, done_poll);
1026 done_poll_cb = done_poll;
1027
1028#ifdef _WIN32
1029 X_MUTEX_CHECK (wrklock);
1030 X_MUTEX_CHECK (reslock);
1031 X_MUTEX_CHECK (reqlock);
1032 X_MUTEX_CHECK (reqwait);
1033 X_MUTEX_CHECK (preadwritelock);
1034 X_MUTEX_CHECK (readdirlock);
1035
1036 X_COND_CHECK (reqwait);
1037#endif
1038
1039 X_THREAD_ATFORK (eio_atfork_prepare, eio_atfork_parent, eio_atfork_child);
1040} 1344}
1041 1345
1042static void eio_api_destroy (eio_req *req) 1346static void eio_api_destroy (eio_req *req)
1043{ 1347{
1044 free (req); 1348 free (req);
1049 \ 1353 \
1050 req = (eio_req *)calloc (1, sizeof *req); \ 1354 req = (eio_req *)calloc (1, sizeof *req); \
1051 if (!req) \ 1355 if (!req) \
1052 return 0; \ 1356 return 0; \
1053 \ 1357 \
1054 req->type = rtype; \ 1358 req->type = rtype; \
1055 req->pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 1359 req->pri = pri; \
1056 req->finish = cb; \ 1360 req->finish = cb; \
1361 req->data = data; \
1057 req->destroy = eio_api_destroy; 1362 req->destroy = eio_api_destroy;
1058 1363
1059#define SEND eio_submit (req); return req 1364#define SEND eio_submit (req); return req
1060 1365
1061#define PATH \ 1366#define PATH \
1065 { \ 1370 { \
1066 eio_api_destroy (req); \ 1371 eio_api_destroy (req); \
1067 return 0; \ 1372 return 0; \
1068 } 1373 }
1069 1374
1375static void eio_execute (etp_worker *self, eio_req *req)
1376{
1377 errno = 0;
1378
1379 switch (req->type)
1380 {
1381 case EIO_READ: ALLOC (req->size);
1382 req->result = req->offs >= 0
1383 ? pread (req->int1, req->ptr2, req->size, req->offs)
1384 : read (req->int1, req->ptr2, req->size); break;
1385 case EIO_WRITE: req->result = req->offs >= 0
1386 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1387 : write (req->int1, req->ptr2, req->size); break;
1388
1389 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1390 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1391
1392 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1393 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1394 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1395 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1396 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1397 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1398
1399 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1400 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1401 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1402 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1403 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1404 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1405
1406 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1407 case EIO_CLOSE: req->result = close (req->int1); break;
1408 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1409 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1410 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1411 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1412 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1413 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1414 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1415 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1416
1417 case EIO_READLINK: ALLOC (NAME_MAX);
1418 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1419
1420 case EIO_SYNC: req->result = 0; sync (); break;
1421 case EIO_FSYNC: req->result = fsync (req->int1); break;
1422 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1423 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
1424 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1425 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1426
1427 case EIO_READDIR: eio__scandir (req, self); break;
1428
1429 case EIO_BUSY:
1430#ifdef _WIN32
1431 Sleep (req->nv1 * 1000.);
1432#else
1433 {
1434 struct timeval tv;
1435
1436 tv.tv_sec = req->nv1;
1437 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1438
1439 req->result = select (0, 0, 0, 0, &tv);
1440 }
1441#endif
1442 break;
1443
1444 case EIO_UTIME:
1445 case EIO_FUTIME:
1446 {
1447 struct timeval tv[2];
1448 struct timeval *times;
1449
1450 if (req->nv1 != -1. || req->nv2 != -1.)
1451 {
1452 tv[0].tv_sec = req->nv1;
1453 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1454 tv[1].tv_sec = req->nv2;
1455 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1456
1457 times = tv;
1458 }
1459 else
1460 times = 0;
1461
1462
1463 req->result = req->type == EIO_FUTIME
1464 ? futimes (req->int1, times)
1465 : utimes (req->ptr1, times);
1466 }
1467 break;
1468
1469 case EIO_GROUP:
1470 abort (); /* handled in eio_request */
1471
1472 case EIO_NOP:
1473 req->result = 0;
1474 break;
1475
1476 case EIO_CUSTOM:
1477 ((void (*)(eio_req *))req->feed) (req);
1478 break;
1479
1480 default:
1481 req->result = -1;
1482 break;
1483 }
1484
1485 req->errorno = errno;
1486}
1487
1488#ifndef EIO_NO_WRAPPERS
1489
1070eio_req *eio_nop (int pri, eio_cb cb, void *data) 1490eio_req *eio_nop (int pri, eio_cb cb, void *data)
1071{ 1491{
1072 REQ (EIO_NOP); SEND; 1492 REQ (EIO_NOP); SEND;
1073} 1493}
1074 1494
1083} 1503}
1084 1504
1085eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data) 1505eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1086{ 1506{
1087 REQ (EIO_FSYNC); req->int1 = fd; SEND; 1507 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1508}
1509
1510eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1511{
1512 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1513}
1514
1515eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1516{
1517 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1518}
1519
1520eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1521{
1522 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1088} 1523}
1089 1524
1090eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 1525eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1091{ 1526{
1092 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 1527 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1206eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 1641eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1207{ 1642{
1208 return eio__1path (EIO_RMDIR, path, pri, cb, data); 1643 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1209} 1644}
1210 1645
1211eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 1646eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1212{ 1647{
1213 return eio__1path (EIO_READDIR, path, pri, cb, data); 1648 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1214} 1649}
1215 1650
1216eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1651eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1217{ 1652{
1218 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 1653 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1219} 1654}
1220 1655
1221static eio_req * 1656static eio_req *
1222eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1657eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1223{ 1658{
1247eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1682eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1248{ 1683{
1249 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1684 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1250} 1685}
1251 1686
1687eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1688{
1689 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND;
1690}
1691
1692#endif
1693
1252eio_req *eio_grp (eio_cb cb, void *data) 1694eio_req *eio_grp (eio_cb cb, void *data)
1253{ 1695{
1254 const int pri = EIO_PRI_MAX; 1696 const int pri = EIO_PRI_MAX;
1255 1697
1256 REQ (EIO_GROUP); SEND; 1698 REQ (EIO_GROUP); SEND;
1280 1722
1281void eio_grp_add (eio_req *grp, eio_req *req) 1723void eio_grp_add (eio_req *grp, eio_req *req)
1282{ 1724{
1283 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 1725 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1284 1726
1727 grp->flags |= EIO_FLAG_GROUPADD;
1728
1285 ++grp->size; 1729 ++grp->size;
1286 req->grp = grp; 1730 req->grp = grp;
1287 1731
1288 req->grp_prev = 0; 1732 req->grp_prev = 0;
1289 req->grp_next = grp->grp_first; 1733 req->grp_next = grp->grp_first;
1297/*****************************************************************************/ 1741/*****************************************************************************/
1298/* misc garbage */ 1742/* misc garbage */
1299 1743
1300ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1744ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1301{ 1745{
1302 worker wrk; 1746 etp_worker wrk;
1303 1747
1304 wrk.dbuf = 0; 1748 wrk.dbuf = 0;
1305 1749
1306 eio__sendfile (ofd, ifd, offset, count, &wrk); 1750 eio__sendfile (ofd, ifd, offset, count, &wrk);
1307 1751

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines