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.147 by root, Sat Feb 17 15:33:22 2018 UTC

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

Diff Legend

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