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

Comparing libeio/eio.c (file contents):
Revision 1.95 by root, Tue Jul 19 04:56:43 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>
… …
105#ifdef _WIN32 100#ifdef _WIN32
106 101
107 #undef PAGESIZE 102 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */ 103 #define PAGESIZE 4096 /* GetSystemInfo? */
109 104
105 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
106
110 #ifdef EIO_STRUCT_STATI64 107 #ifdef EIO_STRUCT_STATI64
108 /* look at perl's non-sloppy stat */
111 #define stat(path,buf) _stati64 (path,buf) 109 #define stat(path,buf) _stati64 (path,buf)
112 #define fstat(fd,buf) _fstati64 (fd,buf) 110 #define fstat(fd,buf) _fstati64 (fd,buf)
113 #endif 111 #endif
114 #define lstat(path,buf) stat (path,buf) 112 #define lstat(path,buf) stat (path,buf)
115 #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))
… …
117 #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))
118 116
119 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
120 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
121 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
122 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
123 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
124 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
125 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
126 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
127 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
129 #define sync() EIO_ENOSYS () 130 #define sync() EIO_ENOSYS ()
130 #define readlink(path,buf,s) EIO_ENOSYS () 131 #define readlink(path,buf,s) EIO_ENOSYS ()
131 #define statvfs(path,buf) EIO_ENOSYS () 132 #define statvfs(path,buf) EIO_ENOSYS ()
132 #define fstatvfs(fd,buf) EIO_ENOSYS () 133 #define fstatvfs(fd,buf) EIO_ENOSYS ()
133 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
134 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
135 static int 202 static int
136 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
137 { 204 {
138 #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)
139 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
140 return 0; 214 return 0;
141
142 if (CreateSymbolicLink (neu, old, 0))
143 return 0;
144 #endif 215 #endif
145 216
146 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
147 } 218 }
148 219
149 /* POSIX API only */ 220 /* POSIX API only, causing trouble for win32 apps */
150 #define CreateHardLink(neu,old,flags) 0 221 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
151 #define CreateSymbolicLink(neu,old,flags) 0 222 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
152 223
153 struct statvfs 224 struct statvfs
154 { 225 {
155 int dummy; 226 int dummy;
156 }; 227 };
… …
160 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
161 #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)
162 233
163#else 234#else
164 235
236 #include <sys/ioctl.h>
165 #include <sys/time.h> 237 #include <sys/time.h>
166 #include <sys/select.h> 238 #include <sys/select.h>
167 #include <sys/statvfs.h>
168 #include <unistd.h> 239 #include <unistd.h>
169 #include <utime.h>
170 #include <signal.h> 240 #include <signal.h>
171 #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
172 251
173 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 252 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
174 #include <sys/mman.h> 253 #include <sys/mman.h>
175 #endif 254 #endif
176 255
177 #define D_NAME(entp) entp->d_name 256 #define D_NAME(entp) entp->d_name
178 257
179 /* 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 */
180 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 259 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
181 #define _DIRENT_HAVE_D_TYPE /* sigh */ 260 #define _DIRENT_HAVE_D_TYPE /* sigh */
182 #define D_INO(de) (de)->d_fileno 261 #define D_INO(de) (de)->d_fileno
183 #define D_NAMLEN(de) (de)->d_namlen 262 #define D_NAMLEN(de) (de)->d_namlen
184 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 263 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
185 #define D_INO(de) (de)->d_ino 264 #define D_INO(de) (de)->d_ino
… …
196 275
197 #ifndef EIO_STRUCT_DIRENT 276 #ifndef EIO_STRUCT_DIRENT
198 #define EIO_STRUCT_DIRENT struct dirent 277 #define EIO_STRUCT_DIRENT struct dirent
199 #endif 278 #endif
200 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>
201#endif 288#endif
202 289
203#if HAVE_SENDFILE 290#if HAVE_SENDFILE
204# if __linux 291# if __linux
205# include <sys/sendfile.h> 292# include <sys/sendfile.h>
… …
213# else 300# else
214# error sendfile support requested but not available 301# error sendfile support requested but not available
215# endif 302# endif
216#endif 303#endif
217 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
218#ifndef D_TYPE 310#ifndef D_TYPE
219# define D_TYPE(de) 0 311# define D_TYPE(de) 0
220#endif 312#endif
221#ifndef D_INO 313#ifndef D_INO
222# define D_INO(de) 0 314# define D_INO(de) 0
… …
230# define NAME_MAX 4096 322# define NAME_MAX 4096
231#endif 323#endif
232 324
233/* used for readlink etc. */ 325/* used for readlink etc. */
234#ifndef PATH_MAX 326#ifndef PATH_MAX
235# define PATH_MAX 4096 327# define PATH_MAX 0
236#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)
237 339
238/* buffer size for various temporary buffers */ 340/* buffer size for various temporary buffers */
239#define EIO_BUFSIZE 65536 341#define EIO_BUFSIZE 65536
240 342
241#define dBUF \ 343#define dBUF \
242 char *eio_buf = malloc (EIO_BUFSIZE); \ 344 char *eio_buf = malloc (EIO_BUFSIZE); \
243 errno = ENOMEM; \ 345 errno = ENOMEM; \
244 if (!eio_buf) \ 346 if (!eio_buf) \
245 return -1 347 return -1
246 348
247#define FUBd \ 349#define FUBd \
248 free (eio_buf) 350 free (eio_buf)
249 351
250#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/*****************************************************************************/
251 377
252#define ETP_PRI_MIN EIO_PRI_MIN 378#define ETP_PRI_MIN EIO_PRI_MIN
253#define ETP_PRI_MAX EIO_PRI_MAX 379#define ETP_PRI_MAX EIO_PRI_MAX
254 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
255struct etp_worker; 391struct etp_worker;
256
257#define ETP_REQ eio_req 392#define ETP_REQ eio_req
258#define ETP_DESTROY(req) eio_destroy (req) 393#define ETP_DESTROY(req) eio_destroy (req)
259static int eio_finish (eio_req *req); 394static int eio_finish (eio_req *req);
260#define ETP_FINISH(req) eio_finish (req) 395#define ETP_FINISH(req) eio_finish (req)
261static void eio_execute (struct etp_worker *self, eio_req *req); 396static void eio_execute (struct etp_worker *self, eio_req *req);
262#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 397#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
263 398
264/*****************************************************************************/ 399#include "etp.c"
265 400
266#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 401static struct etp_pool eio_pool;
267 402#define EIO_POOL (&eio_pool)
268/* calculate time difference in ~1/EIO_TICKS of a second */
269ecb_inline int
270tvdiff (struct timeval *tv1, struct timeval *tv2)
271{
272 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
273 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
274}
275
276static unsigned int started, idle, wanted = 4;
277
278static void (*want_poll_cb) (void);
279static void (*done_poll_cb) (void);
280
281static unsigned int max_poll_time; /* reslock */
282static unsigned int max_poll_reqs; /* reslock */
283
284static volatile unsigned int nreqs; /* reqlock */
285static volatile unsigned int nready; /* reqlock */
286static volatile unsigned int npending; /* reqlock */
287static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
288static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
289
290static xmutex_t wrklock;
291static xmutex_t reslock;
292static xmutex_t reqlock;
293static xcond_t reqwait;
294
295#if !HAVE_PREADWRITE
296/*
297 * make our pread/pwrite emulation safe against themselves, but not against
298 * normal read/write by using a mutex. slows down execution a lot,
299 * but that's your problem, not mine.
300 */
301static xmutex_t preadwritelock;
302#endif
303
304typedef struct etp_worker
305{
306 /* locked by wrklock */
307 struct etp_worker *prev, *next;
308
309 xthread_t tid;
310
311 /* locked by reslock, reqlock or wrklock */
312 ETP_REQ *req; /* currently processed request */
313
314#ifdef ETP_WORKER_COMMON
315 ETP_WORKER_COMMON
316#endif
317} etp_worker;
318
319static etp_worker wrk_first; /* NOT etp */
320
321#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
322#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
323
324/* worker threads management */
325
326static void ecb_cold
327etp_worker_clear (etp_worker *wrk)
328{
329}
330
331static void ecb_cold
332etp_worker_free (etp_worker *wrk)
333{
334 wrk->next->prev = wrk->prev;
335 wrk->prev->next = wrk->next;
336
337 free (wrk);
338}
339
340static unsigned int
341etp_nreqs (void)
342{
343 int retval;
344 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
345 retval = nreqs;
346 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
347 return retval;
348}
349
350static unsigned int
351etp_nready (void)
352{
353 unsigned int retval;
354
355 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
356 retval = nready;
357 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
358
359 return retval;
360}
361
362static unsigned int
363etp_npending (void)
364{
365 unsigned int retval;
366
367 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
368 retval = npending;
369 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
370
371 return retval;
372}
373
374static unsigned int
375etp_nthreads (void)
376{
377 unsigned int retval;
378
379 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
380 retval = started;
381 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
382
383 return retval;
384}
385
386/*
387 * a somewhat faster data structure might be nice, but
388 * with 8 priorities this actually needs <20 insns
389 * per shift, the most expensive operation.
390 */
391typedef struct {
392 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
393 int size;
394} etp_reqq;
395
396static etp_reqq req_queue;
397static etp_reqq res_queue;
398
399static void ecb_noinline ecb_cold
400reqq_init (etp_reqq *q)
401{
402 int pri;
403
404 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
405 q->qs[pri] = q->qe[pri] = 0;
406
407 q->size = 0;
408}
409
410static int ecb_noinline
411reqq_push (etp_reqq *q, ETP_REQ *req)
412{
413 int pri = req->pri;
414 req->next = 0;
415
416 if (q->qe[pri])
417 {
418 q->qe[pri]->next = req;
419 q->qe[pri] = req;
420 }
421 else
422 q->qe[pri] = q->qs[pri] = req;
423
424 return q->size++;
425}
426
427static ETP_REQ * ecb_noinline
428reqq_shift (etp_reqq *q)
429{
430 int pri;
431
432 if (!q->size)
433 return 0;
434
435 --q->size;
436
437 for (pri = ETP_NUM_PRI; pri--; )
438 {
439 eio_req *req = q->qs[pri];
440
441 if (req)
442 {
443 if (!(q->qs[pri] = (eio_req *)req->next))
444 q->qe[pri] = 0;
445
446 return req;
447 }
448 }
449
450 abort ();
451}
452
453static int ecb_cold
454etp_init (void (*want_poll)(void), void (*done_poll)(void))
455{
456 X_MUTEX_CREATE (wrklock);
457 X_MUTEX_CREATE (reslock);
458 X_MUTEX_CREATE (reqlock);
459 X_COND_CREATE (reqwait);
460
461 reqq_init (&req_queue);
462 reqq_init (&res_queue);
463
464 wrk_first.next =
465 wrk_first.prev = &wrk_first;
466
467 started = 0;
468 idle = 0;
469 nreqs = 0;
470 nready = 0;
471 npending = 0;
472
473 want_poll_cb = want_poll;
474 done_poll_cb = done_poll;
475
476 return 0;
477}
478
479X_THREAD_PROC (etp_proc);
480
481static void ecb_cold
482etp_start_thread (void)
483{
484 etp_worker *wrk = calloc (1, sizeof (etp_worker));
485
486 /*TODO*/
487 assert (("unable to allocate worker thread data", wrk));
488
489 X_LOCK (wrklock);
490
491 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
492 {
493 wrk->prev = &wrk_first;
494 wrk->next = wrk_first.next;
495 wrk_first.next->prev = wrk;
496 wrk_first.next = wrk;
497 ++started;
498 }
499 else
500 free (wrk);
501
502 X_UNLOCK (wrklock);
503}
504
505static void
506etp_maybe_start_thread (void)
507{
508 if (ecb_expect_true (etp_nthreads () >= wanted))
509 return;
510
511 /* todo: maybe use idle here, but might be less exact */
512 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
513 return;
514
515 etp_start_thread ();
516}
517
518static void ecb_cold
519etp_end_thread (void)
520{
521 eio_req *req = calloc (1, sizeof (eio_req));
522
523 req->type = -1;
524 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
525
526 X_LOCK (reqlock);
527 reqq_push (&req_queue, req);
528 X_COND_SIGNAL (reqwait);
529 X_UNLOCK (reqlock);
530
531 X_LOCK (wrklock);
532 --started;
533 X_UNLOCK (wrklock);
534}
535
536static int
537etp_poll (void)
538{
539 unsigned int maxreqs;
540 unsigned int maxtime;
541 struct timeval tv_start, tv_now;
542
543 X_LOCK (reslock);
544 maxreqs = max_poll_reqs;
545 maxtime = max_poll_time;
546 X_UNLOCK (reslock);
547
548 if (maxtime)
549 gettimeofday (&tv_start, 0);
550
551 for (;;)
552 {
553 ETP_REQ *req;
554
555 etp_maybe_start_thread ();
556
557 X_LOCK (reslock);
558 req = reqq_shift (&res_queue);
559
560 if (req)
561 {
562 --npending;
563
564 if (!res_queue.size && done_poll_cb)
565 done_poll_cb ();
566 }
567
568 X_UNLOCK (reslock);
569
570 if (!req)
571 return 0;
572
573 X_LOCK (reqlock);
574 --nreqs;
575 X_UNLOCK (reqlock);
576
577 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
578 {
579 req->int1 = 1; /* mark request as delayed */
580 continue;
581 }
582 else
583 {
584 int res = ETP_FINISH (req);
585 if (ecb_expect_false (res))
586 return res;
587 }
588
589 if (ecb_expect_false (maxreqs && !--maxreqs))
590 break;
591
592 if (maxtime)
593 {
594 gettimeofday (&tv_now, 0);
595
596 if (tvdiff (&tv_start, &tv_now) >= maxtime)
597 break;
598 }
599 }
600
601 errno = EAGAIN;
602 return -1;
603}
604
605static void
606etp_cancel (ETP_REQ *req)
607{
608 req->cancelled = 1;
609
610 eio_grp_cancel (req);
611}
612
613static void
614etp_submit (ETP_REQ *req)
615{
616 req->pri -= ETP_PRI_MIN;
617
618 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
619 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
620
621 if (ecb_expect_false (req->type == EIO_GROUP))
622 {
623 /* I hope this is worth it :/ */
624 X_LOCK (reqlock);
625 ++nreqs;
626 X_UNLOCK (reqlock);
627
628 X_LOCK (reslock);
629
630 ++npending;
631
632 if (!reqq_push (&res_queue, req) && want_poll_cb)
633 want_poll_cb ();
634
635 X_UNLOCK (reslock);
636 }
637 else
638 {
639 X_LOCK (reqlock);
640 ++nreqs;
641 ++nready;
642 reqq_push (&req_queue, req);
643 X_COND_SIGNAL (reqwait);
644 X_UNLOCK (reqlock);
645
646 etp_maybe_start_thread ();
647 }
648}
649
650static void ecb_cold
651etp_set_max_poll_time (double nseconds)
652{
653 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
654 max_poll_time = nseconds * EIO_TICKS;
655 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
656}
657
658static void ecb_cold
659etp_set_max_poll_reqs (unsigned int maxreqs)
660{
661 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
662 max_poll_reqs = maxreqs;
663 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
664}
665
666static void ecb_cold
667etp_set_max_idle (unsigned int nthreads)
668{
669 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
670 max_idle = nthreads;
671 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
672}
673
674static void ecb_cold
675etp_set_idle_timeout (unsigned int seconds)
676{
677 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
678 idle_timeout = seconds;
679 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
680}
681
682static void ecb_cold
683etp_set_min_parallel (unsigned int nthreads)
684{
685 if (wanted < nthreads)
686 wanted = nthreads;
687}
688
689static void ecb_cold
690etp_set_max_parallel (unsigned int nthreads)
691{
692 if (wanted > nthreads)
693 wanted = nthreads;
694
695 while (started > wanted)
696 etp_end_thread ();
697}
698 403
699/*****************************************************************************/ 404/*****************************************************************************/
700 405
701static void 406static void
702grp_try_feed (eio_req *grp) 407grp_try_feed (eio_req *grp)
703{ 408{
704 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 409 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
705 { 410 {
706 grp->flags &= ~EIO_FLAG_GROUPADD; 411 grp->flags &= ~ETP_FLAG_GROUPADD;
707 412
708 EIO_FEED (grp); 413 EIO_FEED (grp);
709 414
710 /* stop if no progress has been made */ 415 /* stop if no progress has been made */
711 if (!(grp->flags & EIO_FLAG_GROUPADD)) 416 if (!(grp->flags & ETP_FLAG_GROUPADD))
712 { 417 {
713 grp->feed = 0; 418 grp->feed = 0;
714 break; 419 break;
715 } 420 }
716 } 421 }
… …
723 428
724 /* call feeder, if applicable */ 429 /* call feeder, if applicable */
725 grp_try_feed (grp); 430 grp_try_feed (grp);
726 431
727 /* finish, if done */ 432 /* finish, if done */
728 if (!grp->size && grp->int1) 433 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
729 return eio_finish (grp); 434 return eio_finish (grp);
730 else 435 else
731 return 0; 436 return 0;
732} 437}
733 438
… …
769} 474}
770 475
771void 476void
772eio_grp_cancel (eio_req *grp) 477eio_grp_cancel (eio_req *grp)
773{ 478{
774 for (grp = grp->grp_first; grp; grp = grp->grp_next) 479 etp_grp_cancel (EIO_POOL, grp);
775 eio_cancel (grp);
776} 480}
777 481
778void 482void
779eio_cancel (eio_req *req) 483eio_cancel (eio_req *req)
780{ 484{
781 etp_cancel (req); 485 etp_cancel (EIO_POOL, req);
782} 486}
783 487
784void 488void
785eio_submit (eio_req *req) 489eio_submit (eio_req *req)
786{ 490{
787 etp_submit (req); 491 etp_submit (EIO_POOL, req);
788} 492}
789 493
790unsigned int 494unsigned int
791eio_nreqs (void) 495eio_nreqs (void)
792{ 496{
793 return etp_nreqs (); 497 return etp_nreqs (EIO_POOL);
794} 498}
795 499
796unsigned int 500unsigned int
797eio_nready (void) 501eio_nready (void)
798{ 502{
799 return etp_nready (); 503 return etp_nready (EIO_POOL);
800} 504}
801 505
802unsigned int 506unsigned int
803eio_npending (void) 507eio_npending (void)
804{ 508{
805 return etp_npending (); 509 return etp_npending (EIO_POOL);
806} 510}
807 511
808unsigned int ecb_cold 512unsigned int ecb_cold
809eio_nthreads (void) 513eio_nthreads (void)
810{ 514{
811 return etp_nthreads (); 515 return etp_nthreads (EIO_POOL);
812} 516}
813 517
814void ecb_cold 518void ecb_cold
815eio_set_max_poll_time (double nseconds) 519eio_set_max_poll_time (double nseconds)
816{ 520{
817 etp_set_max_poll_time (nseconds); 521 etp_set_max_poll_time (EIO_POOL, nseconds);
818} 522}
819 523
820void ecb_cold 524void ecb_cold
821eio_set_max_poll_reqs (unsigned int maxreqs) 525eio_set_max_poll_reqs (unsigned int maxreqs)
822{ 526{
823 etp_set_max_poll_reqs (maxreqs); 527 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
824} 528}
825 529
826void ecb_cold 530void ecb_cold
827eio_set_max_idle (unsigned int nthreads) 531eio_set_max_idle (unsigned int nthreads)
828{ 532{
829 etp_set_max_idle (nthreads); 533 etp_set_max_idle (EIO_POOL, nthreads);
830} 534}
831 535
832void ecb_cold 536void ecb_cold
833eio_set_idle_timeout (unsigned int seconds) 537eio_set_idle_timeout (unsigned int seconds)
834{ 538{
835 etp_set_idle_timeout (seconds); 539 etp_set_idle_timeout (EIO_POOL, seconds);
836} 540}
837 541
838void ecb_cold 542void ecb_cold
839eio_set_min_parallel (unsigned int nthreads) 543eio_set_min_parallel (unsigned int nthreads)
840{ 544{
841 etp_set_min_parallel (nthreads); 545 etp_set_min_parallel (EIO_POOL, nthreads);
842} 546}
843 547
844void ecb_cold 548void ecb_cold
845eio_set_max_parallel (unsigned int nthreads) 549eio_set_max_parallel (unsigned int nthreads)
846{ 550{
847 etp_set_max_parallel (nthreads); 551 etp_set_max_parallel (EIO_POOL, nthreads);
848} 552}
849 553
850int eio_poll (void) 554int eio_poll (void)
851{ 555{
852 return etp_poll (); 556 return etp_poll (EIO_POOL);
853} 557}
854 558
855/*****************************************************************************/ 559/*****************************************************************************/
856/* work around various missing functions */ 560/* work around various missing functions */
857 561
858#if !HAVE_PREADWRITE 562#if HAVE_POSIX_CLOSE && !__linux
859# undef pread 563# define eio__close(fd) posix_close (fd, 0)
860# undef pwrite 564#else
861# define pread eio__pread 565# define eio__close(fd) close (fd)
862# define pwrite eio__pwrite
863
864static eio_ssize_t
865eio__pread (int fd, void *buf, size_t count, off_t offset)
866{
867 eio_ssize_t res;
868 off_t ooffset;
869
870 X_LOCK (preadwritelock);
871 ooffset = lseek (fd, 0, SEEK_CUR);
872 lseek (fd, offset, SEEK_SET);
873 res = read (fd, buf, count);
874 lseek (fd, ooffset, SEEK_SET);
875 X_UNLOCK (preadwritelock);
876
877 return res;
878}
879
880static eio_ssize_t
881eio__pwrite (int fd, void *buf, size_t count, off_t offset)
882{
883 eio_ssize_t res;
884 off_t ooffset;
885
886 X_LOCK (preadwritelock);
887 ooffset = lseek (fd, 0, SEEK_CUR);
888 lseek (fd, offset, SEEK_SET);
889 res = write (fd, buf, count);
890 lseek (fd, ooffset, SEEK_SET);
891 X_UNLOCK (preadwritelock);
892
893 return res;
894}
895#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}
896 576
897#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
898 578
899# undef utimes 579# undef utimes
900# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
… …
933 613
934#if !HAVE_FDATASYNC 614#if !HAVE_FDATASYNC
935# undef fdatasync 615# undef fdatasync
936# define fdatasync(fd) fsync (fd) 616# define fdatasync(fd) fsync (fd)
937#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}
938 635
939/* sync_file_range always needs emulation */ 636/* sync_file_range always needs emulation */
940static int 637static int
941eio__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)
942{ 639{
… …
965} 662}
966 663
967static int 664static int
968eio__fallocate (int fd, int mode, off_t offset, size_t len) 665eio__fallocate (int fd, int mode, off_t offset, size_t len)
969{ 666{
970#if HAVE_FALLOCATE 667#if HAVE_LINUX_FALLOCATE
971 return fallocate (fd, mode, offset, len); 668 return fallocate (fd, mode, offset, len);
972#else 669#else
973 errno = ENOSYS; 670 return EIO_ENOSYS ();
974 return -1;
975#endif 671#endif
976} 672}
977 673
978#if !HAVE_READAHEAD 674#if !HAVE_READAHEAD
979# undef readahead 675# undef readahead
… …
994 todo -= len; 690 todo -= len;
995 } 691 }
996 692
997 FUBd; 693 FUBd;
998 694
999 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 */
1000 return count; 697 return 0;
1001} 698}
1002 699
1003#endif 700#endif
1004 701
1005/* sendfile always needs emulation */ 702/* sendfile always needs emulation */
… …
1040 737
1041 /* according to source inspection, this is correct, and useful behaviour */ 738 /* according to source inspection, this is correct, and useful behaviour */
1042 if (sbytes) 739 if (sbytes)
1043 res = sbytes; 740 res = sbytes;
1044 741
1045# elif defined (__APPLE__) 742# elif defined __APPLE__
1046 off_t sbytes = count; 743 off_t sbytes = count;
1047 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 744 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1048 745
1049 /* according to the manpage, sbytes is always valid */ 746 /* according to the manpage, sbytes is always valid */
1050 if (sbytes) 747 if (sbytes)
… …
1077 HANDLE h = TO_SOCKET (ifd); 774 HANDLE h = TO_SOCKET (ifd);
1078 SetFilePointer (h, offset, 0, FILE_BEGIN); 775 SetFilePointer (h, offset, 0, FILE_BEGIN);
1079 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 776 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1080 777
1081#else 778#else
1082 res = -1; 779 res = EIO_ENOSYS ();
1083 errno = ENOSYS;
1084#endif 780#endif
1085 781
1086 /* we assume sendfile can copy at least 128mb in one go */ 782 /* we assume sendfile can copy at least 128mb in one go */
1087 if (res <= 128 * 1024 * 1024) 783 if (res <= 128 * 1024 * 1024)
1088 { 784 {
… …
1263 intptr_t end = addr + len; 959 intptr_t end = addr + len;
1264 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
1265 961
1266 if (addr < end) 962 if (addr < end)
1267 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
1268 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));
1269 else 965 else
1270 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));
1271 } 967 }
1272 968
1273 return 0; 969 return 0;
1274} 970}
1275 971
1276/*****************************************************************************/ 972/*****************************************************************************/
1277/* requests implemented outside eio_execute, because they are so large */ 973/* requests implemented outside eio_execute, because they are so large */
1278 974
1279static void 975static void
1280eio__realpath (eio_req *req, etp_worker *self) 976eio__lseek (eio_req *req)
1281{ 977{
1282 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{
1283 char *res; 993 char *res;
994 const char *rel = path;
1284 char *tmp1, *tmp2; 995 char *tmp1, *tmp2;
1285#if SYMLOOP_MAX > 32 996#if SYMLOOP_MAX > 32
1286 int symlinks = SYMLOOP_MAX; 997 int symlinks = SYMLOOP_MAX;
1287#else 998#else
1288 int symlinks = 32; 999 int symlinks = 32;
1289#endif 1000#endif
1290 1001
1291 req->result = -1;
1292
1293 errno = EINVAL; 1002 errno = EINVAL;
1294 if (!rel) 1003 if (!rel)
1295 return; 1004 return -1;
1296 1005
1297 errno = ENOENT; 1006 errno = ENOENT;
1298 if (!*rel) 1007 if (!*rel)
1299 return; 1008 return -1;
1300 1009
1301 if (!req->ptr2) 1010 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
1302 { 1011#ifdef _WIN32
1303 X_LOCK (wrklock); 1012 if (_access (rel, 4) != 0)
1304 req->flags |= EIO_FLAG_PTR2_FREE;
1305 X_UNLOCK (wrklock);
1306 req->ptr2 = malloc (PATH_MAX * 3);
1307
1308 errno = ENOMEM;
1309 if (!req->ptr2)
1310 return; 1013 return -1;
1311 }
1312 1014
1313 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
1314 tmp1 = res + PATH_MAX; 1028 tmp1 = res + EIO_PATH_MAX;
1315 tmp2 = tmp1 + PATH_MAX; 1029 tmp2 = tmp1 + EIO_PATH_MAX;
1316 1030
1317#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 */
1318#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1032#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1319 /* on linux we may be able to ask the kernel */ 1033 /* on linux we may be able to ask the kernel */
1320 { 1034 {
1321 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);
1322 1036
1323 if (fd >= 0) 1037 if (fd >= 0)
1324 { 1038 {
1325 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1326 req->result = readlink (tmp1, res, PATH_MAX); 1040 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1327 close (fd);
1328
1329 /* 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);
1330 1043
1331 if (req->result > 0) 1044 if (req->result > 0)
1332 goto done; 1045 goto done;
1333 } 1046 }
1334 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)
1335 return; 1048 return -1;
1336 } 1049 }
1337#endif 1050#endif
1338#endif 1051#endif
1339 1052
1340 if (*rel != '/') 1053 if (*rel != '/')
1341 { 1054 {
1342 if (!getcwd (res, PATH_MAX)) 1055 int len;
1056
1057 errno = ENOENT;
1058 if (wd == EIO_INVALID_WD)
1343 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);
1344 1070
1345 if (res [1]) /* only use if not / */ 1071 if (res [1]) /* only use if not / */
1346 res += strlen (res); 1072 res += len;
1347 } 1073 }
1348 1074
1349 while (*rel) 1075 while (*rel)
1350 { 1076 {
1351 eio_ssize_t len, linklen; 1077 eio_ssize_t len, linklen;
1352 char *beg = rel; 1078 const char *beg = rel;
1353 1079
1354 while (*rel && *rel != '/') 1080 while (*rel && *rel != '/')
1355 ++rel; 1081 ++rel;
1356 1082
1357 len = rel - beg; 1083 len = rel - beg;
… …
1369 1095
1370 if (beg [1] == '.' && len == 2) 1096 if (beg [1] == '.' && len == 2)
1371 { 1097 {
1372 /* .. - back up one component, if possible */ 1098 /* .. - back up one component, if possible */
1373 1099
1374 while (res != req->ptr2) 1100 while (res != tmpbuf->ptr)
1375 if (*--res == '/') 1101 if (*--res == '/')
1376 break; 1102 break;
1377 1103
1378 continue; 1104 continue;
1379 } 1105 }
1380 } 1106 }
1381 1107
1382 errno = ENAMETOOLONG; 1108 errno = ENAMETOOLONG;
1383 if (res + 1 + len + 1 >= tmp1) 1109 if (res + 1 + len + 1 >= tmp1)
1384 return; 1110 return -1;
1385 1111
1386 /* copy one component */ 1112 /* copy one component */
1387 *res = '/'; 1113 *res = '/';
1388 memcpy (res + 1, beg, len); 1114 memcpy (res + 1, beg, len);
1389 1115
1390 /* zero-terminate, for readlink */ 1116 /* zero-terminate, for readlink */
1391 res [len + 1] = 0; 1117 res [len + 1] = 0;
1392 1118
1393 /* now check if it's a symlink */ 1119 /* now check if it's a symlink */
1394 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1120 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1395 1121
1396 if (linklen < 0) 1122 if (linklen < 0)
1397 { 1123 {
1398 if (errno != EINVAL) 1124 if (errno != EINVAL)
1399 return; 1125 return -1;
1400 1126
1401 /* it's a normal directory. hopefully */ 1127 /* it's a normal directory. hopefully */
1402 res += len + 1; 1128 res += len + 1;
1403 } 1129 }
1404 else 1130 else
1405 { 1131 {
1406 /* yay, it was a symlink - build new path in tmp2 */ 1132 /* yay, it was a symlink - build new path in tmp2 */
1407 int rellen = strlen (rel); 1133 int rellen = strlen (rel);
1408 1134
1409 errno = ENAMETOOLONG; 1135 errno = ENAMETOOLONG;
1410 if (linklen + 1 + rellen >= PATH_MAX) 1136 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1411 return; 1137 return -1;
1412 1138
1413 errno = ELOOP; 1139 errno = ELOOP;
1414 if (!--symlinks) 1140 if (!--symlinks)
1415 return; 1141 return -1;
1416 1142
1417 if (*tmp1 == '/') 1143 if (*tmp1 == '/')
1418 res = req->ptr2; /* symlink resolves to an absolute path */ 1144 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1419 1145
1420 /* 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 */
1421 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1147 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1422 tmp2 [linklen] = '/'; 1148 tmp2 [linklen] = '/';
1423 memcpy (tmp2, tmp1, linklen); 1149 memcpy (tmp2, tmp1, linklen);
… …
1425 rel = tmp2; 1151 rel = tmp2;
1426 } 1152 }
1427 } 1153 }
1428 1154
1429 /* special case for the lone root path */ 1155 /* special case for the lone root path */
1430 if (res == req->ptr2) 1156 if (res == tmpbuf->ptr)
1431 *res++ = '/'; 1157 *res++ = '/';
1432 1158
1433 req->result = res - (char *)req->ptr2; 1159 return res - (char *)tmpbuf->ptr;
1434 1160#endif
1435done:
1436 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1437} 1161}
1438 1162
1439static signed char 1163static signed char
1440eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1164eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1441{ 1165{
… …
1629#ifdef _WIN32 1353#ifdef _WIN32
1630 { 1354 {
1631 int len = strlen ((const char *)req->ptr1); 1355 int len = strlen ((const char *)req->ptr1);
1632 char *path = malloc (MAX_PATH); 1356 char *path = malloc (MAX_PATH);
1633 const char *fmt; 1357 const char *fmt;
1358 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1634 1359
1635 if (!len) 1360 if (!len)
1636 fmt = "./*"; 1361 fmt = "./*";
1637 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1362 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1638 fmt = "%s*"; 1363 fmt = "%s*";
1639 else 1364 else
1640 fmt = "%s/*"; 1365 fmt = "%s/*";
1641 1366
1642 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1367 _snprintf (path, MAX_PATH, fmt, reqpath);
1643 dirp = FindFirstFile (path, &entp); 1368 dirp = FindFirstFile (path, &entp);
1644 free (path); 1369 free (path);
1645 1370
1646 if (dirp == INVALID_HANDLE_VALUE) 1371 if (dirp == INVALID_HANDLE_VALUE)
1647 { 1372 {
1648 dirp = 0; 1373 /* should steal _dosmaperr */
1649
1650 switch (GetLastError ()) 1374 switch (GetLastError ())
1651 { 1375 {
1652 case ERROR_FILE_NOT_FOUND: 1376 case ERROR_FILE_NOT_FOUND:
1653 req->result = 0; 1377 req->result = 0;
1654 break; 1378 break;
1655 1379
1656 case ERROR_INVALID_NAME: 1380 case ERROR_INVALID_NAME:
1657 case ERROR_PATH_NOT_FOUND: 1381 case ERROR_PATH_NOT_FOUND:
1658 case ERROR_NO_MORE_FILES: 1382 case ERROR_NO_MORE_FILES:
1659 errno = ENOENT; 1383 errno = ENOENT;
1660 break; 1384 break;
1661 1385
1662 case ERROR_NOT_ENOUGH_MEMORY: 1386 case ERROR_NOT_ENOUGH_MEMORY:
1663 errno = ENOMEM; 1387 errno = ENOMEM;
1664 break; 1388 break;
1665 1389
1666 default: 1390 default:
1667 errno = EINVAL; 1391 errno = EINVAL;
1668 break; 1392 break;
1669 } 1393 }
1394
1395 return;
1670 } 1396 }
1671 } 1397 }
1672#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
1673 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;
1674#endif 1420#endif
1675 1421
1676 if (req->flags & EIO_FLAG_PTR1_FREE) 1422 if (req->flags & EIO_FLAG_PTR1_FREE)
1677 free (req->ptr1); 1423 free (req->ptr1);
1678 1424
1679 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1425 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1680 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1426 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1681 req->ptr2 = names = malloc (namesalloc); 1427 req->ptr2 = names = malloc (namesalloc);
1682 1428
1683 if (dirp && names && (!flags || dents)) 1429 if (!names || (flags && !dents))
1430 return;
1431
1684 for (;;) 1432 for (;;)
1685 { 1433 {
1686 int done; 1434 int done;
1687 1435
1688#ifdef _WIN32 1436#ifdef _WIN32
1689 done = !dirp; 1437 done = !dirp;
1690#else 1438#else
1691 errno = 0; 1439 errno = 0;
1692 entp = readdir (dirp); 1440 entp = readdir (dirp);
1693 done = !entp; 1441 done = !entp;
1694#endif 1442#endif
1695 1443
1696 if (done) 1444 if (done)
1697 { 1445 {
1698#ifndef _WIN32 1446#ifndef _WIN32
1699 int old_errno = errno; 1447 int old_errno = errno;
1700 closedir (dirp); 1448 closedir (dirp);
1701 errno = old_errno; 1449 errno = old_errno;
1702 1450
1703 if (errno) 1451 if (errno)
1704 break; 1452 break;
1705#endif 1453#endif
1706 1454
1707 /* sort etc. */ 1455 /* sort etc. */
1708 req->int1 = flags; 1456 req->int1 = flags;
1709 req->result = dentoffs; 1457 req->result = dentoffs;
1710 1458
1711 if (flags & EIO_READDIR_STAT_ORDER) 1459 if (flags & EIO_READDIR_STAT_ORDER)
1712 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);
1713 else if (flags & EIO_READDIR_DIRS_FIRST) 1461 else if (flags & EIO_READDIR_DIRS_FIRST)
1714 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1462 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1715 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 */
1716 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))
1717 { 1515 {
1718 /* 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
1719 eio_dirent *oth = dents + dentoffs; 1523 ent = dents + dentoffs;
1720 eio_dirent *dir = dents;
1721 1524
1722 /* 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 */
1723 /* by walking from both sides and swapping if necessary */ 1526 ent->namelen = len - 1;
1724 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)
1725 { 1587 {
1726 if (dir->type == EIO_DT_DIR) 1588 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1727 ++dir; 1589 ent->score = 1;
1728 else if ((--oth)->type == EIO_DT_DIR) 1590 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1729 { 1591 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1730 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1731
1732 ++dir;
1733 }
1734 } 1592 }
1735 1593 else if (ent->type == EIO_DT_DIR)
1736 /* now sort the dirs only (dirs all have the same score) */ 1594 ent->score = 0;
1737 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1738 } 1595 }
1739
1740 break;
1741 }
1742
1743 /* now add the entry to our list(s) */
1744 name = D_NAME (entp);
1745
1746 /* skip . and .. entries */
1747 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1748 {
1749 int len = D_NAMLEN (entp) + 1;
1750
1751 while (ecb_expect_false (namesoffs + len > namesalloc))
1752 {
1753 namesalloc *= 2;
1754 req->ptr2 = names = realloc (names, namesalloc);
1755
1756 if (!names)
1757 break;
1758 } 1596 }
1759 1597
1760 memcpy (names + namesoffs, name, len);
1761
1762 if (dents)
1763 {
1764 struct eio_dirent *ent;
1765
1766 if (ecb_expect_false (dentoffs == dentalloc))
1767 {
1768 dentalloc *= 2;
1769 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1770
1771 if (!dents)
1772 break;
1773 }
1774
1775 ent = dents + dentoffs;
1776
1777 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1778 ent->namelen = len - 1;
1779 ent->inode = D_INO (entp);
1780
1781 inode_bits |= ent->inode;
1782
1783 switch (D_TYPE (entp))
1784 {
1785 default:
1786 ent->type = EIO_DT_UNKNOWN;
1787 flags |= EIO_READDIR_FOUND_UNKNOWN;
1788 break;
1789
1790 #ifdef DT_FIFO
1791 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1792 #endif
1793 #ifdef DT_CHR
1794 case DT_CHR: ent->type = EIO_DT_CHR; break;
1795 #endif
1796 #ifdef DT_MPC
1797 case DT_MPC: ent->type = EIO_DT_MPC; break;
1798 #endif
1799 #ifdef DT_DIR
1800 case DT_DIR: ent->type = EIO_DT_DIR; break;
1801 #endif
1802 #ifdef DT_NAM
1803 case DT_NAM: ent->type = EIO_DT_NAM; break;
1804 #endif
1805 #ifdef DT_BLK
1806 case DT_BLK: ent->type = EIO_DT_BLK; break;
1807 #endif
1808 #ifdef DT_MPB
1809 case DT_MPB: ent->type = EIO_DT_MPB; break;
1810 #endif
1811 #ifdef DT_REG
1812 case DT_REG: ent->type = EIO_DT_REG; break;
1813 #endif
1814 #ifdef DT_NWK
1815 case DT_NWK: ent->type = EIO_DT_NWK; break;
1816 #endif
1817 #ifdef DT_CMP
1818 case DT_CMP: ent->type = EIO_DT_CMP; break;
1819 #endif
1820 #ifdef DT_LNK
1821 case DT_LNK: ent->type = EIO_DT_LNK; break;
1822 #endif
1823 #ifdef DT_SOCK
1824 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1825 #endif
1826 #ifdef DT_DOOR
1827 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1828 #endif
1829 #ifdef DT_WHT
1830 case DT_WHT: ent->type = EIO_DT_WHT; break;
1831 #endif
1832 }
1833
1834 ent->score = 7;
1835
1836 if (flags & EIO_READDIR_DIRS_FIRST)
1837 {
1838 if (ent->type == EIO_DT_UNKNOWN)
1839 {
1840 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1841 ent->score = 1;
1842 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1843 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1844 }
1845 else if (ent->type == EIO_DT_DIR)
1846 ent->score = 0;
1847 }
1848 }
1849
1850 namesoffs += len; 1598 namesoffs += len;
1851 ++dentoffs; 1599 ++dentoffs;
1852 } 1600 }
1853 1601
1854 if (EIO_CANCELLED (req)) 1602 if (EIO_CANCELLED (req))
1855 { 1603 {
1856 errno = ECANCELED; 1604 errno = ECANCELED;
1857 break; 1605 break;
1858 } 1606 }
1859 1607
1860#ifdef _WIN32 1608#ifdef _WIN32
1861 if (!FindNextFile (dirp, &entp)) 1609 if (!FindNextFile (dirp, &entp))
1862 { 1610 {
1863 FindClose (dirp); 1611 FindClose (dirp);
1864 dirp = 0; 1612 dirp = 0;
1865 } 1613 }
1866#endif 1614#endif
1867 } 1615 }
1868} 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
1869 1751
1870/*****************************************************************************/ 1752/*****************************************************************************/
1871 1753
1872#define ALLOC(len) \ 1754#define ALLOC(len) \
1873 if (!req->ptr2) \ 1755 if (!req->ptr2) \
1874 { \ 1756 { \
1875 X_LOCK (wrklock); \ 1757 X_LOCK (EIO_POOL->wrklock); \
1876 req->flags |= EIO_FLAG_PTR2_FREE; \ 1758 req->flags |= EIO_FLAG_PTR2_FREE; \
1877 X_UNLOCK (wrklock); \ 1759 X_UNLOCK (EIO_POOL->wrklock); \
1878 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
1879 if (!req->ptr2) \ 1761 if (!req->ptr2) \
1880 { \ 1762 { \
1881 errno = ENOMEM; \ 1763 errno = ENOMEM; \
1882 req->result = -1; \ 1764 req->result = -1; \
1883 break; \ 1765 goto alloc_fail; \
1884 } \ 1766 } \
1885 } 1767 }
1886 1768
1887X_THREAD_PROC (etp_proc) 1769/*****************************************************************************/
1888{
1889 ETP_REQ *req;
1890 struct timespec ts;
1891 etp_worker *self = (etp_worker *)thr_arg;
1892 1770
1893 /* try to distribute timeouts somewhat evenly */ 1771static void
1894 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1772eio__slurp (int fd, eio_req *req)
1773{
1774 req->result = fd;
1895 1775
1896 for (;;) 1776 if (fd < 0)
1777 return;
1778
1779 if (req->offs < 0 || !req->size) /* do we need the size? */
1897 { 1780 {
1898 ts.tv_sec = 0; 1781 off_t size = lseek (fd, 0, SEEK_END);
1899 1782
1900 X_LOCK (reqlock);
1901
1902 for (;;)
1903 {
1904 self->req = req = reqq_shift (&req_queue);
1905
1906 if (req)
1907 break;
1908
1909 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1910 {
1911 X_UNLOCK (reqlock);
1912 X_LOCK (wrklock);
1913 --started;
1914 X_UNLOCK (wrklock);
1915 goto quit;
1916 }
1917
1918 ++idle;
1919
1920 if (idle <= max_idle)
1921 /* we are allowed to idle, so do so without any timeout */
1922 X_COND_WAIT (reqwait, reqlock);
1923 else
1924 {
1925 /* initialise timeout once */
1926 if (!ts.tv_sec)
1927 ts.tv_sec = time (0) + idle_timeout;
1928
1929 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1930 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1931 }
1932
1933 --idle;
1934 }
1935
1936 --nready;
1937
1938 X_UNLOCK (reqlock);
1939
1940 if (req->type < 0) 1783 if (req->offs < 0)
1941 goto quit; 1784 req->offs += size;
1942 1785
1943 ETP_EXECUTE (self, req); 1786 if (!req->size)
1944 1787 req->size = size - req->offs;
1945 X_LOCK (reslock);
1946
1947 ++npending;
1948
1949 if (!reqq_push (&res_queue, req) && want_poll_cb)
1950 want_poll_cb ();
1951
1952 self->req = 0;
1953 etp_worker_clear (self);
1954
1955 X_UNLOCK (reslock);
1956 } 1788 }
1957 1789
1958quit: 1790 ALLOC (req->size);
1959 X_LOCK (wrklock); 1791 req->result = pread (fd, req->ptr2, req->size, req->offs);
1960 etp_worker_free (self);
1961 X_UNLOCK (wrklock);
1962 1792
1963 return 0; 1793 silent_close (fd);
1964}
1965 1794
1966/*****************************************************************************/ 1795alloc_fail:
1796 ;
1797}
1967 1798
1968int ecb_cold 1799int ecb_cold
1969eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
1970{ 1801{
1971#if !HAVE_PREADWRITE 1802 eio_want_poll_cb = want_poll;
1972 X_MUTEX_CREATE (preadwritelock); 1803 eio_done_poll_cb = done_poll;
1973#endif
1974 1804
1975 return etp_init (want_poll, done_poll); 1805 return etp_init (EIO_POOL, 0, 0, 0);
1976} 1806}
1977 1807
1978ecb_inline void 1808ecb_inline void
1979eio_api_destroy (eio_req *req) 1809eio_api_destroy (eio_req *req)
1980{ 1810{
1981 free (req); 1811 free (req);
1982} 1812}
1983 1813
1984#define REQ(rtype) \ 1814#define REQ(rtype) \
1985 eio_req *req; \ 1815 eio_req *req; \
1986 \ 1816 \
1987 req = (eio_req *)calloc (1, sizeof *req); \ 1817 req = (eio_req *)calloc (1, sizeof *req); \
1988 if (!req) \ 1818 if (!req) \
1989 return 0; \ 1819 return 0; \
… …
2003 { \ 1833 { \
2004 eio_api_destroy (req); \ 1834 eio_api_destroy (req); \
2005 return 0; \ 1835 return 0; \
2006 } 1836 }
2007 1837
1838#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1839
2008static void 1840static void
2009eio_execute (etp_worker *self, eio_req *req) 1841eio_execute (etp_worker *self, eio_req *req)
2010{ 1842{
1843#if HAVE_AT
1844 int dirfd;
1845#else
1846 const char *path;
1847#endif
1848
2011 if (ecb_expect_false (EIO_CANCELLED (req))) 1849 if (ecb_expect_false (EIO_CANCELLED (req)))
2012 { 1850 {
2013 req->result = -1; 1851 req->result = -1;
2014 req->errorno = ECANCELED; 1852 req->errorno = ECANCELED;
2015 return; 1853 return;
2016 } 1854 }
2017 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
2018 switch (req->type) 1872 switch (req->type)
2019 { 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;
2020 case EIO_READ: ALLOC (req->size); 1881 case EIO_READ: ALLOC (req->size);
2021 req->result = req->offs >= 0 1882 req->result = req->offs >= 0
2022 ? pread (req->int1, req->ptr2, req->size, req->offs) 1883 ? pread (req->int1, req->ptr2, req->size, req->offs)
2023 : read (req->int1, req->ptr2, req->size); break; 1884 : read (req->int1, req->ptr2, req->size); break;
2024 case EIO_WRITE: req->result = req->offs >= 0 1885 case EIO_WRITE: req->result = req->offs >= 0
2025 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1886 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2026 : write (req->int1, req->ptr2, req->size); break; 1887 : write (req->int1, req->ptr2, req->size); break;
2027 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
2028 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;
2029 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;
2030 1894
1895#if HAVE_AT
1896
2031 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1897 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2032 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;
2033 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));
2034 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
2035 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2022 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2036 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2023 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2037 2024
2038 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2039 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2040 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2025 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2041 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2026 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2042 2027
2043 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2044 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;
2045 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2046 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;
2047 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2048 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2049 2031
2050 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2051 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
2052 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2053 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2054 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2055 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2056 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2057 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2058 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2059 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2060
2061 case EIO_REALPATH: eio__realpath (req, self); break;
2062
2063 case EIO_READLINK: ALLOC (PATH_MAX);
2064 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2065
2066 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
2067 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
2068 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;
2069 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;
2070 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2040 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2071 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;
2072 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2042 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2073 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2074 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;
2075 2044
2076 case EIO_READDIR: eio__scandir (req, self); break; 2045 case EIO_READDIR: eio__scandir (req, self); break;
2077 2046
2078 case EIO_BUSY: 2047 case EIO_BUSY:
… …
2088 req->result = select (0, 0, 0, 0, &tv); 2057 req->result = select (0, 0, 0, 0, &tv);
2089 } 2058 }
2090#endif 2059#endif
2091 break; 2060 break;
2092 2061
2093 case EIO_UTIME: 2062#if 0
2094 case EIO_FUTIME:
2095 {
2096 struct timeval tv[2];
2097 struct timeval *times;
2098
2099 if (req->nv1 != -1. || req->nv2 != -1.)
2100 {
2101 tv[0].tv_sec = req->nv1;
2102 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2103 tv[1].tv_sec = req->nv2;
2104 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2105
2106 times = tv;
2107 }
2108 else
2109 times = 0;
2110
2111 req->result = req->type == EIO_FUTIME
2112 ? futimes (req->int1, times)
2113 : utimes (req->ptr1, times);
2114 }
2115 break;
2116
2117 case EIO_GROUP: 2063 case EIO_GROUP:
2118 abort (); /* handled in eio_request */ 2064 abort (); /* handled in eio_request */
2065#endif
2119 2066
2120 case EIO_NOP: 2067 case EIO_NOP:
2121 req->result = 0; 2068 req->result = 0;
2122 break; 2069 break;
2123 2070
2124 case EIO_CUSTOM: 2071 case EIO_CUSTOM:
2125 req->feed (req); 2072 req->feed (req);
2126 break; 2073 break;
2127 2074
2128 default: 2075 default:
2129 errno = ENOSYS;
2130 req->result = -1; 2076 req->result = EIO_ENOSYS ();
2131 break; 2077 break;
2132 } 2078 }
2133 2079
2080alloc_fail:
2134 req->errorno = errno; 2081 req->errorno = errno;
2135} 2082}
2136 2083
2137#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2138 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
2139eio_req *eio_nop (int pri, eio_cb cb, void *data) 2096eio_req *eio_nop (int pri, eio_cb cb, void *data)
2140{ 2097{
2141 REQ (EIO_NOP); SEND; 2098 REQ (EIO_NOP); SEND;
2142} 2099}
2143 2100
… …
2159eio_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)
2160{ 2117{
2161 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;
2162} 2119}
2163 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
2164eio_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)
2165{ 2137{
2166 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;
2167} 2139}
2168 2140
… …
2174eio_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)
2175{ 2147{
2176 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2148 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2177} 2149}
2178 2150
2179eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2180{
2181 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2182}
2183
2184eio_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)
2185{ 2152{
2186 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;
2187} 2154}
2188 2155
2189eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2190{
2191 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2192}
2193
2194eio_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)
2195{ 2157{
2196 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2158 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2197} 2159}
2198 2160
2199eio_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)
2200{ 2162{
2201 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;
2202} 2164}
2203 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
2204eio_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)
2205{ 2172{
2206 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;
2207} 2174}
2208 2175
2209eio_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)
2210{ 2177{
2211 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;
2212} 2189}
2213 2190
2214eio_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)
2215{ 2192{
2216 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2193 REQ (EIO_FSTAT); req->int1 = fd; SEND;
… …
2361eio_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)
2362{ 2339{
2363 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2364} 2341}
2365 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
2366eio_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)
2367{ 2349{
2368 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2369} 2351}
2370 2352
… …
2404void 2386void
2405eio_grp_add (eio_req *grp, eio_req *req) 2387eio_grp_add (eio_req *grp, eio_req *req)
2406{ 2388{
2407 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));
2408 2390
2409 grp->flags |= EIO_FLAG_GROUPADD; 2391 grp->flags |= ETP_FLAG_GROUPADD;
2410 2392
2411 ++grp->size; 2393 ++grp->size;
2412 req->grp = grp; 2394 req->grp = grp;
2413 2395
2414 req->grp_prev = 0; 2396 req->grp_prev = 0;

Diff Legend

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