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

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

Diff Legend

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