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

Comparing libeio/eio.c (file contents):
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.130 by root, Thu May 9 03:03:24 2013 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 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 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
49#endif 49#endif
50#include "xthread.h" 50#include "xthread.h"
51 51
52#include <errno.h> 52#include <errno.h>
53#include <stddef.h> 53#include <stddef.h>
67#endif 67#endif
68 68
69#ifndef ECANCELED 69#ifndef ECANCELED
70# define ECANCELED EDOM 70# define ECANCELED EDOM
71#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
72 79
73static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
74 81
75#ifndef EIO_FINISH 82#ifndef EIO_FINISH
76# 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
95 102
96#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
97 104
98#ifdef _WIN32 105#ifdef _WIN32
99 106
107 #undef PAGESIZE
100 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
101 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
102 #ifdef EIO_STRUCT_STATI64 112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
103 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
104 #define fstat(fd,buf) _fstati64 (path,buf) 115 #define fstat(fd,buf) _fstati64 (fd,buf)
105 #endif 116 #endif
106 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
107 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
108 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
109 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
110 121
122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125
126 #define fchmod(fd,mode) EIO_ENOSYS ()
111 #define chown(path,uid,gid) EIO_ENOSYS () 127 #define chown(path,uid,gid) EIO_ENOSYS ()
112 #define fchown(fd,uid,gid) EIO_ENOSYS () 128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
113 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115 #define mknod(path,mode,dev) EIO_ENOSYS () 131 #define mknod(path,mode,dev) EIO_ENOSYS ()
116 #define sync() EIO_ENOSYS () 132 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
136
137 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
138 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
139
140 #if __GNUC__
141 typedef long long eio_off_t; /* signed for compatibility to msvc */
142 #else
143 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
144 #endif
145
146 static eio_ssize_t
147 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
148 {
149 OVERLAPPED o = { 0 };
150 DWORD got;
151
152 o.Offset = offset;
153 o.OffsetHigh = offset >> 32;
154
155 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
156 ? got : -1;
157 }
158
159 static eio_ssize_t
160 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
161 {
162 OVERLAPPED o = { 0 };
163 DWORD got;
164
165 o.Offset = offset;
166 o.OffsetHigh = offset >> 32;
167
168 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
169 ? got : -1;
170 }
171
172 /* rename() uses MoveFile, which fails to overwrite */
173 #define rename(old,neu) eio__rename (old, neu)
174
175 static int
176 eio__rename (const char *old, const char *neu)
177 {
178 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
179 return 0;
180
181 /* should steal _dosmaperr */
182 switch (GetLastError ())
183 {
184 case ERROR_FILE_NOT_FOUND:
185 case ERROR_PATH_NOT_FOUND:
186 case ERROR_INVALID_DRIVE:
187 case ERROR_NO_MORE_FILES:
188 case ERROR_BAD_NETPATH:
189 case ERROR_BAD_NET_NAME:
190 case ERROR_BAD_PATHNAME:
191 case ERROR_FILENAME_EXCED_RANGE:
192 errno = ENOENT;
193 break;
194
195 default:
196 errno = EACCES;
197 break;
198 }
199
200 return -1;
201 }
117 202
118 /* we could even stat and see if it exists */ 203 /* we could even stat and see if it exists */
119 static int 204 static int
120 symlink (const char *old, const char *neu) 205 symlink (const char *old, const char *neu)
121 { 206 {
207 #if WINVER >= 0x0600
122 if (CreateSymbolicLink (neu, old, 1)) 208 if (CreateSymbolicLink (neu, old, 1))
123 return 0; 209 return 0;
124 210
125 if (CreateSymbolicLink (neu, old, 0)) 211 if (CreateSymbolicLink (neu, old, 0))
126 return 0; 212 return 0;
213 #endif
127 214
128 return EIO_ERRNO (ENOENT, -1); 215 return EIO_ERRNO (ENOENT, -1);
129 } 216 }
130 217
218 /* POSIX API only, causing trouble for win32 apps */
219 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
220 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
221
222 struct statvfs
223 {
224 int dummy;
225 };
226
227 #define DT_DIR EIO_DT_DIR
228 #define DT_REG EIO_DT_REG
229 #define D_NAME(entp) entp.cFileName
230 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
231
131#else 232#else
132 233
133 #include <sys/time.h> 234 #include <sys/time.h>
134 #include <sys/select.h> 235 #include <sys/select.h>
135 #include <sys/statvfs.h>
136 #include <unistd.h> 236 #include <unistd.h>
137 #include <utime.h>
138 #include <signal.h> 237 #include <signal.h>
139 #include <dirent.h> 238 #include <dirent.h>
239
240 #ifdef ANDROID
241 #include <sys/vfs.h>
242 #define statvfs statfs
243 #define fstatvfs fstatfs
244 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
245 #else
246 #include <sys/statvfs.h>
247 #endif
140 248
141 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 249 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
142 #include <sys/mman.h> 250 #include <sys/mman.h>
143 #endif 251 #endif
144 252
253 #define D_NAME(entp) entp->d_name
254
145 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 255 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
146 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 256 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
147 #define _DIRENT_HAVE_D_TYPE /* sigh */ 257 #define _DIRENT_HAVE_D_TYPE /* sigh */
148 #define D_INO(de) (de)->d_fileno 258 #define D_INO(de) (de)->d_fileno
149 #define D_NAMLEN(de) (de)->d_namlen 259 #define D_NAMLEN(de) (de)->d_namlen
150 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 260 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
151 #define D_INO(de) (de)->d_ino 261 #define D_INO(de) (de)->d_ino
162 272
163 #ifndef EIO_STRUCT_DIRENT 273 #ifndef EIO_STRUCT_DIRENT
164 #define EIO_STRUCT_DIRENT struct dirent 274 #define EIO_STRUCT_DIRENT struct dirent
165 #endif 275 #endif
166 276
277#endif
278
279#if HAVE_UTIMES
280# include <utime.h>
281#endif
282
283#if HAVE_SYS_SYSCALL_H
284# include <sys/syscall.h>
285#endif
286
287#if HAVE_SYS_PRCTL_H
288# include <sys/prctl.h>
167#endif 289#endif
168 290
169#if HAVE_SENDFILE 291#if HAVE_SENDFILE
170# if __linux 292# if __linux
171# include <sys/sendfile.h> 293# include <sys/sendfile.h>
186#endif 308#endif
187#ifndef D_INO 309#ifndef D_INO
188# define D_INO(de) 0 310# define D_INO(de) 0
189#endif 311#endif
190#ifndef D_NAMLEN 312#ifndef D_NAMLEN
191# define D_NAMLEN(de) strlen ((de)->d_name) 313# define D_NAMLEN(entp) strlen (D_NAME (entp))
192#endif 314#endif
193 315
194/* used for struct dirent, AIX doesn't provide it */ 316/* used for struct dirent, AIX doesn't provide it */
195#ifndef NAME_MAX 317#ifndef NAME_MAX
196# define NAME_MAX 4096 318# define NAME_MAX 4096
202#endif 324#endif
203 325
204/* buffer size for various temporary buffers */ 326/* buffer size for various temporary buffers */
205#define EIO_BUFSIZE 65536 327#define EIO_BUFSIZE 65536
206 328
207#define dBUF \ 329#define dBUF \
208 char *eio_buf; \
209 ETP_WORKER_LOCK (self); \
210 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 330 char *eio_buf = malloc (EIO_BUFSIZE); \
211 ETP_WORKER_UNLOCK (self); \
212 errno = ENOMEM; \ 331 errno = ENOMEM; \
213 if (!eio_buf) \ 332 if (!eio_buf) \
214 return -1; 333 return -1
215 334
216#define EIO_TICKS ((1000000 + 1023) >> 10) 335#define FUBd \
336 free (eio_buf)
337
338/*****************************************************************************/
339
340struct tmpbuf
341{
342 void *ptr;
343 int len;
344};
345
346static void *
347tmpbuf_get (struct tmpbuf *buf, int len)
348{
349 if (buf->len < len)
350 {
351 free (buf->ptr);
352 buf->ptr = malloc (buf->len = len);
353 }
354
355 return buf->ptr;
356}
357
358struct tmpbuf;
359
360#if _POSIX_VERSION >= 200809L
361 #define HAVE_AT 1
362 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
363 #ifndef O_SEARCH
364 #define O_SEARCH O_RDONLY
365 #endif
366#else
367 #define HAVE_AT 0
368 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
369#endif
370
371struct eio_pwd
372{
373#if HAVE_AT
374 int fd;
375#endif
376 int len;
377 char str[1]; /* actually, a 0-terminated canonical path */
378};
379
380/*****************************************************************************/
217 381
218#define ETP_PRI_MIN EIO_PRI_MIN 382#define ETP_PRI_MIN EIO_PRI_MIN
219#define ETP_PRI_MAX EIO_PRI_MAX 383#define ETP_PRI_MAX EIO_PRI_MAX
384
385#define ETP_TYPE_QUIT -1
386#define ETP_TYPE_GROUP EIO_GROUP
220 387
221struct etp_worker; 388struct etp_worker;
222 389
223#define ETP_REQ eio_req 390#define ETP_REQ eio_req
224#define ETP_DESTROY(req) eio_destroy (req) 391#define ETP_DESTROY(req) eio_destroy (req)
225static int eio_finish (eio_req *req); 392static int eio_finish (eio_req *req);
226#define ETP_FINISH(req) eio_finish (req) 393#define ETP_FINISH(req) eio_finish (req)
227static void eio_execute (struct etp_worker *self, eio_req *req); 394static void eio_execute (struct etp_worker *self, eio_req *req);
228#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 395#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
229 396
230#define ETP_WORKER_CLEAR(req) \ 397#include "etp.c"
231 if (wrk->dbuf) \
232 { \
233 free (wrk->dbuf); \
234 wrk->dbuf = 0; \
235 } \
236 \
237 if (wrk->dirp) \
238 { \
239 closedir (wrk->dirp); \
240 wrk->dirp = 0; \
241 }
242
243#define ETP_WORKER_COMMON \
244 void *dbuf; \
245 DIR *dirp;
246
247/*****************************************************************************/
248
249#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250
251/* calculate time difference in ~1/EIO_TICKS of a second */
252ecb_inline int
253tvdiff (struct timeval *tv1, struct timeval *tv2)
254{
255 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
256 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
257}
258
259static unsigned int started, idle, wanted = 4;
260
261static void (*want_poll_cb) (void);
262static void (*done_poll_cb) (void);
263
264static unsigned int max_poll_time; /* reslock */
265static unsigned int max_poll_reqs; /* reslock */
266
267static volatile unsigned int nreqs; /* reqlock */
268static volatile unsigned int nready; /* reqlock */
269static volatile unsigned int npending; /* reqlock */
270static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
271static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
272
273static xmutex_t wrklock;
274static xmutex_t reslock;
275static xmutex_t reqlock;
276static xcond_t reqwait;
277
278#if !HAVE_PREADWRITE
279/*
280 * make our pread/pwrite emulation safe against themselves, but not against
281 * normal read/write by using a mutex. slows down execution a lot,
282 * but that's your problem, not mine.
283 */
284static xmutex_t preadwritelock = X_MUTEX_INIT;
285#endif
286
287typedef struct etp_worker
288{
289 /* locked by wrklock */
290 struct etp_worker *prev, *next;
291
292 xthread_t tid;
293
294 /* locked by reslock, reqlock or wrklock */
295 ETP_REQ *req; /* currently processed request */
296
297 ETP_WORKER_COMMON
298} etp_worker;
299
300static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
301
302#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304
305/* worker threads management */
306
307static void ecb_cold
308etp_worker_clear (etp_worker *wrk)
309{
310 ETP_WORKER_CLEAR (wrk);
311}
312
313static void ecb_cold
314etp_worker_free (etp_worker *wrk)
315{
316 wrk->next->prev = wrk->prev;
317 wrk->prev->next = wrk->next;
318
319 free (wrk);
320}
321
322static unsigned int
323etp_nreqs (void)
324{
325 int retval;
326 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
327 retval = nreqs;
328 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
329 return retval;
330}
331
332static unsigned int
333etp_nready (void)
334{
335 unsigned int retval;
336
337 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
338 retval = nready;
339 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
340
341 return retval;
342}
343
344static unsigned int
345etp_npending (void)
346{
347 unsigned int retval;
348
349 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
350 retval = npending;
351 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
352
353 return retval;
354}
355
356static unsigned int
357etp_nthreads (void)
358{
359 unsigned int retval;
360
361 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
362 retval = started;
363 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
364
365 return retval;
366}
367
368/*
369 * a somewhat faster data structure might be nice, but
370 * with 8 priorities this actually needs <20 insns
371 * per shift, the most expensive operation.
372 */
373typedef struct {
374 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
375 int size;
376} etp_reqq;
377
378static etp_reqq req_queue;
379static etp_reqq res_queue;
380
381static int ecb_noinline
382reqq_push (etp_reqq *q, ETP_REQ *req)
383{
384 int pri = req->pri;
385 req->next = 0;
386
387 if (q->qe[pri])
388 {
389 q->qe[pri]->next = req;
390 q->qe[pri] = req;
391 }
392 else
393 q->qe[pri] = q->qs[pri] = req;
394
395 return q->size++;
396}
397
398static ETP_REQ * ecb_noinline
399reqq_shift (etp_reqq *q)
400{
401 int pri;
402
403 if (!q->size)
404 return 0;
405
406 --q->size;
407
408 for (pri = ETP_NUM_PRI; pri--; )
409 {
410 eio_req *req = q->qs[pri];
411
412 if (req)
413 {
414 if (!(q->qs[pri] = (eio_req *)req->next))
415 q->qe[pri] = 0;
416
417 return req;
418 }
419 }
420
421 abort ();
422}
423
424static void ecb_cold
425etp_thread_init (void)
426{
427#if !HAVE_PREADWRITE
428 X_MUTEX_CREATE (preadwritelock);
429#endif
430 X_MUTEX_CREATE (wrklock);
431 X_MUTEX_CREATE (reslock);
432 X_MUTEX_CREATE (reqlock);
433 X_COND_CREATE (reqwait);
434}
435
436static void ecb_cold
437etp_atfork_prepare (void)
438{
439}
440
441static void ecb_cold
442etp_atfork_parent (void)
443{
444}
445
446static void ecb_cold
447etp_atfork_child (void)
448{
449 ETP_REQ *prv;
450
451 while ((prv = reqq_shift (&req_queue)))
452 ETP_DESTROY (prv);
453
454 while ((prv = reqq_shift (&res_queue)))
455 ETP_DESTROY (prv);
456
457 while (wrk_first.next != &wrk_first)
458 {
459 etp_worker *wrk = wrk_first.next;
460
461 if (wrk->req)
462 ETP_DESTROY (wrk->req);
463
464 etp_worker_clear (wrk);
465 etp_worker_free (wrk);
466 }
467
468 started = 0;
469 idle = 0;
470 nreqs = 0;
471 nready = 0;
472 npending = 0;
473
474 etp_thread_init ();
475}
476
477static void ecb_cold
478etp_once_init (void)
479{
480 etp_thread_init ();
481 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
482}
483
484static int ecb_cold
485etp_init (void (*want_poll)(void), void (*done_poll)(void))
486{
487 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
488
489 pthread_once (&doinit, etp_once_init);
490
491 want_poll_cb = want_poll;
492 done_poll_cb = done_poll;
493
494 return 0;
495}
496
497X_THREAD_PROC (etp_proc);
498
499static void ecb_cold
500etp_start_thread (void)
501{
502 etp_worker *wrk = calloc (1, sizeof (etp_worker));
503
504 /*TODO*/
505 assert (("unable to allocate worker thread data", wrk));
506
507 X_LOCK (wrklock);
508
509 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
510 {
511 wrk->prev = &wrk_first;
512 wrk->next = wrk_first.next;
513 wrk_first.next->prev = wrk;
514 wrk_first.next = wrk;
515 ++started;
516 }
517 else
518 free (wrk);
519
520 X_UNLOCK (wrklock);
521}
522
523static void
524etp_maybe_start_thread (void)
525{
526 if (ecb_expect_true (etp_nthreads () >= wanted))
527 return;
528
529 /* todo: maybe use idle here, but might be less exact */
530 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
531 return;
532
533 etp_start_thread ();
534}
535
536static void ecb_cold
537etp_end_thread (void)
538{
539 eio_req *req = calloc (1, sizeof (eio_req));
540
541 req->type = -1;
542 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
543
544 X_LOCK (reqlock);
545 reqq_push (&req_queue, req);
546 X_COND_SIGNAL (reqwait);
547 X_UNLOCK (reqlock);
548
549 X_LOCK (wrklock);
550 --started;
551 X_UNLOCK (wrklock);
552}
553
554static int
555etp_poll (void)
556{
557 unsigned int maxreqs;
558 unsigned int maxtime;
559 struct timeval tv_start, tv_now;
560
561 X_LOCK (reslock);
562 maxreqs = max_poll_reqs;
563 maxtime = max_poll_time;
564 X_UNLOCK (reslock);
565
566 if (maxtime)
567 gettimeofday (&tv_start, 0);
568
569 for (;;)
570 {
571 ETP_REQ *req;
572
573 etp_maybe_start_thread ();
574
575 X_LOCK (reslock);
576 req = reqq_shift (&res_queue);
577
578 if (req)
579 {
580 --npending;
581
582 if (!res_queue.size && done_poll_cb)
583 done_poll_cb ();
584 }
585
586 X_UNLOCK (reslock);
587
588 if (!req)
589 return 0;
590
591 X_LOCK (reqlock);
592 --nreqs;
593 X_UNLOCK (reqlock);
594
595 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
596 {
597 req->int1 = 1; /* mark request as delayed */
598 continue;
599 }
600 else
601 {
602 int res = ETP_FINISH (req);
603 if (ecb_expect_false (res))
604 return res;
605 }
606
607 if (ecb_expect_false (maxreqs && !--maxreqs))
608 break;
609
610 if (maxtime)
611 {
612 gettimeofday (&tv_now, 0);
613
614 if (tvdiff (&tv_start, &tv_now) >= maxtime)
615 break;
616 }
617 }
618
619 errno = EAGAIN;
620 return -1;
621}
622
623static void
624etp_cancel (ETP_REQ *req)
625{
626 req->cancelled = 1;
627
628 eio_grp_cancel (req);
629}
630
631static void
632etp_submit (ETP_REQ *req)
633{
634 req->pri -= ETP_PRI_MIN;
635
636 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
637 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
638
639 if (ecb_expect_false (req->type == EIO_GROUP))
640 {
641 /* I hope this is worth it :/ */
642 X_LOCK (reqlock);
643 ++nreqs;
644 X_UNLOCK (reqlock);
645
646 X_LOCK (reslock);
647
648 ++npending;
649
650 if (!reqq_push (&res_queue, req) && want_poll_cb)
651 want_poll_cb ();
652
653 X_UNLOCK (reslock);
654 }
655 else
656 {
657 X_LOCK (reqlock);
658 ++nreqs;
659 ++nready;
660 reqq_push (&req_queue, req);
661 X_COND_SIGNAL (reqwait);
662 X_UNLOCK (reqlock);
663
664 etp_maybe_start_thread ();
665 }
666}
667
668static void ecb_cold
669etp_set_max_poll_time (double nseconds)
670{
671 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
672 max_poll_time = nseconds * EIO_TICKS;
673 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
674}
675
676static void ecb_cold
677etp_set_max_poll_reqs (unsigned int maxreqs)
678{
679 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
680 max_poll_reqs = maxreqs;
681 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
682}
683
684static void ecb_cold
685etp_set_max_idle (unsigned int nthreads)
686{
687 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
688 max_idle = nthreads;
689 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
690}
691
692static void ecb_cold
693etp_set_idle_timeout (unsigned int seconds)
694{
695 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
696 idle_timeout = seconds;
697 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
698}
699
700static void ecb_cold
701etp_set_min_parallel (unsigned int nthreads)
702{
703 if (wanted < nthreads)
704 wanted = nthreads;
705}
706
707static void ecb_cold
708etp_set_max_parallel (unsigned int nthreads)
709{
710 if (wanted > nthreads)
711 wanted = nthreads;
712
713 while (started > wanted)
714 etp_end_thread ();
715}
716 398
717/*****************************************************************************/ 399/*****************************************************************************/
718 400
719static void 401static void
720grp_try_feed (eio_req *grp) 402grp_try_feed (eio_req *grp)
787} 469}
788 470
789void 471void
790eio_grp_cancel (eio_req *grp) 472eio_grp_cancel (eio_req *grp)
791{ 473{
792 for (grp = grp->grp_first; grp; grp = grp->grp_next)
793 eio_cancel (grp); 474 etp_grp_cancel (grp);
794} 475}
795 476
796void 477void
797eio_cancel (eio_req *req) 478eio_cancel (eio_req *req)
798{ 479{
870 return etp_poll (); 551 return etp_poll ();
871} 552}
872 553
873/*****************************************************************************/ 554/*****************************************************************************/
874/* work around various missing functions */ 555/* work around various missing functions */
875
876#if !HAVE_PREADWRITE
877# undef pread
878# undef pwrite
879# define pread eio__pread
880# define pwrite eio__pwrite
881
882static eio_ssize_t
883eio__pread (int fd, void *buf, size_t count, off_t offset)
884{
885 eio_ssize_t res;
886 off_t ooffset;
887
888 X_LOCK (preadwritelock);
889 ooffset = lseek (fd, 0, SEEK_CUR);
890 lseek (fd, offset, SEEK_SET);
891 res = read (fd, buf, count);
892 lseek (fd, ooffset, SEEK_SET);
893 X_UNLOCK (preadwritelock);
894
895 return res;
896}
897
898static eio_ssize_t
899eio__pwrite (int fd, void *buf, size_t count, off_t offset)
900{
901 eio_ssize_t res;
902 off_t ooffset;
903
904 X_LOCK (preadwritelock);
905 ooffset = lseek (fd, 0, SEEK_CUR);
906 lseek (fd, offset, SEEK_SET);
907 res = write (fd, buf, count);
908 lseek (fd, ooffset, SEEK_SET);
909 X_UNLOCK (preadwritelock);
910
911 return res;
912}
913#endif
914 556
915#ifndef HAVE_UTIMES 557#ifndef HAVE_UTIMES
916 558
917# undef utimes 559# undef utimes
918# define utimes(path,times) eio__utimes (path, times) 560# define utimes(path,times) eio__utimes (path, times)
951 593
952#if !HAVE_FDATASYNC 594#if !HAVE_FDATASYNC
953# undef fdatasync 595# undef fdatasync
954# define fdatasync(fd) fsync (fd) 596# define fdatasync(fd) fsync (fd)
955#endif 597#endif
598
599static int
600eio__syncfs (int fd)
601{
602 int res;
603
604#if HAVE_SYS_SYNCFS
605 res = (int)syscall (__NR_syncfs, (int)(fd));
606#else
607 res = EIO_ENOSYS ();
608#endif
609
610 if (res < 0 && errno == ENOSYS && fd >= 0)
611 sync ();
612
613 return res;
614}
956 615
957/* sync_file_range always needs emulation */ 616/* sync_file_range always needs emulation */
958static int 617static int
959eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 618eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960{ 619{
983} 642}
984 643
985static int 644static int
986eio__fallocate (int fd, int mode, off_t offset, size_t len) 645eio__fallocate (int fd, int mode, off_t offset, size_t len)
987{ 646{
988#if HAVE_FALLOCATE 647#if HAVE_LINUX_FALLOCATE
989 return fallocate (fd, mode, offset, len); 648 return fallocate (fd, mode, offset, len);
990#else 649#else
991 errno = ENOSYS; 650 return EIO_ENOSYS ();
992 return -1;
993#endif 651#endif
994} 652}
995 653
996#if !HAVE_READAHEAD 654#if !HAVE_READAHEAD
997# undef readahead 655# undef readahead
1010 pread (fd, eio_buf, len, offset); 668 pread (fd, eio_buf, len, offset);
1011 offset += len; 669 offset += len;
1012 todo -= len; 670 todo -= len;
1013 } 671 }
1014 672
1015 errno = 0; 673 FUBd;
674
675 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
676 /* but not for e.g. EIO or eof, so we also never fail */
1016 return count; 677 return 0;
1017} 678}
1018 679
1019#endif 680#endif
1020 681
1021/* sendfile always needs emulation */ 682/* sendfile always needs emulation */
1022static eio_ssize_t 683static eio_ssize_t
1023eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 684eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024{ 685{
1025 eio_ssize_t written = 0; 686 eio_ssize_t written = 0;
1026 eio_ssize_t res; 687 eio_ssize_t res;
1027 688
1028 if (!count) 689 if (!count)
1056 717
1057 /* according to source inspection, this is correct, and useful behaviour */ 718 /* according to source inspection, this is correct, and useful behaviour */
1058 if (sbytes) 719 if (sbytes)
1059 res = sbytes; 720 res = sbytes;
1060 721
1061# elif defined (__APPLE__) 722# elif defined __APPLE__
1062 off_t sbytes = count; 723 off_t sbytes = count;
1063 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 724 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1064 725
1065 /* according to the manpage, sbytes is always valid */ 726 /* according to the manpage, sbytes is always valid */
1066 if (sbytes) 727 if (sbytes)
1093 HANDLE h = TO_SOCKET (ifd); 754 HANDLE h = TO_SOCKET (ifd);
1094 SetFilePointer (h, offset, 0, FILE_BEGIN); 755 SetFilePointer (h, offset, 0, FILE_BEGIN);
1095 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 756 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1096 757
1097#else 758#else
1098 res = -1; 759 res = EIO_ENOSYS ();
1099 errno = ENOSYS;
1100#endif 760#endif
1101 761
1102 /* we assume sendfile can copy at least 128mb in one go */ 762 /* we assume sendfile can copy at least 128mb in one go */
1103 if (res <= 128 * 1024 * 1024) 763 if (res <= 128 * 1024 * 1024)
1104 { 764 {
1126 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 786 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127 /* BSDs */ 787 /* BSDs */
1128#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 788#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129 || errno == ENOTSUP 789 || errno == ENOTSUP
1130#endif 790#endif
791#ifdef EOPNOTSUPP /* windows */
1131 || errno == EOPNOTSUPP /* BSDs */ 792 || errno == EOPNOTSUPP /* BSDs */
793#endif
1132#if __solaris 794#if __solaris
1133 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 795 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134#endif 796#endif
1135 ) 797 )
1136 ) 798 )
1162 824
1163 offset += cnt; 825 offset += cnt;
1164 res += cnt; 826 res += cnt;
1165 count -= cnt; 827 count -= cnt;
1166 } 828 }
829
830 FUBd;
1167 } 831 }
1168 832
1169 return res; 833 return res;
1170} 834}
1171 835
1287 951
1288/*****************************************************************************/ 952/*****************************************************************************/
1289/* requests implemented outside eio_execute, because they are so large */ 953/* requests implemented outside eio_execute, because they are so large */
1290 954
1291static void 955static void
1292eio__realpath (eio_req *req, etp_worker *self) 956eio__lseek (eio_req *req)
1293{ 957{
1294 char *rel = req->ptr1; 958 /* this usually gets optimised away completely, or your compiler sucks, */
959 /* or the whence constants really are not 0, 1, 2 */
960 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
961 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
962 : req->int2 == EIO_SEEK_END ? SEEK_END
963 : req->int2;
964
965 req->offs = lseek (req->int1, req->offs, whence);
966 req->result = req->offs == (off_t)-1 ? -1 : 0;
967}
968
969/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
970static int
971eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
972{
1295 char *res; 973 char *res;
974 const char *rel = path;
1296 char *tmp1, *tmp2; 975 char *tmp1, *tmp2;
1297#if SYMLOOP_MAX > 32 976#if SYMLOOP_MAX > 32
1298 int symlinks = SYMLOOP_MAX; 977 int symlinks = SYMLOOP_MAX;
1299#else 978#else
1300 int symlinks = 32; 979 int symlinks = 32;
1301#endif 980#endif
1302 981
1303 req->result = -1;
1304
1305 errno = EINVAL; 982 errno = EINVAL;
1306 if (!rel) 983 if (!rel)
1307 return; 984 return -1;
1308 985
1309 errno = ENOENT; 986 errno = ENOENT;
1310 if (!*rel) 987 if (!*rel)
1311 return; 988 return -1;
1312 989
1313 if (!req->ptr2) 990 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1314 { 991#ifdef _WIN32
1315 X_LOCK (wrklock); 992 if (_access (rel, 4) != 0)
1316 req->flags |= EIO_FLAG_PTR2_FREE;
1317 X_UNLOCK (wrklock);
1318 req->ptr2 = malloc (PATH_MAX * 3);
1319
1320 errno = ENOMEM;
1321 if (!req->ptr2)
1322 return; 993 return -1;
1323 }
1324 994
1325 res = req->ptr2; 995 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0);
996
997 errno = ENAMETOOLONG;
998 if (symlinks >= PATH_MAX * 3)
999 return -1;
1000
1001 errno = EIO;
1002 if (symlinks <= 0)
1003 return -1;
1004
1005 return symlinks;
1006
1007#else
1326 tmp1 = res + PATH_MAX; 1008 tmp1 = res + PATH_MAX;
1327 tmp2 = tmp1 + PATH_MAX; 1009 tmp2 = tmp1 + PATH_MAX;
1328 1010
1329#if 0 /* disabled, the musl way to do things is just too racy */ 1011#if 0 /* disabled, the musl way to do things is just too racy */
1330#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1012#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1334 1016
1335 if (fd >= 0) 1017 if (fd >= 0)
1336 { 1018 {
1337 sprintf (tmp1, "/proc/self/fd/%d", fd); 1019 sprintf (tmp1, "/proc/self/fd/%d", fd);
1338 req->result = readlink (tmp1, res, PATH_MAX); 1020 req->result = readlink (tmp1, res, PATH_MAX);
1021 /* here we should probably stat the open file and the disk file, to make sure they still match */
1339 close (fd); 1022 close (fd);
1340
1341 /* here we should probably stat the open file and the disk file, to make sure they still match */
1342 1023
1343 if (req->result > 0) 1024 if (req->result > 0)
1344 goto done; 1025 goto done;
1345 } 1026 }
1346 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1027 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1347 return; 1028 return -1;
1348 } 1029 }
1349#endif 1030#endif
1350#endif 1031#endif
1351 1032
1352 if (*rel != '/') 1033 if (*rel != '/')
1353 { 1034 {
1035 int len;
1036
1037 errno = ENOENT;
1038 if (wd == EIO_INVALID_WD)
1039 return -1;
1040
1041 if (wd == EIO_CWD)
1042 {
1354 if (!getcwd (res, PATH_MAX)) 1043 if (!getcwd (res, PATH_MAX))
1355 return; 1044 return -1;
1045
1046 len = strlen (res);
1047 }
1048 else
1049 memcpy (res, wd->str, len = wd->len);
1356 1050
1357 if (res [1]) /* only use if not / */ 1051 if (res [1]) /* only use if not / */
1358 res += strlen (res); 1052 res += len;
1359 } 1053 }
1360 1054
1361 while (*rel) 1055 while (*rel)
1362 { 1056 {
1363 eio_ssize_t len, linklen; 1057 eio_ssize_t len, linklen;
1364 char *beg = rel; 1058 const char *beg = rel;
1365 1059
1366 while (*rel && *rel != '/') 1060 while (*rel && *rel != '/')
1367 ++rel; 1061 ++rel;
1368 1062
1369 len = rel - beg; 1063 len = rel - beg;
1381 1075
1382 if (beg [1] == '.' && len == 2) 1076 if (beg [1] == '.' && len == 2)
1383 { 1077 {
1384 /* .. - back up one component, if possible */ 1078 /* .. - back up one component, if possible */
1385 1079
1386 while (res != req->ptr2) 1080 while (res != tmpbuf->ptr)
1387 if (*--res == '/') 1081 if (*--res == '/')
1388 break; 1082 break;
1389 1083
1390 continue; 1084 continue;
1391 } 1085 }
1392 } 1086 }
1393 1087
1394 errno = ENAMETOOLONG; 1088 errno = ENAMETOOLONG;
1395 if (res + 1 + len + 1 >= tmp1) 1089 if (res + 1 + len + 1 >= tmp1)
1396 return; 1090 return -1;
1397 1091
1398 /* copy one component */ 1092 /* copy one component */
1399 *res = '/'; 1093 *res = '/';
1400 memcpy (res + 1, beg, len); 1094 memcpy (res + 1, beg, len);
1401 1095
1402 /* zero-terminate, for readlink */ 1096 /* zero-terminate, for readlink */
1403 res [len + 1] = 0; 1097 res [len + 1] = 0;
1404 1098
1405 /* now check if it's a symlink */ 1099 /* now check if it's a symlink */
1406 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1100 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1407 1101
1408 if (linklen < 0) 1102 if (linklen < 0)
1409 { 1103 {
1410 if (errno != EINVAL) 1104 if (errno != EINVAL)
1411 return; 1105 return -1;
1412 1106
1413 /* it's a normal directory. hopefully */ 1107 /* it's a normal directory. hopefully */
1414 res += len + 1; 1108 res += len + 1;
1415 } 1109 }
1416 else 1110 else
1418 /* yay, it was a symlink - build new path in tmp2 */ 1112 /* yay, it was a symlink - build new path in tmp2 */
1419 int rellen = strlen (rel); 1113 int rellen = strlen (rel);
1420 1114
1421 errno = ENAMETOOLONG; 1115 errno = ENAMETOOLONG;
1422 if (linklen + 1 + rellen >= PATH_MAX) 1116 if (linklen + 1 + rellen >= PATH_MAX)
1423 return; 1117 return -1;
1424 1118
1425 errno = ELOOP; 1119 errno = ELOOP;
1426 if (!--symlinks) 1120 if (!--symlinks)
1427 return; 1121 return -1;
1428 1122
1429 if (*tmp1 == '/') 1123 if (*tmp1 == '/')
1430 res = req->ptr2; /* symlink resolves to an absolute path */ 1124 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1431 1125
1432 /* we need to be careful, as rel might point into tmp2 already */ 1126 /* we need to be careful, as rel might point into tmp2 already */
1433 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1127 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1434 tmp2 [linklen] = '/'; 1128 tmp2 [linklen] = '/';
1435 memcpy (tmp2, tmp1, linklen); 1129 memcpy (tmp2, tmp1, linklen);
1437 rel = tmp2; 1131 rel = tmp2;
1438 } 1132 }
1439 } 1133 }
1440 1134
1441 /* special case for the lone root path */ 1135 /* special case for the lone root path */
1442 if (res == req->ptr2) 1136 if (res == tmpbuf->ptr)
1443 *res++ = '/'; 1137 *res++ = '/';
1444 1138
1445 req->result = res - (char *)req->ptr2; 1139 return res - (char *)tmpbuf->ptr;
1446 1140#endif
1447done:
1448 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1449} 1141}
1450 1142
1451static signed char 1143static signed char
1452eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1144eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1453{ 1145{
1461 1153
1462#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1154#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1463#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1155#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464 1156
1465static void 1157static void
1466eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1158eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467{ 1159{
1468 unsigned char bits [9 + sizeof (ino_t) * 8]; 1160 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469 unsigned char *bit = bits; 1161 unsigned char *bit = bits;
1470 1162
1471 assert (CHAR_BIT == 8); 1163 assert (CHAR_BIT == 8);
1472 assert (sizeof (eio_dirent) * 8 < 256); 1164 assert (sizeof (eio_dirent) * 8 < 256);
1473 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1165 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1475 1167
1476 if (size <= EIO_SORT_FAST) 1168 if (size <= EIO_SORT_FAST)
1477 return; 1169 return;
1478 1170
1479 /* first prepare an array of bits to test in our radix sort */ 1171 /* first prepare an array of bits to test in our radix sort */
1480 /* try to take endianness into account, as well as differences in ino_t sizes */ 1172 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481 /* inode_bits must contain all inodes ORed together */ 1173 /* inode_bits must contain all inodes ORed together */
1482 /* which is used to skip bits that are 0 everywhere, which is very common */ 1174 /* which is used to skip bits that are 0 everywhere, which is very common */
1483 { 1175 {
1484 ino_t endianness; 1176 eio_ino_t endianness;
1485 int i, j; 1177 int i, j;
1486 1178
1487 /* we store the byte offset of byte n into byte n of "endianness" */ 1179 /* we store the byte offset of byte n into byte n of "endianness" */
1488 for (i = 0; i < sizeof (ino_t); ++i) 1180 for (i = 0; i < sizeof (eio_ino_t); ++i)
1489 ((unsigned char *)&endianness)[i] = i; 1181 ((unsigned char *)&endianness)[i] = i;
1490 1182
1491 *bit++ = 0; 1183 *bit++ = 0;
1492 1184
1493 for (i = 0; i < sizeof (ino_t); ++i) 1185 for (i = 0; i < sizeof (eio_ino_t); ++i)
1494 { 1186 {
1495 /* shifting off the byte offsets out of "endianness" */ 1187 /* shifting off the byte offsets out of "endianness" */
1496 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1188 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497 endianness >>= 8; 1189 endianness >>= 8;
1498 1190
1499 for (j = 0; j < 8; ++j) 1191 for (j = 0; j < 8; ++j)
1500 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1192 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501 *bit++ = offs + j; 1193 *bit++ = offs + j;
1502 } 1194 }
1503 1195
1504 for (j = 0; j < 8; ++j) 1196 for (j = 0; j < 8; ++j)
1505 if (score_bits & (1 << j)) 1197 if (score_bits & (1 << j))
1506 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1198 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1507 } 1199 }
1508 1200
1509 /* now actually do the sorting (a variant of MSD radix sort) */ 1201 /* now actually do the sorting (a variant of MSD radix sort) */
1510 { 1202 {
1511 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1203 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1204 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1205 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514 int stk_idx = 0; 1206 int stk_idx = 0;
1515 1207
1516 base_stk [stk_idx] = dents; 1208 base_stk [stk_idx] = dents;
1517 end_stk [stk_idx] = dents + size; 1209 end_stk [stk_idx] = dents + size;
1518 bit_stk [stk_idx] = bit - 1; 1210 bit_stk [stk_idx] = bit - 1;
1597 } 1289 }
1598 } 1290 }
1599} 1291}
1600 1292
1601static void 1293static void
1602eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1294eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603{ 1295{
1604 if (size <= 1) 1296 if (size <= 1)
1605 return; /* our insertion sort relies on size > 0 */ 1297 return; /* our insertion sort relies on size > 0 */
1606 1298
1607 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1299 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1615 1307
1616/* read a full directory */ 1308/* read a full directory */
1617static void 1309static void
1618eio__scandir (eio_req *req, etp_worker *self) 1310eio__scandir (eio_req *req, etp_worker *self)
1619{ 1311{
1620 DIR *dirp;
1621 EIO_STRUCT_DIRENT *entp;
1622 char *name, *names; 1312 char *name, *names;
1623 int namesalloc = 4096; 1313 int namesalloc = 4096 - sizeof (void *) * 4;
1624 int namesoffs = 0; 1314 int namesoffs = 0;
1625 int flags = req->int1; 1315 int flags = req->int1;
1626 eio_dirent *dents = 0; 1316 eio_dirent *dents = 0;
1627 int dentalloc = 128; 1317 int dentalloc = 128;
1628 int dentoffs = 0; 1318 int dentoffs = 0;
1629 ino_t inode_bits = 0; 1319 eio_ino_t inode_bits = 0;
1320#ifdef _WIN32
1321 HANDLE dirp;
1322 WIN32_FIND_DATA entp;
1323#else
1324 DIR *dirp;
1325 EIO_STRUCT_DIRENT *entp;
1326#endif
1630 1327
1631 req->result = -1; 1328 req->result = -1;
1632 1329
1633 if (!(flags & EIO_READDIR_DENTS)) 1330 if (!(flags & EIO_READDIR_DENTS))
1634 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1331 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635 1332
1636 X_LOCK (wrklock); 1333#ifdef _WIN32
1637 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1334 {
1335 int len = strlen ((const char *)req->ptr1);
1336 char *path = malloc (MAX_PATH);
1337 const char *fmt;
1338 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1339
1340 if (!len)
1341 fmt = "./*";
1342 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1343 fmt = "%s*";
1344 else
1345 fmt = "%s/*";
1346
1347 _snprintf (path, MAX_PATH, fmt, reqpath);
1348 dirp = FindFirstFile (path, &entp);
1349 free (path);
1350
1351 if (dirp == INVALID_HANDLE_VALUE)
1352 {
1353 /* should steal _dosmaperr */
1354 switch (GetLastError ())
1355 {
1356 case ERROR_FILE_NOT_FOUND:
1357 req->result = 0;
1358 break;
1359
1360 case ERROR_INVALID_NAME:
1361 case ERROR_PATH_NOT_FOUND:
1362 case ERROR_NO_MORE_FILES:
1363 errno = ENOENT;
1364 break;
1365
1366 case ERROR_NOT_ENOUGH_MEMORY:
1367 errno = ENOMEM;
1368 break;
1369
1370 default:
1371 errno = EINVAL;
1372 break;
1373 }
1374
1375 return;
1376 }
1377 }
1378#else
1379 #if HAVE_AT
1380 if (req->wd)
1381 {
1382 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1383
1384 if (fd < 0)
1385 return;
1386
1387 dirp = fdopendir (fd);
1388
1389 if (!dirp)
1390 close (fd);
1391 }
1392 else
1638 self->dirp = dirp = opendir (req->ptr1); 1393 dirp = opendir (req->ptr1);
1394 #else
1395 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1396 #endif
1397
1398 if (!dirp)
1399 return;
1400#endif
1639 1401
1640 if (req->flags & EIO_FLAG_PTR1_FREE) 1402 if (req->flags & EIO_FLAG_PTR1_FREE)
1641 free (req->ptr1); 1403 free (req->ptr1);
1642 1404
1643 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1405 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1406 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645 req->ptr2 = names = malloc (namesalloc); 1407 req->ptr2 = names = malloc (namesalloc);
1646 X_UNLOCK (wrklock);
1647 1408
1648 if (dirp && names && (!flags || dents)) 1409 if (!names || (flags && !dents))
1410 return;
1411
1649 for (;;) 1412 for (;;)
1650 { 1413 {
1414 int done;
1415
1416#ifdef _WIN32
1417 done = !dirp;
1418#else
1651 errno = 0; 1419 errno = 0;
1652 entp = readdir (dirp); 1420 entp = readdir (dirp);
1421 done = !entp;
1422#endif
1653 1423
1654 if (!entp) 1424 if (done)
1655 { 1425 {
1426#ifndef _WIN32
1427 int old_errno = errno;
1428 closedir (dirp);
1429 errno = old_errno;
1430
1656 if (errno) 1431 if (errno)
1657 break; 1432 break;
1433#endif
1658 1434
1659 /* sort etc. */ 1435 /* sort etc. */
1660 req->int1 = flags; 1436 req->int1 = flags;
1661 req->result = dentoffs; 1437 req->result = dentoffs;
1662 1438
1663 if (flags & EIO_READDIR_STAT_ORDER) 1439 if (flags & EIO_READDIR_STAT_ORDER)
1664 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1440 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1665 else if (flags & EIO_READDIR_DIRS_FIRST) 1441 else if (flags & EIO_READDIR_DIRS_FIRST)
1666 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1442 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1667 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1443 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1668 else 1444 else
1445 {
1446 /* in this case, all is known, and we just put dirs first and sort them */
1447 eio_dirent *oth = dents + dentoffs;
1448 eio_dirent *dir = dents;
1449
1450 /* now partition dirs to the front, and non-dirs to the back */
1451 /* by walking from both sides and swapping if necessary */
1452 while (oth > dir)
1453 {
1454 if (dir->type == EIO_DT_DIR)
1455 ++dir;
1456 else if ((--oth)->type == EIO_DT_DIR)
1457 {
1458 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1459
1460 ++dir;
1461 }
1462 }
1463
1464 /* now sort the dirs only (dirs all have the same score) */
1465 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1466 }
1467
1468 break;
1469 }
1470
1471 /* now add the entry to our list(s) */
1472 name = D_NAME (entp);
1473
1474 /* skip . and .. entries */
1475 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1476 {
1477 int len = D_NAMLEN (entp) + 1;
1478
1479 while (ecb_expect_false (namesoffs + len > namesalloc))
1480 {
1481 namesalloc *= 2;
1482 req->ptr2 = names = realloc (names, namesalloc);
1483
1484 if (!names)
1485 break;
1486 }
1487
1488 memcpy (names + namesoffs, name, len);
1489
1490 if (dents)
1491 {
1492 struct eio_dirent *ent;
1493
1494 if (ecb_expect_false (dentoffs == dentalloc))
1669 { 1495 {
1670 /* in this case, all is known, and we just put dirs first and sort them */ 1496 dentalloc *= 2;
1497 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1498
1499 if (!dents)
1500 break;
1501 }
1502
1671 eio_dirent *oth = dents + dentoffs; 1503 ent = dents + dentoffs;
1672 eio_dirent *dir = dents;
1673 1504
1674 /* now partition dirs to the front, and non-dirs to the back */ 1505 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1675 /* by walking from both sides and swapping if necessary */ 1506 ent->namelen = len - 1;
1676 while (oth > dir) 1507 ent->inode = D_INO (entp);
1508
1509 inode_bits |= ent->inode;
1510
1511 switch (D_TYPE (entp))
1512 {
1513 default:
1514 ent->type = EIO_DT_UNKNOWN;
1515 flags |= EIO_READDIR_FOUND_UNKNOWN;
1516 break;
1517
1518 #ifdef DT_FIFO
1519 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1520 #endif
1521 #ifdef DT_CHR
1522 case DT_CHR: ent->type = EIO_DT_CHR; break;
1523 #endif
1524 #ifdef DT_MPC
1525 case DT_MPC: ent->type = EIO_DT_MPC; break;
1526 #endif
1527 #ifdef DT_DIR
1528 case DT_DIR: ent->type = EIO_DT_DIR; break;
1529 #endif
1530 #ifdef DT_NAM
1531 case DT_NAM: ent->type = EIO_DT_NAM; break;
1532 #endif
1533 #ifdef DT_BLK
1534 case DT_BLK: ent->type = EIO_DT_BLK; break;
1535 #endif
1536 #ifdef DT_MPB
1537 case DT_MPB: ent->type = EIO_DT_MPB; break;
1538 #endif
1539 #ifdef DT_REG
1540 case DT_REG: ent->type = EIO_DT_REG; break;
1541 #endif
1542 #ifdef DT_NWK
1543 case DT_NWK: ent->type = EIO_DT_NWK; break;
1544 #endif
1545 #ifdef DT_CMP
1546 case DT_CMP: ent->type = EIO_DT_CMP; break;
1547 #endif
1548 #ifdef DT_LNK
1549 case DT_LNK: ent->type = EIO_DT_LNK; break;
1550 #endif
1551 #ifdef DT_SOCK
1552 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1553 #endif
1554 #ifdef DT_DOOR
1555 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1556 #endif
1557 #ifdef DT_WHT
1558 case DT_WHT: ent->type = EIO_DT_WHT; break;
1559 #endif
1560 }
1561
1562 ent->score = 7;
1563
1564 if (flags & EIO_READDIR_DIRS_FIRST)
1565 {
1566 if (ent->type == EIO_DT_UNKNOWN)
1677 { 1567 {
1678 if (dir->type == EIO_DT_DIR) 1568 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1679 ++dir; 1569 ent->score = 1;
1680 else if ((--oth)->type == EIO_DT_DIR) 1570 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1681 { 1571 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1682 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1683
1684 ++dir;
1685 }
1686 } 1572 }
1687 1573 else if (ent->type == EIO_DT_DIR)
1688 /* now sort the dirs only (dirs all have the same score) */ 1574 ent->score = 0;
1689 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1690 } 1575 }
1691
1692 break;
1693 }
1694
1695 /* now add the entry to our list(s) */
1696 name = entp->d_name;
1697
1698 /* skip . and .. entries */
1699 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1700 {
1701 int len = D_NAMLEN (entp) + 1;
1702
1703 while (ecb_expect_false (namesoffs + len > namesalloc))
1704 {
1705 namesalloc *= 2;
1706 X_LOCK (wrklock);
1707 req->ptr2 = names = realloc (names, namesalloc);
1708 X_UNLOCK (wrklock);
1709
1710 if (!names)
1711 break;
1712 } 1576 }
1713 1577
1714 memcpy (names + namesoffs, name, len);
1715
1716 if (dents)
1717 {
1718 struct eio_dirent *ent;
1719
1720 if (ecb_expect_false (dentoffs == dentalloc))
1721 {
1722 dentalloc *= 2;
1723 X_LOCK (wrklock);
1724 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725 X_UNLOCK (wrklock);
1726
1727 if (!dents)
1728 break;
1729 }
1730
1731 ent = dents + dentoffs;
1732
1733 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1734 ent->namelen = len - 1;
1735 ent->inode = D_INO (entp);
1736
1737 inode_bits |= ent->inode;
1738
1739 switch (D_TYPE (entp))
1740 {
1741 default:
1742 ent->type = EIO_DT_UNKNOWN;
1743 flags |= EIO_READDIR_FOUND_UNKNOWN;
1744 break;
1745
1746 #ifdef DT_FIFO
1747 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1748 #endif
1749 #ifdef DT_CHR
1750 case DT_CHR: ent->type = EIO_DT_CHR; break;
1751 #endif
1752 #ifdef DT_MPC
1753 case DT_MPC: ent->type = EIO_DT_MPC; break;
1754 #endif
1755 #ifdef DT_DIR
1756 case DT_DIR: ent->type = EIO_DT_DIR; break;
1757 #endif
1758 #ifdef DT_NAM
1759 case DT_NAM: ent->type = EIO_DT_NAM; break;
1760 #endif
1761 #ifdef DT_BLK
1762 case DT_BLK: ent->type = EIO_DT_BLK; break;
1763 #endif
1764 #ifdef DT_MPB
1765 case DT_MPB: ent->type = EIO_DT_MPB; break;
1766 #endif
1767 #ifdef DT_REG
1768 case DT_REG: ent->type = EIO_DT_REG; break;
1769 #endif
1770 #ifdef DT_NWK
1771 case DT_NWK: ent->type = EIO_DT_NWK; break;
1772 #endif
1773 #ifdef DT_CMP
1774 case DT_CMP: ent->type = EIO_DT_CMP; break;
1775 #endif
1776 #ifdef DT_LNK
1777 case DT_LNK: ent->type = EIO_DT_LNK; break;
1778 #endif
1779 #ifdef DT_SOCK
1780 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1781 #endif
1782 #ifdef DT_DOOR
1783 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1784 #endif
1785 #ifdef DT_WHT
1786 case DT_WHT: ent->type = EIO_DT_WHT; break;
1787 #endif
1788 }
1789
1790 ent->score = 7;
1791
1792 if (flags & EIO_READDIR_DIRS_FIRST)
1793 {
1794 if (ent->type == EIO_DT_UNKNOWN)
1795 {
1796 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1797 ent->score = 1;
1798 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1799 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1800 }
1801 else if (ent->type == EIO_DT_DIR)
1802 ent->score = 0;
1803 }
1804 }
1805
1806 namesoffs += len; 1578 namesoffs += len;
1807 ++dentoffs; 1579 ++dentoffs;
1808 } 1580 }
1809 1581
1810 if (EIO_CANCELLED (req)) 1582 if (EIO_CANCELLED (req))
1811 { 1583 {
1812 errno = ECANCELED; 1584 errno = ECANCELED;
1813 break; 1585 break;
1814 } 1586 }
1587
1588#ifdef _WIN32
1589 if (!FindNextFile (dirp, &entp))
1590 {
1591 FindClose (dirp);
1592 dirp = 0;
1815 } 1593 }
1594#endif
1595 }
1816} 1596}
1597
1598/*****************************************************************************/
1599/* working directory stuff */
1600/* various deficiencies in the posix 2008 api force us to */
1601/* keep the absolute path in string form at all times */
1602/* fuck yeah. */
1603
1604#if !HAVE_AT
1605
1606/* a bit like realpath, but usually faster because it doesn'T have to return */
1607/* an absolute or canonical path */
1608static const char *
1609wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1610{
1611 if (!wd || *path == '/')
1612 return path;
1613
1614 if (path [0] == '.' && !path [1])
1615 return wd->str;
1616
1617 {
1618 int l1 = wd->len;
1619 int l2 = strlen (path);
1620
1621 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
1622
1623 memcpy (res, wd->str, l1);
1624 res [l1] = '/';
1625 memcpy (res + l1 + 1, path, l2 + 1);
1626
1627 return res;
1628 }
1629}
1630
1631#endif
1632
1633static eio_wd
1634eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1635{
1636 int fd;
1637 eio_wd res;
1638 int len = eio__realpath (tmpbuf, wd, path);
1639
1640 if (len < 0)
1641 return EIO_INVALID_WD;
1642
1643#if HAVE_AT
1644 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1645
1646 if (fd < 0)
1647 return EIO_INVALID_WD;
1648#endif
1649
1650 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1651
1652#if HAVE_AT
1653 res->fd = fd;
1654#endif
1655
1656 res->len = len;
1657 memcpy (res->str, tmpbuf->ptr, len);
1658 res->str [len] = 0;
1659
1660 return res;
1661}
1662
1663eio_wd
1664eio_wd_open_sync (eio_wd wd, const char *path)
1665{
1666 struct tmpbuf tmpbuf = { 0 };
1667 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1668 free (tmpbuf.ptr);
1669
1670 return wd;
1671}
1672
1673void
1674eio_wd_close_sync (eio_wd wd)
1675{
1676 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1677 {
1678 #if HAVE_AT
1679 close (wd->fd);
1680 #endif
1681 free (wd);
1682 }
1683}
1684
1685#if HAVE_AT
1686
1687/* they forgot these */
1688
1689static int
1690eio__truncateat (int dirfd, const char *path, off_t length)
1691{
1692 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1693 int res;
1694
1695 if (fd < 0)
1696 return fd;
1697
1698 res = ftruncate (fd, length);
1699 close (fd);
1700 return res;
1701}
1702
1703static int
1704eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1705{
1706 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
1707 int res;
1708
1709 if (fd < 0)
1710 return fd;
1711
1712 res = fstatvfs (fd, buf);
1713 close (fd);
1714 return res;
1715
1716}
1717
1718#endif
1817 1719
1818/*****************************************************************************/ 1720/*****************************************************************************/
1819 1721
1820#define ALLOC(len) \ 1722#define ALLOC(len) \
1821 if (!req->ptr2) \ 1723 if (!req->ptr2) \
1830 req->result = -1; \ 1732 req->result = -1; \
1831 break; \ 1733 break; \
1832 } \ 1734 } \
1833 } 1735 }
1834 1736
1737static void ecb_noinline ecb_cold
1738etp_proc_init (void)
1739{
1740#if HAVE_PRCTL_SET_NAME
1741 /* provide a more sensible "thread name" */
1742 char name[16 + 1];
1743 const int namelen = sizeof (name) - 1;
1744 int len;
1745
1746 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
1747 name [namelen] = 0;
1748 len = strlen (name);
1749 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
1750 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
1751#endif
1752}
1753
1754/* TODO: move somehow to etp.c */
1835X_THREAD_PROC (etp_proc) 1755X_THREAD_PROC (etp_proc)
1836{ 1756{
1837 ETP_REQ *req; 1757 ETP_REQ *req;
1838 struct timespec ts; 1758 struct timespec ts;
1839 etp_worker *self = (etp_worker *)thr_arg; 1759 etp_worker *self = (etp_worker *)thr_arg;
1840 int timeout; 1760
1761 etp_proc_init ();
1841 1762
1842 /* try to distribute timeouts somewhat evenly */ 1763 /* try to distribute timeouts somewhat evenly */
1843 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1764 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844 1765
1845 for (;;) 1766 for (;;)
1848 1769
1849 X_LOCK (reqlock); 1770 X_LOCK (reqlock);
1850 1771
1851 for (;;) 1772 for (;;)
1852 { 1773 {
1853 self->req = req = reqq_shift (&req_queue); 1774 req = reqq_shift (&req_queue);
1854 1775
1855 if (req) 1776 if (req)
1856 break; 1777 break;
1857 1778
1858 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 1779 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1884 1805
1885 --nready; 1806 --nready;
1886 1807
1887 X_UNLOCK (reqlock); 1808 X_UNLOCK (reqlock);
1888 1809
1889 if (req->type < 0) 1810 if (req->type == ETP_TYPE_QUIT)
1890 goto quit; 1811 goto quit;
1891 1812
1892 ETP_EXECUTE (self, req); 1813 ETP_EXECUTE (self, req);
1893 1814
1894 X_LOCK (reslock); 1815 X_LOCK (reslock);
1896 ++npending; 1817 ++npending;
1897 1818
1898 if (!reqq_push (&res_queue, req) && want_poll_cb) 1819 if (!reqq_push (&res_queue, req) && want_poll_cb)
1899 want_poll_cb (); 1820 want_poll_cb ();
1900 1821
1901 self->req = 0;
1902 etp_worker_clear (self); 1822 etp_worker_clear (self);
1903 1823
1904 X_UNLOCK (reslock); 1824 X_UNLOCK (reslock);
1905 } 1825 }
1906 1826
1907quit: 1827quit:
1828 free (req);
1829
1908 X_LOCK (wrklock); 1830 X_LOCK (wrklock);
1909 etp_worker_free (self); 1831 etp_worker_free (self);
1910 X_UNLOCK (wrklock); 1832 X_UNLOCK (wrklock);
1911 1833
1912 return 0; 1834 return 0;
1924eio_api_destroy (eio_req *req) 1846eio_api_destroy (eio_req *req)
1925{ 1847{
1926 free (req); 1848 free (req);
1927} 1849}
1928 1850
1929#define REQ(rtype) \ 1851#define REQ(rtype) \
1930 eio_req *req; \ 1852 eio_req *req; \
1931 \ 1853 \
1932 req = (eio_req *)calloc (1, sizeof *req); \ 1854 req = (eio_req *)calloc (1, sizeof *req); \
1933 if (!req) \ 1855 if (!req) \
1934 return 0; \ 1856 return 0; \
1948 { \ 1870 { \
1949 eio_api_destroy (req); \ 1871 eio_api_destroy (req); \
1950 return 0; \ 1872 return 0; \
1951 } 1873 }
1952 1874
1875#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1876
1953static void 1877static void
1954eio_execute (etp_worker *self, eio_req *req) 1878eio_execute (etp_worker *self, eio_req *req)
1955{ 1879{
1880#if HAVE_AT
1881 int dirfd;
1882#else
1883 const char *path;
1884#endif
1885
1956 if (ecb_expect_false (EIO_CANCELLED (req))) 1886 if (ecb_expect_false (EIO_CANCELLED (req)))
1957 { 1887 {
1958 req->result = -1; 1888 req->result = -1;
1959 req->errorno = ECANCELED; 1889 req->errorno = ECANCELED;
1960 return; 1890 return;
1961 } 1891 }
1962 1892
1893 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1894 {
1895 req->result = -1;
1896 req->errorno = ENOENT;
1897 return;
1898 }
1899
1900 if (req->type >= EIO_OPEN)
1901 {
1902 #if HAVE_AT
1903 dirfd = WD2FD (req->wd);
1904 #else
1905 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1906 #endif
1907 }
1908
1963 switch (req->type) 1909 switch (req->type)
1964 { 1910 {
1911 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1912 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1913 break;
1914 case EIO_WD_CLOSE: req->result = 0;
1915 eio_wd_close_sync (req->wd); break;
1916
1917 case EIO_SEEK: eio__lseek (req); break;
1965 case EIO_READ: ALLOC (req->size); 1918 case EIO_READ: ALLOC (req->size);
1966 req->result = req->offs >= 0 1919 req->result = req->offs >= 0
1967 ? pread (req->int1, req->ptr2, req->size, req->offs) 1920 ? pread (req->int1, req->ptr2, req->size, req->offs)
1968 : read (req->int1, req->ptr2, req->size); break; 1921 : read (req->int1, req->ptr2, req->size); break;
1969 case EIO_WRITE: req->result = req->offs >= 0 1922 case EIO_WRITE: req->result = req->offs >= 0
1970 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1923 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971 : write (req->int1, req->ptr2, req->size); break; 1924 : write (req->int1, req->ptr2, req->size); break;
1972 1925
1973 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1926 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1974 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 1927 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1928
1929#if HAVE_AT
1975 1930
1976 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1931 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1932 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1978 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1933 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1934 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1935 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1936 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1937 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1938 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1939
1940 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1941 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1942 req->result = req->wd && SINGLEDOT (req->ptr1)
1943 ? rmdir (req->wd->str)
1944 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1945 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1946 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1947 req->result = req->wd && SINGLEDOT (req->ptr1)
1948 ? rename (req->wd->str, req->ptr2)
1949 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1950 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1951 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1952 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1953 case EIO_READLINK: ALLOC (PATH_MAX);
1954 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1955 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1956 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1957 case EIO_UTIME:
1958 case EIO_FUTIME:
1959 {
1960 struct timespec ts[2];
1961 struct timespec *times;
1962
1963 if (req->nv1 != -1. || req->nv2 != -1.)
1964 {
1965 ts[0].tv_sec = req->nv1;
1966 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1967 ts[1].tv_sec = req->nv2;
1968 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1969
1970 times = ts;
1971 }
1972 else
1973 times = 0;
1974
1975 req->result = req->type == EIO_FUTIME
1976 ? futimens (req->int1, times)
1977 : utimensat (dirfd, req->ptr1, times, 0);
1978 }
1979 break;
1980
1981#else
1982
1983 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1984 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1985 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1986 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1987 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1988 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1989 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1990 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1991
1992 case EIO_UNLINK: req->result = unlink (path ); break;
1993 case EIO_RMDIR: req->result = rmdir (path ); break;
1994 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1995 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1996 case EIO_LINK: req->result = link (path , req->ptr2); break;
1997 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1998 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1999 case EIO_READLINK: ALLOC (PATH_MAX);
2000 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2001 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2002 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2003
2004 case EIO_UTIME:
2005 case EIO_FUTIME:
2006 {
2007 struct timeval tv[2];
2008 struct timeval *times;
2009
2010 if (req->nv1 != -1. || req->nv2 != -1.)
2011 {
2012 tv[0].tv_sec = req->nv1;
2013 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2014 tv[1].tv_sec = req->nv2;
2015 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2016
2017 times = tv;
2018 }
2019 else
2020 times = 0;
2021
2022 req->result = req->type == EIO_FUTIME
2023 ? futimes (req->int1, times)
2024 : utimes (req->ptr1, times);
2025 }
2026 break;
2027
2028#endif
2029
2030 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2031 {
2032 ALLOC (req->result);
2033 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2034 }
2035 break;
2036
1980 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2037 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1981 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2038 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1982 2039
1983 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1984 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1985 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2040 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1986 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2041 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1987 2042
1988 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1989 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2043 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1990 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1991 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2044 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1992 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1993 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2045 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1994 2046
1995 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1996 case EIO_CLOSE: req->result = close (req->int1); break; 2047 case EIO_CLOSE: req->result = close (req->int1); break;
1997 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2048 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1998 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1999 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2000 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2001 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2002 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2003 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2004 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2005
2006 case EIO_REALPATH: eio__realpath (req, self); break;
2007
2008 case EIO_READLINK: ALLOC (PATH_MAX);
2009 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2010
2011 case EIO_SYNC: req->result = 0; sync (); break; 2049 case EIO_SYNC: req->result = 0; sync (); break;
2012 case EIO_FSYNC: req->result = fsync (req->int1); break; 2050 case EIO_FSYNC: req->result = fsync (req->int1); break;
2013 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2051 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2052 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2053 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2014 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2054 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2055 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2056 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2057 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2018 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2019 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2058 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020 2059
2021 case EIO_READDIR: eio__scandir (req, self); break; 2060 case EIO_READDIR: eio__scandir (req, self); break;
2022 2061
2023 case EIO_BUSY: 2062 case EIO_BUSY:
2033 req->result = select (0, 0, 0, 0, &tv); 2072 req->result = select (0, 0, 0, 0, &tv);
2034 } 2073 }
2035#endif 2074#endif
2036 break; 2075 break;
2037 2076
2038 case EIO_UTIME:
2039 case EIO_FUTIME:
2040 {
2041 struct timeval tv[2];
2042 struct timeval *times;
2043
2044 if (req->nv1 != -1. || req->nv2 != -1.)
2045 {
2046 tv[0].tv_sec = req->nv1;
2047 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2048 tv[1].tv_sec = req->nv2;
2049 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2050
2051 times = tv;
2052 }
2053 else
2054 times = 0;
2055
2056 req->result = req->type == EIO_FUTIME
2057 ? futimes (req->int1, times)
2058 : utimes (req->ptr1, times);
2059 }
2060 break;
2061
2062 case EIO_GROUP: 2077 case EIO_GROUP:
2063 abort (); /* handled in eio_request */ 2078 abort (); /* handled in eio_request */
2064 2079
2065 case EIO_NOP: 2080 case EIO_NOP:
2066 req->result = 0; 2081 req->result = 0;
2069 case EIO_CUSTOM: 2084 case EIO_CUSTOM:
2070 req->feed (req); 2085 req->feed (req);
2071 break; 2086 break;
2072 2087
2073 default: 2088 default:
2074 errno = ENOSYS;
2075 req->result = -1; 2089 req->result = EIO_ENOSYS ();
2076 break; 2090 break;
2077 } 2091 }
2078 2092
2079 req->errorno = errno; 2093 req->errorno = errno;
2080} 2094}
2081 2095
2082#ifndef EIO_NO_WRAPPERS 2096#ifndef EIO_NO_WRAPPERS
2083 2097
2098eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2099{
2100 REQ (EIO_WD_OPEN); PATH; SEND;
2101}
2102
2103eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2104{
2105 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2106}
2107
2084eio_req *eio_nop (int pri, eio_cb cb, void *data) 2108eio_req *eio_nop (int pri, eio_cb cb, void *data)
2085{ 2109{
2086 REQ (EIO_NOP); SEND; 2110 REQ (EIO_NOP); SEND;
2087} 2111}
2088 2112
2104eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2128eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105{ 2129{
2106 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2130 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107} 2131}
2108 2132
2133eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2134{
2135 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2136}
2137
2138eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2139{
2140 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2141}
2142
2143eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2144{
2145 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2146}
2147
2109eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2148eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110{ 2149{
2111 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2150 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112} 2151}
2113 2152
2119eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2158eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2120{ 2159{
2121 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2160 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122} 2161}
2123 2162
2124eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2125{
2126 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2127}
2128
2129eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2163eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2130{ 2164{
2131 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2165 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2132} 2166}
2133 2167
2134eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2135{
2136 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2137}
2138
2139eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2168eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2140{ 2169{
2141 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2170 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2142} 2171}
2143 2172
2144eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2173eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2145{ 2174{
2146 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2175 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2176}
2177
2178eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2179{
2180 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2147} 2181}
2148 2182
2149eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2183eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2150{ 2184{
2151 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2185 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2369/* misc garbage */ 2403/* misc garbage */
2370 2404
2371eio_ssize_t 2405eio_ssize_t
2372eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2406eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373{ 2407{
2374 etp_worker wrk;
2375 eio_ssize_t ret;
2376
2377 wrk.dbuf = 0;
2378
2379 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2408 return eio__sendfile (ofd, ifd, offset, count);
2380
2381 if (wrk.dbuf)
2382 free (wrk.dbuf);
2383
2384 return ret;
2385} 2409}
2386 2410

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines