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

Comparing libeio/eio.c (file contents):
Revision 1.53 by root, Sat Jan 9 10:03:09 2010 UTC vs.
Revision 1.134 by root, Thu Jun 25 15:59:57 2015 UTC

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

Diff Legend

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