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

Diff Legend

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