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.15 by root, Sat May 17 12:26:57 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 (wrklock); \ 114 ETP_WORKER_LOCK (self); \
76 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 115 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \
77 X_UNLOCK (wrklock); \ 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
123/*****************************************************************************/
124
125#define ETP_PRI_MIN EIO_PRI_MIN
126#define ETP_PRI_MAX EIO_PRI_MAX
127
128struct etp_worker;
129
130#define ETP_REQ eio_req
131#define ETP_DESTROY(req) eio_destroy (req)
132static int eio_finish (eio_req *req);
133#define ETP_FINISH(req) eio_finish (req)
134static void eio_execute (struct etp_worker *self, eio_req *req);
135#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
136
137#define ETP_WORKER_CLEAR(req) \
138 if (wrk->dbuf) \
139 { \
140 free (wrk->dbuf); \
141 wrk->dbuf = 0; \
142 } \
143 \
144 if (wrk->dirp) \
145 { \
146 closedir (wrk->dirp); \
147 wrk->dirp = 0; \
148 }
149#define ETP_WORKER_COMMON \
150 void *dbuf; \
151 DIR *dirp;
152
153/*****************************************************************************/
154
155#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
156
157/* calculcate time difference in ~1/EIO_TICKS of a second */
158static int tvdiff (struct timeval *tv1, struct timeval *tv2)
159{
160 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
161 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
162}
163
164static unsigned int started, idle, wanted = 4;
165
84static void (*want_poll_cb) (void); 166static void (*want_poll_cb) (void);
85static void (*done_poll_cb) (void); 167static void (*done_poll_cb) (void);
86 168
87static unsigned int max_poll_time = 0; 169static unsigned int max_poll_time; /* reslock */
88static unsigned int max_poll_reqs = 0; 170static unsigned int max_poll_reqs; /* reslock */
89 171
90/* calculcate time difference in ~1/EIO_TICKS of a second */ 172static volatile unsigned int nreqs; /* reqlock */
91static int tvdiff (struct timeval *tv1, struct timeval *tv2) 173static volatile unsigned int nready; /* reqlock */
92{ 174static volatile unsigned int npending; /* reqlock */
93 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 175static volatile unsigned int max_idle = 4;
94 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
95}
96 176
97static unsigned int started, idle, wanted = 4;
98
99/* worker threads management */
100static mutex_t wrklock = X_MUTEX_INIT; 177static 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; 178static mutex_t reslock = X_MUTEX_INIT;
144static mutex_t reqlock = X_MUTEX_INIT; 179static mutex_t reqlock = X_MUTEX_INIT;
145static cond_t reqwait = X_COND_INIT; 180static cond_t reqwait = X_COND_INIT;
146 181
182typedef struct etp_worker
183{
184 /* locked by wrklock */
185 struct etp_worker *prev, *next;
186
187 thread_t tid;
188
189 /* locked by reslock, reqlock or wrklock */
190 ETP_REQ *req; /* currently processed request */
191
192 ETP_WORKER_COMMON
193} etp_worker;
194
195static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
196
197#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
198#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
199
200/* worker threads management */
201
202static void etp_worker_clear (etp_worker *wrk)
203{
204 ETP_WORKER_CLEAR (wrk);
205}
206
207static void etp_worker_free (etp_worker *wrk)
208{
209 wrk->next->prev = wrk->prev;
210 wrk->prev->next = wrk->next;
211
212 free (wrk);
213}
214
147unsigned int eio_nreqs (void) 215static unsigned int etp_nreqs (void)
148{ 216{
217 int retval;
218 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
219 retval = nreqs;
220 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
149 return nreqs; 221 return retval;
150} 222}
151 223
152unsigned int eio_nready (void) 224static unsigned int etp_nready (void)
153{ 225{
154 unsigned int retval; 226 unsigned int retval;
155 227
156 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 228 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
157 retval = nready; 229 retval = nready;
158 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 230 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
159 231
160 return retval; 232 return retval;
161} 233}
162 234
163unsigned int eio_npending (void) 235static unsigned int etp_npending (void)
164{ 236{
165 unsigned int retval; 237 unsigned int retval;
166 238
167 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 239 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
168 retval = npending; 240 retval = npending;
169 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 241 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
170 242
171 return retval; 243 return retval;
172} 244}
173 245
174unsigned int eio_nthreads (void) 246static unsigned int etp_nthreads (void)
175{ 247{
176 unsigned int retval; 248 unsigned int retval;
177 249
178 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 250 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
179 retval = started; 251 retval = started;
… …
186 * a somewhat faster data structure might be nice, but 258 * a somewhat faster data structure might be nice, but
187 * with 8 priorities this actually needs <20 insns 259 * with 8 priorities this actually needs <20 insns
188 * per shift, the most expensive operation. 260 * per shift, the most expensive operation.
189 */ 261 */
190typedef struct { 262typedef struct {
191 eio_req *qs[EIO_NUM_PRI], *qe[EIO_NUM_PRI]; /* qstart, qend */ 263 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
192 int size; 264 int size;
193} reqq; 265} etp_reqq;
194 266
195static reqq req_queue; 267static etp_reqq req_queue;
196static reqq res_queue; 268static etp_reqq res_queue;
197 269
198static int reqq_push (reqq *q, eio_req *req) 270static int reqq_push (etp_reqq *q, ETP_REQ *req)
199{ 271{
200 int pri = req->pri; 272 int pri = req->pri;
201 req->next = 0; 273 req->next = 0;
202 274
203 if (q->qe[pri]) 275 if (q->qe[pri])
… …
209 q->qe[pri] = q->qs[pri] = req; 281 q->qe[pri] = q->qs[pri] = req;
210 282
211 return q->size++; 283 return q->size++;
212} 284}
213 285
214static eio_req *reqq_shift (reqq *q) 286static ETP_REQ *reqq_shift (etp_reqq *q)
215{ 287{
216 int pri; 288 int pri;
217 289
218 if (!q->size) 290 if (!q->size)
219 return 0; 291 return 0;
220 292
221 --q->size; 293 --q->size;
222 294
223 for (pri = EIO_NUM_PRI; pri--; ) 295 for (pri = ETP_NUM_PRI; pri--; )
224 { 296 {
225 eio_req *req = q->qs[pri]; 297 eio_req *req = q->qs[pri];
226 298
227 if (req) 299 if (req)
228 { 300 {
… …
234 } 306 }
235 307
236 abort (); 308 abort ();
237} 309}
238 310
239static void grp_try_feed (eio_req *grp) 311static void etp_atfork_prepare (void)
240{ 312{
241 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 313 X_LOCK (wrklock);
314 X_LOCK (reqlock);
315 X_LOCK (reslock);
316#if !HAVE_PREADWRITE
317 X_LOCK (preadwritelock);
318#endif
319#if !HAVE_READDIR_R
320 X_LOCK (readdirlock);
321#endif
322}
323
324static void etp_atfork_parent (void)
325{
326#if !HAVE_READDIR_R
327 X_UNLOCK (readdirlock);
328#endif
329#if !HAVE_PREADWRITE
330 X_UNLOCK (preadwritelock);
331#endif
332 X_UNLOCK (reslock);
333 X_UNLOCK (reqlock);
334 X_UNLOCK (wrklock);
335}
336
337static void etp_atfork_child (void)
338{
339 ETP_REQ *prv;
340
341 while (prv = reqq_shift (&req_queue))
342 ETP_DESTROY (prv);
343
344 while (prv = reqq_shift (&res_queue))
345 ETP_DESTROY (prv);
346
347 while (wrk_first.next != &wrk_first)
242 { 348 {
243 int old_len = grp->size; 349 etp_worker *wrk = wrk_first.next;
244 350
245 EIO_FEED (grp); 351 if (wrk->req)
352 ETP_DESTROY (wrk->req);
246 353
247 /* stop if no progress has been made */ 354 etp_worker_clear (wrk);
248 if (old_len == grp->size) 355 etp_worker_free (wrk);
249 {
250 grp->feed = 0;
251 break;
252 }
253 }
254}
255
256static int eio_finish (eio_req *req);
257
258static int grp_dec (eio_req *grp)
259{
260 --grp->size;
261
262 /* call feeder, if applicable */
263 grp_try_feed (grp);
264
265 /* finish, if done */
266 if (!grp->size && grp->int1)
267 return eio_finish (grp);
268 else
269 return 0;
270}
271
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 { 356 }
286 int res2;
287 eio_req *grp = req->grp;
288 357
289 /* unlink request */ 358 started = 0;
290 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev; 359 idle = 0;
291 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next; 360 nreqs = 0;
361 nready = 0;
362 npending = 0;
292 363
293 if (grp->grp_first == req) 364 etp_atfork_parent ();
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} 365}
306 366
307void eio_grp_cancel (eio_req *grp) 367static void
308{ 368etp_once_init (void)
309 for (grp = grp->grp_first; grp; grp = grp->grp_next) 369{
310 eio_cancel (grp); 370 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
311} 371}
312 372
313void eio_cancel (eio_req *req) 373static int
374etp_init (void (*want_poll)(void), void (*done_poll)(void))
314{ 375{
315 X_LOCK (wrklock); 376 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
316 req->flags |= EIO_FLAG_CANCELLED;
317 X_UNLOCK (wrklock);
318 377
319 eio_grp_cancel (req); 378 pthread_once (&doinit, etp_once_init);
320}
321 379
380 want_poll_cb = want_poll;
381 done_poll_cb = done_poll;
382}
383
322X_THREAD_PROC (eio_proc); 384X_THREAD_PROC (etp_proc);
323 385
324static void start_thread (void) 386static void etp_start_thread (void)
325{ 387{
326 worker *wrk = calloc (1, sizeof (worker)); 388 etp_worker *wrk = calloc (1, sizeof (etp_worker));
327 389
328 /*TODO*/ 390 /*TODO*/
329 assert (("unable to allocate worker thread data", wrk)); 391 assert (("unable to allocate worker thread data", wrk));
330 392
331 X_LOCK (wrklock); 393 X_LOCK (wrklock);
332 394
333 if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) 395 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
334 { 396 {
335 wrk->prev = &wrk_first; 397 wrk->prev = &wrk_first;
336 wrk->next = wrk_first.next; 398 wrk->next = wrk_first.next;
337 wrk_first.next->prev = wrk; 399 wrk_first.next->prev = wrk;
338 wrk_first.next = wrk; 400 wrk_first.next = wrk;
… …
342 free (wrk); 404 free (wrk);
343 405
344 X_UNLOCK (wrklock); 406 X_UNLOCK (wrklock);
345} 407}
346 408
347static void maybe_start_thread (void) 409static void etp_maybe_start_thread (void)
348{ 410{
349 if (eio_nthreads () >= wanted) 411 if (etp_nthreads () >= wanted)
350 return; 412 return;
351 413
352 /* todo: maybe use idle here, but might be less exact */ 414 /* todo: maybe use idle here, but might be less exact */
353 if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ()) 415 if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())
354 return; 416 return;
355 417
356 start_thread (); 418 etp_start_thread ();
357} 419}
358 420
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) 421static void etp_end_thread (void)
373{ 422{
374 eio_req *req = calloc (1, sizeof (eio_req)); 423 eio_req *req = calloc (1, sizeof (eio_req));
375 424
376 req->type = EIO_QUIT; 425 req->type = -1;
377 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 426 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
378 427
379 X_LOCK (reqlock); 428 X_LOCK (reqlock);
380 reqq_push (&req_queue, req); 429 reqq_push (&req_queue, req);
381 X_COND_SIGNAL (reqwait); 430 X_COND_SIGNAL (reqwait);
382 X_UNLOCK (reqlock); 431 X_UNLOCK (reqlock);
… …
384 X_LOCK (wrklock); 433 X_LOCK (wrklock);
385 --started; 434 --started;
386 X_UNLOCK (wrklock); 435 X_UNLOCK (wrklock);
387} 436}
388 437
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) 438static int etp_poll (void)
426{ 439{
427 int maxreqs = max_poll_reqs; 440 unsigned int maxreqs;
441 unsigned int maxtime;
428 struct timeval tv_start, tv_now; 442 struct timeval tv_start, tv_now;
429 eio_req *req;
430 443
444 X_LOCK (reslock);
445 maxreqs = max_poll_reqs;
446 maxtime = max_poll_time;
447 X_UNLOCK (reslock);
448
431 if (max_poll_time) 449 if (maxtime)
432 gettimeofday (&tv_start, 0); 450 gettimeofday (&tv_start, 0);
433 451
434 for (;;) 452 for (;;)
435 { 453 {
454 ETP_REQ *req;
455
436 maybe_start_thread (); 456 etp_maybe_start_thread ();
437 457
438 X_LOCK (reslock); 458 X_LOCK (reslock);
439 req = reqq_shift (&res_queue); 459 req = reqq_shift (&res_queue);
440 460
441 if (req) 461 if (req)
… …
449 X_UNLOCK (reslock); 469 X_UNLOCK (reslock);
450 470
451 if (!req) 471 if (!req)
452 return 0; 472 return 0;
453 473
474 X_LOCK (reqlock);
454 --nreqs; 475 --nreqs;
476 X_UNLOCK (reqlock);
455 477
456 if (req->type == EIO_GROUP && req->size) 478 if (req->type == EIO_GROUP && req->size)
457 { 479 {
458 req->int1 = 1; /* mark request as delayed */ 480 req->int1 = 1; /* mark request as delayed */
459 continue; 481 continue;
460 } 482 }
461 else 483 else
462 { 484 {
463 int res = eio_finish (req); 485 int res = ETP_FINISH (req);
464 if (res) 486 if (res)
465 return res; 487 return res;
466 } 488 }
467 489
468 if (maxreqs && !--maxreqs) 490 if (maxreqs && !--maxreqs)
469 break; 491 break;
470 492
471 if (max_poll_time) 493 if (maxtime)
472 { 494 {
473 gettimeofday (&tv_now, 0); 495 gettimeofday (&tv_now, 0);
474 496
475 if (tvdiff (&tv_start, &tv_now) >= max_poll_time) 497 if (tvdiff (&tv_start, &tv_now) >= maxtime)
476 break; 498 break;
477 } 499 }
478 } 500 }
479 501
480 errno = EAGAIN; 502 errno = EAGAIN;
481 return -1; 503 return -1;
504}
505
506static void etp_cancel (ETP_REQ *req)
507{
508 X_LOCK (wrklock);
509 req->flags |= EIO_FLAG_CANCELLED;
510 X_UNLOCK (wrklock);
511
512 eio_grp_cancel (req);
513}
514
515static void etp_submit (ETP_REQ *req)
516{
517 req->pri -= ETP_PRI_MIN;
518
519 if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
520 if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
521
522 X_LOCK (reqlock);
523 ++nreqs;
524 ++nready;
525 reqq_push (&req_queue, req);
526 X_COND_SIGNAL (reqwait);
527 X_UNLOCK (reqlock);
528
529 etp_maybe_start_thread ();
530}
531
532static void etp_set_max_poll_time (double nseconds)
533{
534 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
535 max_poll_time = nseconds;
536 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
537}
538
539static void etp_set_max_poll_reqs (unsigned int maxreqs)
540{
541 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
542 max_poll_reqs = maxreqs;
543 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
544}
545
546static void etp_set_max_idle (unsigned int nthreads)
547{
548 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
549 max_idle = nthreads <= 0 ? 1 : nthreads;
550 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
551}
552
553static void etp_set_min_parallel (unsigned int nthreads)
554{
555 if (wanted < nthreads)
556 wanted = nthreads;
557}
558
559static void etp_set_max_parallel (unsigned int nthreads)
560{
561 if (wanted > nthreads)
562 wanted = nthreads;
563
564 while (started > wanted)
565 etp_end_thread ();
566}
567
568/*****************************************************************************/
569
570static void grp_try_feed (eio_req *grp)
571{
572 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
573 {
574 int old_len = grp->size;
575
576 EIO_FEED (grp);
577
578 /* stop if no progress has been made */
579 if (old_len == grp->size)
580 {
581 grp->feed = 0;
582 break;
583 }
584 }
585}
586
587static int grp_dec (eio_req *grp)
588{
589 --grp->size;
590
591 /* call feeder, if applicable */
592 grp_try_feed (grp);
593
594 /* finish, if done */
595 if (!grp->size && grp->int1)
596 return eio_finish (grp);
597 else
598 return 0;
599}
600
601void eio_destroy (eio_req *req)
602{
603 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
604 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
605
606 EIO_DESTROY (req);
607}
608
609static int eio_finish (eio_req *req)
610{
611 int res = EIO_FINISH (req);
612
613 if (req->grp)
614 {
615 int res2;
616 eio_req *grp = req->grp;
617
618 /* unlink request */
619 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
620 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
621
622 if (grp->grp_first == req)
623 grp->grp_first = req->grp_next;
624
625 res2 = grp_dec (grp);
626
627 if (!res && res2)
628 res = res2;
629 }
630
631 eio_destroy (req);
632
633 return res;
634}
635
636void eio_grp_cancel (eio_req *grp)
637{
638 for (grp = grp->grp_first; grp; grp = grp->grp_next)
639 eio_cancel (grp);
640}
641
642void eio_cancel (eio_req *req)
643{
644 etp_cancel (req);
645}
646
647void eio_submit (eio_req *req)
648{
649 etp_submit (req);
650}
651
652unsigned int eio_nreqs (void)
653{
654 return etp_nreqs ();
655}
656
657unsigned int eio_nready (void)
658{
659 return etp_nready ();
660}
661
662unsigned int eio_npending (void)
663{
664 return etp_npending ();
665}
666
667unsigned int eio_nthreads (void)
668{
669 return etp_nthreads ();
670}
671
672void eio_set_max_poll_time (double nseconds)
673{
674 etp_set_max_poll_time (nseconds);
675}
676
677void eio_set_max_poll_reqs (unsigned int maxreqs)
678{
679 etp_set_max_poll_reqs (maxreqs);
680}
681
682void eio_set_max_idle (unsigned int nthreads)
683{
684 etp_set_max_idle (nthreads);
685}
686
687void eio_set_min_parallel (unsigned int nthreads)
688{
689 etp_set_min_parallel (nthreads);
690}
691
692void eio_set_max_parallel (unsigned int nthreads)
693{
694 etp_set_max_parallel (nthreads);
695}
696
697int eio_poll (void)
698{
699 return etp_poll ();
482} 700}
483 701
484/*****************************************************************************/ 702/*****************************************************************************/
485/* work around various missing functions */ 703/* work around various missing functions */
486 704
… …
616} 834}
617#endif 835#endif
618 836
619/* sendfile always needs emulation */ 837/* sendfile always needs emulation */
620static ssize_t 838static ssize_t
621eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self) 839eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
622{ 840{
623 ssize_t res; 841 ssize_t res;
624 842
625 if (!count) 843 if (!count)
626 return 0; 844 return 0;
… …
710 return res; 928 return res;
711} 929}
712 930
713/* read a full directory */ 931/* read a full directory */
714static void 932static void
715eio__scandir (eio_req *req, worker *self) 933eio__scandir (eio_req *req, etp_worker *self)
716{ 934{
717 DIR *dirp; 935 DIR *dirp;
718 union 936 union
719 { 937 {
720 EIO_STRUCT_DIRENT d; 938 EIO_STRUCT_DIRENT d;
… …
787 req->result = -1; \ 1005 req->result = -1; \
788 break; \ 1006 break; \
789 } \ 1007 } \
790 } 1008 }
791 1009
792X_THREAD_PROC (eio_proc) 1010X_THREAD_PROC (etp_proc)
793{ 1011{
794 eio_req *req; 1012 ETP_REQ *req;
795 struct timespec ts; 1013 struct timespec ts;
796 worker *self = (worker *)thr_arg; 1014 etp_worker *self = (etp_worker *)thr_arg;
797 1015
798 /* try to distribute timeouts somewhat randomly */ 1016 /* try to distribute timeouts somewhat randomly */
799 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1017 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
800 1018
801 for (;;) 1019 for (;;)
802 { 1020 {
803 ts.tv_sec = time (0) + IDLE_TIMEOUT;
804
805 X_LOCK (reqlock); 1021 X_LOCK (reqlock);
806 1022
807 for (;;) 1023 for (;;)
808 { 1024 {
809 self->req = req = reqq_shift (&req_queue); 1025 self->req = req = reqq_shift (&req_queue);
… …
811 if (req) 1027 if (req)
812 break; 1028 break;
813 1029
814 ++idle; 1030 ++idle;
815 1031
1032 ts.tv_sec = time (0) + IDLE_TIMEOUT;
816 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1033 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
817 { 1034 {
818 if (idle > max_idle) 1035 if (idle > max_idle)
819 { 1036 {
820 --idle; 1037 --idle;
… …
825 goto quit; 1042 goto quit;
826 } 1043 }
827 1044
828 /* we are allowed to idle, so do so without any timeout */ 1045 /* we are allowed to idle, so do so without any timeout */
829 X_COND_WAIT (reqwait, reqlock); 1046 X_COND_WAIT (reqwait, reqlock);
830 ts.tv_sec = time (0) + IDLE_TIMEOUT;
831 } 1047 }
832 1048
833 --idle; 1049 --idle;
834 } 1050 }
835 1051
836 --nready; 1052 --nready;
837 1053
838 X_UNLOCK (reqlock); 1054 X_UNLOCK (reqlock);
839 1055
840 errno = 0; /* strictly unnecessary */ 1056 if (req->type < 0)
1057 goto quit;
841 1058
842 if (!EIO_CANCELLED (req)) 1059 if (!EIO_CANCELLED (req))
843 switch (req->type) 1060 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 1061
944 X_LOCK (reslock); 1062 X_LOCK (reslock);
945 1063
946 ++npending; 1064 ++npending;
947 1065
948 if (!reqq_push (&res_queue, req) && want_poll_cb) 1066 if (!reqq_push (&res_queue, req) && want_poll_cb)
949 want_poll_cb (); 1067 want_poll_cb ();
950 1068
951 self->req = 0; 1069 self->req = 0;
952 worker_clear (self); 1070 etp_worker_clear (self);
953 1071
954 X_UNLOCK (reslock); 1072 X_UNLOCK (reslock);
955 } 1073 }
956 1074
957quit: 1075quit:
958 X_LOCK (wrklock); 1076 X_LOCK (wrklock);
959 worker_free (self); 1077 etp_worker_free (self);
960 X_UNLOCK (wrklock); 1078 X_UNLOCK (wrklock);
961 1079
962 return 0; 1080 return 0;
963} 1081}
964 1082
965/*****************************************************************************/ 1083/*****************************************************************************/
966 1084
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)) 1085int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1024{ 1086{
1025 want_poll_cb = want_poll; 1087 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} 1088}
1041 1089
1042static void eio_api_destroy (eio_req *req) 1090static void eio_api_destroy (eio_req *req)
1043{ 1091{
1044 free (req); 1092 free (req);
… …
1049 \ 1097 \
1050 req = (eio_req *)calloc (1, sizeof *req); \ 1098 req = (eio_req *)calloc (1, sizeof *req); \
1051 if (!req) \ 1099 if (!req) \
1052 return 0; \ 1100 return 0; \
1053 \ 1101 \
1054 req->type = rtype; \ 1102 req->type = rtype; \
1055 req->pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 1103 req->pri = pri; \
1056 req->finish = cb; \ 1104 req->finish = cb; \
1105 req->data = data; \
1057 req->destroy = eio_api_destroy; 1106 req->destroy = eio_api_destroy;
1058 1107
1059#define SEND eio_submit (req); return req 1108#define SEND eio_submit (req); return req
1060 1109
1061#define PATH \ 1110#define PATH \
… …
1065 { \ 1114 { \
1066 eio_api_destroy (req); \ 1115 eio_api_destroy (req); \
1067 return 0; \ 1116 return 0; \
1068 } 1117 }
1069 1118
1119static void eio_execute (etp_worker *self, eio_req *req)
1120{
1121 errno = 0;
1122
1123 switch (req->type)
1124 {
1125 case EIO_READ: ALLOC (req->size);
1126 req->result = req->offs >= 0
1127 ? pread (req->int1, req->ptr2, req->size, req->offs)
1128 : read (req->int1, req->ptr2, req->size); break;
1129 case EIO_WRITE: req->result = req->offs >= 0
1130 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1131 : write (req->int1, req->ptr2, req->size); break;
1132
1133 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1134 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1135
1136 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1137 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1138 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1139 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1140 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1141 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1142
1143 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1144 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1145 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1146 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1147 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1148 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1149
1150 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1151 case EIO_CLOSE: req->result = close (req->int1); break;
1152 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1153 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1154 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1155 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1156 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1157 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1158 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1159 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1160
1161 case EIO_READLINK: ALLOC (NAME_MAX);
1162 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1163
1164 case EIO_SYNC: req->result = 0; sync (); break;
1165 case EIO_FSYNC: req->result = fsync (req->int1); break;
1166 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1167
1168 case EIO_READDIR: eio__scandir (req, self); break;
1169
1170 case EIO_BUSY:
1171#ifdef _WIN32
1172 Sleep (req->nv1 * 1000.);
1173#else
1174 {
1175 struct timeval tv;
1176
1177 tv.tv_sec = req->nv1;
1178 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1179
1180 req->result = select (0, 0, 0, 0, &tv);
1181 }
1182#endif
1183 break;
1184
1185 case EIO_UTIME:
1186 case EIO_FUTIME:
1187 {
1188 struct timeval tv[2];
1189 struct timeval *times;
1190
1191 if (req->nv1 != -1. || req->nv2 != -1.)
1192 {
1193 tv[0].tv_sec = req->nv1;
1194 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1195 tv[1].tv_sec = req->nv2;
1196 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1197
1198 times = tv;
1199 }
1200 else
1201 times = 0;
1202
1203
1204 req->result = req->type == EIO_FUTIME
1205 ? futimes (req->int1, times)
1206 : utimes (req->ptr1, times);
1207 }
1208
1209 case EIO_GROUP:
1210 case EIO_NOP:
1211 req->result = 0;
1212 break;
1213
1214 case EIO_CUSTOM:
1215 req->feed (req);
1216 break;
1217
1218 default:
1219 req->result = -1;
1220 break;
1221 }
1222
1223 req->errorno = errno;
1224}
1225
1226#ifndef EIO_NO_WRAPPERS
1227
1070eio_req *eio_nop (int pri, eio_cb cb, void *data) 1228eio_req *eio_nop (int pri, eio_cb cb, void *data)
1071{ 1229{
1072 REQ (EIO_NOP); SEND; 1230 REQ (EIO_NOP); SEND;
1073} 1231}
1074 1232
… …
1247eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1405eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1248{ 1406{
1249 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1407 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1250} 1408}
1251 1409
1410eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1411{
1412 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1413}
1414
1415#endif
1416
1252eio_req *eio_grp (eio_cb cb, void *data) 1417eio_req *eio_grp (eio_cb cb, void *data)
1253{ 1418{
1254 const int pri = EIO_PRI_MAX; 1419 const int pri = EIO_PRI_MAX;
1255 1420
1256 REQ (EIO_GROUP); SEND; 1421 REQ (EIO_GROUP); SEND;
… …
1297/*****************************************************************************/ 1462/*****************************************************************************/
1298/* misc garbage */ 1463/* misc garbage */
1299 1464
1300ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1465ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1301{ 1466{
1302 worker wrk; 1467 etp_worker wrk;
1303 1468
1304 wrk.dbuf = 0; 1469 wrk.dbuf = 0;
1305 1470
1306 eio__sendfile (ofd, ifd, offset, count, &wrk); 1471 eio__sendfile (ofd, ifd, offset, count, &wrk);
1307 1472

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines