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

Comparing libeio/eio.c (file contents):
Revision 1.13 by root, Tue May 13 19:34:11 2008 UTC vs.
Revision 1.27 by root, Wed Oct 22 18:15:36 2008 UTC

1/*
2 * libeio implementation
3 *
4 * Copyright (c) 2007,2008 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"
2#include "xthread.h" 41#include "xthread.h"
3 42
4#include <errno.h> 43#include <errno.h>
5#include <stddef.h> 44#include <stddef.h>
70/* buffer size for various temporary buffers */ 109/* buffer size for various temporary buffers */
71#define EIO_BUFSIZE 65536 110#define EIO_BUFSIZE 65536
72 111
73#define dBUF \ 112#define dBUF \
74 char *eio_buf; \ 113 char *eio_buf; \
75 X_LOCK (etplock); \ 114 ETP_WORKER_LOCK (self); \
76 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 115 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \
77 X_UNLOCK (etplock); \ 116 ETP_WORKER_UNLOCK (self); \
78 errno = ENOMEM; \ 117 errno = ENOMEM; \
79 if (!eio_buf) \ 118 if (!eio_buf) \
80 return -1; 119 return -1;
81 120
82#define EIO_TICKS ((1000000 + 1023) >> 10) 121#define EIO_TICKS ((1000000 + 1023) >> 10)
83 122
84/*****************************************************************************/ 123/*****************************************************************************/
85 124
125#if __GNUC__ >= 3
126# define expect(expr,value) __builtin_expect ((expr),(value))
127#else
128# define expect(expr,value) (expr)
129#endif
130
131#define expect_false(expr) expect ((expr) != 0, 0)
132#define expect_true(expr) expect ((expr) != 0, 1)
133
134/*****************************************************************************/
135
136#define ETP_PRI_MIN EIO_PRI_MIN
137#define ETP_PRI_MAX EIO_PRI_MAX
138
139struct etp_worker;
140
141#define ETP_REQ eio_req
142#define ETP_DESTROY(req) eio_destroy (req)
143static int eio_finish (eio_req *req);
144#define ETP_FINISH(req) eio_finish (req)
145static void eio_execute (struct etp_worker *self, eio_req *req);
146#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
147
148#define ETP_WORKER_CLEAR(req) \
149 if (wrk->dbuf) \
150 { \
151 free (wrk->dbuf); \
152 wrk->dbuf = 0; \
153 } \
154 \
155 if (wrk->dirp) \
156 { \
157 closedir (wrk->dirp); \
158 wrk->dirp = 0; \
159 }
160#define ETP_WORKER_COMMON \
161 void *dbuf; \
162 DIR *dirp;
163
164/*****************************************************************************/
165
166#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
167
86/* calculcate time difference in ~1/EIO_TICKS of a second */ 168/* calculcate time difference in ~1/EIO_TICKS of a second */
87static int tvdiff (struct timeval *tv1, struct timeval *tv2) 169static int tvdiff (struct timeval *tv1, struct timeval *tv2)
88{ 170{
89 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 171 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
90 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 172 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
91} 173}
92 174
93static unsigned int started, idle, wanted = 4; 175static unsigned int started, idle, wanted = 4;
94 176
95typedef struct etp_pool
96{
97 void (*want_poll_cb) (void); 177static void (*want_poll_cb) (void);
98 void (*done_poll_cb) (void); 178static void (*done_poll_cb) (void);
99 179
100 unsigned int max_poll_time; 180static unsigned int max_poll_time; /* reslock */
101 unsigned int max_poll_reqs; 181static unsigned int max_poll_reqs; /* reslock */
102} etp_pool;
103 182
104static volatile unsigned int nreqs, nready, npending; 183static volatile unsigned int nreqs; /* reqlock */
184static volatile unsigned int nready; /* reqlock */
185static volatile unsigned int npending; /* reqlock */
105static volatile unsigned int max_idle = 4; 186static volatile unsigned int max_idle = 4;
106 187
107static mutex_t etplock = X_MUTEX_INIT; 188static mutex_t wrklock = X_MUTEX_INIT;
108static mutex_t reslock = X_MUTEX_INIT; 189static mutex_t reslock = X_MUTEX_INIT;
109static mutex_t reqlock = X_MUTEX_INIT; 190static mutex_t reqlock = X_MUTEX_INIT;
110static cond_t reqwait = X_COND_INIT; 191static cond_t reqwait = X_COND_INIT;
111 192
193#if !HAVE_PREADWRITE
194/*
195 * make our pread/pwrite emulation safe against themselves, but not against
196 * normal read/write by using a mutex. slows down execution a lot,
197 * but that's your problem, not mine.
198 */
199static mutex_t preadwritelock = X_MUTEX_INIT;
200#endif
201
112typedef struct worker 202typedef struct etp_worker
113{ 203{
114 /* locked by etplock */ 204 /* locked by wrklock */
115 struct worker *prev, *next; 205 struct etp_worker *prev, *next;
116 206
117 thread_t tid; 207 thread_t tid;
118 208
119 /* locked by reslock, reqlock or etplock */ 209 /* locked by reslock, reqlock or wrklock */
120 eio_req *req; /* currently processed request */ 210 ETP_REQ *req; /* currently processed request */
121 void *dbuf; 211
122 DIR *dirp; 212 ETP_WORKER_COMMON
123} worker; 213} etp_worker;
124 214
125static worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 215static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
216
217#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
218#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
126 219
127/* worker threads management */ 220/* worker threads management */
128 221
129static void worker_clear (worker *wrk) 222static void etp_worker_clear (etp_worker *wrk)
130{ 223{
131 if (wrk->dirp) 224 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} 225}
143 226
144static void worker_free (worker *wrk) 227static void etp_worker_free (etp_worker *wrk)
145{ 228{
146 wrk->next->prev = wrk->prev; 229 wrk->next->prev = wrk->prev;
147 wrk->prev->next = wrk->next; 230 wrk->prev->next = wrk->next;
148 231
149 free (wrk); 232 free (wrk);
150} 233}
151 234
152unsigned int eio_nreqs (void) 235static unsigned int etp_nreqs (void)
153{ 236{
237 int retval;
238 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
239 retval = nreqs;
240 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
154 return nreqs; 241 return retval;
155} 242}
156 243
157unsigned int eio_nready (void) 244static unsigned int etp_nready (void)
158{ 245{
159 unsigned int retval; 246 unsigned int retval;
160 247
161 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 248 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
162 retval = nready; 249 retval = nready;
163 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 250 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
164 251
165 return retval; 252 return retval;
166} 253}
167 254
168unsigned int eio_npending (void) 255static unsigned int etp_npending (void)
169{ 256{
170 unsigned int retval; 257 unsigned int retval;
171 258
172 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 259 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
173 retval = npending; 260 retval = npending;
174 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 261 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
175 262
176 return retval; 263 return retval;
177} 264}
178 265
179unsigned int eio_nthreads (void) 266static unsigned int etp_nthreads (void)
180{ 267{
181 unsigned int retval; 268 unsigned int retval;
182 269
183 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 270 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
184 retval = started; 271 retval = started;
191 * a somewhat faster data structure might be nice, but 278 * a somewhat faster data structure might be nice, but
192 * with 8 priorities this actually needs <20 insns 279 * with 8 priorities this actually needs <20 insns
193 * per shift, the most expensive operation. 280 * per shift, the most expensive operation.
194 */ 281 */
195typedef struct { 282typedef struct {
196 eio_req *qs[EIO_NUM_PRI], *qe[EIO_NUM_PRI]; /* qstart, qend */ 283 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
197 int size; 284 int size;
198} reqq; 285} etp_reqq;
199 286
200static reqq req_queue; 287static etp_reqq req_queue;
201static reqq res_queue; 288static etp_reqq res_queue;
202 289
203static int reqq_push (reqq *q, eio_req *req) 290static int reqq_push (etp_reqq *q, ETP_REQ *req)
204{ 291{
205 int pri = req->pri; 292 int pri = req->pri;
206 req->next = 0; 293 req->next = 0;
207 294
208 if (q->qe[pri]) 295 if (q->qe[pri])
214 q->qe[pri] = q->qs[pri] = req; 301 q->qe[pri] = q->qs[pri] = req;
215 302
216 return q->size++; 303 return q->size++;
217} 304}
218 305
219static eio_req *reqq_shift (reqq *q) 306static ETP_REQ *reqq_shift (etp_reqq *q)
220{ 307{
221 int pri; 308 int pri;
222 309
223 if (!q->size) 310 if (!q->size)
224 return 0; 311 return 0;
225 312
226 --q->size; 313 --q->size;
227 314
228 for (pri = EIO_NUM_PRI; pri--; ) 315 for (pri = ETP_NUM_PRI; pri--; )
229 { 316 {
230 eio_req *req = q->qs[pri]; 317 eio_req *req = q->qs[pri];
231 318
232 if (req) 319 if (req)
233 { 320 {
241 abort (); 328 abort ();
242} 329}
243 330
244static void etp_atfork_prepare (void) 331static void etp_atfork_prepare (void)
245{ 332{
246 X_LOCK (etplock); 333 X_LOCK (wrklock);
247 X_LOCK (reqlock); 334 X_LOCK (reqlock);
248 X_LOCK (reslock); 335 X_LOCK (reslock);
249#if !HAVE_PREADWRITE 336#if !HAVE_PREADWRITE
250 X_LOCK (preadwritelock); 337 X_LOCK (preadwritelock);
251#endif 338#endif
252#if !HAVE_READDIR_R
253 X_LOCK (readdirlock);
254#endif
255} 339}
256 340
257static void etp_atfork_parent (void) 341static void etp_atfork_parent (void)
258{ 342{
259#if !HAVE_READDIR_R
260 X_UNLOCK (readdirlock);
261#endif
262#if !HAVE_PREADWRITE 343#if !HAVE_PREADWRITE
263 X_UNLOCK (preadwritelock); 344 X_UNLOCK (preadwritelock);
264#endif 345#endif
265 X_UNLOCK (reslock); 346 X_UNLOCK (reslock);
266 X_UNLOCK (reqlock); 347 X_UNLOCK (reqlock);
267 X_UNLOCK (etplock); 348 X_UNLOCK (wrklock);
268} 349}
269 350
270static void etp_atfork_child (void) 351static void etp_atfork_child (void)
271{ 352{
272 eio_req *prv; 353 ETP_REQ *prv;
273 354
274 while (prv = reqq_shift (&req_queue)) 355 while ((prv = reqq_shift (&req_queue)))
275 eio_destroy (prv); 356 ETP_DESTROY (prv);
276 357
277 while (prv = reqq_shift (&res_queue)) 358 while ((prv = reqq_shift (&res_queue)))
278 eio_destroy (prv); 359 ETP_DESTROY (prv);
279 360
280 while (wrk_first.next != &wrk_first) 361 while (wrk_first.next != &wrk_first)
281 { 362 {
282 worker *wrk = wrk_first.next; 363 etp_worker *wrk = wrk_first.next;
283 364
284 if (wrk->req) 365 if (wrk->req)
285 eio_destroy (wrk->req); 366 ETP_DESTROY (wrk->req);
286 367
287 worker_clear (wrk); 368 etp_worker_clear (wrk);
288 worker_free (wrk); 369 etp_worker_free (wrk);
289 } 370 }
290 371
291 started = 0; 372 started = 0;
292 idle = 0; 373 idle = 0;
293 nreqs = 0; 374 nreqs = 0;
302{ 383{
303 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 384 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
304} 385}
305 386
306static int 387static int
307etp_init (etp_pool *etp, void (*want_poll)(void), void (*done_poll)(void)) 388etp_init (void (*want_poll)(void), void (*done_poll)(void))
308{ 389{
309 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 390 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
310 391
311 pthread_once (&doinit, etp_once_init); 392 pthread_once (&doinit, etp_once_init);
312 393
313 memset (etp, 0, sizeof *etp);
314
315 etp->want_poll_cb = want_poll; 394 want_poll_cb = want_poll;
316 etp->done_poll_cb = done_poll; 395 done_poll_cb = done_poll;
317}
318 396
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; 397 return 0;
354} 398}
355 399
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); 400X_THREAD_PROC (etp_proc);
407 401
408static void start_thread (void) 402static void etp_start_thread (void)
409{ 403{
410 worker *wrk = calloc (1, sizeof (worker)); 404 etp_worker *wrk = calloc (1, sizeof (etp_worker));
411 405
412 /*TODO*/ 406 /*TODO*/
413 assert (("unable to allocate worker thread data", wrk)); 407 assert (("unable to allocate worker thread data", wrk));
414 408
415 X_LOCK (etplock); 409 X_LOCK (wrklock);
416 410
417 if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) 411 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
418 { 412 {
419 wrk->prev = &wrk_first; 413 wrk->prev = &wrk_first;
420 wrk->next = wrk_first.next; 414 wrk->next = wrk_first.next;
421 wrk_first.next->prev = wrk; 415 wrk_first.next->prev = wrk;
422 wrk_first.next = wrk; 416 wrk_first.next = wrk;
423 ++started; 417 ++started;
424 } 418 }
425 else 419 else
426 free (wrk); 420 free (wrk);
427 421
428 X_UNLOCK (etplock); 422 X_UNLOCK (wrklock);
429} 423}
430 424
431static void maybe_start_thread (void) 425static void etp_maybe_start_thread (void)
432{ 426{
433 if (eio_nthreads () >= wanted) 427 if (expect_true (etp_nthreads () >= wanted))
434 return; 428 return;
435 429
436 /* todo: maybe use idle here, but might be less exact */ 430 /* todo: maybe use idle here, but might be less exact */
437 if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ()) 431 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
438 return; 432 return;
439 433
440 start_thread (); 434 etp_start_thread ();
441} 435}
442 436
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) 437static void etp_end_thread (void)
462{ 438{
463 eio_req *req = calloc (1, sizeof (eio_req)); 439 eio_req *req = calloc (1, sizeof (eio_req));
464 440
465 req->type = EIO_QUIT; 441 req->type = -1;
466 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 442 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
467 443
468 X_LOCK (reqlock); 444 X_LOCK (reqlock);
469 reqq_push (&req_queue, req); 445 reqq_push (&req_queue, req);
470 X_COND_SIGNAL (reqwait); 446 X_COND_SIGNAL (reqwait);
471 X_UNLOCK (reqlock); 447 X_UNLOCK (reqlock);
472 448
473 X_LOCK (etplock); 449 X_LOCK (wrklock);
474 --started; 450 --started;
475 X_UNLOCK (etplock); 451 X_UNLOCK (wrklock);
476} 452}
477 453
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) 454static int etp_poll (void)
515{ 455{
516 int maxreqs = etp.max_poll_reqs; 456 unsigned int maxreqs;
457 unsigned int maxtime;
517 struct timeval tv_start, tv_now; 458 struct timeval tv_start, tv_now;
518 eio_req *req;
519 459
520 if (etp.max_poll_time) 460 X_LOCK (reslock);
461 maxreqs = max_poll_reqs;
462 maxtime = max_poll_time;
463 X_UNLOCK (reslock);
464
465 if (maxtime)
521 gettimeofday (&tv_start, 0); 466 gettimeofday (&tv_start, 0);
522 467
523 for (;;) 468 for (;;)
524 { 469 {
470 ETP_REQ *req;
471
525 maybe_start_thread (); 472 etp_maybe_start_thread ();
526 473
527 X_LOCK (reslock); 474 X_LOCK (reslock);
528 req = reqq_shift (&res_queue); 475 req = reqq_shift (&res_queue);
529 476
530 if (req) 477 if (req)
531 { 478 {
532 --npending; 479 --npending;
533 480
534 if (!res_queue.size && etp.done_poll_cb) 481 if (!res_queue.size && done_poll_cb)
535 etp.done_poll_cb (); 482 done_poll_cb ();
536 } 483 }
537 484
538 X_UNLOCK (reslock); 485 X_UNLOCK (reslock);
539 486
540 if (!req) 487 if (!req)
541 return 0; 488 return 0;
542 489
490 X_LOCK (reqlock);
543 --nreqs; 491 --nreqs;
492 X_UNLOCK (reqlock);
544 493
545 if (req->type == EIO_GROUP && req->size) 494 if (expect_false (req->type == EIO_GROUP && req->size))
546 { 495 {
547 req->int1 = 1; /* mark request as delayed */ 496 req->int1 = 1; /* mark request as delayed */
548 continue; 497 continue;
549 } 498 }
550 else 499 else
551 { 500 {
552 int res = eio_finish (req); 501 int res = ETP_FINISH (req);
553 if (res) 502 if (expect_false (res))
554 return res; 503 return res;
555 } 504 }
556 505
557 if (maxreqs && !--maxreqs) 506 if (expect_false (maxreqs && !--maxreqs))
558 break; 507 break;
559 508
560 if (etp.max_poll_time) 509 if (maxtime)
561 { 510 {
562 gettimeofday (&tv_now, 0); 511 gettimeofday (&tv_now, 0);
563 512
564 if (tvdiff (&tv_start, &tv_now) >= etp.max_poll_time) 513 if (tvdiff (&tv_start, &tv_now) >= maxtime)
565 break; 514 break;
566 } 515 }
567 } 516 }
568 517
569 errno = EAGAIN; 518 errno = EAGAIN;
570 return -1; 519 return -1;
571} 520}
572 521
522static void etp_cancel (ETP_REQ *req)
523{
524 X_LOCK (wrklock);
525 req->flags |= EIO_FLAG_CANCELLED;
526 X_UNLOCK (wrklock);
527
528 eio_grp_cancel (req);
529}
530
531static void etp_submit (ETP_REQ *req)
532{
533 req->pri -= ETP_PRI_MIN;
534
535 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
536 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
537
538 if (expect_false (req->type == EIO_GROUP))
539 {
540 /* I hope this is worth it :/ */
541 X_LOCK (reqlock);
542 ++nreqs;
543 X_UNLOCK (reqlock);
544
545 X_LOCK (reslock);
546
547 ++npending;
548
549 if (!reqq_push (&res_queue, req) && want_poll_cb)
550 want_poll_cb ();
551
552 X_UNLOCK (reslock);
553 }
554 else
555 {
556 X_LOCK (reqlock);
557 ++nreqs;
558 ++nready;
559 reqq_push (&req_queue, req);
560 X_COND_SIGNAL (reqwait);
561 X_UNLOCK (reqlock);
562
563 etp_maybe_start_thread ();
564 }
565}
566
567static void etp_set_max_poll_time (double nseconds)
568{
569 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
570 max_poll_time = nseconds;
571 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
572}
573
574static void etp_set_max_poll_reqs (unsigned int maxreqs)
575{
576 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
577 max_poll_reqs = maxreqs;
578 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
579}
580
581static void etp_set_max_idle (unsigned int nthreads)
582{
583 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
584 max_idle = nthreads <= 0 ? 1 : nthreads;
585 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
586}
587
588static void etp_set_min_parallel (unsigned int nthreads)
589{
590 if (wanted < nthreads)
591 wanted = nthreads;
592}
593
594static void etp_set_max_parallel (unsigned int nthreads)
595{
596 if (wanted > nthreads)
597 wanted = nthreads;
598
599 while (started > wanted)
600 etp_end_thread ();
601}
602
603/*****************************************************************************/
604
605static void grp_try_feed (eio_req *grp)
606{
607 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
608 {
609 grp->flags &= ~EIO_FLAG_GROUPADD;
610
611 EIO_FEED (grp);
612
613 /* stop if no progress has been made */
614 if (!(grp->flags & EIO_FLAG_GROUPADD))
615 {
616 grp->feed = 0;
617 break;
618 }
619 }
620}
621
622static int grp_dec (eio_req *grp)
623{
624 --grp->size;
625
626 /* call feeder, if applicable */
627 grp_try_feed (grp);
628
629 /* finish, if done */
630 if (!grp->size && grp->int1)
631 return eio_finish (grp);
632 else
633 return 0;
634}
635
636void eio_destroy (eio_req *req)
637{
638 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
639 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
640
641 EIO_DESTROY (req);
642}
643
644static int eio_finish (eio_req *req)
645{
646 int res = EIO_FINISH (req);
647
648 if (req->grp)
649 {
650 int res2;
651 eio_req *grp = req->grp;
652
653 /* unlink request */
654 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
655 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
656
657 if (grp->grp_first == req)
658 grp->grp_first = req->grp_next;
659
660 res2 = grp_dec (grp);
661
662 if (!res && res2)
663 res = res2;
664 }
665
666 eio_destroy (req);
667
668 return res;
669}
670
671void eio_grp_cancel (eio_req *grp)
672{
673 for (grp = grp->grp_first; grp; grp = grp->grp_next)
674 eio_cancel (grp);
675}
676
677void eio_cancel (eio_req *req)
678{
679 etp_cancel (req);
680}
681
682void eio_submit (eio_req *req)
683{
684 etp_submit (req);
685}
686
687unsigned int eio_nreqs (void)
688{
689 return etp_nreqs ();
690}
691
692unsigned int eio_nready (void)
693{
694 return etp_nready ();
695}
696
697unsigned int eio_npending (void)
698{
699 return etp_npending ();
700}
701
702unsigned int eio_nthreads (void)
703{
704 return etp_nthreads ();
705}
706
707void eio_set_max_poll_time (double nseconds)
708{
709 etp_set_max_poll_time (nseconds);
710}
711
712void eio_set_max_poll_reqs (unsigned int maxreqs)
713{
714 etp_set_max_poll_reqs (maxreqs);
715}
716
717void eio_set_max_idle (unsigned int nthreads)
718{
719 etp_set_max_idle (nthreads);
720}
721
722void eio_set_min_parallel (unsigned int nthreads)
723{
724 etp_set_min_parallel (nthreads);
725}
726
727void eio_set_max_parallel (unsigned int nthreads)
728{
729 etp_set_max_parallel (nthreads);
730}
731
732int eio_poll (void)
733{
734 return etp_poll ();
735}
736
573/*****************************************************************************/ 737/*****************************************************************************/
574/* work around various missing functions */ 738/* work around various missing functions */
575 739
576#if !HAVE_PREADWRITE 740#if !HAVE_PREADWRITE
741# undef pread
742# undef pwrite
577# define pread eio__pread 743# define pread eio__pread
578# define pwrite eio__pwrite 744# 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 745
587static ssize_t 746static ssize_t
588eio__pread (int fd, void *buf, size_t count, off_t offset) 747eio__pread (int fd, void *buf, size_t count, off_t offset)
589{ 748{
590 ssize_t res; 749 ssize_t res;
617} 776}
618#endif 777#endif
619 778
620#ifndef HAVE_FUTIMES 779#ifndef HAVE_FUTIMES
621 780
781# undef utimes
782# undef futimes
622# define utimes(path,times) eio__utimes (path, times) 783# define utimes(path,times) eio__utimes (path, times)
623# define futimes(fd,times) eio__futimes (fd, times) 784# define futimes(fd,times) eio__futimes (fd, times)
624 785
625static int 786static int
626eio__utimes (const char *filename, const struct timeval times[2]) 787eio__utimes (const char *filename, const struct timeval times[2])
645} 806}
646 807
647#endif 808#endif
648 809
649#if !HAVE_FDATASYNC 810#if !HAVE_FDATASYNC
811# undef fdatasync
650# define fdatasync fsync 812# define fdatasync(fd) fsync (fd)
651#endif 813#endif
814
815/* sync_file_range always needs emulation */
816int
817eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
818{
819#if HAVE_SYNC_FILE_RANGE
820 int res;
821
822 if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
823 || EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
824 || EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
825 {
826 flags = 0
827 | (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
828 | (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
829 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
830 }
831
832 res = sync_file_range (fd, offset, nbytes, flags);
833
834 if (res != ENOSYS)
835 return res;
836#endif
837
838 /* even though we could play tricks with the flags, it's better to always
839 * call fdatasync, as thta matches the expectation of it's users best */
840 return fdatasync (fd);
841}
652 842
653#if !HAVE_READAHEAD 843#if !HAVE_READAHEAD
844# undef readahead
654# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 845# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
655 846
656static ssize_t 847static ssize_t
657eio__readahead (int fd, off_t offset, size_t count, worker *self) 848eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
658{ 849{
659 size_t todo = count; 850 size_t todo = count;
660 dBUF; 851 dBUF;
661 852
662 while (todo > 0) 853 while (todo > 0)
672 return count; 863 return count;
673} 864}
674 865
675#endif 866#endif
676 867
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 */ 868/* sendfile always needs emulation */
709static ssize_t 869static ssize_t
710eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self) 870eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
711{ 871{
712 ssize_t res; 872 ssize_t res;
713 873
714 if (!count) 874 if (!count)
715 return 0; 875 return 0;
799 return res; 959 return res;
800} 960}
801 961
802/* read a full directory */ 962/* read a full directory */
803static void 963static void
804eio__scandir (eio_req *req, worker *self) 964eio__scandir (eio_req *req, etp_worker *self)
805{ 965{
806 DIR *dirp; 966 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; 967 EIO_STRUCT_DIRENT *entp;
813 char *name, *names; 968 char *name, *names;
814 int memlen = 4096; 969 int memlen = 4096;
815 int memofs = 0; 970 int memofs = 0;
816 int res = 0; 971 int res = 0;
817 972
818 X_LOCK (etplock); 973 X_LOCK (wrklock);
974 /* the corresponding closedir is in ETP_WORKER_CLEAR */
819 self->dirp = dirp = opendir (req->ptr1); 975 self->dirp = dirp = opendir (req->ptr1);
820 self->dbuf = u = malloc (sizeof (*u));
821 req->flags |= EIO_FLAG_PTR2_FREE; 976 req->flags |= EIO_FLAG_PTR2_FREE;
822 req->ptr2 = names = malloc (memlen); 977 req->ptr2 = names = malloc (memlen);
823 X_UNLOCK (etplock); 978 X_UNLOCK (wrklock);
824 979
825 if (dirp && u && names) 980 if (dirp && names)
826 for (;;) 981 for (;;)
827 { 982 {
828 errno = 0; 983 errno = 0;
829 readdir_r (dirp, &u->d, &entp); 984 entp = readdir (dirp);
830 985
831 if (!entp) 986 if (!entp)
832 break; 987 break;
833 988
834 name = entp->d_name; 989 name = entp->d_name;
840 res++; 995 res++;
841 996
842 while (memofs + len > memlen) 997 while (memofs + len > memlen)
843 { 998 {
844 memlen *= 2; 999 memlen *= 2;
845 X_LOCK (etplock); 1000 X_LOCK (wrklock);
846 req->ptr2 = names = realloc (names, memlen); 1001 req->ptr2 = names = realloc (names, memlen);
847 X_UNLOCK (etplock); 1002 X_UNLOCK (wrklock);
848 1003
849 if (!names) 1004 if (!names)
850 break; 1005 break;
851 } 1006 }
852 1007
859 res = -1; 1014 res = -1;
860 1015
861 req->result = res; 1016 req->result = res;
862} 1017}
863 1018
1019#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1020# undef msync
1021# define msync(a,b,c) ENOSYS
1022#endif
1023
1024int
1025eio__mtouch (void *mem, size_t len, int flags)
1026{
1027 intptr_t addr = (intptr_t)mem;
1028 intptr_t end = addr + len;
1029#ifdef PAGESIZE
1030 const intptr_t page = PAGESIZE;
1031#else
1032 static intptr_t page;
1033
1034 if (!page)
1035 page = sysconf (_SC_PAGESIZE);
1036#endif
1037
1038 addr &= ~(page - 1); /* assume page size is always a power of two */
1039
1040 if (addr < end)
1041 if (flags) /* modify */
1042 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1043 else
1044 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1045
1046 return 0;
1047}
1048
864/*****************************************************************************/ 1049/*****************************************************************************/
865 1050
866#define ALLOC(len) \ 1051#define ALLOC(len) \
867 if (!req->ptr2) \ 1052 if (!req->ptr2) \
868 { \ 1053 { \
869 X_LOCK (etplock); \ 1054 X_LOCK (wrklock); \
870 req->flags |= EIO_FLAG_PTR2_FREE; \ 1055 req->flags |= EIO_FLAG_PTR2_FREE; \
871 X_UNLOCK (etplock); \ 1056 X_UNLOCK (wrklock); \
872 req->ptr2 = malloc (len); \ 1057 req->ptr2 = malloc (len); \
873 if (!req->ptr2) \ 1058 if (!req->ptr2) \
874 { \ 1059 { \
875 errno = ENOMEM; \ 1060 errno = ENOMEM; \
876 req->result = -1; \ 1061 req->result = -1; \
877 break; \ 1062 break; \
878 } \ 1063 } \
879 } 1064 }
880 1065
881X_THREAD_PROC (eio_proc) 1066X_THREAD_PROC (etp_proc)
882{ 1067{
883 eio_req *req; 1068 ETP_REQ *req;
884 struct timespec ts; 1069 struct timespec ts;
885 worker *self = (worker *)thr_arg; 1070 etp_worker *self = (etp_worker *)thr_arg;
886 1071
887 /* try to distribute timeouts somewhat randomly */ 1072 /* try to distribute timeouts somewhat randomly */
888 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1073 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
889 1074
890 for (;;) 1075 for (;;)
891 { 1076 {
892 ts.tv_sec = time (0) + IDLE_TIMEOUT;
893
894 X_LOCK (reqlock); 1077 X_LOCK (reqlock);
895 1078
896 for (;;) 1079 for (;;)
897 { 1080 {
898 self->req = req = reqq_shift (&req_queue); 1081 self->req = req = reqq_shift (&req_queue);
900 if (req) 1083 if (req)
901 break; 1084 break;
902 1085
903 ++idle; 1086 ++idle;
904 1087
1088 ts.tv_sec = time (0) + IDLE_TIMEOUT;
905 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1089 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
906 { 1090 {
907 if (idle > max_idle) 1091 if (idle > max_idle)
908 { 1092 {
909 --idle; 1093 --idle;
910 X_UNLOCK (reqlock); 1094 X_UNLOCK (reqlock);
911 X_LOCK (etplock); 1095 X_LOCK (wrklock);
912 --started; 1096 --started;
913 X_UNLOCK (etplock); 1097 X_UNLOCK (wrklock);
914 goto quit; 1098 goto quit;
915 } 1099 }
916 1100
917 /* we are allowed to idle, so do so without any timeout */ 1101 /* we are allowed to idle, so do so without any timeout */
918 X_COND_WAIT (reqwait, reqlock); 1102 X_COND_WAIT (reqwait, reqlock);
919 ts.tv_sec = time (0) + IDLE_TIMEOUT;
920 } 1103 }
921 1104
922 --idle; 1105 --idle;
923 } 1106 }
924 1107
925 --nready; 1108 --nready;
926 1109
927 X_UNLOCK (reqlock); 1110 X_UNLOCK (reqlock);
928 1111
929 errno = 0; /* strictly unnecessary */ 1112 if (req->type < 0)
1113 goto quit;
930 1114
931 if (!EIO_CANCELLED (req)) 1115 if (!EIO_CANCELLED (req))
932 switch (req->type) 1116 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 1117
1033 X_LOCK (reslock); 1118 X_LOCK (reslock);
1034 1119
1035 ++npending; 1120 ++npending;
1036 1121
1037 if (!reqq_push (&res_queue, req) && etp.want_poll_cb) 1122 if (!reqq_push (&res_queue, req) && want_poll_cb)
1038 etp.want_poll_cb (); 1123 want_poll_cb ();
1039 1124
1040 self->req = 0; 1125 self->req = 0;
1041 worker_clear (self); 1126 etp_worker_clear (self);
1042 1127
1043 X_UNLOCK (reslock); 1128 X_UNLOCK (reslock);
1044 } 1129 }
1045 1130
1046quit: 1131quit:
1047 X_LOCK (etplock); 1132 X_LOCK (wrklock);
1048 worker_free (self); 1133 etp_worker_free (self);
1049 X_UNLOCK (etplock); 1134 X_UNLOCK (wrklock);
1050 1135
1051 return 0; 1136 return 0;
1052} 1137}
1053 1138
1054/*****************************************************************************/ 1139/*****************************************************************************/
1055 1140
1056int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1141int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1057{ 1142{
1058 etp_init (&etp, want_poll, done_poll); 1143 return etp_init (want_poll, done_poll);
1059} 1144}
1060 1145
1061static void eio_api_destroy (eio_req *req) 1146static void eio_api_destroy (eio_req *req)
1062{ 1147{
1063 free (req); 1148 free (req);
1085 { \ 1170 { \
1086 eio_api_destroy (req); \ 1171 eio_api_destroy (req); \
1087 return 0; \ 1172 return 0; \
1088 } 1173 }
1089 1174
1175static void eio_execute (etp_worker *self, eio_req *req)
1176{
1177 errno = 0;
1178
1179 switch (req->type)
1180 {
1181 case EIO_READ: ALLOC (req->size);
1182 req->result = req->offs >= 0
1183 ? pread (req->int1, req->ptr2, req->size, req->offs)
1184 : read (req->int1, req->ptr2, req->size); break;
1185 case EIO_WRITE: req->result = req->offs >= 0
1186 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1187 : write (req->int1, req->ptr2, req->size); break;
1188
1189 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1190 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1191
1192 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1193 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1194 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1195 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1196 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1197 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1198
1199 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1200 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1201 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1202 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1203 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1204 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1205
1206 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1207 case EIO_CLOSE: req->result = close (req->int1); break;
1208 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1209 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1210 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1211 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1212 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1213 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1214 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1215 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1216
1217 case EIO_READLINK: ALLOC (NAME_MAX);
1218 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1219
1220 case EIO_SYNC: req->result = 0; sync (); break;
1221 case EIO_FSYNC: req->result = fsync (req->int1); break;
1222 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1223 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
1224 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1225 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1226
1227 case EIO_READDIR: eio__scandir (req, self); break;
1228
1229 case EIO_BUSY:
1230#ifdef _WIN32
1231 Sleep (req->nv1 * 1000.);
1232#else
1233 {
1234 struct timeval tv;
1235
1236 tv.tv_sec = req->nv1;
1237 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1238
1239 req->result = select (0, 0, 0, 0, &tv);
1240 }
1241#endif
1242 break;
1243
1244 case EIO_UTIME:
1245 case EIO_FUTIME:
1246 {
1247 struct timeval tv[2];
1248 struct timeval *times;
1249
1250 if (req->nv1 != -1. || req->nv2 != -1.)
1251 {
1252 tv[0].tv_sec = req->nv1;
1253 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1254 tv[1].tv_sec = req->nv2;
1255 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1256
1257 times = tv;
1258 }
1259 else
1260 times = 0;
1261
1262
1263 req->result = req->type == EIO_FUTIME
1264 ? futimes (req->int1, times)
1265 : utimes (req->ptr1, times);
1266 }
1267 break;
1268
1269 case EIO_GROUP:
1270 abort (); /* handled in eio_request */
1271
1272 case EIO_NOP:
1273 req->result = 0;
1274 break;
1275
1276 case EIO_CUSTOM:
1277 ((void (*)(eio_req *))req->feed) (req);
1278 break;
1279
1280 default:
1281 req->result = -1;
1282 break;
1283 }
1284
1285 req->errorno = errno;
1286}
1287
1090#ifndef EIO_NO_WRAPPERS 1288#ifndef EIO_NO_WRAPPERS
1091 1289
1092eio_req *eio_nop (int pri, eio_cb cb, void *data) 1290eio_req *eio_nop (int pri, eio_cb cb, void *data)
1093{ 1291{
1094 REQ (EIO_NOP); SEND; 1292 REQ (EIO_NOP); SEND;
1105} 1303}
1106 1304
1107eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data) 1305eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1108{ 1306{
1109 REQ (EIO_FSYNC); req->int1 = fd; SEND; 1307 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1308}
1309
1310eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1311{
1312 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1313}
1314
1315eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1316{
1317 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1318}
1319
1320eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1321{
1322 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1110} 1323}
1111 1324
1112eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 1325eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1113{ 1326{
1114 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 1327 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1235 return eio__1path (EIO_READDIR, path, pri, cb, data); 1448 return eio__1path (EIO_READDIR, path, pri, cb, data);
1236} 1449}
1237 1450
1238eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1451eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1239{ 1452{
1240 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 1453 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1241} 1454}
1242 1455
1243static eio_req * 1456static eio_req *
1244eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1457eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1245{ 1458{
1269eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1482eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1270{ 1483{
1271 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1484 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1272} 1485}
1273 1486
1487eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1488{
1489 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND;
1490}
1491
1274#endif 1492#endif
1275 1493
1276eio_req *eio_grp (eio_cb cb, void *data) 1494eio_req *eio_grp (eio_cb cb, void *data)
1277{ 1495{
1278 const int pri = EIO_PRI_MAX; 1496 const int pri = EIO_PRI_MAX;
1304 1522
1305void eio_grp_add (eio_req *grp, eio_req *req) 1523void eio_grp_add (eio_req *grp, eio_req *req)
1306{ 1524{
1307 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 1525 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1308 1526
1527 grp->flags |= EIO_FLAG_GROUPADD;
1528
1309 ++grp->size; 1529 ++grp->size;
1310 req->grp = grp; 1530 req->grp = grp;
1311 1531
1312 req->grp_prev = 0; 1532 req->grp_prev = 0;
1313 req->grp_next = grp->grp_first; 1533 req->grp_next = grp->grp_first;
1321/*****************************************************************************/ 1541/*****************************************************************************/
1322/* misc garbage */ 1542/* misc garbage */
1323 1543
1324ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1544ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1325{ 1545{
1326 worker wrk; 1546 etp_worker wrk;
1327 1547
1328 wrk.dbuf = 0; 1548 wrk.dbuf = 0;
1329 1549
1330 eio__sendfile (ofd, ifd, offset, count, &wrk); 1550 eio__sendfile (ofd, ifd, offset, count, &wrk);
1331 1551

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines