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

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

Diff Legend

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