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.126 by root, Fri Dec 28 07:33:41 2012 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 }
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)
129 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> 236 #include <sys/statvfs.h>
135 #include <unistd.h> 237 #include <unistd.h>
136 #include <utime.h>
137 #include <signal.h> 238 #include <signal.h>
138 #include <dirent.h> 239 #include <dirent.h>
139 240
140 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 241 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
141 #include <sys/mman.h> 242 #include <sys/mman.h>
142 #endif 243 #endif
143 244
245 #define D_NAME(entp) entp->d_name
246
144 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 247 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
145 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 248 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
146 #define _DIRENT_HAVE_D_TYPE /* sigh */ 249 #define _DIRENT_HAVE_D_TYPE /* sigh */
147 #define D_INO(de) (de)->d_fileno 250 #define D_INO(de) (de)->d_fileno
148 #define D_NAMLEN(de) (de)->d_namlen 251 #define D_NAMLEN(de) (de)->d_namlen
149 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 252 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
150 #define D_INO(de) (de)->d_ino 253 #define D_INO(de) (de)->d_ino
161 264
162 #ifndef EIO_STRUCT_DIRENT 265 #ifndef EIO_STRUCT_DIRENT
163 #define EIO_STRUCT_DIRENT struct dirent 266 #define EIO_STRUCT_DIRENT struct dirent
164 #endif 267 #endif
165 268
269#endif
270
271#if HAVE_UTIMES
272# include <utime.h>
273#endif
274
275#if HAVE_SYS_SYSCALL_H
276# include <sys/syscall.h>
277#endif
278
279#if HAVE_SYS_PRCTL_H
280# include <sys/prctl.h>
166#endif 281#endif
167 282
168#if HAVE_SENDFILE 283#if HAVE_SENDFILE
169# if __linux 284# if __linux
170# include <sys/sendfile.h> 285# include <sys/sendfile.h>
185#endif 300#endif
186#ifndef D_INO 301#ifndef D_INO
187# define D_INO(de) 0 302# define D_INO(de) 0
188#endif 303#endif
189#ifndef D_NAMLEN 304#ifndef D_NAMLEN
190# define D_NAMLEN(de) strlen ((de)->d_name) 305# define D_NAMLEN(entp) strlen (D_NAME (entp))
191#endif 306#endif
192 307
193/* used for struct dirent, AIX doesn't provide it */ 308/* used for struct dirent, AIX doesn't provide it */
194#ifndef NAME_MAX 309#ifndef NAME_MAX
195# define NAME_MAX 4096 310# define NAME_MAX 4096
201#endif 316#endif
202 317
203/* buffer size for various temporary buffers */ 318/* buffer size for various temporary buffers */
204#define EIO_BUFSIZE 65536 319#define EIO_BUFSIZE 65536
205 320
206#define dBUF \ 321#define dBUF \
207 char *eio_buf; \
208 ETP_WORKER_LOCK (self); \
209 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 322 char *eio_buf = malloc (EIO_BUFSIZE); \
210 ETP_WORKER_UNLOCK (self); \
211 errno = ENOMEM; \ 323 errno = ENOMEM; \
212 if (!eio_buf) \ 324 if (!eio_buf) \
213 return -1; 325 return -1
326
327#define FUBd \
328 free (eio_buf)
214 329
215#define EIO_TICKS ((1000000 + 1023) >> 10) 330#define EIO_TICKS ((1000000 + 1023) >> 10)
331
332/*****************************************************************************/
333
334struct tmpbuf
335{
336 void *ptr;
337 int len;
338};
339
340static void *
341tmpbuf_get (struct tmpbuf *buf, int len)
342{
343 if (buf->len < len)
344 {
345 free (buf->ptr);
346 buf->ptr = malloc (buf->len = len);
347 }
348
349 return buf->ptr;
350}
351
352struct tmpbuf;
353
354#if _POSIX_VERSION >= 200809L
355 #define HAVE_AT 1
356 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
357 #ifndef O_SEARCH
358 #define O_SEARCH O_RDONLY
359 #endif
360#else
361 #define HAVE_AT 0
362 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
363#endif
364
365struct eio_pwd
366{
367#if HAVE_AT
368 int fd;
369#endif
370 int len;
371 char str[1]; /* actually, a 0-terminated canonical path */
372};
373
374/*****************************************************************************/
216 375
217#define ETP_PRI_MIN EIO_PRI_MIN 376#define ETP_PRI_MIN EIO_PRI_MIN
218#define ETP_PRI_MAX EIO_PRI_MAX 377#define ETP_PRI_MAX EIO_PRI_MAX
219 378
220struct etp_worker; 379struct etp_worker;
224static int eio_finish (eio_req *req); 383static int eio_finish (eio_req *req);
225#define ETP_FINISH(req) eio_finish (req) 384#define ETP_FINISH(req) eio_finish (req)
226static void eio_execute (struct etp_worker *self, eio_req *req); 385static void eio_execute (struct etp_worker *self, eio_req *req);
227#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 386#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
228 387
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/*****************************************************************************/ 388/*****************************************************************************/
247 389
248#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 390#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
249 391
250/* calculate time difference in ~1/EIO_TICKS of a second */ 392/* calculate time difference in ~1/EIO_TICKS of a second */
261static void (*done_poll_cb) (void); 403static void (*done_poll_cb) (void);
262 404
263static unsigned int max_poll_time; /* reslock */ 405static unsigned int max_poll_time; /* reslock */
264static unsigned int max_poll_reqs; /* reslock */ 406static unsigned int max_poll_reqs; /* reslock */
265 407
266static volatile unsigned int nreqs; /* reqlock */ 408static unsigned int nreqs; /* reqlock */
267static volatile unsigned int nready; /* reqlock */ 409static unsigned int nready; /* reqlock */
268static volatile unsigned int npending; /* reqlock */ 410static unsigned int npending; /* reqlock */
269static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 411static 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 */ 412static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
271 413
272static xmutex_t wrklock; 414static xmutex_t wrklock;
273static xmutex_t reslock; 415static xmutex_t reslock;
274static xmutex_t reqlock; 416static xmutex_t reqlock;
275static xcond_t reqwait; 417static xcond_t reqwait;
276 418
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 419typedef struct etp_worker
287{ 420{
421 struct tmpbuf tmpbuf;
422
288 /* locked by wrklock */ 423 /* locked by wrklock */
289 struct etp_worker *prev, *next; 424 struct etp_worker *prev, *next;
290 425
291 xthread_t tid; 426 xthread_t tid;
292 427
293 /* locked by reslock, reqlock or wrklock */ 428#ifdef ETP_WORKER_COMMON
294 ETP_REQ *req; /* currently processed request */
295
296 ETP_WORKER_COMMON 429 ETP_WORKER_COMMON
430#endif
297} etp_worker; 431} etp_worker;
298 432
299static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 433static etp_worker wrk_first; /* NOT etp */
300 434
301#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 435#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
302#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 436#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
303 437
304/* worker threads management */ 438/* worker threads management */
305 439
306static void ecb_cold 440static void
307etp_worker_clear (etp_worker *wrk) 441etp_worker_clear (etp_worker *wrk)
308{ 442{
309 ETP_WORKER_CLEAR (wrk);
310} 443}
311 444
312static void ecb_cold 445static void ecb_cold
313etp_worker_free (etp_worker *wrk) 446etp_worker_free (etp_worker *wrk)
314{ 447{
448 free (wrk->tmpbuf.ptr);
449
315 wrk->next->prev = wrk->prev; 450 wrk->next->prev = wrk->prev;
316 wrk->prev->next = wrk->next; 451 wrk->prev->next = wrk->next;
317 452
318 free (wrk); 453 free (wrk);
319} 454}
375} etp_reqq; 510} etp_reqq;
376 511
377static etp_reqq req_queue; 512static etp_reqq req_queue;
378static etp_reqq res_queue; 513static etp_reqq res_queue;
379 514
515static void ecb_noinline ecb_cold
516reqq_init (etp_reqq *q)
517{
518 int pri;
519
520 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
521 q->qs[pri] = q->qe[pri] = 0;
522
523 q->size = 0;
524}
525
380static int ecb_noinline 526static int ecb_noinline
381reqq_push (etp_reqq *q, ETP_REQ *req) 527reqq_push (etp_reqq *q, ETP_REQ *req)
382{ 528{
383 int pri = req->pri; 529 int pri = req->pri;
384 req->next = 0; 530 req->next = 0;
418 } 564 }
419 565
420 abort (); 566 abort ();
421} 567}
422 568
423static void ecb_cold 569static int ecb_cold
424etp_thread_init (void) 570etp_init (void (*want_poll)(void), void (*done_poll)(void))
425{ 571{
426#if !HAVE_PREADWRITE
427 X_MUTEX_CREATE (preadwritelock);
428#endif
429 X_MUTEX_CREATE (wrklock); 572 X_MUTEX_CREATE (wrklock);
430 X_MUTEX_CREATE (reslock); 573 X_MUTEX_CREATE (reslock);
431 X_MUTEX_CREATE (reqlock); 574 X_MUTEX_CREATE (reqlock);
432 X_COND_CREATE (reqwait); 575 X_COND_CREATE (reqwait);
433}
434 576
435static void ecb_cold 577 reqq_init (&req_queue);
436etp_atfork_prepare (void) 578 reqq_init (&res_queue);
437{
438}
439 579
440static void ecb_cold 580 wrk_first.next =
441etp_atfork_parent (void) 581 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 582
467 started = 0; 583 started = 0;
468 idle = 0; 584 idle = 0;
469 nreqs = 0; 585 nreqs = 0;
470 nready = 0; 586 nready = 0;
471 npending = 0; 587 npending = 0;
472 588
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; 589 want_poll_cb = want_poll;
491 done_poll_cb = done_poll; 590 done_poll_cb = done_poll;
492 591
493 return 0; 592 return 0;
494} 593}
503 /*TODO*/ 602 /*TODO*/
504 assert (("unable to allocate worker thread data", wrk)); 603 assert (("unable to allocate worker thread data", wrk));
505 604
506 X_LOCK (wrklock); 605 X_LOCK (wrklock);
507 606
508 if (thread_create (&wrk->tid, etp_proc, (void *)wrk)) 607 if (xthread_create (&wrk->tid, etp_proc, (void *)wrk))
509 { 608 {
510 wrk->prev = &wrk_first; 609 wrk->prev = &wrk_first;
511 wrk->next = wrk_first.next; 610 wrk->next = wrk_first.next;
512 wrk_first.next->prev = wrk; 611 wrk_first.next->prev = wrk;
513 wrk_first.next = wrk; 612 wrk_first.next = wrk;
533} 632}
534 633
535static void ecb_cold 634static void ecb_cold
536etp_end_thread (void) 635etp_end_thread (void)
537{ 636{
538 eio_req *req = calloc (1, sizeof (eio_req)); 637 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
539 638
540 req->type = -1; 639 req->type = -1;
541 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 640 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
542 641
543 X_LOCK (reqlock); 642 X_LOCK (reqlock);
870} 969}
871 970
872/*****************************************************************************/ 971/*****************************************************************************/
873/* work around various missing functions */ 972/* work around various missing functions */
874 973
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 974#ifndef HAVE_UTIMES
915 975
916# undef utimes 976# undef utimes
917# define utimes(path,times) eio__utimes (path, times) 977# define utimes(path,times) eio__utimes (path, times)
918 978
950 1010
951#if !HAVE_FDATASYNC 1011#if !HAVE_FDATASYNC
952# undef fdatasync 1012# undef fdatasync
953# define fdatasync(fd) fsync (fd) 1013# define fdatasync(fd) fsync (fd)
954#endif 1014#endif
1015
1016static int
1017eio__syncfs (int fd)
1018{
1019 int res;
1020
1021#if HAVE_SYS_SYNCFS
1022 res = (int)syscall (__NR_syncfs, (int)(fd));
1023#else
1024 res = EIO_ENOSYS ();
1025#endif
1026
1027 if (res < 0 && errno == ENOSYS && fd >= 0)
1028 sync ();
1029
1030 return res;
1031}
955 1032
956/* sync_file_range always needs emulation */ 1033/* sync_file_range always needs emulation */
957static int 1034static int
958eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1035eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
959{ 1036{
982} 1059}
983 1060
984static int 1061static int
985eio__fallocate (int fd, int mode, off_t offset, size_t len) 1062eio__fallocate (int fd, int mode, off_t offset, size_t len)
986{ 1063{
987#if HAVE_FALLOCATE 1064#if HAVE_LINUX_FALLOCATE
988 return fallocate (fd, mode, offset, len); 1065 return fallocate (fd, mode, offset, len);
989#else 1066#else
990 errno = ENOSYS; 1067 return EIO_ENOSYS ();
991 return -1;
992#endif 1068#endif
993} 1069}
994 1070
995#if !HAVE_READAHEAD 1071#if !HAVE_READAHEAD
996# undef readahead 1072# undef readahead
997# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1073# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
998 1074
999static ssize_t 1075static eio_ssize_t
1000eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1076eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
1001{ 1077{
1002 size_t todo = count; 1078 size_t todo = count;
1003 dBUF; 1079 dBUF;
1004 1080
1009 pread (fd, eio_buf, len, offset); 1085 pread (fd, eio_buf, len, offset);
1010 offset += len; 1086 offset += len;
1011 todo -= len; 1087 todo -= len;
1012 } 1088 }
1013 1089
1014 errno = 0; 1090 FUBd;
1091
1092 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1093 /* but not for e.g. EIO or eof, so we also never fail */
1015 return count; 1094 return 0;
1016} 1095}
1017 1096
1018#endif 1097#endif
1019 1098
1020/* sendfile always needs emulation */ 1099/* sendfile always needs emulation */
1021static ssize_t 1100static eio_ssize_t
1022eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1101eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1023{ 1102{
1024 ssize_t written = 0; 1103 eio_ssize_t written = 0;
1025 ssize_t res; 1104 eio_ssize_t res;
1026 1105
1027 if (!count) 1106 if (!count)
1028 return 0; 1107 return 0;
1029 1108
1030 for (;;) 1109 for (;;)
1055 1134
1056 /* according to source inspection, this is correct, and useful behaviour */ 1135 /* according to source inspection, this is correct, and useful behaviour */
1057 if (sbytes) 1136 if (sbytes)
1058 res = sbytes; 1137 res = sbytes;
1059 1138
1060# elif defined (__APPLE__) 1139# elif defined __APPLE__
1061 off_t sbytes = count; 1140 off_t sbytes = count;
1062 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1141 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1063 1142
1064 /* according to the manpage, sbytes is always valid */ 1143 /* according to the manpage, sbytes is always valid */
1065 if (sbytes) 1144 if (sbytes)
1092 HANDLE h = TO_SOCKET (ifd); 1171 HANDLE h = TO_SOCKET (ifd);
1093 SetFilePointer (h, offset, 0, FILE_BEGIN); 1172 SetFilePointer (h, offset, 0, FILE_BEGIN);
1094 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1173 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1095 1174
1096#else 1175#else
1097 res = -1; 1176 res = EIO_ENOSYS ();
1098 errno = ENOSYS;
1099#endif 1177#endif
1100 1178
1101 /* we assume sendfile can copy at least 128mb in one go */ 1179 /* we assume sendfile can copy at least 128mb in one go */
1102 if (res <= 128 * 1024 * 1024) 1180 if (res <= 128 * 1024 * 1024)
1103 { 1181 {
1125 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1203 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1126 /* BSDs */ 1204 /* BSDs */
1127#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1205#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1128 || errno == ENOTSUP 1206 || errno == ENOTSUP
1129#endif 1207#endif
1208#ifdef EOPNOTSUPP /* windows */
1130 || errno == EOPNOTSUPP /* BSDs */ 1209 || errno == EOPNOTSUPP /* BSDs */
1210#endif
1131#if __solaris 1211#if __solaris
1132 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1212 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1133#endif 1213#endif
1134 ) 1214 )
1135 ) 1215 )
1139 1219
1140 res = 0; 1220 res = 0;
1141 1221
1142 while (count) 1222 while (count)
1143 { 1223 {
1144 ssize_t cnt; 1224 eio_ssize_t cnt;
1145 1225
1146 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1226 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1147 1227
1148 if (cnt <= 0) 1228 if (cnt <= 0)
1149 { 1229 {
1161 1241
1162 offset += cnt; 1242 offset += cnt;
1163 res += cnt; 1243 res += cnt;
1164 count -= cnt; 1244 count -= cnt;
1165 } 1245 }
1246
1247 FUBd;
1166 } 1248 }
1167 1249
1168 return res; 1250 return res;
1169} 1251}
1170 1252
1197 /* round up length */ 1279 /* round up length */
1198 *length = (*length + mask) & ~mask; 1280 *length = (*length + mask) & ~mask;
1199} 1281}
1200 1282
1201#if !_POSIX_MEMLOCK 1283#if !_POSIX_MEMLOCK
1202# define eio__mlockall(a) eio_nosyscall() 1284# define eio__mlockall(a) EIO_ENOSYS ()
1203#else 1285#else
1204 1286
1205static int 1287static int
1206eio__mlockall (int flags) 1288eio__mlockall (int flags)
1207{ 1289{
1286 1368
1287/*****************************************************************************/ 1369/*****************************************************************************/
1288/* requests implemented outside eio_execute, because they are so large */ 1370/* requests implemented outside eio_execute, because they are so large */
1289 1371
1290static void 1372static void
1291eio__realpath (eio_req *req, etp_worker *self) 1373eio__lseek (eio_req *req)
1292{ 1374{
1293 char *rel = req->ptr1; 1375 /* this usually gets optimised away completely, or your compiler sucks, */
1376 /* or the whence constants really are not 0, 1, 2 */
1377 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
1378 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
1379 : req->int2 == EIO_SEEK_END ? SEEK_END
1380 : req->int2;
1381
1382 req->offs = lseek (req->int1, req->offs, whence);
1383 req->result = req->offs == (off_t)-1 ? -1 : 0;
1384}
1385
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{
1390 const char *rel = path;
1294 char *res; 1391 char *res;
1295 char *tmp1, *tmp2; 1392 char *tmp1, *tmp2;
1296#if SYMLOOP_MAX > 32 1393#if SYMLOOP_MAX > 32
1297 int symlinks = SYMLOOP_MAX; 1394 int symlinks = SYMLOOP_MAX;
1298#else 1395#else
1299 int symlinks = 32; 1396 int symlinks = 32;
1300#endif 1397#endif
1301 1398
1302 req->result = -1;
1303
1304 errno = EINVAL; 1399 errno = EINVAL;
1305 if (!rel) 1400 if (!rel)
1306 return; 1401 return -1;
1307 1402
1308 errno = ENOENT; 1403 errno = ENOENT;
1309 if (!*rel) 1404 if (!*rel)
1310 return; 1405 return -1;
1311 1406
1312 if (!req->ptr2) 1407 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; 1408 tmp1 = res + PATH_MAX;
1326 tmp2 = tmp1 + PATH_MAX; 1409 tmp2 = tmp1 + PATH_MAX;
1327 1410
1328#if 0 /* disabled, the musl way to do things is just too racy */ 1411#if 0 /* disabled, the musl way to do things is just too racy */
1329#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1412#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1333 1416
1334 if (fd >= 0) 1417 if (fd >= 0)
1335 { 1418 {
1336 sprintf (tmp1, "/proc/self/fd/%d", fd); 1419 sprintf (tmp1, "/proc/self/fd/%d", fd);
1337 req->result = readlink (tmp1, res, PATH_MAX); 1420 req->result = readlink (tmp1, res, PATH_MAX);
1421 /* here we should probably stat the open file and the disk file, to make sure they still match */
1338 close (fd); 1422 close (fd);
1339
1340 /* here we should probably stat the open file and the disk file, to make sure they still match */
1341 1423
1342 if (req->result > 0) 1424 if (req->result > 0)
1343 goto done; 1425 goto done;
1344 } 1426 }
1345 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1427 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1346 return; 1428 return -1;
1347 } 1429 }
1348#endif 1430#endif
1349#endif 1431#endif
1350 1432
1351 if (*rel != '/') 1433 if (*rel != '/')
1352 { 1434 {
1435 int len;
1436
1437 errno = ENOENT;
1438 if (wd == EIO_INVALID_WD)
1439 return -1;
1440
1441 if (wd == EIO_CWD)
1442 {
1353 if (!getcwd (res, PATH_MAX)) 1443 if (!getcwd (res, PATH_MAX))
1354 return; 1444 return -1;
1445
1446 len = strlen (res);
1447 }
1448 else
1449 memcpy (res, wd->str, len = wd->len);
1355 1450
1356 if (res [1]) /* only use if not / */ 1451 if (res [1]) /* only use if not / */
1357 res += strlen (res); 1452 res += len;
1358 } 1453 }
1359 1454
1360 while (*rel) 1455 while (*rel)
1361 { 1456 {
1362 ssize_t len, linklen; 1457 eio_ssize_t len, linklen;
1363 char *beg = rel; 1458 const char *beg = rel;
1364 1459
1365 while (*rel && *rel != '/') 1460 while (*rel && *rel != '/')
1366 ++rel; 1461 ++rel;
1367 1462
1368 len = rel - beg; 1463 len = rel - beg;
1380 1475
1381 if (beg [1] == '.' && len == 2) 1476 if (beg [1] == '.' && len == 2)
1382 { 1477 {
1383 /* .. - back up one component, if possible */ 1478 /* .. - back up one component, if possible */
1384 1479
1385 while (res != req->ptr2) 1480 while (res != tmpbuf->ptr)
1386 if (*--res == '/') 1481 if (*--res == '/')
1387 break; 1482 break;
1388 1483
1389 continue; 1484 continue;
1390 } 1485 }
1391 } 1486 }
1392 1487
1393 errno = ENAMETOOLONG; 1488 errno = ENAMETOOLONG;
1394 if (res + 1 + len + 1 >= tmp1) 1489 if (res + 1 + len + 1 >= tmp1)
1395 return; 1490 return -1;
1396 1491
1397 /* copy one component */ 1492 /* copy one component */
1398 *res = '/'; 1493 *res = '/';
1399 memcpy (res + 1, beg, len); 1494 memcpy (res + 1, beg, len);
1400 1495
1401 /* zero-terminate, for readlink */ 1496 /* zero-terminate, for readlink */
1402 res [len + 1] = 0; 1497 res [len + 1] = 0;
1403 1498
1404 /* now check if it's a symlink */ 1499 /* now check if it's a symlink */
1405 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1500 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1406 1501
1407 if (linklen < 0) 1502 if (linklen < 0)
1408 { 1503 {
1409 if (errno != EINVAL) 1504 if (errno != EINVAL)
1410 return; 1505 return -1;
1411 1506
1412 /* it's a normal directory. hopefully */ 1507 /* it's a normal directory. hopefully */
1413 res += len + 1; 1508 res += len + 1;
1414 } 1509 }
1415 else 1510 else
1417 /* yay, it was a symlink - build new path in tmp2 */ 1512 /* yay, it was a symlink - build new path in tmp2 */
1418 int rellen = strlen (rel); 1513 int rellen = strlen (rel);
1419 1514
1420 errno = ENAMETOOLONG; 1515 errno = ENAMETOOLONG;
1421 if (linklen + 1 + rellen >= PATH_MAX) 1516 if (linklen + 1 + rellen >= PATH_MAX)
1422 return; 1517 return -1;
1423 1518
1424 errno = ELOOP; 1519 errno = ELOOP;
1425 if (!--symlinks) 1520 if (!--symlinks)
1426 return; 1521 return -1;
1427 1522
1428 if (*tmp1 == '/') 1523 if (*tmp1 == '/')
1429 res = req->ptr2; /* symlink resolves to an absolute path */ 1524 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1430 1525
1431 /* we need to be careful, as rel might point into tmp2 already */ 1526 /* we need to be careful, as rel might point into tmp2 already */
1432 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1527 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1433 tmp2 [linklen] = '/'; 1528 tmp2 [linklen] = '/';
1434 memcpy (tmp2, tmp1, linklen); 1529 memcpy (tmp2, tmp1, linklen);
1436 rel = tmp2; 1531 rel = tmp2;
1437 } 1532 }
1438 } 1533 }
1439 1534
1440 /* special case for the lone root path */ 1535 /* special case for the lone root path */
1441 if (res == req->ptr2) 1536 if (res == tmpbuf->ptr)
1442 *res++ = '/'; 1537 *res++ = '/';
1443 1538
1444 req->result = res - (char *)req->ptr2; 1539 return res - (char *)tmpbuf->ptr;
1445
1446done:
1447 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1448} 1540}
1449 1541
1450static signed char 1542static signed char
1451eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1543eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1452{ 1544{
1460 1552
1461#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1553#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 */ 1554#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1463 1555
1464static void 1556static void
1465eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1557eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1466{ 1558{
1467 unsigned char bits [9 + sizeof (ino_t) * 8]; 1559 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1468 unsigned char *bit = bits; 1560 unsigned char *bit = bits;
1469 1561
1470 assert (CHAR_BIT == 8); 1562 assert (CHAR_BIT == 8);
1471 assert (sizeof (eio_dirent) * 8 < 256); 1563 assert (sizeof (eio_dirent) * 8 < 256);
1472 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1564 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1474 1566
1475 if (size <= EIO_SORT_FAST) 1567 if (size <= EIO_SORT_FAST)
1476 return; 1568 return;
1477 1569
1478 /* first prepare an array of bits to test in our radix sort */ 1570 /* 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 */ 1571 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1480 /* inode_bits must contain all inodes ORed together */ 1572 /* inode_bits must contain all inodes ORed together */
1481 /* which is used to skip bits that are 0 everywhere, which is very common */ 1573 /* which is used to skip bits that are 0 everywhere, which is very common */
1482 { 1574 {
1483 ino_t endianness; 1575 eio_ino_t endianness;
1484 int i, j; 1576 int i, j;
1485 1577
1486 /* we store the byte offset of byte n into byte n of "endianness" */ 1578 /* we store the byte offset of byte n into byte n of "endianness" */
1487 for (i = 0; i < sizeof (ino_t); ++i) 1579 for (i = 0; i < sizeof (eio_ino_t); ++i)
1488 ((unsigned char *)&endianness)[i] = i; 1580 ((unsigned char *)&endianness)[i] = i;
1489 1581
1490 *bit++ = 0; 1582 *bit++ = 0;
1491 1583
1492 for (i = 0; i < sizeof (ino_t); ++i) 1584 for (i = 0; i < sizeof (eio_ino_t); ++i)
1493 { 1585 {
1494 /* shifting off the byte offsets out of "endianness" */ 1586 /* shifting off the byte offsets out of "endianness" */
1495 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1587 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1496 endianness >>= 8; 1588 endianness >>= 8;
1497 1589
1498 for (j = 0; j < 8; ++j) 1590 for (j = 0; j < 8; ++j)
1499 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1591 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1500 *bit++ = offs + j; 1592 *bit++ = offs + j;
1501 } 1593 }
1502 1594
1503 for (j = 0; j < 8; ++j) 1595 for (j = 0; j < 8; ++j)
1504 if (score_bits & (1 << j)) 1596 if (score_bits & (1 << j))
1505 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1597 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1506 } 1598 }
1507 1599
1508 /* now actually do the sorting (a variant of MSD radix sort) */ 1600 /* now actually do the sorting (a variant of MSD radix sort) */
1509 { 1601 {
1510 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1602 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1511 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1603 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1512 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1604 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1513 int stk_idx = 0; 1605 int stk_idx = 0;
1514 1606
1515 base_stk [stk_idx] = dents; 1607 base_stk [stk_idx] = dents;
1516 end_stk [stk_idx] = dents + size; 1608 end_stk [stk_idx] = dents + size;
1517 bit_stk [stk_idx] = bit - 1; 1609 bit_stk [stk_idx] = bit - 1;
1596 } 1688 }
1597 } 1689 }
1598} 1690}
1599 1691
1600static void 1692static void
1601eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1693eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1602{ 1694{
1603 if (size <= 1) 1695 if (size <= 1)
1604 return; /* our insertion sort relies on size > 0 */ 1696 return; /* our insertion sort relies on size > 0 */
1605 1697
1606 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1698 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1614 1706
1615/* read a full directory */ 1707/* read a full directory */
1616static void 1708static void
1617eio__scandir (eio_req *req, etp_worker *self) 1709eio__scandir (eio_req *req, etp_worker *self)
1618{ 1710{
1619 DIR *dirp;
1620 EIO_STRUCT_DIRENT *entp;
1621 char *name, *names; 1711 char *name, *names;
1622 int namesalloc = 4096; 1712 int namesalloc = 4096 - sizeof (void *) * 4;
1623 int namesoffs = 0; 1713 int namesoffs = 0;
1624 int flags = req->int1; 1714 int flags = req->int1;
1625 eio_dirent *dents = 0; 1715 eio_dirent *dents = 0;
1626 int dentalloc = 128; 1716 int dentalloc = 128;
1627 int dentoffs = 0; 1717 int dentoffs = 0;
1628 ino_t inode_bits = 0; 1718 eio_ino_t inode_bits = 0;
1719#ifdef _WIN32
1720 HANDLE dirp;
1721 WIN32_FIND_DATA entp;
1722#else
1723 DIR *dirp;
1724 EIO_STRUCT_DIRENT *entp;
1725#endif
1629 1726
1630 req->result = -1; 1727 req->result = -1;
1631 1728
1632 if (!(flags & EIO_READDIR_DENTS)) 1729 if (!(flags & EIO_READDIR_DENTS))
1633 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1730 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1634 1731
1635 X_LOCK (wrklock); 1732#ifdef _WIN32
1636 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1733 {
1734 int len = strlen ((const char *)req->ptr1);
1735 char *path = malloc (MAX_PATH);
1736 const char *fmt;
1737 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1738
1739 if (!len)
1740 fmt = "./*";
1741 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1742 fmt = "%s*";
1743 else
1744 fmt = "%s/*";
1745
1746 _snprintf (path, MAX_PATH, fmt, reqpath);
1747 dirp = FindFirstFile (path, &entp);
1748 free (path);
1749
1750 if (dirp == INVALID_HANDLE_VALUE)
1751 {
1752 /* should steal _dosmaperr */
1753 switch (GetLastError ())
1754 {
1755 case ERROR_FILE_NOT_FOUND:
1756 req->result = 0;
1757 break;
1758
1759 case ERROR_INVALID_NAME:
1760 case ERROR_PATH_NOT_FOUND:
1761 case ERROR_NO_MORE_FILES:
1762 errno = ENOENT;
1763 break;
1764
1765 case ERROR_NOT_ENOUGH_MEMORY:
1766 errno = ENOMEM;
1767 break;
1768
1769 default:
1770 errno = EINVAL;
1771 break;
1772 }
1773
1774 return;
1775 }
1776 }
1777#else
1778 #if HAVE_AT
1779 if (req->wd)
1780 {
1781 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1782
1783 if (fd < 0)
1784 return;
1785
1786 dirp = fdopendir (fd);
1787
1788 if (!dirp)
1789 close (fd);
1790 }
1791 else
1637 self->dirp = dirp = opendir (req->ptr1); 1792 dirp = opendir (req->ptr1);
1793 #else
1794 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1795 #endif
1796
1797 if (!dirp)
1798 return;
1799#endif
1638 1800
1639 if (req->flags & EIO_FLAG_PTR1_FREE) 1801 if (req->flags & EIO_FLAG_PTR1_FREE)
1640 free (req->ptr1); 1802 free (req->ptr1);
1641 1803
1642 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1804 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1643 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1805 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1644 req->ptr2 = names = malloc (namesalloc); 1806 req->ptr2 = names = malloc (namesalloc);
1645 X_UNLOCK (wrklock);
1646 1807
1647 if (dirp && names && (!flags || dents)) 1808 if (!names || (flags && !dents))
1809 return;
1810
1648 for (;;) 1811 for (;;)
1649 { 1812 {
1813 int done;
1814
1815#ifdef _WIN32
1816 done = !dirp;
1817#else
1650 errno = 0; 1818 errno = 0;
1651 entp = readdir (dirp); 1819 entp = readdir (dirp);
1820 done = !entp;
1821#endif
1652 1822
1653 if (!entp) 1823 if (done)
1654 { 1824 {
1825#ifndef _WIN32
1826 int old_errno = errno;
1827 closedir (dirp);
1828 errno = old_errno;
1829
1655 if (errno) 1830 if (errno)
1656 break; 1831 break;
1832#endif
1657 1833
1658 /* sort etc. */ 1834 /* sort etc. */
1659 req->int1 = flags; 1835 req->int1 = flags;
1660 req->result = dentoffs; 1836 req->result = dentoffs;
1661 1837
1662 if (flags & EIO_READDIR_STAT_ORDER) 1838 if (flags & EIO_READDIR_STAT_ORDER)
1663 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1839 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1664 else if (flags & EIO_READDIR_DIRS_FIRST) 1840 else if (flags & EIO_READDIR_DIRS_FIRST)
1665 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1841 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1666 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1842 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1667 else 1843 else
1844 {
1845 /* in this case, all is known, and we just put dirs first and sort them */
1846 eio_dirent *oth = dents + dentoffs;
1847 eio_dirent *dir = dents;
1848
1849 /* now partition dirs to the front, and non-dirs to the back */
1850 /* by walking from both sides and swapping if necessary */
1851 while (oth > dir)
1852 {
1853 if (dir->type == EIO_DT_DIR)
1854 ++dir;
1855 else if ((--oth)->type == EIO_DT_DIR)
1856 {
1857 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1858
1859 ++dir;
1860 }
1861 }
1862
1863 /* now sort the dirs only (dirs all have the same score) */
1864 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1865 }
1866
1867 break;
1868 }
1869
1870 /* now add the entry to our list(s) */
1871 name = D_NAME (entp);
1872
1873 /* skip . and .. entries */
1874 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1875 {
1876 int len = D_NAMLEN (entp) + 1;
1877
1878 while (ecb_expect_false (namesoffs + len > namesalloc))
1879 {
1880 namesalloc *= 2;
1881 req->ptr2 = names = realloc (names, namesalloc);
1882
1883 if (!names)
1884 break;
1885 }
1886
1887 memcpy (names + namesoffs, name, len);
1888
1889 if (dents)
1890 {
1891 struct eio_dirent *ent;
1892
1893 if (ecb_expect_false (dentoffs == dentalloc))
1668 { 1894 {
1669 /* in this case, all is known, and we just put dirs first and sort them */ 1895 dentalloc *= 2;
1896 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1897
1898 if (!dents)
1899 break;
1900 }
1901
1670 eio_dirent *oth = dents + dentoffs; 1902 ent = dents + dentoffs;
1671 eio_dirent *dir = dents;
1672 1903
1673 /* now partition dirs to the front, and non-dirs to the back */ 1904 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1674 /* by walking from both sides and swapping if necessary */ 1905 ent->namelen = len - 1;
1675 while (oth > dir) 1906 ent->inode = D_INO (entp);
1907
1908 inode_bits |= ent->inode;
1909
1910 switch (D_TYPE (entp))
1911 {
1912 default:
1913 ent->type = EIO_DT_UNKNOWN;
1914 flags |= EIO_READDIR_FOUND_UNKNOWN;
1915 break;
1916
1917 #ifdef DT_FIFO
1918 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1919 #endif
1920 #ifdef DT_CHR
1921 case DT_CHR: ent->type = EIO_DT_CHR; break;
1922 #endif
1923 #ifdef DT_MPC
1924 case DT_MPC: ent->type = EIO_DT_MPC; break;
1925 #endif
1926 #ifdef DT_DIR
1927 case DT_DIR: ent->type = EIO_DT_DIR; break;
1928 #endif
1929 #ifdef DT_NAM
1930 case DT_NAM: ent->type = EIO_DT_NAM; break;
1931 #endif
1932 #ifdef DT_BLK
1933 case DT_BLK: ent->type = EIO_DT_BLK; break;
1934 #endif
1935 #ifdef DT_MPB
1936 case DT_MPB: ent->type = EIO_DT_MPB; break;
1937 #endif
1938 #ifdef DT_REG
1939 case DT_REG: ent->type = EIO_DT_REG; break;
1940 #endif
1941 #ifdef DT_NWK
1942 case DT_NWK: ent->type = EIO_DT_NWK; break;
1943 #endif
1944 #ifdef DT_CMP
1945 case DT_CMP: ent->type = EIO_DT_CMP; break;
1946 #endif
1947 #ifdef DT_LNK
1948 case DT_LNK: ent->type = EIO_DT_LNK; break;
1949 #endif
1950 #ifdef DT_SOCK
1951 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1952 #endif
1953 #ifdef DT_DOOR
1954 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1955 #endif
1956 #ifdef DT_WHT
1957 case DT_WHT: ent->type = EIO_DT_WHT; break;
1958 #endif
1959 }
1960
1961 ent->score = 7;
1962
1963 if (flags & EIO_READDIR_DIRS_FIRST)
1964 {
1965 if (ent->type == EIO_DT_UNKNOWN)
1676 { 1966 {
1677 if (dir->type == EIO_DT_DIR) 1967 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1678 ++dir; 1968 ent->score = 1;
1679 else if ((--oth)->type == EIO_DT_DIR) 1969 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1680 { 1970 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 } 1971 }
1686 1972 else if (ent->type == EIO_DT_DIR)
1687 /* now sort the dirs only (dirs all have the same score) */ 1973 ent->score = 0;
1688 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1689 } 1974 }
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 } 1975 }
1712 1976
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; 1977 namesoffs += len;
1806 ++dentoffs; 1978 ++dentoffs;
1807 } 1979 }
1808 1980
1809 if (EIO_CANCELLED (req)) 1981 if (EIO_CANCELLED (req))
1810 { 1982 {
1811 errno = ECANCELED; 1983 errno = ECANCELED;
1812 break; 1984 break;
1813 } 1985 }
1986
1987#ifdef _WIN32
1988 if (!FindNextFile (dirp, &entp))
1989 {
1990 FindClose (dirp);
1991 dirp = 0;
1814 } 1992 }
1993#endif
1994 }
1815} 1995}
1996
1997/*****************************************************************************/
1998/* working directory stuff */
1999/* various deficiencies in the posix 2008 api force us to */
2000/* keep the absolute path in string form at all times */
2001/* fuck yeah. */
2002
2003#if !HAVE_AT
2004
2005/* a bit like realpath, but usually faster because it doesn'T have to return */
2006/* an absolute or canonical path */
2007static const char *
2008wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2009{
2010 if (!wd || *path == '/')
2011 return path;
2012
2013 if (path [0] == '.' && !path [1])
2014 return wd->str;
2015
2016 {
2017 int l1 = wd->len;
2018 int l2 = strlen (path);
2019
2020 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2021
2022 memcpy (res, wd->str, l1);
2023 res [l1] = '/';
2024 memcpy (res + l1 + 1, path, l2 + 1);
2025
2026 return res;
2027 }
2028}
2029
2030#endif
2031
2032static eio_wd
2033eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2034{
2035 int fd;
2036 eio_wd res;
2037 int len = eio__realpath (tmpbuf, wd, path);
2038
2039 if (len < 0)
2040 return EIO_INVALID_WD;
2041
2042#if HAVE_AT
2043 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2044
2045 if (fd < 0)
2046 return EIO_INVALID_WD;
2047#endif
2048
2049 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2050
2051#if HAVE_AT
2052 res->fd = fd;
2053#endif
2054
2055 res->len = len;
2056 memcpy (res->str, tmpbuf->ptr, len);
2057 res->str [len] = 0;
2058
2059 return res;
2060}
2061
2062eio_wd
2063eio_wd_open_sync (eio_wd wd, const char *path)
2064{
2065 struct tmpbuf tmpbuf = { 0 };
2066 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2067 free (tmpbuf.ptr);
2068
2069 return wd;
2070}
2071
2072void
2073eio_wd_close_sync (eio_wd wd)
2074{
2075 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2076 {
2077 #if HAVE_AT
2078 close (wd->fd);
2079 #endif
2080 free (wd);
2081 }
2082}
2083
2084#if HAVE_AT
2085
2086/* they forgot these */
2087
2088static int
2089eio__truncateat (int dirfd, const char *path, off_t length)
2090{
2091 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2092 int res;
2093
2094 if (fd < 0)
2095 return fd;
2096
2097 res = ftruncate (fd, length);
2098 close (fd);
2099 return res;
2100}
2101
2102static int
2103eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2104{
2105 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2106 int res;
2107
2108 if (fd < 0)
2109 return fd;
2110
2111 res = fstatvfs (fd, buf);
2112 close (fd);
2113 return res;
2114
2115}
2116
2117#endif
1816 2118
1817/*****************************************************************************/ 2119/*****************************************************************************/
1818 2120
1819#define ALLOC(len) \ 2121#define ALLOC(len) \
1820 if (!req->ptr2) \ 2122 if (!req->ptr2) \
1829 req->result = -1; \ 2131 req->result = -1; \
1830 break; \ 2132 break; \
1831 } \ 2133 } \
1832 } 2134 }
1833 2135
2136static void ecb_noinline ecb_cold
2137etp_proc_init (void)
2138{
2139#if HAVE_PRCTL_SET_NAME
2140 /* provide a more sensible "thread name" */
2141 char name[16 + 1];
2142 const int namelen = sizeof (name) - 1;
2143 int len;
2144
2145 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2146 name [namelen] = 0;
2147 len = strlen (name);
2148 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2149 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2150#endif
2151}
2152
1834X_THREAD_PROC (etp_proc) 2153X_THREAD_PROC (etp_proc)
1835{ 2154{
1836 ETP_REQ *req; 2155 ETP_REQ *req;
1837 struct timespec ts; 2156 struct timespec ts;
1838 etp_worker *self = (etp_worker *)thr_arg; 2157 etp_worker *self = (etp_worker *)thr_arg;
1839 int timeout; 2158
2159 etp_proc_init ();
1840 2160
1841 /* try to distribute timeouts somewhat evenly */ 2161 /* try to distribute timeouts somewhat evenly */
1842 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2162 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1843 2163
1844 for (;;) 2164 for (;;)
1847 2167
1848 X_LOCK (reqlock); 2168 X_LOCK (reqlock);
1849 2169
1850 for (;;) 2170 for (;;)
1851 { 2171 {
1852 self->req = req = reqq_shift (&req_queue); 2172 req = reqq_shift (&req_queue);
1853 2173
1854 if (req) 2174 if (req)
1855 break; 2175 break;
1856 2176
1857 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2177 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1895 ++npending; 2215 ++npending;
1896 2216
1897 if (!reqq_push (&res_queue, req) && want_poll_cb) 2217 if (!reqq_push (&res_queue, req) && want_poll_cb)
1898 want_poll_cb (); 2218 want_poll_cb ();
1899 2219
1900 self->req = 0;
1901 etp_worker_clear (self); 2220 etp_worker_clear (self);
1902 2221
1903 X_UNLOCK (reslock); 2222 X_UNLOCK (reslock);
1904 } 2223 }
1905 2224
1906quit: 2225quit:
2226 free (req);
2227
1907 X_LOCK (wrklock); 2228 X_LOCK (wrklock);
1908 etp_worker_free (self); 2229 etp_worker_free (self);
1909 X_UNLOCK (wrklock); 2230 X_UNLOCK (wrklock);
1910 2231
1911 return 0; 2232 return 0;
1923eio_api_destroy (eio_req *req) 2244eio_api_destroy (eio_req *req)
1924{ 2245{
1925 free (req); 2246 free (req);
1926} 2247}
1927 2248
1928#define REQ(rtype) \ 2249#define REQ(rtype) \
1929 eio_req *req; \ 2250 eio_req *req; \
1930 \ 2251 \
1931 req = (eio_req *)calloc (1, sizeof *req); \ 2252 req = (eio_req *)calloc (1, sizeof *req); \
1932 if (!req) \ 2253 if (!req) \
1933 return 0; \ 2254 return 0; \
1947 { \ 2268 { \
1948 eio_api_destroy (req); \ 2269 eio_api_destroy (req); \
1949 return 0; \ 2270 return 0; \
1950 } 2271 }
1951 2272
2273#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
2274
1952static void 2275static void
1953eio_execute (etp_worker *self, eio_req *req) 2276eio_execute (etp_worker *self, eio_req *req)
1954{ 2277{
2278#if HAVE_AT
2279 int dirfd;
2280#else
2281 const char *path;
2282#endif
2283
1955 if (ecb_expect_false (EIO_CANCELLED (req))) 2284 if (ecb_expect_false (EIO_CANCELLED (req)))
1956 { 2285 {
1957 req->result = -1; 2286 req->result = -1;
1958 req->errorno = ECANCELED; 2287 req->errorno = ECANCELED;
1959 return; 2288 return;
1960 } 2289 }
1961 2290
2291 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2292 {
2293 req->result = -1;
2294 req->errorno = ENOENT;
2295 return;
2296 }
2297
2298 if (req->type >= EIO_OPEN)
2299 {
2300 #if HAVE_AT
2301 dirfd = WD2FD (req->wd);
2302 #else
2303 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2304 #endif
2305 }
2306
1962 switch (req->type) 2307 switch (req->type)
1963 { 2308 {
2309 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2310 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2311 break;
2312 case EIO_WD_CLOSE: req->result = 0;
2313 eio_wd_close_sync (req->wd); break;
2314
2315 case EIO_SEEK: eio__lseek (req); break;
1964 case EIO_READ: ALLOC (req->size); 2316 case EIO_READ: ALLOC (req->size);
1965 req->result = req->offs >= 0 2317 req->result = req->offs >= 0
1966 ? pread (req->int1, req->ptr2, req->size, req->offs) 2318 ? pread (req->int1, req->ptr2, req->size, req->offs)
1967 : read (req->int1, req->ptr2, req->size); break; 2319 : read (req->int1, req->ptr2, req->size); break;
1968 case EIO_WRITE: req->result = req->offs >= 0 2320 case EIO_WRITE: req->result = req->offs >= 0
1969 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2321 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1970 : write (req->int1, req->ptr2, req->size); break; 2322 : write (req->int1, req->ptr2, req->size); break;
1971 2323
1972 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2324 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; 2325 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2326
2327#if HAVE_AT
1974 2328
1975 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2329 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1976 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2330 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1977 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2331 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2332 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2333 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2334 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2335 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2336 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2337
2338 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2339 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
2340 req->result = req->wd && SINGLEDOT (req->ptr1)
2341 ? rmdir (req->wd->str)
2342 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2343 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2344 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
2345 req->result = req->wd && SINGLEDOT (req->ptr1)
2346 ? rename (req->wd->str, req->ptr2)
2347 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2348 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2349 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2350 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2351 case EIO_READLINK: ALLOC (PATH_MAX);
2352 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2353 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2354 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2355 case EIO_UTIME:
2356 case EIO_FUTIME:
2357 {
2358 struct timespec ts[2];
2359 struct timespec *times;
2360
2361 if (req->nv1 != -1. || req->nv2 != -1.)
2362 {
2363 ts[0].tv_sec = req->nv1;
2364 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2365 ts[1].tv_sec = req->nv2;
2366 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2367
2368 times = ts;
2369 }
2370 else
2371 times = 0;
2372
2373 req->result = req->type == EIO_FUTIME
2374 ? futimens (req->int1, times)
2375 : utimensat (dirfd, req->ptr1, times, 0);
2376 }
2377 break;
2378
2379#else
2380
2381 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2382 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2383 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1978 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2384 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2385 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2386 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2387 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2388 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2389
2390 case EIO_UNLINK: req->result = unlink (path ); break;
2391 case EIO_RMDIR: req->result = rmdir (path ); break;
2392 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2393 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2394 case EIO_LINK: req->result = link (path , req->ptr2); break;
2395 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2396 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2397 case EIO_READLINK: ALLOC (PATH_MAX);
2398 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2399 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2400 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2401
2402 case EIO_UTIME:
2403 case EIO_FUTIME:
2404 {
2405 struct timeval tv[2];
2406 struct timeval *times;
2407
2408 if (req->nv1 != -1. || req->nv2 != -1.)
2409 {
2410 tv[0].tv_sec = req->nv1;
2411 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2412 tv[1].tv_sec = req->nv2;
2413 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2414
2415 times = tv;
2416 }
2417 else
2418 times = 0;
2419
2420 req->result = req->type == EIO_FUTIME
2421 ? futimes (req->int1, times)
2422 : utimes (req->ptr1, times);
2423 }
2424 break;
2425
2426#endif
2427
2428 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2429 {
2430 ALLOC (req->result);
2431 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2432 }
2433 break;
2434
1979 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2435 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1980 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2436 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1981 2437
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)); 2438 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1985 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2439 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1986 2440
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; 2441 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; 2442 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; 2443 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1993 2444
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; 2445 case EIO_CLOSE: req->result = close (req->int1); break;
1996 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2446 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; 2447 case EIO_SYNC: req->result = 0; sync (); break;
2011 case EIO_FSYNC: req->result = fsync (req->int1); break; 2448 case EIO_FSYNC: req->result = fsync (req->int1); break;
2012 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2449 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2450 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2451 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; 2452 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2014 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2453 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2015 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2454 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2016 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2455 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; 2456 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2019 2457
2020 case EIO_READDIR: eio__scandir (req, self); break; 2458 case EIO_READDIR: eio__scandir (req, self); break;
2021 2459
2022 case EIO_BUSY: 2460 case EIO_BUSY:
2032 req->result = select (0, 0, 0, 0, &tv); 2470 req->result = select (0, 0, 0, 0, &tv);
2033 } 2471 }
2034#endif 2472#endif
2035 break; 2473 break;
2036 2474
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: 2475 case EIO_GROUP:
2062 abort (); /* handled in eio_request */ 2476 abort (); /* handled in eio_request */
2063 2477
2064 case EIO_NOP: 2478 case EIO_NOP:
2065 req->result = 0; 2479 req->result = 0;
2068 case EIO_CUSTOM: 2482 case EIO_CUSTOM:
2069 req->feed (req); 2483 req->feed (req);
2070 break; 2484 break;
2071 2485
2072 default: 2486 default:
2073 errno = ENOSYS;
2074 req->result = -1; 2487 req->result = EIO_ENOSYS ();
2075 break; 2488 break;
2076 } 2489 }
2077 2490
2078 req->errorno = errno; 2491 req->errorno = errno;
2079} 2492}
2080 2493
2081#ifndef EIO_NO_WRAPPERS 2494#ifndef EIO_NO_WRAPPERS
2082 2495
2496eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2497{
2498 REQ (EIO_WD_OPEN); PATH; SEND;
2499}
2500
2501eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2502{
2503 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2504}
2505
2083eio_req *eio_nop (int pri, eio_cb cb, void *data) 2506eio_req *eio_nop (int pri, eio_cb cb, void *data)
2084{ 2507{
2085 REQ (EIO_NOP); SEND; 2508 REQ (EIO_NOP); SEND;
2086} 2509}
2087 2510
2103eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2526eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2104{ 2527{
2105 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2528 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2106} 2529}
2107 2530
2531eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2532{
2533 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2534}
2535
2536eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2537{
2538 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2539}
2540
2541eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2542{
2543 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2544}
2545
2108eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2546eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2109{ 2547{
2110 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2548 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2111} 2549}
2112 2550
2118eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2556eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2119{ 2557{
2120 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2558 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2121} 2559}
2122 2560
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) 2561eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2129{ 2562{
2130 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2563 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2131} 2564}
2132 2565
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) 2566eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2139{ 2567{
2140 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2568 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2141} 2569}
2142 2570
2143eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2571eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2144{ 2572{
2145 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2573 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2146} 2574}
2147 2575
2576eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2577{
2578 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2579}
2580
2148eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2581eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2149{ 2582{
2150 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2583 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2151} 2584}
2152 2585
2178eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2611eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2179{ 2612{
2180 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2613 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2181} 2614}
2182 2615
2183eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2616eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2184{ 2617{
2185 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2618 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2186} 2619}
2187 2620
2188eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2621eio_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) 2641eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2209{ 2642{
2210 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2643 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2211} 2644}
2212 2645
2213eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2646eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2214{ 2647{
2215 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2648 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2216} 2649}
2217 2650
2218eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2651eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
2365} 2798}
2366 2799
2367/*****************************************************************************/ 2800/*****************************************************************************/
2368/* misc garbage */ 2801/* misc garbage */
2369 2802
2370ssize_t 2803eio_ssize_t
2371eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2804eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2372{ 2805{
2373 etp_worker wrk;
2374 ssize_t ret;
2375
2376 wrk.dbuf = 0;
2377
2378 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2806 return eio__sendfile (ofd, ifd, offset, count);
2379
2380 if (wrk.dbuf)
2381 free (wrk.dbuf);
2382
2383 return ret;
2384} 2807}
2385 2808

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines