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

Comparing libeio/eio.c (file contents):
Revision 1.79 by root, Tue Jul 5 16:57:41 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>
54#include <stdlib.h> 54#include <stdlib.h>
55#include <string.h> 55#include <string.h>
56#include <errno.h> 56#include <errno.h>
57#include <sys/types.h> 57#include <sys/types.h>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <sys/statvfs.h>
60#include <limits.h> 59#include <limits.h>
61#include <fcntl.h> 60#include <fcntl.h>
62#include <assert.h> 61#include <assert.h>
63 62
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 form 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
69#ifndef ECANCELED
70# define ECANCELED EDOM
71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
80static void eio_destroy (eio_req *req);
81
70#ifndef EIO_FINISH 82#ifndef EIO_FINISH
71# 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
72#endif 84#endif
73 85
74#ifndef EIO_DESTROY 86#ifndef EIO_DESTROY
… …
77 89
78#ifndef EIO_FEED 90#ifndef EIO_FEED
79# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 91# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
80#endif 92#endif
81 93
94#ifndef EIO_FD_TO_WIN32_HANDLE
95# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
96#endif
97#ifndef EIO_WIN32_HANDLE_TO_FD
98# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
99#endif
100
101#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
102
103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
104
82#ifdef _WIN32 105#ifdef _WIN32
83 106
84 /*doh*/ 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */
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 */
114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
117 #define lstat(path,buf) stat (path,buf)
118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
119 #define mkdir(path,mode) _mkdir (path)
120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
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 ()
128 #define chown(path,uid,gid) EIO_ENOSYS ()
129 #define fchown(fd,uid,gid) EIO_ENOSYS ()
130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
131 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
132 #define mknod(path,mode,dev) 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 }
203
204 /* we could even stat and see if it exists */
205 static int
206 symlink (const char *old, const char *neu)
207 {
208 #if WINVER >= 0x0600
209 if (CreateSymbolicLink (neu, old, 1))
210 return 0;
211
212 if (CreateSymbolicLink (neu, old, 0))
213 return 0;
214 #endif
215
216 return EIO_ERRNO (ENOENT, -1);
217 }
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
85#else 233#else
86 234
87# include <sys/time.h> 235 #include <sys/time.h>
88# include <sys/select.h> 236 #include <sys/select.h>
89# include <unistd.h> 237 #include <unistd.h>
238 #include <signal.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
249
250 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
251 #include <sys/mman.h>
252 #endif
253
254 #define D_NAME(entp) entp->d_name
255
256 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
257 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
258 #define _DIRENT_HAVE_D_TYPE /* sigh */
259 #define D_INO(de) (de)->d_fileno
260 #define D_NAMLEN(de) (de)->d_namlen
261 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
262 #define D_INO(de) (de)->d_ino
263 #endif
264
265 #ifdef _D_EXACT_NAMLEN
266 #undef D_NAMLEN
267 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
268 #endif
269
270 #ifdef _DIRENT_HAVE_D_TYPE
271 #define D_TYPE(de) (de)->d_type
272 #endif
273
274 #ifndef EIO_STRUCT_DIRENT
275 #define EIO_STRUCT_DIRENT struct dirent
276 #endif
277
278#endif
279
280#if HAVE_UTIMES
90# include <utime.h> 281# include <utime.h>
91# include <signal.h>
92# include <dirent.h>
93
94#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
95# include <sys/mman.h>
96#endif
97
98/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
99# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
100# define _DIRENT_HAVE_D_TYPE /* sigh */
101# define D_INO(de) (de)->d_fileno
102# define D_NAMLEN(de) (de)->d_namlen
103# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
104# define D_INO(de) (de)->d_ino
105# endif 282#endif
106 283
107#ifdef _D_EXACT_NAMLEN 284#if HAVE_SYS_SYSCALL_H
108# undef D_NAMLEN 285# include <sys/syscall.h>
109# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
110#endif
111
112# ifdef _DIRENT_HAVE_D_TYPE
113# define D_TYPE(de) (de)->d_type
114# endif 286#endif
115 287
116# ifndef EIO_STRUCT_DIRENT 288#if HAVE_SYS_PRCTL_H
117# define EIO_STRUCT_DIRENT struct dirent 289# include <sys/prctl.h>
118# endif
119
120#endif 290#endif
121 291
122#if HAVE_SENDFILE 292#if HAVE_SENDFILE
123# if __linux 293# if __linux
124# include <sys/sendfile.h> 294# include <sys/sendfile.h>
… …
139#endif 309#endif
140#ifndef D_INO 310#ifndef D_INO
141# define D_INO(de) 0 311# define D_INO(de) 0
142#endif 312#endif
143#ifndef D_NAMLEN 313#ifndef D_NAMLEN
144# define D_NAMLEN(de) strlen ((de)->d_name) 314# define D_NAMLEN(entp) strlen (D_NAME (entp))
145#endif 315#endif
146 316
147/* used for struct dirent, AIX doesn't provide it */ 317/* used for struct dirent, AIX doesn't provide it */
148#ifndef NAME_MAX 318#ifndef NAME_MAX
149# define NAME_MAX 4096 319# define NAME_MAX 4096
… …
155#endif 325#endif
156 326
157/* buffer size for various temporary buffers */ 327/* buffer size for various temporary buffers */
158#define EIO_BUFSIZE 65536 328#define EIO_BUFSIZE 65536
159 329
160#define dBUF \ 330#define dBUF \
161 char *eio_buf; \
162 ETP_WORKER_LOCK (self); \
163 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 331 char *eio_buf = malloc (EIO_BUFSIZE); \
164 ETP_WORKER_UNLOCK (self); \
165 errno = ENOMEM; \ 332 errno = ENOMEM; \
166 if (!eio_buf) \ 333 if (!eio_buf) \
167 return -1; 334 return -1
168 335
169#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/*****************************************************************************/
170 364
171#define ETP_PRI_MIN EIO_PRI_MIN 365#define ETP_PRI_MIN EIO_PRI_MIN
172#define ETP_PRI_MAX EIO_PRI_MAX 366#define ETP_PRI_MAX EIO_PRI_MAX
173 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
174struct etp_worker; 378struct etp_worker;
175
176#define ETP_REQ eio_req 379#define ETP_REQ eio_req
177#define ETP_DESTROY(req) eio_destroy (req) 380#define ETP_DESTROY(req) eio_destroy (req)
178static int eio_finish (eio_req *req); 381static int eio_finish (eio_req *req);
179#define ETP_FINISH(req) eio_finish (req) 382#define ETP_FINISH(req) eio_finish (req)
180static void eio_execute (struct etp_worker *self, eio_req *req); 383static void eio_execute (struct etp_worker *self, eio_req *req);
181#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 384#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
182 385
183#define ETP_WORKER_CLEAR(req) \ 386#include "etp.c"
184 if (wrk->dbuf) \
185 { \
186 free (wrk->dbuf); \
187 wrk->dbuf = 0; \
188 } \
189 \
190 if (wrk->dirp) \
191 { \
192 closedir (wrk->dirp); \
193 wrk->dirp = 0; \
194 }
195 387
196#define ETP_WORKER_COMMON \ 388static struct etp_pool eio_pool;
197 void *dbuf; \ 389#define EIO_POOL (&eio_pool)
198 DIR *dirp;
199
200/*****************************************************************************/
201
202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
203
204/* calculate time difference in ~1/EIO_TICKS of a second */
205ecb_inline int
206tvdiff (struct timeval *tv1, struct timeval *tv2)
207{
208 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
209 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
210}
211
212static unsigned int started, idle, wanted = 4;
213
214static void (*want_poll_cb) (void);
215static void (*done_poll_cb) (void);
216
217static unsigned int max_poll_time; /* reslock */
218static unsigned int max_poll_reqs; /* reslock */
219
220static volatile unsigned int nreqs; /* reqlock */
221static volatile unsigned int nready; /* reqlock */
222static volatile unsigned int npending; /* reqlock */
223static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
224static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
225
226static xmutex_t wrklock;
227static xmutex_t reslock;
228static xmutex_t reqlock;
229static xcond_t reqwait;
230
231#if !HAVE_PREADWRITE
232/*
233 * make our pread/pwrite emulation safe against themselves, but not against
234 * normal read/write by using a mutex. slows down execution a lot,
235 * but that's your problem, not mine.
236 */
237static xmutex_t preadwritelock = X_MUTEX_INIT;
238#endif
239
240typedef struct etp_worker
241{
242 /* locked by wrklock */
243 struct etp_worker *prev, *next;
244
245 xthread_t tid;
246
247 /* locked by reslock, reqlock or wrklock */
248 ETP_REQ *req; /* currently processed request */
249
250 ETP_WORKER_COMMON
251} etp_worker;
252
253static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
254
255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
257
258/* worker threads management */
259
260static void ecb_cold
261etp_worker_clear (etp_worker *wrk)
262{
263 ETP_WORKER_CLEAR (wrk);
264}
265
266static void ecb_cold
267etp_worker_free (etp_worker *wrk)
268{
269 wrk->next->prev = wrk->prev;
270 wrk->prev->next = wrk->next;
271
272 free (wrk);
273}
274
275static unsigned int
276etp_nreqs (void)
277{
278 int retval;
279 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
280 retval = nreqs;
281 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
282 return retval;
283}
284
285static unsigned int
286etp_nready (void)
287{
288 unsigned int retval;
289
290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
291 retval = nready;
292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
293
294 return retval;
295}
296
297static unsigned int
298etp_npending (void)
299{
300 unsigned int retval;
301
302 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
303 retval = npending;
304 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
305
306 return retval;
307}
308
309static unsigned int
310etp_nthreads (void)
311{
312 unsigned int retval;
313
314 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
315 retval = started;
316 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
317
318 return retval;
319}
320
321/*
322 * a somewhat faster data structure might be nice, but
323 * with 8 priorities this actually needs <20 insns
324 * per shift, the most expensive operation.
325 */
326typedef struct {
327 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
328 int size;
329} etp_reqq;
330
331static etp_reqq req_queue;
332static etp_reqq res_queue;
333
334static int ecb_noinline
335reqq_push (etp_reqq *q, ETP_REQ *req)
336{
337 int pri = req->pri;
338 req->next = 0;
339
340 if (q->qe[pri])
341 {
342 q->qe[pri]->next = req;
343 q->qe[pri] = req;
344 }
345 else
346 q->qe[pri] = q->qs[pri] = req;
347
348 return q->size++;
349}
350
351static ETP_REQ * ecb_noinline
352reqq_shift (etp_reqq *q)
353{
354 int pri;
355
356 if (!q->size)
357 return 0;
358
359 --q->size;
360
361 for (pri = ETP_NUM_PRI; pri--; )
362 {
363 eio_req *req = q->qs[pri];
364
365 if (req)
366 {
367 if (!(q->qs[pri] = (eio_req *)req->next))
368 q->qe[pri] = 0;
369
370 return req;
371 }
372 }
373
374 abort ();
375}
376
377static void ecb_cold
378etp_thread_init (void)
379{
380 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait);
384}
385
386static void ecb_cold
387etp_atfork_prepare (void)
388{
389 X_LOCK (wrklock);
390 X_LOCK (reqlock);
391 X_LOCK (reslock);
392#if !HAVE_PREADWRITE
393 X_LOCK (preadwritelock);
394#endif
395}
396
397static void ecb_cold
398etp_atfork_parent (void)
399{
400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock);
402#endif
403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock);
406}
407
408static void ecb_cold
409etp_atfork_child (void)
410{
411 ETP_REQ *prv;
412
413 while ((prv = reqq_shift (&req_queue)))
414 ETP_DESTROY (prv);
415
416 while ((prv = reqq_shift (&res_queue)))
417 ETP_DESTROY (prv);
418
419 while (wrk_first.next != &wrk_first)
420 {
421 etp_worker *wrk = wrk_first.next;
422
423 if (wrk->req)
424 ETP_DESTROY (wrk->req);
425
426 etp_worker_clear (wrk);
427 etp_worker_free (wrk);
428 }
429
430 started = 0;
431 idle = 0;
432 nreqs = 0;
433 nready = 0;
434 npending = 0;
435
436 etp_thread_init ();
437}
438
439static void ecb_cold
440etp_once_init (void)
441{
442 etp_thread_init ();
443 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
444}
445
446static int ecb_cold
447etp_init (void (*want_poll)(void), void (*done_poll)(void))
448{
449 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
450
451 pthread_once (&doinit, etp_once_init);
452
453 want_poll_cb = want_poll;
454 done_poll_cb = done_poll;
455
456 return 0;
457}
458
459X_THREAD_PROC (etp_proc);
460
461static void ecb_cold
462etp_start_thread (void)
463{
464 etp_worker *wrk = calloc (1, sizeof (etp_worker));
465
466 /*TODO*/
467 assert (("unable to allocate worker thread data", wrk));
468
469 X_LOCK (wrklock);
470
471 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
472 {
473 wrk->prev = &wrk_first;
474 wrk->next = wrk_first.next;
475 wrk_first.next->prev = wrk;
476 wrk_first.next = wrk;
477 ++started;
478 }
479 else
480 free (wrk);
481
482 X_UNLOCK (wrklock);
483}
484
485static void
486etp_maybe_start_thread (void)
487{
488 if (ecb_expect_true (etp_nthreads () >= wanted))
489 return;
490
491 /* todo: maybe use idle here, but might be less exact */
492 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
493 return;
494
495 etp_start_thread ();
496}
497
498static void ecb_cold
499etp_end_thread (void)
500{
501 eio_req *req = calloc (1, sizeof (eio_req));
502
503 req->type = -1;
504 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
505
506 X_LOCK (reqlock);
507 reqq_push (&req_queue, req);
508 X_COND_SIGNAL (reqwait);
509 X_UNLOCK (reqlock);
510
511 X_LOCK (wrklock);
512 --started;
513 X_UNLOCK (wrklock);
514}
515
516static int
517etp_poll (void)
518{
519 unsigned int maxreqs;
520 unsigned int maxtime;
521 struct timeval tv_start, tv_now;
522
523 X_LOCK (reslock);
524 maxreqs = max_poll_reqs;
525 maxtime = max_poll_time;
526 X_UNLOCK (reslock);
527
528 if (maxtime)
529 gettimeofday (&tv_start, 0);
530
531 for (;;)
532 {
533 ETP_REQ *req;
534
535 etp_maybe_start_thread ();
536
537 X_LOCK (reslock);
538 req = reqq_shift (&res_queue);
539
540 if (req)
541 {
542 --npending;
543
544 if (!res_queue.size && done_poll_cb)
545 done_poll_cb ();
546 }
547
548 X_UNLOCK (reslock);
549
550 if (!req)
551 return 0;
552
553 X_LOCK (reqlock);
554 --nreqs;
555 X_UNLOCK (reqlock);
556
557 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
558 {
559 req->int1 = 1; /* mark request as delayed */
560 continue;
561 }
562 else
563 {
564 int res = ETP_FINISH (req);
565 if (ecb_expect_false (res))
566 return res;
567 }
568
569 if (ecb_expect_false (maxreqs && !--maxreqs))
570 break;
571
572 if (maxtime)
573 {
574 gettimeofday (&tv_now, 0);
575
576 if (tvdiff (&tv_start, &tv_now) >= maxtime)
577 break;
578 }
579 }
580
581 errno = EAGAIN;
582 return -1;
583}
584
585static void
586etp_cancel (ETP_REQ *req)
587{
588 X_LOCK (wrklock);
589 req->flags |= EIO_FLAG_CANCELLED;
590 X_UNLOCK (wrklock);
591
592 eio_grp_cancel (req);
593}
594
595static void
596etp_submit (ETP_REQ *req)
597{
598 req->pri -= ETP_PRI_MIN;
599
600 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
601 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
602
603 if (ecb_expect_false (req->type == EIO_GROUP))
604 {
605 /* I hope this is worth it :/ */
606 X_LOCK (reqlock);
607 ++nreqs;
608 X_UNLOCK (reqlock);
609
610 X_LOCK (reslock);
611
612 ++npending;
613
614 if (!reqq_push (&res_queue, req) && want_poll_cb)
615 want_poll_cb ();
616
617 X_UNLOCK (reslock);
618 }
619 else
620 {
621 X_LOCK (reqlock);
622 ++nreqs;
623 ++nready;
624 reqq_push (&req_queue, req);
625 X_COND_SIGNAL (reqwait);
626 X_UNLOCK (reqlock);
627
628 etp_maybe_start_thread ();
629 }
630}
631
632static void ecb_cold
633etp_set_max_poll_time (double nseconds)
634{
635 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
636 max_poll_time = nseconds * EIO_TICKS;
637 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
638}
639
640static void ecb_cold
641etp_set_max_poll_reqs (unsigned int maxreqs)
642{
643 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
644 max_poll_reqs = maxreqs;
645 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
646}
647
648static void ecb_cold
649etp_set_max_idle (unsigned int nthreads)
650{
651 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
652 max_idle = nthreads;
653 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
654}
655
656static void ecb_cold
657etp_set_idle_timeout (unsigned int seconds)
658{
659 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
660 idle_timeout = seconds;
661 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
662}
663
664static void ecb_cold
665etp_set_min_parallel (unsigned int nthreads)
666{
667 if (wanted < nthreads)
668 wanted = nthreads;
669}
670
671static void ecb_cold
672etp_set_max_parallel (unsigned int nthreads)
673{
674 if (wanted > nthreads)
675 wanted = nthreads;
676
677 while (started > wanted)
678 etp_end_thread ();
679}
680 390
681/*****************************************************************************/ 391/*****************************************************************************/
682 392
683static void 393static void
684grp_try_feed (eio_req *grp) 394grp_try_feed (eio_req *grp)
685{ 395{
686 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 396 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
687 { 397 {
688 grp->flags &= ~EIO_FLAG_GROUPADD; 398 grp->flags &= ~ETP_FLAG_GROUPADD;
689 399
690 EIO_FEED (grp); 400 EIO_FEED (grp);
691 401
692 /* stop if no progress has been made */ 402 /* stop if no progress has been made */
693 if (!(grp->flags & EIO_FLAG_GROUPADD)) 403 if (!(grp->flags & ETP_FLAG_GROUPADD))
694 { 404 {
695 grp->feed = 0; 405 grp->feed = 0;
696 break; 406 break;
697 } 407 }
698 } 408 }
… …
705 415
706 /* call feeder, if applicable */ 416 /* call feeder, if applicable */
707 grp_try_feed (grp); 417 grp_try_feed (grp);
708 418
709 /* finish, if done */ 419 /* finish, if done */
710 if (!grp->size && grp->int1) 420 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
711 return eio_finish (grp); 421 return eio_finish (grp);
712 else 422 else
713 return 0; 423 return 0;
714} 424}
715 425
716void 426static void
717eio_destroy (eio_req *req) 427eio_destroy (eio_req *req)
718{ 428{
719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 429 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 430 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
721 431
… …
751} 461}
752 462
753void 463void
754eio_grp_cancel (eio_req *grp) 464eio_grp_cancel (eio_req *grp)
755{ 465{
756 for (grp = grp->grp_first; grp; grp = grp->grp_next) 466 etp_grp_cancel (EIO_POOL, grp);
757 eio_cancel (grp);
758} 467}
759 468
760void 469void
761eio_cancel (eio_req *req) 470eio_cancel (eio_req *req)
762{ 471{
763 etp_cancel (req); 472 etp_cancel (EIO_POOL, req);
764} 473}
765 474
766void 475void
767eio_submit (eio_req *req) 476eio_submit (eio_req *req)
768{ 477{
769 etp_submit (req); 478 etp_submit (EIO_POOL, req);
770} 479}
771 480
772unsigned int 481unsigned int
773eio_nreqs (void) 482eio_nreqs (void)
774{ 483{
775 return etp_nreqs (); 484 return etp_nreqs (EIO_POOL);
776} 485}
777 486
778unsigned int 487unsigned int
779eio_nready (void) 488eio_nready (void)
780{ 489{
781 return etp_nready (); 490 return etp_nready (EIO_POOL);
782} 491}
783 492
784unsigned int 493unsigned int
785eio_npending (void) 494eio_npending (void)
786{ 495{
787 return etp_npending (); 496 return etp_npending (EIO_POOL);
788} 497}
789 498
790unsigned int ecb_cold 499unsigned int ecb_cold
791eio_nthreads (void) 500eio_nthreads (void)
792{ 501{
793 return etp_nthreads (); 502 return etp_nthreads (EIO_POOL);
794} 503}
795 504
796void ecb_cold 505void ecb_cold
797eio_set_max_poll_time (double nseconds) 506eio_set_max_poll_time (double nseconds)
798{ 507{
799 etp_set_max_poll_time (nseconds); 508 etp_set_max_poll_time (EIO_POOL, nseconds);
800} 509}
801 510
802void ecb_cold 511void ecb_cold
803eio_set_max_poll_reqs (unsigned int maxreqs) 512eio_set_max_poll_reqs (unsigned int maxreqs)
804{ 513{
805 etp_set_max_poll_reqs (maxreqs); 514 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
806} 515}
807 516
808void ecb_cold 517void ecb_cold
809eio_set_max_idle (unsigned int nthreads) 518eio_set_max_idle (unsigned int nthreads)
810{ 519{
811 etp_set_max_idle (nthreads); 520 etp_set_max_idle (EIO_POOL, nthreads);
812} 521}
813 522
814void ecb_cold 523void ecb_cold
815eio_set_idle_timeout (unsigned int seconds) 524eio_set_idle_timeout (unsigned int seconds)
816{ 525{
817 etp_set_idle_timeout (seconds); 526 etp_set_idle_timeout (EIO_POOL, seconds);
818} 527}
819 528
820void ecb_cold 529void ecb_cold
821eio_set_min_parallel (unsigned int nthreads) 530eio_set_min_parallel (unsigned int nthreads)
822{ 531{
823 etp_set_min_parallel (nthreads); 532 etp_set_min_parallel (EIO_POOL, nthreads);
824} 533}
825 534
826void ecb_cold 535void ecb_cold
827eio_set_max_parallel (unsigned int nthreads) 536eio_set_max_parallel (unsigned int nthreads)
828{ 537{
829 etp_set_max_parallel (nthreads); 538 etp_set_max_parallel (EIO_POOL, nthreads);
830} 539}
831 540
832int eio_poll (void) 541int eio_poll (void)
833{ 542{
834 return etp_poll (); 543 return etp_poll (EIO_POOL);
835} 544}
836 545
837/*****************************************************************************/ 546/*****************************************************************************/
838/* work around various missing functions */ 547/* work around various missing functions */
839
840#if !HAVE_PREADWRITE
841# undef pread
842# undef pwrite
843# define pread eio__pread
844# define pwrite eio__pwrite
845
846static ssize_t
847eio__pread (int fd, void *buf, size_t count, off_t offset)
848{
849 ssize_t res;
850 off_t ooffset;
851
852 X_LOCK (preadwritelock);
853 ooffset = lseek (fd, 0, SEEK_CUR);
854 lseek (fd, offset, SEEK_SET);
855 res = read (fd, buf, count);
856 lseek (fd, ooffset, SEEK_SET);
857 X_UNLOCK (preadwritelock);
858
859 return res;
860}
861
862static ssize_t
863eio__pwrite (int fd, void *buf, size_t count, off_t offset)
864{
865 ssize_t res;
866 off_t ooffset;
867
868 X_LOCK (preadwritelock);
869 ooffset = lseek (fd, 0, SEEK_CUR);
870 lseek (fd, offset, SEEK_SET);
871 res = write (fd, buf, count);
872 lseek (fd, ooffset, SEEK_SET);
873 X_UNLOCK (preadwritelock);
874
875 return res;
876}
877#endif
878 548
879#ifndef HAVE_UTIMES 549#ifndef HAVE_UTIMES
880 550
881# undef utimes 551# undef utimes
882# define utimes(path,times) eio__utimes (path, times) 552# define utimes(path,times) eio__utimes (path, times)
… …
915 585
916#if !HAVE_FDATASYNC 586#if !HAVE_FDATASYNC
917# undef fdatasync 587# undef fdatasync
918# define fdatasync(fd) fsync (fd) 588# define fdatasync(fd) fsync (fd)
919#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}
920 607
921/* sync_file_range always needs emulation */ 608/* sync_file_range always needs emulation */
922static int 609static int
923eio__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)
924{ 611{
… …
944 /* even though we could play tricks with the flags, it's better to always 631 /* even though we could play tricks with the flags, it's better to always
945 * call fdatasync, as that matches the expectation of its users best */ 632 * call fdatasync, as that matches the expectation of its users best */
946 return fdatasync (fd); 633 return fdatasync (fd);
947} 634}
948 635
636static int
637eio__fallocate (int fd, int mode, off_t offset, size_t len)
638{
639#if HAVE_LINUX_FALLOCATE
640 return fallocate (fd, mode, offset, len);
641#else
642 return EIO_ENOSYS ();
643#endif
644}
645
949#if !HAVE_READAHEAD 646#if !HAVE_READAHEAD
950# undef readahead 647# undef readahead
951# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 648# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
952 649
953static ssize_t 650static eio_ssize_t
954eio__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)
955{ 652{
956 size_t todo = count; 653 size_t todo = count;
957 dBUF; 654 dBUF;
958 655
… …
963 pread (fd, eio_buf, len, offset); 660 pread (fd, eio_buf, len, offset);
964 offset += len; 661 offset += len;
965 todo -= len; 662 todo -= len;
966 } 663 }
967 664
968 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 */
969 return count; 669 return 0;
970} 670}
971 671
972#endif 672#endif
973 673
974/* sendfile always needs emulation */ 674/* sendfile always needs emulation */
975static ssize_t 675static eio_ssize_t
976eio__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)
977{ 677{
978 ssize_t written = 0; 678 eio_ssize_t written = 0;
979 ssize_t res; 679 eio_ssize_t res;
980 680
981 if (!count) 681 if (!count)
982 return 0; 682 return 0;
983 683
984 for (;;) 684 for (;;)
985 { 685 {
686#ifdef __APPLE__
687# undef HAVE_SENDFILE /* broken, as everything on os x */
688#endif
986#if HAVE_SENDFILE 689#if HAVE_SENDFILE
987# if __linux 690# if __linux
988 off_t soffset = offset; 691 off_t soffset = offset;
989 res = sendfile (ofd, ifd, &soffset, count); 692 res = sendfile (ofd, ifd, &soffset, count);
990 693
… …
1006 709
1007 /* according to source inspection, this is correct, and useful behaviour */ 710 /* according to source inspection, this is correct, and useful behaviour */
1008 if (sbytes) 711 if (sbytes)
1009 res = sbytes; 712 res = sbytes;
1010 713
1011# elif defined (__APPLE__) && 0 /* broken, as everything on os x */ 714# elif defined __APPLE__
1012 off_t sbytes = count; 715 off_t sbytes = count;
1013 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 716 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1014 717
1015 /* according to the manpage, sbytes is always valid */ 718 /* according to the manpage, sbytes is always valid */
1016 if (sbytes) 719 if (sbytes)
… …
1033 if (res < 0 && sbytes) 736 if (res < 0 && sbytes)
1034 res = sbytes; 737 res = sbytes;
1035 738
1036# endif 739# endif
1037 740
1038#elif defined (_WIN32) 741#elif defined (_WIN32) && 0
1039 /* does not work, just for documentation of what would need to be done */ 742 /* does not work, just for documentation of what would need to be done */
1040 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 743 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1041 /* libeio guarantees that the file offset does not change, and windows */ 744 /* libeio guarantees that the file offset does not change, and windows */
1042 /* has no way to get an independent handle to the same file description */ 745 /* has no way to get an independent handle to the same file description */
1043 HANDLE h = TO_SOCKET (ifd); 746 HANDLE h = TO_SOCKET (ifd);
1044 SetFilePointer (h, offset, 0, FILE_BEGIN); 747 SetFilePointer (h, offset, 0, FILE_BEGIN);
1045 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 748 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1046 749
1047#else 750#else
1048 res = -1; 751 res = EIO_ENOSYS ();
1049 errno = ENOSYS;
1050#endif 752#endif
1051 753
1052 /* we assume sendfile can copy at least 128mb in one go */ 754 /* we assume sendfile can copy at least 128mb in one go */
1053 if (res <= 128 * 1024 * 1024) 755 if (res <= 128 * 1024 * 1024)
1054 { 756 {
… …
1076 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 778 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1077 /* BSDs */ 779 /* BSDs */
1078#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... */
1079 || errno == ENOTSUP 781 || errno == ENOTSUP
1080#endif 782#endif
783#ifdef EOPNOTSUPP /* windows */
1081 || errno == EOPNOTSUPP /* BSDs */ 784 || errno == EOPNOTSUPP /* BSDs */
785#endif
1082#if __solaris 786#if __solaris
1083 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 787 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1084#endif 788#endif
1085 ) 789 )
1086 ) 790 )
… …
1090 794
1091 res = 0; 795 res = 0;
1092 796
1093 while (count) 797 while (count)
1094 { 798 {
1095 ssize_t cnt; 799 eio_ssize_t cnt;
1096 800
1097 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);
1098 802
1099 if (cnt <= 0) 803 if (cnt <= 0)
1100 { 804 {
… …
1112 816
1113 offset += cnt; 817 offset += cnt;
1114 res += cnt; 818 res += cnt;
1115 count -= cnt; 819 count -= cnt;
1116 } 820 }
821
822 FUBd;
1117 } 823 }
1118 824
1119 return res; 825 return res;
1120} 826}
1121 827
… …
1148 /* round up length */ 854 /* round up length */
1149 *length = (*length + mask) & ~mask; 855 *length = (*length + mask) & ~mask;
1150} 856}
1151 857
1152#if !_POSIX_MEMLOCK 858#if !_POSIX_MEMLOCK
1153# define eio__mlockall(a) ((errno = ENOSYS), -1) 859# define eio__mlockall(a) EIO_ENOSYS ()
1154#else 860#else
1155 861
1156static int 862static int
1157eio__mlockall (int flags) 863eio__mlockall (int flags)
1158{ 864{
… …
1172 return mlockall (flags); 878 return mlockall (flags);
1173} 879}
1174#endif 880#endif
1175 881
1176#if !_POSIX_MEMLOCK_RANGE 882#if !_POSIX_MEMLOCK_RANGE
1177# define eio__mlock(a,b) ((errno = ENOSYS), -1) 883# define eio__mlock(a,b) EIO_ENOSYS ()
1178#else 884#else
1179 885
1180static int 886static int
1181eio__mlock (void *addr, size_t length) 887eio__mlock (void *addr, size_t length)
1182{ 888{
… …
1186} 892}
1187 893
1188#endif 894#endif
1189 895
1190#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 896#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1191# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 897# define eio__msync(a,b,c) EIO_ENOSYS ()
1192#else 898#else
1193 899
1194static int 900static int
1195eio__msync (void *mem, size_t len, int flags) 901eio__msync (void *mem, size_t len, int flags)
1196{ 902{
… …
1237 943
1238/*****************************************************************************/ 944/*****************************************************************************/
1239/* requests implemented outside eio_execute, because they are so large */ 945/* requests implemented outside eio_execute, because they are so large */
1240 946
1241static void 947static void
1242eio__realpath (eio_req *req, etp_worker *self) 948eio__lseek (eio_req *req)
1243{ 949{
1244 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{
1245 char *res; 965 char *res;
966 const char *rel = path;
1246 char *tmp1, *tmp2; 967 char *tmp1, *tmp2;
1247#if SYMLOOP_MAX > 32 968#if SYMLOOP_MAX > 32
1248 int symlinks = SYMLOOP_MAX; 969 int symlinks = SYMLOOP_MAX;
1249#else 970#else
1250 int symlinks = 32; 971 int symlinks = 32;
1251#endif 972#endif
1252 973
1253 req->result = -1;
1254
1255 errno = EINVAL; 974 errno = EINVAL;
1256 if (!rel) 975 if (!rel)
1257 return; 976 return -1;
1258 977
1259 errno = ENOENT; 978 errno = ENOENT;
1260 if (!*rel) 979 if (!*rel)
1261 return; 980 return -1;
1262 981
1263 if (!req->ptr2) 982 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
1264 { 983#ifdef _WIN32
1265 X_LOCK (wrklock); 984 if (_access (rel, 4) != 0)
1266 req->flags |= EIO_FLAG_PTR2_FREE;
1267 X_UNLOCK (wrklock);
1268 req->ptr2 = malloc (PATH_MAX * 3);
1269
1270 errno = ENOMEM;
1271 if (!req->ptr2)
1272 return; 985 return -1;
1273 }
1274 986
1275 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
1276 tmp1 = res + PATH_MAX; 1000 tmp1 = res + PATH_MAX;
1277 tmp2 = tmp1 + PATH_MAX; 1001 tmp2 = tmp1 + PATH_MAX;
1278 1002
1279#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 */
1280#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1004#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
… …
1284 1008
1285 if (fd >= 0) 1009 if (fd >= 0)
1286 { 1010 {
1287 sprintf (tmp1, "/proc/self/fd/%d", fd); 1011 sprintf (tmp1, "/proc/self/fd/%d", fd);
1288 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 */
1289 close (fd); 1014 close (fd);
1290
1291 /* here we should probably stat the open file and the disk file, to make sure they still match */
1292 1015
1293 if (req->result > 0) 1016 if (req->result > 0)
1294 goto done; 1017 goto done;
1295 } 1018 }
1296 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)
1297 return; 1020 return -1;
1298 } 1021 }
1299#endif 1022#endif
1300#endif 1023#endif
1301 1024
1302 if (*rel != '/') 1025 if (*rel != '/')
1303 { 1026 {
1027 int len;
1028
1029 errno = ENOENT;
1030 if (wd == EIO_INVALID_WD)
1031 return -1;
1032
1033 if (wd == EIO_CWD)
1034 {
1304 if (!getcwd (res, PATH_MAX)) 1035 if (!getcwd (res, PATH_MAX))
1305 return; 1036 return -1;
1037
1038 len = strlen (res);
1039 }
1040 else
1041 memcpy (res, wd->str, len = wd->len);
1306 1042
1307 if (res [1]) /* only use if not / */ 1043 if (res [1]) /* only use if not / */
1308 res += strlen (res); 1044 res += len;
1309 } 1045 }
1310 1046
1311 while (*rel) 1047 while (*rel)
1312 { 1048 {
1313 ssize_t len, linklen; 1049 eio_ssize_t len, linklen;
1314 char *beg = rel; 1050 const char *beg = rel;
1315 1051
1316 while (*rel && *rel != '/') 1052 while (*rel && *rel != '/')
1317 ++rel; 1053 ++rel;
1318 1054
1319 len = rel - beg; 1055 len = rel - beg;
… …
1331 1067
1332 if (beg [1] == '.' && len == 2) 1068 if (beg [1] == '.' && len == 2)
1333 { 1069 {
1334 /* .. - back up one component, if possible */ 1070 /* .. - back up one component, if possible */
1335 1071
1336 while (res != req->ptr2) 1072 while (res != tmpbuf->ptr)
1337 if (*--res == '/') 1073 if (*--res == '/')
1338 break; 1074 break;
1339 1075
1340 continue; 1076 continue;
1341 } 1077 }
1342 } 1078 }
1343 1079
1344 errno = ENAMETOOLONG; 1080 errno = ENAMETOOLONG;
1345 if (res + 1 + len + 1 >= tmp1) 1081 if (res + 1 + len + 1 >= tmp1)
1346 return; 1082 return -1;
1347 1083
1348 /* copy one component */ 1084 /* copy one component */
1349 *res = '/'; 1085 *res = '/';
1350 memcpy (res + 1, beg, len); 1086 memcpy (res + 1, beg, len);
1351 1087
1352 /* zero-terminate, for readlink */ 1088 /* zero-terminate, for readlink */
1353 res [len + 1] = 0; 1089 res [len + 1] = 0;
1354 1090
1355 /* now check if it's a symlink */ 1091 /* now check if it's a symlink */
1356 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1092 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1357 1093
1358 if (linklen < 0) 1094 if (linklen < 0)
1359 { 1095 {
1360 if (errno != EINVAL) 1096 if (errno != EINVAL)
1361 return; 1097 return -1;
1362 1098
1363 /* it's a normal directory. hopefully */ 1099 /* it's a normal directory. hopefully */
1364 res += len + 1; 1100 res += len + 1;
1365 } 1101 }
1366 else 1102 else
… …
1368 /* yay, it was a symlink - build new path in tmp2 */ 1104 /* yay, it was a symlink - build new path in tmp2 */
1369 int rellen = strlen (rel); 1105 int rellen = strlen (rel);
1370 1106
1371 errno = ENAMETOOLONG; 1107 errno = ENAMETOOLONG;
1372 if (linklen + 1 + rellen >= PATH_MAX) 1108 if (linklen + 1 + rellen >= PATH_MAX)
1373 return; 1109 return -1;
1374 1110
1375 errno = ELOOP; 1111 errno = ELOOP;
1376 if (!--symlinks) 1112 if (!--symlinks)
1377 return; 1113 return -1;
1378 1114
1379 if (*tmp1 == '/') 1115 if (*tmp1 == '/')
1380 res = req->ptr2; /* symlink resolves to an absolute path */ 1116 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1381 1117
1382 /* 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 */
1383 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1119 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1384 tmp2 [linklen] = '/'; 1120 tmp2 [linklen] = '/';
1385 memcpy (tmp2, tmp1, linklen); 1121 memcpy (tmp2, tmp1, linklen);
… …
1387 rel = tmp2; 1123 rel = tmp2;
1388 } 1124 }
1389 } 1125 }
1390 1126
1391 /* special case for the lone root path */ 1127 /* special case for the lone root path */
1392 if (res == req->ptr2) 1128 if (res == tmpbuf->ptr)
1393 *res++ = '/'; 1129 *res++ = '/';
1394 1130
1395 req->result = res - (char *)req->ptr2; 1131 return res - (char *)tmpbuf->ptr;
1396 1132#endif
1397done:
1398 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1399} 1133}
1400 1134
1401static signed char 1135static signed char
1402eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1136eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1403{ 1137{
… …
1411 1145
1412#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 */
1413#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1147#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1414 1148
1415static void 1149static void
1416eio_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)
1417{ 1151{
1418 unsigned char bits [9 + sizeof (ino_t) * 8]; 1152 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1419 unsigned char *bit = bits; 1153 unsigned char *bit = bits;
1420 1154
1421 assert (CHAR_BIT == 8); 1155 assert (CHAR_BIT == 8);
1422 assert (sizeof (eio_dirent) * 8 < 256); 1156 assert (sizeof (eio_dirent) * 8 < 256);
1423 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1157 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1425 1159
1426 if (size <= EIO_SORT_FAST) 1160 if (size <= EIO_SORT_FAST)
1427 return; 1161 return;
1428 1162
1429 /* 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 */
1430 /* 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 */
1431 /* inode_bits must contain all inodes ORed together */ 1165 /* inode_bits must contain all inodes ORed together */
1432 /* 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 */
1433 { 1167 {
1434 ino_t endianness; 1168 eio_ino_t endianness;
1435 int i, j; 1169 int i, j;
1436 1170
1437 /* 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" */
1438 for (i = 0; i < sizeof (ino_t); ++i) 1172 for (i = 0; i < sizeof (eio_ino_t); ++i)
1439 ((unsigned char *)&endianness)[i] = i; 1173 ((unsigned char *)&endianness)[i] = i;
1440 1174
1441 *bit++ = 0; 1175 *bit++ = 0;
1442 1176
1443 for (i = 0; i < sizeof (ino_t); ++i) 1177 for (i = 0; i < sizeof (eio_ino_t); ++i)
1444 { 1178 {
1445 /* shifting off the byte offsets out of "endianness" */ 1179 /* shifting off the byte offsets out of "endianness" */
1446 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1180 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1447 endianness >>= 8; 1181 endianness >>= 8;
1448 1182
1449 for (j = 0; j < 8; ++j) 1183 for (j = 0; j < 8; ++j)
1450 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1184 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1451 *bit++ = offs + j; 1185 *bit++ = offs + j;
1452 } 1186 }
1453 1187
1454 for (j = 0; j < 8; ++j) 1188 for (j = 0; j < 8; ++j)
1455 if (score_bits & (1 << j)) 1189 if (score_bits & (1 << j))
1456 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1190 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1457 } 1191 }
1458 1192
1459 /* now actually do the sorting (a variant of MSD radix sort) */ 1193 /* now actually do the sorting (a variant of MSD radix sort) */
1460 { 1194 {
1461 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1195 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1462 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1196 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1463 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1197 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1464 int stk_idx = 0; 1198 int stk_idx = 0;
1465 1199
1466 base_stk [stk_idx] = dents; 1200 base_stk [stk_idx] = dents;
1467 end_stk [stk_idx] = dents + size; 1201 end_stk [stk_idx] = dents + size;
1468 bit_stk [stk_idx] = bit - 1; 1202 bit_stk [stk_idx] = bit - 1;
… …
1547 } 1281 }
1548 } 1282 }
1549} 1283}
1550 1284
1551static void 1285static void
1552eio_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)
1553{ 1287{
1554 if (size <= 1) 1288 if (size <= 1)
1555 return; /* our insertion sort relies on size > 0 */ 1289 return; /* our insertion sort relies on size > 0 */
1556 1290
1557 /* 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 */
… …
1565 1299
1566/* read a full directory */ 1300/* read a full directory */
1567static void 1301static void
1568eio__scandir (eio_req *req, etp_worker *self) 1302eio__scandir (eio_req *req, etp_worker *self)
1569{ 1303{
1570 DIR *dirp;
1571 EIO_STRUCT_DIRENT *entp;
1572 char *name, *names; 1304 char *name, *names;
1573 int namesalloc = 4096; 1305 int namesalloc = 4096 - sizeof (void *) * 4;
1574 int namesoffs = 0; 1306 int namesoffs = 0;
1575 int flags = req->int1; 1307 int flags = req->int1;
1576 eio_dirent *dents = 0; 1308 eio_dirent *dents = 0;
1577 int dentalloc = 128; 1309 int dentalloc = 128;
1578 int dentoffs = 0; 1310 int dentoffs = 0;
1579 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
1580 1319
1581 req->result = -1; 1320 req->result = -1;
1582 1321
1583 if (!(flags & EIO_READDIR_DENTS)) 1322 if (!(flags & EIO_READDIR_DENTS))
1584 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1323 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1585 1324
1586 X_LOCK (wrklock); 1325#ifdef _WIN32
1587 /* 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
1588 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
1589 1393
1590 if (req->flags & EIO_FLAG_PTR1_FREE) 1394 if (req->flags & EIO_FLAG_PTR1_FREE)
1591 free (req->ptr1); 1395 free (req->ptr1);
1592 1396
1593 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1397 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1594 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1398 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1595 req->ptr2 = names = malloc (namesalloc); 1399 req->ptr2 = names = malloc (namesalloc);
1596 X_UNLOCK (wrklock);
1597 1400
1598 if (dirp && names && (!flags || dents)) 1401 if (!names || (flags && !dents))
1402 return;
1403
1599 for (;;) 1404 for (;;)
1600 { 1405 {
1406 int done;
1407
1408#ifdef _WIN32
1409 done = !dirp;
1410#else
1601 errno = 0; 1411 errno = 0;
1602 entp = readdir (dirp); 1412 entp = readdir (dirp);
1413 done = !entp;
1414#endif
1603 1415
1604 if (!entp) 1416 if (done)
1605 { 1417 {
1418#ifndef _WIN32
1419 int old_errno = errno;
1420 closedir (dirp);
1421 errno = old_errno;
1422
1606 if (errno) 1423 if (errno)
1607 break; 1424 break;
1425#endif
1608 1426
1609 /* sort etc. */ 1427 /* sort etc. */
1610 req->int1 = flags; 1428 req->int1 = flags;
1611 req->result = dentoffs; 1429 req->result = dentoffs;
1612 1430
1613 if (flags & EIO_READDIR_STAT_ORDER) 1431 if (flags & EIO_READDIR_STAT_ORDER)
1614 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);
1615 else if (flags & EIO_READDIR_DIRS_FIRST) 1433 else if (flags & EIO_READDIR_DIRS_FIRST)
1616 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1434 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1617 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 */
1618 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))
1619 { 1487 {
1620 /* 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
1621 eio_dirent *oth = dents + dentoffs; 1495 ent = dents + dentoffs;
1622 eio_dirent *dir = dents;
1623 1496
1624 /* 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 */
1625 /* by walking from both sides and swapping if necessary */ 1498 ent->namelen = len - 1;
1626 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)
1627 { 1559 {
1628 if (dir->type == EIO_DT_DIR) 1560 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1629 ++dir; 1561 ent->score = 1;
1630 else if ((--oth)->type == EIO_DT_DIR) 1562 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1631 { 1563 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1632 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1633
1634 ++dir;
1635 }
1636 } 1564 }
1637 1565 else if (ent->type == EIO_DT_DIR)
1638 /* now sort the dirs only (dirs all have the same score) */ 1566 ent->score = 0;
1639 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1640 } 1567 }
1641
1642 break;
1643 }
1644
1645 /* now add the entry to our list(s) */
1646 name = entp->d_name;
1647
1648 /* skip . and .. entries */
1649 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1650 {
1651 int len = D_NAMLEN (entp) + 1;
1652
1653 while (ecb_expect_false (namesoffs + len > namesalloc))
1654 {
1655 namesalloc *= 2;
1656 X_LOCK (wrklock);
1657 req->ptr2 = names = realloc (names, namesalloc);
1658 X_UNLOCK (wrklock);
1659
1660 if (!names)
1661 break;
1662 } 1568 }
1663 1569
1664 memcpy (names + namesoffs, name, len);
1665
1666 if (dents)
1667 {
1668 struct eio_dirent *ent;
1669
1670 if (ecb_expect_false (dentoffs == dentalloc))
1671 {
1672 dentalloc *= 2;
1673 X_LOCK (wrklock);
1674 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1675 X_UNLOCK (wrklock);
1676
1677 if (!dents)
1678 break;
1679 }
1680
1681 ent = dents + dentoffs;
1682
1683 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1684 ent->namelen = len - 1;
1685 ent->inode = D_INO (entp);
1686
1687 inode_bits |= ent->inode;
1688
1689 switch (D_TYPE (entp))
1690 {
1691 default:
1692 ent->type = EIO_DT_UNKNOWN;
1693 flags |= EIO_READDIR_FOUND_UNKNOWN;
1694 break;
1695
1696 #ifdef DT_FIFO
1697 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1698 #endif
1699 #ifdef DT_CHR
1700 case DT_CHR: ent->type = EIO_DT_CHR; break;
1701 #endif
1702 #ifdef DT_MPC
1703 case DT_MPC: ent->type = EIO_DT_MPC; break;
1704 #endif
1705 #ifdef DT_DIR
1706 case DT_DIR: ent->type = EIO_DT_DIR; break;
1707 #endif
1708 #ifdef DT_NAM
1709 case DT_NAM: ent->type = EIO_DT_NAM; break;
1710 #endif
1711 #ifdef DT_BLK
1712 case DT_BLK: ent->type = EIO_DT_BLK; break;
1713 #endif
1714 #ifdef DT_MPB
1715 case DT_MPB: ent->type = EIO_DT_MPB; break;
1716 #endif
1717 #ifdef DT_REG
1718 case DT_REG: ent->type = EIO_DT_REG; break;
1719 #endif
1720 #ifdef DT_NWK
1721 case DT_NWK: ent->type = EIO_DT_NWK; break;
1722 #endif
1723 #ifdef DT_CMP
1724 case DT_CMP: ent->type = EIO_DT_CMP; break;
1725 #endif
1726 #ifdef DT_LNK
1727 case DT_LNK: ent->type = EIO_DT_LNK; break;
1728 #endif
1729 #ifdef DT_SOCK
1730 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1731 #endif
1732 #ifdef DT_DOOR
1733 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1734 #endif
1735 #ifdef DT_WHT
1736 case DT_WHT: ent->type = EIO_DT_WHT; break;
1737 #endif
1738 }
1739
1740 ent->score = 7;
1741
1742 if (flags & EIO_READDIR_DIRS_FIRST)
1743 {
1744 if (ent->type == EIO_DT_UNKNOWN)
1745 {
1746 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1747 ent->score = 1;
1748 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1749 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1750 }
1751 else if (ent->type == EIO_DT_DIR)
1752 ent->score = 0;
1753 }
1754 }
1755
1756 namesoffs += len; 1570 namesoffs += len;
1757 ++dentoffs; 1571 ++dentoffs;
1758 } 1572 }
1759 1573
1760 if (EIO_CANCELLED (req)) 1574 if (EIO_CANCELLED (req))
1761 { 1575 {
1762 errno = ECANCELED; 1576 errno = ECANCELED;
1763 break; 1577 break;
1764 } 1578 }
1579
1580#ifdef _WIN32
1581 if (!FindNextFile (dirp, &entp))
1582 {
1583 FindClose (dirp);
1584 dirp = 0;
1765 } 1585 }
1586#endif
1587 }
1766} 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
1767 1711
1768/*****************************************************************************/ 1712/*****************************************************************************/
1769 1713
1770#define ALLOC(len) \ 1714#define ALLOC(len) \
1771 if (!req->ptr2) \ 1715 if (!req->ptr2) \
1772 { \ 1716 { \
1773 X_LOCK (wrklock); \ 1717 X_LOCK (EIO_POOL->wrklock); \
1774 req->flags |= EIO_FLAG_PTR2_FREE; \ 1718 req->flags |= EIO_FLAG_PTR2_FREE; \
1775 X_UNLOCK (wrklock); \ 1719 X_UNLOCK (EIO_POOL->wrklock); \
1776 req->ptr2 = malloc (len); \ 1720 req->ptr2 = malloc (len); \
1777 if (!req->ptr2) \ 1721 if (!req->ptr2) \
1778 { \ 1722 { \
1779 errno = ENOMEM; \ 1723 errno = ENOMEM; \
1780 req->result = -1; \ 1724 req->result = -1; \
1781 break; \ 1725 break; \
1782 } \ 1726 } \
1783 } 1727 }
1784 1728
1785X_THREAD_PROC (etp_proc)
1786{
1787 ETP_REQ *req;
1788 struct timespec ts;
1789 etp_worker *self = (etp_worker *)thr_arg;
1790
1791 /* try to distribute timeouts somewhat randomly */
1792 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1793
1794 for (;;)
1795 {
1796 X_LOCK (reqlock);
1797
1798 for (;;)
1799 {
1800 self->req = req = reqq_shift (&req_queue);
1801
1802 if (req)
1803 break;
1804
1805 ++idle;
1806
1807 ts.tv_sec = time (0) + idle_timeout;
1808 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1809 {
1810 if (idle > max_idle)
1811 {
1812 --idle;
1813 X_UNLOCK (reqlock);
1814 X_LOCK (wrklock);
1815 --started;
1816 X_UNLOCK (wrklock);
1817 goto quit;
1818 }
1819
1820 /* we are allowed to idle, so do so without any timeout */
1821 X_COND_WAIT (reqwait, reqlock);
1822 }
1823
1824 --idle;
1825 }
1826
1827 --nready;
1828
1829 X_UNLOCK (reqlock);
1830
1831 if (req->type < 0)
1832 goto quit;
1833
1834 if (!EIO_CANCELLED (req))
1835 ETP_EXECUTE (self, req);
1836
1837 X_LOCK (reslock);
1838
1839 ++npending;
1840
1841 if (!reqq_push (&res_queue, req) && want_poll_cb)
1842 want_poll_cb ();
1843
1844 self->req = 0;
1845 etp_worker_clear (self);
1846
1847 X_UNLOCK (reslock);
1848 }
1849
1850quit:
1851 X_LOCK (wrklock);
1852 etp_worker_free (self);
1853 X_UNLOCK (wrklock);
1854
1855 return 0;
1856}
1857
1858/*****************************************************************************/ 1729/*****************************************************************************/
1859 1730
1860int ecb_cold 1731int ecb_cold
1861eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1732eio_init (void (*want_poll)(void), void (*done_poll)(void))
1862{ 1733{
1863 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);
1864} 1738}
1865 1739
1866ecb_inline void 1740ecb_inline void
1867eio_api_destroy (eio_req *req) 1741eio_api_destroy (eio_req *req)
1868{ 1742{
1869 free (req); 1743 free (req);
1870} 1744}
1871 1745
1872#define REQ(rtype) \ 1746#define REQ(rtype) \
1873 eio_req *req; \ 1747 eio_req *req; \
1874 \ 1748 \
1875 req = (eio_req *)calloc (1, sizeof *req); \ 1749 req = (eio_req *)calloc (1, sizeof *req); \
1876 if (!req) \ 1750 if (!req) \
1877 return 0; \ 1751 return 0; \
… …
1891 { \ 1765 { \
1892 eio_api_destroy (req); \ 1766 eio_api_destroy (req); \
1893 return 0; \ 1767 return 0; \
1894 } 1768 }
1895 1769
1770#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1771
1896static void 1772static void
1897eio_execute (etp_worker *self, eio_req *req) 1773eio_execute (etp_worker *self, eio_req *req)
1898{ 1774{
1775#if HAVE_AT
1776 int dirfd;
1777#else
1778 const char *path;
1779#endif
1780
1781 if (ecb_expect_false (EIO_CANCELLED (req)))
1782 {
1783 req->result = -1;
1784 req->errorno = ECANCELED;
1785 return;
1786 }
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
1899 switch (req->type) 1804 switch (req->type)
1900 { 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;
1901 case EIO_READ: ALLOC (req->size); 1813 case EIO_READ: ALLOC (req->size);
1902 req->result = req->offs >= 0 1814 req->result = req->offs >= 0
1903 ? pread (req->int1, req->ptr2, req->size, req->offs) 1815 ? pread (req->int1, req->ptr2, req->size, req->offs)
1904 : read (req->int1, req->ptr2, req->size); break; 1816 : read (req->int1, req->ptr2, req->size); break;
1905 case EIO_WRITE: req->result = req->offs >= 0 1817 case EIO_WRITE: req->result = req->offs >= 0
1906 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1818 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1907 : write (req->int1, req->ptr2, req->size); break; 1819 : write (req->int1, req->ptr2, req->size); break;
1908 1820
1909 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;
1910 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
1911 1825
1912 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1826 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1913 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;
1914 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));
1915 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
1916 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1932 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1917 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1933 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1918 1934
1919 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1920 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1921 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1935 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1922 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1936 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1923 1937
1924 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1925 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;
1926 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1927 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;
1928 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1929 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 1940 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1930 1941
1931 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1932 case EIO_CLOSE: req->result = close (req->int1); break; 1942 case EIO_CLOSE: req->result = close (req->int1); break;
1933 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 1943 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1934 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1935 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1936 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1937 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1938 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1939 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1940 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1941
1942 case EIO_REALPATH: eio__realpath (req, self); break;
1943
1944 case EIO_READLINK: ALLOC (PATH_MAX);
1945 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1946
1947 case EIO_SYNC: req->result = 0; sync (); break; 1944 case EIO_SYNC: req->result = 0; sync (); break;
1948 case EIO_FSYNC: req->result = fsync (req->int1); break; 1945 case EIO_FSYNC: req->result = fsync (req->int1); break;
1949 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;
1950 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;
1951 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 1950 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1952 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;
1953 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1952 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1954 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1953 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1955 1954
1956 case EIO_READDIR: eio__scandir (req, self); break; 1955 case EIO_READDIR: eio__scandir (req, self); break;
1957 1956
1958 case EIO_BUSY: 1957 case EIO_BUSY:
1959#ifdef _WIN32 1958#ifdef _WIN32
… …
1968 req->result = select (0, 0, 0, 0, &tv); 1967 req->result = select (0, 0, 0, 0, &tv);
1969 } 1968 }
1970#endif 1969#endif
1971 break; 1970 break;
1972 1971
1973 case EIO_UTIME: 1972#if 0
1974 case EIO_FUTIME:
1975 {
1976 struct timeval tv[2];
1977 struct timeval *times;
1978
1979 if (req->nv1 != -1. || req->nv2 != -1.)
1980 {
1981 tv[0].tv_sec = req->nv1;
1982 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1983 tv[1].tv_sec = req->nv2;
1984 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1985
1986 times = tv;
1987 }
1988 else
1989 times = 0;
1990
1991 req->result = req->type == EIO_FUTIME
1992 ? futimes (req->int1, times)
1993 : utimes (req->ptr1, times);
1994 }
1995 break;
1996
1997 case EIO_GROUP: 1973 case EIO_GROUP:
1998 abort (); /* handled in eio_request */ 1974 abort (); /* handled in eio_request */
1975#endif
1999 1976
2000 case EIO_NOP: 1977 case EIO_NOP:
2001 req->result = 0; 1978 req->result = 0;
2002 break; 1979 break;
2003 1980
2004 case EIO_CUSTOM: 1981 case EIO_CUSTOM:
2005 req->feed (req); 1982 req->feed (req);
2006 break; 1983 break;
2007 1984
2008 default: 1985 default:
2009 errno = ENOSYS;
2010 req->result = -1; 1986 req->result = EIO_ENOSYS ();
2011 break; 1987 break;
2012 } 1988 }
2013 1989
2014 req->errorno = errno; 1990 req->errorno = errno;
2015} 1991}
2016 1992
2017#ifndef EIO_NO_WRAPPERS 1993#ifndef EIO_NO_WRAPPERS
2018 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
2019eio_req *eio_nop (int pri, eio_cb cb, void *data) 2005eio_req *eio_nop (int pri, eio_cb cb, void *data)
2020{ 2006{
2021 REQ (EIO_NOP); SEND; 2007 REQ (EIO_NOP); SEND;
2022} 2008}
2023 2009
… …
2039eio_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)
2040{ 2026{
2041 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;
2042} 2028}
2043 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
2044eio_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)
2045{ 2046{
2046 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;
2047} 2048}
2048 2049
… …
2054eio_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)
2055{ 2056{
2056 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2057 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2057} 2058}
2058 2059
2059eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, 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)
2060{ 2061{
2061 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2062 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2062}
2063
2064eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2065{
2066 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2067} 2063}
2068 2064
2069eio_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)
2070{ 2066{
2071 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2067 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
2074eio_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)
2075{ 2071{
2076 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;
2077} 2073}
2078 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
2079eio_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)
2080{ 2081{
2081 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;
2082} 2083}
2083 2084
… …
2109eio_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)
2110{ 2111{
2111 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2112 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2112} 2113}
2113 2114
2114eio_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)
2115{ 2116{
2116 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;
2117} 2118}
2118 2119
2119eio_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)
… …
2139eio_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)
2140{ 2141{
2141 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2142 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2142} 2143}
2143 2144
2144eio_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)
2145{ 2146{
2146 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;
2147} 2148}
2148 2149
2149eio_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)
… …
2279void 2280void
2280eio_grp_add (eio_req *grp, eio_req *req) 2281eio_grp_add (eio_req *grp, eio_req *req)
2281{ 2282{
2282 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));
2283 2284
2284 grp->flags |= EIO_FLAG_GROUPADD; 2285 grp->flags |= ETP_FLAG_GROUPADD;
2285 2286
2286 ++grp->size; 2287 ++grp->size;
2287 req->grp = grp; 2288 req->grp = grp;
2288 2289
2289 req->grp_prev = 0; 2290 req->grp_prev = 0;
… …
2296} 2297}
2297 2298
2298/*****************************************************************************/ 2299/*****************************************************************************/
2299/* misc garbage */ 2300/* misc garbage */
2300 2301
2301ssize_t 2302eio_ssize_t
2302eio_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)
2303{ 2304{
2304 etp_worker wrk;
2305 ssize_t ret;
2306
2307 wrk.dbuf = 0;
2308
2309 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2305 return eio__sendfile (ofd, ifd, offset, count);
2310
2311 if (wrk.dbuf)
2312 free (wrk.dbuf);
2313
2314 return ret;
2315} 2306}
2316 2307

Diff Legend

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