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

Comparing libeio/eio.c (file contents):
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.127 by root, Mon Feb 18 03:15:19 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>
… …
71#endif 71#endif
72#ifndef ELOOP 72#ifndef ELOOP
73# define ELOOP EDOM 73# define ELOOP EDOM
74#endif 74#endif
75 75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
76static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
77 81
78#ifndef EIO_FINISH 82#ifndef EIO_FINISH
79# 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
80#endif 84#endif
… …
101#ifdef _WIN32 105#ifdef _WIN32
102 106
103 #undef PAGESIZE 107 #undef PAGESIZE
104 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
105 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
106 #ifdef EIO_STRUCT_STATI64 112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
107 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
108 #define fstat(fd,buf) _fstati64 (path,buf) 115 #define fstat(fd,buf) _fstati64 (fd,buf)
109 #endif 116 #endif
110 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
111 #define fsync(fd) (FlushFileBuffers ((HANDLE)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))
112 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
113 #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))
… …
125 #define sync() EIO_ENOSYS () 132 #define sync() EIO_ENOSYS ()
126 #define readlink(path,buf,s) EIO_ENOSYS () 133 #define readlink(path,buf,s) EIO_ENOSYS ()
127 #define statvfs(path,buf) EIO_ENOSYS () 134 #define statvfs(path,buf) EIO_ENOSYS ()
128 #define fstatvfs(fd,buf) EIO_ENOSYS () 135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
129 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 }
202
130 /* we could even stat and see if it exists */ 203 /* we could even stat and see if it exists */
131 static int 204 static int
132 symlink (const char *old, const char *neu) 205 symlink (const char *old, const char *neu)
133 { 206 {
134 #if WINVER >= 0x0600 207 #if WINVER >= 0x0600
… …
158 231
159#else 232#else
160 233
161 #include <sys/time.h> 234 #include <sys/time.h>
162 #include <sys/select.h> 235 #include <sys/select.h>
163 #include <sys/statvfs.h>
164 #include <unistd.h> 236 #include <unistd.h>
165 #include <utime.h>
166 #include <signal.h> 237 #include <signal.h>
167 #include <dirent.h> 238 #include <dirent.h>
239
240 #if 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
168 248
169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 249 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170 #include <sys/mman.h> 250 #include <sys/mman.h>
171 #endif 251 #endif
172 252
173 #define D_NAME(entp) entp->d_name 253 #define D_NAME(entp) entp->d_name
174 254
175 /* 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 */
176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 256 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
177 #define _DIRENT_HAVE_D_TYPE /* sigh */ 257 #define _DIRENT_HAVE_D_TYPE /* sigh */
178 #define D_INO(de) (de)->d_fileno 258 #define D_INO(de) (de)->d_fileno
179 #define D_NAMLEN(de) (de)->d_namlen 259 #define D_NAMLEN(de) (de)->d_namlen
180 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 260 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
181 #define D_INO(de) (de)->d_ino 261 #define D_INO(de) (de)->d_ino
… …
192 272
193 #ifndef EIO_STRUCT_DIRENT 273 #ifndef EIO_STRUCT_DIRENT
194 #define EIO_STRUCT_DIRENT struct dirent 274 #define EIO_STRUCT_DIRENT struct dirent
195 #endif 275 #endif
196 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>
197#endif 289#endif
198 290
199#if HAVE_SENDFILE 291#if HAVE_SENDFILE
200# if __linux 292# if __linux
201# include <sys/sendfile.h> 293# include <sys/sendfile.h>
… …
232#endif 324#endif
233 325
234/* buffer size for various temporary buffers */ 326/* buffer size for various temporary buffers */
235#define EIO_BUFSIZE 65536 327#define EIO_BUFSIZE 65536
236 328
237#define dBUF \ 329#define dBUF \
238 char *eio_buf; \
239 ETP_WORKER_LOCK (self); \
240 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 330 char *eio_buf = malloc (EIO_BUFSIZE); \
241 ETP_WORKER_UNLOCK (self); \
242 errno = ENOMEM; \ 331 errno = ENOMEM; \
243 if (!eio_buf) \ 332 if (!eio_buf) \
244 return -1; 333 return -1
334
335#define FUBd \
336 free (eio_buf)
245 337
246#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/*****************************************************************************/
247 383
248#define ETP_PRI_MIN EIO_PRI_MIN 384#define ETP_PRI_MIN EIO_PRI_MIN
249#define ETP_PRI_MAX EIO_PRI_MAX 385#define ETP_PRI_MAX EIO_PRI_MAX
250 386
251struct etp_worker; 387struct etp_worker;
… …
255static int eio_finish (eio_req *req); 391static int eio_finish (eio_req *req);
256#define ETP_FINISH(req) eio_finish (req) 392#define ETP_FINISH(req) eio_finish (req)
257static void eio_execute (struct etp_worker *self, eio_req *req); 393static void eio_execute (struct etp_worker *self, eio_req *req);
258#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 394#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
259 395
260#define ETP_WORKER_CLEAR(req) \
261 if (wrk->dbuf) \
262 { \
263 free (wrk->dbuf); \
264 wrk->dbuf = 0; \
265 }
266
267#define ETP_WORKER_COMMON \
268 void *dbuf;
269
270/*****************************************************************************/ 396/*****************************************************************************/
271 397
272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 398#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273 399
274/* calculate time difference in ~1/EIO_TICKS of a second */ 400/* calculate time difference in ~1/EIO_TICKS of a second */
… …
285static void (*done_poll_cb) (void); 411static void (*done_poll_cb) (void);
286 412
287static unsigned int max_poll_time; /* reslock */ 413static unsigned int max_poll_time; /* reslock */
288static unsigned int max_poll_reqs; /* reslock */ 414static unsigned int max_poll_reqs; /* reslock */
289 415
290static volatile unsigned int nreqs; /* reqlock */ 416static unsigned int nreqs; /* reqlock */
291static volatile unsigned int nready; /* reqlock */ 417static unsigned int nready; /* reqlock */
292static volatile unsigned int npending; /* reqlock */ 418static unsigned int npending; /* reqlock */
293static 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 */
294static 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 */
295 421
296static xmutex_t wrklock; 422static xmutex_t wrklock;
297static xmutex_t reslock; 423static xmutex_t reslock;
298static xmutex_t reqlock; 424static xmutex_t reqlock;
299static xcond_t reqwait; 425static xcond_t reqwait;
300 426
301#if !HAVE_PREADWRITE
302/*
303 * make our pread/pwrite emulation safe against themselves, but not against
304 * normal read/write by using a mutex. slows down execution a lot,
305 * but that's your problem, not mine.
306 */
307static xmutex_t preadwritelock;
308#endif
309
310typedef struct etp_worker 427typedef struct etp_worker
311{ 428{
429 struct tmpbuf tmpbuf;
430
312 /* locked by wrklock */ 431 /* locked by wrklock */
313 struct etp_worker *prev, *next; 432 struct etp_worker *prev, *next;
314 433
315 xthread_t tid; 434 xthread_t tid;
316 435
317 /* locked by reslock, reqlock or wrklock */ 436#ifdef ETP_WORKER_COMMON
318 ETP_REQ *req; /* currently processed request */
319
320 ETP_WORKER_COMMON 437 ETP_WORKER_COMMON
438#endif
321} etp_worker; 439} etp_worker;
322 440
323static etp_worker wrk_first; /* NOT etp */ 441static etp_worker wrk_first; /* NOT etp */
324 442
325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 443#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 444#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
327 445
328/* worker threads management */ 446/* worker threads management */
329 447
330static void ecb_cold 448static void
331etp_worker_clear (etp_worker *wrk) 449etp_worker_clear (etp_worker *wrk)
332{ 450{
333 ETP_WORKER_CLEAR (wrk);
334} 451}
335 452
336static void ecb_cold 453static void ecb_cold
337etp_worker_free (etp_worker *wrk) 454etp_worker_free (etp_worker *wrk)
338{ 455{
456 free (wrk->tmpbuf.ptr);
457
339 wrk->next->prev = wrk->prev; 458 wrk->next->prev = wrk->prev;
340 wrk->prev->next = wrk->next; 459 wrk->prev->next = wrk->next;
341 460
342 free (wrk); 461 free (wrk);
343} 462}
… …
491 /*TODO*/ 610 /*TODO*/
492 assert (("unable to allocate worker thread data", wrk)); 611 assert (("unable to allocate worker thread data", wrk));
493 612
494 X_LOCK (wrklock); 613 X_LOCK (wrklock);
495 614
496 if (thread_create (&wrk->tid, etp_proc, (void *)wrk)) 615 if (xthread_create (&wrk->tid, etp_proc, (void *)wrk))
497 { 616 {
498 wrk->prev = &wrk_first; 617 wrk->prev = &wrk_first;
499 wrk->next = wrk_first.next; 618 wrk->next = wrk_first.next;
500 wrk_first.next->prev = wrk; 619 wrk_first.next->prev = wrk;
501 wrk_first.next = wrk; 620 wrk_first.next = wrk;
… …
521} 640}
522 641
523static void ecb_cold 642static void ecb_cold
524etp_end_thread (void) 643etp_end_thread (void)
525{ 644{
526 eio_req *req = calloc (1, sizeof (eio_req)); 645 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
527 646
528 req->type = -1; 647 req->type = -1;
529 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 648 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
530 649
531 X_LOCK (reqlock); 650 X_LOCK (reqlock);
… …
858} 977}
859 978
860/*****************************************************************************/ 979/*****************************************************************************/
861/* work around various missing functions */ 980/* work around various missing functions */
862 981
863#if !HAVE_PREADWRITE
864# undef pread
865# undef pwrite
866# define pread eio__pread
867# define pwrite eio__pwrite
868
869static eio_ssize_t
870eio__pread (int fd, void *buf, size_t count, off_t offset)
871{
872 eio_ssize_t res;
873 off_t ooffset;
874
875 X_LOCK (preadwritelock);
876 ooffset = lseek (fd, 0, SEEK_CUR);
877 lseek (fd, offset, SEEK_SET);
878 res = read (fd, buf, count);
879 lseek (fd, ooffset, SEEK_SET);
880 X_UNLOCK (preadwritelock);
881
882 return res;
883}
884
885static eio_ssize_t
886eio__pwrite (int fd, void *buf, size_t count, off_t offset)
887{
888 eio_ssize_t res;
889 off_t ooffset;
890
891 X_LOCK (preadwritelock);
892 ooffset = lseek (fd, 0, SEEK_CUR);
893 lseek (fd, offset, SEEK_SET);
894 res = write (fd, buf, count);
895 lseek (fd, ooffset, SEEK_SET);
896 X_UNLOCK (preadwritelock);
897
898 return res;
899}
900#endif
901
902#ifndef HAVE_UTIMES 982#ifndef HAVE_UTIMES
903 983
904# undef utimes 984# undef utimes
905# define utimes(path,times) eio__utimes (path, times) 985# define utimes(path,times) eio__utimes (path, times)
906 986
… …
938 1018
939#if !HAVE_FDATASYNC 1019#if !HAVE_FDATASYNC
940# undef fdatasync 1020# undef fdatasync
941# define fdatasync(fd) fsync (fd) 1021# define fdatasync(fd) fsync (fd)
942#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}
943 1040
944/* sync_file_range always needs emulation */ 1041/* sync_file_range always needs emulation */
945static int 1042static int
946eio__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)
947{ 1044{
… …
970} 1067}
971 1068
972static int 1069static int
973eio__fallocate (int fd, int mode, off_t offset, size_t len) 1070eio__fallocate (int fd, int mode, off_t offset, size_t len)
974{ 1071{
975#if HAVE_FALLOCATE 1072#if HAVE_LINUX_FALLOCATE
976 return fallocate (fd, mode, offset, len); 1073 return fallocate (fd, mode, offset, len);
977#else 1074#else
978 errno = ENOSYS; 1075 return EIO_ENOSYS ();
979 return -1;
980#endif 1076#endif
981} 1077}
982 1078
983#if !HAVE_READAHEAD 1079#if !HAVE_READAHEAD
984# undef readahead 1080# undef readahead
… …
997 pread (fd, eio_buf, len, offset); 1093 pread (fd, eio_buf, len, offset);
998 offset += len; 1094 offset += len;
999 todo -= len; 1095 todo -= len;
1000 } 1096 }
1001 1097
1002 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 */
1003 return count; 1102 return 0;
1004} 1103}
1005 1104
1006#endif 1105#endif
1007 1106
1008/* sendfile always needs emulation */ 1107/* sendfile always needs emulation */
1009static eio_ssize_t 1108static eio_ssize_t
1010eio__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)
1011{ 1110{
1012 eio_ssize_t written = 0; 1111 eio_ssize_t written = 0;
1013 eio_ssize_t res; 1112 eio_ssize_t res;
1014 1113
1015 if (!count) 1114 if (!count)
… …
1043 1142
1044 /* according to source inspection, this is correct, and useful behaviour */ 1143 /* according to source inspection, this is correct, and useful behaviour */
1045 if (sbytes) 1144 if (sbytes)
1046 res = sbytes; 1145 res = sbytes;
1047 1146
1048# elif defined (__APPLE__) 1147# elif defined __APPLE__
1049 off_t sbytes = count; 1148 off_t sbytes = count;
1050 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1149 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1051 1150
1052 /* according to the manpage, sbytes is always valid */ 1151 /* according to the manpage, sbytes is always valid */
1053 if (sbytes) 1152 if (sbytes)
… …
1080 HANDLE h = TO_SOCKET (ifd); 1179 HANDLE h = TO_SOCKET (ifd);
1081 SetFilePointer (h, offset, 0, FILE_BEGIN); 1180 SetFilePointer (h, offset, 0, FILE_BEGIN);
1082 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1181 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1083 1182
1084#else 1183#else
1085 res = -1; 1184 res = EIO_ENOSYS ();
1086 errno = ENOSYS;
1087#endif 1185#endif
1088 1186
1089 /* we assume sendfile can copy at least 128mb in one go */ 1187 /* we assume sendfile can copy at least 128mb in one go */
1090 if (res <= 128 * 1024 * 1024) 1188 if (res <= 128 * 1024 * 1024)
1091 { 1189 {
… …
1151 1249
1152 offset += cnt; 1250 offset += cnt;
1153 res += cnt; 1251 res += cnt;
1154 count -= cnt; 1252 count -= cnt;
1155 } 1253 }
1254
1255 FUBd;
1156 } 1256 }
1157 1257
1158 return res; 1258 return res;
1159} 1259}
1160 1260
… …
1276 1376
1277/*****************************************************************************/ 1377/*****************************************************************************/
1278/* requests implemented outside eio_execute, because they are so large */ 1378/* requests implemented outside eio_execute, because they are so large */
1279 1379
1280static void 1380static void
1281eio__realpath (eio_req *req, etp_worker *self) 1381eio__lseek (eio_req *req)
1282{ 1382{
1283 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;
1284 char *res; 1399 char *res;
1285 char *tmp1, *tmp2; 1400 char *tmp1, *tmp2;
1286#if SYMLOOP_MAX > 32 1401#if SYMLOOP_MAX > 32
1287 int symlinks = SYMLOOP_MAX; 1402 int symlinks = SYMLOOP_MAX;
1288#else 1403#else
1289 int symlinks = 32; 1404 int symlinks = 32;
1290#endif 1405#endif
1291 1406
1292 req->result = -1;
1293
1294 errno = EINVAL; 1407 errno = EINVAL;
1295 if (!rel) 1408 if (!rel)
1296 return; 1409 return -1;
1297 1410
1298 errno = ENOENT; 1411 errno = ENOENT;
1299 if (!*rel) 1412 if (!*rel)
1300 return; 1413 return -1;
1301 1414
1302 if (!req->ptr2) 1415 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1303 {
1304 X_LOCK (wrklock);
1305 req->flags |= EIO_FLAG_PTR2_FREE;
1306 X_UNLOCK (wrklock);
1307 req->ptr2 = malloc (PATH_MAX * 3);
1308
1309 errno = ENOMEM;
1310 if (!req->ptr2)
1311 return;
1312 }
1313
1314 res = req->ptr2;
1315 tmp1 = res + PATH_MAX; 1416 tmp1 = res + PATH_MAX;
1316 tmp2 = tmp1 + PATH_MAX; 1417 tmp2 = tmp1 + PATH_MAX;
1317 1418
1318#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 */
1319#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1420#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
… …
1323 1424
1324 if (fd >= 0) 1425 if (fd >= 0)
1325 { 1426 {
1326 sprintf (tmp1, "/proc/self/fd/%d", fd); 1427 sprintf (tmp1, "/proc/self/fd/%d", fd);
1327 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 */
1328 close (fd); 1430 close (fd);
1329
1330 /* here we should probably stat the open file and the disk file, to make sure they still match */
1331 1431
1332 if (req->result > 0) 1432 if (req->result > 0)
1333 goto done; 1433 goto done;
1334 } 1434 }
1335 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)
1336 return; 1436 return -1;
1337 } 1437 }
1338#endif 1438#endif
1339#endif 1439#endif
1340 1440
1341 if (*rel != '/') 1441 if (*rel != '/')
1342 { 1442 {
1443 int len;
1444
1445 errno = ENOENT;
1446 if (wd == EIO_INVALID_WD)
1447 return -1;
1448
1449 if (wd == EIO_CWD)
1450 {
1343 if (!getcwd (res, PATH_MAX)) 1451 if (!getcwd (res, PATH_MAX))
1344 return; 1452 return -1;
1453
1454 len = strlen (res);
1455 }
1456 else
1457 memcpy (res, wd->str, len = wd->len);
1345 1458
1346 if (res [1]) /* only use if not / */ 1459 if (res [1]) /* only use if not / */
1347 res += strlen (res); 1460 res += len;
1348 } 1461 }
1349 1462
1350 while (*rel) 1463 while (*rel)
1351 { 1464 {
1352 eio_ssize_t len, linklen; 1465 eio_ssize_t len, linklen;
1353 char *beg = rel; 1466 const char *beg = rel;
1354 1467
1355 while (*rel && *rel != '/') 1468 while (*rel && *rel != '/')
1356 ++rel; 1469 ++rel;
1357 1470
1358 len = rel - beg; 1471 len = rel - beg;
… …
1370 1483
1371 if (beg [1] == '.' && len == 2) 1484 if (beg [1] == '.' && len == 2)
1372 { 1485 {
1373 /* .. - back up one component, if possible */ 1486 /* .. - back up one component, if possible */
1374 1487
1375 while (res != req->ptr2) 1488 while (res != tmpbuf->ptr)
1376 if (*--res == '/') 1489 if (*--res == '/')
1377 break; 1490 break;
1378 1491
1379 continue; 1492 continue;
1380 } 1493 }
1381 } 1494 }
1382 1495
1383 errno = ENAMETOOLONG; 1496 errno = ENAMETOOLONG;
1384 if (res + 1 + len + 1 >= tmp1) 1497 if (res + 1 + len + 1 >= tmp1)
1385 return; 1498 return -1;
1386 1499
1387 /* copy one component */ 1500 /* copy one component */
1388 *res = '/'; 1501 *res = '/';
1389 memcpy (res + 1, beg, len); 1502 memcpy (res + 1, beg, len);
1390 1503
1391 /* zero-terminate, for readlink */ 1504 /* zero-terminate, for readlink */
1392 res [len + 1] = 0; 1505 res [len + 1] = 0;
1393 1506
1394 /* now check if it's a symlink */ 1507 /* now check if it's a symlink */
1395 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1508 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1396 1509
1397 if (linklen < 0) 1510 if (linklen < 0)
1398 { 1511 {
1399 if (errno != EINVAL) 1512 if (errno != EINVAL)
1400 return; 1513 return -1;
1401 1514
1402 /* it's a normal directory. hopefully */ 1515 /* it's a normal directory. hopefully */
1403 res += len + 1; 1516 res += len + 1;
1404 } 1517 }
1405 else 1518 else
… …
1407 /* yay, it was a symlink - build new path in tmp2 */ 1520 /* yay, it was a symlink - build new path in tmp2 */
1408 int rellen = strlen (rel); 1521 int rellen = strlen (rel);
1409 1522
1410 errno = ENAMETOOLONG; 1523 errno = ENAMETOOLONG;
1411 if (linklen + 1 + rellen >= PATH_MAX) 1524 if (linklen + 1 + rellen >= PATH_MAX)
1412 return; 1525 return -1;
1413 1526
1414 errno = ELOOP; 1527 errno = ELOOP;
1415 if (!--symlinks) 1528 if (!--symlinks)
1416 return; 1529 return -1;
1417 1530
1418 if (*tmp1 == '/') 1531 if (*tmp1 == '/')
1419 res = req->ptr2; /* symlink resolves to an absolute path */ 1532 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1420 1533
1421 /* 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 */
1422 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1535 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1423 tmp2 [linklen] = '/'; 1536 tmp2 [linklen] = '/';
1424 memcpy (tmp2, tmp1, linklen); 1537 memcpy (tmp2, tmp1, linklen);
… …
1426 rel = tmp2; 1539 rel = tmp2;
1427 } 1540 }
1428 } 1541 }
1429 1542
1430 /* special case for the lone root path */ 1543 /* special case for the lone root path */
1431 if (res == req->ptr2) 1544 if (res == tmpbuf->ptr)
1432 *res++ = '/'; 1545 *res++ = '/';
1433 1546
1434 req->result = res - (char *)req->ptr2; 1547 return res - (char *)tmpbuf->ptr;
1435
1436done:
1437 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1438} 1548}
1439 1549
1440static signed char 1550static signed char
1441eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1551eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1442{ 1552{
… …
1630#ifdef _WIN32 1740#ifdef _WIN32
1631 { 1741 {
1632 int len = strlen ((const char *)req->ptr1); 1742 int len = strlen ((const char *)req->ptr1);
1633 char *path = malloc (MAX_PATH); 1743 char *path = malloc (MAX_PATH);
1634 const char *fmt; 1744 const char *fmt;
1745 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1635 1746
1636 if (!len) 1747 if (!len)
1637 fmt = "./*"; 1748 fmt = "./*";
1638 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1749 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1639 fmt = "%s*"; 1750 fmt = "%s*";
1640 else 1751 else
1641 fmt = "%s/*"; 1752 fmt = "%s/*";
1642 1753
1643 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1754 _snprintf (path, MAX_PATH, fmt, reqpath);
1644 dirp = FindFirstFile (path, &entp); 1755 dirp = FindFirstFile (path, &entp);
1645 free (path); 1756 free (path);
1646 1757
1647 if (dirp == INVALID_HANDLE_VALUE) 1758 if (dirp == INVALID_HANDLE_VALUE)
1648 { 1759 {
1649 dirp = 0; 1760 /* should steal _dosmaperr */
1650
1651 switch (GetLastError ()) 1761 switch (GetLastError ())
1652 { 1762 {
1653 case ERROR_FILE_NOT_FOUND: 1763 case ERROR_FILE_NOT_FOUND:
1654 req->result = 0; 1764 req->result = 0;
1655 break; 1765 break;
1656 1766
1657 case ERROR_INVALID_NAME: 1767 case ERROR_INVALID_NAME:
1658 case ERROR_PATH_NOT_FOUND: 1768 case ERROR_PATH_NOT_FOUND:
1659 case ERROR_NO_MORE_FILES: 1769 case ERROR_NO_MORE_FILES:
1660 errno = ENOENT; 1770 errno = ENOENT;
1661 break; 1771 break;
1662 1772
1663 case ERROR_NOT_ENOUGH_MEMORY: 1773 case ERROR_NOT_ENOUGH_MEMORY:
1664 errno = ENOMEM; 1774 errno = ENOMEM;
1665 break; 1775 break;
1666 1776
1667 default: 1777 default:
1668 errno = EINVAL; 1778 errno = EINVAL;
1669 break; 1779 break;
1670 } 1780 }
1781
1782 return;
1671 } 1783 }
1672 } 1784 }
1673#else 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
1674 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;
1675#endif 1807#endif
1676 1808
1677 if (req->flags & EIO_FLAG_PTR1_FREE) 1809 if (req->flags & EIO_FLAG_PTR1_FREE)
1678 free (req->ptr1); 1810 free (req->ptr1);
1679 1811
1680 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1812 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1681 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1813 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1682 req->ptr2 = names = malloc (namesalloc); 1814 req->ptr2 = names = malloc (namesalloc);
1683 1815
1684 if (dirp && names && (!flags || dents)) 1816 if (!names || (flags && !dents))
1817 return;
1818
1685 for (;;) 1819 for (;;)
1686 { 1820 {
1687 int done; 1821 int done;
1688 1822
1689#ifdef _WIN32 1823#ifdef _WIN32
1690 done = !dirp; 1824 done = !dirp;
1691#else 1825#else
1692 errno = 0; 1826 errno = 0;
1693 entp = readdir (dirp); 1827 entp = readdir (dirp);
1694 done = !entp; 1828 done = !entp;
1695#endif 1829#endif
1696 1830
1697 if (done) 1831 if (done)
1698 { 1832 {
1699#ifndef _WIN32 1833#ifndef _WIN32
1700 int old_errno = errno; 1834 int old_errno = errno;
1701 closedir (dirp); 1835 closedir (dirp);
1702 errno = old_errno; 1836 errno = old_errno;
1703 1837
1704 if (errno) 1838 if (errno)
1705 break; 1839 break;
1706#endif 1840#endif
1707 1841
1708 /* sort etc. */ 1842 /* sort etc. */
1709 req->int1 = flags; 1843 req->int1 = flags;
1710 req->result = dentoffs; 1844 req->result = dentoffs;
1711 1845
1712 if (flags & EIO_READDIR_STAT_ORDER) 1846 if (flags & EIO_READDIR_STAT_ORDER)
1713 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);
1714 else if (flags & EIO_READDIR_DIRS_FIRST) 1848 else if (flags & EIO_READDIR_DIRS_FIRST)
1715 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1849 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1716 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 */
1717 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))
1718 { 1902 {
1719 /* 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
1720 eio_dirent *oth = dents + dentoffs; 1910 ent = dents + dentoffs;
1721 eio_dirent *dir = dents;
1722 1911
1723 /* 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 */
1724 /* by walking from both sides and swapping if necessary */ 1913 ent->namelen = len - 1;
1725 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)
1726 { 1974 {
1727 if (dir->type == EIO_DT_DIR) 1975 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1728 ++dir; 1976 ent->score = 1;
1729 else if ((--oth)->type == EIO_DT_DIR) 1977 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1730 { 1978 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1731 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1732
1733 ++dir;
1734 }
1735 } 1979 }
1736 1980 else if (ent->type == EIO_DT_DIR)
1737 /* now sort the dirs only (dirs all have the same score) */ 1981 ent->score = 0;
1738 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1739 } 1982 }
1740
1741 break;
1742 }
1743
1744 /* now add the entry to our list(s) */
1745 name = D_NAME (entp);
1746
1747 /* skip . and .. entries */
1748 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1749 {
1750 int len = D_NAMLEN (entp) + 1;
1751
1752 while (ecb_expect_false (namesoffs + len > namesalloc))
1753 {
1754 namesalloc *= 2;
1755 req->ptr2 = names = realloc (names, namesalloc);
1756
1757 if (!names)
1758 break;
1759 } 1983 }
1760 1984
1761 memcpy (names + namesoffs, name, len);
1762
1763 if (dents)
1764 {
1765 struct eio_dirent *ent;
1766
1767 if (ecb_expect_false (dentoffs == dentalloc))
1768 {
1769 dentalloc *= 2;
1770 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1771
1772 if (!dents)
1773 break;
1774 }
1775
1776 ent = dents + dentoffs;
1777
1778 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1779 ent->namelen = len - 1;
1780 ent->inode = D_INO (entp);
1781
1782 inode_bits |= ent->inode;
1783
1784 switch (D_TYPE (entp))
1785 {
1786 default:
1787 ent->type = EIO_DT_UNKNOWN;
1788 flags |= EIO_READDIR_FOUND_UNKNOWN;
1789 break;
1790
1791 #ifdef DT_FIFO
1792 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1793 #endif
1794 #ifdef DT_CHR
1795 case DT_CHR: ent->type = EIO_DT_CHR; break;
1796 #endif
1797 #ifdef DT_MPC
1798 case DT_MPC: ent->type = EIO_DT_MPC; break;
1799 #endif
1800 #ifdef DT_DIR
1801 case DT_DIR: ent->type = EIO_DT_DIR; break;
1802 #endif
1803 #ifdef DT_NAM
1804 case DT_NAM: ent->type = EIO_DT_NAM; break;
1805 #endif
1806 #ifdef DT_BLK
1807 case DT_BLK: ent->type = EIO_DT_BLK; break;
1808 #endif
1809 #ifdef DT_MPB
1810 case DT_MPB: ent->type = EIO_DT_MPB; break;
1811 #endif
1812 #ifdef DT_REG
1813 case DT_REG: ent->type = EIO_DT_REG; break;
1814 #endif
1815 #ifdef DT_NWK
1816 case DT_NWK: ent->type = EIO_DT_NWK; break;
1817 #endif
1818 #ifdef DT_CMP
1819 case DT_CMP: ent->type = EIO_DT_CMP; break;
1820 #endif
1821 #ifdef DT_LNK
1822 case DT_LNK: ent->type = EIO_DT_LNK; break;
1823 #endif
1824 #ifdef DT_SOCK
1825 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1826 #endif
1827 #ifdef DT_DOOR
1828 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1829 #endif
1830 #ifdef DT_WHT
1831 case DT_WHT: ent->type = EIO_DT_WHT; break;
1832 #endif
1833 }
1834
1835 ent->score = 7;
1836
1837 if (flags & EIO_READDIR_DIRS_FIRST)
1838 {
1839 if (ent->type == EIO_DT_UNKNOWN)
1840 {
1841 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1842 ent->score = 1;
1843 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1844 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1845 }
1846 else if (ent->type == EIO_DT_DIR)
1847 ent->score = 0;
1848 }
1849 }
1850
1851 namesoffs += len; 1985 namesoffs += len;
1852 ++dentoffs; 1986 ++dentoffs;
1853 } 1987 }
1854 1988
1855 if (EIO_CANCELLED (req)) 1989 if (EIO_CANCELLED (req))
1856 { 1990 {
1857 errno = ECANCELED; 1991 errno = ECANCELED;
1858 break; 1992 break;
1859 } 1993 }
1860 1994
1861#ifdef _WIN32 1995#ifdef _WIN32
1862 if (!FindNextFile (dirp, &entp)) 1996 if (!FindNextFile (dirp, &entp))
1863 { 1997 {
1864 FindClose (dirp); 1998 FindClose (dirp);
1865 dirp = 0; 1999 dirp = 0;
1866 } 2000 }
1867#endif 2001#endif
1868 } 2002 }
1869} 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
1870 2126
1871/*****************************************************************************/ 2127/*****************************************************************************/
1872 2128
1873#define ALLOC(len) \ 2129#define ALLOC(len) \
1874 if (!req->ptr2) \ 2130 if (!req->ptr2) \
… …
1883 req->result = -1; \ 2139 req->result = -1; \
1884 break; \ 2140 break; \
1885 } \ 2141 } \
1886 } 2142 }
1887 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
1888X_THREAD_PROC (etp_proc) 2161X_THREAD_PROC (etp_proc)
1889{ 2162{
1890 ETP_REQ *req; 2163 ETP_REQ *req;
1891 struct timespec ts; 2164 struct timespec ts;
1892 etp_worker *self = (etp_worker *)thr_arg; 2165 etp_worker *self = (etp_worker *)thr_arg;
1893 2166
2167 etp_proc_init ();
2168
1894 /* try to distribute timeouts somewhat evenly */ 2169 /* try to distribute timeouts somewhat evenly */
1895 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2170 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1896 2171
1897 for (;;) 2172 for (;;)
1898 { 2173 {
… …
1900 2175
1901 X_LOCK (reqlock); 2176 X_LOCK (reqlock);
1902 2177
1903 for (;;) 2178 for (;;)
1904 { 2179 {
1905 self->req = req = reqq_shift (&req_queue); 2180 req = reqq_shift (&req_queue);
1906 2181
1907 if (req) 2182 if (req)
1908 break; 2183 break;
1909 2184
1910 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 */
… …
1948 ++npending; 2223 ++npending;
1949 2224
1950 if (!reqq_push (&res_queue, req) && want_poll_cb) 2225 if (!reqq_push (&res_queue, req) && want_poll_cb)
1951 want_poll_cb (); 2226 want_poll_cb ();
1952 2227
1953 self->req = 0;
1954 etp_worker_clear (self); 2228 etp_worker_clear (self);
1955 2229
1956 X_UNLOCK (reslock); 2230 X_UNLOCK (reslock);
1957 } 2231 }
1958 2232
1959quit: 2233quit:
2234 free (req);
2235
1960 X_LOCK (wrklock); 2236 X_LOCK (wrklock);
1961 etp_worker_free (self); 2237 etp_worker_free (self);
1962 X_UNLOCK (wrklock); 2238 X_UNLOCK (wrklock);
1963 2239
1964 return 0; 2240 return 0;
… …
1967/*****************************************************************************/ 2243/*****************************************************************************/
1968 2244
1969int ecb_cold 2245int ecb_cold
1970eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2246eio_init (void (*want_poll)(void), void (*done_poll)(void))
1971{ 2247{
1972#if !HAVE_PREADWRITE
1973 X_MUTEX_CREATE (preadwritelock);
1974#endif
1975
1976 return etp_init (want_poll, done_poll); 2248 return etp_init (want_poll, done_poll);
1977} 2249}
1978 2250
1979ecb_inline void 2251ecb_inline void
1980eio_api_destroy (eio_req *req) 2252eio_api_destroy (eio_req *req)
1981{ 2253{
1982 free (req); 2254 free (req);
1983} 2255}
1984 2256
1985#define REQ(rtype) \ 2257#define REQ(rtype) \
1986 eio_req *req; \ 2258 eio_req *req; \
1987 \ 2259 \
1988 req = (eio_req *)calloc (1, sizeof *req); \ 2260 req = (eio_req *)calloc (1, sizeof *req); \
1989 if (!req) \ 2261 if (!req) \
1990 return 0; \ 2262 return 0; \
… …
2004 { \ 2276 { \
2005 eio_api_destroy (req); \ 2277 eio_api_destroy (req); \
2006 return 0; \ 2278 return 0; \
2007 } 2279 }
2008 2280
2281#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
2282
2009static void 2283static void
2010eio_execute (etp_worker *self, eio_req *req) 2284eio_execute (etp_worker *self, eio_req *req)
2011{ 2285{
2286#if HAVE_AT
2287 int dirfd;
2288#else
2289 const char *path;
2290#endif
2291
2012 if (ecb_expect_false (EIO_CANCELLED (req))) 2292 if (ecb_expect_false (EIO_CANCELLED (req)))
2013 { 2293 {
2014 req->result = -1; 2294 req->result = -1;
2015 req->errorno = ECANCELED; 2295 req->errorno = ECANCELED;
2016 return; 2296 return;
2017 } 2297 }
2018 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
2019 switch (req->type) 2315 switch (req->type)
2020 { 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;
2021 case EIO_READ: ALLOC (req->size); 2324 case EIO_READ: ALLOC (req->size);
2022 req->result = req->offs >= 0 2325 req->result = req->offs >= 0
2023 ? pread (req->int1, req->ptr2, req->size, req->offs) 2326 ? pread (req->int1, req->ptr2, req->size, req->offs)
2024 : read (req->int1, req->ptr2, req->size); break; 2327 : read (req->int1, req->ptr2, req->size); break;
2025 case EIO_WRITE: req->result = req->offs >= 0 2328 case EIO_WRITE: req->result = req->offs >= 0
2026 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2329 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2027 : write (req->int1, req->ptr2, req->size); break; 2330 : write (req->int1, req->ptr2, req->size); break;
2028 2331
2029 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;
2030 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
2031 2336
2032 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2337 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2033 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;
2034 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));
2035 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
2036 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2443 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2037 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2444 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2038 2445
2039 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2040 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2041 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2446 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2042 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2447 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2043 2448
2044 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2045 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;
2046 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2047 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;
2048 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2049 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2451 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2050 2452
2051 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2052 case EIO_CLOSE: req->result = close (req->int1); break; 2453 case EIO_CLOSE: req->result = close (req->int1); break;
2053 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2454 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2054 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2055 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2056 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2057 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2058 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2059 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2060 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2061
2062 case EIO_REALPATH: eio__realpath (req, self); break;
2063
2064 case EIO_READLINK: ALLOC (PATH_MAX);
2065 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2066
2067 case EIO_SYNC: req->result = 0; sync (); break; 2455 case EIO_SYNC: req->result = 0; sync (); break;
2068 case EIO_FSYNC: req->result = fsync (req->int1); break; 2456 case EIO_FSYNC: req->result = fsync (req->int1); break;
2069 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;
2070 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;
2071 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2461 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2072 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;
2073 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2463 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2074 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2075 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;
2076 2465
2077 case EIO_READDIR: eio__scandir (req, self); break; 2466 case EIO_READDIR: eio__scandir (req, self); break;
2078 2467
2079 case EIO_BUSY: 2468 case EIO_BUSY:
… …
2089 req->result = select (0, 0, 0, 0, &tv); 2478 req->result = select (0, 0, 0, 0, &tv);
2090 } 2479 }
2091#endif 2480#endif
2092 break; 2481 break;
2093 2482
2094 case EIO_UTIME:
2095 case EIO_FUTIME:
2096 {
2097 struct timeval tv[2];
2098 struct timeval *times;
2099
2100 if (req->nv1 != -1. || req->nv2 != -1.)
2101 {
2102 tv[0].tv_sec = req->nv1;
2103 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2104 tv[1].tv_sec = req->nv2;
2105 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2106
2107 times = tv;
2108 }
2109 else
2110 times = 0;
2111
2112 req->result = req->type == EIO_FUTIME
2113 ? futimes (req->int1, times)
2114 : utimes (req->ptr1, times);
2115 }
2116 break;
2117
2118 case EIO_GROUP: 2483 case EIO_GROUP:
2119 abort (); /* handled in eio_request */ 2484 abort (); /* handled in eio_request */
2120 2485
2121 case EIO_NOP: 2486 case EIO_NOP:
2122 req->result = 0; 2487 req->result = 0;
… …
2125 case EIO_CUSTOM: 2490 case EIO_CUSTOM:
2126 req->feed (req); 2491 req->feed (req);
2127 break; 2492 break;
2128 2493
2129 default: 2494 default:
2130 errno = ENOSYS;
2131 req->result = -1; 2495 req->result = EIO_ENOSYS ();
2132 break; 2496 break;
2133 } 2497 }
2134 2498
2135 req->errorno = errno; 2499 req->errorno = errno;
2136} 2500}
2137 2501
2138#ifndef EIO_NO_WRAPPERS 2502#ifndef EIO_NO_WRAPPERS
2139 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
2140eio_req *eio_nop (int pri, eio_cb cb, void *data) 2514eio_req *eio_nop (int pri, eio_cb cb, void *data)
2141{ 2515{
2142 REQ (EIO_NOP); SEND; 2516 REQ (EIO_NOP); SEND;
2143} 2517}
2144 2518
… …
2160eio_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)
2161{ 2535{
2162 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;
2163} 2537}
2164 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
2165eio_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)
2166{ 2555{
2167 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;
2168} 2557}
2169 2558
… …
2175eio_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)
2176{ 2565{
2177 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2566 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2178} 2567}
2179 2568
2180eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2181{
2182 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2183}
2184
2185eio_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)
2186{ 2570{
2187 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;
2188} 2572}
2189 2573
2190eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2191{
2192 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2193}
2194
2195eio_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)
2196{ 2575{
2197 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2576 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2198} 2577}
2199 2578
2200eio_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)
2201{ 2580{
2202 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;
2582}
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;
2203} 2587}
2204 2588
2205eio_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)
2206{ 2590{
2207 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;
… …
2425/* misc garbage */ 2809/* misc garbage */
2426 2810
2427eio_ssize_t 2811eio_ssize_t
2428eio_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)
2429{ 2813{
2430 etp_worker wrk;
2431 eio_ssize_t ret;
2432
2433 wrk.dbuf = 0;
2434
2435 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2814 return eio__sendfile (ofd, ifd, offset, count);
2436
2437 if (wrk.dbuf)
2438 free (wrk.dbuf);
2439
2440 return ret;
2441} 2815}
2442 2816

Diff Legend

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