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

Comparing libeio/eio.c (file contents):
Revision 1.86 by root, Thu Jul 14 18:30:10 2011 UTC vs.
Revision 1.130 by root, Thu May 9 03:03:24 2013 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 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,
… …
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
49#endif 49#endif
50#include "xthread.h" 50#include "xthread.h"
51 51
52#include <errno.h> 52#include <errno.h>
53#include <stddef.h> 53#include <stddef.h>
… …
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#include <sys/statvfs.h>
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H 65#if HAVE_STDINT_H
67# include <stdint.h> 66# include <stdint.h>
68#endif 67#endif
69 68
70#ifndef ECANCELED 69#ifndef ECANCELED
71# define ECANCELED EDOM 70# define ECANCELED EDOM
72#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
73 79
74static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
75 81
76#ifndef EIO_FINISH 82#ifndef EIO_FINISH
77# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
… …
96 102
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98 104
99#ifdef _WIN32 105#ifdef _WIN32
100 106
107 #undef PAGESIZE
101 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
102 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
103 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
104 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf)
106 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
107 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
108 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
109 121
122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125
126 #define fchmod(fd,mode) EIO_ENOSYS ()
110 #define chown(path,uid,gid) EIO_ENOSYS () 127 #define chown(path,uid,gid) EIO_ENOSYS ()
111 #define fchown(fd,uid,gid) EIO_ENOSYS () 128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
112 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
113 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
114 #define mknod(path,mode,dev) EIO_ENOSYS () 131 #define mknod(path,mode,dev) EIO_ENOSYS ()
115 #define sync() EIO_ENOSYS () 132 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
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 }
116 202
117 /* we could even stat and see if it exists */ 203 /* we could even stat and see if it exists */
118 static int 204 static int
119 symlink (const char *old, const char *neu) 205 symlink (const char *old, const char *neu)
120 { 206 {
207 #if WINVER >= 0x0600
121 if (CreateSymbolicLink (neu, old, 1)) 208 if (CreateSymbolicLink (neu, old, 1))
122 return 0; 209 return 0;
123 210
124 if (CreateSymbolicLink (neu, old, 0)) 211 if (CreateSymbolicLink (neu, old, 0))
125 return 0; 212 return 0;
213 #endif
126 214
127 return EIO_ERRNO (ENOENT, -1); 215 return EIO_ERRNO (ENOENT, -1);
128 } 216 }
129 217
218 /* POSIX API only, causing trouble for win32 apps */
219 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
220 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
221
222 struct statvfs
223 {
224 int dummy;
225 };
226
227 #define DT_DIR EIO_DT_DIR
228 #define DT_REG EIO_DT_REG
229 #define D_NAME(entp) entp.cFileName
230 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
231
130#else 232#else
131 233
132 #include <sys/time.h> 234 #include <sys/time.h>
133 #include <sys/select.h> 235 #include <sys/select.h>
134 #include <sys/statvfs.h>
135 #include <unistd.h> 236 #include <unistd.h>
136 #include <utime.h>
137 #include <signal.h> 237 #include <signal.h>
138 #include <dirent.h> 238 #include <dirent.h>
239
240 #ifdef ANDROID
241 #include <sys/vfs.h>
242 #define statvfs statfs
243 #define fstatvfs fstatfs
244 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
245 #else
246 #include <sys/statvfs.h>
247 #endif
139 248
140 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 249 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
141 #include <sys/mman.h> 250 #include <sys/mman.h>
142 #endif 251 #endif
143 252
253 #define D_NAME(entp) entp->d_name
254
144 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 255 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
145 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 256 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
146 #define _DIRENT_HAVE_D_TYPE /* sigh */ 257 #define _DIRENT_HAVE_D_TYPE /* sigh */
147 #define D_INO(de) (de)->d_fileno 258 #define D_INO(de) (de)->d_fileno
148 #define D_NAMLEN(de) (de)->d_namlen 259 #define D_NAMLEN(de) (de)->d_namlen
149 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 260 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
150 #define D_INO(de) (de)->d_ino 261 #define D_INO(de) (de)->d_ino
… …
161 272
162 #ifndef EIO_STRUCT_DIRENT 273 #ifndef EIO_STRUCT_DIRENT
163 #define EIO_STRUCT_DIRENT struct dirent 274 #define EIO_STRUCT_DIRENT struct dirent
164 #endif 275 #endif
165 276
277#endif
278
279#if HAVE_UTIMES
280# include <utime.h>
281#endif
282
283#if HAVE_SYS_SYSCALL_H
284# include <sys/syscall.h>
285#endif
286
287#if HAVE_SYS_PRCTL_H
288# include <sys/prctl.h>
166#endif 289#endif
167 290
168#if HAVE_SENDFILE 291#if HAVE_SENDFILE
169# if __linux 292# if __linux
170# include <sys/sendfile.h> 293# include <sys/sendfile.h>
… …
185#endif 308#endif
186#ifndef D_INO 309#ifndef D_INO
187# define D_INO(de) 0 310# define D_INO(de) 0
188#endif 311#endif
189#ifndef D_NAMLEN 312#ifndef D_NAMLEN
190# define D_NAMLEN(de) strlen ((de)->d_name) 313# define D_NAMLEN(entp) strlen (D_NAME (entp))
191#endif 314#endif
192 315
193/* used for struct dirent, AIX doesn't provide it */ 316/* used for struct dirent, AIX doesn't provide it */
194#ifndef NAME_MAX 317#ifndef NAME_MAX
195# define NAME_MAX 4096 318# define NAME_MAX 4096
… …
201#endif 324#endif
202 325
203/* buffer size for various temporary buffers */ 326/* buffer size for various temporary buffers */
204#define EIO_BUFSIZE 65536 327#define EIO_BUFSIZE 65536
205 328
206#define dBUF \ 329#define dBUF \
207 char *eio_buf; \
208 ETP_WORKER_LOCK (self); \
209 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 330 char *eio_buf = malloc (EIO_BUFSIZE); \
210 ETP_WORKER_UNLOCK (self); \
211 errno = ENOMEM; \ 331 errno = ENOMEM; \
212 if (!eio_buf) \ 332 if (!eio_buf) \
213 return -1; 333 return -1
214 334
215#define EIO_TICKS ((1000000 + 1023) >> 10) 335#define FUBd \
336 free (eio_buf)
337
338/*****************************************************************************/
339
340struct tmpbuf
341{
342 void *ptr;
343 int len;
344};
345
346static void *
347tmpbuf_get (struct tmpbuf *buf, int len)
348{
349 if (buf->len < len)
350 {
351 free (buf->ptr);
352 buf->ptr = malloc (buf->len = len);
353 }
354
355 return buf->ptr;
356}
357
358struct tmpbuf;
359
360#if _POSIX_VERSION >= 200809L
361 #define HAVE_AT 1
362 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
363 #ifndef O_SEARCH
364 #define O_SEARCH O_RDONLY
365 #endif
366#else
367 #define HAVE_AT 0
368 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
369#endif
370
371struct eio_pwd
372{
373#if HAVE_AT
374 int fd;
375#endif
376 int len;
377 char str[1]; /* actually, a 0-terminated canonical path */
378};
379
380/*****************************************************************************/
216 381
217#define ETP_PRI_MIN EIO_PRI_MIN 382#define ETP_PRI_MIN EIO_PRI_MIN
218#define ETP_PRI_MAX EIO_PRI_MAX 383#define ETP_PRI_MAX EIO_PRI_MAX
384
385#define ETP_TYPE_QUIT -1
386#define ETP_TYPE_GROUP EIO_GROUP
219 387
220struct etp_worker; 388struct etp_worker;
221 389
222#define ETP_REQ eio_req 390#define ETP_REQ eio_req
223#define ETP_DESTROY(req) eio_destroy (req) 391#define ETP_DESTROY(req) eio_destroy (req)
224static int eio_finish (eio_req *req); 392static int eio_finish (eio_req *req);
225#define ETP_FINISH(req) eio_finish (req) 393#define ETP_FINISH(req) eio_finish (req)
226static void eio_execute (struct etp_worker *self, eio_req *req); 394static void eio_execute (struct etp_worker *self, eio_req *req);
227#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 395#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
228 396
229#define ETP_WORKER_CLEAR(req) \ 397#include "etp.c"
230 if (wrk->dbuf) \
231 { \
232 free (wrk->dbuf); \
233 wrk->dbuf = 0; \
234 } \
235 \
236 if (wrk->dirp) \
237 { \
238 closedir (wrk->dirp); \
239 wrk->dirp = 0; \
240 }
241
242#define ETP_WORKER_COMMON \
243 void *dbuf; \
244 DIR *dirp;
245
246/*****************************************************************************/
247
248#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
249
250/* calculate time difference in ~1/EIO_TICKS of a second */
251ecb_inline int
252tvdiff (struct timeval *tv1, struct timeval *tv2)
253{
254 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
255 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
256}
257
258static unsigned int started, idle, wanted = 4;
259
260static void (*want_poll_cb) (void);
261static void (*done_poll_cb) (void);
262
263static unsigned int max_poll_time; /* reslock */
264static unsigned int max_poll_reqs; /* reslock */
265
266static volatile unsigned int nreqs; /* reqlock */
267static volatile unsigned int nready; /* reqlock */
268static volatile unsigned int npending; /* reqlock */
269static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
270static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
271
272static xmutex_t wrklock;
273static xmutex_t reslock;
274static xmutex_t reqlock;
275static xcond_t reqwait;
276
277#if !HAVE_PREADWRITE
278/*
279 * make our pread/pwrite emulation safe against themselves, but not against
280 * normal read/write by using a mutex. slows down execution a lot,
281 * but that's your problem, not mine.
282 */
283static xmutex_t preadwritelock = X_MUTEX_INIT;
284#endif
285
286typedef struct etp_worker
287{
288 /* locked by wrklock */
289 struct etp_worker *prev, *next;
290
291 xthread_t tid;
292
293 /* locked by reslock, reqlock or wrklock */
294 ETP_REQ *req; /* currently processed request */
295
296 ETP_WORKER_COMMON
297} etp_worker;
298
299static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
300
301#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
302#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
303
304/* worker threads management */
305
306static void ecb_cold
307etp_worker_clear (etp_worker *wrk)
308{
309 ETP_WORKER_CLEAR (wrk);
310}
311
312static void ecb_cold
313etp_worker_free (etp_worker *wrk)
314{
315 wrk->next->prev = wrk->prev;
316 wrk->prev->next = wrk->next;
317
318 free (wrk);
319}
320
321static unsigned int
322etp_nreqs (void)
323{
324 int retval;
325 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
326 retval = nreqs;
327 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
328 return retval;
329}
330
331static unsigned int
332etp_nready (void)
333{
334 unsigned int retval;
335
336 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
337 retval = nready;
338 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
339
340 return retval;
341}
342
343static unsigned int
344etp_npending (void)
345{
346 unsigned int retval;
347
348 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
349 retval = npending;
350 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
351
352 return retval;
353}
354
355static unsigned int
356etp_nthreads (void)
357{
358 unsigned int retval;
359
360 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
361 retval = started;
362 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
363
364 return retval;
365}
366
367/*
368 * a somewhat faster data structure might be nice, but
369 * with 8 priorities this actually needs <20 insns
370 * per shift, the most expensive operation.
371 */
372typedef struct {
373 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
374 int size;
375} etp_reqq;
376
377static etp_reqq req_queue;
378static etp_reqq res_queue;
379
380static int ecb_noinline
381reqq_push (etp_reqq *q, ETP_REQ *req)
382{
383 int pri = req->pri;
384 req->next = 0;
385
386 if (q->qe[pri])
387 {
388 q->qe[pri]->next = req;
389 q->qe[pri] = req;
390 }
391 else
392 q->qe[pri] = q->qs[pri] = req;
393
394 return q->size++;
395}
396
397static ETP_REQ * ecb_noinline
398reqq_shift (etp_reqq *q)
399{
400 int pri;
401
402 if (!q->size)
403 return 0;
404
405 --q->size;
406
407 for (pri = ETP_NUM_PRI; pri--; )
408 {
409 eio_req *req = q->qs[pri];
410
411 if (req)
412 {
413 if (!(q->qs[pri] = (eio_req *)req->next))
414 q->qe[pri] = 0;
415
416 return req;
417 }
418 }
419
420 abort ();
421}
422
423static void ecb_cold
424etp_thread_init (void)
425{
426#if !HAVE_PREADWRITE
427 X_MUTEX_CREATE (preadwritelock);
428#endif
429 X_MUTEX_CREATE (wrklock);
430 X_MUTEX_CREATE (reslock);
431 X_MUTEX_CREATE (reqlock);
432 X_COND_CREATE (reqwait);
433}
434
435static void ecb_cold
436etp_atfork_prepare (void)
437{
438}
439
440static void ecb_cold
441etp_atfork_parent (void)
442{
443}
444
445static void ecb_cold
446etp_atfork_child (void)
447{
448 ETP_REQ *prv;
449
450 while ((prv = reqq_shift (&req_queue)))
451 ETP_DESTROY (prv);
452
453 while ((prv = reqq_shift (&res_queue)))
454 ETP_DESTROY (prv);
455
456 while (wrk_first.next != &wrk_first)
457 {
458 etp_worker *wrk = wrk_first.next;
459
460 if (wrk->req)
461 ETP_DESTROY (wrk->req);
462
463 etp_worker_clear (wrk);
464 etp_worker_free (wrk);
465 }
466
467 started = 0;
468 idle = 0;
469 nreqs = 0;
470 nready = 0;
471 npending = 0;
472
473 etp_thread_init ();
474}
475
476static void ecb_cold
477etp_once_init (void)
478{
479 etp_thread_init ();
480 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
481}
482
483static int ecb_cold
484etp_init (void (*want_poll)(void), void (*done_poll)(void))
485{
486 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
487
488 pthread_once (&doinit, etp_once_init);
489
490 want_poll_cb = want_poll;
491 done_poll_cb = done_poll;
492
493 return 0;
494}
495
496X_THREAD_PROC (etp_proc);
497
498static void ecb_cold
499etp_start_thread (void)
500{
501 etp_worker *wrk = calloc (1, sizeof (etp_worker));
502
503 /*TODO*/
504 assert (("unable to allocate worker thread data", wrk));
505
506 X_LOCK (wrklock);
507
508 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
509 {
510 wrk->prev = &wrk_first;
511 wrk->next = wrk_first.next;
512 wrk_first.next->prev = wrk;
513 wrk_first.next = wrk;
514 ++started;
515 }
516 else
517 free (wrk);
518
519 X_UNLOCK (wrklock);
520}
521
522static void
523etp_maybe_start_thread (void)
524{
525 if (ecb_expect_true (etp_nthreads () >= wanted))
526 return;
527
528 /* todo: maybe use idle here, but might be less exact */
529 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
530 return;
531
532 etp_start_thread ();
533}
534
535static void ecb_cold
536etp_end_thread (void)
537{
538 eio_req *req = calloc (1, sizeof (eio_req));
539
540 req->type = -1;
541 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
542
543 X_LOCK (reqlock);
544 reqq_push (&req_queue, req);
545 X_COND_SIGNAL (reqwait);
546 X_UNLOCK (reqlock);
547
548 X_LOCK (wrklock);
549 --started;
550 X_UNLOCK (wrklock);
551}
552
553static int
554etp_poll (void)
555{
556 unsigned int maxreqs;
557 unsigned int maxtime;
558 struct timeval tv_start, tv_now;
559
560 X_LOCK (reslock);
561 maxreqs = max_poll_reqs;
562 maxtime = max_poll_time;
563 X_UNLOCK (reslock);
564
565 if (maxtime)
566 gettimeofday (&tv_start, 0);
567
568 for (;;)
569 {
570 ETP_REQ *req;
571
572 etp_maybe_start_thread ();
573
574 X_LOCK (reslock);
575 req = reqq_shift (&res_queue);
576
577 if (req)
578 {
579 --npending;
580
581 if (!res_queue.size && done_poll_cb)
582 done_poll_cb ();
583 }
584
585 X_UNLOCK (reslock);
586
587 if (!req)
588 return 0;
589
590 X_LOCK (reqlock);
591 --nreqs;
592 X_UNLOCK (reqlock);
593
594 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
595 {
596 req->int1 = 1; /* mark request as delayed */
597 continue;
598 }
599 else
600 {
601 int res = ETP_FINISH (req);
602 if (ecb_expect_false (res))
603 return res;
604 }
605
606 if (ecb_expect_false (maxreqs && !--maxreqs))
607 break;
608
609 if (maxtime)
610 {
611 gettimeofday (&tv_now, 0);
612
613 if (tvdiff (&tv_start, &tv_now) >= maxtime)
614 break;
615 }
616 }
617
618 errno = EAGAIN;
619 return -1;
620}
621
622static void
623etp_cancel (ETP_REQ *req)
624{
625 req->cancelled = 1;
626
627 eio_grp_cancel (req);
628}
629
630static void
631etp_submit (ETP_REQ *req)
632{
633 req->pri -= ETP_PRI_MIN;
634
635 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
636 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
637
638 if (ecb_expect_false (req->type == EIO_GROUP))
639 {
640 /* I hope this is worth it :/ */
641 X_LOCK (reqlock);
642 ++nreqs;
643 X_UNLOCK (reqlock);
644
645 X_LOCK (reslock);
646
647 ++npending;
648
649 if (!reqq_push (&res_queue, req) && want_poll_cb)
650 want_poll_cb ();
651
652 X_UNLOCK (reslock);
653 }
654 else
655 {
656 X_LOCK (reqlock);
657 ++nreqs;
658 ++nready;
659 reqq_push (&req_queue, req);
660 X_COND_SIGNAL (reqwait);
661 X_UNLOCK (reqlock);
662
663 etp_maybe_start_thread ();
664 }
665}
666
667static void ecb_cold
668etp_set_max_poll_time (double nseconds)
669{
670 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
671 max_poll_time = nseconds * EIO_TICKS;
672 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
673}
674
675static void ecb_cold
676etp_set_max_poll_reqs (unsigned int maxreqs)
677{
678 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
679 max_poll_reqs = maxreqs;
680 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
681}
682
683static void ecb_cold
684etp_set_max_idle (unsigned int nthreads)
685{
686 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
687 max_idle = nthreads;
688 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
689}
690
691static void ecb_cold
692etp_set_idle_timeout (unsigned int seconds)
693{
694 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
695 idle_timeout = seconds;
696 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
697}
698
699static void ecb_cold
700etp_set_min_parallel (unsigned int nthreads)
701{
702 if (wanted < nthreads)
703 wanted = nthreads;
704}
705
706static void ecb_cold
707etp_set_max_parallel (unsigned int nthreads)
708{
709 if (wanted > nthreads)
710 wanted = nthreads;
711
712 while (started > wanted)
713 etp_end_thread ();
714}
715 398
716/*****************************************************************************/ 399/*****************************************************************************/
717 400
718static void 401static void
719grp_try_feed (eio_req *grp) 402grp_try_feed (eio_req *grp)
… …
786} 469}
787 470
788void 471void
789eio_grp_cancel (eio_req *grp) 472eio_grp_cancel (eio_req *grp)
790{ 473{
791 for (grp = grp->grp_first; grp; grp = grp->grp_next)
792 eio_cancel (grp); 474 etp_grp_cancel (grp);
793} 475}
794 476
795void 477void
796eio_cancel (eio_req *req) 478eio_cancel (eio_req *req)
797{ 479{
… …
869 return etp_poll (); 551 return etp_poll ();
870} 552}
871 553
872/*****************************************************************************/ 554/*****************************************************************************/
873/* work around various missing functions */ 555/* work around various missing functions */
874
875#if !HAVE_PREADWRITE
876# undef pread
877# undef pwrite
878# define pread eio__pread
879# define pwrite eio__pwrite
880
881static ssize_t
882eio__pread (int fd, void *buf, size_t count, off_t offset)
883{
884 ssize_t res;
885 off_t ooffset;
886
887 X_LOCK (preadwritelock);
888 ooffset = lseek (fd, 0, SEEK_CUR);
889 lseek (fd, offset, SEEK_SET);
890 res = read (fd, buf, count);
891 lseek (fd, ooffset, SEEK_SET);
892 X_UNLOCK (preadwritelock);
893
894 return res;
895}
896
897static ssize_t
898eio__pwrite (int fd, void *buf, size_t count, off_t offset)
899{
900 ssize_t res;
901 off_t ooffset;
902
903 X_LOCK (preadwritelock);
904 ooffset = lseek (fd, 0, SEEK_CUR);
905 lseek (fd, offset, SEEK_SET);
906 res = write (fd, buf, count);
907 lseek (fd, ooffset, SEEK_SET);
908 X_UNLOCK (preadwritelock);
909
910 return res;
911}
912#endif
913 556
914#ifndef HAVE_UTIMES 557#ifndef HAVE_UTIMES
915 558
916# undef utimes 559# undef utimes
917# define utimes(path,times) eio__utimes (path, times) 560# define utimes(path,times) eio__utimes (path, times)
… …
950 593
951#if !HAVE_FDATASYNC 594#if !HAVE_FDATASYNC
952# undef fdatasync 595# undef fdatasync
953# define fdatasync(fd) fsync (fd) 596# define fdatasync(fd) fsync (fd)
954#endif 597#endif
598
599static int
600eio__syncfs (int fd)
601{
602 int res;
603
604#if HAVE_SYS_SYNCFS
605 res = (int)syscall (__NR_syncfs, (int)(fd));
606#else
607 res = EIO_ENOSYS ();
608#endif
609
610 if (res < 0 && errno == ENOSYS && fd >= 0)
611 sync ();
612
613 return res;
614}
955 615
956/* sync_file_range always needs emulation */ 616/* sync_file_range always needs emulation */
957static int 617static int
958eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 618eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
959{ 619{
… …
982} 642}
983 643
984static int 644static int
985eio__fallocate (int fd, int mode, off_t offset, size_t len) 645eio__fallocate (int fd, int mode, off_t offset, size_t len)
986{ 646{
987#if HAVE_FALLOCATE 647#if HAVE_LINUX_FALLOCATE
988 return fallocate (fd, mode, offset, len); 648 return fallocate (fd, mode, offset, len);
989#else 649#else
990 errno = ENOSYS; 650 return EIO_ENOSYS ();
991 return -1;
992#endif 651#endif
993} 652}
994 653
995#if !HAVE_READAHEAD 654#if !HAVE_READAHEAD
996# undef readahead 655# undef readahead
997# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 656# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
998 657
999static ssize_t 658static eio_ssize_t
1000eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 659eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
1001{ 660{
1002 size_t todo = count; 661 size_t todo = count;
1003 dBUF; 662 dBUF;
1004 663
… …
1009 pread (fd, eio_buf, len, offset); 668 pread (fd, eio_buf, len, offset);
1010 offset += len; 669 offset += len;
1011 todo -= len; 670 todo -= len;
1012 } 671 }
1013 672
1014 errno = 0; 673 FUBd;
674
675 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
676 /* but not for e.g. EIO or eof, so we also never fail */
1015 return count; 677 return 0;
1016} 678}
1017 679
1018#endif 680#endif
1019 681
1020/* sendfile always needs emulation */ 682/* sendfile always needs emulation */
1021static ssize_t 683static eio_ssize_t
1022eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 684eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1023{ 685{
1024 ssize_t written = 0; 686 eio_ssize_t written = 0;
1025 ssize_t res; 687 eio_ssize_t res;
1026 688
1027 if (!count) 689 if (!count)
1028 return 0; 690 return 0;
1029 691
1030 for (;;) 692 for (;;)
… …
1055 717
1056 /* according to source inspection, this is correct, and useful behaviour */ 718 /* according to source inspection, this is correct, and useful behaviour */
1057 if (sbytes) 719 if (sbytes)
1058 res = sbytes; 720 res = sbytes;
1059 721
1060# elif defined (__APPLE__) 722# elif defined __APPLE__
1061 off_t sbytes = count; 723 off_t sbytes = count;
1062 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 724 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1063 725
1064 /* according to the manpage, sbytes is always valid */ 726 /* according to the manpage, sbytes is always valid */
1065 if (sbytes) 727 if (sbytes)
… …
1092 HANDLE h = TO_SOCKET (ifd); 754 HANDLE h = TO_SOCKET (ifd);
1093 SetFilePointer (h, offset, 0, FILE_BEGIN); 755 SetFilePointer (h, offset, 0, FILE_BEGIN);
1094 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 756 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1095 757
1096#else 758#else
1097 res = -1; 759 res = EIO_ENOSYS ();
1098 errno = ENOSYS;
1099#endif 760#endif
1100 761
1101 /* we assume sendfile can copy at least 128mb in one go */ 762 /* we assume sendfile can copy at least 128mb in one go */
1102 if (res <= 128 * 1024 * 1024) 763 if (res <= 128 * 1024 * 1024)
1103 { 764 {
… …
1125 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 786 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1126 /* BSDs */ 787 /* BSDs */
1127#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 788#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1128 || errno == ENOTSUP 789 || errno == ENOTSUP
1129#endif 790#endif
791#ifdef EOPNOTSUPP /* windows */
1130 || errno == EOPNOTSUPP /* BSDs */ 792 || errno == EOPNOTSUPP /* BSDs */
793#endif
1131#if __solaris 794#if __solaris
1132 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 795 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1133#endif 796#endif
1134 ) 797 )
1135 ) 798 )
… …
1139 802
1140 res = 0; 803 res = 0;
1141 804
1142 while (count) 805 while (count)
1143 { 806 {
1144 ssize_t cnt; 807 eio_ssize_t cnt;
1145 808
1146 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 809 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1147 810
1148 if (cnt <= 0) 811 if (cnt <= 0)
1149 { 812 {
… …
1161 824
1162 offset += cnt; 825 offset += cnt;
1163 res += cnt; 826 res += cnt;
1164 count -= cnt; 827 count -= cnt;
1165 } 828 }
829
830 FUBd;
1166 } 831 }
1167 832
1168 return res; 833 return res;
1169} 834}
1170 835
… …
1197 /* round up length */ 862 /* round up length */
1198 *length = (*length + mask) & ~mask; 863 *length = (*length + mask) & ~mask;
1199} 864}
1200 865
1201#if !_POSIX_MEMLOCK 866#if !_POSIX_MEMLOCK
1202# define eio__mlockall(a) eio_nosyscall() 867# define eio__mlockall(a) EIO_ENOSYS ()
1203#else 868#else
1204 869
1205static int 870static int
1206eio__mlockall (int flags) 871eio__mlockall (int flags)
1207{ 872{
… …
1286 951
1287/*****************************************************************************/ 952/*****************************************************************************/
1288/* requests implemented outside eio_execute, because they are so large */ 953/* requests implemented outside eio_execute, because they are so large */
1289 954
1290static void 955static void
1291eio__realpath (eio_req *req, etp_worker *self) 956eio__lseek (eio_req *req)
1292{ 957{
1293 char *rel = req->ptr1; 958 /* this usually gets optimised away completely, or your compiler sucks, */
959 /* or the whence constants really are not 0, 1, 2 */
960 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
961 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
962 : req->int2 == EIO_SEEK_END ? SEEK_END
963 : req->int2;
964
965 req->offs = lseek (req->int1, req->offs, whence);
966 req->result = req->offs == (off_t)-1 ? -1 : 0;
967}
968
969/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
970static int
971eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
972{
1294 char *res; 973 char *res;
974 const char *rel = path;
1295 char *tmp1, *tmp2; 975 char *tmp1, *tmp2;
1296#if SYMLOOP_MAX > 32 976#if SYMLOOP_MAX > 32
1297 int symlinks = SYMLOOP_MAX; 977 int symlinks = SYMLOOP_MAX;
1298#else 978#else
1299 int symlinks = 32; 979 int symlinks = 32;
1300#endif 980#endif
1301 981
1302 req->result = -1;
1303
1304 errno = EINVAL; 982 errno = EINVAL;
1305 if (!rel) 983 if (!rel)
1306 return; 984 return -1;
1307 985
1308 errno = ENOENT; 986 errno = ENOENT;
1309 if (!*rel) 987 if (!*rel)
1310 return; 988 return -1;
1311 989
1312 if (!req->ptr2) 990 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1313 { 991#ifdef _WIN32
1314 X_LOCK (wrklock); 992 if (_access (rel, 4) != 0)
1315 req->flags |= EIO_FLAG_PTR2_FREE;
1316 X_UNLOCK (wrklock);
1317 req->ptr2 = malloc (PATH_MAX * 3);
1318
1319 errno = ENOMEM;
1320 if (!req->ptr2)
1321 return; 993 return -1;
1322 }
1323 994
1324 res = req->ptr2; 995 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0);
996
997 errno = ENAMETOOLONG;
998 if (symlinks >= PATH_MAX * 3)
999 return -1;
1000
1001 errno = EIO;
1002 if (symlinks <= 0)
1003 return -1;
1004
1005 return symlinks;
1006
1007#else
1325 tmp1 = res + PATH_MAX; 1008 tmp1 = res + PATH_MAX;
1326 tmp2 = tmp1 + PATH_MAX; 1009 tmp2 = tmp1 + PATH_MAX;
1327 1010
1328#if 0 /* disabled, the musl way to do things is just too racy */ 1011#if 0 /* disabled, the musl way to do things is just too racy */
1329#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1012#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
… …
1333 1016
1334 if (fd >= 0) 1017 if (fd >= 0)
1335 { 1018 {
1336 sprintf (tmp1, "/proc/self/fd/%d", fd); 1019 sprintf (tmp1, "/proc/self/fd/%d", fd);
1337 req->result = readlink (tmp1, res, PATH_MAX); 1020 req->result = readlink (tmp1, res, PATH_MAX);
1021 /* here we should probably stat the open file and the disk file, to make sure they still match */
1338 close (fd); 1022 close (fd);
1339
1340 /* here we should probably stat the open file and the disk file, to make sure they still match */
1341 1023
1342 if (req->result > 0) 1024 if (req->result > 0)
1343 goto done; 1025 goto done;
1344 } 1026 }
1345 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1027 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1346 return; 1028 return -1;
1347 } 1029 }
1348#endif 1030#endif
1349#endif 1031#endif
1350 1032
1351 if (*rel != '/') 1033 if (*rel != '/')
1352 { 1034 {
1035 int len;
1036
1037 errno = ENOENT;
1038 if (wd == EIO_INVALID_WD)
1039 return -1;
1040
1041 if (wd == EIO_CWD)
1042 {
1353 if (!getcwd (res, PATH_MAX)) 1043 if (!getcwd (res, PATH_MAX))
1354 return; 1044 return -1;
1045
1046 len = strlen (res);
1047 }
1048 else
1049 memcpy (res, wd->str, len = wd->len);
1355 1050
1356 if (res [1]) /* only use if not / */ 1051 if (res [1]) /* only use if not / */
1357 res += strlen (res); 1052 res += len;
1358 } 1053 }
1359 1054
1360 while (*rel) 1055 while (*rel)
1361 { 1056 {
1362 ssize_t len, linklen; 1057 eio_ssize_t len, linklen;
1363 char *beg = rel; 1058 const char *beg = rel;
1364 1059
1365 while (*rel && *rel != '/') 1060 while (*rel && *rel != '/')
1366 ++rel; 1061 ++rel;
1367 1062
1368 len = rel - beg; 1063 len = rel - beg;
… …
1380 1075
1381 if (beg [1] == '.' && len == 2) 1076 if (beg [1] == '.' && len == 2)
1382 { 1077 {
1383 /* .. - back up one component, if possible */ 1078 /* .. - back up one component, if possible */
1384 1079
1385 while (res != req->ptr2) 1080 while (res != tmpbuf->ptr)
1386 if (*--res == '/') 1081 if (*--res == '/')
1387 break; 1082 break;
1388 1083
1389 continue; 1084 continue;
1390 } 1085 }
1391 } 1086 }
1392 1087
1393 errno = ENAMETOOLONG; 1088 errno = ENAMETOOLONG;
1394 if (res + 1 + len + 1 >= tmp1) 1089 if (res + 1 + len + 1 >= tmp1)
1395 return; 1090 return -1;
1396 1091
1397 /* copy one component */ 1092 /* copy one component */
1398 *res = '/'; 1093 *res = '/';
1399 memcpy (res + 1, beg, len); 1094 memcpy (res + 1, beg, len);
1400 1095
1401 /* zero-terminate, for readlink */ 1096 /* zero-terminate, for readlink */
1402 res [len + 1] = 0; 1097 res [len + 1] = 0;
1403 1098
1404 /* now check if it's a symlink */ 1099 /* now check if it's a symlink */
1405 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1100 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1406 1101
1407 if (linklen < 0) 1102 if (linklen < 0)
1408 { 1103 {
1409 if (errno != EINVAL) 1104 if (errno != EINVAL)
1410 return; 1105 return -1;
1411 1106
1412 /* it's a normal directory. hopefully */ 1107 /* it's a normal directory. hopefully */
1413 res += len + 1; 1108 res += len + 1;
1414 } 1109 }
1415 else 1110 else
… …
1417 /* yay, it was a symlink - build new path in tmp2 */ 1112 /* yay, it was a symlink - build new path in tmp2 */
1418 int rellen = strlen (rel); 1113 int rellen = strlen (rel);
1419 1114
1420 errno = ENAMETOOLONG; 1115 errno = ENAMETOOLONG;
1421 if (linklen + 1 + rellen >= PATH_MAX) 1116 if (linklen + 1 + rellen >= PATH_MAX)
1422 return; 1117 return -1;
1423 1118
1424 errno = ELOOP; 1119 errno = ELOOP;
1425 if (!--symlinks) 1120 if (!--symlinks)
1426 return; 1121 return -1;
1427 1122
1428 if (*tmp1 == '/') 1123 if (*tmp1 == '/')
1429 res = req->ptr2; /* symlink resolves to an absolute path */ 1124 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1430 1125
1431 /* we need to be careful, as rel might point into tmp2 already */ 1126 /* we need to be careful, as rel might point into tmp2 already */
1432 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1127 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1433 tmp2 [linklen] = '/'; 1128 tmp2 [linklen] = '/';
1434 memcpy (tmp2, tmp1, linklen); 1129 memcpy (tmp2, tmp1, linklen);
… …
1436 rel = tmp2; 1131 rel = tmp2;
1437 } 1132 }
1438 } 1133 }
1439 1134
1440 /* special case for the lone root path */ 1135 /* special case for the lone root path */
1441 if (res == req->ptr2) 1136 if (res == tmpbuf->ptr)
1442 *res++ = '/'; 1137 *res++ = '/';
1443 1138
1444 req->result = res - (char *)req->ptr2; 1139 return res - (char *)tmpbuf->ptr;
1445 1140#endif
1446done:
1447 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1448} 1141}
1449 1142
1450static signed char 1143static signed char
1451eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1144eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1452{ 1145{
… …
1460 1153
1461#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1154#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1462#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1155#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1463 1156
1464static void 1157static void
1465eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1158eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1466{ 1159{
1467 unsigned char bits [9 + sizeof (ino_t) * 8]; 1160 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1468 unsigned char *bit = bits; 1161 unsigned char *bit = bits;
1469 1162
1470 assert (CHAR_BIT == 8); 1163 assert (CHAR_BIT == 8);
1471 assert (sizeof (eio_dirent) * 8 < 256); 1164 assert (sizeof (eio_dirent) * 8 < 256);
1472 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1165 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1474 1167
1475 if (size <= EIO_SORT_FAST) 1168 if (size <= EIO_SORT_FAST)
1476 return; 1169 return;
1477 1170
1478 /* first prepare an array of bits to test in our radix sort */ 1171 /* first prepare an array of bits to test in our radix sort */
1479 /* try to take endianness into account, as well as differences in ino_t sizes */ 1172 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1480 /* inode_bits must contain all inodes ORed together */ 1173 /* inode_bits must contain all inodes ORed together */
1481 /* which is used to skip bits that are 0 everywhere, which is very common */ 1174 /* which is used to skip bits that are 0 everywhere, which is very common */
1482 { 1175 {
1483 ino_t endianness; 1176 eio_ino_t endianness;
1484 int i, j; 1177 int i, j;
1485 1178
1486 /* we store the byte offset of byte n into byte n of "endianness" */ 1179 /* we store the byte offset of byte n into byte n of "endianness" */
1487 for (i = 0; i < sizeof (ino_t); ++i) 1180 for (i = 0; i < sizeof (eio_ino_t); ++i)
1488 ((unsigned char *)&endianness)[i] = i; 1181 ((unsigned char *)&endianness)[i] = i;
1489 1182
1490 *bit++ = 0; 1183 *bit++ = 0;
1491 1184
1492 for (i = 0; i < sizeof (ino_t); ++i) 1185 for (i = 0; i < sizeof (eio_ino_t); ++i)
1493 { 1186 {
1494 /* shifting off the byte offsets out of "endianness" */ 1187 /* shifting off the byte offsets out of "endianness" */
1495 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1188 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1496 endianness >>= 8; 1189 endianness >>= 8;
1497 1190
1498 for (j = 0; j < 8; ++j) 1191 for (j = 0; j < 8; ++j)
1499 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1192 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1500 *bit++ = offs + j; 1193 *bit++ = offs + j;
1501 } 1194 }
1502 1195
1503 for (j = 0; j < 8; ++j) 1196 for (j = 0; j < 8; ++j)
1504 if (score_bits & (1 << j)) 1197 if (score_bits & (1 << j))
1505 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1198 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1506 } 1199 }
1507 1200
1508 /* now actually do the sorting (a variant of MSD radix sort) */ 1201 /* now actually do the sorting (a variant of MSD radix sort) */
1509 { 1202 {
1510 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1203 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1511 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1204 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1512 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1205 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1513 int stk_idx = 0; 1206 int stk_idx = 0;
1514 1207
1515 base_stk [stk_idx] = dents; 1208 base_stk [stk_idx] = dents;
1516 end_stk [stk_idx] = dents + size; 1209 end_stk [stk_idx] = dents + size;
1517 bit_stk [stk_idx] = bit - 1; 1210 bit_stk [stk_idx] = bit - 1;
… …
1596 } 1289 }
1597 } 1290 }
1598} 1291}
1599 1292
1600static void 1293static void
1601eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1294eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1602{ 1295{
1603 if (size <= 1) 1296 if (size <= 1)
1604 return; /* our insertion sort relies on size > 0 */ 1297 return; /* our insertion sort relies on size > 0 */
1605 1298
1606 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1299 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1614 1307
1615/* read a full directory */ 1308/* read a full directory */
1616static void 1309static void
1617eio__scandir (eio_req *req, etp_worker *self) 1310eio__scandir (eio_req *req, etp_worker *self)
1618{ 1311{
1619 DIR *dirp;
1620 EIO_STRUCT_DIRENT *entp;
1621 char *name, *names; 1312 char *name, *names;
1622 int namesalloc = 4096; 1313 int namesalloc = 4096 - sizeof (void *) * 4;
1623 int namesoffs = 0; 1314 int namesoffs = 0;
1624 int flags = req->int1; 1315 int flags = req->int1;
1625 eio_dirent *dents = 0; 1316 eio_dirent *dents = 0;
1626 int dentalloc = 128; 1317 int dentalloc = 128;
1627 int dentoffs = 0; 1318 int dentoffs = 0;
1628 ino_t inode_bits = 0; 1319 eio_ino_t inode_bits = 0;
1320#ifdef _WIN32
1321 HANDLE dirp;
1322 WIN32_FIND_DATA entp;
1323#else
1324 DIR *dirp;
1325 EIO_STRUCT_DIRENT *entp;
1326#endif
1629 1327
1630 req->result = -1; 1328 req->result = -1;
1631 1329
1632 if (!(flags & EIO_READDIR_DENTS)) 1330 if (!(flags & EIO_READDIR_DENTS))
1633 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1331 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1634 1332
1635 X_LOCK (wrklock); 1333#ifdef _WIN32
1636 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1334 {
1335 int len = strlen ((const char *)req->ptr1);
1336 char *path = malloc (MAX_PATH);
1337 const char *fmt;
1338 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1339
1340 if (!len)
1341 fmt = "./*";
1342 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1343 fmt = "%s*";
1344 else
1345 fmt = "%s/*";
1346
1347 _snprintf (path, MAX_PATH, fmt, reqpath);
1348 dirp = FindFirstFile (path, &entp);
1349 free (path);
1350
1351 if (dirp == INVALID_HANDLE_VALUE)
1352 {
1353 /* should steal _dosmaperr */
1354 switch (GetLastError ())
1355 {
1356 case ERROR_FILE_NOT_FOUND:
1357 req->result = 0;
1358 break;
1359
1360 case ERROR_INVALID_NAME:
1361 case ERROR_PATH_NOT_FOUND:
1362 case ERROR_NO_MORE_FILES:
1363 errno = ENOENT;
1364 break;
1365
1366 case ERROR_NOT_ENOUGH_MEMORY:
1367 errno = ENOMEM;
1368 break;
1369
1370 default:
1371 errno = EINVAL;
1372 break;
1373 }
1374
1375 return;
1376 }
1377 }
1378#else
1379 #if HAVE_AT
1380 if (req->wd)
1381 {
1382 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1383
1384 if (fd < 0)
1385 return;
1386
1387 dirp = fdopendir (fd);
1388
1389 if (!dirp)
1390 close (fd);
1391 }
1392 else
1637 self->dirp = dirp = opendir (req->ptr1); 1393 dirp = opendir (req->ptr1);
1394 #else
1395 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1396 #endif
1397
1398 if (!dirp)
1399 return;
1400#endif
1638 1401
1639 if (req->flags & EIO_FLAG_PTR1_FREE) 1402 if (req->flags & EIO_FLAG_PTR1_FREE)
1640 free (req->ptr1); 1403 free (req->ptr1);
1641 1404
1642 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1405 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1643 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1406 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1644 req->ptr2 = names = malloc (namesalloc); 1407 req->ptr2 = names = malloc (namesalloc);
1645 X_UNLOCK (wrklock);
1646 1408
1647 if (dirp && names && (!flags || dents)) 1409 if (!names || (flags && !dents))
1410 return;
1411
1648 for (;;) 1412 for (;;)
1649 { 1413 {
1414 int done;
1415
1416#ifdef _WIN32
1417 done = !dirp;
1418#else
1650 errno = 0; 1419 errno = 0;
1651 entp = readdir (dirp); 1420 entp = readdir (dirp);
1421 done = !entp;
1422#endif
1652 1423
1653 if (!entp) 1424 if (done)
1654 { 1425 {
1426#ifndef _WIN32
1427 int old_errno = errno;
1428 closedir (dirp);
1429 errno = old_errno;
1430
1655 if (errno) 1431 if (errno)
1656 break; 1432 break;
1433#endif
1657 1434
1658 /* sort etc. */ 1435 /* sort etc. */
1659 req->int1 = flags; 1436 req->int1 = flags;
1660 req->result = dentoffs; 1437 req->result = dentoffs;
1661 1438
1662 if (flags & EIO_READDIR_STAT_ORDER) 1439 if (flags & EIO_READDIR_STAT_ORDER)
1663 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1440 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1664 else if (flags & EIO_READDIR_DIRS_FIRST) 1441 else if (flags & EIO_READDIR_DIRS_FIRST)
1665 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1442 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1666 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1443 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1667 else 1444 else
1445 {
1446 /* in this case, all is known, and we just put dirs first and sort them */
1447 eio_dirent *oth = dents + dentoffs;
1448 eio_dirent *dir = dents;
1449
1450 /* now partition dirs to the front, and non-dirs to the back */
1451 /* by walking from both sides and swapping if necessary */
1452 while (oth > dir)
1453 {
1454 if (dir->type == EIO_DT_DIR)
1455 ++dir;
1456 else if ((--oth)->type == EIO_DT_DIR)
1457 {
1458 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1459
1460 ++dir;
1461 }
1462 }
1463
1464 /* now sort the dirs only (dirs all have the same score) */
1465 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1466 }
1467
1468 break;
1469 }
1470
1471 /* now add the entry to our list(s) */
1472 name = D_NAME (entp);
1473
1474 /* skip . and .. entries */
1475 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1476 {
1477 int len = D_NAMLEN (entp) + 1;
1478
1479 while (ecb_expect_false (namesoffs + len > namesalloc))
1480 {
1481 namesalloc *= 2;
1482 req->ptr2 = names = realloc (names, namesalloc);
1483
1484 if (!names)
1485 break;
1486 }
1487
1488 memcpy (names + namesoffs, name, len);
1489
1490 if (dents)
1491 {
1492 struct eio_dirent *ent;
1493
1494 if (ecb_expect_false (dentoffs == dentalloc))
1668 { 1495 {
1669 /* in this case, all is known, and we just put dirs first and sort them */ 1496 dentalloc *= 2;
1497 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1498
1499 if (!dents)
1500 break;
1501 }
1502
1670 eio_dirent *oth = dents + dentoffs; 1503 ent = dents + dentoffs;
1671 eio_dirent *dir = dents;
1672 1504
1673 /* now partition dirs to the front, and non-dirs to the back */ 1505 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1674 /* by walking from both sides and swapping if necessary */ 1506 ent->namelen = len - 1;
1675 while (oth > dir) 1507 ent->inode = D_INO (entp);
1508
1509 inode_bits |= ent->inode;
1510
1511 switch (D_TYPE (entp))
1512 {
1513 default:
1514 ent->type = EIO_DT_UNKNOWN;
1515 flags |= EIO_READDIR_FOUND_UNKNOWN;
1516 break;
1517
1518 #ifdef DT_FIFO
1519 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1520 #endif
1521 #ifdef DT_CHR
1522 case DT_CHR: ent->type = EIO_DT_CHR; break;
1523 #endif
1524 #ifdef DT_MPC
1525 case DT_MPC: ent->type = EIO_DT_MPC; break;
1526 #endif
1527 #ifdef DT_DIR
1528 case DT_DIR: ent->type = EIO_DT_DIR; break;
1529 #endif
1530 #ifdef DT_NAM
1531 case DT_NAM: ent->type = EIO_DT_NAM; break;
1532 #endif
1533 #ifdef DT_BLK
1534 case DT_BLK: ent->type = EIO_DT_BLK; break;
1535 #endif
1536 #ifdef DT_MPB
1537 case DT_MPB: ent->type = EIO_DT_MPB; break;
1538 #endif
1539 #ifdef DT_REG
1540 case DT_REG: ent->type = EIO_DT_REG; break;
1541 #endif
1542 #ifdef DT_NWK
1543 case DT_NWK: ent->type = EIO_DT_NWK; break;
1544 #endif
1545 #ifdef DT_CMP
1546 case DT_CMP: ent->type = EIO_DT_CMP; break;
1547 #endif
1548 #ifdef DT_LNK
1549 case DT_LNK: ent->type = EIO_DT_LNK; break;
1550 #endif
1551 #ifdef DT_SOCK
1552 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1553 #endif
1554 #ifdef DT_DOOR
1555 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1556 #endif
1557 #ifdef DT_WHT
1558 case DT_WHT: ent->type = EIO_DT_WHT; break;
1559 #endif
1560 }
1561
1562 ent->score = 7;
1563
1564 if (flags & EIO_READDIR_DIRS_FIRST)
1565 {
1566 if (ent->type == EIO_DT_UNKNOWN)
1676 { 1567 {
1677 if (dir->type == EIO_DT_DIR) 1568 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1678 ++dir; 1569 ent->score = 1;
1679 else if ((--oth)->type == EIO_DT_DIR) 1570 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1680 { 1571 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1681 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1682
1683 ++dir;
1684 }
1685 } 1572 }
1686 1573 else if (ent->type == EIO_DT_DIR)
1687 /* now sort the dirs only (dirs all have the same score) */ 1574 ent->score = 0;
1688 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1689 } 1575 }
1690
1691 break;
1692 }
1693
1694 /* now add the entry to our list(s) */
1695 name = entp->d_name;
1696
1697 /* skip . and .. entries */
1698 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1699 {
1700 int len = D_NAMLEN (entp) + 1;
1701
1702 while (ecb_expect_false (namesoffs + len > namesalloc))
1703 {
1704 namesalloc *= 2;
1705 X_LOCK (wrklock);
1706 req->ptr2 = names = realloc (names, namesalloc);
1707 X_UNLOCK (wrklock);
1708
1709 if (!names)
1710 break;
1711 } 1576 }
1712 1577
1713 memcpy (names + namesoffs, name, len);
1714
1715 if (dents)
1716 {
1717 struct eio_dirent *ent;
1718
1719 if (ecb_expect_false (dentoffs == dentalloc))
1720 {
1721 dentalloc *= 2;
1722 X_LOCK (wrklock);
1723 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1724 X_UNLOCK (wrklock);
1725
1726 if (!dents)
1727 break;
1728 }
1729
1730 ent = dents + dentoffs;
1731
1732 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1733 ent->namelen = len - 1;
1734 ent->inode = D_INO (entp);
1735
1736 inode_bits |= ent->inode;
1737
1738 switch (D_TYPE (entp))
1739 {
1740 default:
1741 ent->type = EIO_DT_UNKNOWN;
1742 flags |= EIO_READDIR_FOUND_UNKNOWN;
1743 break;
1744
1745 #ifdef DT_FIFO
1746 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1747 #endif
1748 #ifdef DT_CHR
1749 case DT_CHR: ent->type = EIO_DT_CHR; break;
1750 #endif
1751 #ifdef DT_MPC
1752 case DT_MPC: ent->type = EIO_DT_MPC; break;
1753 #endif
1754 #ifdef DT_DIR
1755 case DT_DIR: ent->type = EIO_DT_DIR; break;
1756 #endif
1757 #ifdef DT_NAM
1758 case DT_NAM: ent->type = EIO_DT_NAM; break;
1759 #endif
1760 #ifdef DT_BLK
1761 case DT_BLK: ent->type = EIO_DT_BLK; break;
1762 #endif
1763 #ifdef DT_MPB
1764 case DT_MPB: ent->type = EIO_DT_MPB; break;
1765 #endif
1766 #ifdef DT_REG
1767 case DT_REG: ent->type = EIO_DT_REG; break;
1768 #endif
1769 #ifdef DT_NWK
1770 case DT_NWK: ent->type = EIO_DT_NWK; break;
1771 #endif
1772 #ifdef DT_CMP
1773 case DT_CMP: ent->type = EIO_DT_CMP; break;
1774 #endif
1775 #ifdef DT_LNK
1776 case DT_LNK: ent->type = EIO_DT_LNK; break;
1777 #endif
1778 #ifdef DT_SOCK
1779 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1780 #endif
1781 #ifdef DT_DOOR
1782 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1783 #endif
1784 #ifdef DT_WHT
1785 case DT_WHT: ent->type = EIO_DT_WHT; break;
1786 #endif
1787 }
1788
1789 ent->score = 7;
1790
1791 if (flags & EIO_READDIR_DIRS_FIRST)
1792 {
1793 if (ent->type == EIO_DT_UNKNOWN)
1794 {
1795 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1796 ent->score = 1;
1797 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1798 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1799 }
1800 else if (ent->type == EIO_DT_DIR)
1801 ent->score = 0;
1802 }
1803 }
1804
1805 namesoffs += len; 1578 namesoffs += len;
1806 ++dentoffs; 1579 ++dentoffs;
1807 } 1580 }
1808 1581
1809 if (EIO_CANCELLED (req)) 1582 if (EIO_CANCELLED (req))
1810 { 1583 {
1811 errno = ECANCELED; 1584 errno = ECANCELED;
1812 break; 1585 break;
1813 } 1586 }
1587
1588#ifdef _WIN32
1589 if (!FindNextFile (dirp, &entp))
1590 {
1591 FindClose (dirp);
1592 dirp = 0;
1814 } 1593 }
1594#endif
1595 }
1815} 1596}
1597
1598/*****************************************************************************/
1599/* working directory stuff */
1600/* various deficiencies in the posix 2008 api force us to */
1601/* keep the absolute path in string form at all times */
1602/* fuck yeah. */
1603
1604#if !HAVE_AT
1605
1606/* a bit like realpath, but usually faster because it doesn'T have to return */
1607/* an absolute or canonical path */
1608static const char *
1609wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1610{
1611 if (!wd || *path == '/')
1612 return path;
1613
1614 if (path [0] == '.' && !path [1])
1615 return wd->str;
1616
1617 {
1618 int l1 = wd->len;
1619 int l2 = strlen (path);
1620
1621 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
1622
1623 memcpy (res, wd->str, l1);
1624 res [l1] = '/';
1625 memcpy (res + l1 + 1, path, l2 + 1);
1626
1627 return res;
1628 }
1629}
1630
1631#endif
1632
1633static eio_wd
1634eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1635{
1636 int fd;
1637 eio_wd res;
1638 int len = eio__realpath (tmpbuf, wd, path);
1639
1640 if (len < 0)
1641 return EIO_INVALID_WD;
1642
1643#if HAVE_AT
1644 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1645
1646 if (fd < 0)
1647 return EIO_INVALID_WD;
1648#endif
1649
1650 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1651
1652#if HAVE_AT
1653 res->fd = fd;
1654#endif
1655
1656 res->len = len;
1657 memcpy (res->str, tmpbuf->ptr, len);
1658 res->str [len] = 0;
1659
1660 return res;
1661}
1662
1663eio_wd
1664eio_wd_open_sync (eio_wd wd, const char *path)
1665{
1666 struct tmpbuf tmpbuf = { 0 };
1667 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1668 free (tmpbuf.ptr);
1669
1670 return wd;
1671}
1672
1673void
1674eio_wd_close_sync (eio_wd wd)
1675{
1676 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1677 {
1678 #if HAVE_AT
1679 close (wd->fd);
1680 #endif
1681 free (wd);
1682 }
1683}
1684
1685#if HAVE_AT
1686
1687/* they forgot these */
1688
1689static int
1690eio__truncateat (int dirfd, const char *path, off_t length)
1691{
1692 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1693 int res;
1694
1695 if (fd < 0)
1696 return fd;
1697
1698 res = ftruncate (fd, length);
1699 close (fd);
1700 return res;
1701}
1702
1703static int
1704eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1705{
1706 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
1707 int res;
1708
1709 if (fd < 0)
1710 return fd;
1711
1712 res = fstatvfs (fd, buf);
1713 close (fd);
1714 return res;
1715
1716}
1717
1718#endif
1816 1719
1817/*****************************************************************************/ 1720/*****************************************************************************/
1818 1721
1819#define ALLOC(len) \ 1722#define ALLOC(len) \
1820 if (!req->ptr2) \ 1723 if (!req->ptr2) \
… …
1829 req->result = -1; \ 1732 req->result = -1; \
1830 break; \ 1733 break; \
1831 } \ 1734 } \
1832 } 1735 }
1833 1736
1737static void ecb_noinline ecb_cold
1738etp_proc_init (void)
1739{
1740#if HAVE_PRCTL_SET_NAME
1741 /* provide a more sensible "thread name" */
1742 char name[16 + 1];
1743 const int namelen = sizeof (name) - 1;
1744 int len;
1745
1746 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
1747 name [namelen] = 0;
1748 len = strlen (name);
1749 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
1750 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
1751#endif
1752}
1753
1754/* TODO: move somehow to etp.c */
1834X_THREAD_PROC (etp_proc) 1755X_THREAD_PROC (etp_proc)
1835{ 1756{
1836 ETP_REQ *req; 1757 ETP_REQ *req;
1837 struct timespec ts; 1758 struct timespec ts;
1838 etp_worker *self = (etp_worker *)thr_arg; 1759 etp_worker *self = (etp_worker *)thr_arg;
1839 int timeout; 1760
1761 etp_proc_init ();
1840 1762
1841 /* try to distribute timeouts somewhat evenly */ 1763 /* try to distribute timeouts somewhat evenly */
1842 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1764 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1843 1765
1844 for (;;) 1766 for (;;)
… …
1847 1769
1848 X_LOCK (reqlock); 1770 X_LOCK (reqlock);
1849 1771
1850 for (;;) 1772 for (;;)
1851 { 1773 {
1852 self->req = req = reqq_shift (&req_queue); 1774 req = reqq_shift (&req_queue);
1853 1775
1854 if (req) 1776 if (req)
1855 break; 1777 break;
1856 1778
1857 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 1779 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
… …
1883 1805
1884 --nready; 1806 --nready;
1885 1807
1886 X_UNLOCK (reqlock); 1808 X_UNLOCK (reqlock);
1887 1809
1888 if (req->type < 0) 1810 if (req->type == ETP_TYPE_QUIT)
1889 goto quit; 1811 goto quit;
1890 1812
1891 ETP_EXECUTE (self, req); 1813 ETP_EXECUTE (self, req);
1892 1814
1893 X_LOCK (reslock); 1815 X_LOCK (reslock);
… …
1895 ++npending; 1817 ++npending;
1896 1818
1897 if (!reqq_push (&res_queue, req) && want_poll_cb) 1819 if (!reqq_push (&res_queue, req) && want_poll_cb)
1898 want_poll_cb (); 1820 want_poll_cb ();
1899 1821
1900 self->req = 0;
1901 etp_worker_clear (self); 1822 etp_worker_clear (self);
1902 1823
1903 X_UNLOCK (reslock); 1824 X_UNLOCK (reslock);
1904 } 1825 }
1905 1826
1906quit: 1827quit:
1828 free (req);
1829
1907 X_LOCK (wrklock); 1830 X_LOCK (wrklock);
1908 etp_worker_free (self); 1831 etp_worker_free (self);
1909 X_UNLOCK (wrklock); 1832 X_UNLOCK (wrklock);
1910 1833
1911 return 0; 1834 return 0;
… …
1923eio_api_destroy (eio_req *req) 1846eio_api_destroy (eio_req *req)
1924{ 1847{
1925 free (req); 1848 free (req);
1926} 1849}
1927 1850
1928#define REQ(rtype) \ 1851#define REQ(rtype) \
1929 eio_req *req; \ 1852 eio_req *req; \
1930 \ 1853 \
1931 req = (eio_req *)calloc (1, sizeof *req); \ 1854 req = (eio_req *)calloc (1, sizeof *req); \
1932 if (!req) \ 1855 if (!req) \
1933 return 0; \ 1856 return 0; \
… …
1947 { \ 1870 { \
1948 eio_api_destroy (req); \ 1871 eio_api_destroy (req); \
1949 return 0; \ 1872 return 0; \
1950 } 1873 }
1951 1874
1875#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1876
1952static void 1877static void
1953eio_execute (etp_worker *self, eio_req *req) 1878eio_execute (etp_worker *self, eio_req *req)
1954{ 1879{
1880#if HAVE_AT
1881 int dirfd;
1882#else
1883 const char *path;
1884#endif
1885
1955 if (ecb_expect_false (EIO_CANCELLED (req))) 1886 if (ecb_expect_false (EIO_CANCELLED (req)))
1956 { 1887 {
1957 req->result = -1; 1888 req->result = -1;
1958 req->errorno = ECANCELED; 1889 req->errorno = ECANCELED;
1959 return; 1890 return;
1960 } 1891 }
1961 1892
1893 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1894 {
1895 req->result = -1;
1896 req->errorno = ENOENT;
1897 return;
1898 }
1899
1900 if (req->type >= EIO_OPEN)
1901 {
1902 #if HAVE_AT
1903 dirfd = WD2FD (req->wd);
1904 #else
1905 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1906 #endif
1907 }
1908
1962 switch (req->type) 1909 switch (req->type)
1963 { 1910 {
1911 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1912 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1913 break;
1914 case EIO_WD_CLOSE: req->result = 0;
1915 eio_wd_close_sync (req->wd); break;
1916
1917 case EIO_SEEK: eio__lseek (req); break;
1964 case EIO_READ: ALLOC (req->size); 1918 case EIO_READ: ALLOC (req->size);
1965 req->result = req->offs >= 0 1919 req->result = req->offs >= 0
1966 ? pread (req->int1, req->ptr2, req->size, req->offs) 1920 ? pread (req->int1, req->ptr2, req->size, req->offs)
1967 : read (req->int1, req->ptr2, req->size); break; 1921 : read (req->int1, req->ptr2, req->size); break;
1968 case EIO_WRITE: req->result = req->offs >= 0 1922 case EIO_WRITE: req->result = req->offs >= 0
1969 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1923 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1970 : write (req->int1, req->ptr2, req->size); break; 1924 : write (req->int1, req->ptr2, req->size); break;
1971 1925
1972 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1926 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1973 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 1927 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1928
1929#if HAVE_AT
1974 1930
1975 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1931 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1976 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1932 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1977 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1933 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1934 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1935 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1936 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1937 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1938 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1939
1940 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1941 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1942 req->result = req->wd && SINGLEDOT (req->ptr1)
1943 ? rmdir (req->wd->str)
1944 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1945 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1946 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1947 req->result = req->wd && SINGLEDOT (req->ptr1)
1948 ? rename (req->wd->str, req->ptr2)
1949 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1950 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1951 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1952 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1953 case EIO_READLINK: ALLOC (PATH_MAX);
1954 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1955 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1956 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1957 case EIO_UTIME:
1958 case EIO_FUTIME:
1959 {
1960 struct timespec ts[2];
1961 struct timespec *times;
1962
1963 if (req->nv1 != -1. || req->nv2 != -1.)
1964 {
1965 ts[0].tv_sec = req->nv1;
1966 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1967 ts[1].tv_sec = req->nv2;
1968 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1969
1970 times = ts;
1971 }
1972 else
1973 times = 0;
1974
1975 req->result = req->type == EIO_FUTIME
1976 ? futimens (req->int1, times)
1977 : utimensat (dirfd, req->ptr1, times, 0);
1978 }
1979 break;
1980
1981#else
1982
1983 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1984 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1985 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1978 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1986 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1987 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1988 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1989 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1990 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1991
1992 case EIO_UNLINK: req->result = unlink (path ); break;
1993 case EIO_RMDIR: req->result = rmdir (path ); break;
1994 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1995 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1996 case EIO_LINK: req->result = link (path , req->ptr2); break;
1997 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1998 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1999 case EIO_READLINK: ALLOC (PATH_MAX);
2000 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2001 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2002 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2003
2004 case EIO_UTIME:
2005 case EIO_FUTIME:
2006 {
2007 struct timeval tv[2];
2008 struct timeval *times;
2009
2010 if (req->nv1 != -1. || req->nv2 != -1.)
2011 {
2012 tv[0].tv_sec = req->nv1;
2013 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2014 tv[1].tv_sec = req->nv2;
2015 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2016
2017 times = tv;
2018 }
2019 else
2020 times = 0;
2021
2022 req->result = req->type == EIO_FUTIME
2023 ? futimes (req->int1, times)
2024 : utimes (req->ptr1, times);
2025 }
2026 break;
2027
2028#endif
2029
2030 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2031 {
2032 ALLOC (req->result);
2033 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2034 }
2035 break;
2036
1979 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2037 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1980 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2038 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1981 2039
1982 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1983 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1984 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2040 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1985 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2041 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1986 2042
1987 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1988 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2043 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1989 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1990 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2044 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1991 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1992 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2045 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1993 2046
1994 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1995 case EIO_CLOSE: req->result = close (req->int1); break; 2047 case EIO_CLOSE: req->result = close (req->int1); break;
1996 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2048 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1997 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1998 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1999 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2000 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2001 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2002 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2003 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2004
2005 case EIO_REALPATH: eio__realpath (req, self); break;
2006
2007 case EIO_READLINK: ALLOC (PATH_MAX);
2008 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2009
2010 case EIO_SYNC: req->result = 0; sync (); break; 2049 case EIO_SYNC: req->result = 0; sync (); break;
2011 case EIO_FSYNC: req->result = fsync (req->int1); break; 2050 case EIO_FSYNC: req->result = fsync (req->int1); break;
2012 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2051 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2052 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2053 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2013 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2054 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2014 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2055 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2015 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2056 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2016 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2057 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2017 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2018 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2058 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2019 2059
2020 case EIO_READDIR: eio__scandir (req, self); break; 2060 case EIO_READDIR: eio__scandir (req, self); break;
2021 2061
2022 case EIO_BUSY: 2062 case EIO_BUSY:
… …
2032 req->result = select (0, 0, 0, 0, &tv); 2072 req->result = select (0, 0, 0, 0, &tv);
2033 } 2073 }
2034#endif 2074#endif
2035 break; 2075 break;
2036 2076
2037 case EIO_UTIME:
2038 case EIO_FUTIME:
2039 {
2040 struct timeval tv[2];
2041 struct timeval *times;
2042
2043 if (req->nv1 != -1. || req->nv2 != -1.)
2044 {
2045 tv[0].tv_sec = req->nv1;
2046 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2047 tv[1].tv_sec = req->nv2;
2048 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2049
2050 times = tv;
2051 }
2052 else
2053 times = 0;
2054
2055 req->result = req->type == EIO_FUTIME
2056 ? futimes (req->int1, times)
2057 : utimes (req->ptr1, times);
2058 }
2059 break;
2060
2061 case EIO_GROUP: 2077 case EIO_GROUP:
2062 abort (); /* handled in eio_request */ 2078 abort (); /* handled in eio_request */
2063 2079
2064 case EIO_NOP: 2080 case EIO_NOP:
2065 req->result = 0; 2081 req->result = 0;
… …
2068 case EIO_CUSTOM: 2084 case EIO_CUSTOM:
2069 req->feed (req); 2085 req->feed (req);
2070 break; 2086 break;
2071 2087
2072 default: 2088 default:
2073 errno = ENOSYS;
2074 req->result = -1; 2089 req->result = EIO_ENOSYS ();
2075 break; 2090 break;
2076 } 2091 }
2077 2092
2078 req->errorno = errno; 2093 req->errorno = errno;
2079} 2094}
2080 2095
2081#ifndef EIO_NO_WRAPPERS 2096#ifndef EIO_NO_WRAPPERS
2082 2097
2098eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2099{
2100 REQ (EIO_WD_OPEN); PATH; SEND;
2101}
2102
2103eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2104{
2105 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2106}
2107
2083eio_req *eio_nop (int pri, eio_cb cb, void *data) 2108eio_req *eio_nop (int pri, eio_cb cb, void *data)
2084{ 2109{
2085 REQ (EIO_NOP); SEND; 2110 REQ (EIO_NOP); SEND;
2086} 2111}
2087 2112
… …
2103eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2128eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2104{ 2129{
2105 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2130 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2106} 2131}
2107 2132
2133eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2134{
2135 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2136}
2137
2138eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2139{
2140 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2141}
2142
2143eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2144{
2145 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2146}
2147
2108eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2148eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2109{ 2149{
2110 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2150 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2111} 2151}
2112 2152
… …
2118eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2158eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2119{ 2159{
2120 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2160 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2121} 2161}
2122 2162
2123eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2124{
2125 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2126}
2127
2128eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2163eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2129{ 2164{
2130 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2165 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2131} 2166}
2132 2167
2133eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2134{
2135 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2136}
2137
2138eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2168eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2139{ 2169{
2140 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2170 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2141} 2171}
2142 2172
2143eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2173eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2144{ 2174{
2145 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2175 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2146} 2176}
2147 2177
2178eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2179{
2180 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2181}
2182
2148eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2183eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2149{ 2184{
2150 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2185 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2151} 2186}
2152 2187
… …
2178eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2213eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2179{ 2214{
2180 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2215 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2181} 2216}
2182 2217
2183eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2218eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2184{ 2219{
2185 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2220 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2186} 2221}
2187 2222
2188eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2223eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
2208eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2243eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2209{ 2244{
2210 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2245 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2211} 2246}
2212 2247
2213eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2248eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2214{ 2249{
2215 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2250 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2216} 2251}
2217 2252
2218eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2253eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
2365} 2400}
2366 2401
2367/*****************************************************************************/ 2402/*****************************************************************************/
2368/* misc garbage */ 2403/* misc garbage */
2369 2404
2370ssize_t 2405eio_ssize_t
2371eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2406eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2372{ 2407{
2373 etp_worker wrk;
2374 ssize_t ret;
2375
2376 wrk.dbuf = 0;
2377
2378 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2408 return eio__sendfile (ofd, ifd, offset, count);
2379
2380 if (wrk.dbuf)
2381 free (wrk.dbuf);
2382
2383 return ret;
2384} 2409}
2385 2410

Diff Legend

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