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

Comparing libeio/eio.c (file contents):
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.155 by root, Fri Aug 17 17:31:43 2018 UTC

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

Diff Legend

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