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

Comparing libeio/eio.c (file contents):
Revision 1.15 by root, Sat May 17 12:26:57 2008 UTC vs.
Revision 1.72 by root, Fri Jun 10 12:45:20 2011 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
35 * and other provisions required by the GPL. If you do not delete the 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 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifndef _WIN32
41# include "config.h"
42#endif
43
40#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
46
47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE
49#endif
41#include "xthread.h" 50#include "xthread.h"
42 51
43#include <errno.h> 52#include <errno.h>
44#include <stddef.h> 53#include <stddef.h>
45#include <stdlib.h> 54#include <stdlib.h>
46#include <string.h> 55#include <string.h>
47#include <errno.h> 56#include <errno.h>
48#include <sys/types.h> 57#include <sys/types.h>
49#include <sys/stat.h> 58#include <sys/stat.h>
59#include <sys/statvfs.h>
50#include <limits.h> 60#include <limits.h>
51#include <fcntl.h> 61#include <fcntl.h>
52#include <assert.h> 62#include <assert.h>
53 63
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes form stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H
67# include <stdint.h>
68#endif
69
54#ifndef EIO_FINISH 70#ifndef EIO_FINISH
55# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 71# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
56#endif 72#endif
57 73
58#ifndef EIO_DESTROY 74#ifndef EIO_DESTROY
64#endif 80#endif
65 81
66#ifdef _WIN32 82#ifdef _WIN32
67 83
68 /*doh*/ 84 /*doh*/
69
70#else 85#else
71 86
72# include "config.h"
73# include <sys/time.h> 87# include <sys/time.h>
74# include <sys/select.h> 88# include <sys/select.h>
75# include <unistd.h> 89# include <unistd.h>
76# include <utime.h> 90# include <utime.h>
77# include <signal.h> 91# include <signal.h>
78# include <dirent.h> 92# include <dirent.h>
79 93
94#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
95# include <sys/mman.h>
96#endif
97
98/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
99# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
100# define _DIRENT_HAVE_D_TYPE /* sigh */
101# define D_INO(de) (de)->d_fileno
102# define D_NAMLEN(de) (de)->d_namlen
103# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
104# define D_INO(de) (de)->d_ino
105# endif
106
107#ifdef _D_EXACT_NAMLEN
108# undef D_NAMLEN
109# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
110#endif
111
112# ifdef _DIRENT_HAVE_D_TYPE
113# define D_TYPE(de) (de)->d_type
114# endif
115
80# ifndef EIO_STRUCT_DIRENT 116# ifndef EIO_STRUCT_DIRENT
81# define EIO_STRUCT_DIRENT struct dirent 117# define EIO_STRUCT_DIRENT struct dirent
82# endif 118# endif
83 119
84#endif 120#endif
85 121
86#if HAVE_SENDFILE 122#if HAVE_SENDFILE
87# if __linux 123# if __linux
88# include <sys/sendfile.h> 124# include <sys/sendfile.h>
89# elif __freebsd 125# elif __FreeBSD__ || defined __APPLE__
90# include <sys/socket.h> 126# include <sys/socket.h>
91# include <sys/uio.h> 127# include <sys/uio.h>
92# elif __hpux 128# elif __hpux
93# include <sys/socket.h> 129# include <sys/socket.h>
94# elif __solaris /* not yet */ 130# elif __solaris
95# include <sys/sendfile.h> 131# include <sys/sendfile.h>
96# else 132# else
97# error sendfile support requested but not available 133# error sendfile support requested but not available
98# endif 134# endif
99#endif 135#endif
100 136
101/* number of seconds after which an idle threads exit */ 137#ifndef D_TYPE
102#define IDLE_TIMEOUT 10 138# define D_TYPE(de) 0
139#endif
140#ifndef D_INO
141# define D_INO(de) 0
142#endif
143#ifndef D_NAMLEN
144# define D_NAMLEN(de) strlen ((de)->d_name)
145#endif
103 146
104/* used for struct dirent, AIX doesn't provide it */ 147/* used for struct dirent, AIX doesn't provide it */
105#ifndef NAME_MAX 148#ifndef NAME_MAX
106# define NAME_MAX 4096 149# define NAME_MAX 4096
150#endif
151
152/* used for readlink etc. */
153#ifndef PATH_MAX
154# define PATH_MAX 4096
107#endif 155#endif
108 156
109/* buffer size for various temporary buffers */ 157/* buffer size for various temporary buffers */
110#define EIO_BUFSIZE 65536 158#define EIO_BUFSIZE 65536
111 159
117 errno = ENOMEM; \ 165 errno = ENOMEM; \
118 if (!eio_buf) \ 166 if (!eio_buf) \
119 return -1; 167 return -1;
120 168
121#define EIO_TICKS ((1000000 + 1023) >> 10) 169#define EIO_TICKS ((1000000 + 1023) >> 10)
122
123/*****************************************************************************/
124 170
125#define ETP_PRI_MIN EIO_PRI_MIN 171#define ETP_PRI_MIN EIO_PRI_MIN
126#define ETP_PRI_MAX EIO_PRI_MAX 172#define ETP_PRI_MAX EIO_PRI_MAX
127 173
128struct etp_worker; 174struct etp_worker;
144 if (wrk->dirp) \ 190 if (wrk->dirp) \
145 { \ 191 { \
146 closedir (wrk->dirp); \ 192 closedir (wrk->dirp); \
147 wrk->dirp = 0; \ 193 wrk->dirp = 0; \
148 } 194 }
195
149#define ETP_WORKER_COMMON \ 196#define ETP_WORKER_COMMON \
150 void *dbuf; \ 197 void *dbuf; \
151 DIR *dirp; 198 DIR *dirp;
152 199
153/*****************************************************************************/ 200/*****************************************************************************/
154 201
155#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
156 203
157/* calculcate time difference in ~1/EIO_TICKS of a second */ 204/* calculate time difference in ~1/EIO_TICKS of a second */
205ECB_INLINE int
158static int tvdiff (struct timeval *tv1, struct timeval *tv2) 206tvdiff (struct timeval *tv1, struct timeval *tv2)
159{ 207{
160 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 208 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
161 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 209 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
162} 210}
163 211
170static unsigned int max_poll_reqs; /* reslock */ 218static unsigned int max_poll_reqs; /* reslock */
171 219
172static volatile unsigned int nreqs; /* reqlock */ 220static volatile unsigned int nreqs; /* reqlock */
173static volatile unsigned int nready; /* reqlock */ 221static volatile unsigned int nready; /* reqlock */
174static volatile unsigned int npending; /* reqlock */ 222static volatile unsigned int npending; /* reqlock */
175static volatile unsigned int max_idle = 4; 223static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
224static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
176 225
226static xmutex_t wrklock;
227static xmutex_t reslock;
228static xmutex_t reqlock;
229static xcond_t reqwait;
230
231#if !HAVE_PREADWRITE
232/*
233 * make our pread/pwrite emulation safe against themselves, but not against
234 * normal read/write by using a mutex. slows down execution a lot,
235 * but that's your problem, not mine.
236 */
177static mutex_t wrklock = X_MUTEX_INIT; 237static xmutex_t preadwritelock = X_MUTEX_INIT;
178static mutex_t reslock = X_MUTEX_INIT; 238#endif
179static mutex_t reqlock = X_MUTEX_INIT;
180static cond_t reqwait = X_COND_INIT;
181 239
182typedef struct etp_worker 240typedef struct etp_worker
183{ 241{
184 /* locked by wrklock */ 242 /* locked by wrklock */
185 struct etp_worker *prev, *next; 243 struct etp_worker *prev, *next;
186 244
187 thread_t tid; 245 xthread_t tid;
188 246
189 /* locked by reslock, reqlock or wrklock */ 247 /* locked by reslock, reqlock or wrklock */
190 ETP_REQ *req; /* currently processed request */ 248 ETP_REQ *req; /* currently processed request */
191 249
192 ETP_WORKER_COMMON 250 ETP_WORKER_COMMON
197#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
198#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
199 257
200/* worker threads management */ 258/* worker threads management */
201 259
260static void ecb_cold
202static void etp_worker_clear (etp_worker *wrk) 261etp_worker_clear (etp_worker *wrk)
203{ 262{
204 ETP_WORKER_CLEAR (wrk); 263 ETP_WORKER_CLEAR (wrk);
205} 264}
206 265
266static void ecb_cold
207static void etp_worker_free (etp_worker *wrk) 267etp_worker_free (etp_worker *wrk)
208{ 268{
209 wrk->next->prev = wrk->prev; 269 wrk->next->prev = wrk->prev;
210 wrk->prev->next = wrk->next; 270 wrk->prev->next = wrk->next;
211 271
212 free (wrk); 272 free (wrk);
213} 273}
214 274
215static unsigned int etp_nreqs (void) 275static unsigned int
276etp_nreqs (void)
216{ 277{
217 int retval; 278 int retval;
218 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 279 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
219 retval = nreqs; 280 retval = nreqs;
220 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 281 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
221 return retval; 282 return retval;
222} 283}
223 284
224static unsigned int etp_nready (void) 285static unsigned int
286etp_nready (void)
225{ 287{
226 unsigned int retval; 288 unsigned int retval;
227 289
228 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
229 retval = nready; 291 retval = nready;
230 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
231 293
232 return retval; 294 return retval;
233} 295}
234 296
235static unsigned int etp_npending (void) 297static unsigned int
298etp_npending (void)
236{ 299{
237 unsigned int retval; 300 unsigned int retval;
238 301
239 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 302 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
240 retval = npending; 303 retval = npending;
241 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 304 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
242 305
243 return retval; 306 return retval;
244} 307}
245 308
246static unsigned int etp_nthreads (void) 309static unsigned int
310etp_nthreads (void)
247{ 311{
248 unsigned int retval; 312 unsigned int retval;
249 313
250 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 314 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
251 retval = started; 315 retval = started;
265} etp_reqq; 329} etp_reqq;
266 330
267static etp_reqq req_queue; 331static etp_reqq req_queue;
268static etp_reqq res_queue; 332static etp_reqq res_queue;
269 333
334static int ecb_noinline
270static int reqq_push (etp_reqq *q, ETP_REQ *req) 335reqq_push (etp_reqq *q, ETP_REQ *req)
271{ 336{
272 int pri = req->pri; 337 int pri = req->pri;
273 req->next = 0; 338 req->next = 0;
274 339
275 if (q->qe[pri]) 340 if (q->qe[pri])
281 q->qe[pri] = q->qs[pri] = req; 346 q->qe[pri] = q->qs[pri] = req;
282 347
283 return q->size++; 348 return q->size++;
284} 349}
285 350
351static ETP_REQ * ecb_noinline
286static ETP_REQ *reqq_shift (etp_reqq *q) 352reqq_shift (etp_reqq *q)
287{ 353{
288 int pri; 354 int pri;
289 355
290 if (!q->size) 356 if (!q->size)
291 return 0; 357 return 0;
306 } 372 }
307 373
308 abort (); 374 abort ();
309} 375}
310 376
377static void ecb_cold
378etp_thread_init (void)
379{
380 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait);
384}
385
386static void ecb_cold
311static void etp_atfork_prepare (void) 387etp_atfork_prepare (void)
312{ 388{
313 X_LOCK (wrklock); 389 X_LOCK (wrklock);
314 X_LOCK (reqlock); 390 X_LOCK (reqlock);
315 X_LOCK (reslock); 391 X_LOCK (reslock);
316#if !HAVE_PREADWRITE 392#if !HAVE_PREADWRITE
317 X_LOCK (preadwritelock); 393 X_LOCK (preadwritelock);
318#endif 394#endif
319#if !HAVE_READDIR_R
320 X_LOCK (readdirlock);
321#endif
322} 395}
323 396
397static void ecb_cold
324static void etp_atfork_parent (void) 398etp_atfork_parent (void)
325{ 399{
326#if !HAVE_READDIR_R
327 X_UNLOCK (readdirlock);
328#endif
329#if !HAVE_PREADWRITE 400#if !HAVE_PREADWRITE
330 X_UNLOCK (preadwritelock); 401 X_UNLOCK (preadwritelock);
331#endif 402#endif
332 X_UNLOCK (reslock); 403 X_UNLOCK (reslock);
333 X_UNLOCK (reqlock); 404 X_UNLOCK (reqlock);
334 X_UNLOCK (wrklock); 405 X_UNLOCK (wrklock);
335} 406}
336 407
408static void ecb_cold
337static void etp_atfork_child (void) 409etp_atfork_child (void)
338{ 410{
339 ETP_REQ *prv; 411 ETP_REQ *prv;
340 412
341 while (prv = reqq_shift (&req_queue)) 413 while ((prv = reqq_shift (&req_queue)))
342 ETP_DESTROY (prv); 414 ETP_DESTROY (prv);
343 415
344 while (prv = reqq_shift (&res_queue)) 416 while ((prv = reqq_shift (&res_queue)))
345 ETP_DESTROY (prv); 417 ETP_DESTROY (prv);
346 418
347 while (wrk_first.next != &wrk_first) 419 while (wrk_first.next != &wrk_first)
348 { 420 {
349 etp_worker *wrk = wrk_first.next; 421 etp_worker *wrk = wrk_first.next;
359 idle = 0; 431 idle = 0;
360 nreqs = 0; 432 nreqs = 0;
361 nready = 0; 433 nready = 0;
362 npending = 0; 434 npending = 0;
363 435
364 etp_atfork_parent (); 436 etp_thread_init ();
365} 437}
366 438
367static void 439static void ecb_cold
368etp_once_init (void) 440etp_once_init (void)
369{ 441{
442 etp_thread_init ();
370 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 443 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
371} 444}
372 445
373static int 446static int ecb_cold
374etp_init (void (*want_poll)(void), void (*done_poll)(void)) 447etp_init (void (*want_poll)(void), void (*done_poll)(void))
375{ 448{
376 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 449 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
377 450
378 pthread_once (&doinit, etp_once_init); 451 pthread_once (&doinit, etp_once_init);
379 452
380 want_poll_cb = want_poll; 453 want_poll_cb = want_poll;
381 done_poll_cb = done_poll; 454 done_poll_cb = done_poll;
455
456 return 0;
382} 457}
383 458
384X_THREAD_PROC (etp_proc); 459X_THREAD_PROC (etp_proc);
385 460
461static void ecb_cold
386static void etp_start_thread (void) 462etp_start_thread (void)
387{ 463{
388 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 464 etp_worker *wrk = calloc (1, sizeof (etp_worker));
389 465
390 /*TODO*/ 466 /*TODO*/
391 assert (("unable to allocate worker thread data", wrk)); 467 assert (("unable to allocate worker thread data", wrk));
404 free (wrk); 480 free (wrk);
405 481
406 X_UNLOCK (wrklock); 482 X_UNLOCK (wrklock);
407} 483}
408 484
485static void
409static void etp_maybe_start_thread (void) 486etp_maybe_start_thread (void)
410{ 487{
411 if (etp_nthreads () >= wanted) 488 if (ecb_expect_true (etp_nthreads () >= wanted))
412 return; 489 return;
413 490
414 /* todo: maybe use idle here, but might be less exact */ 491 /* todo: maybe use idle here, but might be less exact */
415 if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()) 492 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
416 return; 493 return;
417 494
418 etp_start_thread (); 495 etp_start_thread ();
419} 496}
420 497
498static void ecb_cold
421static void etp_end_thread (void) 499etp_end_thread (void)
422{ 500{
423 eio_req *req = calloc (1, sizeof (eio_req)); 501 eio_req *req = calloc (1, sizeof (eio_req));
424 502
425 req->type = -1; 503 req->type = -1;
426 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 504 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
433 X_LOCK (wrklock); 511 X_LOCK (wrklock);
434 --started; 512 --started;
435 X_UNLOCK (wrklock); 513 X_UNLOCK (wrklock);
436} 514}
437 515
438static int etp_poll (void) 516static int
517etp_poll (void)
439{ 518{
440 unsigned int maxreqs; 519 unsigned int maxreqs;
441 unsigned int maxtime; 520 unsigned int maxtime;
442 struct timeval tv_start, tv_now; 521 struct timeval tv_start, tv_now;
443 522
473 552
474 X_LOCK (reqlock); 553 X_LOCK (reqlock);
475 --nreqs; 554 --nreqs;
476 X_UNLOCK (reqlock); 555 X_UNLOCK (reqlock);
477 556
478 if (req->type == EIO_GROUP && req->size) 557 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
479 { 558 {
480 req->int1 = 1; /* mark request as delayed */ 559 req->int1 = 1; /* mark request as delayed */
481 continue; 560 continue;
482 } 561 }
483 else 562 else
484 { 563 {
485 int res = ETP_FINISH (req); 564 int res = ETP_FINISH (req);
486 if (res) 565 if (ecb_expect_false (res))
487 return res; 566 return res;
488 } 567 }
489 568
490 if (maxreqs && !--maxreqs) 569 if (ecb_expect_false (maxreqs && !--maxreqs))
491 break; 570 break;
492 571
493 if (maxtime) 572 if (maxtime)
494 { 573 {
495 gettimeofday (&tv_now, 0); 574 gettimeofday (&tv_now, 0);
501 580
502 errno = EAGAIN; 581 errno = EAGAIN;
503 return -1; 582 return -1;
504} 583}
505 584
585static void
506static void etp_cancel (ETP_REQ *req) 586etp_cancel (ETP_REQ *req)
507{ 587{
508 X_LOCK (wrklock); 588 X_LOCK (wrklock);
509 req->flags |= EIO_FLAG_CANCELLED; 589 req->flags |= EIO_FLAG_CANCELLED;
510 X_UNLOCK (wrklock); 590 X_UNLOCK (wrklock);
511 591
512 eio_grp_cancel (req); 592 eio_grp_cancel (req);
513} 593}
514 594
595static void
515static void etp_submit (ETP_REQ *req) 596etp_submit (ETP_REQ *req)
516{ 597{
517 req->pri -= ETP_PRI_MIN; 598 req->pri -= ETP_PRI_MIN;
518 599
519 if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 600 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
520 if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 601 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
521 602
603 if (ecb_expect_false (req->type == EIO_GROUP))
604 {
605 /* I hope this is worth it :/ */
522 X_LOCK (reqlock); 606 X_LOCK (reqlock);
523 ++nreqs; 607 ++nreqs;
608 X_UNLOCK (reqlock);
609
610 X_LOCK (reslock);
611
612 ++npending;
613
614 if (!reqq_push (&res_queue, req) && want_poll_cb)
615 want_poll_cb ();
616
617 X_UNLOCK (reslock);
618 }
619 else
620 {
621 X_LOCK (reqlock);
622 ++nreqs;
524 ++nready; 623 ++nready;
525 reqq_push (&req_queue, req); 624 reqq_push (&req_queue, req);
526 X_COND_SIGNAL (reqwait); 625 X_COND_SIGNAL (reqwait);
527 X_UNLOCK (reqlock); 626 X_UNLOCK (reqlock);
528 627
529 etp_maybe_start_thread (); 628 etp_maybe_start_thread ();
629 }
530} 630}
531 631
632static void ecb_cold
532static void etp_set_max_poll_time (double nseconds) 633etp_set_max_poll_time (double nseconds)
533{ 634{
534 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 635 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
535 max_poll_time = nseconds; 636 max_poll_time = nseconds * EIO_TICKS;
536 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 637 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
537} 638}
538 639
640static void ecb_cold
539static void etp_set_max_poll_reqs (unsigned int maxreqs) 641etp_set_max_poll_reqs (unsigned int maxreqs)
540{ 642{
541 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 643 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
542 max_poll_reqs = maxreqs; 644 max_poll_reqs = maxreqs;
543 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 645 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
544} 646}
545 647
648static void ecb_cold
546static void etp_set_max_idle (unsigned int nthreads) 649etp_set_max_idle (unsigned int nthreads)
547{ 650{
548 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 651 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
549 max_idle = nthreads <= 0 ? 1 : nthreads; 652 max_idle = nthreads;
550 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 653 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
551} 654}
552 655
656static void ecb_cold
657etp_set_idle_timeout (unsigned int seconds)
658{
659 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
660 idle_timeout = seconds;
661 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
662}
663
664static void ecb_cold
553static void etp_set_min_parallel (unsigned int nthreads) 665etp_set_min_parallel (unsigned int nthreads)
554{ 666{
555 if (wanted < nthreads) 667 if (wanted < nthreads)
556 wanted = nthreads; 668 wanted = nthreads;
557} 669}
558 670
671static void ecb_cold
559static void etp_set_max_parallel (unsigned int nthreads) 672etp_set_max_parallel (unsigned int nthreads)
560{ 673{
561 if (wanted > nthreads) 674 if (wanted > nthreads)
562 wanted = nthreads; 675 wanted = nthreads;
563 676
564 while (started > wanted) 677 while (started > wanted)
565 etp_end_thread (); 678 etp_end_thread ();
566} 679}
567 680
568/*****************************************************************************/ 681/*****************************************************************************/
569 682
683static void
570static void grp_try_feed (eio_req *grp) 684grp_try_feed (eio_req *grp)
571{ 685{
572 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 686 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
573 { 687 {
574 int old_len = grp->size; 688 grp->flags &= ~EIO_FLAG_GROUPADD;
575 689
576 EIO_FEED (grp); 690 EIO_FEED (grp);
577 691
578 /* stop if no progress has been made */ 692 /* stop if no progress has been made */
579 if (old_len == grp->size) 693 if (!(grp->flags & EIO_FLAG_GROUPADD))
580 { 694 {
581 grp->feed = 0; 695 grp->feed = 0;
582 break; 696 break;
583 } 697 }
584 } 698 }
585} 699}
586 700
701static int
587static int grp_dec (eio_req *grp) 702grp_dec (eio_req *grp)
588{ 703{
589 --grp->size; 704 --grp->size;
590 705
591 /* call feeder, if applicable */ 706 /* call feeder, if applicable */
592 grp_try_feed (grp); 707 grp_try_feed (grp);
596 return eio_finish (grp); 711 return eio_finish (grp);
597 else 712 else
598 return 0; 713 return 0;
599} 714}
600 715
716void
601void eio_destroy (eio_req *req) 717eio_destroy (eio_req *req)
602{ 718{
603 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
604 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
605 721
606 EIO_DESTROY (req); 722 EIO_DESTROY (req);
607} 723}
608 724
725static int
609static int eio_finish (eio_req *req) 726eio_finish (eio_req *req)
610{ 727{
611 int res = EIO_FINISH (req); 728 int res = EIO_FINISH (req);
612 729
613 if (req->grp) 730 if (req->grp)
614 { 731 {
631 eio_destroy (req); 748 eio_destroy (req);
632 749
633 return res; 750 return res;
634} 751}
635 752
753void
636void eio_grp_cancel (eio_req *grp) 754eio_grp_cancel (eio_req *grp)
637{ 755{
638 for (grp = grp->grp_first; grp; grp = grp->grp_next) 756 for (grp = grp->grp_first; grp; grp = grp->grp_next)
639 eio_cancel (grp); 757 eio_cancel (grp);
640} 758}
641 759
760void
642void eio_cancel (eio_req *req) 761eio_cancel (eio_req *req)
643{ 762{
644 etp_cancel (req); 763 etp_cancel (req);
645} 764}
646 765
766void
647void eio_submit (eio_req *req) 767eio_submit (eio_req *req)
648{ 768{
649 etp_submit (req); 769 etp_submit (req);
650} 770}
651 771
652unsigned int eio_nreqs (void) 772unsigned int
773eio_nreqs (void)
653{ 774{
654 return etp_nreqs (); 775 return etp_nreqs ();
655} 776}
656 777
657unsigned int eio_nready (void) 778unsigned int
779eio_nready (void)
658{ 780{
659 return etp_nready (); 781 return etp_nready ();
660} 782}
661 783
662unsigned int eio_npending (void) 784unsigned int
785eio_npending (void)
663{ 786{
664 return etp_npending (); 787 return etp_npending ();
665} 788}
666 789
667unsigned int eio_nthreads (void) 790unsigned int ecb_cold
791eio_nthreads (void)
668{ 792{
669 return etp_nthreads (); 793 return etp_nthreads ();
670} 794}
671 795
796void ecb_cold
672void eio_set_max_poll_time (double nseconds) 797eio_set_max_poll_time (double nseconds)
673{ 798{
674 etp_set_max_poll_time (nseconds); 799 etp_set_max_poll_time (nseconds);
675} 800}
676 801
802void ecb_cold
677void eio_set_max_poll_reqs (unsigned int maxreqs) 803eio_set_max_poll_reqs (unsigned int maxreqs)
678{ 804{
679 etp_set_max_poll_reqs (maxreqs); 805 etp_set_max_poll_reqs (maxreqs);
680} 806}
681 807
808void ecb_cold
682void eio_set_max_idle (unsigned int nthreads) 809eio_set_max_idle (unsigned int nthreads)
683{ 810{
684 etp_set_max_idle (nthreads); 811 etp_set_max_idle (nthreads);
685} 812}
686 813
814void ecb_cold
815eio_set_idle_timeout (unsigned int seconds)
816{
817 etp_set_idle_timeout (seconds);
818}
819
820void ecb_cold
687void eio_set_min_parallel (unsigned int nthreads) 821eio_set_min_parallel (unsigned int nthreads)
688{ 822{
689 etp_set_min_parallel (nthreads); 823 etp_set_min_parallel (nthreads);
690} 824}
691 825
826void ecb_cold
692void eio_set_max_parallel (unsigned int nthreads) 827eio_set_max_parallel (unsigned int nthreads)
693{ 828{
694 etp_set_max_parallel (nthreads); 829 etp_set_max_parallel (nthreads);
695} 830}
696 831
697int eio_poll (void) 832int eio_poll (void)
701 836
702/*****************************************************************************/ 837/*****************************************************************************/
703/* work around various missing functions */ 838/* work around various missing functions */
704 839
705#if !HAVE_PREADWRITE 840#if !HAVE_PREADWRITE
841# undef pread
842# undef pwrite
706# define pread eio__pread 843# define pread eio__pread
707# define pwrite eio__pwrite 844# define pwrite eio__pwrite
708
709/*
710 * make our pread/pwrite safe against themselves, but not against
711 * normal read/write by using a mutex. slows down execution a lot,
712 * but that's your problem, not mine.
713 */
714static mutex_t preadwritelock = X_MUTEX_INIT;
715 845
716static ssize_t 846static ssize_t
717eio__pread (int fd, void *buf, size_t count, off_t offset) 847eio__pread (int fd, void *buf, size_t count, off_t offset)
718{ 848{
719 ssize_t res; 849 ssize_t res;
737 867
738 X_LOCK (preadwritelock); 868 X_LOCK (preadwritelock);
739 ooffset = lseek (fd, 0, SEEK_CUR); 869 ooffset = lseek (fd, 0, SEEK_CUR);
740 lseek (fd, offset, SEEK_SET); 870 lseek (fd, offset, SEEK_SET);
741 res = write (fd, buf, count); 871 res = write (fd, buf, count);
742 lseek (fd, offset, SEEK_SET); 872 lseek (fd, ooffset, SEEK_SET);
743 X_UNLOCK (preadwritelock); 873 X_UNLOCK (preadwritelock);
744 874
745 return res; 875 return res;
746} 876}
747#endif 877#endif
748 878
749#ifndef HAVE_FUTIMES 879#ifndef HAVE_UTIMES
750 880
881# undef utimes
751# define utimes(path,times) eio__utimes (path, times) 882# define utimes(path,times) eio__utimes (path, times)
752# define futimes(fd,times) eio__futimes (fd, times)
753 883
754static int 884static int
755eio__utimes (const char *filename, const struct timeval times[2]) 885eio__utimes (const char *filename, const struct timeval times[2])
756{ 886{
757 if (times) 887 if (times)
765 } 895 }
766 else 896 else
767 return utime (filename, 0); 897 return utime (filename, 0);
768} 898}
769 899
900#endif
901
902#ifndef HAVE_FUTIMES
903
904# undef futimes
905# define futimes(fd,times) eio__futimes (fd, times)
906
907static int
770static int eio__futimes (int fd, const struct timeval tv[2]) 908eio__futimes (int fd, const struct timeval tv[2])
771{ 909{
772 errno = ENOSYS; 910 errno = ENOSYS;
773 return -1; 911 return -1;
774} 912}
775 913
776#endif 914#endif
777 915
778#if !HAVE_FDATASYNC 916#if !HAVE_FDATASYNC
917# undef fdatasync
779# define fdatasync fsync 918# define fdatasync(fd) fsync (fd)
780#endif 919#endif
920
921/* sync_file_range always needs emulation */
922static int
923eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
924{
925#if HAVE_SYNC_FILE_RANGE
926 int res;
927
928 if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
929 || EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
930 || EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
931 {
932 flags = 0
933 | (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
934 | (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
935 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
936 }
937
938 res = sync_file_range (fd, offset, nbytes, flags);
939
940 if (!res || errno != ENOSYS)
941 return res;
942#endif
943
944 /* even though we could play tricks with the flags, it's better to always
945 * call fdatasync, as that matches the expectation of its users best */
946 return fdatasync (fd);
947}
781 948
782#if !HAVE_READAHEAD 949#if !HAVE_READAHEAD
950# undef readahead
783# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 951# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
784 952
785static ssize_t 953static ssize_t
786eio__readahead (int fd, off_t offset, size_t count, worker *self) 954eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
787{ 955{
788 size_t todo = count; 956 size_t todo = count;
789 dBUF; 957 dBUF;
790 958
791 while (todo > 0) 959 while (todo > 0)
801 return count; 969 return count;
802} 970}
803 971
804#endif 972#endif
805 973
806#if !HAVE_READDIR_R
807# define readdir_r eio__readdir_r
808
809static mutex_t readdirlock = X_MUTEX_INIT;
810
811static int
812eio__readdir_r (DIR *dirp, EIO_STRUCT_DIRENT *ent, EIO_STRUCT_DIRENT **res)
813{
814 EIO_STRUCT_DIRENT *e;
815 int errorno;
816
817 X_LOCK (readdirlock);
818
819 e = readdir (dirp);
820 errorno = errno;
821
822 if (e)
823 {
824 *res = ent;
825 strcpy (ent->d_name, e->d_name);
826 }
827 else
828 *res = 0;
829
830 X_UNLOCK (readdirlock);
831
832 errno = errorno;
833 return e ? 0 : -1;
834}
835#endif
836
837/* sendfile always needs emulation */ 974/* sendfile always needs emulation */
838static ssize_t 975static ssize_t
839eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 976eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
840{ 977{
978 ssize_t written = 0;
841 ssize_t res; 979 ssize_t res;
842 980
843 if (!count) 981 if (!count)
844 return 0; 982 return 0;
845 983
984 for (;;)
985 {
846#if HAVE_SENDFILE 986#if HAVE_SENDFILE
847# if __linux 987# if __linux
988 off_t soffset = offset;
848 res = sendfile (ofd, ifd, &offset, count); 989 res = sendfile (ofd, ifd, &soffset, count);
849 990
850# elif __freebsd 991# elif __FreeBSD__
851 /* 992 /*
852 * Of course, the freebsd sendfile is a dire hack with no thoughts 993 * Of course, the freebsd sendfile is a dire hack with no thoughts
853 * wasted on making it similar to other I/O functions. 994 * wasted on making it similar to other I/O functions.
854 */ 995 */
855 {
856 off_t sbytes; 996 off_t sbytes;
857 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 997 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
858 998
859 if (res < 0 && sbytes) 999 #if 0 /* according to the manpage, this is correct, but broken behaviour */
860 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 1000 /* freebsd' sendfile will return 0 on success */
1001 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
1002 /* not on e.g. EIO or EPIPE - sounds broken */
1003 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
861 res = sbytes; 1004 res = sbytes;
862 } 1005 #endif
1006
1007 /* according to source inspection, this is correct, and useful behaviour */
1008 if (sbytes)
1009 res = sbytes;
1010
1011# elif defined (__APPLE__)
1012 off_t sbytes = count;
1013 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1014
1015 /* according to the manpage, sbytes is always valid */
1016 if (sbytes)
1017 res = sbytes;
863 1018
864# elif __hpux 1019# elif __hpux
865 res = sendfile (ofd, ifd, offset, count, 0, 0); 1020 res = sendfile (ofd, ifd, offset, count, 0, 0);
866 1021
867# elif __solaris 1022# elif __solaris
868 {
869 struct sendfilevec vec; 1023 struct sendfilevec vec;
870 size_t sbytes; 1024 size_t sbytes;
871 1025
872 vec.sfv_fd = ifd; 1026 vec.sfv_fd = ifd;
873 vec.sfv_flag = 0; 1027 vec.sfv_flag = 0;
874 vec.sfv_off = offset; 1028 vec.sfv_off = offset;
875 vec.sfv_len = count; 1029 vec.sfv_len = count;
876 1030
877 res = sendfilev (ofd, &vec, 1, &sbytes); 1031 res = sendfilev (ofd, &vec, 1, &sbytes);
878 1032
879 if (res < 0 && sbytes) 1033 if (res < 0 && sbytes)
880 res = sbytes; 1034 res = sbytes;
881 }
882 1035
883# endif 1036# endif
1037
1038#elif defined (_WIN32)
1039 /* does not work, just for documentation of what would need to be done */
1040 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1041 /* libeio guarantees that the file offset does not change, and windows */
1042 /* has no way to get an independent handle to the same file description */
1043 HANDLE h = TO_SOCKET (ifd);
1044 SetFilePointer (h, offset, 0, FILE_BEGIN);
1045 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1046
884#else 1047#else
885 res = -1; 1048 res = -1;
886 errno = ENOSYS; 1049 errno = ENOSYS;
887#endif 1050#endif
888 1051
1052 /* we assume sendfile can copy at least 128mb in one go */
1053 if (res <= 128 * 1024 * 1024)
1054 {
1055 if (res > 0)
1056 written += res;
1057
1058 if (written)
1059 return written;
1060
1061 break;
1062 }
1063 else
1064 {
1065 /* if we requested more, then probably the kernel was lazy */
1066 written += res;
1067 offset += res;
1068 count -= res;
1069
1070 if (!count)
1071 return written;
1072 }
1073 }
1074
889 if (res < 0 1075 if (res < 0
890 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1076 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1077 /* BSDs */
1078#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1079 || errno == ENOTSUP
1080#endif
1081 || errno == EOPNOTSUPP /* BSDs */
891#if __solaris 1082#if __solaris
892 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1083 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
893#endif 1084#endif
894 ) 1085 )
895 ) 1086 )
926 } 1117 }
927 1118
928 return res; 1119 return res;
929} 1120}
930 1121
1122static signed char
1123eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1124{
1125 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1126 : a->inode < b->inode ? -1
1127 : a->inode > b->inode ? 1
1128 : 0;
1129}
1130
1131#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1132
1133#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1134#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1135
1136static void
1137eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1138{
1139 unsigned char bits [9 + sizeof (ino_t) * 8];
1140 unsigned char *bit = bits;
1141
1142 assert (CHAR_BIT == 8);
1143 assert (sizeof (eio_dirent) * 8 < 256);
1144 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1145 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1146
1147 if (size <= EIO_SORT_FAST)
1148 return;
1149
1150 /* first prepare an array of bits to test in our radix sort */
1151 /* try to take endianness into account, as well as differences in ino_t sizes */
1152 /* inode_bits must contain all inodes ORed together */
1153 /* which is used to skip bits that are 0 everywhere, which is very common */
1154 {
1155 ino_t endianness;
1156 int i, j;
1157
1158 /* we store the byte offset of byte n into byte n of "endianness" */
1159 for (i = 0; i < sizeof (ino_t); ++i)
1160 ((unsigned char *)&endianness)[i] = i;
1161
1162 *bit++ = 0;
1163
1164 for (i = 0; i < sizeof (ino_t); ++i)
1165 {
1166 /* shifting off the byte offsets out of "endianness" */
1167 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1168 endianness >>= 8;
1169
1170 for (j = 0; j < 8; ++j)
1171 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1172 *bit++ = offs + j;
1173 }
1174
1175 for (j = 0; j < 8; ++j)
1176 if (score_bits & (1 << j))
1177 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1178 }
1179
1180 /* now actually do the sorting (a variant of MSD radix sort) */
1181 {
1182 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1183 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1184 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1185 int stk_idx = 0;
1186
1187 base_stk [stk_idx] = dents;
1188 end_stk [stk_idx] = dents + size;
1189 bit_stk [stk_idx] = bit - 1;
1190
1191 do
1192 {
1193 base = base_stk [stk_idx];
1194 end = end_stk [stk_idx];
1195 bit = bit_stk [stk_idx];
1196
1197 for (;;)
1198 {
1199 unsigned char O = *bit >> 3;
1200 unsigned char M = 1 << (*bit & 7);
1201
1202 eio_dirent *a = base;
1203 eio_dirent *b = end;
1204
1205 if (b - a < EIO_SORT_CUTOFF)
1206 break;
1207
1208 /* now bit-partition the array on the bit */
1209 /* this ugly asymmetric loop seems to perform much better than typical */
1210 /* partition algos found in the literature */
1211 do
1212 if (!(((unsigned char *)a)[O] & M))
1213 ++a;
1214 else if (!(((unsigned char *)--b)[O] & M))
1215 {
1216 eio_dirent tmp = *a; *a = *b; *b = tmp;
1217 ++a;
1218 }
1219 while (b > a);
1220
1221 /* next bit, or stop, if no bits left in this path */
1222 if (!*--bit)
1223 break;
1224
1225 base_stk [stk_idx] = a;
1226 end_stk [stk_idx] = end;
1227 bit_stk [stk_idx] = bit;
1228 ++stk_idx;
1229
1230 end = a;
1231 }
1232 }
1233 while (stk_idx--);
1234 }
1235}
1236
1237static void
1238eio_dent_insertion_sort (eio_dirent *dents, int size)
1239{
1240 /* first move the smallest element to the front, to act as a sentinel */
1241 {
1242 int i;
1243 eio_dirent *min = dents;
1244
1245 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1246 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1247 if (EIO_DENT_CMP (dents [i], <, *min))
1248 min = &dents [i];
1249
1250 /* swap elements 0 and j (minimum) */
1251 {
1252 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1253 }
1254 }
1255
1256 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1257 {
1258 eio_dirent *i, *j;
1259
1260 for (i = dents + 1; i < dents + size; ++i)
1261 {
1262 eio_dirent value = *i;
1263
1264 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1265 j [1] = j [0];
1266
1267 j [1] = value;
1268 }
1269 }
1270}
1271
1272static void
1273eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1274{
1275 if (size <= 1)
1276 return; /* our insertion sort relies on size > 0 */
1277
1278 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1279 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1280 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1281
1282 /* use an insertion sort at the end, or for small arrays, */
1283 /* as insertion sort is more efficient for small partitions */
1284 eio_dent_insertion_sort (dents, size);
1285}
1286
931/* read a full directory */ 1287/* read a full directory */
932static void 1288static void
933eio__scandir (eio_req *req, etp_worker *self) 1289eio__scandir (eio_req *req, etp_worker *self)
934{ 1290{
935 DIR *dirp; 1291 DIR *dirp;
936 union
937 {
938 EIO_STRUCT_DIRENT d;
939 char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
940 } *u;
941 EIO_STRUCT_DIRENT *entp; 1292 EIO_STRUCT_DIRENT *entp;
942 char *name, *names; 1293 char *name, *names;
943 int memlen = 4096; 1294 int namesalloc = 4096;
944 int memofs = 0; 1295 int namesoffs = 0;
1296 int flags = req->int1;
1297 eio_dirent *dents = 0;
1298 int dentalloc = 128;
945 int res = 0; 1299 int dentoffs = 0;
1300 ino_t inode_bits = 0;
1301
1302 req->result = -1;
1303
1304 if (!(flags & EIO_READDIR_DENTS))
1305 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
946 1306
947 X_LOCK (wrklock); 1307 X_LOCK (wrklock);
1308 /* the corresponding closedir is in ETP_WORKER_CLEAR */
948 self->dirp = dirp = opendir (req->ptr1); 1309 self->dirp = dirp = opendir (req->ptr1);
949 self->dbuf = u = malloc (sizeof (*u)); 1310
950 req->flags |= EIO_FLAG_PTR2_FREE; 1311 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1312 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
951 req->ptr2 = names = malloc (memlen); 1313 req->ptr2 = names = malloc (namesalloc);
952 X_UNLOCK (wrklock); 1314 X_UNLOCK (wrklock);
953 1315
954 if (dirp && u && names) 1316 if (dirp && names && (!flags || dents))
955 for (;;) 1317 for (;;)
956 { 1318 {
957 errno = 0; 1319 errno = 0;
958 readdir_r (dirp, &u->d, &entp); 1320 entp = readdir (dirp);
959 1321
960 if (!entp) 1322 if (!entp)
1323 {
1324 if (errno)
1325 break;
1326
1327 /* sort etc. */
1328 req->int1 = flags;
1329 req->result = dentoffs;
1330
1331 if (flags & EIO_READDIR_STAT_ORDER)
1332 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1333 else if (flags & EIO_READDIR_DIRS_FIRST)
1334 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1335 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1336 else
1337 {
1338 /* in this case, all is known, and we just put dirs first and sort them */
1339 eio_dirent *oth = dents + dentoffs;
1340 eio_dirent *dir = dents;
1341
1342 /* now partition dirs to the front, and non-dirs to the back */
1343 /* by walking from both sides and swapping if necessary */
1344 while (oth > dir)
1345 {
1346 if (dir->type == EIO_DT_DIR)
1347 ++dir;
1348 else if ((--oth)->type == EIO_DT_DIR)
1349 {
1350 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1351
1352 ++dir;
1353 }
1354 }
1355
1356 /* now sort the dirs only (dirs all have the same score) */
1357 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1358 }
1359
961 break; 1360 break;
1361 }
962 1362
1363 /* now add the entry to our list(s) */
963 name = entp->d_name; 1364 name = entp->d_name;
964 1365
1366 /* skip . and .. entries */
965 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1367 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
966 { 1368 {
967 int len = strlen (name) + 1; 1369 int len = D_NAMLEN (entp) + 1;
968 1370
969 res++; 1371 while (ecb_expect_false (namesoffs + len > namesalloc))
970
971 while (memofs + len > memlen)
972 { 1372 {
973 memlen *= 2; 1373 namesalloc *= 2;
974 X_LOCK (wrklock); 1374 X_LOCK (wrklock);
975 req->ptr2 = names = realloc (names, memlen); 1375 req->ptr2 = names = realloc (names, namesalloc);
976 X_UNLOCK (wrklock); 1376 X_UNLOCK (wrklock);
977 1377
978 if (!names) 1378 if (!names)
979 break; 1379 break;
980 } 1380 }
981 1381
982 memcpy (names + memofs, name, len); 1382 memcpy (names + namesoffs, name, len);
1383
1384 if (dents)
1385 {
1386 struct eio_dirent *ent;
1387
1388 if (ecb_expect_false (dentoffs == dentalloc))
1389 {
1390 dentalloc *= 2;
1391 X_LOCK (wrklock);
1392 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1393 X_UNLOCK (wrklock);
1394
1395 if (!dents)
1396 break;
1397 }
1398
1399 ent = dents + dentoffs;
1400
1401 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1402 ent->namelen = len - 1;
1403 ent->inode = D_INO (entp);
1404
1405 inode_bits |= ent->inode;
1406
1407 switch (D_TYPE (entp))
1408 {
1409 default:
1410 ent->type = EIO_DT_UNKNOWN;
1411 flags |= EIO_READDIR_FOUND_UNKNOWN;
1412 break;
1413
1414 #ifdef DT_FIFO
1415 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1416 #endif
1417 #ifdef DT_CHR
1418 case DT_CHR: ent->type = EIO_DT_CHR; break;
1419 #endif
1420 #ifdef DT_MPC
1421 case DT_MPC: ent->type = EIO_DT_MPC; break;
1422 #endif
1423 #ifdef DT_DIR
1424 case DT_DIR: ent->type = EIO_DT_DIR; break;
1425 #endif
1426 #ifdef DT_NAM
1427 case DT_NAM: ent->type = EIO_DT_NAM; break;
1428 #endif
1429 #ifdef DT_BLK
1430 case DT_BLK: ent->type = EIO_DT_BLK; break;
1431 #endif
1432 #ifdef DT_MPB
1433 case DT_MPB: ent->type = EIO_DT_MPB; break;
1434 #endif
1435 #ifdef DT_REG
1436 case DT_REG: ent->type = EIO_DT_REG; break;
1437 #endif
1438 #ifdef DT_NWK
1439 case DT_NWK: ent->type = EIO_DT_NWK; break;
1440 #endif
1441 #ifdef DT_CMP
1442 case DT_CMP: ent->type = EIO_DT_CMP; break;
1443 #endif
1444 #ifdef DT_LNK
1445 case DT_LNK: ent->type = EIO_DT_LNK; break;
1446 #endif
1447 #ifdef DT_SOCK
1448 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1449 #endif
1450 #ifdef DT_DOOR
1451 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1452 #endif
1453 #ifdef DT_WHT
1454 case DT_WHT: ent->type = EIO_DT_WHT; break;
1455 #endif
1456 }
1457
1458 ent->score = 7;
1459
1460 if (flags & EIO_READDIR_DIRS_FIRST)
1461 {
1462 if (ent->type == EIO_DT_UNKNOWN)
1463 {
1464 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1465 ent->score = 1;
1466 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1467 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1468 }
1469 else if (ent->type == EIO_DT_DIR)
1470 ent->score = 0;
1471 }
1472 }
1473
983 memofs += len; 1474 namesoffs += len;
1475 ++dentoffs;
1476 }
1477
1478 if (EIO_CANCELLED (req))
1479 {
1480 errno = ECANCELED;
1481 break;
984 } 1482 }
985 } 1483 }
1484}
986 1485
987 if (errno) 1486#ifdef PAGESIZE
988 res = -1; 1487# define eio_pagesize() PAGESIZE
1488#else
1489static intptr_t
1490eio_pagesize (void)
1491{
1492 static intptr_t page;
1493
1494 if (!page)
1495 page = sysconf (_SC_PAGESIZE);
1496
1497 return page;
1498}
1499#endif
1500
1501static void
1502eio_page_align (void **addr, size_t *length)
1503{
1504 intptr_t mask = eio_pagesize () - 1;
1505
1506 /* round down addr */
1507 intptr_t adj = mask & (intptr_t)*addr;
1508
1509 *addr = (void *)((intptr_t)*addr - adj);
1510 *length += adj;
1511
1512 /* round up length */
1513 *length = (*length + mask) & ~mask;
1514}
1515
1516#if !_POSIX_MEMLOCK
1517# define eio__mlockall(a) ((errno = ENOSYS), -1)
1518#else
1519
1520static int
1521eio__mlockall (int flags)
1522{
1523 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1524 extern int mallopt (int, int);
1525 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1526 #endif
1527
1528 if (EIO_MCL_CURRENT != MCL_CURRENT
1529 || EIO_MCL_FUTURE != MCL_FUTURE)
1530 {
1531 flags = 0
1532 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1533 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1534 }
1535
1536 return mlockall (flags);
1537}
1538#endif
1539
1540#if !_POSIX_MEMLOCK_RANGE
1541# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1542#else
1543
1544static int
1545eio__mlock (void *addr, size_t length)
1546{
1547 eio_page_align (&addr, &length);
1548
1549 return mlock (addr, length);
1550}
1551
1552#endif
1553
1554#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1555# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1556#else
1557
1558static int
1559eio__msync (void *mem, size_t len, int flags)
1560{
1561 eio_page_align (&mem, &len);
1562
1563 if (EIO_MS_ASYNC != MS_SYNC
1564 || EIO_MS_INVALIDATE != MS_INVALIDATE
1565 || EIO_MS_SYNC != MS_SYNC)
1566 {
1567 flags = 0
1568 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1569 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1570 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1571 }
1572
1573 return msync (mem, len, flags);
1574}
1575
1576#endif
1577
1578static int
1579eio__mtouch (eio_req *req)
1580{
1581 void *mem = req->ptr2;
1582 size_t len = req->size;
1583 int flags = req->int1;
1584
1585 eio_page_align (&mem, &len);
1586
989 1587 {
990 req->result = res; 1588 intptr_t addr = (intptr_t)mem;
1589 intptr_t end = addr + len;
1590 intptr_t page = eio_pagesize ();
1591
1592 if (addr < end)
1593 if (flags & EIO_MT_MODIFY) /* modify */
1594 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1595 else
1596 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1597 }
1598
1599 return 0;
991} 1600}
992 1601
993/*****************************************************************************/ 1602/*****************************************************************************/
994 1603
995#define ALLOC(len) \ 1604#define ALLOC(len) \
1027 if (req) 1636 if (req)
1028 break; 1637 break;
1029 1638
1030 ++idle; 1639 ++idle;
1031 1640
1032 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1641 ts.tv_sec = time (0) + idle_timeout;
1033 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1642 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1034 { 1643 {
1035 if (idle > max_idle) 1644 if (idle > max_idle)
1036 { 1645 {
1037 --idle; 1646 --idle;
1080 return 0; 1689 return 0;
1081} 1690}
1082 1691
1083/*****************************************************************************/ 1692/*****************************************************************************/
1084 1693
1694int ecb_cold
1085int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1695eio_init (void (*want_poll)(void), void (*done_poll)(void))
1086{ 1696{
1087 etp_init (want_poll, done_poll); 1697 return etp_init (want_poll, done_poll);
1088} 1698}
1089 1699
1700ECB_INLINE void
1090static void eio_api_destroy (eio_req *req) 1701eio_api_destroy (eio_req *req)
1091{ 1702{
1092 free (req); 1703 free (req);
1093} 1704}
1094 1705
1095#define REQ(rtype) \ 1706#define REQ(rtype) \
1114 { \ 1725 { \
1115 eio_api_destroy (req); \ 1726 eio_api_destroy (req); \
1116 return 0; \ 1727 return 0; \
1117 } 1728 }
1118 1729
1730static void
1119static void eio_execute (etp_worker *self, eio_req *req) 1731eio_execute (etp_worker *self, eio_req *req)
1120{ 1732{
1121 errno = 0;
1122
1123 switch (req->type) 1733 switch (req->type)
1124 { 1734 {
1125 case EIO_READ: ALLOC (req->size); 1735 case EIO_READ: ALLOC (req->size);
1126 req->result = req->offs >= 0 1736 req->result = req->offs >= 0
1127 ? pread (req->int1, req->ptr2, req->size, req->offs) 1737 ? pread (req->int1, req->ptr2, req->size, req->offs)
1137 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1747 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1138 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1748 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1139 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1749 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1140 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1750 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1141 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1751 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1752
1753 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1754 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1755 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1756 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1142 1757
1143 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1758 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1144 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1759 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1145 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1760 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1146 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1761 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1156 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1771 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1157 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1772 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1158 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1773 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1159 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1774 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1160 1775
1161 case EIO_READLINK: ALLOC (NAME_MAX); 1776 case EIO_READLINK: ALLOC (PATH_MAX);
1162 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1777 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1163 1778
1164 case EIO_SYNC: req->result = 0; sync (); break; 1779 case EIO_SYNC: req->result = 0; sync (); break;
1165 case EIO_FSYNC: req->result = fsync (req->int1); break; 1780 case EIO_FSYNC: req->result = fsync (req->int1); break;
1166 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1781 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1782 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1783 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1784 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1785 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1786 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1167 1787
1168 case EIO_READDIR: eio__scandir (req, self); break; 1788 case EIO_READDIR: eio__scandir (req, self); break;
1169 1789
1170 case EIO_BUSY: 1790 case EIO_BUSY:
1171#ifdef _WIN32 1791#ifdef _WIN32
1172 Sleep (req->nv1 * 1000.); 1792 Sleep (req->nv1 * 1e3);
1173#else 1793#else
1174 { 1794 {
1175 struct timeval tv; 1795 struct timeval tv;
1176 1796
1177 tv.tv_sec = req->nv1; 1797 tv.tv_sec = req->nv1;
1178 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1798 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1179 1799
1180 req->result = select (0, 0, 0, 0, &tv); 1800 req->result = select (0, 0, 0, 0, &tv);
1181 } 1801 }
1182#endif 1802#endif
1183 break; 1803 break;
1198 times = tv; 1818 times = tv;
1199 } 1819 }
1200 else 1820 else
1201 times = 0; 1821 times = 0;
1202 1822
1203
1204 req->result = req->type == EIO_FUTIME 1823 req->result = req->type == EIO_FUTIME
1205 ? futimes (req->int1, times) 1824 ? futimes (req->int1, times)
1206 : utimes (req->ptr1, times); 1825 : utimes (req->ptr1, times);
1207 } 1826 }
1827 break;
1208 1828
1209 case EIO_GROUP: 1829 case EIO_GROUP:
1830 abort (); /* handled in eio_request */
1831
1210 case EIO_NOP: 1832 case EIO_NOP:
1211 req->result = 0; 1833 req->result = 0;
1212 break; 1834 break;
1213 1835
1214 case EIO_CUSTOM: 1836 case EIO_CUSTOM:
1215 req->feed (req); 1837 req->feed (req);
1216 break; 1838 break;
1217 1839
1218 default: 1840 default:
1841 errno = ENOSYS;
1219 req->result = -1; 1842 req->result = -1;
1220 break; 1843 break;
1221 } 1844 }
1222 1845
1223 req->errorno = errno; 1846 req->errorno = errno;
1243eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data) 1866eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1244{ 1867{
1245 REQ (EIO_FSYNC); req->int1 = fd; SEND; 1868 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1246} 1869}
1247 1870
1871eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1872{
1873 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1874}
1875
1876eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1877{
1878 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1879}
1880
1881eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1882{
1883 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1884}
1885
1886eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1887{
1888 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1889}
1890
1891eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1892{
1893 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1894}
1895
1248eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 1896eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1249{ 1897{
1250 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 1898 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1251} 1899}
1252 1900
1271} 1919}
1272 1920
1273eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1921eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1274{ 1922{
1275 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1923 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1924}
1925
1926eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1927{
1928 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1276} 1929}
1277 1930
1278eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1931eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1279{ 1932{
1280 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1933 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1354eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 2007eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1355{ 2008{
1356 return eio__1path (EIO_LSTAT, path, pri, cb, data); 2009 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1357} 2010}
1358 2011
2012eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
2013{
2014 return eio__1path (EIO_STATVFS, path, pri, cb, data);
2015}
2016
1359eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 2017eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1360{ 2018{
1361 return eio__1path (EIO_UNLINK, path, pri, cb, data); 2019 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1362} 2020}
1363 2021
1364eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data) 2022eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1365{ 2023{
1366 return eio__1path (EIO_RMDIR, path, pri, cb, data); 2024 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1367} 2025}
1368 2026
1369eio_req *eio_readdir (const char *path, int pri, eio_cb cb, void *data) 2027eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1370{ 2028{
1371 return eio__1path (EIO_READDIR, path, pri, cb, data); 2029 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1372} 2030}
1373 2031
1374eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2032eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1375{ 2033{
1376 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 2034 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1377} 2035}
1378 2036
1379static eio_req * 2037static eio_req *
1380eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2038eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1381{ 2039{
1405eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2063eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1406{ 2064{
1407 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2065 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1408} 2066}
1409 2067
1410eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2068eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1411{ 2069{
1412 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2070 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1413} 2071}
1414 2072
1415#endif 2073#endif
1426#undef SEND 2084#undef SEND
1427 2085
1428/*****************************************************************************/ 2086/*****************************************************************************/
1429/* grp functions */ 2087/* grp functions */
1430 2088
2089void
1431void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2090eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1432{ 2091{
1433 grp->int2 = limit; 2092 grp->int2 = limit;
1434 grp->feed = feed; 2093 grp->feed = feed;
1435 2094
1436 grp_try_feed (grp); 2095 grp_try_feed (grp);
1437} 2096}
1438 2097
2098void
1439void eio_grp_limit (eio_req *grp, int limit) 2099eio_grp_limit (eio_req *grp, int limit)
1440{ 2100{
1441 grp->int2 = limit; 2101 grp->int2 = limit;
1442 2102
1443 grp_try_feed (grp); 2103 grp_try_feed (grp);
1444} 2104}
1445 2105
2106void
1446void eio_grp_add (eio_req *grp, eio_req *req) 2107eio_grp_add (eio_req *grp, eio_req *req)
1447{ 2108{
1448 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2109 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2110
2111 grp->flags |= EIO_FLAG_GROUPADD;
1449 2112
1450 ++grp->size; 2113 ++grp->size;
1451 req->grp = grp; 2114 req->grp = grp;
1452 2115
1453 req->grp_prev = 0; 2116 req->grp_prev = 0;
1460} 2123}
1461 2124
1462/*****************************************************************************/ 2125/*****************************************************************************/
1463/* misc garbage */ 2126/* misc garbage */
1464 2127
2128ssize_t
1465ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2129eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1466{ 2130{
1467 etp_worker wrk; 2131 etp_worker wrk;
2132 ssize_t ret;
1468 2133
1469 wrk.dbuf = 0; 2134 wrk.dbuf = 0;
1470 2135
1471 eio__sendfile (ofd, ifd, offset, count, &wrk); 2136 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1472 2137
1473 if (wrk.dbuf) 2138 if (wrk.dbuf)
1474 free (wrk.dbuf); 2139 free (wrk.dbuf);
1475}
1476 2140
2141 return ret;
2142}
2143

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines