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.22 by root, Fri Jul 11 10:54:50 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
182#if !HAVE_PREADWRITE
183/*
184 * make our pread/pwrite emulation safe against themselves, but not against
185 * normal read/write by using a mutex. slows down execution a lot,
186 * but that's your problem, not mine.
187 */
188static mutex_t preadwritelock = X_MUTEX_INIT;
189#endif
190
191typedef struct etp_worker
192{
193 /* locked by wrklock */
194 struct etp_worker *prev, *next;
195
196 thread_t tid;
197
198 /* locked by reslock, reqlock or wrklock */
199 ETP_REQ *req; /* currently processed request */
200
201 ETP_WORKER_COMMON
202} etp_worker;
203
204static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
205
206#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
207#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
208
209/* worker threads management */
210
211static void etp_worker_clear (etp_worker *wrk)
212{
213 ETP_WORKER_CLEAR (wrk);
214}
215
216static void etp_worker_free (etp_worker *wrk)
217{
218 wrk->next->prev = wrk->prev;
219 wrk->prev->next = wrk->next;
220
221 free (wrk);
222}
223
147unsigned int eio_nreqs (void) 224static unsigned int etp_nreqs (void)
148{ 225{
226 int retval;
227 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
228 retval = nreqs;
229 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
149 return nreqs; 230 return retval;
150} 231}
151 232
152unsigned int eio_nready (void) 233static unsigned int etp_nready (void)
153{ 234{
154 unsigned int retval; 235 unsigned int retval;
155 236
156 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 237 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
157 retval = nready; 238 retval = nready;
158 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 239 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
159 240
160 return retval; 241 return retval;
161} 242}
162 243
163unsigned int eio_npending (void) 244static unsigned int etp_npending (void)
164{ 245{
165 unsigned int retval; 246 unsigned int retval;
166 247
167 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 248 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
168 retval = npending; 249 retval = npending;
169 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 250 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
170 251
171 return retval; 252 return retval;
172} 253}
173 254
174unsigned int eio_nthreads (void) 255static unsigned int etp_nthreads (void)
175{ 256{
176 unsigned int retval; 257 unsigned int retval;
177 258
178 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 259 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
179 retval = started; 260 retval = started;
… …
186 * a somewhat faster data structure might be nice, but 267 * a somewhat faster data structure might be nice, but
187 * with 8 priorities this actually needs <20 insns 268 * with 8 priorities this actually needs <20 insns
188 * per shift, the most expensive operation. 269 * per shift, the most expensive operation.
189 */ 270 */
190typedef struct { 271typedef struct {
191 eio_req *qs[EIO_NUM_PRI], *qe[EIO_NUM_PRI]; /* qstart, qend */ 272 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
192 int size; 273 int size;
193} reqq; 274} etp_reqq;
194 275
195static reqq req_queue; 276static etp_reqq req_queue;
196static reqq res_queue; 277static etp_reqq res_queue;
197 278
198static int reqq_push (reqq *q, eio_req *req) 279static int reqq_push (etp_reqq *q, ETP_REQ *req)
199{ 280{
200 int pri = req->pri; 281 int pri = req->pri;
201 req->next = 0; 282 req->next = 0;
202 283
203 if (q->qe[pri]) 284 if (q->qe[pri])
… …
209 q->qe[pri] = q->qs[pri] = req; 290 q->qe[pri] = q->qs[pri] = req;
210 291
211 return q->size++; 292 return q->size++;
212} 293}
213 294
214static eio_req *reqq_shift (reqq *q) 295static ETP_REQ *reqq_shift (etp_reqq *q)
215{ 296{
216 int pri; 297 int pri;
217 298
218 if (!q->size) 299 if (!q->size)
219 return 0; 300 return 0;
220 301
221 --q->size; 302 --q->size;
222 303
223 for (pri = EIO_NUM_PRI; pri--; ) 304 for (pri = ETP_NUM_PRI; pri--; )
224 { 305 {
225 eio_req *req = q->qs[pri]; 306 eio_req *req = q->qs[pri];
226 307
227 if (req) 308 if (req)
228 { 309 {
… …
234 } 315 }
235 316
236 abort (); 317 abort ();
237} 318}
238 319
239static void grp_try_feed (eio_req *grp) 320static void etp_atfork_prepare (void)
240{ 321{
241 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 322 X_LOCK (wrklock);
323 X_LOCK (reqlock);
324 X_LOCK (reslock);
325#if !HAVE_PREADWRITE
326 X_LOCK (preadwritelock);
327#endif
328}
329
330static void etp_atfork_parent (void)
331{
332#if !HAVE_PREADWRITE
333 X_UNLOCK (preadwritelock);
334#endif
335 X_UNLOCK (reslock);
336 X_UNLOCK (reqlock);
337 X_UNLOCK (wrklock);
338}
339
340static void etp_atfork_child (void)
341{
342 ETP_REQ *prv;
343
344 while ((prv = reqq_shift (&req_queue)))
345 ETP_DESTROY (prv);
346
347 while ((prv = reqq_shift (&res_queue)))
348 ETP_DESTROY (prv);
349
350 while (wrk_first.next != &wrk_first)
242 { 351 {
243 int old_len = grp->size; 352 etp_worker *wrk = wrk_first.next;
244 353
245 EIO_FEED (grp); 354 if (wrk->req)
355 ETP_DESTROY (wrk->req);
246 356
247 /* stop if no progress has been made */ 357 etp_worker_clear (wrk);
248 if (old_len == grp->size) 358 etp_worker_free (wrk);
249 {
250 grp->feed = 0;
251 break;
252 }
253 } 359 }
254}
255 360
256static int eio_finish (eio_req *req); 361 started = 0;
362 idle = 0;
363 nreqs = 0;
364 nready = 0;
365 npending = 0;
257 366
258static int grp_dec (eio_req *grp) 367 etp_atfork_parent ();
259{ 368}
260 --grp->size;
261 369
262 /* call feeder, if applicable */ 370static void
263 grp_try_feed (grp); 371etp_once_init (void)
372{
373 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
374}
264 375
265 /* finish, if done */ 376static int
266 if (!grp->size && grp->int1) 377etp_init (void (*want_poll)(void), void (*done_poll)(void))
267 return eio_finish (grp); 378{
268 else 379 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
380
381 pthread_once (&doinit, etp_once_init);
382
383 want_poll_cb = want_poll;
384 done_poll_cb = done_poll;
385
269 return 0; 386 return 0;
270} 387}
271 388
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); 389X_THREAD_PROC (etp_proc);
323 390
324static void start_thread (void) 391static void etp_start_thread (void)
325{ 392{
326 worker *wrk = calloc (1, sizeof (worker)); 393 etp_worker *wrk = calloc (1, sizeof (etp_worker));
327 394
328 /*TODO*/ 395 /*TODO*/
329 assert (("unable to allocate worker thread data", wrk)); 396 assert (("unable to allocate worker thread data", wrk));
330 397
331 X_LOCK (wrklock); 398 X_LOCK (wrklock);
332 399
333 if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) 400 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
334 { 401 {
335 wrk->prev = &wrk_first; 402 wrk->prev = &wrk_first;
336 wrk->next = wrk_first.next; 403 wrk->next = wrk_first.next;
337 wrk_first.next->prev = wrk; 404 wrk_first.next->prev = wrk;
338 wrk_first.next = wrk; 405 wrk_first.next = wrk;
… …
342 free (wrk); 409 free (wrk);
343 410
344 X_UNLOCK (wrklock); 411 X_UNLOCK (wrklock);
345} 412}
346 413
347static void maybe_start_thread (void) 414static void etp_maybe_start_thread (void)
348{ 415{
349 if (eio_nthreads () >= wanted) 416 if (etp_nthreads () >= wanted)
350 return; 417 return;
351 418
352 /* todo: maybe use idle here, but might be less exact */ 419 /* todo: maybe use idle here, but might be less exact */
353 if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ()) 420 if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())
354 return; 421 return;
355 422
356 start_thread (); 423 etp_start_thread ();
357} 424}
358 425
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) 426static void etp_end_thread (void)
373{ 427{
374 eio_req *req = calloc (1, sizeof (eio_req)); 428 eio_req *req = calloc (1, sizeof (eio_req));
375 429
376 req->type = EIO_QUIT; 430 req->type = -1;
377 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 431 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
378 432
379 X_LOCK (reqlock); 433 X_LOCK (reqlock);
380 reqq_push (&req_queue, req); 434 reqq_push (&req_queue, req);
381 X_COND_SIGNAL (reqwait); 435 X_COND_SIGNAL (reqwait);
382 X_UNLOCK (reqlock); 436 X_UNLOCK (reqlock);
… …
384 X_LOCK (wrklock); 438 X_LOCK (wrklock);
385 --started; 439 --started;
386 X_UNLOCK (wrklock); 440 X_UNLOCK (wrklock);
387} 441}
388 442
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) 443static int etp_poll (void)
426{ 444{
427 int maxreqs = max_poll_reqs; 445 unsigned int maxreqs;
446 unsigned int maxtime;
428 struct timeval tv_start, tv_now; 447 struct timeval tv_start, tv_now;
429 eio_req *req;
430 448
449 X_LOCK (reslock);
450 maxreqs = max_poll_reqs;
451 maxtime = max_poll_time;
452 X_UNLOCK (reslock);
453
431 if (max_poll_time) 454 if (maxtime)
432 gettimeofday (&tv_start, 0); 455 gettimeofday (&tv_start, 0);
433 456
434 for (;;) 457 for (;;)
435 { 458 {
459 ETP_REQ *req;
460
436 maybe_start_thread (); 461 etp_maybe_start_thread ();
437 462
438 X_LOCK (reslock); 463 X_LOCK (reslock);
439 req = reqq_shift (&res_queue); 464 req = reqq_shift (&res_queue);
440 465
441 if (req) 466 if (req)
… …
449 X_UNLOCK (reslock); 474 X_UNLOCK (reslock);
450 475
451 if (!req) 476 if (!req)
452 return 0; 477 return 0;
453 478
479 X_LOCK (reqlock);
454 --nreqs; 480 --nreqs;
481 X_UNLOCK (reqlock);
455 482
456 if (req->type == EIO_GROUP && req->size) 483 if (req->type == EIO_GROUP && req->size)
457 { 484 {
458 req->int1 = 1; /* mark request as delayed */ 485 req->int1 = 1; /* mark request as delayed */
459 continue; 486 continue;
460 } 487 }
461 else 488 else
462 { 489 {
463 int res = eio_finish (req); 490 int res = ETP_FINISH (req);
464 if (res) 491 if (res)
465 return res; 492 return res;
466 } 493 }
467 494
468 if (maxreqs && !--maxreqs) 495 if (maxreqs && !--maxreqs)
469 break; 496 break;
470 497
471 if (max_poll_time) 498 if (maxtime)
472 { 499 {
473 gettimeofday (&tv_now, 0); 500 gettimeofday (&tv_now, 0);
474 501
475 if (tvdiff (&tv_start, &tv_now) >= max_poll_time) 502 if (tvdiff (&tv_start, &tv_now) >= maxtime)
476 break; 503 break;
477 } 504 }
478 } 505 }
479 506
480 errno = EAGAIN; 507 errno = EAGAIN;
481 return -1; 508 return -1;
509}
510
511static void etp_cancel (ETP_REQ *req)
512{
513 X_LOCK (wrklock);
514 req->flags |= EIO_FLAG_CANCELLED;
515 X_UNLOCK (wrklock);
516
517 eio_grp_cancel (req);
518}
519
520static void etp_submit (ETP_REQ *req)
521{
522 req->pri -= ETP_PRI_MIN;
523
524 if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
525 if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
526
527 X_LOCK (reqlock);
528 ++nreqs;
529 ++nready;
530 reqq_push (&req_queue, req);
531 X_COND_SIGNAL (reqwait);
532 X_UNLOCK (reqlock);
533
534 etp_maybe_start_thread ();
535}
536
537static void etp_set_max_poll_time (double nseconds)
538{
539 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
540 max_poll_time = nseconds;
541 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
542}
543
544static void etp_set_max_poll_reqs (unsigned int maxreqs)
545{
546 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
547 max_poll_reqs = maxreqs;
548 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
549}
550
551static void etp_set_max_idle (unsigned int nthreads)
552{
553 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
554 max_idle = nthreads <= 0 ? 1 : nthreads;
555 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
556}
557
558static void etp_set_min_parallel (unsigned int nthreads)
559{
560 if (wanted < nthreads)
561 wanted = nthreads;
562}
563
564static void etp_set_max_parallel (unsigned int nthreads)
565{
566 if (wanted > nthreads)
567 wanted = nthreads;
568
569 while (started > wanted)
570 etp_end_thread ();
571}
572
573/*****************************************************************************/
574
575static void grp_try_feed (eio_req *grp)
576{
577 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
578 {
579 int old_len = grp->size;
580
581 EIO_FEED (grp);
582
583 /* stop if no progress has been made */
584 if (old_len == grp->size)
585 {
586 grp->feed = 0;
587 break;
588 }
589 }
590}
591
592static int grp_dec (eio_req *grp)
593{
594 --grp->size;
595
596 /* call feeder, if applicable */
597 grp_try_feed (grp);
598
599 /* finish, if done */
600 if (!grp->size && grp->int1)
601 return eio_finish (grp);
602 else
603 return 0;
604}
605
606void eio_destroy (eio_req *req)
607{
608 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
609 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
610
611 EIO_DESTROY (req);
612}
613
614static int eio_finish (eio_req *req)
615{
616 int res = EIO_FINISH (req);
617
618 if (req->grp)
619 {
620 int res2;
621 eio_req *grp = req->grp;
622
623 /* unlink request */
624 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
625 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
626
627 if (grp->grp_first == req)
628 grp->grp_first = req->grp_next;
629
630 res2 = grp_dec (grp);
631
632 if (!res && res2)
633 res = res2;
634 }
635
636 eio_destroy (req);
637
638 return res;
639}
640
641void eio_grp_cancel (eio_req *grp)
642{
643 for (grp = grp->grp_first; grp; grp = grp->grp_next)
644 eio_cancel (grp);
645}
646
647void eio_cancel (eio_req *req)
648{
649 etp_cancel (req);
650}
651
652void eio_submit (eio_req *req)
653{
654 etp_submit (req);
655}
656
657unsigned int eio_nreqs (void)
658{
659 return etp_nreqs ();
660}
661
662unsigned int eio_nready (void)
663{
664 return etp_nready ();
665}
666
667unsigned int eio_npending (void)
668{
669 return etp_npending ();
670}
671
672unsigned int eio_nthreads (void)
673{
674 return etp_nthreads ();
675}
676
677void eio_set_max_poll_time (double nseconds)
678{
679 etp_set_max_poll_time (nseconds);
680}
681
682void eio_set_max_poll_reqs (unsigned int maxreqs)
683{
684 etp_set_max_poll_reqs (maxreqs);
685}
686
687void eio_set_max_idle (unsigned int nthreads)
688{
689 etp_set_max_idle (nthreads);
690}
691
692void eio_set_min_parallel (unsigned int nthreads)
693{
694 etp_set_min_parallel (nthreads);
695}
696
697void eio_set_max_parallel (unsigned int nthreads)
698{
699 etp_set_max_parallel (nthreads);
700}
701
702int eio_poll (void)
703{
704 return etp_poll ();
482} 705}
483 706
484/*****************************************************************************/ 707/*****************************************************************************/
485/* work around various missing functions */ 708/* work around various missing functions */
486 709
487#if !HAVE_PREADWRITE 710#if !HAVE_PREADWRITE
488# define pread eio__pread 711# define pread eio__pread
489# define pwrite eio__pwrite 712# 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 713
498static ssize_t 714static ssize_t
499eio__pread (int fd, void *buf, size_t count, off_t offset) 715eio__pread (int fd, void *buf, size_t count, off_t offset)
500{ 716{
501 ssize_t res; 717 ssize_t res;
… …
563 779
564#if !HAVE_READAHEAD 780#if !HAVE_READAHEAD
565# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 781# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
566 782
567static ssize_t 783static ssize_t
568eio__readahead (int fd, off_t offset, size_t count, worker *self) 784eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
569{ 785{
570 size_t todo = count; 786 size_t todo = count;
571 dBUF; 787 dBUF;
572 788
573 while (todo > 0) 789 while (todo > 0)
… …
583 return count; 799 return count;
584} 800}
585 801
586#endif 802#endif
587 803
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 */ 804/* sendfile always needs emulation */
620static ssize_t 805static ssize_t
621eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self) 806eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
622{ 807{
623 ssize_t res; 808 ssize_t res;
624 809
625 if (!count) 810 if (!count)
626 return 0; 811 return 0;
… …
710 return res; 895 return res;
711} 896}
712 897
713/* read a full directory */ 898/* read a full directory */
714static void 899static void
715eio__scandir (eio_req *req, worker *self) 900eio__scandir (eio_req *req, etp_worker *self)
716{ 901{
717 DIR *dirp; 902 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; 903 EIO_STRUCT_DIRENT *entp;
724 char *name, *names; 904 char *name, *names;
725 int memlen = 4096; 905 int memlen = 4096;
726 int memofs = 0; 906 int memofs = 0;
727 int res = 0; 907 int res = 0;
728 908
729 X_LOCK (wrklock); 909 X_LOCK (wrklock);
910 /* the corresponding closedir is in ETP_WORKER_CLEAR */
730 self->dirp = dirp = opendir (req->ptr1); 911 self->dirp = dirp = opendir (req->ptr1);
731 self->dbuf = u = malloc (sizeof (*u));
732 req->flags |= EIO_FLAG_PTR2_FREE; 912 req->flags |= EIO_FLAG_PTR2_FREE;
733 req->ptr2 = names = malloc (memlen); 913 req->ptr2 = names = malloc (memlen);
734 X_UNLOCK (wrklock); 914 X_UNLOCK (wrklock);
735 915
736 if (dirp && u && names) 916 if (dirp && names)
737 for (;;) 917 for (;;)
738 { 918 {
739 errno = 0; 919 errno = 0;
740 readdir_r (dirp, &u->d, &entp); 920 entp = readdir (dirp);
741 921
742 if (!entp) 922 if (!entp)
743 break; 923 break;
744 924
745 name = entp->d_name; 925 name = entp->d_name;
… …
787 req->result = -1; \ 967 req->result = -1; \
788 break; \ 968 break; \
789 } \ 969 } \
790 } 970 }
791 971
792X_THREAD_PROC (eio_proc) 972X_THREAD_PROC (etp_proc)
793{ 973{
794 eio_req *req; 974 ETP_REQ *req;
795 struct timespec ts; 975 struct timespec ts;
796 worker *self = (worker *)thr_arg; 976 etp_worker *self = (etp_worker *)thr_arg;
797 977
798 /* try to distribute timeouts somewhat randomly */ 978 /* try to distribute timeouts somewhat randomly */
799 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 979 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
800 980
801 for (;;) 981 for (;;)
802 { 982 {
803 ts.tv_sec = time (0) + IDLE_TIMEOUT;
804
805 X_LOCK (reqlock); 983 X_LOCK (reqlock);
806 984
807 for (;;) 985 for (;;)
808 { 986 {
809 self->req = req = reqq_shift (&req_queue); 987 self->req = req = reqq_shift (&req_queue);
… …
811 if (req) 989 if (req)
812 break; 990 break;
813 991
814 ++idle; 992 ++idle;
815 993
994 ts.tv_sec = time (0) + IDLE_TIMEOUT;
816 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 995 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
817 { 996 {
818 if (idle > max_idle) 997 if (idle > max_idle)
819 { 998 {
820 --idle; 999 --idle;
… …
825 goto quit; 1004 goto quit;
826 } 1005 }
827 1006
828 /* we are allowed to idle, so do so without any timeout */ 1007 /* we are allowed to idle, so do so without any timeout */
829 X_COND_WAIT (reqwait, reqlock); 1008 X_COND_WAIT (reqwait, reqlock);
830 ts.tv_sec = time (0) + IDLE_TIMEOUT;
831 } 1009 }
832 1010
833 --idle; 1011 --idle;
834 } 1012 }
835 1013
836 --nready; 1014 --nready;
837 1015
838 X_UNLOCK (reqlock); 1016 X_UNLOCK (reqlock);
839 1017
840 errno = 0; /* strictly unnecessary */ 1018 if (req->type < 0)
1019 goto quit;
841 1020
842 if (!EIO_CANCELLED (req)) 1021 if (!EIO_CANCELLED (req))
843 switch (req->type) 1022 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 1023
944 X_LOCK (reslock); 1024 X_LOCK (reslock);
945 1025
946 ++npending; 1026 ++npending;
947 1027
948 if (!reqq_push (&res_queue, req) && want_poll_cb) 1028 if (!reqq_push (&res_queue, req) && want_poll_cb)
949 want_poll_cb (); 1029 want_poll_cb ();
950 1030
951 self->req = 0; 1031 self->req = 0;
952 worker_clear (self); 1032 etp_worker_clear (self);
953 1033
954 X_UNLOCK (reslock); 1034 X_UNLOCK (reslock);
955 } 1035 }
956 1036
957quit: 1037quit:
958 X_LOCK (wrklock); 1038 X_LOCK (wrklock);
959 worker_free (self); 1039 etp_worker_free (self);
960 X_UNLOCK (wrklock); 1040 X_UNLOCK (wrklock);
961 1041
962 return 0; 1042 return 0;
963} 1043}
964 1044
965/*****************************************************************************/ 1045/*****************************************************************************/
966 1046
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)) 1047int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1024{ 1048{
1025 want_poll_cb = want_poll; 1049 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} 1050}
1041 1051
1042static void eio_api_destroy (eio_req *req) 1052static void eio_api_destroy (eio_req *req)
1043{ 1053{
1044 free (req); 1054 free (req);
… …
1049 \ 1059 \
1050 req = (eio_req *)calloc (1, sizeof *req); \ 1060 req = (eio_req *)calloc (1, sizeof *req); \
1051 if (!req) \ 1061 if (!req) \
1052 return 0; \ 1062 return 0; \
1053 \ 1063 \
1054 req->type = rtype; \ 1064 req->type = rtype; \
1055 req->pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 1065 req->pri = pri; \
1056 req->finish = cb; \ 1066 req->finish = cb; \
1067 req->data = data; \
1057 req->destroy = eio_api_destroy; 1068 req->destroy = eio_api_destroy;
1058 1069
1059#define SEND eio_submit (req); return req 1070#define SEND eio_submit (req); return req
1060 1071
1061#define PATH \ 1072#define PATH \
… …
1065 { \ 1076 { \
1066 eio_api_destroy (req); \ 1077 eio_api_destroy (req); \
1067 return 0; \ 1078 return 0; \
1068 } 1079 }
1069 1080
1081static void eio_execute (etp_worker *self, eio_req *req)
1082{
1083 errno = 0;
1084
1085 switch (req->type)
1086 {
1087 case EIO_READ: ALLOC (req->size);
1088 req->result = req->offs >= 0
1089 ? pread (req->int1, req->ptr2, req->size, req->offs)
1090 : read (req->int1, req->ptr2, req->size); break;
1091 case EIO_WRITE: req->result = req->offs >= 0
1092 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1093 : write (req->int1, req->ptr2, req->size); break;
1094
1095 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1096 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1097
1098 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1099 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1100 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1101 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1102 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1103 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1104
1105 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1106 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1107 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1108 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1109 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1110 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1111
1112 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1113 case EIO_CLOSE: req->result = close (req->int1); break;
1114 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1115 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1116 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1117 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1118 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1119 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1120 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1121 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1122
1123 case EIO_READLINK: ALLOC (NAME_MAX);
1124 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1125
1126 case EIO_SYNC: req->result = 0; sync (); break;
1127 case EIO_FSYNC: req->result = fsync (req->int1); break;
1128 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1129
1130 case EIO_READDIR: eio__scandir (req, self); break;
1131
1132 case EIO_BUSY:
1133#ifdef _WIN32
1134 Sleep (req->nv1 * 1000.);
1135#else
1136 {
1137 struct timeval tv;
1138
1139 tv.tv_sec = req->nv1;
1140 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1141
1142 req->result = select (0, 0, 0, 0, &tv);
1143 }
1144#endif
1145 break;
1146
1147 case EIO_UTIME:
1148 case EIO_FUTIME:
1149 {
1150 struct timeval tv[2];
1151 struct timeval *times;
1152
1153 if (req->nv1 != -1. || req->nv2 != -1.)
1154 {
1155 tv[0].tv_sec = req->nv1;
1156 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1157 tv[1].tv_sec = req->nv2;
1158 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1159
1160 times = tv;
1161 }
1162 else
1163 times = 0;
1164
1165
1166 req->result = req->type == EIO_FUTIME
1167 ? futimes (req->int1, times)
1168 : utimes (req->ptr1, times);
1169 }
1170
1171 case EIO_GROUP:
1172 case EIO_NOP:
1173 req->result = 0;
1174 break;
1175
1176 case EIO_CUSTOM:
1177 req->feed (req);
1178 break;
1179
1180 default:
1181 req->result = -1;
1182 break;
1183 }
1184
1185 req->errorno = errno;
1186}
1187
1188#ifndef EIO_NO_WRAPPERS
1189
1070eio_req *eio_nop (int pri, eio_cb cb, void *data) 1190eio_req *eio_nop (int pri, eio_cb cb, void *data)
1071{ 1191{
1072 REQ (EIO_NOP); SEND; 1192 REQ (EIO_NOP); SEND;
1073} 1193}
1074 1194
… …
1213 return eio__1path (EIO_READDIR, path, pri, cb, data); 1333 return eio__1path (EIO_READDIR, path, pri, cb, data);
1214} 1334}
1215 1335
1216eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1336eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1217{ 1337{
1218 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 1338 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1219} 1339}
1220 1340
1221static eio_req * 1341static eio_req *
1222eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1342eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1223{ 1343{
… …
1247eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1367eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1248{ 1368{
1249 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1369 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1250} 1370}
1251 1371
1372eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1373{
1374 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1375}
1376
1377#endif
1378
1252eio_req *eio_grp (eio_cb cb, void *data) 1379eio_req *eio_grp (eio_cb cb, void *data)
1253{ 1380{
1254 const int pri = EIO_PRI_MAX; 1381 const int pri = EIO_PRI_MAX;
1255 1382
1256 REQ (EIO_GROUP); SEND; 1383 REQ (EIO_GROUP); SEND;
… …
1297/*****************************************************************************/ 1424/*****************************************************************************/
1298/* misc garbage */ 1425/* misc garbage */
1299 1426
1300ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1427ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1301{ 1428{
1302 worker wrk; 1429 etp_worker wrk;
1303 1430
1304 wrk.dbuf = 0; 1431 wrk.dbuf = 0;
1305 1432
1306 eio__sendfile (ofd, ifd, offset, count, &wrk); 1433 eio__sendfile (ofd, ifd, offset, count, &wrk);
1307 1434

Diff Legend

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