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.137 by root, Thu Jun 25 17:40:24 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 381
194#define ETP_WORKER_COMMON \ 382static struct etp_pool eio_pool;
195 void *dbuf; \ 383#define EIO_POOL (&eio_pool)
196 DIR *dirp;
197 384
198/*****************************************************************************/ 385/*****************************************************************************/
199 386
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 387static 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) 388grp_try_feed (eio_req *grp)
640{ 389{
641 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 390 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
642 { 391 {
643 grp->flags &= ~EIO_FLAG_GROUPADD; 392 grp->flags &= ~ETP_FLAG_GROUPADD;
644 393
645 EIO_FEED (grp); 394 EIO_FEED (grp);
646 395
647 /* stop if no progress has been made */ 396 /* stop if no progress has been made */
648 if (!(grp->flags & EIO_FLAG_GROUPADD)) 397 if (!(grp->flags & ETP_FLAG_GROUPADD))
649 { 398 {
650 grp->feed = 0; 399 grp->feed = 0;
651 break; 400 break;
652 } 401 }
653 } 402 }
654} 403}
655 404
405static int
656static int grp_dec (eio_req *grp) 406grp_dec (eio_req *grp)
657{ 407{
658 --grp->size; 408 --grp->size;
659 409
660 /* call feeder, if applicable */ 410 /* call feeder, if applicable */
661 grp_try_feed (grp); 411 grp_try_feed (grp);
662 412
663 /* finish, if done */ 413 /* finish, if done */
664 if (!grp->size && grp->int1) 414 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
665 return eio_finish (grp); 415 return eio_finish (grp);
666 else 416 else
667 return 0; 417 return 0;
668} 418}
669 419
420static void
670void eio_destroy (eio_req *req) 421eio_destroy (eio_req *req)
671{ 422{
672 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 423 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
673 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 424 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
674 425
675 EIO_DESTROY (req); 426 EIO_DESTROY (req);
676} 427}
677 428
429static int
678static int eio_finish (eio_req *req) 430eio_finish (eio_req *req)
679{ 431{
680 int res = EIO_FINISH (req); 432 int res = EIO_FINISH (req);
681 433
682 if (req->grp) 434 if (req->grp)
683 { 435 {
… …
691 if (grp->grp_first == req) 443 if (grp->grp_first == req)
692 grp->grp_first = req->grp_next; 444 grp->grp_first = req->grp_next;
693 445
694 res2 = grp_dec (grp); 446 res2 = grp_dec (grp);
695 447
696 if (!res && res2) 448 if (!res)
697 res = res2; 449 res = res2;
698 } 450 }
699 451
700 eio_destroy (req); 452 eio_destroy (req);
701 453
702 return res; 454 return res;
703} 455}
704 456
457void
705void eio_grp_cancel (eio_req *grp) 458eio_grp_cancel (eio_req *grp)
706{ 459{
707 for (grp = grp->grp_first; grp; grp = grp->grp_next) 460 etp_grp_cancel (EIO_POOL, grp);
708 eio_cancel (grp);
709} 461}
710 462
463void
711void eio_cancel (eio_req *req) 464eio_cancel (eio_req *req)
712{ 465{
713 etp_cancel (req); 466 etp_cancel (EIO_POOL, req);
714} 467}
715 468
469void
716void eio_submit (eio_req *req) 470eio_submit (eio_req *req)
717{ 471{
718 etp_submit (req); 472 etp_submit (EIO_POOL, req);
719} 473}
720 474
721unsigned int eio_nreqs (void) 475unsigned int
476eio_nreqs (void)
722{ 477{
723 return etp_nreqs (); 478 return etp_nreqs (EIO_POOL);
724} 479}
725 480
726unsigned int eio_nready (void) 481unsigned int
482eio_nready (void)
727{ 483{
728 return etp_nready (); 484 return etp_nready (EIO_POOL);
729} 485}
730 486
731unsigned int eio_npending (void) 487unsigned int
488eio_npending (void)
732{ 489{
733 return etp_npending (); 490 return etp_npending (EIO_POOL);
734} 491}
735 492
736unsigned int eio_nthreads (void) 493unsigned int ecb_cold
494eio_nthreads (void)
737{ 495{
738 return etp_nthreads (); 496 return etp_nthreads (EIO_POOL);
739} 497}
740 498
499void ecb_cold
741void eio_set_max_poll_time (double nseconds) 500eio_set_max_poll_time (double nseconds)
742{ 501{
743 etp_set_max_poll_time (nseconds); 502 etp_set_max_poll_time (EIO_POOL, nseconds);
744} 503}
745 504
505void ecb_cold
746void eio_set_max_poll_reqs (unsigned int maxreqs) 506eio_set_max_poll_reqs (unsigned int maxreqs)
747{ 507{
748 etp_set_max_poll_reqs (maxreqs); 508 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
749} 509}
750 510
511void ecb_cold
751void eio_set_max_idle (unsigned int nthreads) 512eio_set_max_idle (unsigned int nthreads)
752{ 513{
753 etp_set_max_idle (nthreads); 514 etp_set_max_idle (EIO_POOL, nthreads);
754} 515}
755 516
517void ecb_cold
518eio_set_idle_timeout (unsigned int seconds)
519{
520 etp_set_idle_timeout (EIO_POOL, seconds);
521}
522
523void ecb_cold
756void eio_set_min_parallel (unsigned int nthreads) 524eio_set_min_parallel (unsigned int nthreads)
757{ 525{
758 etp_set_min_parallel (nthreads); 526 etp_set_min_parallel (EIO_POOL, nthreads);
759} 527}
760 528
529void ecb_cold
761void eio_set_max_parallel (unsigned int nthreads) 530eio_set_max_parallel (unsigned int nthreads)
762{ 531{
763 etp_set_max_parallel (nthreads); 532 etp_set_max_parallel (EIO_POOL, nthreads);
764} 533}
765 534
766int eio_poll (void) 535int eio_poll (void)
767{ 536{
768 return etp_poll (); 537 return etp_poll (EIO_POOL);
769} 538}
770 539
771/*****************************************************************************/ 540/*****************************************************************************/
772/* work around various missing functions */ 541/* work around various missing functions */
773 542
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 543#ifndef HAVE_UTIMES
814 544
815# undef utimes 545# undef utimes
816# undef futimes
817# define utimes(path,times) eio__utimes (path, times) 546# define utimes(path,times) eio__utimes (path, times)
818# define futimes(fd,times) eio__futimes (fd, times)
819 547
820static int 548static int
821eio__utimes (const char *filename, const struct timeval times[2]) 549eio__utimes (const char *filename, const struct timeval times[2])
822{ 550{
823 if (times) 551 if (times)
… …
831 } 559 }
832 else 560 else
833 return utime (filename, 0); 561 return utime (filename, 0);
834} 562}
835 563
564#endif
565
566#ifndef HAVE_FUTIMES
567
568# undef futimes
569# define futimes(fd,times) eio__futimes (fd, times)
570
571static int
836static int eio__futimes (int fd, const struct timeval tv[2]) 572eio__futimes (int fd, const struct timeval tv[2])
837{ 573{
838 errno = ENOSYS; 574 errno = ENOSYS;
839 return -1; 575 return -1;
840} 576}
841 577
… …
844#if !HAVE_FDATASYNC 580#if !HAVE_FDATASYNC
845# undef fdatasync 581# undef fdatasync
846# define fdatasync(fd) fsync (fd) 582# define fdatasync(fd) fsync (fd)
847#endif 583#endif
848 584
585static int
586eio__syncfs (int fd)
587{
588 int res;
589
590#if HAVE_SYS_SYNCFS
591 res = (int)syscall (__NR_syncfs, (int)(fd));
592#else
593 res = EIO_ENOSYS ();
594#endif
595
596 if (res < 0 && errno == ENOSYS && fd >= 0)
597 sync ();
598
599 return res;
600}
601
849/* sync_file_range always needs emulation */ 602/* sync_file_range always needs emulation */
850int 603static int
851eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 604eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
852{ 605{
853#if HAVE_SYNC_FILE_RANGE 606#if HAVE_SYNC_FILE_RANGE
854 int res; 607 int res;
855 608
… …
872 /* even though we could play tricks with the flags, it's better to always 625 /* 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 */ 626 * call fdatasync, as that matches the expectation of its users best */
874 return fdatasync (fd); 627 return fdatasync (fd);
875} 628}
876 629
630static int
631eio__fallocate (int fd, int mode, off_t offset, size_t len)
632{
633#if HAVE_LINUX_FALLOCATE
634 return fallocate (fd, mode, offset, len);
635#else
636 return EIO_ENOSYS ();
637#endif
638}
639
877#if !HAVE_READAHEAD 640#if !HAVE_READAHEAD
878# undef readahead 641# undef readahead
879# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 642# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
880 643
881static ssize_t 644static eio_ssize_t
882eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 645eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
883{ 646{
884 size_t todo = count; 647 size_t todo = count;
885 dBUF; 648 dBUF;
886 649
… …
891 pread (fd, eio_buf, len, offset); 654 pread (fd, eio_buf, len, offset);
892 offset += len; 655 offset += len;
893 todo -= len; 656 todo -= len;
894 } 657 }
895 658
896 errno = 0; 659 FUBd;
660
661 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
662 /* but not for e.g. EIO or eof, so we also never fail */
897 return count; 663 return 0;
898} 664}
899 665
900#endif 666#endif
901 667
902/* sendfile always needs emulation */ 668/* sendfile always needs emulation */
903static ssize_t 669static eio_ssize_t
904eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 670eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
905{ 671{
672 eio_ssize_t written = 0;
906 ssize_t res; 673 eio_ssize_t res;
907 674
908 if (!count) 675 if (!count)
909 return 0; 676 return 0;
910 677
678 for (;;)
679 {
680#ifdef __APPLE__
681# undef HAVE_SENDFILE /* broken, as everything on os x */
682#endif
911#if HAVE_SENDFILE 683#if HAVE_SENDFILE
912# if __linux 684# if __linux
685 off_t soffset = offset;
913 res = sendfile (ofd, ifd, &offset, count); 686 res = sendfile (ofd, ifd, &soffset, count);
914 687
915# elif __FreeBSD__ 688# elif __FreeBSD__
916 /* 689 /*
917 * Of course, the freebsd sendfile is a dire hack with no thoughts 690 * Of course, the freebsd sendfile is a dire hack with no thoughts
918 * wasted on making it similar to other I/O functions. 691 * wasted on making it similar to other I/O functions.
919 */ 692 */
920 {
921 off_t sbytes; 693 off_t sbytes;
922 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 694 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
923 695
924 #if 0 /* according to the manpage, this is correct, but broken behaviour */ 696 #if 0 /* according to the manpage, this is correct, but broken behaviour */
925 /* freebsd' sendfile will return 0 on success */ 697 /* freebsd' sendfile will return 0 on success */
926 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 698 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
927 /* not on e.g. EIO or EPIPE - sounds broken */ 699 /* not on e.g. EIO or EPIPE - sounds broken */
928 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 700 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
929 res = sbytes; 701 res = sbytes;
930 #endif 702 #endif
931 703
932 /* according to source inspection, this is correct, and useful behaviour */ 704 /* according to source inspection, this is correct, and useful behaviour */
933 if (sbytes) 705 if (sbytes)
934 res = sbytes; 706 res = sbytes;
935 }
936 707
937# elif defined (__APPLE__) 708# elif defined __APPLE__
938
939 {
940 off_t sbytes = count; 709 off_t sbytes = count;
941 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 710 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
942 711
943 /* according to the manpage, sbytes is always valid */ 712 /* according to the manpage, sbytes is always valid */
944 if (sbytes) 713 if (sbytes)
945 res = sbytes; 714 res = sbytes;
946 }
947 715
948# elif __hpux 716# elif __hpux
949 res = sendfile (ofd, ifd, offset, count, 0, 0); 717 res = sendfile (ofd, ifd, offset, count, 0, 0);
950 718
951# elif __solaris 719# elif __solaris
952 {
953 struct sendfilevec vec; 720 struct sendfilevec vec;
954 size_t sbytes; 721 size_t sbytes;
955 722
956 vec.sfv_fd = ifd; 723 vec.sfv_fd = ifd;
957 vec.sfv_flag = 0; 724 vec.sfv_flag = 0;
958 vec.sfv_off = offset; 725 vec.sfv_off = offset;
959 vec.sfv_len = count; 726 vec.sfv_len = count;
960 727
961 res = sendfilev (ofd, &vec, 1, &sbytes); 728 res = sendfilev (ofd, &vec, 1, &sbytes);
962 729
963 if (res < 0 && sbytes) 730 if (res < 0 && sbytes)
964 res = sbytes; 731 res = sbytes;
965 }
966 732
967# endif 733# endif
968 734
969#elif defined (_WIN32) 735#elif defined (_WIN32) && 0
970
971 /* does not work, just for documentation of what would need to be done */ 736 /* does not work, just for documentation of what would need to be done */
972 { 737 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
738 /* libeio guarantees that the file offset does not change, and windows */
739 /* has no way to get an independent handle to the same file description */
973 HANDLE h = TO_SOCKET (ifd); 740 HANDLE h = TO_SOCKET (ifd);
974 SetFilePointer (h, offset, 0, FILE_BEGIN); 741 SetFilePointer (h, offset, 0, FILE_BEGIN);
975 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 742 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
976 }
977 743
978#else 744#else
979 res = -1; 745 res = EIO_ENOSYS ();
980 errno = ENOSYS;
981#endif 746#endif
982 747
748 /* we assume sendfile can copy at least 128mb in one go */
749 if (res <= 128 * 1024 * 1024)
750 {
751 if (res > 0)
752 written += res;
753
754 if (written)
755 return written;
756
757 break;
758 }
759 else
760 {
761 /* if we requested more, then probably the kernel was lazy */
762 written += res;
763 offset += res;
764 count -= res;
765
766 if (!count)
767 return written;
768 }
769 }
770
983 if (res < 0 771 if (res < 0
984 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 772 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
985 /* BSDs */ 773 /* BSDs */
986#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 774#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
987 || errno == ENOTSUP 775 || errno == ENOTSUP
988#endif 776#endif
777#ifdef EOPNOTSUPP /* windows */
989 || errno == EOPNOTSUPP /* BSDs */ 778 || errno == EOPNOTSUPP /* BSDs */
779#endif
990#if __solaris 780#if __solaris
991 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 781 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
992#endif 782#endif
993 ) 783 )
994 ) 784 )
… …
998 788
999 res = 0; 789 res = 0;
1000 790
1001 while (count) 791 while (count)
1002 { 792 {
1003 ssize_t cnt; 793 eio_ssize_t cnt;
1004 794
1005 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 795 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1006 796
1007 if (cnt <= 0) 797 if (cnt <= 0)
1008 { 798 {
… …
1020 810
1021 offset += cnt; 811 offset += cnt;
1022 res += cnt; 812 res += cnt;
1023 count -= cnt; 813 count -= cnt;
1024 } 814 }
815
816 FUBd;
1025 } 817 }
1026 818
1027 return res; 819 return res;
820}
821
822#ifdef PAGESIZE
823# define eio_pagesize() PAGESIZE
824#else
825static intptr_t
826eio_pagesize (void)
827{
828 static intptr_t page;
829
830 if (!page)
831 page = sysconf (_SC_PAGESIZE);
832
833 return page;
834}
835#endif
836
837static void
838eio_page_align (void **addr, size_t *length)
839{
840 intptr_t mask = eio_pagesize () - 1;
841
842 /* round down addr */
843 intptr_t adj = mask & (intptr_t)*addr;
844
845 *addr = (void *)((intptr_t)*addr - adj);
846 *length += adj;
847
848 /* round up length */
849 *length = (*length + mask) & ~mask;
850}
851
852#if !_POSIX_MEMLOCK
853# define eio__mlockall(a) EIO_ENOSYS ()
854#else
855
856static int
857eio__mlockall (int flags)
858{
859 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
860 extern int mallopt (int, int);
861 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
862 #endif
863
864 if (EIO_MCL_CURRENT != MCL_CURRENT
865 || EIO_MCL_FUTURE != MCL_FUTURE)
866 {
867 flags = 0
868 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
869 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
870 }
871
872 return mlockall (flags);
873}
874#endif
875
876#if !_POSIX_MEMLOCK_RANGE
877# define eio__mlock(a,b) EIO_ENOSYS ()
878#else
879
880static int
881eio__mlock (void *addr, size_t length)
882{
883 eio_page_align (&addr, &length);
884
885 return mlock (addr, length);
886}
887
888#endif
889
890#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
891# define eio__msync(a,b,c) EIO_ENOSYS ()
892#else
893
894static int
895eio__msync (void *mem, size_t len, int flags)
896{
897 eio_page_align (&mem, &len);
898
899 if (EIO_MS_ASYNC != MS_SYNC
900 || EIO_MS_INVALIDATE != MS_INVALIDATE
901 || EIO_MS_SYNC != MS_SYNC)
902 {
903 flags = 0
904 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
905 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
906 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
907 }
908
909 return msync (mem, len, flags);
910}
911
912#endif
913
914static int
915eio__mtouch (eio_req *req)
916{
917 void *mem = req->ptr2;
918 size_t len = req->size;
919 int flags = req->int1;
920
921 eio_page_align (&mem, &len);
922
923 {
924 intptr_t addr = (intptr_t)mem;
925 intptr_t end = addr + len;
926 intptr_t page = eio_pagesize ();
927
928 if (addr < end)
929 if (flags & EIO_MT_MODIFY) /* modify */
930 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
931 else
932 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
933 }
934
935 return 0;
936}
937
938/*****************************************************************************/
939/* requests implemented outside eio_execute, because they are so large */
940
941static void
942eio__lseek (eio_req *req)
943{
944 /* this usually gets optimised away completely, or your compiler sucks, */
945 /* or the whence constants really are not 0, 1, 2 */
946 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
947 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
948 : req->int2 == EIO_SEEK_END ? SEEK_END
949 : req->int2;
950
951 req->offs = lseek (req->int1, req->offs, whence);
952 req->result = req->offs == (off_t)-1 ? -1 : 0;
953}
954
955/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
956static int
957eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
958{
959 char *res;
960 const char *rel = path;
961 char *tmp1, *tmp2;
962#if SYMLOOP_MAX > 32
963 int symlinks = SYMLOOP_MAX;
964#else
965 int symlinks = 32;
966#endif
967
968 errno = EINVAL;
969 if (!rel)
970 return -1;
971
972 errno = ENOENT;
973 if (!*rel)
974 return -1;
975
976 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
977#ifdef _WIN32
978 if (_access (rel, 4) != 0)
979 return -1;
980
981 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0);
982
983 errno = ENAMETOOLONG;
984 if (symlinks >= PATH_MAX * 3)
985 return -1;
986
987 errno = EIO;
988 if (symlinks <= 0)
989 return -1;
990
991 return symlinks;
992
993#else
994 tmp1 = res + PATH_MAX;
995 tmp2 = tmp1 + PATH_MAX;
996
997#if 0 /* disabled, the musl way to do things is just too racy */
998#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
999 /* on linux we may be able to ask the kernel */
1000 {
1001 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1002
1003 if (fd >= 0)
1004 {
1005 sprintf (tmp1, "/proc/self/fd/%d", fd);
1006 req->result = readlink (tmp1, res, PATH_MAX);
1007 /* here we should probably stat the open file and the disk file, to make sure they still match */
1008 close (fd);
1009
1010 if (req->result > 0)
1011 goto done;
1012 }
1013 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1014 return -1;
1015 }
1016#endif
1017#endif
1018
1019 if (*rel != '/')
1020 {
1021 int len;
1022
1023 errno = ENOENT;
1024 if (wd == EIO_INVALID_WD)
1025 return -1;
1026
1027 if (wd == EIO_CWD)
1028 {
1029 if (!getcwd (res, PATH_MAX))
1030 return -1;
1031
1032 len = strlen (res);
1033 }
1034 else
1035 memcpy (res, wd->str, len = wd->len);
1036
1037 if (res [1]) /* only use if not / */
1038 res += len;
1039 }
1040
1041 while (*rel)
1042 {
1043 eio_ssize_t len, linklen;
1044 const char *beg = rel;
1045
1046 while (*rel && *rel != '/')
1047 ++rel;
1048
1049 len = rel - beg;
1050
1051 if (!len) /* skip slashes */
1052 {
1053 ++rel;
1054 continue;
1055 }
1056
1057 if (beg [0] == '.')
1058 {
1059 if (len == 1)
1060 continue; /* . - nop */
1061
1062 if (beg [1] == '.' && len == 2)
1063 {
1064 /* .. - back up one component, if possible */
1065
1066 while (res != tmpbuf->ptr)
1067 if (*--res == '/')
1068 break;
1069
1070 continue;
1071 }
1072 }
1073
1074 errno = ENAMETOOLONG;
1075 if (res + 1 + len + 1 >= tmp1)
1076 return -1;
1077
1078 /* copy one component */
1079 *res = '/';
1080 memcpy (res + 1, beg, len);
1081
1082 /* zero-terminate, for readlink */
1083 res [len + 1] = 0;
1084
1085 /* now check if it's a symlink */
1086 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1087
1088 if (linklen < 0)
1089 {
1090 if (errno != EINVAL)
1091 return -1;
1092
1093 /* it's a normal directory. hopefully */
1094 res += len + 1;
1095 }
1096 else
1097 {
1098 /* yay, it was a symlink - build new path in tmp2 */
1099 int rellen = strlen (rel);
1100
1101 errno = ENAMETOOLONG;
1102 if (linklen + 1 + rellen >= PATH_MAX)
1103 return -1;
1104
1105 errno = ELOOP;
1106 if (!--symlinks)
1107 return -1;
1108
1109 if (*tmp1 == '/')
1110 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1111
1112 /* we need to be careful, as rel might point into tmp2 already */
1113 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1114 tmp2 [linklen] = '/';
1115 memcpy (tmp2, tmp1, linklen);
1116
1117 rel = tmp2;
1118 }
1119 }
1120
1121 /* special case for the lone root path */
1122 if (res == tmpbuf->ptr)
1123 *res++ = '/';
1124
1125 return res - (char *)tmpbuf->ptr;
1126#endif
1028} 1127}
1029 1128
1030static signed char 1129static signed char
1031eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1130eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1032{ 1131{
1033 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1132 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; 1133 : a->inode < b->inode ? -1
1134 : a->inode > b->inode ? 1
1135 : 0;
1035} 1136}
1036 1137
1037#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1138#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1038 1139
1039#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1140#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 */ 1141#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1041 1142
1042static void 1143static void
1043eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1144eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1044{ 1145{
1045 unsigned char bits [9 + sizeof (ino_t) * 8]; 1146 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1046 unsigned char *bit = bits; 1147 unsigned char *bit = bits;
1047 1148
1048 assert (CHAR_BIT == 8); 1149 assert (CHAR_BIT == 8);
1049 assert (sizeof (eio_dirent) * 8 < 256); 1150 assert (sizeof (eio_dirent) * 8 < 256);
1050 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1151 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1051 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1152 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1052 1153
1053 if (size <= EIO_SORT_FAST) 1154 if (size <= EIO_SORT_FAST)
1054 return; 1155 return;
1055 1156
1056 /* first prepare an array of bits to test in our radix sort */ 1157 /* 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 */ 1158 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1058 /* inode_bits must contain all inodes ORed together */ 1159 /* inode_bits must contain all inodes ORed together */
1059 /* which is used to skip bits that are 0 everywhere, which is very common */ 1160 /* which is used to skip bits that are 0 everywhere, which is very common */
1060 { 1161 {
1061 ino_t endianness; 1162 eio_ino_t endianness;
1062 int i, j; 1163 int i, j;
1063 1164
1064 /* we store the byte offset of byte n into byte n of "endianness" */ 1165 /* we store the byte offset of byte n into byte n of "endianness" */
1065 for (i = 0; i < sizeof (ino_t); ++i) 1166 for (i = 0; i < sizeof (eio_ino_t); ++i)
1066 ((unsigned char *)&endianness)[i] = i; 1167 ((unsigned char *)&endianness)[i] = i;
1067 1168
1068 *bit++ = 0; 1169 *bit++ = 0;
1069 1170
1070 for (i = 0; i < sizeof (ino_t); ++i) 1171 for (i = 0; i < sizeof (eio_ino_t); ++i)
1071 { 1172 {
1072 /* shifting off the byte offsets out of "endianness" */ 1173 /* shifting off the byte offsets out of "endianness" */
1073 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1174 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1074 endianness >>= 8; 1175 endianness >>= 8;
1075 1176
1076 for (j = 0; j < 8; ++j) 1177 for (j = 0; j < 8; ++j)
1077 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1178 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1078 *bit++ = offs + j; 1179 *bit++ = offs + j;
1079 } 1180 }
1080 1181
1081 for (j = 0; j < 8; ++j) 1182 for (j = 0; j < 8; ++j)
1082 if (score_bits & (1 << j)) 1183 if (score_bits & (1 << j))
1083 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1184 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1084 } 1185 }
1085 1186
1086 /* now actually do the sorting (a variant of MSD radix sort) */ 1187 /* now actually do the sorting (a variant of MSD radix sort) */
1087 { 1188 {
1088 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1189 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1089 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1190 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1090 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1191 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1091 int stk_idx = 0; 1192 int stk_idx = 0;
1092 1193
1093 base_stk [stk_idx] = dents; 1194 base_stk [stk_idx] = dents;
1094 end_stk [stk_idx] = dents + size; 1195 end_stk [stk_idx] = dents + size;
1095 bit_stk [stk_idx] = bit - 1; 1196 bit_stk [stk_idx] = bit - 1;
… …
1174 } 1275 }
1175 } 1276 }
1176} 1277}
1177 1278
1178static void 1279static void
1179eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1280eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1180{ 1281{
1181 if (size <= 1) 1282 if (size <= 1)
1182 return; /* our insertion sort relies on size > 0 */ 1283 return; /* our insertion sort relies on size > 0 */
1183 1284
1184 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1285 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1192 1293
1193/* read a full directory */ 1294/* read a full directory */
1194static void 1295static void
1195eio__scandir (eio_req *req, etp_worker *self) 1296eio__scandir (eio_req *req, etp_worker *self)
1196{ 1297{
1197 DIR *dirp;
1198 EIO_STRUCT_DIRENT *entp;
1199 char *name, *names; 1298 char *name, *names;
1200 int namesalloc = 4096; 1299 int namesalloc = 4096 - sizeof (void *) * 4;
1201 int namesoffs = 0; 1300 int namesoffs = 0;
1202 int flags = req->int1; 1301 int flags = req->int1;
1203 eio_dirent *dents = 0; 1302 eio_dirent *dents = 0;
1204 int dentalloc = 128; 1303 int dentalloc = 128;
1205 int dentoffs = 0; 1304 int dentoffs = 0;
1206 ino_t inode_bits = 0; 1305 eio_ino_t inode_bits = 0;
1306#ifdef _WIN32
1307 HANDLE dirp;
1308 WIN32_FIND_DATA entp;
1309#else
1310 DIR *dirp;
1311 EIO_STRUCT_DIRENT *entp;
1312#endif
1207 1313
1208 req->result = -1; 1314 req->result = -1;
1209 1315
1210 if (!(flags & EIO_READDIR_DENTS)) 1316 if (!(flags & EIO_READDIR_DENTS))
1211 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1317 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1212 1318
1213 X_LOCK (wrklock); 1319#ifdef _WIN32
1214 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1320 {
1321 int len = strlen ((const char *)req->ptr1);
1322 char *path = malloc (MAX_PATH);
1323 const char *fmt;
1324 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1325
1326 if (!len)
1327 fmt = "./*";
1328 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1329 fmt = "%s*";
1330 else
1331 fmt = "%s/*";
1332
1333 _snprintf (path, MAX_PATH, fmt, reqpath);
1334 dirp = FindFirstFile (path, &entp);
1335 free (path);
1336
1337 if (dirp == INVALID_HANDLE_VALUE)
1338 {
1339 /* should steal _dosmaperr */
1340 switch (GetLastError ())
1341 {
1342 case ERROR_FILE_NOT_FOUND:
1343 req->result = 0;
1344 break;
1345
1346 case ERROR_INVALID_NAME:
1347 case ERROR_PATH_NOT_FOUND:
1348 case ERROR_NO_MORE_FILES:
1349 errno = ENOENT;
1350 break;
1351
1352 case ERROR_NOT_ENOUGH_MEMORY:
1353 errno = ENOMEM;
1354 break;
1355
1356 default:
1357 errno = EINVAL;
1358 break;
1359 }
1360
1361 return;
1362 }
1363 }
1364#else
1365 #if HAVE_AT
1366 if (req->wd)
1367 {
1368 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1369
1370 if (fd < 0)
1371 return;
1372
1373 dirp = fdopendir (fd);
1374
1375 if (!dirp)
1376 close (fd);
1377 }
1378 else
1215 self->dirp = dirp = opendir (req->ptr1); 1379 dirp = opendir (req->ptr1);
1380 #else
1381 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1382 #endif
1383
1384 if (!dirp)
1385 return;
1386#endif
1387
1388 if (req->flags & EIO_FLAG_PTR1_FREE)
1389 free (req->ptr1);
1390
1216 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1391 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1217 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1392 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1218 req->ptr2 = names = malloc (namesalloc); 1393 req->ptr2 = names = malloc (namesalloc);
1219 X_UNLOCK (wrklock);
1220 1394
1221 if (dirp && names && (!flags || dents)) 1395 if (!names || (flags && !dents))
1396 return;
1397
1222 for (;;) 1398 for (;;)
1223 { 1399 {
1400 int done;
1401
1402#ifdef _WIN32
1403 done = !dirp;
1404#else
1224 errno = 0; 1405 errno = 0;
1225 entp = readdir (dirp); 1406 entp = readdir (dirp);
1407 done = !entp;
1408#endif
1226 1409
1227 if (!entp) 1410 if (done)
1228 { 1411 {
1412#ifndef _WIN32
1413 int old_errno = errno;
1414 closedir (dirp);
1415 errno = old_errno;
1416
1229 if (errno) 1417 if (errno)
1230 break; 1418 break;
1419#endif
1231 1420
1232 /* sort etc. */ 1421 /* sort etc. */
1233 req->int1 = flags; 1422 req->int1 = flags;
1234 req->result = dentoffs; 1423 req->result = dentoffs;
1235 1424
1236 if (flags & EIO_READDIR_STAT_ORDER) 1425 if (flags & EIO_READDIR_STAT_ORDER)
1237 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1426 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1238 else if (flags & EIO_READDIR_DIRS_FIRST) 1427 else if (flags & EIO_READDIR_DIRS_FIRST)
1239 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1428 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1240 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1429 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1241 else 1430 else
1431 {
1432 /* in this case, all is known, and we just put dirs first and sort them */
1433 eio_dirent *oth = dents + dentoffs;
1434 eio_dirent *dir = dents;
1435
1436 /* now partition dirs to the front, and non-dirs to the back */
1437 /* by walking from both sides and swapping if necessary */
1438 while (oth > dir)
1439 {
1440 if (dir->type == EIO_DT_DIR)
1441 ++dir;
1442 else if ((--oth)->type == EIO_DT_DIR)
1443 {
1444 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1445
1446 ++dir;
1447 }
1448 }
1449
1450 /* now sort the dirs only (dirs all have the same score) */
1451 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1452 }
1453
1454 break;
1455 }
1456
1457 /* now add the entry to our list(s) */
1458 name = D_NAME (entp);
1459
1460 /* skip . and .. entries */
1461 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1462 {
1463 int len = D_NAMLEN (entp) + 1;
1464
1465 while (ecb_expect_false (namesoffs + len > namesalloc))
1466 {
1467 namesalloc *= 2;
1468 req->ptr2 = names = realloc (names, namesalloc);
1469
1470 if (!names)
1471 break;
1472 }
1473
1474 memcpy (names + namesoffs, name, len);
1475
1476 if (dents)
1477 {
1478 struct eio_dirent *ent;
1479
1480 if (ecb_expect_false (dentoffs == dentalloc))
1242 { 1481 {
1243 /* in this case, all is known, and we just put dirs first and sort them */ 1482 dentalloc *= 2;
1483 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1484
1485 if (!dents)
1486 break;
1487 }
1488
1244 eio_dirent *oth = dents + dentoffs; 1489 ent = dents + dentoffs;
1245 eio_dirent *dir = dents;
1246 1490
1247 /* now partition dirs to the front, and non-dirs to the back */ 1491 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1248 /* by walking from both sides and swapping if necessary */ 1492 ent->namelen = len - 1;
1249 /* also clear score, so it doesn't influence sorting */ 1493 ent->inode = D_INO (entp);
1250 while (oth > dir) 1494
1495 inode_bits |= ent->inode;
1496
1497 switch (D_TYPE (entp))
1498 {
1499 default:
1500 ent->type = EIO_DT_UNKNOWN;
1501 flags |= EIO_READDIR_FOUND_UNKNOWN;
1502 break;
1503
1504 #ifdef DT_FIFO
1505 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1506 #endif
1507 #ifdef DT_CHR
1508 case DT_CHR: ent->type = EIO_DT_CHR; break;
1509 #endif
1510 #ifdef DT_MPC
1511 case DT_MPC: ent->type = EIO_DT_MPC; break;
1512 #endif
1513 #ifdef DT_DIR
1514 case DT_DIR: ent->type = EIO_DT_DIR; break;
1515 #endif
1516 #ifdef DT_NAM
1517 case DT_NAM: ent->type = EIO_DT_NAM; break;
1518 #endif
1519 #ifdef DT_BLK
1520 case DT_BLK: ent->type = EIO_DT_BLK; break;
1521 #endif
1522 #ifdef DT_MPB
1523 case DT_MPB: ent->type = EIO_DT_MPB; break;
1524 #endif
1525 #ifdef DT_REG
1526 case DT_REG: ent->type = EIO_DT_REG; break;
1527 #endif
1528 #ifdef DT_NWK
1529 case DT_NWK: ent->type = EIO_DT_NWK; break;
1530 #endif
1531 #ifdef DT_CMP
1532 case DT_CMP: ent->type = EIO_DT_CMP; break;
1533 #endif
1534 #ifdef DT_LNK
1535 case DT_LNK: ent->type = EIO_DT_LNK; break;
1536 #endif
1537 #ifdef DT_SOCK
1538 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1539 #endif
1540 #ifdef DT_DOOR
1541 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1542 #endif
1543 #ifdef DT_WHT
1544 case DT_WHT: ent->type = EIO_DT_WHT; break;
1545 #endif
1546 }
1547
1548 ent->score = 7;
1549
1550 if (flags & EIO_READDIR_DIRS_FIRST)
1551 {
1552 if (ent->type == EIO_DT_UNKNOWN)
1251 { 1553 {
1252 if (dir->type == EIO_DT_DIR) 1554 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1253 ++dir; 1555 ent->score = 1;
1254 else if ((--oth)->type == EIO_DT_DIR) 1556 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1255 { 1557 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 } 1558 }
1261 1559 else if (ent->type == EIO_DT_DIR)
1262 /* now sort the dirs only */ 1560 ent->score = 0;
1263 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1264 } 1561 }
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 } 1562 }
1287 1563
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; 1564 namesoffs += len;
1381 ++dentoffs; 1565 ++dentoffs;
1382 } 1566 }
1383 1567
1384 if (EIO_CANCELLED (req)) 1568 if (EIO_CANCELLED (req))
1385 { 1569 {
1386 errno = ECANCELED; 1570 errno = ECANCELED;
1387 break; 1571 break;
1388 } 1572 }
1573
1574#ifdef _WIN32
1575 if (!FindNextFile (dirp, &entp))
1576 {
1577 FindClose (dirp);
1578 dirp = 0;
1389 } 1579 }
1580#endif
1581 }
1390} 1582}
1391 1583
1392#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1584/*****************************************************************************/
1393# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1585/* working directory stuff */
1394#else 1586/* various deficiencies in the posix 2008 api force us to */
1587/* keep the absolute path in string form at all times */
1588/* fuck yeah. */
1395 1589
1396int 1590#if !HAVE_AT
1397eio__msync (void *mem, size_t len, int flags) 1591
1592/* a bit like realpath, but usually faster because it doesn'T have to return */
1593/* an absolute or canonical path */
1594static const char *
1595wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1398{ 1596{
1399 if (EIO_MS_ASYNC != MS_SYNC 1597 if (!wd || *path == '/')
1400 || EIO_MS_INVALIDATE != MS_INVALIDATE 1598 return path;
1401 || EIO_MS_SYNC != MS_SYNC) 1599
1600 if (path [0] == '.' && !path [1])
1601 return wd->str;
1602
1603 {
1604 int l1 = wd->len;
1605 int l2 = strlen (path);
1606
1607 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1608
1609 memcpy (res, wd->str, l1);
1610 res [l1] = '/';
1611 memcpy (res + l1 + 1, path, l2 + 1);
1612
1613 return res;
1614 }
1615}
1616
1617#endif
1618
1619static eio_wd
1620eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1621{
1622 int fd;
1623 eio_wd res;
1624 int len = eio__realpath (tmpbuf, wd, path);
1625
1626 if (len < 0)
1627 return EIO_INVALID_WD;
1628
1629#if HAVE_AT
1630 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1631
1632 if (fd < 0)
1633 return EIO_INVALID_WD;
1634#endif
1635
1636 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1637
1638#if HAVE_AT
1639 res->fd = fd;
1640#endif
1641
1642 res->len = len;
1643 memcpy (res->str, tmpbuf->ptr, len);
1644 res->str [len] = 0;
1645
1646 return res;
1647}
1648
1649eio_wd
1650eio_wd_open_sync (eio_wd wd, const char *path)
1651{
1652 struct etp_tmpbuf tmpbuf = { };
1653 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1654 free (tmpbuf.ptr);
1655
1656 return wd;
1657}
1658
1659void
1660eio_wd_close_sync (eio_wd wd)
1661{
1662 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1402 { 1663 {
1403 flags = 0 1664 #if HAVE_AT
1404 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0) 1665 close (wd->fd);
1405 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0) 1666 #endif
1406 | (flags & EIO_MS_SYNC ? MS_SYNC : 0); 1667 free (wd);
1407 } 1668 }
1408
1409 return msync (mem, len, flags);
1410} 1669}
1411 1670
1412#endif 1671#if HAVE_AT
1413 1672
1414int 1673/* 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 1674
1424 if (!page) 1675static int
1425 page = sysconf (_SC_PAGESIZE); 1676eio__truncateat (int dirfd, const char *path, off_t length)
1426#endif 1677{
1678 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1679 int res;
1427 1680
1428 /* round down to start of page, although this is probably useless */ 1681 if (fd < 0)
1429 addr &= ~(page - 1); /* assume page size is always a power of two */ 1682 return fd;
1430 1683
1431 if (addr < end) 1684 res = ftruncate (fd, length);
1432 if (flags & EIO_MT_MODIFY) /* modify */ 1685 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; 1686 return res;
1438} 1687}
1688
1689static int
1690eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1691{
1692 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
1693 int res;
1694
1695 if (fd < 0)
1696 return fd;
1697
1698 res = fstatvfs (fd, buf);
1699 close (fd);
1700 return res;
1701
1702}
1703
1704#endif
1439 1705
1440/*****************************************************************************/ 1706/*****************************************************************************/
1441 1707
1442#define ALLOC(len) \ 1708#define ALLOC(len) \
1443 if (!req->ptr2) \ 1709 if (!req->ptr2) \
… …
1452 req->result = -1; \ 1718 req->result = -1; \
1453 break; \ 1719 break; \
1454 } \ 1720 } \
1455 } 1721 }
1456 1722
1457X_THREAD_PROC (etp_proc)
1458{
1459 ETP_REQ *req;
1460 struct timespec ts;
1461 etp_worker *self = (etp_worker *)thr_arg;
1462
1463 /* try to distribute timeouts somewhat randomly */
1464 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1465
1466 for (;;)
1467 {
1468 X_LOCK (reqlock);
1469
1470 for (;;)
1471 {
1472 self->req = req = reqq_shift (&req_queue);
1473
1474 if (req)
1475 break;
1476
1477 ++idle;
1478
1479 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1480 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1481 {
1482 if (idle > max_idle)
1483 {
1484 --idle;
1485 X_UNLOCK (reqlock);
1486 X_LOCK (wrklock);
1487 --started;
1488 X_UNLOCK (wrklock);
1489 goto quit;
1490 }
1491
1492 /* we are allowed to idle, so do so without any timeout */
1493 X_COND_WAIT (reqwait, reqlock);
1494 }
1495
1496 --idle;
1497 }
1498
1499 --nready;
1500
1501 X_UNLOCK (reqlock);
1502
1503 if (req->type < 0)
1504 goto quit;
1505
1506 if (!EIO_CANCELLED (req))
1507 ETP_EXECUTE (self, req);
1508
1509 X_LOCK (reslock);
1510
1511 ++npending;
1512
1513 if (!reqq_push (&res_queue, req) && want_poll_cb)
1514 want_poll_cb ();
1515
1516 self->req = 0;
1517 etp_worker_clear (self);
1518
1519 X_UNLOCK (reslock);
1520 }
1521
1522quit:
1523 X_LOCK (wrklock);
1524 etp_worker_free (self);
1525 X_UNLOCK (wrklock);
1526
1527 return 0;
1528}
1529
1530/*****************************************************************************/ 1723/*****************************************************************************/
1531 1724
1725int ecb_cold
1532int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1726eio_init (void (*want_poll)(void), void (*done_poll)(void))
1533{ 1727{
1534 return etp_init (want_poll, done_poll); 1728 return etp_init (EIO_POOL, want_poll, done_poll);
1535} 1729}
1536 1730
1731ecb_inline void
1537static void eio_api_destroy (eio_req *req) 1732eio_api_destroy (eio_req *req)
1538{ 1733{
1539 free (req); 1734 free (req);
1540} 1735}
1541 1736
1542#define REQ(rtype) \ 1737#define REQ(rtype) \
1543 eio_req *req; \ 1738 eio_req *req; \
1544 \ 1739 \
1545 req = (eio_req *)calloc (1, sizeof *req); \ 1740 req = (eio_req *)calloc (1, sizeof *req); \
1546 if (!req) \ 1741 if (!req) \
1547 return 0; \ 1742 return 0; \
… …
1561 { \ 1756 { \
1562 eio_api_destroy (req); \ 1757 eio_api_destroy (req); \
1563 return 0; \ 1758 return 0; \
1564 } 1759 }
1565 1760
1761#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1762
1763static void
1566static void eio_execute (etp_worker *self, eio_req *req) 1764eio_execute (etp_worker *self, eio_req *req)
1567{ 1765{
1568 errno = 0; 1766#if HAVE_AT
1767 int dirfd;
1768#else
1769 const char *path;
1770#endif
1771
1772 if (ecb_expect_false (EIO_CANCELLED (req)))
1773 {
1774 req->result = -1;
1775 req->errorno = ECANCELED;
1776 return;
1777 }
1778
1779 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1780 {
1781 req->result = -1;
1782 req->errorno = ENOENT;
1783 return;
1784 }
1785
1786 if (req->type >= EIO_OPEN)
1787 {
1788 #if HAVE_AT
1789 dirfd = WD2FD (req->wd);
1790 #else
1791 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1792 #endif
1793 }
1569 1794
1570 switch (req->type) 1795 switch (req->type)
1571 { 1796 {
1797 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1798 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1799 break;
1800 case EIO_WD_CLOSE: req->result = 0;
1801 eio_wd_close_sync (req->wd); break;
1802
1803 case EIO_SEEK: eio__lseek (req); break;
1572 case EIO_READ: ALLOC (req->size); 1804 case EIO_READ: ALLOC (req->size);
1573 req->result = req->offs >= 0 1805 req->result = req->offs >= 0
1574 ? pread (req->int1, req->ptr2, req->size, req->offs) 1806 ? pread (req->int1, req->ptr2, req->size, req->offs)
1575 : read (req->int1, req->ptr2, req->size); break; 1807 : read (req->int1, req->ptr2, req->size); break;
1576 case EIO_WRITE: req->result = req->offs >= 0 1808 case EIO_WRITE: req->result = req->offs >= 0
1577 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1809 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1578 : write (req->int1, req->ptr2, req->size); break; 1810 : write (req->int1, req->ptr2, req->size); break;
1579 1811
1580 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1812 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; 1813 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1814
1815#if HAVE_AT
1582 1816
1583 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1817 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1584 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1818 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1585 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1819 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1586 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1820 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1587 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1821 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; 1822 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1823 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1824 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1589 1825
1826 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1827 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1828 req->result = req->wd && SINGLEDOT (req->ptr1)
1829 ? rmdir (req->wd->str)
1830 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1831 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1832 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1833 req->result = req->wd && SINGLEDOT (req->ptr1)
1834 ? rename (req->wd->str, req->ptr2)
1835 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1836 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1837 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1838 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1839 case EIO_READLINK: ALLOC (PATH_MAX);
1840 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1590 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1841 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1591 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1842 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: 1843 case EIO_UTIME:
1626#ifdef _WIN32 1844 case EIO_FUTIME:
1627 Sleep (req->nv1 * 1000.); 1845 {
1846 struct timespec ts[2];
1847 struct timespec *times;
1848
1849 if (req->nv1 != -1. || req->nv2 != -1.)
1850 {
1851 ts[0].tv_sec = req->nv1;
1852 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1853 ts[1].tv_sec = req->nv2;
1854 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1855
1856 times = ts;
1857 }
1858 else
1859 times = 0;
1860
1861 req->result = req->type == EIO_FUTIME
1862 ? futimens (req->int1, times)
1863 : utimensat (dirfd, req->ptr1, times, 0);
1864 }
1865 break;
1866
1628#else 1867#else
1629 {
1630 struct timeval tv;
1631 1868
1632 tv.tv_sec = req->nv1; 1869 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1633 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1870 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1871 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1872 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1873 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1874 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1875 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1876 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1634 1877
1635 req->result = select (0, 0, 0, 0, &tv); 1878 case EIO_UNLINK: req->result = unlink (path ); break;
1636 } 1879 case EIO_RMDIR: req->result = rmdir (path ); break;
1637#endif 1880 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1638 break; 1881 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1882 case EIO_LINK: req->result = link (path , req->ptr2); break;
1883 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1884 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1885 case EIO_READLINK: ALLOC (PATH_MAX);
1886 req->result = readlink (path, req->ptr2, PATH_MAX); break;
1887 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1888 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1639 1889
1640 case EIO_UTIME: 1890 case EIO_UTIME:
1641 case EIO_FUTIME: 1891 case EIO_FUTIME:
1642 { 1892 {
1643 struct timeval tv[2]; 1893 struct timeval tv[2];
1644 struct timeval *times; 1894 struct timeval *times;
1645 1895
1646 if (req->nv1 != -1. || req->nv2 != -1.) 1896 if (req->nv1 != -1. || req->nv2 != -1.)
1647 { 1897 {
1648 tv[0].tv_sec = req->nv1; 1898 tv[0].tv_sec = req->nv1;
1649 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; 1899 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1650 tv[1].tv_sec = req->nv2; 1900 tv[1].tv_sec = req->nv2;
1651 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; 1901 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
1652 1902
1653 times = tv; 1903 times = tv;
1654 } 1904 }
1655 else 1905 else
1656 times = 0; 1906 times = 0;
1657
1658 1907
1659 req->result = req->type == EIO_FUTIME 1908 req->result = req->type == EIO_FUTIME
1660 ? futimes (req->int1, times) 1909 ? futimes (req->int1, times)
1661 : utimes (req->ptr1, times); 1910 : utimes (req->ptr1, times);
1662 } 1911 }
1663 break; 1912 break;
1664 1913
1914#endif
1915
1916 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
1917 {
1918 ALLOC (req->result);
1919 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
1920 }
1921 break;
1922
1923 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1924 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1925
1926 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1927 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1928
1929 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1930 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1931 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1932
1933 case EIO_CLOSE: req->result = close (req->int1); break;
1934 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1935 case EIO_SYNC: req->result = 0; sync (); break;
1936 case EIO_FSYNC: req->result = fsync (req->int1); break;
1937 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1938 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
1939 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1940 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1941 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1942 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1943 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1944 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1945
1946 case EIO_READDIR: eio__scandir (req, self); break;
1947
1948 case EIO_BUSY:
1949#ifdef _WIN32
1950 Sleep (req->nv1 * 1e3);
1951#else
1952 {
1953 struct timeval tv;
1954
1955 tv.tv_sec = req->nv1;
1956 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1957
1958 req->result = select (0, 0, 0, 0, &tv);
1959 }
1960#endif
1961 break;
1962
1963#if 0
1665 case EIO_GROUP: 1964 case EIO_GROUP:
1666 abort (); /* handled in eio_request */ 1965 abort (); /* handled in eio_request */
1966#endif
1667 1967
1668 case EIO_NOP: 1968 case EIO_NOP:
1669 req->result = 0; 1969 req->result = 0;
1670 break; 1970 break;
1671 1971
1672 case EIO_CUSTOM: 1972 case EIO_CUSTOM:
1673 ((void (*)(eio_req *))req->feed) (req); 1973 req->feed (req);
1674 break; 1974 break;
1675 1975
1676 default: 1976 default:
1677 req->result = -1; 1977 req->result = EIO_ENOSYS ();
1678 break; 1978 break;
1679 } 1979 }
1680 1980
1681 req->errorno = errno; 1981 req->errorno = errno;
1682} 1982}
1683 1983
1684#ifndef EIO_NO_WRAPPERS 1984#ifndef EIO_NO_WRAPPERS
1685 1985
1986eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
1987{
1988 REQ (EIO_WD_OPEN); PATH; SEND;
1989}
1990
1991eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
1992{
1993 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
1994}
1995
1686eio_req *eio_nop (int pri, eio_cb cb, void *data) 1996eio_req *eio_nop (int pri, eio_cb cb, void *data)
1687{ 1997{
1688 REQ (EIO_NOP); SEND; 1998 REQ (EIO_NOP); SEND;
1689} 1999}
1690 2000
… …
1706eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2016eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1707{ 2017{
1708 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2018 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1709} 2019}
1710 2020
2021eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2022{
2023 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2024}
2025
2026eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2027{
2028 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2029}
2030
2031eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2032{
2033 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2034}
2035
1711eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2036eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1712{ 2037{
1713 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2038 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1714} 2039}
1715 2040
1716eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2041eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1717{ 2042{
1718 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2043 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1719} 2044}
1720 2045
1721eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2046eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1722{ 2047{
1723 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2048 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2049}
2050
2051eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2052{
2053 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1724} 2054}
1725 2055
1726eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2056eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1727{ 2057{
1728 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2058 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) 2061eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
1732{ 2062{
1733 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2063 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
1734} 2064}
1735 2065
2066eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2067{
2068 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2069}
2070
1736eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2071eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1737{ 2072{
1738 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2073 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1739} 2074}
1740 2075
… …
1766eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2101eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1767{ 2102{
1768 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2103 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1769} 2104}
1770 2105
1771eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2106eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1772{ 2107{
1773 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2108 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1774} 2109}
1775 2110
1776eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2111eio_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) 2131eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1797{ 2132{
1798 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2133 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1799} 2134}
1800 2135
1801eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2136eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1802{ 2137{
1803 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2138 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1804} 2139}
1805 2140
1806eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2141eio_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) 2157eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1823{ 2158{
1824 return eio__1path (EIO_READLINK, path, pri, cb, data); 2159 return eio__1path (EIO_READLINK, path, pri, cb, data);
1825} 2160}
1826 2161
2162eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2163{
2164 return eio__1path (EIO_REALPATH, path, pri, cb, data);
2165}
2166
1827eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2167eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1828{ 2168{
1829 return eio__1path (EIO_STAT, path, pri, cb, data); 2169 return eio__1path (EIO_STAT, path, pri, cb, data);
1830} 2170}
1831 2171
… …
1854 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 2194 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1855} 2195}
1856 2196
1857eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2197eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1858{ 2198{
1859 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 2199 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1860} 2200}
1861 2201
1862static eio_req * 2202static eio_req *
1863eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2203eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1864{ 2204{
… …
1888eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2228eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1889{ 2229{
1890 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2230 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1891} 2231}
1892 2232
1893eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2233eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1894{ 2234{
1895 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2235 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1896} 2236}
1897 2237
1898#endif 2238#endif
1899 2239
1900eio_req *eio_grp (eio_cb cb, void *data) 2240eio_req *eio_grp (eio_cb cb, void *data)
… …
1909#undef SEND 2249#undef SEND
1910 2250
1911/*****************************************************************************/ 2251/*****************************************************************************/
1912/* grp functions */ 2252/* grp functions */
1913 2253
2254void
1914void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2255eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1915{ 2256{
1916 grp->int2 = limit; 2257 grp->int2 = limit;
1917 grp->feed = feed; 2258 grp->feed = feed;
1918 2259
1919 grp_try_feed (grp); 2260 grp_try_feed (grp);
1920} 2261}
1921 2262
2263void
1922void eio_grp_limit (eio_req *grp, int limit) 2264eio_grp_limit (eio_req *grp, int limit)
1923{ 2265{
1924 grp->int2 = limit; 2266 grp->int2 = limit;
1925 2267
1926 grp_try_feed (grp); 2268 grp_try_feed (grp);
1927} 2269}
1928 2270
2271void
1929void eio_grp_add (eio_req *grp, eio_req *req) 2272eio_grp_add (eio_req *grp, eio_req *req)
1930{ 2273{
1931 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2274 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1932 2275
1933 grp->flags |= EIO_FLAG_GROUPADD; 2276 grp->flags |= ETP_FLAG_GROUPADD;
1934 2277
1935 ++grp->size; 2278 ++grp->size;
1936 req->grp = grp; 2279 req->grp = grp;
1937 2280
1938 req->grp_prev = 0; 2281 req->grp_prev = 0;
… …
1945} 2288}
1946 2289
1947/*****************************************************************************/ 2290/*****************************************************************************/
1948/* misc garbage */ 2291/* misc garbage */
1949 2292
2293eio_ssize_t
1950ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2294eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1951{ 2295{
1952 etp_worker wrk;
1953 ssize_t ret;
1954
1955 wrk.dbuf = 0;
1956
1957 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2296 return eio__sendfile (ofd, ifd, offset, count);
1958
1959 if (wrk.dbuf)
1960 free (wrk.dbuf);
1961
1962 return ret;
1963} 2297}
1964 2298

Diff Legend

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