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

Comparing libeio/eio.c (file contents):
Revision 1.86 by root, Thu Jul 14 18:30:10 2011 UTC vs.
Revision 1.128 by root, Mon Feb 18 03:16:30 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 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>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#include <sys/statvfs.h>
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H 65#if HAVE_STDINT_H
67# include <stdint.h> 66# include <stdint.h>
68#endif 67#endif
69 68
70#ifndef ECANCELED 69#ifndef ECANCELED
71# define ECANCELED EDOM 70# define ECANCELED EDOM
72#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
73 79
74static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
75 81
76#ifndef EIO_FINISH 82#ifndef EIO_FINISH
77# 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
96 102
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98 104
99#ifdef _WIN32 105#ifdef _WIN32
100 106
107 #undef PAGESIZE
101 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
102 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
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)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
104 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf)
106 #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))
107 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
108 #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))
109 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 ()
110 #define chown(path,uid,gid) EIO_ENOSYS () 127 #define chown(path,uid,gid) EIO_ENOSYS ()
111 #define fchown(fd,uid,gid) EIO_ENOSYS () 128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
112 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
113 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
114 #define mknod(path,mode,dev) EIO_ENOSYS () 131 #define mknod(path,mode,dev) EIO_ENOSYS ()
115 #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 }
116 202
117 /* we could even stat and see if it exists */ 203 /* we could even stat and see if it exists */
118 static int 204 static int
119 symlink (const char *old, const char *neu) 205 symlink (const char *old, const char *neu)
120 { 206 {
207 #if WINVER >= 0x0600
121 if (CreateSymbolicLink (neu, old, 1)) 208 if (CreateSymbolicLink (neu, old, 1))
122 return 0; 209 return 0;
123 210
124 if (CreateSymbolicLink (neu, old, 0)) 211 if (CreateSymbolicLink (neu, old, 0))
125 return 0; 212 return 0;
213 #endif
126 214
127 return EIO_ERRNO (ENOENT, -1); 215 return EIO_ERRNO (ENOENT, -1);
128 } 216 }
129 217
218 /* POSIX API only */
219 #define CreateHardLink(neu,old,flags) 0
220 #define CreateSymbolicLink(neu,old,flags) 0
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
130#else 232#else
131 233
132 #include <sys/time.h> 234 #include <sys/time.h>
133 #include <sys/select.h> 235 #include <sys/select.h>
134 #include <sys/statvfs.h>
135 #include <unistd.h> 236 #include <unistd.h>
136 #include <utime.h>
137 #include <signal.h> 237 #include <signal.h>
138 #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
139 248
140 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 249 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
141 #include <sys/mman.h> 250 #include <sys/mman.h>
142 #endif 251 #endif
143 252
253 #define D_NAME(entp) entp->d_name
254
144 /* 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 */
145 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 256 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
146 #define _DIRENT_HAVE_D_TYPE /* sigh */ 257 #define _DIRENT_HAVE_D_TYPE /* sigh */
147 #define D_INO(de) (de)->d_fileno 258 #define D_INO(de) (de)->d_fileno
148 #define D_NAMLEN(de) (de)->d_namlen 259 #define D_NAMLEN(de) (de)->d_namlen
149 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 260 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
150 #define D_INO(de) (de)->d_ino 261 #define D_INO(de) (de)->d_ino
161 272
162 #ifndef EIO_STRUCT_DIRENT 273 #ifndef EIO_STRUCT_DIRENT
163 #define EIO_STRUCT_DIRENT struct dirent 274 #define EIO_STRUCT_DIRENT struct dirent
164 #endif 275 #endif
165 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>
166#endif 289#endif
167 290
168#if HAVE_SENDFILE 291#if HAVE_SENDFILE
169# if __linux 292# if __linux
170# include <sys/sendfile.h> 293# include <sys/sendfile.h>
185#endif 308#endif
186#ifndef D_INO 309#ifndef D_INO
187# define D_INO(de) 0 310# define D_INO(de) 0
188#endif 311#endif
189#ifndef D_NAMLEN 312#ifndef D_NAMLEN
190# define D_NAMLEN(de) strlen ((de)->d_name) 313# define D_NAMLEN(entp) strlen (D_NAME (entp))
191#endif 314#endif
192 315
193/* used for struct dirent, AIX doesn't provide it */ 316/* used for struct dirent, AIX doesn't provide it */
194#ifndef NAME_MAX 317#ifndef NAME_MAX
195# define NAME_MAX 4096 318# define NAME_MAX 4096
201#endif 324#endif
202 325
203/* buffer size for various temporary buffers */ 326/* buffer size for various temporary buffers */
204#define EIO_BUFSIZE 65536 327#define EIO_BUFSIZE 65536
205 328
206#define dBUF \ 329#define dBUF \
207 char *eio_buf; \
208 ETP_WORKER_LOCK (self); \
209 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 330 char *eio_buf = malloc (EIO_BUFSIZE); \
210 ETP_WORKER_UNLOCK (self); \
211 errno = ENOMEM; \ 331 errno = ENOMEM; \
212 if (!eio_buf) \ 332 if (!eio_buf) \
213 return -1; 333 return -1
334
335#define FUBd \
336 free (eio_buf)
214 337
215#define EIO_TICKS ((1000000 + 1023) >> 10) 338#define EIO_TICKS ((1000000 + 1023) >> 10)
339
340/*****************************************************************************/
341
342struct tmpbuf
343{
344 void *ptr;
345 int len;
346};
347
348static void *
349tmpbuf_get (struct tmpbuf *buf, int len)
350{
351 if (buf->len < len)
352 {
353 free (buf->ptr);
354 buf->ptr = malloc (buf->len = len);
355 }
356
357 return buf->ptr;
358}
359
360struct tmpbuf;
361
362#if _POSIX_VERSION >= 200809L
363 #define HAVE_AT 1
364 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
365 #ifndef O_SEARCH
366 #define O_SEARCH O_RDONLY
367 #endif
368#else
369 #define HAVE_AT 0
370 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
371#endif
372
373struct eio_pwd
374{
375#if HAVE_AT
376 int fd;
377#endif
378 int len;
379 char str[1]; /* actually, a 0-terminated canonical path */
380};
381
382/*****************************************************************************/
216 383
217#define ETP_PRI_MIN EIO_PRI_MIN 384#define ETP_PRI_MIN EIO_PRI_MIN
218#define ETP_PRI_MAX EIO_PRI_MAX 385#define ETP_PRI_MAX EIO_PRI_MAX
219 386
220struct etp_worker; 387struct etp_worker;
224static int eio_finish (eio_req *req); 391static int eio_finish (eio_req *req);
225#define ETP_FINISH(req) eio_finish (req) 392#define ETP_FINISH(req) eio_finish (req)
226static void eio_execute (struct etp_worker *self, eio_req *req); 393static void eio_execute (struct etp_worker *self, eio_req *req);
227#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 394#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
228 395
229#define ETP_WORKER_CLEAR(req) \
230 if (wrk->dbuf) \
231 { \
232 free (wrk->dbuf); \
233 wrk->dbuf = 0; \
234 } \
235 \
236 if (wrk->dirp) \
237 { \
238 closedir (wrk->dirp); \
239 wrk->dirp = 0; \
240 }
241
242#define ETP_WORKER_COMMON \
243 void *dbuf; \
244 DIR *dirp;
245
246/*****************************************************************************/ 396/*****************************************************************************/
247 397
248#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 398#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
249 399
250/* calculate time difference in ~1/EIO_TICKS of a second */ 400/* calculate time difference in ~1/EIO_TICKS of a second */
261static void (*done_poll_cb) (void); 411static void (*done_poll_cb) (void);
262 412
263static unsigned int max_poll_time; /* reslock */ 413static unsigned int max_poll_time; /* reslock */
264static unsigned int max_poll_reqs; /* reslock */ 414static unsigned int max_poll_reqs; /* reslock */
265 415
266static volatile unsigned int nreqs; /* reqlock */ 416static unsigned int nreqs; /* reqlock */
267static volatile unsigned int nready; /* reqlock */ 417static unsigned int nready; /* reqlock */
268static volatile unsigned int npending; /* reqlock */ 418static unsigned int npending; /* reqlock */
269static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 419static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
270static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 420static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
271 421
272static xmutex_t wrklock; 422static xmutex_t wrklock;
273static xmutex_t reslock; 423static xmutex_t reslock;
274static xmutex_t reqlock; 424static xmutex_t reqlock;
275static xcond_t reqwait; 425static xcond_t reqwait;
276 426
277#if !HAVE_PREADWRITE
278/*
279 * make our pread/pwrite emulation safe against themselves, but not against
280 * normal read/write by using a mutex. slows down execution a lot,
281 * but that's your problem, not mine.
282 */
283static xmutex_t preadwritelock = X_MUTEX_INIT;
284#endif
285
286typedef struct etp_worker 427typedef struct etp_worker
287{ 428{
429 struct tmpbuf tmpbuf;
430
288 /* locked by wrklock */ 431 /* locked by wrklock */
289 struct etp_worker *prev, *next; 432 struct etp_worker *prev, *next;
290 433
291 xthread_t tid; 434 xthread_t tid;
292 435
293 /* locked by reslock, reqlock or wrklock */ 436#ifdef ETP_WORKER_COMMON
294 ETP_REQ *req; /* currently processed request */
295
296 ETP_WORKER_COMMON 437 ETP_WORKER_COMMON
438#endif
297} etp_worker; 439} etp_worker;
298 440
299static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 441static etp_worker wrk_first; /* NOT etp */
300 442
301#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 443#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
302#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 444#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
303 445
304/* worker threads management */ 446/* worker threads management */
305 447
306static void ecb_cold 448static void
307etp_worker_clear (etp_worker *wrk) 449etp_worker_clear (etp_worker *wrk)
308{ 450{
309 ETP_WORKER_CLEAR (wrk);
310} 451}
311 452
312static void ecb_cold 453static void ecb_cold
313etp_worker_free (etp_worker *wrk) 454etp_worker_free (etp_worker *wrk)
314{ 455{
456 free (wrk->tmpbuf.ptr);
457
315 wrk->next->prev = wrk->prev; 458 wrk->next->prev = wrk->prev;
316 wrk->prev->next = wrk->next; 459 wrk->prev->next = wrk->next;
317 460
318 free (wrk); 461 free (wrk);
319} 462}
375} etp_reqq; 518} etp_reqq;
376 519
377static etp_reqq req_queue; 520static etp_reqq req_queue;
378static etp_reqq res_queue; 521static etp_reqq res_queue;
379 522
523static void ecb_noinline ecb_cold
524reqq_init (etp_reqq *q)
525{
526 int pri;
527
528 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
529 q->qs[pri] = q->qe[pri] = 0;
530
531 q->size = 0;
532}
533
380static int ecb_noinline 534static int ecb_noinline
381reqq_push (etp_reqq *q, ETP_REQ *req) 535reqq_push (etp_reqq *q, ETP_REQ *req)
382{ 536{
383 int pri = req->pri; 537 int pri = req->pri;
384 req->next = 0; 538 req->next = 0;
418 } 572 }
419 573
420 abort (); 574 abort ();
421} 575}
422 576
423static void ecb_cold 577static int ecb_cold
424etp_thread_init (void) 578etp_init (void (*want_poll)(void), void (*done_poll)(void))
425{ 579{
426#if !HAVE_PREADWRITE
427 X_MUTEX_CREATE (preadwritelock);
428#endif
429 X_MUTEX_CREATE (wrklock); 580 X_MUTEX_CREATE (wrklock);
430 X_MUTEX_CREATE (reslock); 581 X_MUTEX_CREATE (reslock);
431 X_MUTEX_CREATE (reqlock); 582 X_MUTEX_CREATE (reqlock);
432 X_COND_CREATE (reqwait); 583 X_COND_CREATE (reqwait);
433}
434 584
435static void ecb_cold 585 reqq_init (&req_queue);
436etp_atfork_prepare (void) 586 reqq_init (&res_queue);
437{
438}
439 587
440static void ecb_cold 588 wrk_first.next =
441etp_atfork_parent (void) 589 wrk_first.prev = &wrk_first;
442{
443}
444
445static void ecb_cold
446etp_atfork_child (void)
447{
448 ETP_REQ *prv;
449
450 while ((prv = reqq_shift (&req_queue)))
451 ETP_DESTROY (prv);
452
453 while ((prv = reqq_shift (&res_queue)))
454 ETP_DESTROY (prv);
455
456 while (wrk_first.next != &wrk_first)
457 {
458 etp_worker *wrk = wrk_first.next;
459
460 if (wrk->req)
461 ETP_DESTROY (wrk->req);
462
463 etp_worker_clear (wrk);
464 etp_worker_free (wrk);
465 }
466 590
467 started = 0; 591 started = 0;
468 idle = 0; 592 idle = 0;
469 nreqs = 0; 593 nreqs = 0;
470 nready = 0; 594 nready = 0;
471 npending = 0; 595 npending = 0;
472 596
473 etp_thread_init ();
474}
475
476static void ecb_cold
477etp_once_init (void)
478{
479 etp_thread_init ();
480 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
481}
482
483static int ecb_cold
484etp_init (void (*want_poll)(void), void (*done_poll)(void))
485{
486 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
487
488 pthread_once (&doinit, etp_once_init);
489
490 want_poll_cb = want_poll; 597 want_poll_cb = want_poll;
491 done_poll_cb = done_poll; 598 done_poll_cb = done_poll;
492 599
493 return 0; 600 return 0;
494} 601}
503 /*TODO*/ 610 /*TODO*/
504 assert (("unable to allocate worker thread data", wrk)); 611 assert (("unable to allocate worker thread data", wrk));
505 612
506 X_LOCK (wrklock); 613 X_LOCK (wrklock);
507 614
508 if (thread_create (&wrk->tid, etp_proc, (void *)wrk)) 615 if (xthread_create (&wrk->tid, etp_proc, (void *)wrk))
509 { 616 {
510 wrk->prev = &wrk_first; 617 wrk->prev = &wrk_first;
511 wrk->next = wrk_first.next; 618 wrk->next = wrk_first.next;
512 wrk_first.next->prev = wrk; 619 wrk_first.next->prev = wrk;
513 wrk_first.next = wrk; 620 wrk_first.next = wrk;
533} 640}
534 641
535static void ecb_cold 642static void ecb_cold
536etp_end_thread (void) 643etp_end_thread (void)
537{ 644{
538 eio_req *req = calloc (1, sizeof (eio_req)); 645 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
539 646
540 req->type = -1; 647 req->type = -1;
541 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 648 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
542 649
543 X_LOCK (reqlock); 650 X_LOCK (reqlock);
870} 977}
871 978
872/*****************************************************************************/ 979/*****************************************************************************/
873/* work around various missing functions */ 980/* work around various missing functions */
874 981
875#if !HAVE_PREADWRITE
876# undef pread
877# undef pwrite
878# define pread eio__pread
879# define pwrite eio__pwrite
880
881static ssize_t
882eio__pread (int fd, void *buf, size_t count, off_t offset)
883{
884 ssize_t res;
885 off_t ooffset;
886
887 X_LOCK (preadwritelock);
888 ooffset = lseek (fd, 0, SEEK_CUR);
889 lseek (fd, offset, SEEK_SET);
890 res = read (fd, buf, count);
891 lseek (fd, ooffset, SEEK_SET);
892 X_UNLOCK (preadwritelock);
893
894 return res;
895}
896
897static ssize_t
898eio__pwrite (int fd, void *buf, size_t count, off_t offset)
899{
900 ssize_t res;
901 off_t ooffset;
902
903 X_LOCK (preadwritelock);
904 ooffset = lseek (fd, 0, SEEK_CUR);
905 lseek (fd, offset, SEEK_SET);
906 res = write (fd, buf, count);
907 lseek (fd, ooffset, SEEK_SET);
908 X_UNLOCK (preadwritelock);
909
910 return res;
911}
912#endif
913
914#ifndef HAVE_UTIMES 982#ifndef HAVE_UTIMES
915 983
916# undef utimes 984# undef utimes
917# define utimes(path,times) eio__utimes (path, times) 985# define utimes(path,times) eio__utimes (path, times)
918 986
950 1018
951#if !HAVE_FDATASYNC 1019#if !HAVE_FDATASYNC
952# undef fdatasync 1020# undef fdatasync
953# define fdatasync(fd) fsync (fd) 1021# define fdatasync(fd) fsync (fd)
954#endif 1022#endif
1023
1024static int
1025eio__syncfs (int fd)
1026{
1027 int res;
1028
1029#if HAVE_SYS_SYNCFS
1030 res = (int)syscall (__NR_syncfs, (int)(fd));
1031#else
1032 res = EIO_ENOSYS ();
1033#endif
1034
1035 if (res < 0 && errno == ENOSYS && fd >= 0)
1036 sync ();
1037
1038 return res;
1039}
955 1040
956/* sync_file_range always needs emulation */ 1041/* sync_file_range always needs emulation */
957static int 1042static int
958eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1043eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
959{ 1044{
982} 1067}
983 1068
984static int 1069static int
985eio__fallocate (int fd, int mode, off_t offset, size_t len) 1070eio__fallocate (int fd, int mode, off_t offset, size_t len)
986{ 1071{
987#if HAVE_FALLOCATE 1072#if HAVE_LINUX_FALLOCATE
988 return fallocate (fd, mode, offset, len); 1073 return fallocate (fd, mode, offset, len);
989#else 1074#else
990 errno = ENOSYS; 1075 return EIO_ENOSYS ();
991 return -1;
992#endif 1076#endif
993} 1077}
994 1078
995#if !HAVE_READAHEAD 1079#if !HAVE_READAHEAD
996# undef readahead 1080# undef readahead
997# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1081# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
998 1082
999static ssize_t 1083static eio_ssize_t
1000eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1084eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
1001{ 1085{
1002 size_t todo = count; 1086 size_t todo = count;
1003 dBUF; 1087 dBUF;
1004 1088
1009 pread (fd, eio_buf, len, offset); 1093 pread (fd, eio_buf, len, offset);
1010 offset += len; 1094 offset += len;
1011 todo -= len; 1095 todo -= len;
1012 } 1096 }
1013 1097
1014 errno = 0; 1098 FUBd;
1099
1100 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1101 /* but not for e.g. EIO or eof, so we also never fail */
1015 return count; 1102 return 0;
1016} 1103}
1017 1104
1018#endif 1105#endif
1019 1106
1020/* sendfile always needs emulation */ 1107/* sendfile always needs emulation */
1021static ssize_t 1108static eio_ssize_t
1022eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1109eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1023{ 1110{
1024 ssize_t written = 0; 1111 eio_ssize_t written = 0;
1025 ssize_t res; 1112 eio_ssize_t res;
1026 1113
1027 if (!count) 1114 if (!count)
1028 return 0; 1115 return 0;
1029 1116
1030 for (;;) 1117 for (;;)
1055 1142
1056 /* according to source inspection, this is correct, and useful behaviour */ 1143 /* according to source inspection, this is correct, and useful behaviour */
1057 if (sbytes) 1144 if (sbytes)
1058 res = sbytes; 1145 res = sbytes;
1059 1146
1060# elif defined (__APPLE__) 1147# elif defined __APPLE__
1061 off_t sbytes = count; 1148 off_t sbytes = count;
1062 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1149 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1063 1150
1064 /* according to the manpage, sbytes is always valid */ 1151 /* according to the manpage, sbytes is always valid */
1065 if (sbytes) 1152 if (sbytes)
1092 HANDLE h = TO_SOCKET (ifd); 1179 HANDLE h = TO_SOCKET (ifd);
1093 SetFilePointer (h, offset, 0, FILE_BEGIN); 1180 SetFilePointer (h, offset, 0, FILE_BEGIN);
1094 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1181 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1095 1182
1096#else 1183#else
1097 res = -1; 1184 res = EIO_ENOSYS ();
1098 errno = ENOSYS;
1099#endif 1185#endif
1100 1186
1101 /* we assume sendfile can copy at least 128mb in one go */ 1187 /* we assume sendfile can copy at least 128mb in one go */
1102 if (res <= 128 * 1024 * 1024) 1188 if (res <= 128 * 1024 * 1024)
1103 { 1189 {
1125 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1211 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1126 /* BSDs */ 1212 /* BSDs */
1127#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1213#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1128 || errno == ENOTSUP 1214 || errno == ENOTSUP
1129#endif 1215#endif
1216#ifdef EOPNOTSUPP /* windows */
1130 || errno == EOPNOTSUPP /* BSDs */ 1217 || errno == EOPNOTSUPP /* BSDs */
1218#endif
1131#if __solaris 1219#if __solaris
1132 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1220 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1133#endif 1221#endif
1134 ) 1222 )
1135 ) 1223 )
1139 1227
1140 res = 0; 1228 res = 0;
1141 1229
1142 while (count) 1230 while (count)
1143 { 1231 {
1144 ssize_t cnt; 1232 eio_ssize_t cnt;
1145 1233
1146 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1234 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1147 1235
1148 if (cnt <= 0) 1236 if (cnt <= 0)
1149 { 1237 {
1161 1249
1162 offset += cnt; 1250 offset += cnt;
1163 res += cnt; 1251 res += cnt;
1164 count -= cnt; 1252 count -= cnt;
1165 } 1253 }
1254
1255 FUBd;
1166 } 1256 }
1167 1257
1168 return res; 1258 return res;
1169} 1259}
1170 1260
1197 /* round up length */ 1287 /* round up length */
1198 *length = (*length + mask) & ~mask; 1288 *length = (*length + mask) & ~mask;
1199} 1289}
1200 1290
1201#if !_POSIX_MEMLOCK 1291#if !_POSIX_MEMLOCK
1202# define eio__mlockall(a) eio_nosyscall() 1292# define eio__mlockall(a) EIO_ENOSYS ()
1203#else 1293#else
1204 1294
1205static int 1295static int
1206eio__mlockall (int flags) 1296eio__mlockall (int flags)
1207{ 1297{
1286 1376
1287/*****************************************************************************/ 1377/*****************************************************************************/
1288/* requests implemented outside eio_execute, because they are so large */ 1378/* requests implemented outside eio_execute, because they are so large */
1289 1379
1290static void 1380static void
1291eio__realpath (eio_req *req, etp_worker *self) 1381eio__lseek (eio_req *req)
1292{ 1382{
1293 char *rel = req->ptr1; 1383 /* this usually gets optimised away completely, or your compiler sucks, */
1384 /* or the whence constants really are not 0, 1, 2 */
1385 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
1386 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
1387 : req->int2 == EIO_SEEK_END ? SEEK_END
1388 : req->int2;
1389
1390 req->offs = lseek (req->int1, req->offs, whence);
1391 req->result = req->offs == (off_t)-1 ? -1 : 0;
1392}
1393
1394/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1395static int
1396eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1397{
1398 const char *rel = path;
1294 char *res; 1399 char *res;
1295 char *tmp1, *tmp2; 1400 char *tmp1, *tmp2;
1296#if SYMLOOP_MAX > 32 1401#if SYMLOOP_MAX > 32
1297 int symlinks = SYMLOOP_MAX; 1402 int symlinks = SYMLOOP_MAX;
1298#else 1403#else
1299 int symlinks = 32; 1404 int symlinks = 32;
1300#endif 1405#endif
1301 1406
1302 req->result = -1;
1303
1304 errno = EINVAL; 1407 errno = EINVAL;
1305 if (!rel) 1408 if (!rel)
1306 return; 1409 return -1;
1307 1410
1308 errno = ENOENT; 1411 errno = ENOENT;
1309 if (!*rel) 1412 if (!*rel)
1310 return; 1413 return -1;
1311 1414
1312 if (!req->ptr2) 1415 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1313 {
1314 X_LOCK (wrklock);
1315 req->flags |= EIO_FLAG_PTR2_FREE;
1316 X_UNLOCK (wrklock);
1317 req->ptr2 = malloc (PATH_MAX * 3);
1318
1319 errno = ENOMEM;
1320 if (!req->ptr2)
1321 return;
1322 }
1323
1324 res = req->ptr2;
1325 tmp1 = res + PATH_MAX; 1416 tmp1 = res + PATH_MAX;
1326 tmp2 = tmp1 + PATH_MAX; 1417 tmp2 = tmp1 + PATH_MAX;
1327 1418
1328#if 0 /* disabled, the musl way to do things is just too racy */ 1419#if 0 /* disabled, the musl way to do things is just too racy */
1329#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1420#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1333 1424
1334 if (fd >= 0) 1425 if (fd >= 0)
1335 { 1426 {
1336 sprintf (tmp1, "/proc/self/fd/%d", fd); 1427 sprintf (tmp1, "/proc/self/fd/%d", fd);
1337 req->result = readlink (tmp1, res, PATH_MAX); 1428 req->result = readlink (tmp1, res, PATH_MAX);
1429 /* here we should probably stat the open file and the disk file, to make sure they still match */
1338 close (fd); 1430 close (fd);
1339
1340 /* here we should probably stat the open file and the disk file, to make sure they still match */
1341 1431
1342 if (req->result > 0) 1432 if (req->result > 0)
1343 goto done; 1433 goto done;
1344 } 1434 }
1345 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1435 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1346 return; 1436 return -1;
1347 } 1437 }
1348#endif 1438#endif
1349#endif 1439#endif
1350 1440
1351 if (*rel != '/') 1441 if (*rel != '/')
1352 { 1442 {
1443 int len;
1444
1445 errno = ENOENT;
1446 if (wd == EIO_INVALID_WD)
1447 return -1;
1448
1449 if (wd == EIO_CWD)
1450 {
1353 if (!getcwd (res, PATH_MAX)) 1451 if (!getcwd (res, PATH_MAX))
1354 return; 1452 return -1;
1453
1454 len = strlen (res);
1455 }
1456 else
1457 memcpy (res, wd->str, len = wd->len);
1355 1458
1356 if (res [1]) /* only use if not / */ 1459 if (res [1]) /* only use if not / */
1357 res += strlen (res); 1460 res += len;
1358 } 1461 }
1359 1462
1360 while (*rel) 1463 while (*rel)
1361 { 1464 {
1362 ssize_t len, linklen; 1465 eio_ssize_t len, linklen;
1363 char *beg = rel; 1466 const char *beg = rel;
1364 1467
1365 while (*rel && *rel != '/') 1468 while (*rel && *rel != '/')
1366 ++rel; 1469 ++rel;
1367 1470
1368 len = rel - beg; 1471 len = rel - beg;
1380 1483
1381 if (beg [1] == '.' && len == 2) 1484 if (beg [1] == '.' && len == 2)
1382 { 1485 {
1383 /* .. - back up one component, if possible */ 1486 /* .. - back up one component, if possible */
1384 1487
1385 while (res != req->ptr2) 1488 while (res != tmpbuf->ptr)
1386 if (*--res == '/') 1489 if (*--res == '/')
1387 break; 1490 break;
1388 1491
1389 continue; 1492 continue;
1390 } 1493 }
1391 } 1494 }
1392 1495
1393 errno = ENAMETOOLONG; 1496 errno = ENAMETOOLONG;
1394 if (res + 1 + len + 1 >= tmp1) 1497 if (res + 1 + len + 1 >= tmp1)
1395 return; 1498 return -1;
1396 1499
1397 /* copy one component */ 1500 /* copy one component */
1398 *res = '/'; 1501 *res = '/';
1399 memcpy (res + 1, beg, len); 1502 memcpy (res + 1, beg, len);
1400 1503
1401 /* zero-terminate, for readlink */ 1504 /* zero-terminate, for readlink */
1402 res [len + 1] = 0; 1505 res [len + 1] = 0;
1403 1506
1404 /* now check if it's a symlink */ 1507 /* now check if it's a symlink */
1405 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1508 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1406 1509
1407 if (linklen < 0) 1510 if (linklen < 0)
1408 { 1511 {
1409 if (errno != EINVAL) 1512 if (errno != EINVAL)
1410 return; 1513 return -1;
1411 1514
1412 /* it's a normal directory. hopefully */ 1515 /* it's a normal directory. hopefully */
1413 res += len + 1; 1516 res += len + 1;
1414 } 1517 }
1415 else 1518 else
1417 /* yay, it was a symlink - build new path in tmp2 */ 1520 /* yay, it was a symlink - build new path in tmp2 */
1418 int rellen = strlen (rel); 1521 int rellen = strlen (rel);
1419 1522
1420 errno = ENAMETOOLONG; 1523 errno = ENAMETOOLONG;
1421 if (linklen + 1 + rellen >= PATH_MAX) 1524 if (linklen + 1 + rellen >= PATH_MAX)
1422 return; 1525 return -1;
1423 1526
1424 errno = ELOOP; 1527 errno = ELOOP;
1425 if (!--symlinks) 1528 if (!--symlinks)
1426 return; 1529 return -1;
1427 1530
1428 if (*tmp1 == '/') 1531 if (*tmp1 == '/')
1429 res = req->ptr2; /* symlink resolves to an absolute path */ 1532 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1430 1533
1431 /* we need to be careful, as rel might point into tmp2 already */ 1534 /* we need to be careful, as rel might point into tmp2 already */
1432 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1535 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1433 tmp2 [linklen] = '/'; 1536 tmp2 [linklen] = '/';
1434 memcpy (tmp2, tmp1, linklen); 1537 memcpy (tmp2, tmp1, linklen);
1436 rel = tmp2; 1539 rel = tmp2;
1437 } 1540 }
1438 } 1541 }
1439 1542
1440 /* special case for the lone root path */ 1543 /* special case for the lone root path */
1441 if (res == req->ptr2) 1544 if (res == tmpbuf->ptr)
1442 *res++ = '/'; 1545 *res++ = '/';
1443 1546
1444 req->result = res - (char *)req->ptr2; 1547 return res - (char *)tmpbuf->ptr;
1445
1446done:
1447 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1448} 1548}
1449 1549
1450static signed char 1550static signed char
1451eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1551eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1452{ 1552{
1460 1560
1461#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1561#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1462#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1562#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1463 1563
1464static void 1564static void
1465eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1565eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1466{ 1566{
1467 unsigned char bits [9 + sizeof (ino_t) * 8]; 1567 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1468 unsigned char *bit = bits; 1568 unsigned char *bit = bits;
1469 1569
1470 assert (CHAR_BIT == 8); 1570 assert (CHAR_BIT == 8);
1471 assert (sizeof (eio_dirent) * 8 < 256); 1571 assert (sizeof (eio_dirent) * 8 < 256);
1472 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1572 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1474 1574
1475 if (size <= EIO_SORT_FAST) 1575 if (size <= EIO_SORT_FAST)
1476 return; 1576 return;
1477 1577
1478 /* first prepare an array of bits to test in our radix sort */ 1578 /* first prepare an array of bits to test in our radix sort */
1479 /* try to take endianness into account, as well as differences in ino_t sizes */ 1579 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1480 /* inode_bits must contain all inodes ORed together */ 1580 /* inode_bits must contain all inodes ORed together */
1481 /* which is used to skip bits that are 0 everywhere, which is very common */ 1581 /* which is used to skip bits that are 0 everywhere, which is very common */
1482 { 1582 {
1483 ino_t endianness; 1583 eio_ino_t endianness;
1484 int i, j; 1584 int i, j;
1485 1585
1486 /* we store the byte offset of byte n into byte n of "endianness" */ 1586 /* we store the byte offset of byte n into byte n of "endianness" */
1487 for (i = 0; i < sizeof (ino_t); ++i) 1587 for (i = 0; i < sizeof (eio_ino_t); ++i)
1488 ((unsigned char *)&endianness)[i] = i; 1588 ((unsigned char *)&endianness)[i] = i;
1489 1589
1490 *bit++ = 0; 1590 *bit++ = 0;
1491 1591
1492 for (i = 0; i < sizeof (ino_t); ++i) 1592 for (i = 0; i < sizeof (eio_ino_t); ++i)
1493 { 1593 {
1494 /* shifting off the byte offsets out of "endianness" */ 1594 /* shifting off the byte offsets out of "endianness" */
1495 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1595 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1496 endianness >>= 8; 1596 endianness >>= 8;
1497 1597
1498 for (j = 0; j < 8; ++j) 1598 for (j = 0; j < 8; ++j)
1499 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1599 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1500 *bit++ = offs + j; 1600 *bit++ = offs + j;
1501 } 1601 }
1502 1602
1503 for (j = 0; j < 8; ++j) 1603 for (j = 0; j < 8; ++j)
1504 if (score_bits & (1 << j)) 1604 if (score_bits & (1 << j))
1505 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1605 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1506 } 1606 }
1507 1607
1508 /* now actually do the sorting (a variant of MSD radix sort) */ 1608 /* now actually do the sorting (a variant of MSD radix sort) */
1509 { 1609 {
1510 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1610 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1511 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1611 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1512 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1612 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1513 int stk_idx = 0; 1613 int stk_idx = 0;
1514 1614
1515 base_stk [stk_idx] = dents; 1615 base_stk [stk_idx] = dents;
1516 end_stk [stk_idx] = dents + size; 1616 end_stk [stk_idx] = dents + size;
1517 bit_stk [stk_idx] = bit - 1; 1617 bit_stk [stk_idx] = bit - 1;
1596 } 1696 }
1597 } 1697 }
1598} 1698}
1599 1699
1600static void 1700static void
1601eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1701eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1602{ 1702{
1603 if (size <= 1) 1703 if (size <= 1)
1604 return; /* our insertion sort relies on size > 0 */ 1704 return; /* our insertion sort relies on size > 0 */
1605 1705
1606 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1706 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1614 1714
1615/* read a full directory */ 1715/* read a full directory */
1616static void 1716static void
1617eio__scandir (eio_req *req, etp_worker *self) 1717eio__scandir (eio_req *req, etp_worker *self)
1618{ 1718{
1619 DIR *dirp;
1620 EIO_STRUCT_DIRENT *entp;
1621 char *name, *names; 1719 char *name, *names;
1622 int namesalloc = 4096; 1720 int namesalloc = 4096 - sizeof (void *) * 4;
1623 int namesoffs = 0; 1721 int namesoffs = 0;
1624 int flags = req->int1; 1722 int flags = req->int1;
1625 eio_dirent *dents = 0; 1723 eio_dirent *dents = 0;
1626 int dentalloc = 128; 1724 int dentalloc = 128;
1627 int dentoffs = 0; 1725 int dentoffs = 0;
1628 ino_t inode_bits = 0; 1726 eio_ino_t inode_bits = 0;
1727#ifdef _WIN32
1728 HANDLE dirp;
1729 WIN32_FIND_DATA entp;
1730#else
1731 DIR *dirp;
1732 EIO_STRUCT_DIRENT *entp;
1733#endif
1629 1734
1630 req->result = -1; 1735 req->result = -1;
1631 1736
1632 if (!(flags & EIO_READDIR_DENTS)) 1737 if (!(flags & EIO_READDIR_DENTS))
1633 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1738 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1634 1739
1635 X_LOCK (wrklock); 1740#ifdef _WIN32
1636 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1741 {
1742 int len = strlen ((const char *)req->ptr1);
1743 char *path = malloc (MAX_PATH);
1744 const char *fmt;
1745 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1746
1747 if (!len)
1748 fmt = "./*";
1749 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1750 fmt = "%s*";
1751 else
1752 fmt = "%s/*";
1753
1754 _snprintf (path, MAX_PATH, fmt, reqpath);
1755 dirp = FindFirstFile (path, &entp);
1756 free (path);
1757
1758 if (dirp == INVALID_HANDLE_VALUE)
1759 {
1760 /* should steal _dosmaperr */
1761 switch (GetLastError ())
1762 {
1763 case ERROR_FILE_NOT_FOUND:
1764 req->result = 0;
1765 break;
1766
1767 case ERROR_INVALID_NAME:
1768 case ERROR_PATH_NOT_FOUND:
1769 case ERROR_NO_MORE_FILES:
1770 errno = ENOENT;
1771 break;
1772
1773 case ERROR_NOT_ENOUGH_MEMORY:
1774 errno = ENOMEM;
1775 break;
1776
1777 default:
1778 errno = EINVAL;
1779 break;
1780 }
1781
1782 return;
1783 }
1784 }
1785#else
1786 #if HAVE_AT
1787 if (req->wd)
1788 {
1789 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1790
1791 if (fd < 0)
1792 return;
1793
1794 dirp = fdopendir (fd);
1795
1796 if (!dirp)
1797 close (fd);
1798 }
1799 else
1637 self->dirp = dirp = opendir (req->ptr1); 1800 dirp = opendir (req->ptr1);
1801 #else
1802 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1803 #endif
1804
1805 if (!dirp)
1806 return;
1807#endif
1638 1808
1639 if (req->flags & EIO_FLAG_PTR1_FREE) 1809 if (req->flags & EIO_FLAG_PTR1_FREE)
1640 free (req->ptr1); 1810 free (req->ptr1);
1641 1811
1642 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1812 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1643 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1813 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1644 req->ptr2 = names = malloc (namesalloc); 1814 req->ptr2 = names = malloc (namesalloc);
1645 X_UNLOCK (wrklock);
1646 1815
1647 if (dirp && names && (!flags || dents)) 1816 if (!names || (flags && !dents))
1817 return;
1818
1648 for (;;) 1819 for (;;)
1649 { 1820 {
1821 int done;
1822
1823#ifdef _WIN32
1824 done = !dirp;
1825#else
1650 errno = 0; 1826 errno = 0;
1651 entp = readdir (dirp); 1827 entp = readdir (dirp);
1828 done = !entp;
1829#endif
1652 1830
1653 if (!entp) 1831 if (done)
1654 { 1832 {
1833#ifndef _WIN32
1834 int old_errno = errno;
1835 closedir (dirp);
1836 errno = old_errno;
1837
1655 if (errno) 1838 if (errno)
1656 break; 1839 break;
1840#endif
1657 1841
1658 /* sort etc. */ 1842 /* sort etc. */
1659 req->int1 = flags; 1843 req->int1 = flags;
1660 req->result = dentoffs; 1844 req->result = dentoffs;
1661 1845
1662 if (flags & EIO_READDIR_STAT_ORDER) 1846 if (flags & EIO_READDIR_STAT_ORDER)
1663 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1847 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1664 else if (flags & EIO_READDIR_DIRS_FIRST) 1848 else if (flags & EIO_READDIR_DIRS_FIRST)
1665 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1849 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1666 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1850 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1667 else 1851 else
1852 {
1853 /* in this case, all is known, and we just put dirs first and sort them */
1854 eio_dirent *oth = dents + dentoffs;
1855 eio_dirent *dir = dents;
1856
1857 /* now partition dirs to the front, and non-dirs to the back */
1858 /* by walking from both sides and swapping if necessary */
1859 while (oth > dir)
1860 {
1861 if (dir->type == EIO_DT_DIR)
1862 ++dir;
1863 else if ((--oth)->type == EIO_DT_DIR)
1864 {
1865 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1866
1867 ++dir;
1868 }
1869 }
1870
1871 /* now sort the dirs only (dirs all have the same score) */
1872 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1873 }
1874
1875 break;
1876 }
1877
1878 /* now add the entry to our list(s) */
1879 name = D_NAME (entp);
1880
1881 /* skip . and .. entries */
1882 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1883 {
1884 int len = D_NAMLEN (entp) + 1;
1885
1886 while (ecb_expect_false (namesoffs + len > namesalloc))
1887 {
1888 namesalloc *= 2;
1889 req->ptr2 = names = realloc (names, namesalloc);
1890
1891 if (!names)
1892 break;
1893 }
1894
1895 memcpy (names + namesoffs, name, len);
1896
1897 if (dents)
1898 {
1899 struct eio_dirent *ent;
1900
1901 if (ecb_expect_false (dentoffs == dentalloc))
1668 { 1902 {
1669 /* in this case, all is known, and we just put dirs first and sort them */ 1903 dentalloc *= 2;
1904 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1905
1906 if (!dents)
1907 break;
1908 }
1909
1670 eio_dirent *oth = dents + dentoffs; 1910 ent = dents + dentoffs;
1671 eio_dirent *dir = dents;
1672 1911
1673 /* now partition dirs to the front, and non-dirs to the back */ 1912 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1674 /* by walking from both sides and swapping if necessary */ 1913 ent->namelen = len - 1;
1675 while (oth > dir) 1914 ent->inode = D_INO (entp);
1915
1916 inode_bits |= ent->inode;
1917
1918 switch (D_TYPE (entp))
1919 {
1920 default:
1921 ent->type = EIO_DT_UNKNOWN;
1922 flags |= EIO_READDIR_FOUND_UNKNOWN;
1923 break;
1924
1925 #ifdef DT_FIFO
1926 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1927 #endif
1928 #ifdef DT_CHR
1929 case DT_CHR: ent->type = EIO_DT_CHR; break;
1930 #endif
1931 #ifdef DT_MPC
1932 case DT_MPC: ent->type = EIO_DT_MPC; break;
1933 #endif
1934 #ifdef DT_DIR
1935 case DT_DIR: ent->type = EIO_DT_DIR; break;
1936 #endif
1937 #ifdef DT_NAM
1938 case DT_NAM: ent->type = EIO_DT_NAM; break;
1939 #endif
1940 #ifdef DT_BLK
1941 case DT_BLK: ent->type = EIO_DT_BLK; break;
1942 #endif
1943 #ifdef DT_MPB
1944 case DT_MPB: ent->type = EIO_DT_MPB; break;
1945 #endif
1946 #ifdef DT_REG
1947 case DT_REG: ent->type = EIO_DT_REG; break;
1948 #endif
1949 #ifdef DT_NWK
1950 case DT_NWK: ent->type = EIO_DT_NWK; break;
1951 #endif
1952 #ifdef DT_CMP
1953 case DT_CMP: ent->type = EIO_DT_CMP; break;
1954 #endif
1955 #ifdef DT_LNK
1956 case DT_LNK: ent->type = EIO_DT_LNK; break;
1957 #endif
1958 #ifdef DT_SOCK
1959 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1960 #endif
1961 #ifdef DT_DOOR
1962 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1963 #endif
1964 #ifdef DT_WHT
1965 case DT_WHT: ent->type = EIO_DT_WHT; break;
1966 #endif
1967 }
1968
1969 ent->score = 7;
1970
1971 if (flags & EIO_READDIR_DIRS_FIRST)
1972 {
1973 if (ent->type == EIO_DT_UNKNOWN)
1676 { 1974 {
1677 if (dir->type == EIO_DT_DIR) 1975 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1678 ++dir; 1976 ent->score = 1;
1679 else if ((--oth)->type == EIO_DT_DIR) 1977 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1680 { 1978 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1681 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1682
1683 ++dir;
1684 }
1685 } 1979 }
1686 1980 else if (ent->type == EIO_DT_DIR)
1687 /* now sort the dirs only (dirs all have the same score) */ 1981 ent->score = 0;
1688 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1689 } 1982 }
1690
1691 break;
1692 }
1693
1694 /* now add the entry to our list(s) */
1695 name = entp->d_name;
1696
1697 /* skip . and .. entries */
1698 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1699 {
1700 int len = D_NAMLEN (entp) + 1;
1701
1702 while (ecb_expect_false (namesoffs + len > namesalloc))
1703 {
1704 namesalloc *= 2;
1705 X_LOCK (wrklock);
1706 req->ptr2 = names = realloc (names, namesalloc);
1707 X_UNLOCK (wrklock);
1708
1709 if (!names)
1710 break;
1711 } 1983 }
1712 1984
1713 memcpy (names + namesoffs, name, len);
1714
1715 if (dents)
1716 {
1717 struct eio_dirent *ent;
1718
1719 if (ecb_expect_false (dentoffs == dentalloc))
1720 {
1721 dentalloc *= 2;
1722 X_LOCK (wrklock);
1723 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1724 X_UNLOCK (wrklock);
1725
1726 if (!dents)
1727 break;
1728 }
1729
1730 ent = dents + dentoffs;
1731
1732 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1733 ent->namelen = len - 1;
1734 ent->inode = D_INO (entp);
1735
1736 inode_bits |= ent->inode;
1737
1738 switch (D_TYPE (entp))
1739 {
1740 default:
1741 ent->type = EIO_DT_UNKNOWN;
1742 flags |= EIO_READDIR_FOUND_UNKNOWN;
1743 break;
1744
1745 #ifdef DT_FIFO
1746 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1747 #endif
1748 #ifdef DT_CHR
1749 case DT_CHR: ent->type = EIO_DT_CHR; break;
1750 #endif
1751 #ifdef DT_MPC
1752 case DT_MPC: ent->type = EIO_DT_MPC; break;
1753 #endif
1754 #ifdef DT_DIR
1755 case DT_DIR: ent->type = EIO_DT_DIR; break;
1756 #endif
1757 #ifdef DT_NAM
1758 case DT_NAM: ent->type = EIO_DT_NAM; break;
1759 #endif
1760 #ifdef DT_BLK
1761 case DT_BLK: ent->type = EIO_DT_BLK; break;
1762 #endif
1763 #ifdef DT_MPB
1764 case DT_MPB: ent->type = EIO_DT_MPB; break;
1765 #endif
1766 #ifdef DT_REG
1767 case DT_REG: ent->type = EIO_DT_REG; break;
1768 #endif
1769 #ifdef DT_NWK
1770 case DT_NWK: ent->type = EIO_DT_NWK; break;
1771 #endif
1772 #ifdef DT_CMP
1773 case DT_CMP: ent->type = EIO_DT_CMP; break;
1774 #endif
1775 #ifdef DT_LNK
1776 case DT_LNK: ent->type = EIO_DT_LNK; break;
1777 #endif
1778 #ifdef DT_SOCK
1779 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1780 #endif
1781 #ifdef DT_DOOR
1782 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1783 #endif
1784 #ifdef DT_WHT
1785 case DT_WHT: ent->type = EIO_DT_WHT; break;
1786 #endif
1787 }
1788
1789 ent->score = 7;
1790
1791 if (flags & EIO_READDIR_DIRS_FIRST)
1792 {
1793 if (ent->type == EIO_DT_UNKNOWN)
1794 {
1795 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1796 ent->score = 1;
1797 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1798 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1799 }
1800 else if (ent->type == EIO_DT_DIR)
1801 ent->score = 0;
1802 }
1803 }
1804
1805 namesoffs += len; 1985 namesoffs += len;
1806 ++dentoffs; 1986 ++dentoffs;
1807 } 1987 }
1808 1988
1809 if (EIO_CANCELLED (req)) 1989 if (EIO_CANCELLED (req))
1810 { 1990 {
1811 errno = ECANCELED; 1991 errno = ECANCELED;
1812 break; 1992 break;
1813 } 1993 }
1994
1995#ifdef _WIN32
1996 if (!FindNextFile (dirp, &entp))
1997 {
1998 FindClose (dirp);
1999 dirp = 0;
1814 } 2000 }
2001#endif
2002 }
1815} 2003}
2004
2005/*****************************************************************************/
2006/* working directory stuff */
2007/* various deficiencies in the posix 2008 api force us to */
2008/* keep the absolute path in string form at all times */
2009/* fuck yeah. */
2010
2011#if !HAVE_AT
2012
2013/* a bit like realpath, but usually faster because it doesn'T have to return */
2014/* an absolute or canonical path */
2015static const char *
2016wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2017{
2018 if (!wd || *path == '/')
2019 return path;
2020
2021 if (path [0] == '.' && !path [1])
2022 return wd->str;
2023
2024 {
2025 int l1 = wd->len;
2026 int l2 = strlen (path);
2027
2028 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2029
2030 memcpy (res, wd->str, l1);
2031 res [l1] = '/';
2032 memcpy (res + l1 + 1, path, l2 + 1);
2033
2034 return res;
2035 }
2036}
2037
2038#endif
2039
2040static eio_wd
2041eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2042{
2043 int fd;
2044 eio_wd res;
2045 int len = eio__realpath (tmpbuf, wd, path);
2046
2047 if (len < 0)
2048 return EIO_INVALID_WD;
2049
2050#if HAVE_AT
2051 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2052
2053 if (fd < 0)
2054 return EIO_INVALID_WD;
2055#endif
2056
2057 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2058
2059#if HAVE_AT
2060 res->fd = fd;
2061#endif
2062
2063 res->len = len;
2064 memcpy (res->str, tmpbuf->ptr, len);
2065 res->str [len] = 0;
2066
2067 return res;
2068}
2069
2070eio_wd
2071eio_wd_open_sync (eio_wd wd, const char *path)
2072{
2073 struct tmpbuf tmpbuf = { 0 };
2074 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2075 free (tmpbuf.ptr);
2076
2077 return wd;
2078}
2079
2080void
2081eio_wd_close_sync (eio_wd wd)
2082{
2083 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2084 {
2085 #if HAVE_AT
2086 close (wd->fd);
2087 #endif
2088 free (wd);
2089 }
2090}
2091
2092#if HAVE_AT
2093
2094/* they forgot these */
2095
2096static int
2097eio__truncateat (int dirfd, const char *path, off_t length)
2098{
2099 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2100 int res;
2101
2102 if (fd < 0)
2103 return fd;
2104
2105 res = ftruncate (fd, length);
2106 close (fd);
2107 return res;
2108}
2109
2110static int
2111eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2112{
2113 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2114 int res;
2115
2116 if (fd < 0)
2117 return fd;
2118
2119 res = fstatvfs (fd, buf);
2120 close (fd);
2121 return res;
2122
2123}
2124
2125#endif
1816 2126
1817/*****************************************************************************/ 2127/*****************************************************************************/
1818 2128
1819#define ALLOC(len) \ 2129#define ALLOC(len) \
1820 if (!req->ptr2) \ 2130 if (!req->ptr2) \
1829 req->result = -1; \ 2139 req->result = -1; \
1830 break; \ 2140 break; \
1831 } \ 2141 } \
1832 } 2142 }
1833 2143
2144static void ecb_noinline ecb_cold
2145etp_proc_init (void)
2146{
2147#if HAVE_PRCTL_SET_NAME
2148 /* provide a more sensible "thread name" */
2149 char name[16 + 1];
2150 const int namelen = sizeof (name) - 1;
2151 int len;
2152
2153 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2154 name [namelen] = 0;
2155 len = strlen (name);
2156 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2157 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2158#endif
2159}
2160
1834X_THREAD_PROC (etp_proc) 2161X_THREAD_PROC (etp_proc)
1835{ 2162{
1836 ETP_REQ *req; 2163 ETP_REQ *req;
1837 struct timespec ts; 2164 struct timespec ts;
1838 etp_worker *self = (etp_worker *)thr_arg; 2165 etp_worker *self = (etp_worker *)thr_arg;
1839 int timeout; 2166
2167 etp_proc_init ();
1840 2168
1841 /* try to distribute timeouts somewhat evenly */ 2169 /* try to distribute timeouts somewhat evenly */
1842 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2170 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1843 2171
1844 for (;;) 2172 for (;;)
1847 2175
1848 X_LOCK (reqlock); 2176 X_LOCK (reqlock);
1849 2177
1850 for (;;) 2178 for (;;)
1851 { 2179 {
1852 self->req = req = reqq_shift (&req_queue); 2180 req = reqq_shift (&req_queue);
1853 2181
1854 if (req) 2182 if (req)
1855 break; 2183 break;
1856 2184
1857 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2185 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1895 ++npending; 2223 ++npending;
1896 2224
1897 if (!reqq_push (&res_queue, req) && want_poll_cb) 2225 if (!reqq_push (&res_queue, req) && want_poll_cb)
1898 want_poll_cb (); 2226 want_poll_cb ();
1899 2227
1900 self->req = 0;
1901 etp_worker_clear (self); 2228 etp_worker_clear (self);
1902 2229
1903 X_UNLOCK (reslock); 2230 X_UNLOCK (reslock);
1904 } 2231 }
1905 2232
1906quit: 2233quit:
2234 free (req);
2235
1907 X_LOCK (wrklock); 2236 X_LOCK (wrklock);
1908 etp_worker_free (self); 2237 etp_worker_free (self);
1909 X_UNLOCK (wrklock); 2238 X_UNLOCK (wrklock);
1910 2239
1911 return 0; 2240 return 0;
1923eio_api_destroy (eio_req *req) 2252eio_api_destroy (eio_req *req)
1924{ 2253{
1925 free (req); 2254 free (req);
1926} 2255}
1927 2256
1928#define REQ(rtype) \ 2257#define REQ(rtype) \
1929 eio_req *req; \ 2258 eio_req *req; \
1930 \ 2259 \
1931 req = (eio_req *)calloc (1, sizeof *req); \ 2260 req = (eio_req *)calloc (1, sizeof *req); \
1932 if (!req) \ 2261 if (!req) \
1933 return 0; \ 2262 return 0; \
1947 { \ 2276 { \
1948 eio_api_destroy (req); \ 2277 eio_api_destroy (req); \
1949 return 0; \ 2278 return 0; \
1950 } 2279 }
1951 2280
2281#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
2282
1952static void 2283static void
1953eio_execute (etp_worker *self, eio_req *req) 2284eio_execute (etp_worker *self, eio_req *req)
1954{ 2285{
2286#if HAVE_AT
2287 int dirfd;
2288#else
2289 const char *path;
2290#endif
2291
1955 if (ecb_expect_false (EIO_CANCELLED (req))) 2292 if (ecb_expect_false (EIO_CANCELLED (req)))
1956 { 2293 {
1957 req->result = -1; 2294 req->result = -1;
1958 req->errorno = ECANCELED; 2295 req->errorno = ECANCELED;
1959 return; 2296 return;
1960 } 2297 }
1961 2298
2299 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2300 {
2301 req->result = -1;
2302 req->errorno = ENOENT;
2303 return;
2304 }
2305
2306 if (req->type >= EIO_OPEN)
2307 {
2308 #if HAVE_AT
2309 dirfd = WD2FD (req->wd);
2310 #else
2311 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2312 #endif
2313 }
2314
1962 switch (req->type) 2315 switch (req->type)
1963 { 2316 {
2317 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2318 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2319 break;
2320 case EIO_WD_CLOSE: req->result = 0;
2321 eio_wd_close_sync (req->wd); break;
2322
2323 case EIO_SEEK: eio__lseek (req); break;
1964 case EIO_READ: ALLOC (req->size); 2324 case EIO_READ: ALLOC (req->size);
1965 req->result = req->offs >= 0 2325 req->result = req->offs >= 0
1966 ? pread (req->int1, req->ptr2, req->size, req->offs) 2326 ? pread (req->int1, req->ptr2, req->size, req->offs)
1967 : read (req->int1, req->ptr2, req->size); break; 2327 : read (req->int1, req->ptr2, req->size); break;
1968 case EIO_WRITE: req->result = req->offs >= 0 2328 case EIO_WRITE: req->result = req->offs >= 0
1969 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2329 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1970 : write (req->int1, req->ptr2, req->size); break; 2330 : write (req->int1, req->ptr2, req->size); break;
1971 2331
1972 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2332 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1973 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2333 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2334
2335#if HAVE_AT
1974 2336
1975 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2337 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1976 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2338 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1977 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2339 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2340 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2341 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2342 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2343 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2344 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2345
2346 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2347 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
2348 req->result = req->wd && SINGLEDOT (req->ptr1)
2349 ? rmdir (req->wd->str)
2350 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2351 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2352 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
2353 req->result = req->wd && SINGLEDOT (req->ptr1)
2354 ? rename (req->wd->str, req->ptr2)
2355 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2356 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2357 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2362 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2363 case EIO_UTIME:
2364 case EIO_FUTIME:
2365 {
2366 struct timespec ts[2];
2367 struct timespec *times;
2368
2369 if (req->nv1 != -1. || req->nv2 != -1.)
2370 {
2371 ts[0].tv_sec = req->nv1;
2372 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2373 ts[1].tv_sec = req->nv2;
2374 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2375
2376 times = ts;
2377 }
2378 else
2379 times = 0;
2380
2381 req->result = req->type == EIO_FUTIME
2382 ? futimens (req->int1, times)
2383 : utimensat (dirfd, req->ptr1, times, 0);
2384 }
2385 break;
2386
2387#else
2388
2389 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2390 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2391 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1978 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2392 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2393 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2394 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2395 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2396 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2397
2398 case EIO_UNLINK: req->result = unlink (path ); break;
2399 case EIO_RMDIR: req->result = rmdir (path ); break;
2400 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2401 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2402 case EIO_LINK: req->result = link (path , req->ptr2); break;
2403 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2404 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2405 case EIO_READLINK: ALLOC (PATH_MAX);
2406 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2407 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2408 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2409
2410 case EIO_UTIME:
2411 case EIO_FUTIME:
2412 {
2413 struct timeval tv[2];
2414 struct timeval *times;
2415
2416 if (req->nv1 != -1. || req->nv2 != -1.)
2417 {
2418 tv[0].tv_sec = req->nv1;
2419 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2420 tv[1].tv_sec = req->nv2;
2421 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2422
2423 times = tv;
2424 }
2425 else
2426 times = 0;
2427
2428 req->result = req->type == EIO_FUTIME
2429 ? futimes (req->int1, times)
2430 : utimes (req->ptr1, times);
2431 }
2432 break;
2433
2434#endif
2435
2436 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2437 {
2438 ALLOC (req->result);
2439 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2440 }
2441 break;
2442
1979 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2443 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1980 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2444 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1981 2445
1982 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1983 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1984 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2446 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1985 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2447 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1986 2448
1987 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1988 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2449 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1989 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1990 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2450 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1991 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1992 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2451 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1993 2452
1994 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1995 case EIO_CLOSE: req->result = close (req->int1); break; 2453 case EIO_CLOSE: req->result = close (req->int1); break;
1996 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2454 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1997 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1998 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1999 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2000 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2001 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2002 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2003 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2004
2005 case EIO_REALPATH: eio__realpath (req, self); break;
2006
2007 case EIO_READLINK: ALLOC (PATH_MAX);
2008 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2009
2010 case EIO_SYNC: req->result = 0; sync (); break; 2455 case EIO_SYNC: req->result = 0; sync (); break;
2011 case EIO_FSYNC: req->result = fsync (req->int1); break; 2456 case EIO_FSYNC: req->result = fsync (req->int1); break;
2012 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2457 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2458 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2459 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2013 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2460 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2014 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2461 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2015 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2462 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2016 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2463 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2017 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2018 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2464 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2019 2465
2020 case EIO_READDIR: eio__scandir (req, self); break; 2466 case EIO_READDIR: eio__scandir (req, self); break;
2021 2467
2022 case EIO_BUSY: 2468 case EIO_BUSY:
2032 req->result = select (0, 0, 0, 0, &tv); 2478 req->result = select (0, 0, 0, 0, &tv);
2033 } 2479 }
2034#endif 2480#endif
2035 break; 2481 break;
2036 2482
2037 case EIO_UTIME:
2038 case EIO_FUTIME:
2039 {
2040 struct timeval tv[2];
2041 struct timeval *times;
2042
2043 if (req->nv1 != -1. || req->nv2 != -1.)
2044 {
2045 tv[0].tv_sec = req->nv1;
2046 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2047 tv[1].tv_sec = req->nv2;
2048 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2049
2050 times = tv;
2051 }
2052 else
2053 times = 0;
2054
2055 req->result = req->type == EIO_FUTIME
2056 ? futimes (req->int1, times)
2057 : utimes (req->ptr1, times);
2058 }
2059 break;
2060
2061 case EIO_GROUP: 2483 case EIO_GROUP:
2062 abort (); /* handled in eio_request */ 2484 abort (); /* handled in eio_request */
2063 2485
2064 case EIO_NOP: 2486 case EIO_NOP:
2065 req->result = 0; 2487 req->result = 0;
2068 case EIO_CUSTOM: 2490 case EIO_CUSTOM:
2069 req->feed (req); 2491 req->feed (req);
2070 break; 2492 break;
2071 2493
2072 default: 2494 default:
2073 errno = ENOSYS;
2074 req->result = -1; 2495 req->result = EIO_ENOSYS ();
2075 break; 2496 break;
2076 } 2497 }
2077 2498
2078 req->errorno = errno; 2499 req->errorno = errno;
2079} 2500}
2080 2501
2081#ifndef EIO_NO_WRAPPERS 2502#ifndef EIO_NO_WRAPPERS
2082 2503
2504eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2505{
2506 REQ (EIO_WD_OPEN); PATH; SEND;
2507}
2508
2509eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2510{
2511 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2512}
2513
2083eio_req *eio_nop (int pri, eio_cb cb, void *data) 2514eio_req *eio_nop (int pri, eio_cb cb, void *data)
2084{ 2515{
2085 REQ (EIO_NOP); SEND; 2516 REQ (EIO_NOP); SEND;
2086} 2517}
2087 2518
2103eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2534eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2104{ 2535{
2105 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2536 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2106} 2537}
2107 2538
2539eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2540{
2541 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2542}
2543
2544eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2545{
2546 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2547}
2548
2549eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2550{
2551 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2552}
2553
2108eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2554eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2109{ 2555{
2110 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2556 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2111} 2557}
2112 2558
2118eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2564eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2119{ 2565{
2120 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2566 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2121} 2567}
2122 2568
2123eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2124{
2125 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2126}
2127
2128eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2569eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2129{ 2570{
2130 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2571 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2131} 2572}
2132 2573
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_close (int fd, int pri, eio_cb cb, void *data) 2574eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2139{ 2575{
2140 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2576 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2141} 2577}
2142 2578
2143eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2579eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2144{ 2580{
2145 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2581 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2146} 2582}
2147 2583
2584eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2585{
2586 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2587}
2588
2148eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2589eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2149{ 2590{
2150 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2591 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2151} 2592}
2152 2593
2178eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2619eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2179{ 2620{
2180 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2621 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2181} 2622}
2182 2623
2183eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2624eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2184{ 2625{
2185 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2626 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2186} 2627}
2187 2628
2188eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2629eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
2208eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2649eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2209{ 2650{
2210 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2651 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2211} 2652}
2212 2653
2213eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2654eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2214{ 2655{
2215 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2656 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2216} 2657}
2217 2658
2218eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2659eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
2365} 2806}
2366 2807
2367/*****************************************************************************/ 2808/*****************************************************************************/
2368/* misc garbage */ 2809/* misc garbage */
2369 2810
2370ssize_t 2811eio_ssize_t
2371eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2812eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2372{ 2813{
2373 etp_worker wrk;
2374 ssize_t ret;
2375
2376 wrk.dbuf = 0;
2377
2378 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2814 return eio__sendfile (ofd, ifd, offset, count);
2379
2380 if (wrk.dbuf)
2381 free (wrk.dbuf);
2382
2383 return ret;
2384} 2815}
2385 2816

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines