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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.12 by root, Tue May 13 18:54:52 2008 UTC vs.
Revision 1.23 by root, Sun Sep 21 00:23:45 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 req->pri += EIO_PRI_BIAS;
362
363 if (req->pri < EIO_PRI_MIN + EIO_PRI_BIAS) req->pri = EIO_PRI_MIN + EIO_PRI_BIAS;
364 if (req->pri > EIO_PRI_MAX + EIO_PRI_BIAS) req->pri = EIO_PRI_MAX + EIO_PRI_BIAS;
365
366 ++nreqs;
367
368 X_LOCK (reqlock);
369 ++nready;
370 reqq_push (&req_queue, req);
371 X_COND_SIGNAL (reqwait);
372 X_UNLOCK (reqlock);
373
374 maybe_start_thread ();
375}
376
377static void end_thread (void) 426static void etp_end_thread (void)
378{ 427{
379 eio_req *req = calloc (1, sizeof (eio_req)); 428 eio_req *req = calloc (1, sizeof (eio_req));
380 429
381 req->type = EIO_QUIT; 430 req->type = -1;
382 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 431 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
383 432
384 X_LOCK (reqlock); 433 X_LOCK (reqlock);
385 reqq_push (&req_queue, req); 434 reqq_push (&req_queue, req);
386 X_COND_SIGNAL (reqwait); 435 X_COND_SIGNAL (reqwait);
387 X_UNLOCK (reqlock); 436 X_UNLOCK (reqlock);
… …
389 X_LOCK (wrklock); 438 X_LOCK (wrklock);
390 --started; 439 --started;
391 X_UNLOCK (wrklock); 440 X_UNLOCK (wrklock);
392} 441}
393 442
394void eio_set_max_poll_time (double nseconds)
395{
396 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
397 max_poll_time = nseconds;
398 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
399}
400
401void eio_set_max_poll_reqs (unsigned int maxreqs)
402{
403 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
404 max_poll_reqs = maxreqs;
405 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
406}
407
408void eio_set_max_idle (unsigned int nthreads)
409{
410 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
411 max_idle = nthreads <= 0 ? 1 : nthreads;
412 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
413}
414
415void eio_set_min_parallel (unsigned int nthreads)
416{
417 if (wanted < nthreads)
418 wanted = nthreads;
419}
420
421void eio_set_max_parallel (unsigned int nthreads)
422{
423 if (wanted > nthreads)
424 wanted = nthreads;
425
426 while (started > wanted)
427 end_thread ();
428}
429
430int eio_poll (void) 443static int etp_poll (void)
431{ 444{
432 int maxreqs = max_poll_reqs; 445 unsigned int maxreqs;
446 unsigned int maxtime;
433 struct timeval tv_start, tv_now; 447 struct timeval tv_start, tv_now;
434 eio_req *req;
435 448
449 X_LOCK (reslock);
450 maxreqs = max_poll_reqs;
451 maxtime = max_poll_time;
452 X_UNLOCK (reslock);
453
436 if (max_poll_time) 454 if (maxtime)
437 gettimeofday (&tv_start, 0); 455 gettimeofday (&tv_start, 0);
438 456
439 for (;;) 457 for (;;)
440 { 458 {
459 ETP_REQ *req;
460
441 maybe_start_thread (); 461 etp_maybe_start_thread ();
442 462
443 X_LOCK (reslock); 463 X_LOCK (reslock);
444 req = reqq_shift (&res_queue); 464 req = reqq_shift (&res_queue);
445 465
446 if (req) 466 if (req)
… …
454 X_UNLOCK (reslock); 474 X_UNLOCK (reslock);
455 475
456 if (!req) 476 if (!req)
457 return 0; 477 return 0;
458 478
479 X_LOCK (reqlock);
459 --nreqs; 480 --nreqs;
481 X_UNLOCK (reqlock);
460 482
461 if (req->type == EIO_GROUP && req->size) 483 if (req->type == EIO_GROUP && req->size)
462 { 484 {
463 req->int1 = 1; /* mark request as delayed */ 485 req->int1 = 1; /* mark request as delayed */
464 continue; 486 continue;
465 } 487 }
466 else 488 else
467 { 489 {
468 int res = eio_finish (req); 490 int res = ETP_FINISH (req);
469 if (res) 491 if (res)
470 return res; 492 return res;
471 } 493 }
472 494
473 if (maxreqs && !--maxreqs) 495 if (maxreqs && !--maxreqs)
474 break; 496 break;
475 497
476 if (max_poll_time) 498 if (maxtime)
477 { 499 {
478 gettimeofday (&tv_now, 0); 500 gettimeofday (&tv_now, 0);
479 501
480 if (tvdiff (&tv_start, &tv_now) >= max_poll_time) 502 if (tvdiff (&tv_start, &tv_now) >= maxtime)
481 break; 503 break;
482 } 504 }
483 } 505 }
484 506
485 errno = EAGAIN; 507 errno = EAGAIN;
486 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 ();
487} 705}
488 706
489/*****************************************************************************/ 707/*****************************************************************************/
490/* work around various missing functions */ 708/* work around various missing functions */
491 709
492#if !HAVE_PREADWRITE 710#if !HAVE_PREADWRITE
493# define pread eio__pread 711# define pread eio__pread
494# define pwrite eio__pwrite 712# define pwrite eio__pwrite
495
496/*
497 * make our pread/pwrite safe against themselves, but not against
498 * normal read/write by using a mutex. slows down execution a lot,
499 * but that's your problem, not mine.
500 */
501static mutex_t preadwritelock = X_MUTEX_INIT;
502 713
503static ssize_t 714static ssize_t
504eio__pread (int fd, void *buf, size_t count, off_t offset) 715eio__pread (int fd, void *buf, size_t count, off_t offset)
505{ 716{
506 ssize_t res; 717 ssize_t res;
… …
568 779
569#if !HAVE_READAHEAD 780#if !HAVE_READAHEAD
570# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 781# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
571 782
572static ssize_t 783static ssize_t
573eio__readahead (int fd, off_t offset, size_t count, worker *self) 784eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
574{ 785{
575 size_t todo = count; 786 size_t todo = count;
576 dBUF; 787 dBUF;
577 788
578 while (todo > 0) 789 while (todo > 0)
… …
588 return count; 799 return count;
589} 800}
590 801
591#endif 802#endif
592 803
593#if !HAVE_READDIR_R
594# define readdir_r eio__readdir_r
595
596static mutex_t readdirlock = X_MUTEX_INIT;
597
598static int
599eio__readdir_r (DIR *dirp, EIO_STRUCT_DIRENT *ent, EIO_STRUCT_DIRENT **res)
600{
601 EIO_STRUCT_DIRENT *e;
602 int errorno;
603
604 X_LOCK (readdirlock);
605
606 e = readdir (dirp);
607 errorno = errno;
608
609 if (e)
610 {
611 *res = ent;
612 strcpy (ent->d_name, e->d_name);
613 }
614 else
615 *res = 0;
616
617 X_UNLOCK (readdirlock);
618
619 errno = errorno;
620 return e ? 0 : -1;
621}
622#endif
623
624/* sendfile always needs emulation */ 804/* sendfile always needs emulation */
625static ssize_t 805static ssize_t
626eio__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)
627{ 807{
628 ssize_t res; 808 ssize_t res;
629 809
630 if (!count) 810 if (!count)
631 return 0; 811 return 0;
… …
715 return res; 895 return res;
716} 896}
717 897
718/* read a full directory */ 898/* read a full directory */
719static void 899static void
720eio__scandir (eio_req *req, worker *self) 900eio__scandir (eio_req *req, etp_worker *self)
721{ 901{
722 DIR *dirp; 902 DIR *dirp;
723 union
724 {
725 EIO_STRUCT_DIRENT d;
726 char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
727 } *u;
728 EIO_STRUCT_DIRENT *entp; 903 EIO_STRUCT_DIRENT *entp;
729 char *name, *names; 904 char *name, *names;
730 int memlen = 4096; 905 int memlen = 4096;
731 int memofs = 0; 906 int memofs = 0;
732 int res = 0; 907 int res = 0;
733 908
734 X_LOCK (wrklock); 909 X_LOCK (wrklock);
910 /* the corresponding closedir is in ETP_WORKER_CLEAR */
735 self->dirp = dirp = opendir (req->ptr1); 911 self->dirp = dirp = opendir (req->ptr1);
736 self->dbuf = u = malloc (sizeof (*u));
737 req->flags |= EIO_FLAG_PTR2_FREE; 912 req->flags |= EIO_FLAG_PTR2_FREE;
738 req->ptr2 = names = malloc (memlen); 913 req->ptr2 = names = malloc (memlen);
739 X_UNLOCK (wrklock); 914 X_UNLOCK (wrklock);
740 915
741 if (dirp && u && names) 916 if (dirp && names)
742 for (;;) 917 for (;;)
743 { 918 {
744 errno = 0; 919 errno = 0;
745 readdir_r (dirp, &u->d, &entp); 920 entp = readdir (dirp);
746 921
747 if (!entp) 922 if (!entp)
748 break; 923 break;
749 924
750 name = entp->d_name; 925 name = entp->d_name;
… …
773 948
774 if (errno) 949 if (errno)
775 res = -1; 950 res = -1;
776 951
777 req->result = res; 952 req->result = res;
953}
954
955#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
956# define msync(a,b,c) ENOSYS
957#endif
958
959int
960eio__mtouch (void *mem, size_t len, int flags)
961{
962 intptr_t addr = (intptr_t)mem;
963 intptr_t end = addr + len;
964#ifdef PAGESIZE
965 const intptr_t page = PAGESIZE;
966#else
967 static intptr_t page;
968
969 if (!page)
970 page = sysconf (_SC_PAGESIZE);
971#endif
972
973 addr &= ~(page - 1); /* assume page size is always a power of two */
974
975 if (addr < end)
976 if (flags) /* modify */
977 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
978 else
979 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
980
981 return 0;
778} 982}
779 983
780/*****************************************************************************/ 984/*****************************************************************************/
781 985
782#define ALLOC(len) \ 986#define ALLOC(len) \
… …
792 req->result = -1; \ 996 req->result = -1; \
793 break; \ 997 break; \
794 } \ 998 } \
795 } 999 }
796 1000
797X_THREAD_PROC (eio_proc) 1001X_THREAD_PROC (etp_proc)
798{ 1002{
799 eio_req *req; 1003 ETP_REQ *req;
800 struct timespec ts; 1004 struct timespec ts;
801 worker *self = (worker *)thr_arg; 1005 etp_worker *self = (etp_worker *)thr_arg;
802 1006
803 /* try to distribute timeouts somewhat randomly */ 1007 /* try to distribute timeouts somewhat randomly */
804 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1008 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
805 1009
806 for (;;) 1010 for (;;)
807 { 1011 {
808 ts.tv_sec = time (0) + IDLE_TIMEOUT;
809
810 X_LOCK (reqlock); 1012 X_LOCK (reqlock);
811 1013
812 for (;;) 1014 for (;;)
813 { 1015 {
814 self->req = req = reqq_shift (&req_queue); 1016 self->req = req = reqq_shift (&req_queue);
… …
816 if (req) 1018 if (req)
817 break; 1019 break;
818 1020
819 ++idle; 1021 ++idle;
820 1022
1023 ts.tv_sec = time (0) + IDLE_TIMEOUT;
821 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1024 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
822 { 1025 {
823 if (idle > max_idle) 1026 if (idle > max_idle)
824 { 1027 {
825 --idle; 1028 --idle;
… …
830 goto quit; 1033 goto quit;
831 } 1034 }
832 1035
833 /* we are allowed to idle, so do so without any timeout */ 1036 /* we are allowed to idle, so do so without any timeout */
834 X_COND_WAIT (reqwait, reqlock); 1037 X_COND_WAIT (reqwait, reqlock);
835 ts.tv_sec = time (0) + IDLE_TIMEOUT;
836 } 1038 }
837 1039
838 --idle; 1040 --idle;
839 } 1041 }
840 1042
841 --nready; 1043 --nready;
842 1044
843 X_UNLOCK (reqlock); 1045 X_UNLOCK (reqlock);
844 1046
845 errno = 0; /* strictly unnecessary */ 1047 if (req->type < 0)
1048 goto quit;
846 1049
847 if (!EIO_CANCELLED (req)) 1050 if (!EIO_CANCELLED (req))
848 switch (req->type) 1051 ETP_EXECUTE (self, req);
849 {
850 case EIO_READ: ALLOC (req->size);
851 req->result = req->offs >= 0
852 ? pread (req->int1, req->ptr2, req->size, req->offs)
853 : read (req->int1, req->ptr2, req->size); break;
854 case EIO_WRITE: req->result = req->offs >= 0
855 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
856 : write (req->int1, req->ptr2, req->size); break;
857
858 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
859 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
860
861 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
862 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
863 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
864 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
865 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
866 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
867
868 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
869 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
870 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
871 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
872 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
873 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
874
875 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
876 case EIO_CLOSE: req->result = close (req->int1); break;
877 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
878 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
879 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
880 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
881 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
882 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
883 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
884 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
885
886 case EIO_READLINK: ALLOC (NAME_MAX);
887 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
888
889 case EIO_SYNC: req->result = 0; sync (); break;
890 case EIO_FSYNC: req->result = fsync (req->int1); break;
891 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
892
893 case EIO_READDIR: eio__scandir (req, self); break;
894
895 case EIO_BUSY:
896#ifdef _WIN32
897 Sleep (req->nv1 * 1000.);
898#else
899 {
900 struct timeval tv;
901
902 tv.tv_sec = req->nv1;
903 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
904
905 req->result = select (0, 0, 0, 0, &tv);
906 }
907#endif
908 break;
909
910 case EIO_UTIME:
911 case EIO_FUTIME:
912 {
913 struct timeval tv[2];
914 struct timeval *times;
915
916 if (req->nv1 != -1. || req->nv2 != -1.)
917 {
918 tv[0].tv_sec = req->nv1;
919 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
920 tv[1].tv_sec = req->nv2;
921 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
922
923 times = tv;
924 }
925 else
926 times = 0;
927
928
929 req->result = req->type == EIO_FUTIME
930 ? futimes (req->int1, times)
931 : utimes (req->ptr1, times);
932 }
933
934 case EIO_GROUP:
935 case EIO_NOP:
936 req->result = 0;
937 break;
938
939 case EIO_QUIT:
940 goto quit;
941
942 default:
943 req->result = -1;
944 break;
945 }
946
947 req->errorno = errno;
948 1052
949 X_LOCK (reslock); 1053 X_LOCK (reslock);
950 1054
951 ++npending; 1055 ++npending;
952 1056
953 if (!reqq_push (&res_queue, req) && want_poll_cb) 1057 if (!reqq_push (&res_queue, req) && want_poll_cb)
954 want_poll_cb (); 1058 want_poll_cb ();
955 1059
956 self->req = 0; 1060 self->req = 0;
957 worker_clear (self); 1061 etp_worker_clear (self);
958 1062
959 X_UNLOCK (reslock); 1063 X_UNLOCK (reslock);
960 } 1064 }
961 1065
962quit: 1066quit:
963 X_LOCK (wrklock); 1067 X_LOCK (wrklock);
964 worker_free (self); 1068 etp_worker_free (self);
965 X_UNLOCK (wrklock); 1069 X_UNLOCK (wrklock);
966 1070
967 return 0; 1071 return 0;
968} 1072}
969 1073
970/*****************************************************************************/ 1074/*****************************************************************************/
971 1075
972static void eio_atfork_prepare (void)
973{
974 X_LOCK (wrklock);
975 X_LOCK (reqlock);
976 X_LOCK (reslock);
977#if !HAVE_PREADWRITE
978 X_LOCK (preadwritelock);
979#endif
980#if !HAVE_READDIR_R
981 X_LOCK (readdirlock);
982#endif
983}
984
985static void eio_atfork_parent (void)
986{
987#if !HAVE_READDIR_R
988 X_UNLOCK (readdirlock);
989#endif
990#if !HAVE_PREADWRITE
991 X_UNLOCK (preadwritelock);
992#endif
993 X_UNLOCK (reslock);
994 X_UNLOCK (reqlock);
995 X_UNLOCK (wrklock);
996}
997
998static void eio_atfork_child (void)
999{
1000 eio_req *prv;
1001
1002 while (prv = reqq_shift (&req_queue))
1003 eio_destroy (prv);
1004
1005 while (prv = reqq_shift (&res_queue))
1006 eio_destroy (prv);
1007
1008 while (wrk_first.next != &wrk_first)
1009 {
1010 worker *wrk = wrk_first.next;
1011
1012 if (wrk->req)
1013 eio_destroy (wrk->req);
1014
1015 worker_clear (wrk);
1016 worker_free (wrk);
1017 }
1018
1019 started = 0;
1020 idle = 0;
1021 nreqs = 0;
1022 nready = 0;
1023 npending = 0;
1024
1025 eio_atfork_parent ();
1026}
1027
1028int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1076int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1029{ 1077{
1030 want_poll_cb = want_poll; 1078 return etp_init (want_poll, done_poll);
1031 done_poll_cb = done_poll;
1032
1033#ifdef _WIN32
1034 X_MUTEX_CHECK (wrklock);
1035 X_MUTEX_CHECK (reslock);
1036 X_MUTEX_CHECK (reqlock);
1037 X_MUTEX_CHECK (reqwait);
1038 X_MUTEX_CHECK (preadwritelock);
1039 X_MUTEX_CHECK (readdirlock);
1040
1041 X_COND_CHECK (reqwait);
1042#endif
1043
1044 X_THREAD_ATFORK (eio_atfork_prepare, eio_atfork_parent, eio_atfork_child);
1045} 1079}
1046 1080
1047static void eio_api_destroy (eio_req *req) 1081static void eio_api_destroy (eio_req *req)
1048{ 1082{
1049 free (req); 1083 free (req);
… …
1071 { \ 1105 { \
1072 eio_api_destroy (req); \ 1106 eio_api_destroy (req); \
1073 return 0; \ 1107 return 0; \
1074 } 1108 }
1075 1109
1110static void eio_execute (etp_worker *self, eio_req *req)
1111{
1112 errno = 0;
1113
1114 switch (req->type)
1115 {
1116 case EIO_READ: ALLOC (req->size);
1117 req->result = req->offs >= 0
1118 ? pread (req->int1, req->ptr2, req->size, req->offs)
1119 : read (req->int1, req->ptr2, req->size); break;
1120 case EIO_WRITE: req->result = req->offs >= 0
1121 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1122 : write (req->int1, req->ptr2, req->size); break;
1123
1124 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1125 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1126
1127 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1128 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1129 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1130 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1131 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1132 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1133
1134 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1135 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1136 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1137 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1138 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1139 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1140
1141 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1142 case EIO_CLOSE: req->result = close (req->int1); break;
1143 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1144 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1145 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1146 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1147 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1148 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1149 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1150 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1151
1152 case EIO_READLINK: ALLOC (NAME_MAX);
1153 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1154
1155 case EIO_SYNC: req->result = 0; sync (); break;
1156 case EIO_FSYNC: req->result = fsync (req->int1); break;
1157 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1158 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
1159 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1160
1161 case EIO_READDIR: eio__scandir (req, self); break;
1162
1163 case EIO_BUSY:
1164#ifdef _WIN32
1165 Sleep (req->nv1 * 1000.);
1166#else
1167 {
1168 struct timeval tv;
1169
1170 tv.tv_sec = req->nv1;
1171 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1172
1173 req->result = select (0, 0, 0, 0, &tv);
1174 }
1175#endif
1176 break;
1177
1178 case EIO_UTIME:
1179 case EIO_FUTIME:
1180 {
1181 struct timeval tv[2];
1182 struct timeval *times;
1183
1184 if (req->nv1 != -1. || req->nv2 != -1.)
1185 {
1186 tv[0].tv_sec = req->nv1;
1187 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1188 tv[1].tv_sec = req->nv2;
1189 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1190
1191 times = tv;
1192 }
1193 else
1194 times = 0;
1195
1196
1197 req->result = req->type == EIO_FUTIME
1198 ? futimes (req->int1, times)
1199 : utimes (req->ptr1, times);
1200 }
1201
1202 case EIO_GROUP:
1203 case EIO_NOP:
1204 req->result = 0;
1205 break;
1206
1207 case EIO_CUSTOM:
1208 ((void (*)(eio_req *))req->feed) (req);
1209 break;
1210
1211 default:
1212 req->result = -1;
1213 break;
1214 }
1215
1216 req->errorno = errno;
1217}
1218
1076#ifndef EIO_NO_WRAPPERS 1219#ifndef EIO_NO_WRAPPERS
1077 1220
1078eio_req *eio_nop (int pri, eio_cb cb, void *data) 1221eio_req *eio_nop (int pri, eio_cb cb, void *data)
1079{ 1222{
1080 REQ (EIO_NOP); SEND; 1223 REQ (EIO_NOP); SEND;
… …
1091} 1234}
1092 1235
1093eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data) 1236eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1094{ 1237{
1095 REQ (EIO_FSYNC); req->int1 = fd; SEND; 1238 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1239}
1240
1241eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1242{
1243 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1244}
1245
1246eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1247{
1248 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1096} 1249}
1097 1250
1098eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 1251eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1099{ 1252{
1100 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 1253 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
… …
1221 return eio__1path (EIO_READDIR, path, pri, cb, data); 1374 return eio__1path (EIO_READDIR, path, pri, cb, data);
1222} 1375}
1223 1376
1224eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1377eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1225{ 1378{
1226 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 1379 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1227} 1380}
1228 1381
1229static eio_req * 1382static eio_req *
1230eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1383eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1231{ 1384{
… …
1255eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1408eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1256{ 1409{
1257 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1410 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1258} 1411}
1259 1412
1413eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1414{
1415 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND;
1416}
1417
1260#endif 1418#endif
1261 1419
1262eio_req *eio_grp (eio_cb cb, void *data) 1420eio_req *eio_grp (eio_cb cb, void *data)
1263{ 1421{
1264 const int pri = EIO_PRI_MAX; 1422 const int pri = EIO_PRI_MAX;
… …
1307/*****************************************************************************/ 1465/*****************************************************************************/
1308/* misc garbage */ 1466/* misc garbage */
1309 1467
1310ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 1468ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1311{ 1469{
1312 worker wrk; 1470 etp_worker wrk;
1313 1471
1314 wrk.dbuf = 0; 1472 wrk.dbuf = 0;
1315 1473
1316 eio__sendfile (ofd, ifd, offset, count, &wrk); 1474 eio__sendfile (ofd, ifd, offset, count, &wrk);
1317 1475

Diff Legend

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