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

Comparing libeio/eio.c (file contents):
Revision 1.32 by root, Sat Jun 6 18:06:55 2009 UTC vs.
Revision 1.99 by root, Tue Jul 26 11:07:08 2011 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009 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"
41 46
42#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define XTHREAD_STACKSIZE EIO_STACKSIZE
44#endif 49#endif
45#include "xthread.h" 50#include "xthread.h"
… …
53#include <sys/stat.h> 58#include <sys/stat.h>
54#include <limits.h> 59#include <limits.h>
55#include <fcntl.h> 60#include <fcntl.h>
56#include <assert.h> 61#include <assert.h>
57 62
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H
66# include <stdint.h>
67#endif
68
69#ifndef ECANCELED
70# define ECANCELED EDOM
71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
80static void eio_destroy (eio_req *req);
81
58#ifndef EIO_FINISH 82#ifndef EIO_FINISH
59# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
60#endif 84#endif
61 85
62#ifndef EIO_DESTROY 86#ifndef EIO_DESTROY
… …
65 89
66#ifndef EIO_FEED 90#ifndef EIO_FEED
67# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 91# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
68#endif 92#endif
69 93
94#ifndef EIO_FD_TO_WIN32_HANDLE
95# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
96#endif
97#ifndef EIO_WIN32_HANDLE_TO_FD
98# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
99#endif
100
101#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
102
103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
104
70#ifdef _WIN32 105#ifdef _WIN32
71 106
72 /*doh*/ 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */
109
110 #ifdef EIO_STRUCT_STATI64
111 #define stat(path,buf) _stati64 (path,buf)
112 #define fstat(fd,buf) _fstati64 (fd,buf)
113 #endif
114 #define lstat(path,buf) stat (path,buf)
115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
116 #define mkdir(path,mode) _mkdir (path)
117 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
118
119 #define chmod(path,mode) _chmod (path, mode)
120 #define dup(fd) _dup (fd)
121 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
122
123 #define fchmod(fd,mode) EIO_ENOSYS ()
124 #define chown(path,uid,gid) EIO_ENOSYS ()
125 #define fchown(fd,uid,gid) EIO_ENOSYS ()
126 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
127 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
128 #define mknod(path,mode,dev) EIO_ENOSYS ()
129 #define sync() EIO_ENOSYS ()
130 #define readlink(path,buf,s) EIO_ENOSYS ()
131 #define statvfs(path,buf) EIO_ENOSYS ()
132 #define fstatvfs(fd,buf) EIO_ENOSYS ()
133
134 /* rename() uses MoveFile, which fails to overwrite */
135 #define rename(old,neu) eio__rename (old, neu)
136
137 static int
138 eio__rename (const char *old, const char *neu)
139 {
140 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
141 return 0;
142
143 /* should steal _dosmaperr */
144 switch (GetLastError ())
145 {
146 case ERROR_FILE_NOT_FOUND:
147 case ERROR_PATH_NOT_FOUND:
148 case ERROR_INVALID_DRIVE:
149 case ERROR_NO_MORE_FILES:
150 case ERROR_BAD_NETPATH:
151 case ERROR_BAD_NET_NAME:
152 case ERROR_BAD_PATHNAME:
153 case ERROR_FILENAME_EXCED_RANGE:
154 errno = ENOENT;
155 break;
156
157 default:
158 errno = EACCES;
159 break;
160 }
161
162 return -1;
163 }
164
165 /* we could even stat and see if it exists */
166 static int
167 symlink (const char *old, const char *neu)
168 {
169 #if WINVER >= 0x0600
170 if (CreateSymbolicLink (neu, old, 1))
171 return 0;
172
173 if (CreateSymbolicLink (neu, old, 0))
174 return 0;
175 #endif
176
177 return EIO_ERRNO (ENOENT, -1);
178 }
179
180 /* POSIX API only */
181 #define CreateHardLink(neu,old,flags) 0
182 #define CreateSymbolicLink(neu,old,flags) 0
183
184 struct statvfs
185 {
186 int dummy;
187 };
188
189 #define DT_DIR EIO_DT_DIR
190 #define DT_REG EIO_DT_REG
191 #define D_NAME(entp) entp.cFileName
192 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
193
73#else 194#else
74 195
75# include "config.h"
76# include <sys/time.h> 196 #include <sys/time.h>
77# include <sys/select.h> 197 #include <sys/select.h>
198 #include <sys/statvfs.h>
78# include <unistd.h> 199 #include <unistd.h>
200 #include <signal.h>
201 #include <dirent.h>
202
203 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
204 #include <sys/mman.h>
205 #endif
206
207 #define D_NAME(entp) entp->d_name
208
209 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
210 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
211 #define _DIRENT_HAVE_D_TYPE /* sigh */
212 #define D_INO(de) (de)->d_fileno
213 #define D_NAMLEN(de) (de)->d_namlen
214 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
215 #define D_INO(de) (de)->d_ino
216 #endif
217
218 #ifdef _D_EXACT_NAMLEN
219 #undef D_NAMLEN
220 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
221 #endif
222
223 #ifdef _DIRENT_HAVE_D_TYPE
224 #define D_TYPE(de) (de)->d_type
225 #endif
226
227 #ifndef EIO_STRUCT_DIRENT
228 #define EIO_STRUCT_DIRENT struct dirent
229 #endif
230
231#endif
232
233#if HAVE_UTIMES
79# include <utime.h> 234# include <utime.h>
80# include <signal.h>
81# include <dirent.h>
82
83/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
84# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
85# define D_INO(de) (de)->d_fileno
86# define _DIRENT_HAVE_D_TYPE /* sigh */
87# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600
88# define D_INO(de) (de)->d_ino
89# endif 235#endif
90 236
91# ifdef _DIRENT_HAVE_D_TYPE 237#if HAVE_SYS_SYSCALL_H
92# define D_TYPE(de) (de)->d_type 238# include <sys/syscall.h>
93# endif 239#endif
94 240
95# ifndef EIO_STRUCT_DIRENT 241#if HAVE_SYS_PRCTL_H
96# define EIO_STRUCT_DIRENT struct dirent 242# include <sys/prctl.h>
97# endif
98
99#endif 243#endif
100 244
101#if HAVE_SENDFILE 245#if HAVE_SENDFILE
102# if __linux 246# if __linux
103# include <sys/sendfile.h> 247# include <sys/sendfile.h>
104# elif __freebsd 248# elif __FreeBSD__ || defined __APPLE__
105# include <sys/socket.h> 249# include <sys/socket.h>
106# include <sys/uio.h> 250# include <sys/uio.h>
107# elif __hpux 251# elif __hpux
108# include <sys/socket.h> 252# include <sys/socket.h>
109# elif __solaris /* not yet */ 253# elif __solaris
110# include <sys/sendfile.h> 254# include <sys/sendfile.h>
111# else 255# else
112# error sendfile support requested but not available 256# error sendfile support requested but not available
113# endif 257# endif
114#endif 258#endif
115 259
116#ifndef D_TYPE 260#ifndef D_TYPE
117# define D_TYPE(de) 0 261# define D_TYPE(de) 0
118#endif 262#endif
119
120#ifndef D_INO 263#ifndef D_INO
121# define D_INO(de) 0 264# define D_INO(de) 0
122#endif 265#endif
123 266#ifndef D_NAMLEN
124/* number of seconds after which an idle threads exit */ 267# define D_NAMLEN(entp) strlen (D_NAME (entp))
125#define IDLE_TIMEOUT 10 268#endif
126 269
127/* used for struct dirent, AIX doesn't provide it */ 270/* used for struct dirent, AIX doesn't provide it */
128#ifndef NAME_MAX 271#ifndef NAME_MAX
129# define NAME_MAX 4096 272# define NAME_MAX 4096
130#endif 273#endif
131 274
275/* used for readlink etc. */
276#ifndef PATH_MAX
277# define PATH_MAX 4096
278#endif
279
132/* buffer size for various temporary buffers */ 280/* buffer size for various temporary buffers */
133#define EIO_BUFSIZE 65536 281#define EIO_BUFSIZE 65536
134 282
135#define dBUF \ 283#define dBUF \
136 char *eio_buf; \
137 ETP_WORKER_LOCK (self); \
138 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 284 char *eio_buf = malloc (EIO_BUFSIZE); \
139 ETP_WORKER_UNLOCK (self); \
140 errno = ENOMEM; \ 285 errno = ENOMEM; \
141 if (!eio_buf) \ 286 if (!eio_buf) \
142 return -1; 287 return -1
288
289#define FUBd \
290 free (eio_buf)
143 291
144#define EIO_TICKS ((1000000 + 1023) >> 10) 292#define EIO_TICKS ((1000000 + 1023) >> 10)
145
146/*****************************************************************************/
147
148#if __GNUC__ >= 3
149# define expect(expr,value) __builtin_expect ((expr),(value))
150#else
151# define expect(expr,value) (expr)
152#endif
153
154#define expect_false(expr) expect ((expr) != 0, 0)
155#define expect_true(expr) expect ((expr) != 0, 1)
156
157/*****************************************************************************/
158 293
159#define ETP_PRI_MIN EIO_PRI_MIN 294#define ETP_PRI_MIN EIO_PRI_MIN
160#define ETP_PRI_MAX EIO_PRI_MAX 295#define ETP_PRI_MAX EIO_PRI_MAX
161 296
162struct etp_worker; 297struct etp_worker;
… …
166static int eio_finish (eio_req *req); 301static int eio_finish (eio_req *req);
167#define ETP_FINISH(req) eio_finish (req) 302#define ETP_FINISH(req) eio_finish (req)
168static void eio_execute (struct etp_worker *self, eio_req *req); 303static void eio_execute (struct etp_worker *self, eio_req *req);
169#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 304#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
170 305
171#define ETP_WORKER_CLEAR(req) \
172 if (wrk->dbuf) \
173 { \
174 free (wrk->dbuf); \
175 wrk->dbuf = 0; \
176 } \
177 \
178 if (wrk->dirp) \
179 { \
180 closedir (wrk->dirp); \
181 wrk->dirp = 0; \
182 }
183
184#define ETP_WORKER_COMMON \
185 void *dbuf; \
186 DIR *dirp;
187
188/*****************************************************************************/ 306/*****************************************************************************/
189 307
190#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 308#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
191 309
192/* calculcate time difference in ~1/EIO_TICKS of a second */ 310/* calculate time difference in ~1/EIO_TICKS of a second */
311ecb_inline int
193static int tvdiff (struct timeval *tv1, struct timeval *tv2) 312tvdiff (struct timeval *tv1, struct timeval *tv2)
194{ 313{
195 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 314 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
196 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 315 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
197} 316}
198 317
… …
205static unsigned int max_poll_reqs; /* reslock */ 324static unsigned int max_poll_reqs; /* reslock */
206 325
207static volatile unsigned int nreqs; /* reqlock */ 326static volatile unsigned int nreqs; /* reqlock */
208static volatile unsigned int nready; /* reqlock */ 327static volatile unsigned int nready; /* reqlock */
209static volatile unsigned int npending; /* reqlock */ 328static volatile unsigned int npending; /* reqlock */
210static volatile unsigned int max_idle = 4; 329static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
330static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
211 331
212static mutex_t wrklock = X_MUTEX_INIT; 332static xmutex_t wrklock;
213static mutex_t reslock = X_MUTEX_INIT; 333static xmutex_t reslock;
214static mutex_t reqlock = X_MUTEX_INIT; 334static xmutex_t reqlock;
215static cond_t reqwait = X_COND_INIT; 335static xcond_t reqwait;
216 336
217#if !HAVE_PREADWRITE 337#if !HAVE_PREADWRITE
218/* 338/*
219 * make our pread/pwrite emulation safe against themselves, but not against 339 * make our pread/pwrite emulation safe against themselves, but not against
220 * normal read/write by using a mutex. slows down execution a lot, 340 * normal read/write by using a mutex. slows down execution a lot,
221 * but that's your problem, not mine. 341 * but that's your problem, not mine.
222 */ 342 */
223static mutex_t preadwritelock = X_MUTEX_INIT; 343static xmutex_t preadwritelock;
224#endif 344#endif
225 345
226typedef struct etp_worker 346typedef struct etp_worker
227{ 347{
228 /* locked by wrklock */ 348 /* locked by wrklock */
229 struct etp_worker *prev, *next; 349 struct etp_worker *prev, *next;
230 350
231 thread_t tid; 351 xthread_t tid;
232 352
233 /* locked by reslock, reqlock or wrklock */ 353 /* locked by reslock, reqlock or wrklock */
234 ETP_REQ *req; /* currently processed request */ 354 ETP_REQ *req; /* currently processed request */
235 355
356#ifdef ETP_WORKER_COMMON
236 ETP_WORKER_COMMON 357 ETP_WORKER_COMMON
358#endif
237} etp_worker; 359} etp_worker;
238 360
239static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 361static etp_worker wrk_first; /* NOT etp */
240 362
241#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 363#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
242#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 364#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
243 365
244/* worker threads management */ 366/* worker threads management */
245 367
368static void ecb_cold
246static void etp_worker_clear (etp_worker *wrk) 369etp_worker_clear (etp_worker *wrk)
247{ 370{
248 ETP_WORKER_CLEAR (wrk);
249} 371}
250 372
373static void ecb_cold
251static void etp_worker_free (etp_worker *wrk) 374etp_worker_free (etp_worker *wrk)
252{ 375{
253 wrk->next->prev = wrk->prev; 376 wrk->next->prev = wrk->prev;
254 wrk->prev->next = wrk->next; 377 wrk->prev->next = wrk->next;
255 378
256 free (wrk); 379 free (wrk);
257} 380}
258 381
259static unsigned int etp_nreqs (void) 382static unsigned int
383etp_nreqs (void)
260{ 384{
261 int retval; 385 int retval;
262 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 386 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
263 retval = nreqs; 387 retval = nreqs;
264 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 388 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
265 return retval; 389 return retval;
266} 390}
267 391
268static unsigned int etp_nready (void) 392static unsigned int
393etp_nready (void)
269{ 394{
270 unsigned int retval; 395 unsigned int retval;
271 396
272 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 397 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
273 retval = nready; 398 retval = nready;
274 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 399 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
275 400
276 return retval; 401 return retval;
277} 402}
278 403
279static unsigned int etp_npending (void) 404static unsigned int
405etp_npending (void)
280{ 406{
281 unsigned int retval; 407 unsigned int retval;
282 408
283 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 409 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
284 retval = npending; 410 retval = npending;
285 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 411 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
286 412
287 return retval; 413 return retval;
288} 414}
289 415
290static unsigned int etp_nthreads (void) 416static unsigned int
417etp_nthreads (void)
291{ 418{
292 unsigned int retval; 419 unsigned int retval;
293 420
294 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 421 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
295 retval = started; 422 retval = started;
… …
309} etp_reqq; 436} etp_reqq;
310 437
311static etp_reqq req_queue; 438static etp_reqq req_queue;
312static etp_reqq res_queue; 439static etp_reqq res_queue;
313 440
441static void ecb_noinline ecb_cold
442reqq_init (etp_reqq *q)
443{
444 int pri;
445
446 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
447 q->qs[pri] = q->qe[pri] = 0;
448
449 q->size = 0;
450}
451
452static int ecb_noinline
314static int reqq_push (etp_reqq *q, ETP_REQ *req) 453reqq_push (etp_reqq *q, ETP_REQ *req)
315{ 454{
316 int pri = req->pri; 455 int pri = req->pri;
317 req->next = 0; 456 req->next = 0;
318 457
319 if (q->qe[pri]) 458 if (q->qe[pri])
… …
325 q->qe[pri] = q->qs[pri] = req; 464 q->qe[pri] = q->qs[pri] = req;
326 465
327 return q->size++; 466 return q->size++;
328} 467}
329 468
469static ETP_REQ * ecb_noinline
330static ETP_REQ *reqq_shift (etp_reqq *q) 470reqq_shift (etp_reqq *q)
331{ 471{
332 int pri; 472 int pri;
333 473
334 if (!q->size) 474 if (!q->size)
335 return 0; 475 return 0;
… …
350 } 490 }
351 491
352 abort (); 492 abort ();
353} 493}
354 494
355static void etp_atfork_prepare (void) 495static int ecb_cold
496etp_init (void (*want_poll)(void), void (*done_poll)(void))
356{ 497{
357 X_LOCK (wrklock); 498 X_MUTEX_CREATE (wrklock);
358 X_LOCK (reqlock); 499 X_MUTEX_CREATE (reslock);
359 X_LOCK (reslock); 500 X_MUTEX_CREATE (reqlock);
360#if !HAVE_PREADWRITE 501 X_COND_CREATE (reqwait);
361 X_LOCK (preadwritelock);
362#endif
363}
364 502
365static void etp_atfork_parent (void) 503 reqq_init (&req_queue);
366{ 504 reqq_init (&res_queue);
367#if !HAVE_PREADWRITE
368 X_UNLOCK (preadwritelock);
369#endif
370 X_UNLOCK (reslock);
371 X_UNLOCK (reqlock);
372 X_UNLOCK (wrklock);
373}
374 505
375static void etp_atfork_child (void) 506 wrk_first.next =
376{ 507 wrk_first.prev = &wrk_first;
377 ETP_REQ *prv;
378
379 while ((prv = reqq_shift (&req_queue)))
380 ETP_DESTROY (prv);
381
382 while ((prv = reqq_shift (&res_queue)))
383 ETP_DESTROY (prv);
384
385 while (wrk_first.next != &wrk_first)
386 {
387 etp_worker *wrk = wrk_first.next;
388
389 if (wrk->req)
390 ETP_DESTROY (wrk->req);
391
392 etp_worker_clear (wrk);
393 etp_worker_free (wrk);
394 }
395 508
396 started = 0; 509 started = 0;
397 idle = 0; 510 idle = 0;
398 nreqs = 0; 511 nreqs = 0;
399 nready = 0; 512 nready = 0;
400 npending = 0; 513 npending = 0;
401 514
402 etp_atfork_parent ();
403}
404
405static void
406etp_once_init (void)
407{
408 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
409}
410
411static int
412etp_init (void (*want_poll)(void), void (*done_poll)(void))
413{
414 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
415
416 pthread_once (&doinit, etp_once_init);
417
418 want_poll_cb = want_poll; 515 want_poll_cb = want_poll;
419 done_poll_cb = done_poll; 516 done_poll_cb = done_poll;
420 517
421 return 0; 518 return 0;
422} 519}
423 520
424X_THREAD_PROC (etp_proc); 521X_THREAD_PROC (etp_proc);
425 522
523static void ecb_cold
426static void etp_start_thread (void) 524etp_start_thread (void)
427{ 525{
428 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 526 etp_worker *wrk = calloc (1, sizeof (etp_worker));
429 527
430 /*TODO*/ 528 /*TODO*/
431 assert (("unable to allocate worker thread data", wrk)); 529 assert (("unable to allocate worker thread data", wrk));
… …
444 free (wrk); 542 free (wrk);
445 543
446 X_UNLOCK (wrklock); 544 X_UNLOCK (wrklock);
447} 545}
448 546
547static void
449static void etp_maybe_start_thread (void) 548etp_maybe_start_thread (void)
450{ 549{
451 if (expect_true (etp_nthreads () >= wanted)) 550 if (ecb_expect_true (etp_nthreads () >= wanted))
452 return; 551 return;
453 552
454 /* todo: maybe use idle here, but might be less exact */ 553 /* todo: maybe use idle here, but might be less exact */
455 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 554 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
456 return; 555 return;
457 556
458 etp_start_thread (); 557 etp_start_thread ();
459} 558}
460 559
560static void ecb_cold
461static void etp_end_thread (void) 561etp_end_thread (void)
462{ 562{
463 eio_req *req = calloc (1, sizeof (eio_req)); 563 eio_req *req = calloc (1, sizeof (eio_req));
464 564
465 req->type = -1; 565 req->type = -1;
466 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 566 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
473 X_LOCK (wrklock); 573 X_LOCK (wrklock);
474 --started; 574 --started;
475 X_UNLOCK (wrklock); 575 X_UNLOCK (wrklock);
476} 576}
477 577
478static int etp_poll (void) 578static int
579etp_poll (void)
479{ 580{
480 unsigned int maxreqs; 581 unsigned int maxreqs;
481 unsigned int maxtime; 582 unsigned int maxtime;
482 struct timeval tv_start, tv_now; 583 struct timeval tv_start, tv_now;
483 584
… …
513 614
514 X_LOCK (reqlock); 615 X_LOCK (reqlock);
515 --nreqs; 616 --nreqs;
516 X_UNLOCK (reqlock); 617 X_UNLOCK (reqlock);
517 618
518 if (expect_false (req->type == EIO_GROUP && req->size)) 619 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
519 { 620 {
520 req->int1 = 1; /* mark request as delayed */ 621 req->int1 = 1; /* mark request as delayed */
521 continue; 622 continue;
522 } 623 }
523 else 624 else
524 { 625 {
525 int res = ETP_FINISH (req); 626 int res = ETP_FINISH (req);
526 if (expect_false (res)) 627 if (ecb_expect_false (res))
527 return res; 628 return res;
528 } 629 }
529 630
530 if (expect_false (maxreqs && !--maxreqs)) 631 if (ecb_expect_false (maxreqs && !--maxreqs))
531 break; 632 break;
532 633
533 if (maxtime) 634 if (maxtime)
534 { 635 {
535 gettimeofday (&tv_now, 0); 636 gettimeofday (&tv_now, 0);
… …
541 642
542 errno = EAGAIN; 643 errno = EAGAIN;
543 return -1; 644 return -1;
544} 645}
545 646
647static void
546static void etp_cancel (ETP_REQ *req) 648etp_cancel (ETP_REQ *req)
547{ 649{
548 X_LOCK (wrklock); 650 req->cancelled = 1;
549 req->flags |= EIO_FLAG_CANCELLED;
550 X_UNLOCK (wrklock);
551 651
552 eio_grp_cancel (req); 652 eio_grp_cancel (req);
553} 653}
554 654
655static void
555static void etp_submit (ETP_REQ *req) 656etp_submit (ETP_REQ *req)
556{ 657{
557 req->pri -= ETP_PRI_MIN; 658 req->pri -= ETP_PRI_MIN;
558 659
559 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 660 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
560 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 661 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
561 662
562 if (expect_false (req->type == EIO_GROUP)) 663 if (ecb_expect_false (req->type == EIO_GROUP))
563 { 664 {
564 /* I hope this is worth it :/ */ 665 /* I hope this is worth it :/ */
565 X_LOCK (reqlock); 666 X_LOCK (reqlock);
566 ++nreqs; 667 ++nreqs;
567 X_UNLOCK (reqlock); 668 X_UNLOCK (reqlock);
… …
586 687
587 etp_maybe_start_thread (); 688 etp_maybe_start_thread ();
588 } 689 }
589} 690}
590 691
692static void ecb_cold
591static void etp_set_max_poll_time (double nseconds) 693etp_set_max_poll_time (double nseconds)
592{ 694{
593 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 695 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
594 max_poll_time = nseconds; 696 max_poll_time = nseconds * EIO_TICKS;
595 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 697 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
596} 698}
597 699
700static void ecb_cold
598static void etp_set_max_poll_reqs (unsigned int maxreqs) 701etp_set_max_poll_reqs (unsigned int maxreqs)
599{ 702{
600 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 703 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
601 max_poll_reqs = maxreqs; 704 max_poll_reqs = maxreqs;
602 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 705 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
603} 706}
604 707
708static void ecb_cold
605static void etp_set_max_idle (unsigned int nthreads) 709etp_set_max_idle (unsigned int nthreads)
606{ 710{
607 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 711 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
608 max_idle = nthreads <= 0 ? 1 : nthreads; 712 max_idle = nthreads;
609 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 713 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
610} 714}
611 715
716static void ecb_cold
717etp_set_idle_timeout (unsigned int seconds)
718{
719 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
720 idle_timeout = seconds;
721 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
722}
723
724static void ecb_cold
612static void etp_set_min_parallel (unsigned int nthreads) 725etp_set_min_parallel (unsigned int nthreads)
613{ 726{
614 if (wanted < nthreads) 727 if (wanted < nthreads)
615 wanted = nthreads; 728 wanted = nthreads;
616} 729}
617 730
731static void ecb_cold
618static void etp_set_max_parallel (unsigned int nthreads) 732etp_set_max_parallel (unsigned int nthreads)
619{ 733{
620 if (wanted > nthreads) 734 if (wanted > nthreads)
621 wanted = nthreads; 735 wanted = nthreads;
622 736
623 while (started > wanted) 737 while (started > wanted)
624 etp_end_thread (); 738 etp_end_thread ();
625} 739}
626 740
627/*****************************************************************************/ 741/*****************************************************************************/
628 742
743static void
629static void grp_try_feed (eio_req *grp) 744grp_try_feed (eio_req *grp)
630{ 745{
631 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 746 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
632 { 747 {
633 grp->flags &= ~EIO_FLAG_GROUPADD; 748 grp->flags &= ~EIO_FLAG_GROUPADD;
634 749
… …
641 break; 756 break;
642 } 757 }
643 } 758 }
644} 759}
645 760
761static int
646static int grp_dec (eio_req *grp) 762grp_dec (eio_req *grp)
647{ 763{
648 --grp->size; 764 --grp->size;
649 765
650 /* call feeder, if applicable */ 766 /* call feeder, if applicable */
651 grp_try_feed (grp); 767 grp_try_feed (grp);
… …
655 return eio_finish (grp); 771 return eio_finish (grp);
656 else 772 else
657 return 0; 773 return 0;
658} 774}
659 775
776static void
660void eio_destroy (eio_req *req) 777eio_destroy (eio_req *req)
661{ 778{
662 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 779 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
663 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 780 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
664 781
665 EIO_DESTROY (req); 782 EIO_DESTROY (req);
666} 783}
667 784
785static int
668static int eio_finish (eio_req *req) 786eio_finish (eio_req *req)
669{ 787{
670 int res = EIO_FINISH (req); 788 int res = EIO_FINISH (req);
671 789
672 if (req->grp) 790 if (req->grp)
673 { 791 {
… …
681 if (grp->grp_first == req) 799 if (grp->grp_first == req)
682 grp->grp_first = req->grp_next; 800 grp->grp_first = req->grp_next;
683 801
684 res2 = grp_dec (grp); 802 res2 = grp_dec (grp);
685 803
686 if (!res && res2) 804 if (!res)
687 res = res2; 805 res = res2;
688 } 806 }
689 807
690 eio_destroy (req); 808 eio_destroy (req);
691 809
692 return res; 810 return res;
693} 811}
694 812
813void
695void eio_grp_cancel (eio_req *grp) 814eio_grp_cancel (eio_req *grp)
696{ 815{
697 for (grp = grp->grp_first; grp; grp = grp->grp_next) 816 for (grp = grp->grp_first; grp; grp = grp->grp_next)
698 eio_cancel (grp); 817 eio_cancel (grp);
699} 818}
700 819
820void
701void eio_cancel (eio_req *req) 821eio_cancel (eio_req *req)
702{ 822{
703 etp_cancel (req); 823 etp_cancel (req);
704} 824}
705 825
826void
706void eio_submit (eio_req *req) 827eio_submit (eio_req *req)
707{ 828{
708 etp_submit (req); 829 etp_submit (req);
709} 830}
710 831
711unsigned int eio_nreqs (void) 832unsigned int
833eio_nreqs (void)
712{ 834{
713 return etp_nreqs (); 835 return etp_nreqs ();
714} 836}
715 837
716unsigned int eio_nready (void) 838unsigned int
839eio_nready (void)
717{ 840{
718 return etp_nready (); 841 return etp_nready ();
719} 842}
720 843
721unsigned int eio_npending (void) 844unsigned int
845eio_npending (void)
722{ 846{
723 return etp_npending (); 847 return etp_npending ();
724} 848}
725 849
726unsigned int eio_nthreads (void) 850unsigned int ecb_cold
851eio_nthreads (void)
727{ 852{
728 return etp_nthreads (); 853 return etp_nthreads ();
729} 854}
730 855
856void ecb_cold
731void eio_set_max_poll_time (double nseconds) 857eio_set_max_poll_time (double nseconds)
732{ 858{
733 etp_set_max_poll_time (nseconds); 859 etp_set_max_poll_time (nseconds);
734} 860}
735 861
862void ecb_cold
736void eio_set_max_poll_reqs (unsigned int maxreqs) 863eio_set_max_poll_reqs (unsigned int maxreqs)
737{ 864{
738 etp_set_max_poll_reqs (maxreqs); 865 etp_set_max_poll_reqs (maxreqs);
739} 866}
740 867
868void ecb_cold
741void eio_set_max_idle (unsigned int nthreads) 869eio_set_max_idle (unsigned int nthreads)
742{ 870{
743 etp_set_max_idle (nthreads); 871 etp_set_max_idle (nthreads);
744} 872}
745 873
874void ecb_cold
875eio_set_idle_timeout (unsigned int seconds)
876{
877 etp_set_idle_timeout (seconds);
878}
879
880void ecb_cold
746void eio_set_min_parallel (unsigned int nthreads) 881eio_set_min_parallel (unsigned int nthreads)
747{ 882{
748 etp_set_min_parallel (nthreads); 883 etp_set_min_parallel (nthreads);
749} 884}
750 885
886void ecb_cold
751void eio_set_max_parallel (unsigned int nthreads) 887eio_set_max_parallel (unsigned int nthreads)
752{ 888{
753 etp_set_max_parallel (nthreads); 889 etp_set_max_parallel (nthreads);
754} 890}
755 891
756int eio_poll (void) 892int eio_poll (void)
… …
765# undef pread 901# undef pread
766# undef pwrite 902# undef pwrite
767# define pread eio__pread 903# define pread eio__pread
768# define pwrite eio__pwrite 904# define pwrite eio__pwrite
769 905
770static ssize_t 906static eio_ssize_t
771eio__pread (int fd, void *buf, size_t count, off_t offset) 907eio__pread (int fd, void *buf, size_t count, off_t offset)
772{ 908{
773 ssize_t res; 909 eio_ssize_t res;
774 off_t ooffset; 910 off_t ooffset;
775 911
776 X_LOCK (preadwritelock); 912 X_LOCK (preadwritelock);
777 ooffset = lseek (fd, 0, SEEK_CUR); 913 ooffset = lseek (fd, 0, SEEK_CUR);
778 lseek (fd, offset, SEEK_SET); 914 lseek (fd, offset, SEEK_SET);
… …
781 X_UNLOCK (preadwritelock); 917 X_UNLOCK (preadwritelock);
782 918
783 return res; 919 return res;
784} 920}
785 921
786static ssize_t 922static eio_ssize_t
787eio__pwrite (int fd, void *buf, size_t count, off_t offset) 923eio__pwrite (int fd, void *buf, size_t count, off_t offset)
788{ 924{
789 ssize_t res; 925 eio_ssize_t res;
790 off_t ooffset; 926 off_t ooffset;
791 927
792 X_LOCK (preadwritelock); 928 X_LOCK (preadwritelock);
793 ooffset = lseek (fd, 0, SEEK_CUR); 929 ooffset = lseek (fd, 0, SEEK_CUR);
794 lseek (fd, offset, SEEK_SET); 930 lseek (fd, offset, SEEK_SET);
… …
798 934
799 return res; 935 return res;
800} 936}
801#endif 937#endif
802 938
803#ifndef HAVE_FUTIMES 939#ifndef HAVE_UTIMES
804 940
805# undef utimes 941# undef utimes
806# undef futimes
807# define utimes(path,times) eio__utimes (path, times) 942# define utimes(path,times) eio__utimes (path, times)
808# define futimes(fd,times) eio__futimes (fd, times)
809 943
810static int 944static int
811eio__utimes (const char *filename, const struct timeval times[2]) 945eio__utimes (const char *filename, const struct timeval times[2])
812{ 946{
813 if (times) 947 if (times)
… …
821 } 955 }
822 else 956 else
823 return utime (filename, 0); 957 return utime (filename, 0);
824} 958}
825 959
960#endif
961
962#ifndef HAVE_FUTIMES
963
964# undef futimes
965# define futimes(fd,times) eio__futimes (fd, times)
966
967static int
826static int eio__futimes (int fd, const struct timeval tv[2]) 968eio__futimes (int fd, const struct timeval tv[2])
827{ 969{
828 errno = ENOSYS; 970 errno = ENOSYS;
829 return -1; 971 return -1;
830} 972}
831 973
… …
834#if !HAVE_FDATASYNC 976#if !HAVE_FDATASYNC
835# undef fdatasync 977# undef fdatasync
836# define fdatasync(fd) fsync (fd) 978# define fdatasync(fd) fsync (fd)
837#endif 979#endif
838 980
981static int
982eio__syncfs (int fd)
983{
984 int res;
985
986#if HAVE_SYS_SYNCFS
987 res = (int)syscall (__NR_syncfs, (int)(fd));
988#else
989 res = -1;
990 errno = ENOSYS;
991#endif
992
993 if (res < 0 && errno == ENOSYS && fd >= 0)
994 sync ();
995
996 return res;
997}
998
839/* sync_file_range always needs emulation */ 999/* sync_file_range always needs emulation */
840int 1000static int
841eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1001eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
842{ 1002{
843#if HAVE_SYNC_FILE_RANGE 1003#if HAVE_SYNC_FILE_RANGE
844 int res; 1004 int res;
845 1005
… …
858 if (!res || errno != ENOSYS) 1018 if (!res || errno != ENOSYS)
859 return res; 1019 return res;
860#endif 1020#endif
861 1021
862 /* even though we could play tricks with the flags, it's better to always 1022 /* even though we could play tricks with the flags, it's better to always
863 * call fdatasync, as thta matches the expectation of it's users best */ 1023 * call fdatasync, as that matches the expectation of its users best */
864 return fdatasync (fd); 1024 return fdatasync (fd);
1025}
1026
1027static int
1028eio__fallocate (int fd, int mode, off_t offset, size_t len)
1029{
1030#if HAVE_FALLOCATE
1031 return fallocate (fd, mode, offset, len);
1032#else
1033 errno = ENOSYS;
1034 return -1;
1035#endif
865} 1036}
866 1037
867#if !HAVE_READAHEAD 1038#if !HAVE_READAHEAD
868# undef readahead 1039# undef readahead
869# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1040# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
870 1041
871static ssize_t 1042static eio_ssize_t
872eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1043eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
873{ 1044{
874 size_t todo = count; 1045 size_t todo = count;
875 dBUF; 1046 dBUF;
876 1047
… …
881 pread (fd, eio_buf, len, offset); 1052 pread (fd, eio_buf, len, offset);
882 offset += len; 1053 offset += len;
883 todo -= len; 1054 todo -= len;
884 } 1055 }
885 1056
1057 FUBd;
1058
886 errno = 0; 1059 errno = 0;
887 return count; 1060 return count;
888} 1061}
889 1062
890#endif 1063#endif
891 1064
892/* sendfile always needs emulation */ 1065/* sendfile always needs emulation */
893static ssize_t 1066static eio_ssize_t
894eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1067eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
895{ 1068{
1069 eio_ssize_t written = 0;
896 ssize_t res; 1070 eio_ssize_t res;
897 1071
898 if (!count) 1072 if (!count)
899 return 0; 1073 return 0;
900 1074
1075 for (;;)
1076 {
1077#ifdef __APPLE__
1078# undef HAVE_SENDFILE /* broken, as everything on os x */
1079#endif
901#if HAVE_SENDFILE 1080#if HAVE_SENDFILE
902# if __linux 1081# if __linux
1082 off_t soffset = offset;
903 res = sendfile (ofd, ifd, &offset, count); 1083 res = sendfile (ofd, ifd, &soffset, count);
904 1084
905# elif __freebsd 1085# elif __FreeBSD__
906 /* 1086 /*
907 * Of course, the freebsd sendfile is a dire hack with no thoughts 1087 * Of course, the freebsd sendfile is a dire hack with no thoughts
908 * wasted on making it similar to other I/O functions. 1088 * wasted on making it similar to other I/O functions.
909 */ 1089 */
910 {
911 off_t sbytes; 1090 off_t sbytes;
912 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1091 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
913 1092
914 if (res < 0 && sbytes) 1093 #if 0 /* according to the manpage, this is correct, but broken behaviour */
915 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 1094 /* freebsd' sendfile will return 0 on success */
1095 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
1096 /* not on e.g. EIO or EPIPE - sounds broken */
1097 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
916 res = sbytes; 1098 res = sbytes;
917 } 1099 #endif
1100
1101 /* according to source inspection, this is correct, and useful behaviour */
1102 if (sbytes)
1103 res = sbytes;
1104
1105# elif defined (__APPLE__)
1106 off_t sbytes = count;
1107 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1108
1109 /* according to the manpage, sbytes is always valid */
1110 if (sbytes)
1111 res = sbytes;
918 1112
919# elif __hpux 1113# elif __hpux
920 res = sendfile (ofd, ifd, offset, count, 0, 0); 1114 res = sendfile (ofd, ifd, offset, count, 0, 0);
921 1115
922# elif __solaris 1116# elif __solaris
923 {
924 struct sendfilevec vec; 1117 struct sendfilevec vec;
925 size_t sbytes; 1118 size_t sbytes;
926 1119
927 vec.sfv_fd = ifd; 1120 vec.sfv_fd = ifd;
928 vec.sfv_flag = 0; 1121 vec.sfv_flag = 0;
929 vec.sfv_off = offset; 1122 vec.sfv_off = offset;
930 vec.sfv_len = count; 1123 vec.sfv_len = count;
931 1124
932 res = sendfilev (ofd, &vec, 1, &sbytes); 1125 res = sendfilev (ofd, &vec, 1, &sbytes);
933 1126
934 if (res < 0 && sbytes) 1127 if (res < 0 && sbytes)
935 res = sbytes; 1128 res = sbytes;
936 }
937 1129
938# endif 1130# endif
1131
1132#elif defined (_WIN32) && 0
1133 /* does not work, just for documentation of what would need to be done */
1134 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1135 /* libeio guarantees that the file offset does not change, and windows */
1136 /* has no way to get an independent handle to the same file description */
1137 HANDLE h = TO_SOCKET (ifd);
1138 SetFilePointer (h, offset, 0, FILE_BEGIN);
1139 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1140
939#else 1141#else
940 res = -1; 1142 res = -1;
941 errno = ENOSYS; 1143 errno = ENOSYS;
942#endif 1144#endif
943 1145
1146 /* we assume sendfile can copy at least 128mb in one go */
1147 if (res <= 128 * 1024 * 1024)
1148 {
1149 if (res > 0)
1150 written += res;
1151
1152 if (written)
1153 return written;
1154
1155 break;
1156 }
1157 else
1158 {
1159 /* if we requested more, then probably the kernel was lazy */
1160 written += res;
1161 offset += res;
1162 count -= res;
1163
1164 if (!count)
1165 return written;
1166 }
1167 }
1168
944 if (res < 0 1169 if (res < 0
945 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1170 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1171 /* BSDs */
1172#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1173 || errno == ENOTSUP
1174#endif
1175#ifdef EOPNOTSUPP /* windows */
1176 || errno == EOPNOTSUPP /* BSDs */
1177#endif
946#if __solaris 1178#if __solaris
947 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1179 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
948#endif 1180#endif
949 ) 1181 )
950 ) 1182 )
… …
954 1186
955 res = 0; 1187 res = 0;
956 1188
957 while (count) 1189 while (count)
958 { 1190 {
959 ssize_t cnt; 1191 eio_ssize_t cnt;
960 1192
961 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1193 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
962 1194
963 if (cnt <= 0) 1195 if (cnt <= 0)
964 { 1196 {
… …
976 1208
977 offset += cnt; 1209 offset += cnt;
978 res += cnt; 1210 res += cnt;
979 count -= cnt; 1211 count -= cnt;
980 } 1212 }
1213
1214 FUBd;
981 } 1215 }
982 1216
983 return res; 1217 return res;
984} 1218}
985 1219
1220#ifdef PAGESIZE
1221# define eio_pagesize() PAGESIZE
1222#else
1223static intptr_t
1224eio_pagesize (void)
1225{
1226 static intptr_t page;
1227
1228 if (!page)
1229 page = sysconf (_SC_PAGESIZE);
1230
1231 return page;
1232}
1233#endif
1234
1235static void
1236eio_page_align (void **addr, size_t *length)
1237{
1238 intptr_t mask = eio_pagesize () - 1;
1239
1240 /* round down addr */
1241 intptr_t adj = mask & (intptr_t)*addr;
1242
1243 *addr = (void *)((intptr_t)*addr - adj);
1244 *length += adj;
1245
1246 /* round up length */
1247 *length = (*length + mask) & ~mask;
1248}
1249
1250#if !_POSIX_MEMLOCK
1251# define eio__mlockall(a) EIO_ENOSYS ()
1252#else
1253
986static int 1254static int
1255eio__mlockall (int flags)
1256{
1257 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1258 extern int mallopt (int, int);
1259 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1260 #endif
1261
1262 if (EIO_MCL_CURRENT != MCL_CURRENT
1263 || EIO_MCL_FUTURE != MCL_FUTURE)
1264 {
1265 flags = 0
1266 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1267 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1268 }
1269
1270 return mlockall (flags);
1271}
1272#endif
1273
1274#if !_POSIX_MEMLOCK_RANGE
1275# define eio__mlock(a,b) EIO_ENOSYS ()
1276#else
1277
1278static int
1279eio__mlock (void *addr, size_t length)
1280{
1281 eio_page_align (&addr, &length);
1282
1283 return mlock (addr, length);
1284}
1285
1286#endif
1287
1288#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1289# define eio__msync(a,b,c) EIO_ENOSYS ()
1290#else
1291
1292static int
1293eio__msync (void *mem, size_t len, int flags)
1294{
1295 eio_page_align (&mem, &len);
1296
1297 if (EIO_MS_ASYNC != MS_SYNC
1298 || EIO_MS_INVALIDATE != MS_INVALIDATE
1299 || EIO_MS_SYNC != MS_SYNC)
1300 {
1301 flags = 0
1302 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1303 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1304 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1305 }
1306
1307 return msync (mem, len, flags);
1308}
1309
1310#endif
1311
1312static int
1313eio__mtouch (eio_req *req)
1314{
1315 void *mem = req->ptr2;
1316 size_t len = req->size;
1317 int flags = req->int1;
1318
1319 eio_page_align (&mem, &len);
1320
1321 {
1322 intptr_t addr = (intptr_t)mem;
1323 intptr_t end = addr + len;
1324 intptr_t page = eio_pagesize ();
1325
1326 if (addr < end)
1327 if (flags & EIO_MT_MODIFY) /* modify */
1328 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1329 else
1330 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1331 }
1332
1333 return 0;
1334}
1335
1336/*****************************************************************************/
1337/* requests implemented outside eio_execute, because they are so large */
1338
1339static void
1340eio__realpath (eio_req *req, etp_worker *self)
1341{
1342 char *rel = req->ptr1;
1343 char *res;
1344 char *tmp1, *tmp2;
1345#if SYMLOOP_MAX > 32
1346 int symlinks = SYMLOOP_MAX;
1347#else
1348 int symlinks = 32;
1349#endif
1350
1351 req->result = -1;
1352
1353 errno = EINVAL;
1354 if (!rel)
1355 return;
1356
1357 errno = ENOENT;
1358 if (!*rel)
1359 return;
1360
1361 if (!req->ptr2)
1362 {
1363 X_LOCK (wrklock);
1364 req->flags |= EIO_FLAG_PTR2_FREE;
1365 X_UNLOCK (wrklock);
1366 req->ptr2 = malloc (PATH_MAX * 3);
1367
1368 errno = ENOMEM;
1369 if (!req->ptr2)
1370 return;
1371 }
1372
1373 res = req->ptr2;
1374 tmp1 = res + PATH_MAX;
1375 tmp2 = tmp1 + PATH_MAX;
1376
1377#if 0 /* disabled, the musl way to do things is just too racy */
1378#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1379 /* on linux we may be able to ask the kernel */
1380 {
1381 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1382
1383 if (fd >= 0)
1384 {
1385 sprintf (tmp1, "/proc/self/fd/%d", fd);
1386 req->result = readlink (tmp1, res, PATH_MAX);
1387 close (fd);
1388
1389 /* here we should probably stat the open file and the disk file, to make sure they still match */
1390
1391 if (req->result > 0)
1392 goto done;
1393 }
1394 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1395 return;
1396 }
1397#endif
1398#endif
1399
1400 if (*rel != '/')
1401 {
1402 if (!getcwd (res, PATH_MAX))
1403 return;
1404
1405 if (res [1]) /* only use if not / */
1406 res += strlen (res);
1407 }
1408
1409 while (*rel)
1410 {
1411 eio_ssize_t len, linklen;
1412 char *beg = rel;
1413
1414 while (*rel && *rel != '/')
1415 ++rel;
1416
1417 len = rel - beg;
1418
1419 if (!len) /* skip slashes */
1420 {
1421 ++rel;
1422 continue;
1423 }
1424
1425 if (beg [0] == '.')
1426 {
1427 if (len == 1)
1428 continue; /* . - nop */
1429
1430 if (beg [1] == '.' && len == 2)
1431 {
1432 /* .. - back up one component, if possible */
1433
1434 while (res != req->ptr2)
1435 if (*--res == '/')
1436 break;
1437
1438 continue;
1439 }
1440 }
1441
1442 errno = ENAMETOOLONG;
1443 if (res + 1 + len + 1 >= tmp1)
1444 return;
1445
1446 /* copy one component */
1447 *res = '/';
1448 memcpy (res + 1, beg, len);
1449
1450 /* zero-terminate, for readlink */
1451 res [len + 1] = 0;
1452
1453 /* now check if it's a symlink */
1454 linklen = readlink (req->ptr2, tmp1, PATH_MAX);
1455
1456 if (linklen < 0)
1457 {
1458 if (errno != EINVAL)
1459 return;
1460
1461 /* it's a normal directory. hopefully */
1462 res += len + 1;
1463 }
1464 else
1465 {
1466 /* yay, it was a symlink - build new path in tmp2 */
1467 int rellen = strlen (rel);
1468
1469 errno = ENAMETOOLONG;
1470 if (linklen + 1 + rellen >= PATH_MAX)
1471 return;
1472
1473 errno = ELOOP;
1474 if (!--symlinks)
1475 return;
1476
1477 if (*tmp1 == '/')
1478 res = req->ptr2; /* symlink resolves to an absolute path */
1479
1480 /* we need to be careful, as rel might point into tmp2 already */
1481 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482 tmp2 [linklen] = '/';
1483 memcpy (tmp2, tmp1, linklen);
1484
1485 rel = tmp2;
1486 }
1487 }
1488
1489 /* special case for the lone root path */
1490 if (res == req->ptr2)
1491 *res++ = '/';
1492
1493 req->result = res - (char *)req->ptr2;
1494
1495done:
1496 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497}
1498
1499static signed char
987eio_dent_cmp (const void *a_, const void *b_) 1500eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
988{ 1501{
989 const eio_dirent *a = (const eio_dirent *)a_; 1502 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
990 const eio_dirent *b = (const eio_dirent *)b_; 1503 : a->inode < b->inode ? -1
1504 : a->inode > b->inode ? 1
1505 : 0;
1506}
991 1507
992 return (int)b->score - (int)a->score ? (int)b->score - (int)a->score 1508#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
993 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */ 1509
1510#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1511#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1512
1513static void
1514eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1515{
1516 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1517 unsigned char *bit = bits;
1518
1519 assert (CHAR_BIT == 8);
1520 assert (sizeof (eio_dirent) * 8 < 256);
1521 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1522 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1523
1524 if (size <= EIO_SORT_FAST)
1525 return;
1526
1527 /* first prepare an array of bits to test in our radix sort */
1528 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1529 /* inode_bits must contain all inodes ORed together */
1530 /* which is used to skip bits that are 0 everywhere, which is very common */
1531 {
1532 eio_ino_t endianness;
1533 int i, j;
1534
1535 /* we store the byte offset of byte n into byte n of "endianness" */
1536 for (i = 0; i < sizeof (eio_ino_t); ++i)
1537 ((unsigned char *)&endianness)[i] = i;
1538
1539 *bit++ = 0;
1540
1541 for (i = 0; i < sizeof (eio_ino_t); ++i)
1542 {
1543 /* shifting off the byte offsets out of "endianness" */
1544 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1545 endianness >>= 8;
1546
1547 for (j = 0; j < 8; ++j)
1548 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1549 *bit++ = offs + j;
1550 }
1551
1552 for (j = 0; j < 8; ++j)
1553 if (score_bits & (1 << j))
1554 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1555 }
1556
1557 /* now actually do the sorting (a variant of MSD radix sort) */
1558 {
1559 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1560 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1561 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1562 int stk_idx = 0;
1563
1564 base_stk [stk_idx] = dents;
1565 end_stk [stk_idx] = dents + size;
1566 bit_stk [stk_idx] = bit - 1;
1567
1568 do
1569 {
1570 base = base_stk [stk_idx];
1571 end = end_stk [stk_idx];
1572 bit = bit_stk [stk_idx];
1573
1574 for (;;)
1575 {
1576 unsigned char O = *bit >> 3;
1577 unsigned char M = 1 << (*bit & 7);
1578
1579 eio_dirent *a = base;
1580 eio_dirent *b = end;
1581
1582 if (b - a < EIO_SORT_CUTOFF)
1583 break;
1584
1585 /* now bit-partition the array on the bit */
1586 /* this ugly asymmetric loop seems to perform much better than typical */
1587 /* partition algos found in the literature */
1588 do
1589 if (!(((unsigned char *)a)[O] & M))
1590 ++a;
1591 else if (!(((unsigned char *)--b)[O] & M))
1592 {
1593 eio_dirent tmp = *a; *a = *b; *b = tmp;
1594 ++a;
1595 }
1596 while (b > a);
1597
1598 /* next bit, or stop, if no bits left in this path */
1599 if (!*--bit)
1600 break;
1601
1602 base_stk [stk_idx] = a;
1603 end_stk [stk_idx] = end;
1604 bit_stk [stk_idx] = bit;
1605 ++stk_idx;
1606
1607 end = a;
1608 }
1609 }
1610 while (stk_idx--);
1611 }
1612}
1613
1614static void
1615eio_dent_insertion_sort (eio_dirent *dents, int size)
1616{
1617 /* first move the smallest element to the front, to act as a sentinel */
1618 {
1619 int i;
1620 eio_dirent *min = dents;
1621
1622 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1623 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1624 if (EIO_DENT_CMP (dents [i], <, *min))
1625 min = &dents [i];
1626
1627 /* swap elements 0 and j (minimum) */
1628 {
1629 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1630 }
1631 }
1632
1633 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1634 {
1635 eio_dirent *i, *j;
1636
1637 for (i = dents + 1; i < dents + size; ++i)
1638 {
1639 eio_dirent value = *i;
1640
1641 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1642 j [1] = j [0];
1643
1644 j [1] = value;
1645 }
1646 }
1647}
1648
1649static void
1650eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1651{
1652 if (size <= 1)
1653 return; /* our insertion sort relies on size > 0 */
1654
1655 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1656 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1657 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1658
1659 /* use an insertion sort at the end, or for small arrays, */
1660 /* as insertion sort is more efficient for small partitions */
1661 eio_dent_insertion_sort (dents, size);
994} 1662}
995 1663
996/* read a full directory */ 1664/* read a full directory */
997static void 1665static void
998eio__scandir (eio_req *req, etp_worker *self) 1666eio__scandir (eio_req *req, etp_worker *self)
999{ 1667{
1000 DIR *dirp;
1001 EIO_STRUCT_DIRENT *entp;
1002 unsigned char *name, *names; 1668 char *name, *names;
1003 int namesalloc = 4096; 1669 int namesalloc = 4096 - sizeof (void *) * 4;
1004 int namesoffs = 0; 1670 int namesoffs = 0;
1005 int flags = req->int1; 1671 int flags = req->int1;
1006 eio_dirent *dents = 0; 1672 eio_dirent *dents = 0;
1007 int dentalloc = 128; 1673 int dentalloc = 128;
1008 int dentoffs = 0; 1674 int dentoffs = 0;
1675 eio_ino_t inode_bits = 0;
1676#ifdef _WIN32
1677 HANDLE dirp;
1678 WIN32_FIND_DATA entp;
1679#else
1680 DIR *dirp;
1681 EIO_STRUCT_DIRENT *entp;
1682#endif
1009 1683
1010 req->result = -1; 1684 req->result = -1;
1011 1685
1012 if (!(flags & EIO_READDIR_DENTS)) 1686 if (!(flags & EIO_READDIR_DENTS))
1013 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1687 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1014 1688
1015 X_LOCK (wrklock); 1689#ifdef _WIN32
1016 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1690 {
1691 int len = strlen ((const char *)req->ptr1);
1692 char *path = malloc (MAX_PATH);
1693 const char *fmt;
1694
1695 if (!len)
1696 fmt = "./*";
1697 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1698 fmt = "%s*";
1699 else
1700 fmt = "%s/*";
1701
1702 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1703 dirp = FindFirstFile (path, &entp);
1704 free (path);
1705
1706 if (dirp == INVALID_HANDLE_VALUE)
1707 {
1708 dirp = 0;
1709
1710 /* should steal _dosmaperr */
1711 switch (GetLastError ())
1712 {
1713 case ERROR_FILE_NOT_FOUND:
1714 req->result = 0;
1715 break;
1716
1717 case ERROR_INVALID_NAME:
1718 case ERROR_PATH_NOT_FOUND:
1719 case ERROR_NO_MORE_FILES:
1720 errno = ENOENT;
1721 break;
1722
1723 case ERROR_NOT_ENOUGH_MEMORY:
1724 errno = ENOMEM;
1725 break;
1726
1727 default:
1728 errno = EINVAL;
1729 break;
1730 }
1731 }
1732 }
1733#else
1017 self->dirp = dirp = opendir (req->ptr1); 1734 dirp = opendir (req->ptr1);
1735#endif
1736
1737 if (req->flags & EIO_FLAG_PTR1_FREE)
1738 free (req->ptr1);
1739
1018 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1740 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1019 req->ptr1 = names = malloc (namesalloc);
1020 req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1741 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1021 X_UNLOCK (wrklock); 1742 req->ptr2 = names = malloc (namesalloc);
1022 1743
1023 if (dirp && names && (!flags || dents)) 1744 if (dirp && names && (!flags || dents))
1024 for (;;) 1745 for (;;)
1025 { 1746 {
1747 int done;
1748
1749#ifdef _WIN32
1750 done = !dirp;
1751#else
1026 errno = 0; 1752 errno = 0;
1027 entp = readdir (dirp); 1753 entp = readdir (dirp);
1754 done = !entp;
1755#endif
1028 1756
1029 if (!entp) 1757 if (done)
1030 { 1758 {
1759#ifndef _WIN32
1760 int old_errno = errno;
1761 closedir (dirp);
1762 errno = old_errno;
1763
1031 if (errno) 1764 if (errno)
1032 break; 1765 break;
1766#endif
1033 1767
1034 /* sort etc. */ 1768 /* sort etc. */
1035 req->int1 = flags; 1769 req->int1 = flags;
1036 req->result = dentoffs; 1770 req->result = dentoffs;
1037 1771
1038 if (dents)
1039 {
1040 eio_dirent *ent = dents + dentoffs;
1041
1042 while (ent > dents)
1043 (--ent)->name = names + (size_t)ent->name;
1044 }
1045
1046 if (flags & EIO_READDIR_STAT_ORDER 1772 if (flags & EIO_READDIR_STAT_ORDER)
1047 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1773 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1048 {
1049 /* pray your qsort doesn't use quicksort */
1050 qsort (dents, dentoffs, sizeof (*dents), eio_dent_cmp); /* score depends of DIRS_FIRST */
1051 }
1052 else if (flags & EIO_READDIR_DIRS_FIRST) 1774 else if (flags & EIO_READDIR_DIRS_FIRST)
1775 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1777 else
1053 { 1778 {
1054 /* in this case, all is known, and we just put dirs first and sort them */ 1779 /* in this case, all is known, and we just put dirs first and sort them */
1055 eio_dirent *ent = dents + dentoffs; 1780 eio_dirent *oth = dents + dentoffs;
1056 eio_dirent *dir = dents; 1781 eio_dirent *dir = dents;
1057 1782
1783 /* now partition dirs to the front, and non-dirs to the back */
1784 /* by walking from both sides and swapping if necessary */
1058 while (ent > dir) 1785 while (oth > dir)
1059 { 1786 {
1060 if (dir->type == DT_DIR) 1787 if (dir->type == EIO_DT_DIR)
1061 ++dir; 1788 ++dir;
1062 else
1063 {
1064 --ent;
1065
1066 if (ent->type == DT_DIR) 1789 else if ((--oth)->type == EIO_DT_DIR)
1067 { 1790 {
1068 eio_dirent tmp = *dir; 1791 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1069 *dir = *ent;
1070 *ent = tmp;
1071 1792
1072 ++dir; 1793 ++dir;
1073 } 1794 }
1074 } 1795 }
1796
1797 /* now sort the dirs only (dirs all have the same score) */
1798 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1075 } 1799 }
1076
1077 /* now sort the dirs only */
1078 qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);
1079 }
1080
1081 /* only provide the names array unless DENTS is specified */
1082 if (!(flags & EIO_READDIR_DENTS))
1083 {
1084 X_LOCK (wrklock);
1085 assert (!dents);
1086 req->ptr1 = 0;
1087 req->ptr2 = names;
1088 X_UNLOCK (wrklock);
1089 }
1090 1800
1091 break; 1801 break;
1092 } 1802 }
1093 1803
1094 /* now add the entry to our list(s) */ 1804 /* now add the entry to our list(s) */
1095 name = entp->d_name; 1805 name = D_NAME (entp);
1096 1806
1097 /* skip . and .. entries */ 1807 /* skip . and .. entries */
1098 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1808 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1099 { 1809 {
1100 int len = strlen (name) + 1; 1810 int len = D_NAMLEN (entp) + 1;
1101 1811
1102 while (expect_false (namesoffs + len > namesalloc)) 1812 while (ecb_expect_false (namesoffs + len > namesalloc))
1103 { 1813 {
1104 namesalloc *= 2; 1814 namesalloc *= 2;
1105 X_LOCK (wrklock);
1106 req->ptr1 = names = realloc (names, namesalloc); 1815 req->ptr2 = names = realloc (names, namesalloc);
1107 X_UNLOCK (wrklock);
1108 1816
1109 if (!names) 1817 if (!names)
1110 break; 1818 break;
1111 } 1819 }
1112 1820
… …
1114 1822
1115 if (dents) 1823 if (dents)
1116 { 1824 {
1117 struct eio_dirent *ent; 1825 struct eio_dirent *ent;
1118 1826
1119 if (expect_false (dentoffs == dentalloc)) 1827 if (ecb_expect_false (dentoffs == dentalloc))
1120 { 1828 {
1121 dentalloc *= 2; 1829 dentalloc *= 2;
1122 X_LOCK (wrklock);
1123 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1830 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1124 X_UNLOCK (wrklock);
1125 1831
1126 if (!dents) 1832 if (!dents)
1127 break; 1833 break;
1128 } 1834 }
1129 1835
1130 ent = dents + dentoffs; 1836 ent = dents + dentoffs;
1131 1837
1132 ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */ 1838 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1133 ent->namelen = len - 1; 1839 ent->namelen = len - 1;
1134 ent->inode = D_INO (entp); 1840 ent->inode = D_INO (entp);
1841
1842 inode_bits |= ent->inode;
1135 1843
1136 switch (D_TYPE (entp)) 1844 switch (D_TYPE (entp))
1137 { 1845 {
1138 default: 1846 default:
1139 ent->type = EIO_DT_UNKNOWN; 1847 ent->type = EIO_DT_UNKNOWN;
… …
1144 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1852 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1145 #endif 1853 #endif
1146 #ifdef DT_CHR 1854 #ifdef DT_CHR
1147 case DT_CHR: ent->type = EIO_DT_CHR; break; 1855 case DT_CHR: ent->type = EIO_DT_CHR; break;
1148 #endif 1856 #endif
1857 #ifdef DT_MPC
1858 case DT_MPC: ent->type = EIO_DT_MPC; break;
1859 #endif
1149 #ifdef DT_DIR 1860 #ifdef DT_DIR
1150 case DT_DIR: ent->type = EIO_DT_DIR; break; 1861 case DT_DIR: ent->type = EIO_DT_DIR; break;
1862 #endif
1863 #ifdef DT_NAM
1864 case DT_NAM: ent->type = EIO_DT_NAM; break;
1151 #endif 1865 #endif
1152 #ifdef DT_BLK 1866 #ifdef DT_BLK
1153 case DT_BLK: ent->type = EIO_DT_BLK; break; 1867 case DT_BLK: ent->type = EIO_DT_BLK; break;
1154 #endif 1868 #endif
1869 #ifdef DT_MPB
1870 case DT_MPB: ent->type = EIO_DT_MPB; break;
1871 #endif
1155 #ifdef DT_REG 1872 #ifdef DT_REG
1156 case DT_REG: ent->type = EIO_DT_REG; break; 1873 case DT_REG: ent->type = EIO_DT_REG; break;
1874 #endif
1875 #ifdef DT_NWK
1876 case DT_NWK: ent->type = EIO_DT_NWK; break;
1877 #endif
1878 #ifdef DT_CMP
1879 case DT_CMP: ent->type = EIO_DT_CMP; break;
1157 #endif 1880 #endif
1158 #ifdef DT_LNK 1881 #ifdef DT_LNK
1159 case DT_LNK: ent->type = EIO_DT_LNK; break; 1882 case DT_LNK: ent->type = EIO_DT_LNK; break;
1160 #endif 1883 #endif
1161 #ifdef DT_SOCK 1884 #ifdef DT_SOCK
1162 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1885 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1163 #endif 1886 #endif
1887 #ifdef DT_DOOR
1888 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1889 #endif
1164 #ifdef DT_WHT 1890 #ifdef DT_WHT
1165 case DT_WHT: ent->type = EIO_DT_WHT; break; 1891 case DT_WHT: ent->type = EIO_DT_WHT; break;
1166 #endif 1892 #endif
1167 } 1893 }
1168 1894
1169 ent->score = 0; 1895 ent->score = 7;
1170 1896
1171 if (flags & EIO_READDIR_DIRS_FIRST) 1897 if (flags & EIO_READDIR_DIRS_FIRST)
1172 { 1898 {
1173 if (ent->type == EIO_DT_UNKNOWN) 1899 if (ent->type == EIO_DT_UNKNOWN)
1174 { 1900 {
1175 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1901 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1176 ent->score = 98; 1902 ent->score = 1;
1177 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1903 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1178 ent->score = len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */ 1904 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1179 } 1905 }
1180 else if (ent->type == DT_DIR) 1906 else if (ent->type == EIO_DT_DIR)
1181 ent->score = 100; 1907 ent->score = 0;
1182 } 1908 }
1183 } 1909 }
1184 1910
1185 namesoffs += len; 1911 namesoffs += len;
1186 ++dentoffs; 1912 ++dentoffs;
1187 } 1913 }
1914
1915 if (EIO_CANCELLED (req))
1916 {
1917 errno = ECANCELED;
1918 break;
1919 }
1920
1921#ifdef _WIN32
1922 if (!FindNextFile (dirp, &entp))
1923 {
1924 FindClose (dirp);
1925 dirp = 0;
1926 }
1927#endif
1188 } 1928 }
1189 else
1190 req->result = -1;
1191}
1192
1193#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1194# undef msync
1195# define msync(a,b,c) ((errno = ENOSYS), -1)
1196#endif
1197
1198int
1199eio__mtouch (void *mem, size_t len, int flags)
1200{
1201 intptr_t addr = (intptr_t)mem;
1202 intptr_t end = addr + len;
1203#ifdef PAGESIZE
1204 const intptr_t page = PAGESIZE;
1205#else
1206 static intptr_t page;
1207
1208 if (!page)
1209 page = sysconf (_SC_PAGESIZE);
1210#endif
1211
1212 addr &= ~(page - 1); /* assume page size is always a power of two */
1213
1214 if (addr < end)
1215 if (flags) /* modify */
1216 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1217 else
1218 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1219
1220 return 0;
1221} 1929}
1222 1930
1223/*****************************************************************************/ 1931/*****************************************************************************/
1224 1932
1225#define ALLOC(len) \ 1933#define ALLOC(len) \
… …
1241{ 1949{
1242 ETP_REQ *req; 1950 ETP_REQ *req;
1243 struct timespec ts; 1951 struct timespec ts;
1244 etp_worker *self = (etp_worker *)thr_arg; 1952 etp_worker *self = (etp_worker *)thr_arg;
1245 1953
1954#if HAVE_PRCTL_SET_NAME
1955 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1956#endif
1957
1246 /* try to distribute timeouts somewhat randomly */ 1958 /* try to distribute timeouts somewhat evenly */
1247 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1959 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1248 1960
1249 for (;;) 1961 for (;;)
1250 { 1962 {
1963 ts.tv_sec = 0;
1964
1251 X_LOCK (reqlock); 1965 X_LOCK (reqlock);
1252 1966
1253 for (;;) 1967 for (;;)
1254 { 1968 {
1255 self->req = req = reqq_shift (&req_queue); 1969 self->req = req = reqq_shift (&req_queue);
1256 1970
1257 if (req) 1971 if (req)
1258 break; 1972 break;
1259 1973
1974 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1975 {
1976 X_UNLOCK (reqlock);
1977 X_LOCK (wrklock);
1978 --started;
1979 X_UNLOCK (wrklock);
1980 goto quit;
1981 }
1982
1260 ++idle; 1983 ++idle;
1261 1984
1262 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1985 if (idle <= max_idle)
1263 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1986 /* we are allowed to idle, so do so without any timeout */
1987 X_COND_WAIT (reqwait, reqlock);
1988 else
1264 { 1989 {
1265 if (idle > max_idle) 1990 /* initialise timeout once */
1266 { 1991 if (!ts.tv_sec)
1267 --idle; 1992 ts.tv_sec = time (0) + idle_timeout;
1268 X_UNLOCK (reqlock);
1269 X_LOCK (wrklock);
1270 --started;
1271 X_UNLOCK (wrklock);
1272 goto quit;
1273 }
1274 1993
1275 /* we are allowed to idle, so do so without any timeout */
1276 X_COND_WAIT (reqwait, reqlock); 1994 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1995 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1277 } 1996 }
1278 1997
1279 --idle; 1998 --idle;
1280 } 1999 }
1281 2000
… …
1284 X_UNLOCK (reqlock); 2003 X_UNLOCK (reqlock);
1285 2004
1286 if (req->type < 0) 2005 if (req->type < 0)
1287 goto quit; 2006 goto quit;
1288 2007
1289 if (!EIO_CANCELLED (req))
1290 ETP_EXECUTE (self, req); 2008 ETP_EXECUTE (self, req);
1291 2009
1292 X_LOCK (reslock); 2010 X_LOCK (reslock);
1293 2011
1294 ++npending; 2012 ++npending;
1295 2013
… …
1310 return 0; 2028 return 0;
1311} 2029}
1312 2030
1313/*****************************************************************************/ 2031/*****************************************************************************/
1314 2032
2033int ecb_cold
1315int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2034eio_init (void (*want_poll)(void), void (*done_poll)(void))
1316{ 2035{
2036#if !HAVE_PREADWRITE
2037 X_MUTEX_CREATE (preadwritelock);
2038#endif
2039
1317 return etp_init (want_poll, done_poll); 2040 return etp_init (want_poll, done_poll);
1318} 2041}
1319 2042
2043ecb_inline void
1320static void eio_api_destroy (eio_req *req) 2044eio_api_destroy (eio_req *req)
1321{ 2045{
1322 free (req); 2046 free (req);
1323} 2047}
1324 2048
1325#define REQ(rtype) \ 2049#define REQ(rtype) \
… …
1344 { \ 2068 { \
1345 eio_api_destroy (req); \ 2069 eio_api_destroy (req); \
1346 return 0; \ 2070 return 0; \
1347 } 2071 }
1348 2072
2073static void
1349static void eio_execute (etp_worker *self, eio_req *req) 2074eio_execute (etp_worker *self, eio_req *req)
1350{ 2075{
1351 errno = 0; 2076 if (ecb_expect_false (EIO_CANCELLED (req)))
2077 {
2078 req->result = -1;
2079 req->errorno = ECANCELED;
2080 return;
2081 }
1352 2082
1353 switch (req->type) 2083 switch (req->type)
1354 { 2084 {
1355 case EIO_READ: ALLOC (req->size); 2085 case EIO_READ: ALLOC (req->size);
1356 req->result = req->offs >= 0 2086 req->result = req->offs >= 0
… …
1359 case EIO_WRITE: req->result = req->offs >= 0 2089 case EIO_WRITE: req->result = req->offs >= 0
1360 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2090 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1361 : write (req->int1, req->ptr2, req->size); break; 2091 : write (req->int1, req->ptr2, req->size); break;
1362 2092
1363 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2093 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1364 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2094 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1365 2095
1366 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2096 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1367 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2097 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1368 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2098 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1369 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2099 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1370 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2100 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1371 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2101 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102
2103 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2104 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2105 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1372 2107
1373 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 2108 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1374 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2109 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1375 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 2110 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1376 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2111 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
… …
1384 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 2119 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1385 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 2120 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1386 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 2121 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1387 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 2122 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1388 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 2123 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1389 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 2124 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1390 2125
2126 case EIO_REALPATH: eio__realpath (req, self); break;
2127
1391 case EIO_READLINK: ALLOC (NAME_MAX); 2128 case EIO_READLINK: ALLOC (PATH_MAX);
1392 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 2129 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1393 2130
1394 case EIO_SYNC: req->result = 0; sync (); break; 2131 case EIO_SYNC: req->result = 0; sync (); break;
1395 case EIO_FSYNC: req->result = fsync (req->int1); break; 2132 case EIO_FSYNC: req->result = fsync (req->int1); break;
1396 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2133 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1397 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 2134 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
1398 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1399 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2135 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2136 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2137 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2138 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2139 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2140 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1400 2141
1401 case EIO_READDIR: eio__scandir (req, self); break; 2142 case EIO_READDIR: eio__scandir (req, self); break;
1402 2143
1403 case EIO_BUSY: 2144 case EIO_BUSY:
1404#ifdef _WIN32 2145#ifdef _WIN32
1405 Sleep (req->nv1 * 1000.); 2146 Sleep (req->nv1 * 1e3);
1406#else 2147#else
1407 { 2148 {
1408 struct timeval tv; 2149 struct timeval tv;
1409 2150
1410 tv.tv_sec = req->nv1; 2151 tv.tv_sec = req->nv1;
1411 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 2152 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1412 2153
1413 req->result = select (0, 0, 0, 0, &tv); 2154 req->result = select (0, 0, 0, 0, &tv);
1414 } 2155 }
1415#endif 2156#endif
1416 break; 2157 break;
… …
1431 times = tv; 2172 times = tv;
1432 } 2173 }
1433 else 2174 else
1434 times = 0; 2175 times = 0;
1435 2176
1436
1437 req->result = req->type == EIO_FUTIME 2177 req->result = req->type == EIO_FUTIME
1438 ? futimes (req->int1, times) 2178 ? futimes (req->int1, times)
1439 : utimes (req->ptr1, times); 2179 : utimes (req->ptr1, times);
1440 } 2180 }
1441 break; 2181 break;
… …
1446 case EIO_NOP: 2186 case EIO_NOP:
1447 req->result = 0; 2187 req->result = 0;
1448 break; 2188 break;
1449 2189
1450 case EIO_CUSTOM: 2190 case EIO_CUSTOM:
1451 ((void (*)(eio_req *))req->feed) (req); 2191 req->feed (req);
1452 break; 2192 break;
1453 2193
1454 default: 2194 default:
2195 errno = ENOSYS;
1455 req->result = -1; 2196 req->result = -1;
1456 break; 2197 break;
1457 } 2198 }
1458 2199
1459 req->errorno = errno; 2200 req->errorno = errno;
… …
1484eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2225eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1485{ 2226{
1486 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2227 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1487} 2228}
1488 2229
2230eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2231{
2232 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2233}
2234
2235eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2236{
2237 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2238}
2239
2240eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2241{
2242 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2243}
2244
1489eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2245eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1490{ 2246{
1491 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2247 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1492} 2248}
1493 2249
1494eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2250eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1495{ 2251{
1496 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2252 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1497} 2253}
1498 2254
1499eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2255eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1500{ 2256{
1501 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2257 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2258}
2259
2260eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2261{
2262 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1502} 2263}
1503 2264
1504eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2265eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1505{ 2266{
1506 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2267 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
1524eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2285eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1525{ 2286{
1526 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2287 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1527} 2288}
1528 2289
2290eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
2291{
2292 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
2293}
2294
1529eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 2295eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1530{ 2296{
1531 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 2297 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1532} 2298}
1533 2299
… …
1539eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2305eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1540{ 2306{
1541 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2307 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1542} 2308}
1543 2309
1544eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2310eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1545{ 2311{
1546 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2312 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1547} 2313}
1548 2314
1549eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2315eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1569eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2335eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1570{ 2336{
1571 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2337 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1572} 2338}
1573 2339
1574eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2340eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1575{ 2341{
1576 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2342 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1577} 2343}
1578 2344
1579eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2345eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1595eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2361eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1596{ 2362{
1597 return eio__1path (EIO_READLINK, path, pri, cb, data); 2363 return eio__1path (EIO_READLINK, path, pri, cb, data);
1598} 2364}
1599 2365
2366eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2367{
2368 return eio__1path (EIO_REALPATH, path, pri, cb, data);
2369}
2370
1600eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2371eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1601{ 2372{
1602 return eio__1path (EIO_STAT, path, pri, cb, data); 2373 return eio__1path (EIO_STAT, path, pri, cb, data);
1603} 2374}
1604 2375
1605eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 2376eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1606{ 2377{
1607 return eio__1path (EIO_LSTAT, path, pri, cb, data); 2378 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1608} 2379}
1609 2380
2381eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
2382{
2383 return eio__1path (EIO_STATVFS, path, pri, cb, data);
2384}
2385
1610eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 2386eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1611{ 2387{
1612 return eio__1path (EIO_UNLINK, path, pri, cb, data); 2388 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1613} 2389}
1614 2390
… …
1622 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 2398 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1623} 2399}
1624 2400
1625eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2401eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1626{ 2402{
1627 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 2403 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1628} 2404}
1629 2405
1630static eio_req * 2406static eio_req *
1631eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2407eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1632{ 2408{
… …
1656eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2432eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1657{ 2433{
1658 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2434 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1659} 2435}
1660 2436
1661eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2437eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1662{ 2438{
1663 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2439 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1664} 2440}
1665 2441
1666#endif 2442#endif
1667 2443
1668eio_req *eio_grp (eio_cb cb, void *data) 2444eio_req *eio_grp (eio_cb cb, void *data)
… …
1677#undef SEND 2453#undef SEND
1678 2454
1679/*****************************************************************************/ 2455/*****************************************************************************/
1680/* grp functions */ 2456/* grp functions */
1681 2457
2458void
1682void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2459eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1683{ 2460{
1684 grp->int2 = limit; 2461 grp->int2 = limit;
1685 grp->feed = feed; 2462 grp->feed = feed;
1686 2463
1687 grp_try_feed (grp); 2464 grp_try_feed (grp);
1688} 2465}
1689 2466
2467void
1690void eio_grp_limit (eio_req *grp, int limit) 2468eio_grp_limit (eio_req *grp, int limit)
1691{ 2469{
1692 grp->int2 = limit; 2470 grp->int2 = limit;
1693 2471
1694 grp_try_feed (grp); 2472 grp_try_feed (grp);
1695} 2473}
1696 2474
2475void
1697void eio_grp_add (eio_req *grp, eio_req *req) 2476eio_grp_add (eio_req *grp, eio_req *req)
1698{ 2477{
1699 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2478 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1700 2479
1701 grp->flags |= EIO_FLAG_GROUPADD; 2480 grp->flags |= EIO_FLAG_GROUPADD;
1702 2481
… …
1713} 2492}
1714 2493
1715/*****************************************************************************/ 2494/*****************************************************************************/
1716/* misc garbage */ 2495/* misc garbage */
1717 2496
2497eio_ssize_t
1718ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2498eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1719{ 2499{
1720 etp_worker wrk;
1721
1722 wrk.dbuf = 0;
1723
1724 eio__sendfile (ofd, ifd, offset, count, &wrk); 2500 return eio__sendfile (ofd, ifd, offset, count);
1725
1726 if (wrk.dbuf)
1727 free (wrk.dbuf);
1728} 2501}
1729 2502

Diff Legend

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