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

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

Diff Legend

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