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

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

Diff Legend

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