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

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

Diff Legend

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